changeset 13463:f527fadcb5c5

[gaim-migrate @ 15838] 3 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 08 Mar 2006 17:43:55 +0000
parents f9ec1d1f497a
children 974fffde9f60
files po/ChangeLog po/cs.po po/he.po po/zh_CN.po
diffstat 4 files changed, 11682 insertions(+), 11370 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Wed Mar 08 14:57:22 2006 +0000
+++ b/po/ChangeLog	Wed Mar 08 17:43:55 2006 +0000
@@ -7,6 +7,7 @@
 	* Catalan translation updated (Josep Puigdemont)
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Paladin R. Liu)
+	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten (mbrix) Brix Pedersen)
 	* Dutch translation updated (Roy Spliet, Vincent van Adrighem)
 	* English (British) translation updated (Stu Tomlinson and Luke Ross)
--- a/po/cs.po	Wed Mar 08 14:57:22 2006 +0000
+++ b/po/cs.po	Wed Mar 08 17:43:55 2006 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gaim VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-06-07 12:42+0200\n"
+"POT-Creation-Date: 2006-03-07 00:01-0500\n"
+"PO-Revision-Date: 2006-03-08 16:45+0100\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,78 +30,60 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Posílat instant message různými protokoly"
 
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Potlačování zpráv o chybách"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Skrývat chyby připojení"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Skrývat chyby přihlašování"
-
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "Skrývat chyby připojení"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Automaticky se znovu připojit"
+#: ../plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Test šifer"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "Když jste vykopnuti pryč, toto vás znovu připojí."
-
-#: plugins/contact_priority.c:84
+#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr "Testuje šifry dodávané s gaim."
+
+#: ../plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Kamarád je nečinný"
+
+#: ../plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Kamarád je pryč"
+
+#: ../plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Kamarád je pryč \"na dlouho\""
+
+#. Not used yet.
+#: ../plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Kamarád je mobilní"
+
+#: ../plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Kamarád je odpojen"
+
+#: ../plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Hodnoty bodů, které používat, když..."
 
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "Kamarád je odpojen:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "Kamarád je pryč:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "Kamarád je nečinný:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "Používat posledního odpovídajícího kamaráda"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"Kamarád s nejnižším skóre bude mít v kontaktu prioritu.\n"
-"Implicitní hodnoty (odpojen = 4, pryč = 2 a nečinný = 1)\n"
-"způsobí, co bývalo vestavění pořadí aktivní->nečinný->pryč->pryč+nečinný-"
-">odpojen."
-
-#: plugins/contact_priority.c:144
-#, fuzzy
+#: ../plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr "Kamarád s <i>největším skóre</i> bude mít v kontaktu prioritu.\n"
+
+#: ../plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Používat posledního kamaráda, když jsou si skóre rovna."
+
+#: ../plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Hodnoty bodů, které používat pro účet..."
 
@@ -111,20 +93,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
+#: ../plugins/contact_priority.c:182
 msgid "Contact Priority"
 msgstr "Priorita kontaktu"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
+#: ../plugins/contact_priority.c:185
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr "Umožňuje ovládání hodnot přiřazených s různými stavy kamarádků."
+msgstr "Umožňuje ovládání hodnot přiřazených s různými stavy kamarádů."
 
 #. *< description
-#: plugins/contact_priority.c:200
+#: ../plugins/contact_priority.c:187
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -132,57 +114,56 @@
 "Umožňuje změnu hodnot bodů stavů nečinný/pryč/odpojen kamarádů při výpočtech "
 "priority kontaktů."
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - Odhlášen"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Pryč"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "Seznam kamarádů"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "Nová zpráva.."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Připojit se k chatu..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "Umlčet zvuky"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "Přenosy souborů"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "Účty"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "Nastavení"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "Konec"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "Zásuvný modul pro vytvoření sezení Crazychat."
+
+#. *  description
+#: ../plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr "Používá Gaim pro získání ip kamarádů pro připojení k sezení Crazychat"
+
+#. make the network configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Nastavení sítě"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "Port TCP"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "Port UDP"
+
+#. make the feature configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "Kalibrace funkcí"
+
+#. add enabled / disabled
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
+#: ../src/gtkplugin.c:577
+msgid "Enabled"
+msgstr "Povoleno"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Zakázáno"
 
 #. *< type
 #. *< ui_requirement
@@ -190,44 +171,189 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: ../plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "Příklad zásuvného modulu DBus"
+
+#: ../plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "Pro více nepřečtených zpráv klikněte pravým tlačítkem...\n"
+
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d nepřečtená zpráva od %s\n"
+msgstr[1] "%d nepřečtené zprávy od %s\n"
+msgstr[2] "%d nepřečtených zpráv od %s\n"
+
+#: ../plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "Změnit stav"
+
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
+#: ../src/protocols/jabber/buddy.c:1101 ../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:2845
+#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
+msgid "Available"
+msgstr "Přítomen"
+
+#. Away stuff
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
+#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
+#: ../src/status.c:158
+msgid "Away"
+msgstr "Pryč"
+
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
+#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
+#: ../src/status.c:157
+msgid "Invisible"
+msgstr "Neviditelný"
+
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
+#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
+#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
+#: ../src/status.c:154
+msgid "Offline"
+msgstr "Odpojen"
+
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
+msgid "New..."
+msgstr "Nový..."
+
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
+msgid "Saved..."
+msgstr "Uloženo..."
+
+#: ../plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "Zobrazit seznam kamarádů"
+
+#: ../plugins/docklet/docklet.c:489
+msgid "Unread Messages"
+msgstr "Nepřečtené zprávy"
+
+#: ../plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "Nová zpráva.."
+
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+msgid "Accounts"
+msgstr "Účty"
+
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: ../plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "Umlčet zvuky"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "Konec"
+
+#: ../plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr "Blikat ikonou v oznamovací oblasti pro nepřečtené..."
+
+#: ../plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr "_Instant Message:"
+
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+msgid "Never"
+msgstr "Nikdy"
+
+#: ../plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "Ve skrytých konverzacích"
+
+#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+msgid "Always"
+msgstr "Vždy"
+
+#: ../plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "Zprávy _chatu:"
+
+#: ../plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "Když je vyslovena má přezdívka"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "Ikona v panelu"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Zobrazuje ikonu Gaim v oznamovací oblasti."
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: ../plugins/docklet/docklet.c:725
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"Zobrazuje ikonu v oznamovací oblasti (např. v GNOME, KDE nebo Windows) pro "
-"zobrazení aktuálního stavu Gaim, umožnění rychlého přístupu k často "
-"používaným funkcím a přepnutí zobrazování seznamu kamarádů nebo "
-"přihlašovacího okna. Také dovoluje ukládat zprávy do fronty, dokud není "
-"kliknuto na ikonu, podobně jako ICQ."
-
-#: plugins/extplacement.c:79
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
+msgstr "Zobrazuje ikonu v oznamovací oblasti (např. v GNOME, KDE nebo Windows) pro zobrazení aktuálního stavu Gaim, umožnění rychlého přístupu k často používaným funkcím a přepnutí zobrazování seznamu kamarádů. Také poskytuje možnosti blikat při nepřečtených zprávách."
+
+#: ../plugins/docklet/eggtrayicon.c:123
+msgid "Orientation"
+msgstr "Orientace"
+
+#: ../plugins/docklet/eggtrayicon.c:124
+msgid "The orientation of the tray."
+msgstr "Orientace oznamovací oblasti."
+
+#: ../plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Podle počtu konverzací"
 
-#: plugins/extplacement.c:100
+#: ../plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Umísťování konverzací"
 
-#: plugins/extplacement.c:105
+#: ../plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "Počet konverzací v okně"
 
-#: plugins/extplacement.c:111
+#: ../plugins/extplacement.c:112
 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"
 
@@ -237,19 +363,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
 msgstr "DalUmístění"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
 msgstr "Další možnosti umísťování konverzací"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: ../plugins/extplacement.c:139
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -261,7 +387,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Ovládání Gaim souborem"
 
@@ -269,7 +395,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Umožňuje vám ovládat Gaim zadáváním příkazů v souboru."
 
@@ -279,19 +405,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Ukázkový zásuvný modul Gaim"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Ukázkový zásuvný modul, který něco dělá - viz popis."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -303,102 +429,128 @@
 "- Obrací všechen příchozí text\n"
 "- Odešle zprávu lidem ve vašem seznamu okamžitě, když se přihlásí"
 
-#: plugins/gaimrc.c:40
+#: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
+msgstr "Barva kurzoru"
+
+#: ../plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-#, fuzzy
+msgstr "Sekundární barva kurzoru"
+
+#: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "Barva odkazu"
 
-#: plugins/gaimrc.c:53
-#, fuzzy
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
-msgstr "Velikost rozbalovače"
-
-#: plugins/gaimrc.c:72
-#, fuzzy
+msgstr "Velikost rozbalovače GtkTreeView"
+
+#: ../plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Vodorovné oddělení GtkTreeView"
+
+#: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
-msgstr "Konverzace"
-
-#: plugins/gaimrc.c:73
-#, fuzzy
+msgstr "Pole konverzace"
+
+#: ../plugins/gaimrc.c:77
 msgid "Conversation History"
-msgstr "Konverzace"
-
-#: plugins/gaimrc.c:74
-#, fuzzy
+msgstr "Historie konverzace"
+
+#: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
-msgstr "Přihlašovací server"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
+msgstr "Prohlížeč záznamů"
+
+#: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
-msgstr "Požadavek nejednoznačný"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
+msgstr "Dialog požadavku"
+
+#: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
-msgstr "Upozorňovat na"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
+msgstr "Dialog upozornění"
+
+#: ../plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "Odsadit rozbalovače GtkTreeView"
+
+#: ../plugins/gaimrc.c:287
+#, c-format
 msgid "Select Color for %s"
-msgstr "Vyberte barvu textu"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
+msgstr "Vyberte barvu pro %s"
+
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
-msgstr "Vyberte barvu textu"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
+msgstr "Vyberte barvu"
+
+#: ../plugins/gaimrc.c:324
+#, c-format
 msgid "Select Font for %s"
-msgstr "Vyberte písmo"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
+msgstr "Vyberte písmo pro %s"
+
+#: ../plugins/gaimrc.c:362
 msgid "Select Interface Font"
-msgstr "Vyberte písmo"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
+msgstr "Vyberte písmo rozhraní"
+
+#: ../plugins/gaimrc.c:415
+msgid "General"
+msgstr "Obecné"
+
+#: ../plugins/gaimrc.c:420
 msgid "GTK+ Interface Font"
-msgstr "Možnosti rozhraní"
-
-#: plugins/gaimrc.c:362
+msgstr "Písmo rozhraní GTK+"
+
+#: ../plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-#, fuzzy
+msgstr "Téma GTK+ textu odkazu"
+
+#: ../plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "Barvy rozhraní"
+
+#: ../plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "Velikosti widgetů"
+
+#: ../plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "Písma"
+
+#: ../plugins/gaimrc.c:543
+msgid "Tools"
+msgstr "Nástroje"
+
+#: ../plugins/gaimrc.c:548
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Zapsat nastavení do %s%sgtkrc-2.0"
+
+#: ../plugins/gaimrc.c:556
+msgid "Re-read gtkrc files"
+msgstr "Znovu načíst soubory gtkrc"
+
+#: ../plugins/gaimrc.c:583
 msgid "Gaim GTK+ Theme Control"
-msgstr "Ovládání Gaim souborem"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr "Ovládání téma GTK+ Gaimu"
+
+#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "Poskytuje přístup k často používaným nastavením gtkrc."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: ../plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Nastavení gest myši"
 
-#: plugins/gestures/gestures.c:250
+#: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Prostřední tlačítko myši"
 
-#: plugins/gestures/gestures.c:255
+#: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Pravé tlačítko myši"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: ../plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Vizuální zobrazování gest"
 
@@ -408,19 +560,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: ../plugins/gestures/gestures.c:289
 msgid "Mouse Gestures"
 msgstr "Gesta myši"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:292
 msgid "Provides support for mouse gestures"
 msgstr "Poskytuje podporu pro gesta myši"
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: ../plugins/gestures/gestures.c:294
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -436,47 +588,50 @@
 "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:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#. Extract their Name and put it in
+#: ../plugins/gevolution/add_buddy_dialog.c:131
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
+#: ../src/protocols/msn/msn.c:1525
 msgid "Name"
 msgstr "Název"
 
-#: plugins/gevolution/add_buddy_dialog.c:142
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:454
 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:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
+#: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "Hledat"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: ../plugins/gevolution/add_buddy_dialog.c:548
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
+#: ../src/gtkblist.c:4934
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "Nová osoba"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:591
 msgid "Select Buddy"
 msgstr "Vybrat kamaráda"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+#: ../plugins/gevolution/assoc-buddy.c:340
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -485,55 +640,59 @@
 "vytvořte novou osobu."
 
 #. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
+#: ../plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
-msgstr "Skrýt detaily o uživateli"
+msgstr "_Podrobnosti o uživateli"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
+#: ../plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "_Přiřadit kamaráda"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1121
+msgid "None"
+msgstr "Žádné"
+
+#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
+#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
+#: ../src/gtkblist.c:4379 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Kamarádi"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "Nemohu odeslat zprávu."
-
-#: plugins/gevolution/gevolution.c:263
+msgstr "Nemohu odeslat e-mail"
+
+#: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
+msgstr "Program evolution nebyl nalezen v PATH."
+
+#: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+msgstr "Určený kamarád nebyl nalezen v kontaktech Evolution."
+
+#: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Přidat do adresáře"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
-msgstr "Email"
+msgstr "Odeslat e-mail"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Nastavení integrace s Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Vyberte všechny účty, ke kterým se mají automaticky přidat kamarádi."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
+#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "Účet"
 
@@ -543,7 +702,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integrace s Evolution"
 
@@ -551,87 +710,111 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
-msgstr "Poskytuje integraci s Ximian Evolution."
-
-#: plugins/gevolution/new_person_dialog.c:266
+msgstr "Poskytuje integraci s Evolution."
+
+#: ../plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Zadejte prosím níže informace o osobě."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Zadejte prosím níže jméno uživatele kamaráda a typ účtu."
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Typ účtu:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
+#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+msgid "Screen name:"
 msgstr "Jméno uživatele:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Nepovinné informace:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
 msgid "Buddy Icon"
 msgstr "Ikona kamaráda"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "Křestní jméno:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Příjmení:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:146
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:147
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:186
-msgid "History"
-msgstr "Historie"
-
-#: plugins/history.c:188
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Zobrazuje nedávno zaznamenané konverzace v nových konverzacích."
-
-#: plugins/history.c:189
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: ../plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Test signálů GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "Test pro zjištění, jestli všechny signály ui fungují správně."
+
+#: ../plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>Konverzace s %s v %s:</b><br>"
+
+#: ../plugins/history.c:147
+msgid "History Plugin Requires Logging"
+msgstr "Zásuvný modul historie vyžaduje zaznamenávání"
+
+#: ../plugins/history.c:148
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Zaznamenávání lze povolit z Nástroje -> Nastavení -> Zaznamenávání.\n"
+"\n"
+"Povolení záznamů pro instant message a chaty aktivuje historii pro tytéž typy konverzací."
+
+#: ../plugins/history.c:188
+msgid "History"
+msgstr "Historie"
+
+#: ../plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Zobrazuje nedávno zaznamenané konverzace v nových konverzacích."
+
+#: ../plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Když je otevřena nová konverzace, tento zásuvný modul vloží poslední "
+"konverzaci do aktuální konverzace."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Ikonifikovat při nepřítomnosti"
 
@@ -639,46 +822,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ikonifikuje seznam kamarádů a vaše konverzace, když jdete pryč."
 
-#: plugins/idle.c:115
+#: ../plugins/idle.c:152 ../plugins/idle.c:210
 msgid "Minutes"
 msgstr "minut"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
+#: ../plugins/idle.c:306
 msgid "I'dle Mak'er"
 msgstr "Tvůrce nečinnosti"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: ../plugins/idle.c:160 ../plugins/idle.c:249
 msgid "Set Account Idle Time"
 msgstr "Nastavit čas nečinnosti účtu"
 
-#: plugins/idle.c:126
+#: ../plugins/idle.c:163 ../plugins/idle.c:221
 msgid "_Set"
 msgstr "_Nastavit"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: ../plugins/idle.c:177
+msgid "None of your accounts are idle."
+msgstr "Žádný váš účet není nečinný."
+
+#: ../plugins/idle.c:193 ../plugins/idle.c:253
 msgid "Unset Account Idle Time"
-msgstr "Nastavit čas nečinnosti účtu"
-
-#: plugins/idle.c:153
-#, fuzzy
+msgstr "Zrušit čas nečinnosti účtu"
+
+#: ../plugins/idle.c:196
 msgid "_Unset"
-msgstr "_Použít"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr "_Zrušit"
+
+#: ../plugins/idle.c:218 ../plugins/idle.c:257
+msgid "Set Idle Time for All Accounts"
+msgstr "Nastavit čas nečinnosti pro všechny účty"
+
+#: ../plugins/idle.c:262
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Zrušit čas nečinnosti pro všechny nečinné účty"
+
+#: ../plugins/idle.c:308 ../plugins/idle.c:309
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Umožňuje vám ručně nastavit, jak dlouho jste byli nečinní"
 
@@ -688,25 +877,122 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Testovací klient IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Test podpory IPC zásuvných modulů jako klient."
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr ""
-"Test podpory IPC zásuvných modulů jako klient. Nalezne plugin serveru a "
-"zavolá zaregistrované příkazy."
+msgstr "Test podpory IPC zásuvných modulů jako klient. Nalezne zásuvnhý modul serveru a zavolá zaregistrované příkazy."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "Server testu IPC"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Test podpory IPC zásuvných modulů jako server."
+
+#. *  description
+#: ../plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"Test podpory IPC zásuvných modulů jako server. Zaregistruje příkazy IPC."
+
+#: ../plugins/log_reader.c:1407
+msgid "User is offline."
+msgstr "Uživatel je odpojen."
+
+#: ../plugins/log_reader.c:1413
+msgid "Auto-response sent:"
+msgstr "Automatická odpověď odeslána:"
+
+#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
+#: ../plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s se odhlásil."
+
+#: ../plugins/log_reader.c:1440
+msgid "One or more messages may have been undeliverable."
+msgstr "Jedna nebo více zpráv možná nebyla doručitelná."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "Byli jste odpojeni od serveru."
+
+#: ../plugins/log_reader.c:1458
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr "Momentálně jste odpojeni. Zprávy nebudou přijímány, pokud nejste přihlášeni."
+
+#: ../plugins/log_reader.c:1473
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Zprávu nelze odeslat, protože byla překročena maximální délka."
+
+#: ../plugins/log_reader.c:1478
+msgid "Message could not be sent."
+msgstr "Zprávu nelze odeslat."
+
+#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
+msgid "Adium"
+msgstr "Adium"
+
+#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
+msgid "Fire"
+msgstr "Fire"
+
+#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../plugins/log_reader.c:1912
+msgid "General Log Reading Configuration"
+msgstr "Obecné nastavení čtení záznamů"
+
+#: ../plugins/log_reader.c:1916
+msgid "Fast size calculations"
+msgstr "Rychlé výpočty velikosti"
+
+#: ../plugins/log_reader.c:1920
+msgid "Use name heuristics"
+msgstr "Používat heuristiku pro jména"
+
+#. Add Log Directory preferences.
+#: ../plugins/log_reader.c:1926
+msgid "Log Directory"
+msgstr "Adresář záznamů"
 
 #. *< type
 #. *< ui_requirement
@@ -714,106 +1000,175 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "Server testu IPC"
+#: ../plugins/log_reader.c:1969
+msgid "Log Reader"
+msgstr "Čtečka záznamů"
 
 #. *< name
 #. *< version
-#. *  summary
-#: plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Test podpory IPC zásuvných modulů jako server."
-
-#. *  description
-#: plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Test podpory IPC zásuvných modulů jako server. Zaregistruje příkazy IPC."
-
-#: plugins/mailchk.c:160
+#. * summary
+#: ../plugins/log_reader.c:1973
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Zahrnuje záznamy jiných klientů IM v prohlížeči záznamů."
+
+#. * description
+#: ../plugins/log_reader.c:1977
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr "Tento zásuvný modul při prohlížení záznamů přidá záznamy z jiných klientů IM. Momentálně se to týká Adium, Fire, Messenger Plus!, MSN Messenger a Trillian."
+
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Kontrola pošty"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Kontroluje novou místní poštu."
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Přidá do seznamu kamarádů malý obdélník, který zobtrazuje, jestli máte novou "
-"poštu."
+msgstr "Přidá do seznamu kamarádů malý obdélník, který zobrazuje, jestli máte novou poštu."
+
+#: ../plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Načítač zásuvných modulů Mono"
+
+#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Načítá zásuvné moduly .NET pomocí Mono."
+
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr "Bylo vyžádáno sezení music messaging. Přijměte prosím kliknutím na ikonu MM."
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Sezení music messaging potvrzeno."
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "Music Messaging"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "Při spouštění příkazu došlo ke konfliktu:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "Chyba při spouštění editoru"
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "Došlo k následující chybě:"
+
+#. Configuration frame
+#: ../plugins/musicmessaging/musicmessaging.c:623
+msgid "Music Messaging Configuration"
+msgstr "Nastavení Music Messaging"
+
+#: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "Cesta editoru skóre"
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
+msgid "_Apply"
+msgstr "_Použít"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Zásuvný modul music messaging pro spolupráci při skládání."
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr "Zásuvný modul music messaging umožňuje několika uživatelům zároveň pracovat na hudebním díle upravováním společné partitury v reálném čase."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "Upozorňovat na"
 
-#: plugins/notify.c:642
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "Okna _IM"
 
-#: plugins/notify.c:649
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "Okna _chatu"
 
-#: plugins/notify.c:656
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your nick"
+msgstr "\t_Jen když někdo řekne vaši přezdívku"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "_Aktivní okna"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "Metody upozornění"
 
-#: plugins/notify.c:671
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
 msgstr "Připojit _řetězec před nadpis okna:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "Vložit _počet zpráv do nadpisu okna"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Nastavit hint manažera oken \"_URGENT\""
 
 #. Raise window method button
-#: plugins/notify.c:706
-#, fuzzy
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
-msgstr "Okna IM konverzace"
+msgstr "Z_výšit okno konverzace"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "Odstranění upozornění"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "Odstranit, když se okno konverzace stane _aktivní"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "Odstranit, když okno konverzace _přijme kliknutí"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "Odstranit při _psaní do okna konverzace"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "Odstranit, když je _odeslána zpráva"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "Odstranit při přepnutí na zá_ložku konverzace"
 
@@ -823,7 +1178,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "Upozornění na zprávu"
 
@@ -831,7 +1186,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Poskytuje několik způsobů, jak vás upozornit na nepřečtené zprávy."
 
@@ -841,26 +1196,56 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:587
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Načítač zásuvných modulů Perlu"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "Poskytuje podporu pro načítání zásuvných modulů v perlu."
 
-#: plugins/raw.c:151
+#: ../plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr "Telepatický režim"
+
+#: ../plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr "Telepatický režim pro příchozí konverzace"
+
+#: ../plugins/psychic.c:24
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr "Způsobí, že okna konverzací se objeví, když vám jiní uživatelé začnou psát zprávu.  Funguje s AIM, ICQ, Jabber, Sametime a Yahoo!"
+
+#: ../plugins/psychic.c:60
+msgid "You feel a disturbance in the force..."
+msgstr "Cítíte narušení síly..."
+
+#: ../plugins/psychic.c:79
+msgid "Only enable for users on the buddy list"
+msgstr "Povolit jen uživatelům na seznamu kamarádů"
+
+#: ../plugins/psychic.c:84
+msgid "Disable when away"
+msgstr "Zakázat při nepřítomnosti"
+
+#: ../plugins/psychic.c:88
+msgid "Display notification message in conversations"
+msgstr "Zobrazovat upozorňující zprávu v konverzacích"
+
+#: ../plugins/raw.c:175
 msgid "Raw"
 msgstr "Přímý"
 
-#: plugins/raw.c:153
+#: ../plugins/raw.c:177
 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:154
+#: ../plugins/raw.c:178
 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."
@@ -869,12 +1254,12 @@
 "IRC, TOC). Pro odeslání stiskněte 'Enter' ve vstupním poli. Sledujte ladicí "
 "okno."
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "Používáte Gaim verze %s. Aktuální verze je %s.<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -883,7 +1268,7 @@
 "<b>Seznam změn:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -892,7 +1277,7 @@
 "Verzi %s můžete získat z<br><a href=\"http://gaim.sourceforge.net/\">http://"
 "gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78 plugins/relnot.c:79
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Je k dispozici nová verze"
 
@@ -902,19 +1287,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Upozornění na verzi"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "Pravidelně hledá nové verze."
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -926,7 +1311,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: ../plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Test signálů"
 
@@ -934,7 +1319,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Test pro zjištění, jestli všechny signály fungují správně."
 
@@ -944,7 +1329,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "Jednoduchý zásuvný modul"
 
@@ -952,55 +1337,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: ../plugins/simple.c:37 ../plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Test pro zjištění, zda většina věcí funguje."
 
-#: plugins/spellchk.c:1788
+#: ../plugins/spellchk.c:1917
 msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1789
+msgstr "Duplikátní oprava"
+
+#: ../plugins/spellchk.c:1918
 msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1948
+msgstr "Zadané slovo již v seznamu oprav existuje."
+
+#: ../plugins/spellchk.c:2127
 msgid "Text Replacements"
 msgstr "Náhrady textu"
 
-#: plugins/spellchk.c:1972
+#: ../plugins/spellchk.c:2150
 msgid "You type"
 msgstr "Píšete"
 
-#: plugins/spellchk.c:1984
+#: ../plugins/spellchk.c:2164
 msgid "You send"
 msgstr "Odesíláte"
 
-#: plugins/spellchk.c:1996
+#: ../plugins/spellchk.c:2178
 msgid "Whole words only"
-msgstr ""
-
-#: plugins/spellchk.c:2022
+msgstr "Jen celá slova"
+
+#: ../plugins/spellchk.c:2190
+msgid "Case sensitive"
+msgstr "Rozlišovat velikost písmen"
+
+#: ../plugins/spellchk.c:2216
 msgid "Add a new text replacement"
 msgstr "Přidat novou náhradu textu"
 
-#: plugins/spellchk.c:2032
+#: ../plugins/spellchk.c:2232
 msgid "You _type:"
 msgstr "_Píšete:"
 
-#: plugins/spellchk.c:2048
+#: ../plugins/spellchk.c:2249
 msgid "You _send:"
 msgstr "_Odesíláte:"
 
-#: plugins/spellchk.c:2060
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../plugins/spellchk.c:2261
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "_Zachovat velikost písmen (zrušte volbu pro automatické zpracovávání velikosti písmen)"
+
+#: ../plugins/spellchk.c:2263
 msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2097
+msgstr "Nahrazovat jen _celá slova"
+
+#: ../plugins/spellchk.c:2288
+msgid "General Text Replacement Options"
+msgstr "Obecné možnosti náhrady textu"
+
+#: ../plugins/spellchk.c:2289
+msgid "Enable replacement of last word on send"
+msgstr "Povolit náhradu posledního slova při odesílání"
+
+#: ../plugins/spellchk.c:2314
 msgid "Text replacement"
 msgstr "Náhrada textu"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Nahrazuje text v odchozích zprávách podle uživatelem definovaných pravidel."
@@ -1011,7 +1413,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1019,9 +1421,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
-msgstr "Poskutuje podporu SSL pomocí GNUTLS."
+msgstr "Poskytuje podporu SSL pomocí GNUTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -1029,7 +1431,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412
 msgid "NSS"
 msgstr "NSS"
 
@@ -1037,7 +1439,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Poskytuje podporu SSL pomocí Mozilla NSS."
 
@@ -1047,7 +1449,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1055,49 +1457,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Poskytuje rozhraní pro knihovny podporySSL."
-
-#: plugins/statenotify.c:42
+msgstr "Poskytuje rozhraní pro knihovny podpory SSL."
+
+#: ../plugins/statenotify.c:49
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s už není pryč."
+
+#: ../plugins/statenotify.c:51
 #, c-format
 msgid "%s has gone away."
 msgstr "%s šel pryč."
 
-#: plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s už není pryč."
-
-#: plugins/statenotify.c:56
+#: ../plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
 msgstr "%s se stal nečinným."
 
-#: plugins/statenotify.c:63
+#: ../plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s už není nečinnný."
-
-#: plugins/statenotify.c:74
+msgstr "%s už není nečinný."
+
+#: ../plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s se přihlásil."
+
+#: ../plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "Upozorňovat, když"
 
-#: plugins/statenotify.c:77
+#: ../plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "Kamarád jde _pryč"
 
-#: plugins/statenotify.c:80
+#: ../plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
 msgstr "Kamarád se stane _nečinným"
 
+#: ../plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "Kamarád se při_hlásí/odhlásí"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:141
 msgid "Buddy State Notification"
 msgstr "Upozornění na stav kamaráda"
 
@@ -1105,7 +1516,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1113,11 +1524,11 @@
 "Upozorňuje v okně konverzace, když kamarád je nebo přestane být pryč nebo "
 "nečinný."
 
-#: plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:369
 msgid "Tcl Plugin Loader"
 msgstr "Načítač zásuvných modulů Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
 msgstr "Poskytuje podporu pro načítání zásuvných modulů v Tcl"
 
@@ -1127,7 +1538,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "Ticker kamarádů"
 
@@ -1135,19 +1546,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodorovně se posunující verze seznamu kamarádů."
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "Časová značka iChat"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "Zpoždění"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "minut."
 
@@ -1157,7 +1568,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: ../plugins/timestamp.c:254
 msgid "Timestamp"
 msgstr "Časová značka"
 
@@ -1165,53 +1576,102 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Každých N minut přidává ke konverzacím časové značky ve styly iChat."
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Možnosti formátu časové značky"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Vnutit 24-hodinový formát času (tradiční pro Gaim)"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Zobrazovat data v..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "_Konverzace:"
+
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Pro zpožděné zprávy"
+
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Pro zpožděné zprávy a v chatech"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "_Záznamy zpráv:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Formáty časových značek zpráv"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Upravit formáty časových značek zpráv."
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr "Tento zásuvný modul umožňuje uživateli upravit formáty časových značek zpráv v konverzacích a záznamech."
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
 msgstr "Krytí:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
+#: ../plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
 msgstr "Okna IM konverzace"
 
-#: plugins/win32/transparency/win2ktrans.c:534
+#: ../plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
 msgstr "Průhlednost okna _IM"
 
-#: plugins/win32/transparency/win2ktrans.c:548
+#: ../plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
 msgstr "_Zobrazovat posuvný pruh v okně IM"
 
-#: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
+#: ../plugins/win32/transparency/win2ktrans.c:555
 msgid "Remove IM window transparency on focus"
-msgstr "Průhlednost okna _IM"
-
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
+msgstr "Odstranit průhlednost okna IM při aktivaci"
+
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
 msgid "Always on top"
-msgstr "Alias kontaktu"
+msgstr "Vždy nahoře"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
+#: ../plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
 msgstr "Okno seznamu kamarádů"
 
-#: plugins/win32/transparency/win2ktrans.c:591
+#: ../plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
 msgstr "Průhlednost okna _seznamu kamarádů"
 
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
+#: ../plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Průhlednost okna _seznamu kamarádů"
+msgstr "Odstranit průhlednost okna seznamu kamarádů při aktivaci"
 
 #. *< type
 #. *< ui_requirement
@@ -1219,324 +1679,315 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Průhlednost"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:660
 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:662
-#, fuzzy
+#: ../plugins/win32/transparency/win2ktrans.c:662
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Tento zásuvný modul umožňuje proměnlivou alfa průhlednost oken konverzace a "
-"seznamu kamarádů.\n"
+"Tento zásuvný modul umožňuje proměnlivou alfa průhlednost oken konverzace a seznamu kamarádů.\n"
 "\n"
-"* Poznámka: Tento zásuvný modul vyžaduje Win2000 nebo WinXP."
-
-#: plugins/win32/winprefs/winprefs.c:385
+"* Poznámka: Tento zásuvný modul vyžaduje Win2000 nebo vyšší."
+
+#: ../plugins/win32/winprefs/winprefs.c:397
 msgid "GTK+ Runtime Version"
 msgstr "Verze runtime GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: ../plugins/win32/winprefs/winprefs.c:405
 msgid "Startup"
 msgstr "Spuštění"
 
-#: plugins/win32/winprefs/winprefs.c:394
+#: ../plugins/win32/winprefs/winprefs.c:406
 msgid "_Start Gaim on Windows startup"
 msgstr "_Spustit Gaim při spuštění Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
 msgid "Buddy List"
 msgstr "Seznam kamarádů"
 
-#: plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:418
 msgid "_Dockable Buddy List"
 msgstr "_Dokovatelný seznam kamarádů"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:422
 msgid "_Keep Buddy List window on top:"
-msgstr "_Udržovat okno seznamu kamarádů nahoře"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "Nikdy"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "Pryč"
+msgstr "_Udržovat okno seznamu kamarádů nahoře:"
 
 #. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
+#: ../plugins/win32/winprefs/winprefs.c:427
 msgid "Only when docked"
-msgstr ""
+msgstr "Jen při zadokování"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1864
 msgid "Conversations"
 msgstr "Konverzace"
 
-#: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:432
 msgid "_Flash window when messages are received"
 msgstr "_Bliknout oknem, když jsou přijaty zprávy"
 
-#: plugins/win32/winprefs/winprefs.c:443
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "WinGaim Options"
 msgstr "Možnosti WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: ../plugins/win32/winprefs/winprefs.c:458
 msgid "Options specific to Windows Gaim."
 msgstr "Možnosti specifické pro Windows Gaim."
 
-#: plugins/win32/winprefs/winprefs.c:446
+#: ../plugins/win32/winprefs/winprefs.c:459
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-#, fuzzy
+msgstr "Poskytuje možnosti specifické pro Gaim ve Windows, například dokování seznamu kamarádů a blikání konverzací."
+
+#: ../src/account.c:773
 msgid "accounts"
-msgstr "Účty"
-
-#: src/account.c:915
-#, fuzzy
+msgstr "účty"
+
+#: ../src/account.c:923
 msgid "Password is required to sign on."
-msgstr "Heslo vypršelo"
-
-#: src/account.c:940
+msgstr "Pro přihlášení je vyžadováno heslo."
+
+#: ../src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Zadejte heslo pro %s (%s)"
 
-#: src/account.c:947
-#, fuzzy
+#: ../src/account.c:955
 msgid "Enter Password"
-msgstr "Změnit heslo"
-
-#: src/account.c:952
-#, fuzzy
+msgstr "Zadejte heslo"
+
+#: ../src/account.c:960
 msgid "Save password"
-msgstr "Nové heslo"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+msgstr "Uložit heslo"
+
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3507
+#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:789
+#: ../src/gtkrequest.c:275 ../src/protocols/gg/gg.c:454
+#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
+#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
+#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
+#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8122
+#: ../src/protocols/oscar/oscar.c:8245 ../src/protocols/oscar/oscar.c:8270
+#: ../src/protocols/oscar/oscar.c:8322 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
+#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
+#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3062
+#: ../src/protocols/yahoo/yahoo.c:3071
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4975
+#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:790
+#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
+#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
+#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:276 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
+#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
+#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
+#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
+#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
+#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
+#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
+#: ../src/protocols/oscar/oscar.c:8123 ../src/protocols/oscar/oscar.c:8246
+#: ../src/protocols/oscar/oscar.c:8271 ../src/protocols/oscar/oscar.c:8323
+#: ../src/protocols/oscar/oscar.c:8392
+#: ../src/protocols/sametime/sametime.c:3376
+#: ../src/protocols/sametime/sametime.c:3461
+#: ../src/protocols/sametime/sametime.c:3631
+#: ../src/protocols/sametime/sametime.c:5320
+#: ../src/protocols/sametime/sametime.c:5409
+#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3063
+#: ../src/protocols/yahoo/yahoo.c:3072
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/account.c:986 src/connection.c:96
+#: ../src/account.c:994 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Chybí zásuvný modul protokolu pro %s"
 
-#: src/account.c:988 src/connection.c:99
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3499
+#: ../src/gtkblist.c:3505
 msgid "Connection Error"
 msgstr "Chyba spojení"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/protocols/jabber/jabber.c:1271
 msgid "New passwords do not match."
 msgstr "Nová hesla nesouhlasí."
 
-#: src/account.c:1061
+#: ../src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "Úplně vyplňte všechna pole."
 
-#: src/account.c:1085
+#: ../src/account.c:1108
 msgid "Original password"
 msgstr "Původní heslo"
 
-#: src/account.c:1092
+#: ../src/account.c:1115
 msgid "New password"
 msgstr "Nové heslo"
 
-#: src/account.c:1099
+#: ../src/account.c:1122
 msgid "New password (again)"
 msgstr "Nové heslo (znovu)"
 
-#: src/account.c:1105
+#: ../src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "Změnit heslo pro %s"
 
-#: src/account.c:1113
+#: ../src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "Zadejte prosím své aktuální a nové heslo."
 
-#: src/account.c:1146
+#: ../src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "Změnit informace o uživateli %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:282
+#: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Uložit"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: ../src/account.c:1679 ../src/gtkft.c:157
+#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
+#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: src/blist.c:545
-#, fuzzy
+#: ../src/blist.c:543
 msgid "buddy list"
-msgstr "Seznam kamarádů"
-
-#: src/blist.c:1162
+msgstr "seznam kamarádů"
+
+#: ../src/blist.c:1173
 msgid "Chats"
 msgstr "Chaty"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
+#: ../src/blist.c:1894
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
 msgstr[0] ""
-"%d kamarád ze skupiny %s nebyl odstraněno, protože jeho účty nebyly "
-"přihlášeny. Tento kamarád a skupina nebyli odstraněni.\n"
+"%d kamarád ze skupiny %s nebyl odstraněn, protože patří k účtu, který je zakázán nebo odpojen. "
+"Tento kamarád a skupina nebyli odstraněni.\n"
 msgstr[1] ""
-"%d kamarádi ze skupiny %s nebyli odstraněni, protože jejich účty nebyly "
-"přihlášeny. Tito kamarádi a skupina nebyli odstraněni.\n"
+"%d kamarádi ze skupiny %s nebyli odstraněni, protože patří k účtu, který je zakázán nebo odpojen. "
+"Tito kamarádi a skupina nebyli odstraněni.\n"
 msgstr[2] ""
-"%d kamarádů ze skupiny %s nebylo odstraněno, protože jejich účty nebyly "
-"přihlášeny. Tito kamarádi a skupina nebyli odstraněni.\n"
-
-#: src/blist.c:1872
+"%d kamarádů ze skupiny %s nebylo odstraněno, protože patří k účtu, který je zakázán nebo odpojen. "
+"Tito kamarádi a skupina nebyli odstraněni.\n"
+
+#: ../src/blist.c:1904
 msgid "Group not removed"
 msgstr "Skupina neodstraněna"
 
-#: src/connection.c:98
+#: ../src/connection.c:98
 msgid "Registration Error"
 msgstr "Chyba registrace"
 
-#: src/conversation.c:205
-#, fuzzy
+#: ../src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s se přihlásil"
+
+#: ../src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s se odhlásil"
+
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
-msgstr "Nemohu odeslat zprávu. Zpráva je příliš velká."
-
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+msgstr "Nemohu odeslat zprávu: Zpráva je příliš velká."
+
+#: ../src/conversation.c:166 ../src/conversation.c:179
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "Nemohu odeslat zprávu k %s:"
-
-#: src/conversation.c:209
+msgstr "Nemohu odeslat zprávu k %s."
+
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "Zpráva je příliš velká."
 
-#: src/conversation.c:218
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "Nemohu odeslat zprávu."
 
-#: src/conversation.c:1497
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vstoupil do místnosti."
 
-#: src/conversation.c:1499
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] vstoupil do místnosti."
 
-#: src/conversation.c:1598
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "Jste teď znám jako %s"
 
-#: src/conversation.c:1613
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"
 
-#: src/conversation.c:1669
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s opustil místnost (%s)."
-
-#: src/conversation.c:1671
+#: ../src/conversation.c:1720
 #, c-format
 msgid "%s left the room."
 msgstr "%s opustil místnost."
 
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(+%d dalších)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr " opustil místnost (%s)."
-
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: ../src/conversation.c:1723
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s opustil místnost (%s)."
+
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+msgid "No name"
+msgstr "Žádné jméno"
+
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1545,7 +1996,7 @@
 "Chyba při čtení %s: \n"
 "%s.\n"
 
-#: src/ft.c:192
+#: ../src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1554,7 +2005,7 @@
 "Chyba při zápisu %s: \n"
 "%s.\n"
 
-#: src/ft.c:196
+#: ../src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1563,35 +2014,35 @@
 "Chyba při přístupu k %s: \n"
 "%s.\n"
 
-#: src/ft.c:229
+#: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nemohu odeslat soubor s 0 bajty."
 
-#: src/ft.c:239
+#: ../src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "Nemohu odeslat adresář."
 
-#: src/ft.c:248
+#: ../src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s není obyčejný soubor. Zaběle odmítám jej přepsat.\n"
-
-#: src/ft.c:306
+msgstr "%s není obyčejný soubor. Zbaběle odmítám jej přepsat.\n"
+
+#: ../src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vám chce poslat %s (%s)"
 
-#: src/ft.c:313
+#: ../src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vám chce poslat soubor"
 
-#: src/ft.c:354
+#: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Přijmout požadavek na přenos souboru od %s?"
 
-#: src/ft.c:358
+#: ../src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1602,65 +2053,65 @@
 "Vzdálený počítač: %s\n"
 "Vzdálený port: %d"
 
-#: src/ft.c:382
-#, fuzzy, c-format
+#: ../src/ft.c:391
+#, c-format
 msgid "%s is offering to send file %s"
-msgstr "Nabízím %2$s poslat %1$s"
-
-#: src/ft.c:422
+msgstr "%s nabízí poslat soubor %s"
+
+#: ../src/ft.c:442
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s není platný název souboru.\n"
 
-#: src/ft.c:443
+#: ../src/ft.c:463
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Nabízím %2$s poslat %1$s"
 
-#: src/ft.c:454
-#, fuzzy, c-format
+#: ../src/ft.c:474
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Přijmout požadavek na přenos souboru od %s?"
-
-#: src/ft.c:608
+msgstr "Začínám přenos %s od %s"
+
+#: ../src/ft.c:628
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Přenos souboru %s dokončen"
 
-#: src/ft.c:611
+#: ../src/ft.c:631
 msgid "File transfer complete"
 msgstr "Přenos souborů dokončen"
 
-#: src/ft.c:995
+#: ../src/ft.c:1022
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Zrušili jste přenos %s"
 
-#: src/ft.c:1000
+#: ../src/ft.c:1027
 msgid "File transfer cancelled"
 msgstr "Přenos souborů zrušen"
 
-#: src/ft.c:1057
+#: ../src/ft.c:1084
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s zrušil přenos %s"
 
-#: src/ft.c:1062
+#: ../src/ft.c:1089
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s zrušil přenos souborů"
 
-#: src/ft.c:1119
-#, fuzzy, c-format
+#: ../src/ft.c:1146
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "Přenos souboru k %s přerušen.\n"
-
-#: src/ft.c:1121
-#, fuzzy, c-format
+msgstr "Přenos souboru k %s selhal."
+
+#: ../src/ft.c:1148
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "Přenos souboru od %s přerušen.\n"
-
-#: src/gtkaccount.c:362
+msgstr "Přenos souboru od %s selhal."
+
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1672,178 +2123,163 @@
 "<b>Velikost obrázku:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "Možnosti přihlášení"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Jméno uživatele:"
-
-#: src/gtkaccount.c:825
+#: ../src/gtkaccount.c:858
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4553 ../src/gtkblist.c:4919
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:834
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "Zapamatovat si heslo"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "Nastavení uživatele"
 
-#: src/gtkaccount.c:892
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "Upozornění na nové zprávy"
 
-#: src/gtkaccount.c:901
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
 msgstr "Ikona kamaráda:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr "Nastavení %s"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "Použít globální nastavení proxy"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "Žádná proxy"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
 msgid "Use Environmental Settings"
 msgstr "Použít globální prostředí"
 
 # More daring translation?
-#: src/gtkaccount.c:1249
+#: ../src/gtkaccount.c:1297
 msgid "you can see the butterflies mating"
 msgstr "můžete vidět, jak se motýli párují"
 
-#: src/gtkaccount.c:1253
+#: ../src/gtkaccount.c:1301
 msgid "If you look real closely"
 msgstr "Pokud se podíváte opravdu zblízka,"
 
-#: src/gtkaccount.c:1269
+#: ../src/gtkaccount.c:1317
 msgid "Proxy Options"
 msgstr "Možnosti proxy"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
 msgid "Proxy _type:"
 msgstr "_Typ proxy:"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
 msgid "_Host:"
 msgstr "_Počítač:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1308
+#: ../src/gtkaccount.c:1352
 msgid "_Username:"
 msgstr "Jméno _uživatele:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
 msgid "Pa_ssword:"
 msgstr "_Heslo:"
 
-#: src/gtkaccount.c:1700
+#: ../src/gtkaccount.c:1736
 msgid "Add Account"
 msgstr "Přidat účet"
 
-#: src/gtkaccount.c:1702
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3508
 msgid "Modify Account"
 msgstr "Změnit účet"
 
+#: ../src/gtkaccount.c:1760
+msgid "_Basic"
+msgstr "Zá_kladní"
+
+#: ../src/gtkaccount.c:1771
+msgid "_Advanced"
+msgstr "_Pokročilé"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "Registrovat"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Jste si jisti, že chcete odstranit %s?"
-
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+msgstr "Opravdu chcete odstranit %s?"
+
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:279
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:5252
 msgid "Screen Name"
 msgstr "Jméno uživatele"
 
-#: src/gtkaccount.c:2210
-#, fuzzy
-msgid "Enabled"
-msgstr "Selhalo"
-
-#: src/gtkaccount.c:2218
+#: ../src/gtkaccount.c:2259
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/gtkaccount.c:2550
-#, 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:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Chcete je přidat do svého seznamu kamarádů?"
-
-#: src/gtkaccount.c:2572
+#: ../src/gtkaccount.c:2586
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s udělali %s svým kamarádem%s%s"
+
+#: ../src/gtkaccount.c:2635
 msgid "Add buddy to your list?"
 msgstr "Přidat kamaráda do vašeho seznamu?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4974 ../src/gtkconv.c:1594
+#: ../src/gtkrequest.c:280 ../src/protocols/gg/gg.c:811
+#: ../src/protocols/oscar/oscar.c:4877
+#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Přidat"
 
-#: src/gtkblist.c:595
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Připojit se k chatu"
 
-#: src/gtkblist.c:616
+#: ../src/gtkblist.c:694
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1851,221 +2287,213 @@
 "Zadejte prosím odpovídající informace o chatu, ke kterému se chcete "
 "připojit.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Účet:"
 
 # KEEP THIS SHORT FORM, the full one doesn't fit on a button.
-#: src/gtkblist.c:935
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "_Info"
 
-#: src/gtkblist.c:938
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:944
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "_Odeslat soubor"
 
-#: src/gtkblist.c:950
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "Přidat _sledování kamaráda"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Zobrazit záz_nam"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "_Alias kamaráda..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "_Odstranit kamaráda"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "Alias kontaktu..."
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "Odstranit kontakt"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: ../src/gtkblist.c:984
+msgid "Alias..."
+msgstr "Alias..."
+
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1591 ../src/gtkrequest.c:281
+msgid "Remove"
+msgstr "Odstranit"
+
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/gtkblist.c:1028
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "_Přidat kamaráda"
 
-#: src/gtkblist.c:1030
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "Přidat _chat"
 
-#: src/gtkblist.c:1032
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "_Odstranit skupinu"
 
-#: src/gtkblist.c:1034
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Připojit"
 
-#: src/gtkblist.c:1054
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Automatické přihlašování"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Sbalit"
 
-#: src/gtkblist.c:1120
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "_Rozbalit"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-#, fuzzy
+#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3768
+#: ../src/gtkblist.c:3778
 msgid "/Tools/Mute Sounds"
-msgstr "Umlčet zvuky"
-
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+msgstr "/Nástroje/Umlčet zvuky"
+
+#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4194 ../src/gtkpounce.c:426
 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:2329
+#: ../src/gtkblist.c:2463
 msgid "/_Buddies"
 msgstr "/_Kamarádi"
 
-#: src/gtkblist.c:2330
+#: ../src/gtkblist.c:2464
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kamarádi/Nová _Instant Message..."
 
-#: src/gtkblist.c:2331
+#: ../src/gtkblist.c:2465
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kamarádi/Připojit se k _chatu..."
 
-#: src/gtkblist.c:2332
+#: ../src/gtkblist.c:2466
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kamarádi/Získat informace o _uživateli..."
 
-#: src/gtkblist.c:2333
+#: ../src/gtkblist.c:2467
 msgid "/Buddies/View User _Log..."
 msgstr "/Kamarádi/Zobrazit _záznam uživatele..."
 
-#: src/gtkblist.c:2335
+#: ../src/gtkblist.c:2469
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kamarádi/Zobrazovat _odpojené kamarády"
 
-#: src/gtkblist.c:2336
+#: ../src/gtkblist.c:2470
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kamarádi/Zobrazovat _prázdné skupiny"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: ../src/gtkblist.c:2471
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Nástroje/Zobrazovat odpojené kamarády"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "/Nástroje/Zobrazovat odpojené kamarády"
-
-#: src/gtkblist.c:2340
+msgstr "/Kamarádi/Zobrazovat _podrobnosti o kamarádovi"
+
+#: ../src/gtkblist.c:2472
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Kamarádi/Zobrazovat _čas nečinnosti"
+
+#: ../src/gtkblist.c:2473
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Kamarádi/_Řadit kamarády"
+
+#: ../src/gtkblist.c:2475
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kamarádi/_Přidat kamaráda..."
 
-#: src/gtkblist.c:2341
+#: ../src/gtkblist.c:2476
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kamarádi/Přidat _chat..."
 
-#: src/gtkblist.c:2342
+#: ../src/gtkblist.c:2477
 msgid "/Buddies/Add _Group..."
 msgstr "/Kamarádi/Přidat _skupinu..."
 
-#: src/gtkblist.c:2344
+#: ../src/gtkblist.c:2479
 msgid "/Buddies/_Quit"
 msgstr "/Kamarádi/_Konec"
 
+#. Accounts menu
+#: ../src/gtkblist.c:2482
+msgid "/_Accounts"
+msgstr "/_Účty"
+
+#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5553
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Účty/Přidat\\/upravit"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: ../src/gtkblist.c:2486
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
+#: ../src/gtkblist.c:2487
+msgid "/Tools/Buddy _Pounces"
 msgstr "/Nástroje/_Sledování kamarádů"
 
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/Nástroje/Akce _účtu"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/Nástroje/_Účty"
-
-#: src/gtkblist.c:2352
+#: ../src/gtkblist.c:2488
+msgid "/Tools/Plu_gins"
+msgstr "/Nástroje/_Zásuvné moduly"
+
+#: ../src/gtkblist.c:2489
 msgid "/Tools/Pr_eferences"
 msgstr "/Nástroje/_Nastavení"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/Nástroje/Akce zásuvných modulů"
-
-#: src/gtkblist.c:2354
+#: ../src/gtkblist.c:2490
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Soukromí"
 
-#: src/gtkblist.c:2355
+#: ../src/gtkblist.c:2492
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Přenosy souborů"
 
-#: src/gtkblist.c:2356
+#: ../src/gtkblist.c:2493
 msgid "/Tools/R_oom List"
 msgstr "/Nástroje/_Seznam místností"
 
-#: src/gtkblist.c:2358
-#, fuzzy
+#: ../src/gtkblist.c:2494
+msgid "/Tools/System _Log"
+msgstr "/Nástroje/Systémový záz_nam"
+
+#: ../src/gtkblist.c:2496
 msgid "/Tools/Mute _Sounds"
-msgstr "Umlčet zvuky"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/Nástroje/Zobrazit systémový záz_nam"
+msgstr "/Nástroje/Umlčet _zvuky"
 
 #. Help
-#: src/gtkblist.c:2362
+#: ../src/gtkblist.c:2499
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/gtkblist.c:2363
+#: ../src/gtkblist.c:2500
 msgid "/Help/Online _Help"
 msgstr "/Nápověda/_Nápověda online"
 
-#: src/gtkblist.c:2364
+#: ../src/gtkblist.c:2501
 msgid "/Help/_Debug Window"
 msgstr "/Nápověda/_Ladicí okno"
 
-#: src/gtkblist.c:2365
+#: ../src/gtkblist.c:2502
 msgid "/Help/_About"
 msgstr "/Nápověda/O _aplikaci"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -2074,61 +2502,42 @@
 "\n"
 "<b>Účet:</b> %s"
 
-#: src/gtkblist.c:2473
-#, fuzzy, c-format
+#: ../src/gtkblist.c:2615
+#, c-format
 msgid ""
 "\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias kontaktu:</b>"
-
-#: src/gtkblist.c:2481
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias:</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
+"<b>Buddy Alias:</b> %s"
+msgstr "\n<b>Alias kamaráda:</b> %s"
+
+#: ../src/gtkblist.c:2627
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Přezdívka:</b>"
-
-#: src/gtkblist.c:2498
-#, fuzzy, c-format
+msgstr "\n<b>Přezdívka:</b> %s"
+
+#: ../src/gtkblist.c:2636
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Přihlášen:</b> "
-
-#: src/gtkblist.c:2510
-#, fuzzy, c-format
+msgstr "\n<b>Přihlášen:</b> %s"
+
+#: ../src/gtkblist.c:2647
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Nečinný:</b>"
-
-#: src/gtkblist.c:2546
-#, fuzzy, c-format
+msgstr "\n<b>Nečinný:</b> %s"
+
+#: ../src/gtkblist.c:2682
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/gtkblist.c:2554
+msgstr "\n<b>Naposledy spatřen:</b> před %s"
+
+#: ../src/gtkblist.c:2691
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2136,7 +2545,7 @@
 "\n"
 "<b>Stav:</b> Odpojen"
 
-#: src/gtkblist.c:2577
+#: ../src/gtkblist.c:2702
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2144,17 +2553,13 @@
 "\n"
 "<b>Popis:</b> Vystrašený"
 
-#: src/gtkblist.c:2579
-#, fuzzy
+#: ../src/gtkblist.c:2704
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
-msgstr ""
-"\n"
-"<b>Stav</b>: Skvělý"
-
-#: src/gtkblist.c:2581
-#, fuzzy
+msgstr "\n<b>Stav:</b> Skvělý"
+
+#: ../src/gtkblist.c:2706
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2162,111 +2567,125 @@
 "\n"
 "<b>Stav:</b> Žůžo"
 
-#: src/gtkblist.c:2843
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Nečinný (%dh%02dm) "
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "Nečinný (%dm) "
-
-#: src/gtkblist.c:2848
-#, fuzzy
-msgid "Idle "
+#: ../src/gtkblist.c:2995
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Nečinný %dh %02dm"
+
+#: ../src/gtkblist.c:2997
+#, c-format
+msgid "Idle %dm"
+msgstr "Nečinný %dm"
+
+#. Idle stuff
+#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
+#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2730
+#: ../src/protocols/yahoo/yahoo_profile.c:691
+msgid "Idle"
 msgstr "Nečinný"
 
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "Odpojen "
-
-#: src/gtkblist.c:2968
-#, fuzzy
+#: ../src/gtkblist.c:3132
 msgid "/Buddies/New Instant Message..."
-msgstr "/Kamarádi/Nová _Instant Message..."
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+msgstr "/Kamarádi/Nová Instant Message..."
+
+#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kamarádi/Připojit se k chatu..."
 
-#: src/gtkblist.c:2970
-#, fuzzy
+#: ../src/gtkblist.c:3134
 msgid "/Buddies/Get User Info..."
-msgstr "/Kamarádi/Získat informace o _uživateli..."
-
-#: src/gtkblist.c:2971
-#, fuzzy
+msgstr "/Kamarádi/Získat informace o uživateli..."
+
+#: ../src/gtkblist.c:3135
 msgid "/Buddies/Add Buddy..."
-msgstr "/Kamarádi/_Přidat kamaráda..."
-
-#: src/gtkblist.c:2972
-#, fuzzy
+msgstr "/Kamarádi/Přidat kamaráda..."
+
+#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
 msgid "/Buddies/Add Chat..."
-msgstr "/Kamarádi/Přidat _chat..."
-
-#: src/gtkblist.c:2973
-#, fuzzy
+msgstr "/Kamarádi/Přidat chat..."
+
+#: ../src/gtkblist.c:3137
 msgid "/Buddies/Add Group..."
-msgstr "/Kamarádi/Přidat _skupinu..."
-
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/Nástroje/Seznam místností"
-
-#: src/gtkblist.c:3009
+msgstr "/Kamarádi/Přidat skupinu..."
+
+#: ../src/gtkblist.c:3172
+msgid "/Tools/Buddy Pounces"
+msgstr "/Nástroje/Sledování kamarádů"
+
+#: ../src/gtkblist.c:3175
 msgid "/Tools/Privacy"
 msgstr "/Nástroje/Soukromí"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: ../src/gtkblist.c:3178
+msgid "/Tools/Room List"
+msgstr "/Nástroje/Seznam místností"
+
+#: ../src/gtkblist.c:3372
 msgid "Manually"
-msgstr "Ruční"
-
-#: src/gtkblist.c:3087
-#, fuzzy
+msgstr "Ručně"
+
+#: ../src/gtkblist.c:3374
 msgid "Alphabetically"
 msgstr "Podle abecedy"
 
-#: src/gtkblist.c:3088
+#: ../src/gtkblist.c:3375
 msgid "By status"
 msgstr "Podle stavu"
 
-#: src/gtkblist.c:3089
+#: ../src/gtkblist.c:3376
 msgid "By log size"
 msgstr "Podle velikosti záznamu"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/Nástroje/Sledování kamarádů"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/Nástroje/Akce účtu"
+#: ../src/gtkblist.c:3493 ../src/gtkconn.c:196
+#, c-format
+msgid "%s disconnected"
+msgstr "%s odpojen"
+
+#: ../src/gtkblist.c:3509 ../src/protocols/sametime/sametime.c:3630
+msgid "Connect"
+msgstr "Připojit"
+
+#: ../src/gtkblist.c:3509 ../src/gtkblist.c:5652
+msgid "Enable Account"
+msgstr "Povolit účet"
+
+#: ../src/gtkblist.c:3530
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s odpojen: %s</span>"
+
+#: ../src/gtkblist.c:3657
+msgid "/Accounts"
+msgstr "/Účty"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: ../src/gtkblist.c:3762
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/Nástroje/Zobrazovat odpojené kamarády"
-
-#: src/gtkblist.c:3324
+msgstr "/Kamarádi/Zobrazovat odpojené kamarády"
+
+#: ../src/gtkblist.c:3765
 msgid "/Buddies/Show Empty Groups"
-msgstr "/Nástroje/Zobrazovat prázdné skupiny"
-
-#: src/gtkblist.c:3328
-#, fuzzy
+msgstr "/Kamarádi/Zobrazovat prázdné skupiny"
+
+#: ../src/gtkblist.c:3771
 msgid "/Buddies/Show Buddy Details"
-msgstr "/Nástroje/Zobrazovat odpojené kamarády"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/Kamarádi/Zobrazit podrobnosti o kamarádovi"
+
+#: ../src/gtkblist.c:3774
+msgid "/Buddies/Show Idle Times"
+msgstr "/Kamarádi/Zobrazit čas nečinnosti"
+
+#: ../src/gtkblist.c:4486 ../src/protocols/silc/buddy.c:736
+#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2977
 msgid "Add Buddy"
 msgstr "Přidat kamaráda"
 
-#: src/gtkblist.c:4029
+#: ../src/gtkblist.c:4510
 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. "
@@ -2276,27 +2695,31 @@
 "kamarádů. Můžete také zadat alias nebo přezdívku pro kamaráda. Alias bude "
 "zobrazen místo jména uživatele kdykoli je to možné.\n"
 
+#: ../src/gtkblist.c:4532
+msgid "Screen Name:"
+msgstr "Jméno uživatele:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: ../src/gtkblist.c:4580 ../src/gtkblist.c:4899
 msgid "Account:"
 msgstr "Účet:"
 
-#: src/gtkblist.c:4357
+#: ../src/gtkblist.c:4832
 msgid "This protocol does not support chat rooms."
 msgstr "Tento protokol nepodporuje místnosti chatu."
 
-#: src/gtkblist.c:4373
+#: ../src/gtkblist.c:4848
 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:4390
+#: ../src/gtkblist.c:4865
 msgid "Add Chat"
 msgstr "Přidat chat"
 
-#: src/gtkblist.c:4414
+#: ../src/gtkblist.c:4889
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2304,98 +2727,100 @@
 "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:4493
+#: ../src/gtkblist.c:4971 ../src/protocols/sametime/sametime.c:5319
+#: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "Přidat skupinu"
 
-#: src/gtkblist.c:4494
+#: ../src/gtkblist.c:4972
 msgid "Please enter the name of the group to be added."
 msgstr "Zadejte prosím název skupiny, kterou přidat."
 
-#: src/gtkblist.c:5025
+#: ../src/gtkblist.c:5593
+msgid "_Edit Account"
+msgstr "_Upravit účet"
+
+#: ../src/gtkblist.c:5626 ../src/gtkblist.c:5632
 msgid "No actions available"
 msgstr "Žádné akce nejsou k dispozici"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: ../src/gtkblist.c:5640
+msgid "_Disable"
+msgstr "Za_kázat"
+
+#: ../src/gtkblist.c:5705
 msgid "/Tools"
-msgstr "/_Nástroje"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "Odpojen."
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "me používá Gaim v%s."
-
-#: src/gtkconv.c:334
+msgstr "/Nástroje"
+
+#: ../src/gtkblist.c:5800
+msgid "/Buddies/Sort Buddies"
+msgstr "/Kamarádi/Řadit kamarády"
+
+#: ../src/gtkconn.c:197
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and reenable the account."
+msgstr ""
+"%s byl odpojen kvůli chybě: %s\n"
+"Gaim se nepokusí znovu připojit k účtu, dokud chybu neopravíte a účet znovu nepovolíte."
+
+#: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
 msgstr "Podporované ladicí přepínače jsou: version"
 
-#: src/gtkconv.c:371
+#: ../src/gtkconv.c:409
 msgid "No such command (in this context)."
 msgstr "Takový příkaz (v tomto kontextu) neexistuje."
 
-#: src/gtkconv.c:374
+#: ../src/gtkconv.c:412
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"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:446
+"Pro nápovědu o konkrétním příkazu použijte \"/help &lt;příkaz&gt;\".\n"
+"V tomto kontextu jsou k dispozici následující příkazy:\n"
+
+#: ../src/gtkconv.c:484
 msgid "No such command."
 msgstr "Takový příkaz neexistuje"
 
-#: src/gtkconv.c:453
+#: ../src/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Chyba syntaxe: Zadali jste špatný počet parametrů příkazu."
 
-#: src/gtkconv.c:458
+#: ../src/gtkconv.c:496
 msgid "Your command failed for an unknown reason."
 msgstr "Váš příkaz selhal z neznámého důvodu."
 
-#: src/gtkconv.c:465
-#, fuzzy
+#: ../src/gtkconv.c:503
 msgid "That command only works in chats, not IMs."
 msgstr "Tento příkaz funguje jen v chatech, ne v IM."
 
-#: src/gtkconv.c:468
-#, fuzzy
+#: ../src/gtkconv.c:506
 msgid "That command only works in IMs, not chats."
 msgstr "Tento příkaz funguje jen v IM, ne v chatech."
 
-#: src/gtkconv.c:472
+#: ../src/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "Tento příkaz nefunguje s tímto protokolem."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
+#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Tento kamarád není na stejném protokolu jako tento chat"
-
-#: src/gtkconv.c:719
+msgstr "Tento kamarád není na stejném protokolu jako tento chat."
+
+#: ../src/gtkconv.c:764
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Nejste momentálně připojen s účtem, který může pozvat tohoto kamaráda."
 
-#: src/gtkconv.c:772
+#: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "Pozvat kamaráda do místnosti chatu"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: ../src/gtkconv.c:847
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2403,293 +2828,291 @@
 "Zadejte prosím jméno uživatele, kterého chcete pozvat, a nepovinně i zvací "
 "zprávu."
 
-#: src/gtkconv.c:823
+#: ../src/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "_Kamarád:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
+#: ../src/gtksavedstatuses.c:1444
 msgid "_Message:"
 msgstr "Z_práva:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2377 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Nemohu otevřít soubor."
 
-#: src/gtkconv.c:906
+#: ../src/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Konverzace s %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: ../src/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "Uložit konverzaci"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Hledat"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Hledat:"
 
-#: src/gtkconv.c:1227
+#: ../src/gtkconv.c:1290
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: src/gtkconv.c:1235
+msgstr "Zaznamenávání spuštěno. Budoucí zprávy v této konverzaci budou zaznamenány."
+
+#: ../src/gtkconv.c:1298
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: src/gtkconv.c:1489
+msgstr "Zaznamenávání zastaveno. Budoucí zprávy v této konverzaci nebudou zaznamenány."
+
+#: ../src/gtkconv.c:1556
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1562 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "Odeslat soubor"
 
-#: src/gtkconv.c:1502
+#: ../src/gtkconv.c:1569
 msgid "Un-Ignore"
 msgstr "Přestat ignorovat"
 
-#: src/gtkconv.c:1505
+#: ../src/gtkconv.c:1572
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: src/gtkconv.c:1511
+#: ../src/gtkconv.c:1578
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1517
-#, fuzzy
+#: ../src/gtkconv.c:1584
 msgid "Get Away Message"
-msgstr "Nová zpráva o nepřítomnosti"
-
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "Odstranit"
-
-#: src/gtkconv.c:2236
+msgstr "Získat zprávu o nepřítomnosti"
+
+#: ../src/gtkconv.c:1599
+msgid "Last said"
+msgstr "Naposledy řečeno"
+
+#: ../src/gtkconv.c:2385
 msgid "Unable to save icon file to disk."
 msgstr "Nemohu uložit soubor ikony na disk."
 
-#: src/gtkconv.c:2259
+#: ../src/gtkconv.c:2409
 msgid "Save Icon"
 msgstr "Uložit ikonu"
 
-#: src/gtkconv.c:2308
+#: ../src/gtkconv.c:2458
 msgid "Animate"
 msgstr "Animovat"
 
-#: src/gtkconv.c:2313
+#: ../src/gtkconv.c:2463
 msgid "Hide Icon"
 msgstr "Skrýt ikonu"
 
-#: src/gtkconv.c:2319
+#: ../src/gtkconv.c:2469
 msgid "Save Icon As..."
 msgstr "Uložit ikonu jako..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: ../src/gtkconv.c:2610
 msgid "/_Conversation"
 msgstr "/_Konverzace"
 
-#: src/gtkconv.c:2369
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konverzace/Nová _Instant Message..."
 
-#: src/gtkconv.c:2374
+#: ../src/gtkconv.c:2617
 msgid "/Conversation/_Find..."
 msgstr "/Konverzace/_Hledat..."
 
-#: src/gtkconv.c:2376
+#: ../src/gtkconv.c:2619
 msgid "/Conversation/View _Log"
 msgstr "/Konverzace/Zobrazit záz_nam"
 
-#: src/gtkconv.c:2377
+#: ../src/gtkconv.c:2620
 msgid "/Conversation/_Save As..."
 msgstr "/Konverzace/_Uložit jako..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/Konverzace/Vymazat"
-
-#: src/gtkconv.c:2383
+#: ../src/gtkconv.c:2622
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Konverzace/Vy_mazat paměť řádků"
+
+#: ../src/gtkconv.c:2626
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konverzace/Odeslat _soubor..."
 
-#: src/gtkconv.c:2384
+#: ../src/gtkconv.c:2627
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konverzace/Přidat _sledování kamaráda..."
 
-#: src/gtkconv.c:2386
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/_Get Info"
 msgstr "/Konverzace/_Získat informace"
 
-#: src/gtkconv.c:2388
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/In_vite..."
 msgstr "/Konverzace/_Pozvat..."
 
-#: src/gtkconv.c:2393
-#, fuzzy
+#: ../src/gtkconv.c:2636
 msgid "/Conversation/Al_ias..."
-msgstr "/Konverzace/Alias..."
-
-#: src/gtkconv.c:2395
+msgstr "/Konverzace/_Alias..."
+
+#: ../src/gtkconv.c:2638
 msgid "/Conversation/_Block..."
 msgstr "/Konverzace/_Blokovat..."
 
-#: src/gtkconv.c:2397
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/_Add..."
 msgstr "/Konverzace/_Přidat..."
 
-#: src/gtkconv.c:2399
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/_Remove..."
 msgstr "/Konverzace/_Odstranit..."
 
-#: src/gtkconv.c:2404
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Konverzace/Vložit _odkaz..."
 
-#: src/gtkconv.c:2406
+#: ../src/gtkconv.c:2649
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Konverzace/Vložit _obrázek..."
 
-#: src/gtkconv.c:2411
+#: ../src/gtkconv.c:2654
 msgid "/Conversation/_Close"
 msgstr "/Konverzace/_Zavřít"
 
 #. Options
-#: src/gtkconv.c:2415
+#: ../src/gtkconv.c:2658
 msgid "/_Options"
 msgstr "/_Možnosti"
 
-#: src/gtkconv.c:2416
+#: ../src/gtkconv.c:2659
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Povolit zaz_namenávání"
 
-#: src/gtkconv.c:2417
+#: ../src/gtkconv.c:2660
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Povolit _zvuky"
 
-#: src/gtkconv.c:2418
-#, fuzzy
+#: ../src/gtkconv.c:2661
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Možnosti/Zobrazovat _ikonu kamaráda"
+
+#: ../src/gtkconv.c:2663
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Možnosti/Zobrazovat lištu nástrojů _Formátování"
-
-#: src/gtkconv.c:2419
-#, fuzzy
+msgstr "/Možnosti/Zobrazovat lišty nástrojů _Formátování"
+
+#: ../src/gtkconv.c:2664
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Možnosti/Zobrazovat časové značky"
-
-#: src/gtkconv.c:2420
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "Zobrazovat _ikony kamarádů"
-
-#: src/gtkconv.c:2460
+msgstr "/Možnosti/Zobrazovat _časové značky"
+
+#: ../src/gtkconv.c:2756
 msgid "/Conversation/View Log"
 msgstr "/Konverzace/Zobrazit záznam"
 
-#: src/gtkconv.c:2466
+#: ../src/gtkconv.c:2762
 msgid "/Conversation/Send File..."
 msgstr "/Konverzace/Odeslat soubor..."
 
-#: src/gtkconv.c:2470
+#: ../src/gtkconv.c:2766
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konverzace/Přidat sledování kamaráda..."
 
-#: src/gtkconv.c:2476
+#: ../src/gtkconv.c:2772
 msgid "/Conversation/Get Info"
 msgstr "/Konverzace/Získat informace"
 
-#: src/gtkconv.c:2480
+#: ../src/gtkconv.c:2776
 msgid "/Conversation/Invite..."
 msgstr "/Konverzace/Pozvat..."
 
-#: src/gtkconv.c:2486
+#: ../src/gtkconv.c:2782
 msgid "/Conversation/Alias..."
 msgstr "/Konverzace/Alias..."
 
-#: src/gtkconv.c:2490
+#: ../src/gtkconv.c:2786
 msgid "/Conversation/Block..."
 msgstr "/Konverzace/Blokovat..."
 
-#: src/gtkconv.c:2494
+#: ../src/gtkconv.c:2790
 msgid "/Conversation/Add..."
 msgstr "/Konverzace/Přidat..."
 
-#: src/gtkconv.c:2498
+#: ../src/gtkconv.c:2794
 msgid "/Conversation/Remove..."
 msgstr "/Konverzace/Odstranit..."
 
-#: src/gtkconv.c:2504
+#: ../src/gtkconv.c:2800
 msgid "/Conversation/Insert Link..."
 msgstr "/Konverzace/Vložit odkaz..."
 
-#: src/gtkconv.c:2508
+#: ../src/gtkconv.c:2804
 msgid "/Conversation/Insert Image..."
 msgstr "/Konverzace/Vložit obrázek..."
 
-#: src/gtkconv.c:2514
+#: ../src/gtkconv.c:2810
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Povolit zaznamenávání"
 
-#: src/gtkconv.c:2517
+#: ../src/gtkconv.c:2813
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Povolit zvuky"
 
-#: src/gtkconv.c:2520
-#, fuzzy
+#: ../src/gtkconv.c:2826
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Možnosti/Zobrazovat lištu nástrojů Formátování"
-
-#: src/gtkconv.c:2523
+msgstr "/Možnosti/Zobrazovat lišty nástrojů Formátování"
+
+#: ../src/gtkconv.c:2829
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Zobrazovat časové značky"
 
-#: src/gtkconv.c:2526
-#, fuzzy
+#: ../src/gtkconv.c:2832
 msgid "/Options/Show Buddy Icon"
-msgstr "Zobrazovat _ikony kamarádů"
-
-#: src/gtkconv.c:2597
+msgstr "/Možnosti/Zobrazovat _ikonu kamaráda"
+
+#: ../src/gtkconv.c:2912
 msgid "User is typing..."
 msgstr "Uživatel píše..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: ../src/gtkconv.c:2915
+msgid "User has typed something and stopped"
 msgstr "Uživatel něco napsal a počkal"
 
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#. Build the Send To menu
+#: ../src/gtkconv.c:3098
 msgid "_Send To"
-msgstr "_Odeslat jako"
-
-#: src/gtkconv.c:3373
+msgstr "_Odeslat do"
+
+#: ../src/gtkconv.c:3750
+msgid "_Send"
+msgstr "_Odeslat"
+
+#: ../src/gtkconv.c:3805 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "Téma:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: ../src/gtkconv.c:3857
 msgid "0 people in room"
 msgstr "0 lidí v místnosti"
 
-#: src/gtkconv.c:3500
+#: ../src/gtkconv.c:3936
 msgid "IM the user"
 msgstr "IM uživatele"
 
-#: src/gtkconv.c:3513
+#: ../src/gtkconv.c:3949
 msgid "Ignore the user"
 msgstr "Ignorovat uživatele"
 
-#: src/gtkconv.c:3525
+#: ../src/gtkconv.c:3961
 msgid "Get the user's information"
 msgstr "Získat informace o uživateli"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: ../src/gtkconv.c:4935 ../src/gtkconv.c:5044
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2697,7 +3120,7 @@
 msgstr[1] "%d osoby v místnosti"
 msgstr[2] "%d osob v místnosti"
 
-#: src/gtkconv.c:5582
+#: ../src/gtkconv.c:6517
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2705,420 +3128,448 @@
 "say &lt;zpráva&gt;: Odeslat zprávu normálně, jako kdybyste nepoužívali "
 "příkaz."
 
-#: src/gtkconv.c:5585
+#: ../src/gtkconv.c:6520
 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:5588
+#: ../src/gtkconv.c:6523
 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:5591
-#, fuzzy
+#: ../src/gtkconv.c:6526
 msgid "clear: Clears the conversation scrollback."
-msgstr "%s zavřel okno konverzace."
-
-#: src/gtkconv.c:5594
+msgstr "clear: Vymaže paměť řádků konverzace."
+
+#: ../src/gtkconv.c:6529
 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/gtkconv.c:5709
-#, fuzzy
+#: ../src/gtkconv.c:6688
 msgid "Confirm close"
-msgstr "Potvrdit účet"
-
-#: src/gtkconv.c:5741
-#, fuzzy
+msgstr "Potvrdit zavření"
+
+#: ../src/gtkconv.c:6720
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Jste si jisti, že chcete odstranit %s?"
-
-#: src/gtkconv.c:6408
+msgstr "Máte nepřečtené zprávy. Opravdu chcete zavřít okno?"
+
+#: ../src/gtkconv.c:7242
+msgid "Close other tabs"
+msgstr "Zavřít ostatní záložky"
+
+#: ../src/gtkconv.c:7248
+msgid "Close all tabs"
+msgstr "Zavřít všechny záložky"
+
+#: ../src/gtkconv.c:7256
+msgid "Detach this tab"
+msgstr "Odpojit tuto záložku"
+
+#: ../src/gtkconv.c:7262
+msgid "Close this tab"
+msgstr "Zavřít tuto záložku"
+
+#: ../src/gtkconv.c:7524
 msgid "Close conversation"
 msgstr "Zavřít konverzaci"
 
-#: src/gtkconv.c:6872
+#: ../src/gtkconv.c:7988
 msgid "Last created window"
 msgstr "Poslední vytvořené okno"
 
-#: src/gtkconv.c:6874
+#: ../src/gtkconv.c:7990
 msgid "Separate IM and Chat windows"
 msgstr "Oddělovat okna IM a chatů"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: ../src/gtkconv.c:7992 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Nové okno"
 
-#: src/gtkconv.c:6878
+#: ../src/gtkconv.c:7994
 msgid "By group"
 msgstr "Podle skupiny"
 
-#: src/gtkconv.c:6880
+#: ../src/gtkconv.c:7996
 msgid "By account"
 msgstr "Podle účtu"
 
-#: src/gtkdebug.c:232
+#: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Uložit ladicí záznam"
 
-#: src/gtkdebug.c:586
-#, fuzzy
+#: ../src/gtkdebug.c:586
 msgid "Invert"
-msgstr "_Vložit"
-
-#: src/gtkdebug.c:589
+msgstr "Invertovat"
+
+#: ../src/gtkdebug.c:589
 msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:636
+msgstr "Zvýrazňovat výskyty"
+
+#: ../src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Ladicí okno"
 
-#: src/gtkdebug.c:689
-#, fuzzy
+#: ../src/gtkdebug.c:689
 msgid "Clear"
-msgstr "Zavřít"
-
-#: src/gtkdebug.c:698
+msgstr "Vymazat"
+
+#: ../src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Časové značky"
 
-#: src/gtkdebug.c:724
-#, fuzzy
+#: ../src/gtkdebug.c:724
 msgid "Filter"
-msgstr "Selhalo"
-
-#: src/gtkdebug.c:743
-#, fuzzy
+msgstr "Filtr"
+
+#: ../src/gtkdebug.c:743
 msgid "Right click for more options."
-msgstr "Zobrazit více nastavení"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "Pro více možností klikněte pravým tlačítkem."
+
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
 msgid "lead developer"
 msgstr "vedoucí vývojář"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
+#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
+#: ../src/gtkdialogs.c:74
 msgid "developer"
 msgstr "vývojář"
 
-#: src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:64
+msgid "win32 port"
+msgstr "port na win32"
+
+#: ../src/gtkdialogs.c:66
 msgid "developer & webmaster"
 msgstr "vývojář a webmaster"
 
-#: src/gtkdialogs.c:62
-msgid "win32 port"
-msgstr "port na win32"
-
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:72
 msgid "support"
 msgstr "podpora"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
 msgid "maintainer"
 msgstr "správce"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
+#: ../src/gtkdialogs.c:96
 msgid "libfaim maintainer"
-msgstr "dřívější správce libfaim"
-
-#: src/gtkdialogs.c:92
-#, fuzzy
+msgstr "správce libfaim"
+
+#: ../src/gtkdialogs.c:97
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker a jmenovaný řidič [líná kůže]"
+
+#: ../src/gtkdialogs.c:98
 msgid "Jabber developer"
-msgstr "dřívější vývojář Jabberu"
-
-#: src/gtkdialogs.c:93
+msgstr "vývojář Jabberu"
+
+#: ../src/gtkdialogs.c:99
 msgid "original author"
 msgstr "původní autor"
 
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker a jmenovaný řidič [líná kůže]"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
 msgid "Bulgarian"
 msgstr "Bulharština"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+msgid "Bengali"
+msgstr "Bengálština"
+
+#: ../src/gtkdialogs.c:110
 msgid "Bosnian"
-msgstr "Estonština"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "Bosenština"
+
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
 msgid "Catalan"
 msgstr "Katalánština"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
 msgid "Czech"
 msgstr "Čeština"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:113
 msgid "Danish"
 msgstr "Dánština"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
 msgid "German"
 msgstr "Němčina"
 
-#: src/gtkdialogs.c:106
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+msgid "Greek"
+msgstr "Řečtina"
+
+#: ../src/gtkdialogs.c:117
 msgid "Australian English"
 msgstr "Australská angličtina"
 
-#: src/gtkdialogs.c:107
-msgid "British English"
-msgstr "Britská angličtina"
-
-#: src/gtkdialogs.c:108
+#: ../src/gtkdialogs.c:118
 msgid "Canadian English"
 msgstr "Kanadská angličtina"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:119
+msgid "British English"
+msgstr "Britská angličtina"
+
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
 msgid "Spanish"
 msgstr "Španělština"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+msgid "Persian"
+msgstr "Perština"
+
+#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
 msgid "Finnish"
 msgstr "Finština"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "French"
 msgstr "Francouzština"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:125
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:126
 msgid "Hindi"
 msgstr "Hindština"
 
-#: src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:127
 msgid "Hungarian"
 msgstr "Maďarština"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
 msgid "Italian"
 msgstr "Italština"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:178
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr "Litevština"
-
-#: src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
 msgid "Georgian"
 msgstr "Gruzínština"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/gtkdialogs.c:120
-#, fuzzy
-msgid "Dutch, Flemish"
-msgstr "Holandština; vlámština"
-
-#: src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:132
+msgid "Kurdish"
+msgstr "Kurdština"
+
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+msgid "Lithuanian"
+msgstr "Litevština"
+
+#: ../src/gtkdialogs.c:134
 msgid "Macedonian"
 msgstr "Makedonština"
 
-#: src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:135
+msgid "Dutch, Flemish"
+msgstr "Holandština, vlámština"
+
+#: ../src/gtkdialogs.c:136
 msgid "Norwegian"
 msgstr "Norština"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
 msgid "Polish"
 msgstr "Polština"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:139
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:140
 msgid "Portuguese-Brazil"
 msgstr "Portugalština-brazilská"
 
-#: src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:141
 msgid "Romanian"
 msgstr "Rumunština"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
 msgid "Russian"
 msgstr "Ruština"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Serbian"
 msgstr "Srbština"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:145
 msgid "Slovenian"
 msgstr "Slovinština"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
 msgid "Swedish"
 msgstr "Švédština"
 
-#: src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:147
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/gtkdialogs.c:148
 msgid "Telugu"
-msgstr ""
-
-#: src/gtkdialogs.c:134
+msgstr "Telugu"
+
+#: ../src/gtkdialogs.c:149
+msgid "Turkish"
+msgstr "Turečtina"
+
+#: ../src/gtkdialogs.c:150
 msgid "Vietnamese"
 msgstr "Vietnamština"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:150
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "TM.Thanh a tým Gnome-Vi"
-
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+msgstr "T.M.Thanh a tým Gnome-Vi"
+
+#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
 msgid "Simplified Chinese"
 msgstr "Zjednodušená čínština"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
 msgid "Traditional Chinese"
 msgstr "Tradiční čínština"
 
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:159
 msgid "Amharic"
 msgstr "Amharština"
 
-#: src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:186
 msgid "Slovak"
 msgstr "Slovenština"
 
-#: src/gtkdialogs.c:202
+#: ../src/gtkdialogs.c:230
 msgid "About Gaim"
 msgstr "O Gaim"
 
-#: src/gtkdialogs.c:226
-#, fuzzy
+#: ../src/gtkdialogs.c:254
 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 GNU 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/gtkdialogs.c:235
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+"file for the complete list of contributors.  We provide no warranty for this "
+"program.<BR><BR>"
+msgstr "Gaim je modulární klient IM schopný zároveň používat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, a Gadu-Gadu. Je napsán pomocí GTK+<BR><BR>Program můžete upravovat a dále šířit pod podmínkami GPL (verze 2 nebo novější). Kopie GPL je obsažena v souboru 'COPYING' dodávaném s Gaim. Copyright Gaimu vlastní jeho spoluautoři. Pro úplný seznam spoluautorů viz soubor 'COPYRIGHT'. Pro tento program neposkytujeme žádnou záruku.<BR><BR>"
+
+#: ../src/gtkdialogs.c:268
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim na irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: ../src/gtkdialogs.c:271
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "Aktivní vývojáři"
-
-#: src/gtkdialogs.c:259
+#: ../src/gtkdialogs.c:277
+msgid "Current Developers"
+msgstr "Současní vývojáři"
+
+#: ../src/gtkdialogs.c:292
 msgid "Crazy Patch Writers"
 msgstr "Šílení autoři patchů"
 
-#: src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:307
 msgid "Retired Developers"
 msgstr "Vývojáři na odpočinku"
 
-#: src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:322
 msgid "Current Translators"
 msgstr "Současní překladatelé"
 
-#: src/gtkdialogs.c:309
+#: ../src/gtkdialogs.c:342
 msgid "Past Translators"
 msgstr "Dřívější překladatelé"
 
-#: src/gtkdialogs.c:327
-#, fuzzy
+#: ../src/gtkdialogs.c:360
 msgid "Debugging Information"
-msgstr "Informace o uživateli"
-
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
+msgstr "Ladicí informace"
+
+#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:770
 msgid "_Name"
-msgstr "Název"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+msgstr "_Název"
+
+#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:775
 msgid "_Account"
 msgstr "_Účet"
 
-#: src/gtkdialogs.c:502
+#: ../src/gtkdialogs.c:579
 msgid "New Instant Message"
 msgstr "Nová Instant Message"
 
-#: src/gtkdialogs.c:504
-#, fuzzy
+#: ../src/gtkdialogs.c:581
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Zadejte prosím jméno uživatele, kterého chcete IM."
-
-#: src/gtkdialogs.c:643
+msgstr "Zadejte prosím jméno uživatele nebo alias osoby, kterou chcete IM."
+
+#: ../src/gtkdialogs.c:716
 msgid "Get User Info"
 msgstr "Získat informace o uživateli"
 
-#: src/gtkdialogs.c:645
-#, fuzzy
+#: ../src/gtkdialogs.c:718
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
-msgstr "Zadejte prosím jméno uživatele, jehož informace chcete zobrazit."
-
-#: src/gtkdialogs.c:699
-#, fuzzy
+msgstr "Zadejte prosím jméno uživatele nebo alias osoby, jejíž informace chcete zobrazit."
+
+#: ../src/gtkdialogs.c:784
 msgid "View User Log"
-msgstr "Získat záznam uživatele"
-
-#: src/gtkdialogs.c:701
-#, fuzzy
+msgstr "Zobrazit záznam uživatele"
+
+#: ../src/gtkdialogs.c:786
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
-msgstr "Zadejte prosím jméno uživatele, jehož záznam chcete zobrazit."
-
-#: src/gtkdialogs.c:720
+msgstr "Zadejte prosím jméno uživatele nebo alias osoby, jejíž záznam chcete zobrazit."
+
+#: ../src/gtkdialogs.c:805
 msgid "Alias Contact"
 msgstr "Alias kontaktu"
 
-#: src/gtkdialogs.c:721
+#: ../src/gtkdialogs.c:806
 msgid "Enter an alias for this contact."
 msgstr "Zadejte alias pro tento kontakt."
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
+#: ../src/gtkrequest.c:283 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:826
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Zadejte alias pro %s"
 
-#: src/gtkdialogs.c:743
+#: ../src/gtkdialogs.c:828
 msgid "Alias Buddy"
 msgstr "Alias kamaráda"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:847
 msgid "Alias Chat"
 msgstr "Alias chatu"
 
-#: src/gtkdialogs.c:763
+#: ../src/gtkdialogs.c:848
 msgid "Enter an alias for this chat."
 msgstr "Zadejte alias pro tento chat."
 
-#: src/gtkdialogs.c:800
-#, fuzzy, c-format
+#: ../src/gtkdialogs.c:885
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -3126,16 +3577,24 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Hodláte odstranit kontakt obsahující %s a %d jiných kamarádů ze svého "
+"Hodláte odstranit kontakt obsahující %s a %d jiného kamaráda ze svého "
 "seznamu kamarádů. Chcete pokračovat?"
 msgstr[1] ""
-"Hodláte odstranit kontakt obsahující %s a %d jiných kamarádů ze svého "
+"Hodláte odstranit kontakt obsahující %s a %d jiné kamarády ze svého "
 "seznamu kamarádů. Chcete pokračovat?"
 msgstr[2] ""
 "Hodláte odstranit kontakt obsahující %s a %d jiných kamarádů ze svého "
 "seznamu kamarádů. Chcete pokračovat?"
 
-#: src/gtkdialogs.c:867
+#: ../src/gtkdialogs.c:893
+msgid "Remove Contact"
+msgstr "Odstranit kontakt"
+
+#: ../src/gtkdialogs.c:894
+msgid "_Remove Contact"
+msgstr "_Odstranit kontakt"
+
+#: ../src/gtkdialogs.c:945
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3144,21 +3603,29 @@
 "Hodláte odstranit skupinu %s a všechny její členy ze svého seznamu kamarádů. "
 "Chcete pokračovat?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: ../src/gtkdialogs.c:948
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: src/gtkdialogs.c:909
+#: ../src/gtkdialogs.c:949
+msgid "_Remove Group"
+msgstr "_Odstranit skupinu"
+
+#: ../src/gtkdialogs.c:982
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Hodláte odstranit %s ze svého seznamu kamarádů. Chcete pokračovat?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: ../src/gtkdialogs.c:985
 msgid "Remove Buddy"
 msgstr "Odstranit kamaráda"
 
-#: src/gtkdialogs.c:951
+#: ../src/gtkdialogs.c:986
+msgid "_Remove Buddy"
+msgstr "_Odstranit kamaráda"
+
+#: ../src/gtkdialogs.c:1007
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3166,372 +3633,388 @@
 msgstr ""
 "Hodláte odstranit chat %s ze svého seznamu kamarádů. Chcete pokračovat?"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: ../src/gtkdialogs.c:1010
 msgid "Remove Chat"
 msgstr "Odstranit chat"
 
-#: src/gtkft.c:138
+#: ../src/gtkdialogs.c:1011
+msgid "_Remove Chat"
+msgstr "_Odstranit chat"
+
+#: ../src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: ../src/gtkft.c:160 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: ../src/gtkft.c:163 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Zrušeno"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: ../src/gtkft.c:166 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "Čekám na začátek přenosu..."
 
-#: src/gtkft.c:218
+#: ../src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Přijímám jako:</b>"
 
-#: src/gtkft.c:220
+#: ../src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Přijímám od:</b>"
 
-#: src/gtkft.c:224
+#: ../src/gtkft.c:225
 msgid "<b>Sending To:</b>"
 msgstr "<b>Odesílám k:</b>"
 
-#: src/gtkft.c:226
+#: ../src/gtkft.c:227
 msgid "<b>Sending As:</b>"
 msgstr "<b>Odesílám jako:</b>"
 
-#: src/gtkft.c:442
+#: ../src/gtkft.c:443
 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:447
+#: ../src/gtkft.c:448
 msgid "An error occurred while opening the file."
 msgstr "Při otevírání souboru došlo k chybě."
 
-#: src/gtkft.c:467
-#, fuzzy, c-format
+#: ../src/gtkft.c:485
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "Chyba při spouštění <b>%s</b>: %s"
-
-#: src/gtkft.c:476
-#, fuzzy, c-format
+msgstr "Chyba při spouštění %s: %s"
+
+#: ../src/gtkft.c:494
+#, c-format
 msgid "Error running %s"
-msgstr "Chyba při připojování k chatu %s"
-
-#: src/gtkft.c:477
+msgstr "Chyba při spouštění %s"
+
+#: ../src/gtkft.c:495
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+msgstr "Proces vrátil kód chyby %d"
+
+#: ../src/gtkft.c:589
 msgid "Progress"
 msgstr "Průběh"
 
-#: src/gtkft.c:579
+#: ../src/gtkft.c:596
 msgid "Filename"
 msgstr "Název souboru"
 
-#: src/gtkft.c:586
+#: ../src/gtkft.c:603
 msgid "Size"
 msgstr "Velikost"
 
-#: src/gtkft.c:593
+#: ../src/gtkft.c:610
 msgid "Remaining"
 msgstr "Zbývá"
 
-#: src/gtkft.c:624
+#: ../src/gtkft.c:641
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: src/gtkft.c:625
+#: ../src/gtkft.c:642
 msgid "Local File:"
 msgstr "Místní soubor:"
 
-#: src/gtkft.c:626
+#: ../src/gtkft.c:643
 msgid "Status:"
 msgstr "Stav:"
 
-#: src/gtkft.c:627
+#: ../src/gtkft.c:644
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: src/gtkft.c:628
+#: ../src/gtkft.c:645
 msgid "Time Elapsed:"
 msgstr "Využitý čas:"
 
-#: src/gtkft.c:629
+#: ../src/gtkft.c:646
 msgid "Time Remaining:"
 msgstr "Zbývající čas:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "_Nechat dialog otevřený"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: ../src/gtkft.c:708
+msgid "File Transfers"
+msgstr "Přenosy souborů"
+
+#: ../src/gtkft.c:731
+msgid "Close this window when all transfers _finish"
+msgstr "Zavřít toto okno, až všechny přenosy _skončí"
+
+#: ../src/gtkft.c:741
 msgid "C_lear finished transfers"
 msgstr "_Vymazat dokončené přenosy"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: ../src/gtkft.c:750
 msgid "File transfer _details"
-msgstr "Skrýt detaily o přenosu"
+msgstr "_Podrobnosti o přenosu souboru"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: ../src/gtkft.c:780 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Pozastavit"
 
 #. Resume button
-#: src/gtkft.c:774
+#: ../src/gtkft.c:790
 msgid "_Resume"
 msgstr "_Pokračovat"
 
-#: src/gtkft.c:988
+#: ../src/gtkft.c:1005
 msgid "Failed"
 msgstr "Selhalo"
 
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
+#: ../src/gtkimhtml.c:821
+msgid "Paste as Plain _Text"
 msgstr "Vložit _jako text"
 
-#: src/gtkimhtml.c:1313
+#. XXX: make this new with mnemonic, and HIG-happy after string thaw
+#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
+msgid "Clear formatting"
+msgstr "Vymazat formátování"
+
+#: ../src/gtkimhtml.c:1328
 msgid "Hyperlink color"
 msgstr "Barva odkazu"
 
-#: src/gtkimhtml.c:1314
+#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "Barva, kterou kreslit odkazy."
 
-#: src/gtkimhtml.c:1317
-#, fuzzy
+#: ../src/gtkimhtml.c:1332
 msgid "Hyperlink prelight color"
-msgstr "Barva odkazu"
-
-#: src/gtkimhtml.c:1318
-#, fuzzy
+msgstr "Barva zvýraznění odkazu"
+
+#: ../src/gtkimhtml.c:1333
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Barva, kterou kreslit odkazy."
-
-#: src/gtkimhtml.c:1537
+msgstr "Barva, kterou kreslit odkazy, když je nad nimi myš."
+
+#: ../src/gtkimhtml.c:1554
 msgid "_Copy E-Mail Address"
 msgstr "_Kopírovat emailovou adresu"
 
-#: src/gtkimhtml.c:1549
+#: ../src/gtkimhtml.c:1566
 msgid "_Open Link in Browser"
 msgstr "_Otevřít odkaz v prohlížeči"
 
-#: src/gtkimhtml.c:1559
+#: ../src/gtkimhtml.c:1576
 msgid "_Copy Link Location"
 msgstr "_Kopírovat adresu odkazu"
 
-#: src/gtkimhtml.c:3234
+#: ../src/gtkimhtml.c:3273
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3237
+"<span size='larger' weight='bold'>Nerozpoznaný typ souboru</span>\n"
+"\n"
+"Používám PNG."
+
+#: ../src/gtkimhtml.c:3276
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-#: src/gtkimhtml.c:3250
-#, fuzzy, c-format
+"Nerozpoznaný typ souboru\n"
+"\n"
+"Používám PNG."
+
+#: ../src/gtkimhtml.c:3289
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Máte poštu!</span>\n"
+"<span size='larger' weight='bold'>Chyba při ukládání obrázku</span>\n"
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
-#, fuzzy, c-format
+#: ../src/gtkimhtml.c:3292
+#, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "Chyba při ukládání obrázku: %s"
-
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+msgstr ""
+"Chyba při ukládání obrázku\n"
+"\n"
+"%s"
+
+#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
 msgid "Save Image"
 msgstr "Uložit obrázek"
 
-#: src/gtkimhtml.c:3373
+#: ../src/gtkimhtml.c:3412
 msgid "_Save Image..."
 msgstr "_Uložit obrázek..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Vyberte písmo"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Vyberte barvu textu"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Vyberte barvu pozadí"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Popis"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 "Zadejte prosím URL a popis odkazu, který chcete vložit. Popis je nepovinný."
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Zadejte prosím URL odkazu, který chcete vložit."
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Vložit odkaz"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Nemohu uložit obrázek: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Vložit obrázek"
 
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "V tomto tématu nejsou k dispozici smajlíky."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Úsměv!"
 
-#: src/gtkimhtmltoolbar.c:916
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
 msgstr "Tučné"
 
-#: src/gtkimhtmltoolbar.c:927
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: src/gtkimhtmltoolbar.c:938
+#: ../src/gtkimhtmltoolbar.c:945
 msgid "Underline"
 msgstr "Podtržené"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
 msgstr "Větší velikost písma"
 
-#: src/gtkimhtmltoolbar.c:966
+#: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
 msgstr "Menší velikost písma"
 
-#: src/gtkimhtmltoolbar.c:983
+#: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
 msgstr "Řez písma"
 
-#: src/gtkimhtmltoolbar.c:995
+#: ../src/gtkimhtmltoolbar.c:1002
 msgid "Foreground font color"
 msgstr "Barva pozadí písma"
 
-#: src/gtkimhtmltoolbar.c:1007
+#: ../src/gtkimhtmltoolbar.c:1014
 msgid "Background color"
 msgstr "Barva pozadí"
 
-#: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
-msgid "Clear formatting"
-msgstr "_Vymazat formátování"
-
-#: src/gtkimhtmltoolbar.c:1038
+#: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Vložit odkaz"
 
-#: src/gtkimhtmltoolbar.c:1048
+#: ../src/gtkimhtmltoolbar.c:1055
 msgid "Insert image"
 msgstr "Vložit obrázek"
 
-#: src/gtkimhtmltoolbar.c:1059
+#: ../src/gtkimhtmltoolbar.c:1066
 msgid "Insert smiley"
 msgstr "Vložit smajlík"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "Konverzace s %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "Konverzace s %s"
-
-#: src/gtklog.c:309
+#: ../src/gtklog.c:202
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konverzace v %s v %s</span>"
+
+#: ../src/gtklog.c:207
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konverzace s %s v %s</span>"
+
+#: ../src/gtklog.c:258
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../src/gtklog.c:311
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:313
+msgstr "Systémový události budou zaznamenávány, jen je-li povoleno nastavení \"Zaznamenávat všechny změny stavu do systémového záznamu\"."
+
+#: ../src/gtklog.c:315
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
+msgstr "Instant message budou zaznamenávány, jen je-li povoleno nastavení \"Zaznamenávat všechny instant message\"."
+
+#: ../src/gtklog.c:318
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "Chaty budou zaznamenávány, jen je-li povoleno nastavení \"Zaznamenávat všechny chaty\"."
+
+#: ../src/gtklog.c:322
 msgid "No logs were found"
-msgstr ""
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "Nebyly nalezeny žádné záznamy"
+
+#: ../src/gtklog.c:398
 msgid "Total log size:"
-msgstr "Podle velikosti záznamu"
-
-#: src/gtklog.c:472
-#, fuzzy, c-format
+msgstr "Celková velikost záznamu:"
+
+#: ../src/gtklog.c:474
+#, c-format
 msgid "Conversations in %s"
-msgstr "Konverzace s %s"
-
-#: src/gtklog.c:480 src/gtklog.c:531
+msgstr "Konverzace v %s"
+
+#: ../src/gtklog.c:482 ../src/gtklog.c:533
 #, c-format
 msgid "Conversations with %s"
 msgstr "Konverzace s %s"
 
-#: src/gtklog.c:556
+#: ../src/gtklog.c:558
 msgid "System Log"
 msgstr "Systémový záznam"
 
-#: src/gtkmain.c:326
+#: ../src/gtkmain.c:308
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Pro více informací zkuste `%s -h'.\n"
 
-#: src/gtkmain.c:328
+#: ../src/gtkmain.c:310
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3545,18 +4028,77 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
-msgid "Default"
-msgstr "Implicitní pro Gnome"
-
-#. Descriptive label
-#: src/gtknotify.c:275
+"Gaim %s\n"
+"Použití: %s [PŘEPÍNAČ]...\n"
+"\n"
+"  -c, --config=ADRESÁŘ používat adresář pro soubory s nastavením\n"
+"  -d, --debug          vypisovat ladicí zprávy na stdout\n"
+"  -h, --help           zobrazit tuto nápovědu a skončit\n"
+"  -n, --nologin        nepřihlašovat se automaticky\n"
+"  -l, --login[=NÁZEV]  automaticky se přihlásit (nepovinný parametr NÁZEV\n"
+"                       určuje účty, které použít, oddělené čárkami)\n"
+"  -v, --version        zobrazit aktuální verzi a skončit\n"
+
+#: ../src/gtkmain.c:493
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+"Gaim spadl a pokusil se vypsat soubor core.\n"
+"Toto je chyba v programu a nestalo se to vaší\n"
+"vinou.\n"
+"\n"
+"Pokud umíte pád zopakovat, upozorněte prosím\n"
+"vývojáře gaimu ohlášením chyby na\n"
+"%sbug.php\n"
+"\n"
+"Zkontrolujte prosím, že jste popsali, co jste v té době\n"
+"dělali, a že jste poslali backtrace ze souboru core. Pokud\n"
+"nevíte, jak získat backtrace, přečtěte si prosím instrukce na\n"
+"%sgdb.php\n"
+"\n"
+"Pokud potřebujete další pomoc, prosím IM buď SeanEgn nebo\n"
+"LSchiere (pomocí AIM). Kontaktní informace pro Sean a Luka\n"
+"na jiných protokolech je na\n"
+"%scontactinfo.php\n"
+
+#: ../src/gtknotify.c:327
+msgid "New Mail"
+msgstr "Nový e-mail"
+
+#: ../src/gtknotify.c:343
+msgid "Open All Messages"
+msgstr "Otevřít všechny zprávy"
+
+#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1114
+msgid "From"
+msgstr "Z"
+
+#: ../src/gtknotify.c:418
+msgid "Subject"
+msgstr "Předmět"
+
+#: ../src/gtknotify.c:427
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
+
+#: ../src/gtknotify.c:493
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -3564,28 +4106,7 @@
 msgstr[1] "%s má %d nové zprávy."
 msgstr[2] "%s má %d nových zpráv."
 
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">Od:</span> %s\n"
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">Předmět:</span> %s\n"
-
-#: src/gtknotify.c:303
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Máte poštu!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
+#: ../src/gtknotify.c:498
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3596,193 +4117,268 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "Výsledky hledání"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
 #, c-format
 msgid "Info for %s"
 msgstr "Informace pro %s"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informace o kamarádovi"
 
-#: src/gtknotify.c:687
+#: ../src/gtknotify.c:882
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Příkaz prohlížeče <b>%s</b> není platný."
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "Nemohu otevřít URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Chyba při spouštění <b>%s</b>: %s"
 
-#: src/gtknotify.c:839
+#: ../src/gtknotify.c:1035
 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:130
+#: ../src/gtkplugin.c:275
+msgid "The following plugins will be unloaded."
+msgstr "Následující zásuvné moduly budou odebrány."
+
+#: ../src/gtkplugin.c:294
+msgid "Multiple plugins will be unloaded."
+msgstr "Několik zásuvných modulů bude odebráno."
+
+#: ../src/gtkplugin.c:296
+msgid "Unload Plugins"
+msgstr "Odebrat zásuvné moduly"
+
+#: ../src/gtkplugin.c:410
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Napsal:</span>\t%s\n"
+"<span weight=\"bold\">WWW stránka:</span>\t\t%s\n"
+"<span weight=\"bold\">Název souboru:</span>\t%s"
+
+#: ../src/gtkplugin.c:420
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Chyba: %s\n"
+"Hledejte aktualizaci na WWW zásuvného modulu.</span>"
+
+#: ../src/gtkplugin.c:546
+msgid "Configure Pl_ugin"
+msgstr "Nastavit zásuvný _modul"
+
+#: ../src/gtkplugin.c:604
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Podrobnosti o zásuvném modulu</b>"
+
+#: ../src/gtkpounce.c:162
 msgid "Select a file"
 msgstr "Zvolte soubor"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:259
 msgid "Please enter a buddy to pounce."
 msgstr "Zadejte prosím kamaráda, kterého sledovat."
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:503
 msgid "New Buddy Pounce"
 msgstr "Nové sledování kamaráda"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:503
 msgid "Edit Buddy Pounce"
 msgstr "Upravit sledování kamaráda"
 
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
+#. Create the "Pounce on Whom" frame.
+#: ../src/gtkpounce.c:520
+msgid "Pounce on Whom"
 msgstr "Sledovat koho"
 
-#: src/gtkpounce.c:435
+#: ../src/gtkpounce.c:547
 msgid "_Buddy name:"
 msgstr "_Jméno kamaráda:"
 
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "Sledovat kdy"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "_Přihlášení"
-
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "_Odhlášení"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "_Pryč"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "Ná_vrat z nepřítomnosti"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "_Nečinný"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "Náv_rat z nečinnosti"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "Kamarád začne _psát"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "Kamarád přestane p_sát"
-
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "Akce sledování"
-
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
+#. Create the "Pounce When Buddy..." frame.
+#: ../src/gtkpounce.c:573
+msgid "Pounce When Buddy..."
+msgstr "Sledovat když kamarád..."
+
+#: ../src/gtkpounce.c:581
+msgid "Si_gns on"
+msgstr "_Přihlásí se"
+
+#: ../src/gtkpounce.c:583
+msgid "Signs o_ff"
+msgstr "_Odhlásí se"
+
+#: ../src/gtkpounce.c:585
+msgid "Goes a_way"
+msgstr "Jde _pryč"
+
+#: ../src/gtkpounce.c:587
+msgid "Ret_urns from away"
+msgstr "_Vrátí se z nepřítomnosti"
+
+#: ../src/gtkpounce.c:589
+msgid "Becomes _idle"
+msgstr "Stane se _nečinným"
+
+#: ../src/gtkpounce.c:591
+msgid "Is no longer i_dle"
+msgstr "Už není ne_činný."
+
+#: ../src/gtkpounce.c:593
+msgid "Starts _typing"
+msgstr "Začne _psát"
+
+#: ../src/gtkpounce.c:595
+msgid "Stops t_yping"
+msgstr "Přestane p_sát"
+
+#: ../src/gtkpounce.c:597
+msgid "Sends a _message"
+msgstr "Odešle _zprávu"
+
+#. Create the "Action" frame.
+#: ../src/gtkpounce.c:629
+msgid "Action"
+msgstr "Akce"
+
+#: ../src/gtkpounce.c:637
+msgid "Ope_n an IM window"
 msgstr "_Otevřít okno IM"
 
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#: ../src/gtkpounce.c:639
+msgid "_Pop up a notification"
 msgstr "Zobrazit _upozornění"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:641
 msgid "Send a _message"
 msgstr "Odeslat _zprávu"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:643
 msgid "E_xecute a command"
 msgstr "Spustit _příkaz"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:645
 msgid "P_lay a sound"
 msgstr "Pře_hrát zvuk"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
+#: ../src/gtkpounce.c:650
+msgid "Brows_e..."
 msgstr "_Procházet..."
 
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
+#: ../src/gtkpounce.c:652
+msgid "Br_owse..."
 msgstr "_Procházet..."
 
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:653
 msgid "Pre_view"
 msgstr "Ná_hled"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "_Uložit toto sledování po aktivaci"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Odstranit sledování kamaráda"
-
-#: src/gtkpounce.c:964
+#. Create the "Options" frame.
+#: ../src/gtkpounce.c:765
+msgid "Options"
+msgstr "Možnosti"
+
+#: ../src/gtkpounce.c:773
+msgid "P_ounce only when my status is not available"
+msgstr "_Sledovat, jen když můj stav je nejsem k dispozici"
+
+#: ../src/gtkpounce.c:778
+msgid "_Recurring"
+msgstr "_Opakující se"
+
+#: ../src/gtkpounce.c:1092
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Opravdu že chcete odstranit sledování %s pro %s?"
+
+#: ../src/gtkpounce.c:1240
+msgid "Pounce Target"
+msgstr "Cíl sledování"
+
+#: ../src/gtkpounce.c:1275
+msgid "Recurring"
+msgstr "Opakující se"
+
+#: ../src/gtkpounce.c:1322
+msgid "Buddy Pounces"
+msgstr "Sledování kamarádů"
+
+#: ../src/gtkpounce.c:1449
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vám začal psát (%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:1451
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se přihlásil (%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:1453
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s se vrátil z nečinnosti (%s)"
 
-#: src/gtkpounce.c:970
+#: ../src/gtkpounce.c:1455
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se vrátil z nepřítomnosti (%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:1457
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vám přestal psát (%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:1459
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se odhlásil (%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:1461
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se stal nečinným (%s)"
 
-#: src/gtkpounce.c:978
+#: ../src/gtkpounce.c:1463
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s šel pryč. (%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:1465
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s vám poslal zprávu. (%s)"
+
+#: ../src/gtkpounce.c:1466
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznámá událost sledování. Oznamte to prosím!"
 
-#: src/gtkprefs.c:623
+#: ../src/gtkprefs.c:512
+msgid "Smiley theme failed to unpack."
+msgstr "Téma smajlíků nelze rozbalit."
+
+#: ../src/gtkprefs.c:638
 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."
@@ -3790,41 +4386,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:658
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
+#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Popis"
 
-#: src/gtkprefs.c:805
+#: ../src/gtkprefs.c:821
+msgid "_Hide new IM conversations"
+msgstr "_Skrýt nové konverzace IM"
+
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+msgid "When away"
+msgstr "Při nepřítomnosti"
+
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Odesílat neznámé příkazy s \"_lomítkem\" jako zprávy"
 
-#: src/gtkprefs.c:807
-#, fuzzy
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
-msgstr "Zobrazovat lištu nástrojů _Formátování"
-
-#: src/gtkprefs.c:809
+msgstr "Zobrazovat _Formátování u příchozích zpráv"
+
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "Zobrazovat _ikony kamarádů"
 
-#: src/gtkprefs.c:811
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "Povolit _animaci ikon kamarádů"
 
-#: src/gtkprefs.c:813
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "Upozorňovat kamarády, že jim _píšete"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
+#: ../src/gtkprefs.c:845
+msgid "Highlight _misspelled words"
 msgstr "Z_výrazňovat slova s překlepy"
 
-#: src/gtkprefs.c:834
+#: ../src/gtkprefs.c:849
+msgid "Use smooth-scrolling"
+msgstr "Používat hladké posouvání"
+
+#: ../src/gtkprefs.c:865
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3833,164 +4440,160 @@
 "které podporují formátování. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
 msgstr "Možnosti záložek"
 
-#: src/gtkprefs.c:858
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Zobrazovat IM a chaty v oknech se zá_ložkami."
 
-#: src/gtkprefs.c:872
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
 msgstr "Zobrazovat na záložkách tlačítko z_avřít"
 
-#: src/gtkprefs.c:878
-#, fuzzy
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
-msgstr "DalUmístění"
-
-#: src/gtkprefs.c:880
+msgstr "_Umístění:"
+
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "Nahoře"
 
-#: src/gtkprefs.c:881
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "Dole"
 
-#: src/gtkprefs.c:882
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "Vlevo"
 
-#: src/gtkprefs.c:883
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/gtkprefs.c:885
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:886
+msgstr "Vlevo svislé"
+
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
-msgstr ""
-
-#: src/gtkprefs.c:891
-#, fuzzy
+msgstr "Vpravo svislé"
+
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
-msgstr "Zavřít konverzaci"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "_Nové konverzace:"
+
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
+#: ../src/protocols/oscar/oscar.c:6172
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: src/gtkprefs.c:944
-#, fuzzy
-msgid "STUN Server:"
-msgstr "_Server:"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
+#: ../src/gtkprefs.c:975
+msgid "ST_UN server:"
+msgstr "Server ST_UN:"
+
+#: ../src/gtkprefs.c:977
+msgid "_Autodetect IP address"
 msgstr "_Autodetekovat IP adresu"
 
-#: src/gtkprefs.c:955
+#: ../src/gtkprefs.c:986
 msgid "Public _IP:"
 msgstr "Veřejná _IP:"
 
-#: src/gtkprefs.c:979
+#: ../src/gtkprefs.c:1014
 msgid "Ports"
 msgstr "Porty"
 
-#: src/gtkprefs.c:982
+#: ../src/gtkprefs.c:1017
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ručně určit rozsah portů, na kterých poslouchat"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: ../src/gtkprefs.c:1020
+msgid "_Start port:"
 msgstr "_Počáteční port:"
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: ../src/gtkprefs.c:1027
+msgid "_End port:"
 msgstr "_Koncový port:"
 
-#: src/gtkprefs.c:999
+#: ../src/gtkprefs.c:1035
 msgid "Proxy Server"
 msgstr "Proxy server"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1039
 msgid "No proxy"
 msgstr "Žádná proxy"
 
-#: src/gtkprefs.c:1059
+#: ../src/gtkprefs.c:1095
 msgid "_User:"
 msgstr "_Uživatel:"
 
-#: src/gtkprefs.c:1119
+#: ../src/gtkprefs.c:1157
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: ../src/gtkprefs.c:1158
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: ../src/gtkprefs.c:1159
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: ../src/gtkprefs.c:1160
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: ../src/gtkprefs.c:1161
 msgid "GNOME Default"
-msgstr "Implicitní pro Gnome"
-
-#: src/gtkprefs.c:1124
+msgstr "Implicitní pro GNOME"
+
+#: ../src/gtkprefs.c:1162
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: ../src/gtkprefs.c:1163
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: ../src/gtkprefs.c:1164
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: ../src/gtkprefs.c:1165
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: ../src/gtkprefs.c:1174
 msgid "Manual"
 msgstr "Ruční"
 
-#: src/gtkprefs.c:1189
+#: ../src/gtkprefs.c:1227
 msgid "Browser Selection"
 msgstr "Výběr prohlížeče"
 
-#: src/gtkprefs.c:1193
+#: ../src/gtkprefs.c:1231
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: src/gtkprefs.c:1201
+#: ../src/gtkprefs.c:1239
 msgid "_Open link in:"
 msgstr "_Otevřít odkaz v:"
 
-#: src/gtkprefs.c:1203
+#: ../src/gtkprefs.c:1241
 msgid "Browser default"
 msgstr "Implicitní nastavení prohlížeče"
 
-#: src/gtkprefs.c:1204
+#: ../src/gtkprefs.c:1242
 msgid "Existing window"
 msgstr "Existující okno"
 
-#: src/gtkprefs.c:1206
+#: ../src/gtkprefs.c:1244
 msgid "New tab"
 msgstr "Nová záložka"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1258
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3999,57 +4602,83 @@
 "_Ruční:\n"
 "(%s pro URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
 msgid "Logging"
 msgstr "Zaznamenávání"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
+#: ../src/gtkprefs.c:1297
+msgid "Log _format:"
 msgstr "_Formát záznamu:"
 
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: ../src/gtkprefs.c:1302
 msgid "Log all _instant messages"
 msgstr "Zaz_namenávat všechny instant message"
 
-#: src/gtkprefs.c:1266
+#: ../src/gtkprefs.c:1304
 msgid "Log all c_hats"
 msgstr "Zaznamenávat všechny _chaty"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1306
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "Zaznamenávat všechny změny _stavu do systémového záznamu"
+
+#: ../src/gtkprefs.c:1454
 msgid "Sound Selection"
 msgstr "Výběr zvuku"
 
-#: src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1462
+msgid "Quietest"
+msgstr "Nejtišší"
+
+#: ../src/gtkprefs.c:1464
+msgid "Quieter"
+msgstr "Tišší"
+
+#: ../src/gtkprefs.c:1466
+msgid "Quiet"
+msgstr "Tichý"
+
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
+msgid "Normal"
+msgstr "Normální"
+
+#: ../src/gtkprefs.c:1470
+msgid "Loud"
+msgstr "Hlasitý"
+
+#: ../src/gtkprefs.c:1472
+msgid "Louder"
+msgstr "Hlasitější"
+
+#: ../src/gtkprefs.c:1474
+msgid "Loudest"
+msgstr "Nejhlasitější"
+
+#: ../src/gtkprefs.c:1537
 msgid "Sound Method"
 msgstr "Metoda zvuku"
 
-#: src/gtkprefs.c:1455
+#: ../src/gtkprefs.c:1538
 msgid "_Method:"
 msgstr "_Metoda:"
 
-#: src/gtkprefs.c:1457
+#: ../src/gtkprefs.c:1540
 msgid "Console beep"
 msgstr "Pípnutí konzoly"
 
-#: src/gtkprefs.c:1459
+#: ../src/gtkprefs.c:1542
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1547
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/gtkprefs.c:1465
-#, fuzzy
+#: ../src/gtkprefs.c:1548
 msgid "No sounds"
-msgstr "Zvuky"
-
-#: src/gtkprefs.c:1473
+msgstr "Žádné zvuky"
+
+#: ../src/gtkprefs.c:1556
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4058,372 +4687,389 @@
 "_Příkaz zvuku:\n"
 "(%s pro název souboru)"
 
-#: src/gtkprefs.c:1499
+#: ../src/gtkprefs.c:1582
 msgid "Sound Options"
 msgstr "Možnosti zvuku"
 
-#: src/gtkprefs.c:1500
+#: ../src/gtkprefs.c:1583
 msgid "Sounds when conversation has _focus"
 msgstr "Zvuky, když je okno konverzace _aktivní"
 
-#: src/gtkprefs.c:1502
+#: ../src/gtkprefs.c:1585
 msgid "_Sounds while away"
 msgstr "Z_vuky při nepřítomnosti"
 
-#: src/gtkprefs.c:1512
+#: ../src/gtkprefs.c:1592
+msgid "Volume:"
+msgstr "Hlasitost:"
+
+#: ../src/gtkprefs.c:1620
 msgid "Sound Events"
 msgstr "Události zvuků"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1671
 msgid "Play"
 msgstr "Přehrát"
 
-#: src/gtkprefs.c:1570
+#: ../src/gtkprefs.c:1678
 msgid "Event"
 msgstr "Událost"
 
-#: src/gtkprefs.c:1589
+#: ../src/gtkprefs.c:1697
 msgid "Test"
 msgstr "Otestovat"
 
-#: src/gtkprefs.c:1593
+#: ../src/gtkprefs.c:1701
 msgid "Reset"
 msgstr "Vymazat"
 
-#: src/gtkprefs.c:1597
+#: ../src/gtkprefs.c:1705
 msgid "Choose..."
 msgstr "Vybrat..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "Pryč"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "Zařazovat nové zprávy do _fronty při nepřítomnosti"
-
-#: src/gtkprefs.c:1655
+#: ../src/gtkprefs.c:1747
+msgid "_Report idle time:"
+msgstr "_Hlásit čas nečinnosti:"
+
+#: ../src/gtkprefs.c:1750
+msgid "From last sent message"
+msgstr "Od naposledy odeslané zprávy"
+
+#: ../src/gtkprefs.c:1752
+msgid "Based on keyboard or mouse use"
+msgstr "Podle používání klávesnice nebo myši"
+
+#: ../src/gtkprefs.c:1761
 msgid "_Auto-reply:"
 msgstr "_Automatická odpověď:"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "Při nepřítomnosti"
-
-#: src/gtkprefs.c:1659
-#, fuzzy
+#: ../src/gtkprefs.c:1765
 msgid "When both away and idle"
 msgstr "Při nepřítomnosti a nečinnosti"
 
-#: src/gtkprefs.c:1662
-#, fuzzy
-msgid "_Report idle time"
-msgstr "Zobrazovat _doby nečinnosti"
-
-#: src/gtkprefs.c:1665
+#. Auto-away stuff
+#: ../src/gtkprefs.c:1771
 msgid "Auto-away"
 msgstr "Automatická nepřítomnost"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: ../src/gtkprefs.c:1773
 msgid "Change status when _idle"
-msgstr "Nastavit nepřítomnost _při nečinnosti"
-
-#: src/gtkprefs.c:1670
-#, fuzzy
+msgstr "Změnit stav _při nečinnosti"
+
+#: ../src/gtkprefs.c:1777
 msgid "_Minutes before changing status:"
-msgstr "_Minuty před nastavením nepřítomnosti:"
-
-#: src/gtkprefs.c:1678
-#, fuzzy
+msgstr "_Minuty před změnou stavu:"
+
+#: ../src/gtkprefs.c:1785
 msgid "Change _status to:"
-msgstr "Změnit adresu na:"
-
-#: src/gtkprefs.c:1728
+msgstr "Změnit _stav na:"
+
+#. Signon status stuff
+#: ../src/gtkprefs.c:1806
+msgid "Status at startup"
+msgstr "Stav při spuštění"
+
+#: ../src/gtkprefs.c:1808
+msgid "Use status from last _exit at startup"
+msgstr "Používat při spouštění stav podle posledního _ukončení"
+
+#: ../src/gtkprefs.c:1814
+msgid "Status to a_pply at startup:"
+msgstr "Stav, který použít při _spouštění:"
+
+#: ../src/gtkprefs.c:1865
 msgid "Smiley Themes"
 msgstr "Témata smajlíků"
 
-#: src/gtkprefs.c:1729
+#: ../src/gtkprefs.c:1866
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "Síť"
 
-#: src/gtkprefs.c:1735
+#: ../src/gtkprefs.c:1872
 msgid "Browser"
 msgstr "Prohlížeč"
 
-#: src/gtkprefs.c:1739
+#: ../src/gtkprefs.c:1876
 msgid "Away / Idle"
 msgstr "Pryč / nečinný"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Povolit všem uživatelům kontaktovat mě"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Povolit jen uživatelům na mém seznamu kamarádů"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Povolit jen uživatelům níže"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Blokovat všechny uživatele"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Blokovat jen uživatele níže"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Změny v nastavení soukromí mají okamžitý efekt."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Nastavit soukromí pro:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "Povolit uživateli"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "Zadejte uživatele, kterému povolujete vás kontaktovat."
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Zadejte prosím jméno uživatele, o kterém chcete, aby vás mohl kontaktovat."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "Povolit"
-
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+msgid "_Permit"
+msgstr "_Povolit"
+
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Povolit %s kontaktovat vás?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Jste si jisti, že chcete povolit %s kontaktovat vás?"
-
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+msgstr "Opravdu chcete povolit %s kontaktovat vás?"
+
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "Blokovat uživatele"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Zadejte uživatele, kterého blokovat."
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Zadejte prosím jméno uživatele, kterého chcete blokovat."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "Blokovat"
-
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+msgid "_Block"
+msgstr "_Blokovat"
+
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "Blokovat %s?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "Jste si jisti, že chcete blokovat %s?"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+msgstr "Opravdu chcete blokovat %s?"
+
+#: ../src/gtkrequest.c:273 ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Ano"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: ../src/gtkrequest.c:274 ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "Ne"
 
-#: src/gtkrequest.c:263
+#: ../src/gtkrequest.c:277
 msgid "Apply"
 msgstr "Použít"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:278 ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gtkrequest.c:1796
+#: ../src/gtkrequest.c:1473
 msgid "That file already exists"
 msgstr "Tento soubor již existuje"
 
-#: src/gtkrequest.c:1797
+#: ../src/gtkrequest.c:1474
 msgid "Would you like to overwrite it?"
 msgstr "Chcete jej přepsat?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: ../src/gtkrequest.c:1518 ../src/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "Uložit soubor..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: ../src/gtkrequest.c:1519 ../src/gtkrequest.c:1560
 msgid "Open File..."
 msgstr "Otevřít soubor..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "_Přidat"
+
+#: ../src/gtkroomlist.c:354
 msgid "Room List"
 msgstr "Seznam místností"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:424
 msgid "_Get List"
 msgstr "_Získat seznam"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#. add button
+#: ../src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "_Přidat chat"
+
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
+#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "Titul"
 
-#: src/gtksavedstatuses.c:377
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+msgstr "Typ"
+
+#. Available status messages are plain text
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
+#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
+#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
+#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
+#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
+#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7794
+#: ../src/protocols/oscar/oscar.c:7808 ../src/protocols/oscar/oscar.c:7813
+#: ../src/protocols/oscar/oscar.c:8022 ../src/protocols/oscar/oscar.c:8034
+#: ../src/protocols/sametime/sametime.c:3274
+#: ../src/protocols/sametime/sametime.c:3280
+#: ../src/protocols/sametime/sametime.c:3286
+#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
+#: ../src/protocols/zephyr/zephyr.c:2261
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/gtksavedstatuses.c:451
-#, fuzzy
+#: ../src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
-msgstr "Statistika o serveru"
+msgstr "Uložené stavy"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
 msgid "_Use"
 msgstr "_Použít"
 
-#: src/gtksavedstatuses.c:584
+#: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:675
-#, fuzzy
-msgid "Custom status"
-msgstr "Podle stavu"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+msgstr "Název se již používá. Musíte zvolit jedinečný název."
+
+#: ../src/gtksavedstatuses.c:879
+msgid "Different"
+msgstr "Různé"
+
+#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
+#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
+#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
+#: ../src/protocols/yahoo/yahoo.c:2881
 msgid "Status"
 msgstr "Stav"
 
-#: src/gtksavedstatuses.c:797
-#, fuzzy
+#: ../src/gtksavedstatuses.c:1073
 msgid "_Title:"
-msgstr "Titul"
-
-#: src/gtksavedstatuses.c:817
-#, fuzzy
+msgstr "_Název:"
+
+#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
 msgid "_Status:"
-msgstr "Stav:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "_Stav:"
+
+#. Different status message expander
+#: ../src/gtksavedstatuses.c:1124
 msgid "Use a _different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:61
+msgstr "Používat _jiný stav pro některé účty"
+
+#. Save & Use button
+#: ../src/gtksavedstatuses.c:1188
+msgid "Sa_ve & Use"
+msgstr "Uložit _a použít"
+
+#: ../src/gtksavedstatuses.c:1394
+#, c-format
+msgid "Status for %s"
+msgstr "Stav pro %s"
+
+#: ../src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Kamarád se přihlásí"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Kamarád se odhlásí"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:63
 msgid "Message received"
 msgstr "Zpráva přijata"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "Přijatá zpráva začíná konverzaci"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:65
 msgid "Message sent"
 msgstr "Zpráva odeslána"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "Osoba vstoupí do chatu"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "Osoba opustí chat"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Vy mluvíte v chatu"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Jiní mluví v chatu"
 
-#: src/gtksound.c:72
+#: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Někdo v chatu řekne vaše jméno"
 
-#: src/gtksound.c:414
+#: ../src/gtksound.c:489
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Nemohu přehrát zvuk, protože zvolený soubor (%s) neexistuje."
 
-#: src/gtksound.c:430
+#: ../src/gtksound.c:505
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4431,7 +5077,7 @@
 "Nemohu přehrávat zvuk, protože byla zvolena metoda zvuku 'Příkaz', ale "
 "příkaz nebyl nastaven."
 
-#: src/gtksound.c:442
+#: ../src/gtksound.c:517
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4439,179 +5085,150 @@
 msgstr ""
 "Nemohu přehrávat zvuk, protože nastavený příkaz zvuku nemohl být spuštěn: %s"
 
-#: src/gtkstatusbox.c:197
-#, fuzzy
+#: ../src/gtkstatusbox.c:366
 msgid "Typing"
-msgstr "Ping"
+msgstr "Píše"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
+#: ../src/protocols/sametime/sametime.c:3693
+#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2571
+#: ../src/protocols/zephyr/zephyr.c:1547
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 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:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "Přítomen"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "Neviditelný"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "Odpojen"
-
-#: src/gtkstatusbox.c:299
-#, fuzzy
-msgid "Custom..."
-msgstr "Vlastní"
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
-msgid "Saved..."
-msgstr "Uložit soubor..."
-
-#: src/gtkstock.c:117
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/gtkstock.c:119
+#: ../src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "Zavřít _záložky"
+
+#: ../src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "_Získat info"
+
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "_Pozvat"
 
-#: src/gtkstock.c:120
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "Z_měnit"
 
-#: src/gtkstock.c:121
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "_Otevřít poštu"
 
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "_Varovat"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
+#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Došlo k neznáme chybě při přihlašování: %s."
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
+msgstr "Při načítání %s došlo k následující chybě: %s"
+
+#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
 msgid "Failed to load image"
-msgstr "Nemohu uložit obrázek: %s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
+msgstr "Nemohu načíst obrázek"
+
+#: ../src/gtkutils.c:1408
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "Nemohu odeslat soubor"
-
-#: src/gtkutils.c:1497
+msgstr "Nemohu odeslat složku %s."
+
+#: ../src/gtkutils.c:1410
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
-msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
+msgstr "Gaim neumí přenést složku. Budete muset soubory v ní přenést po jednom"
+
+#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
 msgid "You have dragged an image"
-msgstr "Zadali jste neplatné jméno uživatele"
-
-#: src/gtkutils.c:1526
+msgstr "Přetáhli jste obrázek"
+
+#: ../src/gtkutils.c:1439
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
+msgstr "Můžete tento obrázek odeslat jako přenos souboru, vložit jej do zprávy, nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
+
+#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
-msgstr "Zobrazovat _ikony kamarádů"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Nastavit jako ikonu kamaráda"
+
+#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
 msgid "Send image file"
-msgstr "Odeslat zprávu"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Odeslat soubor obrázku"
+
+#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
 msgid "Insert in message"
-msgstr "Vložit obrázek"
-
-#: src/gtkutils.c:1535
-#, fuzzy
+msgstr "Vložit do zprávy"
+
+#: ../src/gtkutils.c:1448
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Chcete se připojit k této konverzaci?"
-
-#: src/gtkutils.c:1540
+msgstr "Chcete jej nastavit jako ikonu kamaráda pro tohoto uživatele?"
+
+#: ../src/gtkutils.c:1453
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1542
+msgstr "Můžete tento obrázek odeslat jako přenos souboru, vložit jej do této zprávy, nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
+
+#: ../src/gtkutils.c:1455
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr ""
+msgstr "Můžete tento obrázek vložit do této zprávy nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
-#, fuzzy
+#: ../src/gtkutils.c:1509
 msgid "Cannot send launcher"
-msgstr "Nemohu odeslat soubor"
-
-#: src/gtkutils.c:1596
+msgstr "Nemohu odeslat spouštěč"
+
+#: ../src/gtkutils.c:1509
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
-msgstr ""
-
-#: src/log.c:129
+msgstr "Přetáhli jste spouštěč pracovní plochy. Pravděpodobně jste chtěli odeslat, na co tento spouštěč ukazuje, místo přímo tohoto spouštěče."
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/gtkwhiteboard.c:343 ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Odeslán požadavek o kreslení."
+
+#: ../src/log.c:167
 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:577
+#: ../src/log.c:549
+msgid "HTML"
+msgstr "HTML"
+
+#: ../src/log.c:560
+msgid "Plain text"
+msgstr "Prostý text"
+
+#: ../src/log.c:571
+msgid "Old Gaim"
+msgstr "Starý Gaim"
+
+#: ../src/log.c:666
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
+msgstr "Zaznamenávání této konverzace selhalo."
+
+#: ../src/log.c:1009
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: ../src/log.c:1077
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4620,7 +5237,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:906
+#: ../src/log.c:1079
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4629,21 +5246,40 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:957 src/log.c:1074
+#: ../src/log.c:1136 ../src/log.c:1262
 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:967 src/log.c:1086
+#: ../src/log.c:1148 ../src/log.c:1276
 #, 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:1019
+#: ../src/log.c:1205
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ODPOVĚĎ>: %s\n"
 
-#: src/plugin.c:331
+#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
+msgid "Unknown error"
+msgstr "Neznámá chyba"
+
+#: ../src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "Magie zásuvného modulu %d nesouhlasí (potřebuji %d)"
+
+#: ../src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "Verze ABI %d.%d.x nesouhlasí (potřebuji %d.%d.x)"
+
+#: ../src/plugin.c:458
+msgid "Plugin does not implement all required functions"
+msgstr "Zásuvný modul neimplementuje všechny vyžadované funkce"
+
+#: ../src/plugin.c:523
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4652,39 +5288,52 @@
 "Vyžadovaný zásuvný modul %s nebyl nalezen. Nainstalujte prosím tento zásuvný "
 "modul a zkuste to znovu."
 
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim nemohl načíst váš zásuvný modul."
-
-#: src/plugin.c:360
+#: ../src/plugin.c:528
+msgid "Gaim encountered errors loading the plugin."
+msgstr "Gaim se setkal s chybou při načítání zásuvného modulu."
+
+#: ../src/plugin.c:551
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vyžadovaný zásuvný modul %s nebylo možné načíst."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Nečinný"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#: ../src/plugin.c:555
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim nemohl načíst váš zásuvný modul."
+
+#: ../src/plugin.c:657
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "Závislý zásuvný modul %s nelze odebrat."
+
+#: ../src/plugin.c:662
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "Gaim se setkal s chybou při odebírání zásuvného modulu."
+
+#. Send a message about the connection error
+#: ../src/protocols/bonjour/bonjour.c:111
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "Nemohu poslouchat příchozí spojení IM\n"
+
+#: ../src/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Nemohu vytvořit spojení s místním serverem mDNS. Běží?"
+
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3251
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>Stav</b>: Skvělý"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+msgstr "\n<b>Stav</b>: %s"
+
+#: ../src/protocols/bonjour/bonjour.c:339
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
+msgstr "\n<b>Zpráva:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4696,350 +5345,375 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:433
+#: ../src/protocols/bonjour/bonjour.c:435
 msgid "Bonjour Protocol Plugin"
-msgstr "Zásuvný modul protokolu Yahoo"
+msgstr "Zásuvný modul protokolu Bonjour"
+
+#: ../src/protocols/bonjour/bonjour.c:471
+#: ../src/protocols/bonjour/bonjour.c:479
+#: ../src/protocols/bonjour/bonjour.c:537
+msgid "Gaim User"
+msgstr "Uživatel Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "Příjmení:"
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
+msgid "Hostname"
+msgstr "Jméno počítače"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
+#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
+#: ../src/protocols/gg/gg.c:971
 msgid "First name"
-msgstr "Křestní jméno:"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+msgstr "Křestní jméno"
+
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
 msgid "Last name"
-msgstr "Příjmení:"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
+msgstr "Příjmení"
+
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
+#: ../src/protocols/bonjour/jabber.c:357
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s zavřel konverzaci."
+
+#: ../src/protocols/bonjour/jabber.c:439
+msgid "Cannot open socket"
+msgstr "Nemohu otevřít socket"
+
+#: ../src/protocols/bonjour/jabber.c:447
+msgid "Error setting socket options"
+msgstr "Chyba při nastavování možností socketu"
+
+#: ../src/protocols/bonjour/jabber.c:458
+msgid "Cannot bind socket to port"
+msgstr "Nemohu připojit socket k portu"
+
+#: ../src/protocols/bonjour/jabber.c:465
+msgid "Cannot listen on socket"
+msgstr "Nemohu poslouchat na socketu"
+
+#: ../src/protocols/bonjour/jabber.c:559
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Nemohu odeslat zprávu, konverzaci nelze spustit."
+
+#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:137
+msgid "Token Error"
+msgstr "Chyba tokenu"
+
+#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
+#: ../src/protocols/gg/gg.c:138
+msgid "Unable to fetch the token.\n"
+msgstr "Nemohu získat token.\n"
+
+#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
 msgid "Save Buddylist..."
-msgstr "Odeslat seznam kamarádů"
-
-#: src/protocols/gg/gg.c:137
+msgstr "Uložit seznam kamarádů..."
+
+#: ../src/protocols/gg/gg.c:227
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
+msgstr "Váš seznam kamarádů je prázdný, do souboru nebylo nic zapsáno."
+
+#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
 msgid "Couldn't open file"
-msgstr "Nemohu odeslat soubor"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
+msgstr "Nemohu otevřít soubor"
+
+#: ../src/protocols/gg/gg.c:246
 msgid "Buddylist saved successfully!"
-msgstr "Heslo úspěšně změněno"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "Nemohu odeslat soubor"
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
+msgstr "Seznam kamarádů úspěšně uložen!"
+
+#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+msgid "Couldn't load buddylist"
+msgstr "Nemohu načíst seznam kamarádů"
+
+#: ../src/protocols/gg/gg.c:281
 msgid "Load Buddylist..."
-msgstr "_Alias kamaráda..."
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
+msgstr "Načíst seznam kamarádů..."
+
+#: ../src/protocols/gg/gg.c:282
 msgid "Buddylist loaded successfully!"
-msgstr "Heslo úspěšně změněno"
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
+msgstr "Seznam kamarádů úspěšně načten!"
+
+#: ../src/protocols/gg/gg.c:293
 msgid "Save buddylist..."
-msgstr "Odeslat seznam kamarádů"
-
-#: src/protocols/gg/gg.c:254
+msgstr "Uložit seznam kamarádů..."
+
+#: ../src/protocols/gg/gg.c:337
 msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
+msgstr "Vyplňte pole pro registraci."
+
+#: ../src/protocols/gg/gg.c:342
 msgid "Passwords do not match."
-msgstr "Nová hesla nesouhlasí."
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
+msgstr "Hesla nesouhlasí."
+
+#: ../src/protocols/gg/gg.c:351
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Nemohu vytvořit nové spojení."
-
-#: src/protocols/gg/gg.c:279
+msgstr "Nemohu zaregistrovat nový účet. Došlo k chybě.\n"
+
+#: ../src/protocols/gg/gg.c:364
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
+msgstr "Nový účet Gadu-Gadu zaregistrován"
+
+#: ../src/protocols/gg/gg.c:365
 msgid "Registration completed successfully!"
-msgstr "Registrace úspěšná"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+msgstr "Registrace úspěšně dokončena!"
+
+#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
+msgid "E-Mail"
+msgstr "Email"
+
+#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
+msgid "Password"
+msgstr "Heslo"
+
+#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+msgid "Password (retype)"
+msgstr "Heslo (znovu)"
+
+#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+msgid "Enter current token"
+msgstr "Zadejte aktuální token"
+
+#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+msgid "Current token"
+msgstr "Aktuální token"
+
+#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+msgid "Register New Gadu-Gadu Account"
+msgstr "Zaregistrovat nový účet Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:452
+msgid "Please, fill in the following fields"
+msgstr "Vyplňte prosím následující pole"
+
+#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
+msgid "Unable to initiate a new search"
+msgstr "Nemohu začít nové hledání"
+
+#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "Probíhá pro vás hledání. Počkejte prosím, než skončí."
+
+#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
+#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
+#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1035
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "City"
 msgstr "Město"
 
-#: src/protocols/gg/gg.c:417
+#: ../src/protocols/gg/gg.c:577
 msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
+msgstr "Rok narození"
+
+#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/yahoo/yahoo_profile.c:1060
+msgid "Gender"
+msgstr "Pohlaví"
+
+#: ../src/protocols/gg/gg.c:581
+msgid "Male or female"
+msgstr "Muž nebo žena"
+
+#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+msgid "Male"
+msgstr "Muž"
+
+#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+msgid "Female"
+msgstr "Žena"
+
+#: ../src/protocols/gg/gg.c:587
 msgid "Only online"
-msgstr "Připojen"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
+msgstr "Jen připojené"
+
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
 msgid "Find buddies"
-msgstr "Ztmavovat _nečinné kamarády"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
+msgstr "Hledat kamarády"
+
+#: ../src/protocols/gg/gg.c:593
 msgid "Please, enter your search criteria below"
-msgstr "Zadejte prosím své nové heslo"
-
-#: src/protocols/gg/gg.c:465
+msgstr "Zadejte prosím podmínky hledání níže"
+
+#: ../src/protocols/gg/gg.c:630
 msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
+msgstr "Vyplňte tato pole."
+
+#: ../src/protocols/gg/gg.c:642
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
+msgstr "Vaše aktuální heslo je jiné než to, které jste zadali."
+
+#: ../src/protocols/gg/gg.c:656
 msgid "Unable to change password. Error occured.\n"
-msgstr "Nemohu změnit heslo Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:500
-#, fuzzy
+msgstr "Nemohu změnit heslo. Došlo k chybě.\n"
+
+#: ../src/protocols/gg/gg.c:665
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Změnit heslo pro %s"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
+msgstr "Změnit heslo pro účet Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:666
 msgid "Password was changed successfully!"
-msgstr "Heslo úspěšně změněno"
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "Neznámá chyba"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "Nemohu získat seznam místností."
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
+msgstr "Heslo bylo úspěšně změněno!"
+
+#: ../src/protocols/gg/gg.c:699
 msgid "Current password"
-msgstr "Nesprávné heslo."
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Heslo"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Heslo odesláno"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s není momentálně přihlášen."
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
-msgid "Current token"
-msgstr "Momentálně na"
-
-#: src/protocols/gg/gg.c:574
-#, fuzzy
+msgstr "Aktuální heslo"
+
+#: ../src/protocols/gg/gg.c:724
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Zadejte prosím své aktuální a nové heslo."
-
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
+msgstr "Zadejte prosím své aktuální a nové heslo pro UIN: "
+
+#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
 msgid "Change Gadu-Gadu Password"
-msgstr "Nemohu změnit heslo Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
+msgstr "Změnit heslo Gadu-Gadu"
+
+#. TODO: s/screenname/alias/
+#: ../src/protocols/gg/gg.c:804
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Odstranit chat z vašeho seznamu kamarádů"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
+msgstr "Vyberte chat pro kamaráda: %s"
+
+#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
 msgid "Add to chat..."
-msgstr "Přidat _chat"
-
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "Nemohu číst ze socketu"
-
-#: src/protocols/gg/gg.c:959
+msgstr "Přidat k chatu..."
+
+#: ../src/protocols/gg/gg.c:950
+msgid "No matching users found"
+msgstr "Nenalezen žádný odpovídající uživatel"
+
+#: ../src/protocols/gg/gg.c:951
+msgid "There are no users matching your search criteria."
+msgstr "Neexistuje žádný uživatel odpovídající vašim podmínkám hledání."
+
+#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/oscar/oscar.c:6329
+msgid "Unable to display the search results."
+msgstr "Nemohu zobrazit výsledky hledání."
+
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
+msgid "UIN"
+msgstr "UIN"
+
+#: ../src/protocols/gg/gg.c:980
+msgid "Birth year"
+msgstr "Rok narození"
+
+#: ../src/protocols/gg/gg.c:1020
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: src/protocols/gg/gg.c:960
-#, fuzzy
+msgstr "Veřejný adresář Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:1021
 msgid "Search results"
 msgstr "Výsledky hledání"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "Připojen"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "Zaneprázdněn"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+msgid "Unable to read socket"
+msgstr "Nemohu číst ze socketu"
+
+#: ../src/protocols/gg/gg.c:1201
+msgid "Buddy list downloaded"
+msgstr "Seznam kamarádů stažen"
+
+#: ../src/protocols/gg/gg.c:1202
+msgid "Your buddy list was downloaded from the server."
+msgstr "Váš seznam kamarádů byl stažen ze serveru."
+
+#: ../src/protocols/gg/gg.c:1209
+msgid "Buddy list uploaded"
+msgstr "Seznam kamarádů odeslán"
+
+#: ../src/protocols/gg/gg.c:1210
+msgid "Your buddy list was stored on the server."
+msgstr "Váš seznam kamarádů byl uložen na serveru."
+
+#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+msgid "Connection failed."
+msgstr "Spojení selhalo."
+
+#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "Zablokován"
 
-#: src/protocols/gg/gg.c:1129
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1468
 msgid "Add to chat"
-msgstr "Přidat chat"
-
-#: src/protocols/gg/gg.c:1133
-#, fuzzy
+msgstr "Přidat k chatu"
+
+#: ../src/protocols/gg/gg.c:1477
 msgid "Unblock"
+msgstr "Odblokovat"
+
+#: ../src/protocols/gg/gg.c:1481
+msgid "Block"
 msgstr "Blokovat"
 
-#: src/protocols/gg/gg.c:1149
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1498
 msgid "Chat _name:"
-msgstr "Příjmení:"
-
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
-msgid "Connection failed."
-msgstr "Spojení selhalo"
-
-#: src/protocols/gg/gg.c:1357
-#, fuzzy
+msgstr "_Název chatu:"
+
+#: ../src/protocols/gg/gg.c:1724
 msgid "Chat error"
-msgstr "Chyba čtení"
-
-#: src/protocols/gg/gg.c:1358
-#, fuzzy
+msgstr "Chyba chatu"
+
+#: ../src/protocols/gg/gg.c:1725
 msgid "This chat name is already in use"
-msgstr "Tento soubor již existuje"
-
-#: src/protocols/gg/gg.c:1435
-#, fuzzy
+msgstr "Tento název chatu se již používá"
+
+#: ../src/protocols/gg/gg.c:1808
 msgid "Not connected to the server."
-msgstr "Byli jste odpojeni od serveru."
-
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "Email"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "Zaregistrovat nový účet Jabber"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
-msgid "Change password"
-msgstr "Změnit heslo"
-
-#: src/protocols/gg/gg.c:1520
-#, fuzzy
+msgstr "Nepřipojen k serveru."
+
+#: ../src/protocols/gg/gg.c:1831
+msgid "Find buddies..."
+msgstr "Hledat kamarády..."
+
+#: ../src/protocols/gg/gg.c:1837
+msgid "Change password..."
+msgstr "Změnit heslo..."
+
+#: ../src/protocols/gg/gg.c:1843
 msgid "Upload buddylist to Server"
-msgstr "Exportovat seznam kamarádů na serveru"
-
-#: src/protocols/gg/gg.c:1523
-#, fuzzy
+msgstr "Odeslat seznam kamarádů na server"
+
+#: ../src/protocols/gg/gg.c:1847
 msgid "Download buddylist from Server"
-msgstr "Odstranit seznam kamarádů ze serveru"
-
-#: src/protocols/gg/gg.c:1526
-#, fuzzy
+msgstr "Stáhnout seznam kamarádů ze serveru"
+
+#: ../src/protocols/gg/gg.c:1851
 msgid "Delete buddylist from Server"
 msgstr "Odstranit seznam kamarádů ze serveru"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
-msgid "Load buddylist from file"
-msgstr "Importovat seznam kamarádů ze serveru"
+#: ../src/protocols/gg/gg.c:1855
+msgid "Save buddylist to file..."
+msgstr "Uložit seznam kamarádů do souboru..."
+
+#: ../src/protocols/gg/gg.c:1859
+msgid "Load buddylist from file..."
+msgstr "Načíst seznam kamarádů ze serveru..."
 
 #. magic
 #. major_version
@@ -5052,119 +5726,119 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../src/protocols/gg/gg.c:1955
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Zásuvný modul protokolu Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../src/protocols/gg/gg.c:1956
 msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1665
-#, fuzzy
+msgstr "Populární polský IM"
+
+#: ../src/protocols/gg/gg.c:2004
 msgid "Gadu-Gadu User"
-msgstr "Vyhledávací stroj Gadu-Gadu"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+msgstr "Uživatel Gadu-Gadu"
+
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznámý příkaz: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/silc/silc.c:1294
 #, c-format
 msgid "current topic is: %s"
 msgstr "aktuální téma je: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/silc/silc.c:1298
 msgid "No topic is set"
 msgstr "Nenastaveno žádné téma"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
+#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
-msgstr "Přenos souborů zrušen"
-
-#: src/protocols/irc/dcc_send.c:273
+msgstr "Přenos souborů selhal"
+
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "Gaim nemohl otevřít poslouchající port."
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Chyba při zobrazování MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "MOTD není k dispozici"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "S tímto spojením není asociována MOTD."
 
-#: src/protocols/irc/irc.c:83
+#: ../src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD pro %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "Server se odpojil"
 
-#: src/protocols/irc/irc.c:188
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "Zobrazit MOTD"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanál:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: src/protocols/irc/irc.c:238
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "Přezdívky IRC nemohou obsahovat mezery"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
+#: ../src/protocols/jabber/jabber.c:890
 msgid "SSL support unavailable"
 msgstr "Podpora SSL není k dispozici"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
+#: ../src/protocols/simple/simple.c:1518
 msgid "Couldn't create socket"
 msgstr "Nemohu vytvořit socket"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
+#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
 msgid "Couldn't connect to host"
 msgstr "Nemohu se připojit k hostiteli"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
 msgid "SSL Handshake Failed"
 msgstr "Vyjednávání SSL selhalo"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "Chyba čtení"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Uživatelé"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
+#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Téma"
 
@@ -5176,34 +5850,37 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../src/protocols/irc/irc.c:877
 msgid "IRC Protocol Plugin"
 msgstr "Zásuvný modul protokolu IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../src/protocols/irc/irc.c:878
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Zásuvný modul protokolu IRC, který není tak špatný"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/jabber/jabber.c:1904
+#: ../src/protocols/napster/napster.c:719
+#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:825
+#: ../src/protocols/irc/irc.c:903
 msgid "Encodings"
 msgstr "Kódování"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
+#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
+#: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Jméno uživatele"
 
-#: src/protocols/irc/irc.c:831
+#: ../src/protocols/irc/irc.c:909
 msgid "Real name"
 msgstr "Skutečné jméno"
 
@@ -5211,159 +5888,170 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
-#, fuzzy
+#: ../src/protocols/irc/irc.c:917
 msgid "Use SSL"
-msgstr "SSL"
-
-#: src/protocols/irc/msgs.c:105
+msgstr "Používat SSL"
+
+#: ../src/protocols/irc/msgs.c:103
 msgid "Bad mode"
 msgstr "Špatný tah"
 
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:114
 #, c-format
 msgid "You are banned from %s."
 msgstr "Byl vám zakázán vstup do %s."
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:115
 msgid "Banned"
 msgstr "Zakázán"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:132
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Nemohu zakázat %s: seznam zakázaných je plný"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: src/protocols/irc/msgs.c:216
+#: ../src/protocols/irc/msgs.c:214
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:215
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikován)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
+#: ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1040
 msgid "Realname"
 msgstr "Skutečné jméno"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Momentálně na"
 
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:242
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Nečinný:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:244
 msgid "Online since"
 msgstr "Připojen od"
 
-#: src/protocols/irc/msgs.c:249
+#: ../src/protocols/irc/msgs.c:248
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Definující přídavné jméno:</b> Skvělý<br>"
 
-#: src/protocols/irc/msgs.c:317
+#: ../src/protocols/irc/msgs.c:318
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s změnil téma na: %s"
 
-#: src/protocols/irc/msgs.c:322
+#: ../src/protocols/irc/msgs.c:325
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Téma pro %s je: %s"
 
-#: src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:343
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Neznámá zpráva '%s'"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:344
 msgid "Unknown message"
 msgstr "Neznámá zpráva"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:344
 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:363
+msgstr "Gaim odeslal zprávu, které IRC server nerozuměl."
+
+#: ../src/protocols/irc/msgs.c:367
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uživatelé na %s: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: ../src/protocols/irc/msgs.c:495
 msgid "Time Response"
 msgstr "Odpověď s časem"
 
-#: src/protocols/irc/msgs.c:483
+#: ../src/protocols/irc/msgs.c:496
 msgid "The IRC server's local time is:"
 msgstr "Místní čas IRC serveru je:"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:507
 msgid "No such channel"
 msgstr "Takový kanál neexistuje"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../src/protocols/irc/msgs.c:518
 msgid "no such channel"
 msgstr "Takový kanál neexistuje"
 
-#: src/protocols/irc/msgs.c:508
+#: ../src/protocols/irc/msgs.c:521
 msgid "User is not logged in"
 msgstr "Uživatel není přihlášen"
 
-#: src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:526
 msgid "No such nick or channel"
 msgstr "Taková přezdívka nebo kanál neexistuje"
 
-#: src/protocols/irc/msgs.c:533
+#: ../src/protocols/irc/msgs.c:546
 msgid "Could not send"
 msgstr "Nemohu odeslat"
 
-#: src/protocols/irc/msgs.c:589
+#: ../src/protocols/irc/msgs.c:602
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Připojení se k %s vyžaduje pozvání."
 
-#: src/protocols/irc/msgs.c:590
+#: ../src/protocols/irc/msgs.c:603
 msgid "Invitation only"
 msgstr "Jen pro pozvané"
 
-#: src/protocols/irc/msgs.c:692
+#: ../src/protocols/irc/msgs.c:704
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Byli jste vykopnuti z %s: (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#. Remove user from channel
+#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Vykopnut od %s: (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: ../src/protocols/irc/msgs.c:732
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "režim (%s %s) od %s"
 
-#: src/protocols/irc/msgs.c:805
+#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
+msgid "Invalid nickname"
+msgstr "Neplatná přezdívka"
+
+#: ../src/protocols/irc/msgs.c:819
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr "Vámi zvolená přezdívka byla serverem odmítnuta. Pravděpodobně obsahuje neplatné znaky."
+
+#: ../src/protocols/irc/msgs.c:823
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5371,52 +6059,51 @@
 "Vámi zvolený název účtu byl serverem odmítnut. Pravděpodobně obsahuje "
 "neplatné znaky."
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:863
 msgid "Cannot change nick"
 msgstr "Nemohu změnit přezdívku"
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:863
 msgid "Could not change nick"
 msgstr "Nemohu změnit přezdívku"
 
-#: src/protocols/irc/msgs.c:865
+#: ../src/protocols/irc/msgs.c:884
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Opustili jste kanál%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: ../src/protocols/irc/msgs.c:926
 msgid "Error: invalid PONG from server"
 msgstr "Chyba: neplatný PONG od serveru"
 
-#: src/protocols/irc/msgs.c:909
+#: ../src/protocols/irc/msgs.c:928
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Odpověď na PING -- zpoždění: %lu sekund"
 
-#: src/protocols/irc/msgs.c:984
+#: ../src/protocols/irc/msgs.c:1003
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Nemohu se připojit k %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nemohu se připojit ke kanálu"
 
-#: src/protocols/irc/msgs.c:1019
-#, fuzzy
+#: ../src/protocols/irc/msgs.c:1038
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Služba je dočasně nedostupná."
-
-#: src/protocols/irc/msgs.c:1031
+msgstr "Přezdívka nebo kanál je dočasně nedostupná."
+
+#: ../src/protocols/irc/msgs.c:1050
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops od %s"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;akce, kterou provést&gt;: Provést akci."
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5424,7 +6111,11 @@
 "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:116
+#: ../src/protocols/irc/parse.c:116
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: Odeslat příkaz chanservu"
+
+#: ../src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5432,7 +6123,7 @@
 "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:117
+#: ../src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5442,7 +6133,7 @@
 "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:118
+#: ../src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5450,7 +6141,7 @@
 "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:119
+#: ../src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5459,7 +6150,7 @@
 "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:120
+#: ../src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5468,7 +6159,7 @@
 "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:121
+#: ../src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5476,7 +6167,7 @@
 "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:122
+#: ../src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5484,19 +6175,21 @@
 "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:123
+#: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;akce, kterou provést&gt;: Provést akci."
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:125
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: Odeslat příkaz memoservu"
+
+#: ../src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;přezdívka|kanál&gt;: Nastavit nebo zrušit "
-"řežim kanálu nebo uživatele."
-
-#: src/protocols/irc/parse.c:125
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;přezdívka|kanál&gt;: Nastavit nebo zrušit režim kanálu nebo uživatele."
+
+#: ../src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5504,15 +6197,19 @@
 "msg &lt;přezdívka&gt; &lt;zpráva&gt;: Poslat soukromou zprávu uživateli (ne "
 "kanálu)."
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:128
 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:127 src/protocols/jabber/jabber.c:1555
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nová přezdívka&gt;: Změnit vaši přezdívku."
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:130
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: Odeslat příkaz nickservu"
+
+#: ../src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5520,7 +6217,7 @@
 "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:129
+#: ../src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5528,7 +6225,11 @@
 "operwall &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
 "použít."
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:133
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: Odeslat příkaz operservu"
+
+#: ../src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5536,7 +6237,7 @@
 "part [místnost] [zpráva]: Opustit aktuální nebo určený kanál s nepovinnou "
 "zprávou."
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5544,7 +6245,7 @@
 "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:132
+#: ../src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5552,15 +6253,15 @@
 "query &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat soukromou zprávu uživateli "
 "(ne kanálu)."
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:137
 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/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Poslat serveru nezpracovaný příkaz."
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5568,19 +6269,19 @@
 "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:136
+#: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Zobrazí momentální místní čas na IRC serveru."
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nové téma]: Zobrazit nebo změnit téma kanálu."
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Nastavit nebo zrušit režim uživatele."
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5588,7 +6289,7 @@
 "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:140
+#: ../src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5596,31 +6297,31 @@
 "wallops &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
 "použít."
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [server] &lt;přezdívka&gt;: Ziskat informace o uživateli."
-
-#: src/protocols/irc/parse.c:422
+msgstr "whois [server] &lt;přezdívka&gt;: Získat informace o uživateli."
+
+#: ../src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Čas odpovědi z %s: %lu sekund"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "Odpověď na CTCP PING"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
+#: ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Odpojen."
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5628,26 +6329,26 @@
 "Server pro přihlášení vyžaduje TLS/SSL. Zvolte \"Používat TLS, pokud je k "
 "dispozici\" ve vlastnostech účtu"
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vyžaduje textovou autentizaci v nešifrovaném proudu"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "Neplatná odpověď od serveru."
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:234
+msgid "Server couldn't authenticate you without a password"
+msgstr "Server vás nemohl bez hesla autentizovat"
+
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "Textová autentizace"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5655,719 +6356,726 @@
 "Tento server vyžaduje textovou autentizaci přes nešifrované spojení. Povolit "
 "a pokračovat v autentizaci?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "Server nepoužívá žádnou podporovanou metodu autentizace"
 
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "Neplatná odpověď od serveru."
+
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "Neplatná výzva od serveru"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: ../src/protocols/jabber/auth.c:719
+msgid "SASL error"
+msgstr "Chyba SASL"
+
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Celé jméno"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Příjmení"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
 msgid "Given Name"
 msgstr "Křestní jméno"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
 msgid "Street Address"
 msgstr "Adresa ulice"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
 msgid "Extended Address"
 msgstr "Rozšířená adresa"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
 msgid "Locality"
 msgstr "Lokalita"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "PSČ"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Země"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:768
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "Název organizace"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
 msgid "Organization Unit"
 msgstr "Jednotka organizace"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
+#: ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "Datum narození"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Upravit vCard Jabberu"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:569
 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:616
-msgid "Jabber ID"
-msgstr "ID Jabberu"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
 msgid "Resource"
 msgstr "Zdroj"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Prostřední jméno"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
+#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adresa"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:725
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../src/protocols/jabber/buddy.c:1042
 msgid "Un-hide From"
 msgstr "Zrušit skrytí Od"
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../src/protocols/jabber/buddy.c:1046
 msgid "Temporarily Hide From"
 msgstr "Dočasně skrýt Od"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1054
 msgid "Cancel Presence Notification"
 msgstr "Zrušit upozornění na přítomnosti"
 
-#: src/protocols/jabber/buddy.c:1051
+#: ../src/protocols/jabber/buddy.c:1061
 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:1059
+#: ../src/protocols/jabber/buddy.c:1070
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Chyba"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Pryč na dlouho"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8051
+#: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "Nerušit"
 
-#: src/protocols/jabber/buddy.c:1235
+#: ../src/protocols/jabber/buddy.c:1289
 msgid "The following are the results of your search"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1327
+msgstr "Výsledky vašeho hledání jsou následující"
+
+#: ../src/protocols/jabber/buddy.c:1388
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+msgstr "Vyplňte jedno nebo více polí pro hledání odpovídajících uživatelů Jabberu."
+
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Křestní jméno"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../src/protocols/jabber/buddy.c:1407
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
 msgid "Search for Jabber users"
-msgstr "Hledat kamaráda podle emailové adresy"
-
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
+msgstr "Hledat uživatele Jabberu"
+
+#: ../src/protocols/jabber/buddy.c:1431
 msgid "Invalid Directory"
-msgstr "Neplatná chyba"
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
+msgstr "Neplatný adresář"
+
+#: ../src/protocols/jabber/buddy.c:1448
 msgid "Enter a User Directory"
-msgstr "Nemohu odeslat adresář."
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
+msgstr "Zadejte adresář uživatelů"
+
+#: ../src/protocols/jabber/buddy.c:1449
 msgid "Select a user directory to search"
-msgstr "Zvolte server konference, kterého se ptát"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
+msgstr "Zvolte adresář uživatelů, ve kterém hledat"
+
+#: ../src/protocols/jabber/buddy.c:1452
 msgid "Search Directory"
-msgstr "_Hledat:"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+msgstr "Hledat v adresáři"
+
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
+#: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Místnost:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Přezdívka:"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s není platný název místnosti"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Neplatný název místnosti"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s není platný název serveru"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Neplatný název serveru"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s není platná přezdívka místnosti"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Neplatná přezdívka místnosti"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Chyba nastavení"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Nemohu nastavit"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Chyba nastavení místnosti"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Tuto místnost není možné nastavovat"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Chyba registrace"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Změna přezdívky není podporována v ne-MUC místnostech"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
-#, fuzzy
+#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Chyba při získávání seznamu místností"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Neplatný server"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Zadejte server konference"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Zvolte server konference, kterého se ptát"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Hledat místnosti"
 
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Chyba při inicializaci sezení"
 
-#: src/protocols/jabber/jabber.c:215
+#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:303
 msgid "Write error"
 msgstr "Chyba zápisu"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
 msgid "Read Error"
 msgstr "Chyba čtení"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
 msgid "Unable to create socket"
 msgstr "Nemohu vytvořit socket"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
 msgid "Invalid Jabber ID"
 msgstr "Neplatné ID Jabberu"
 
-#: src/protocols/jabber/jabber.c:473
+#: ../src/protocols/jabber/jabber.c:590
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrace %s@%s úspěšná"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
 msgid "Registration Successful"
 msgstr "Registrace úspěšná"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
 msgid "Unknown Error"
 msgstr "Neznámá chyba"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
 msgid "Registration Failed"
 msgstr "Registrace selhala"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
 msgid "Already Registered"
 msgstr "Již zaregistrován"
 
-#: src/protocols/jabber/jabber.c:643
-msgid "E-Mail"
-msgstr "Email"
-
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
+#: ../src/protocols/oscar/oscar.c:6227
 msgid "State"
 msgstr "Stát"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:693
+#: ../src/protocols/jabber/jabber.c:810
 msgid "Date"
 msgstr "Datum"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../src/protocols/jabber/jabber.c:818
 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:704 src/protocols/jabber/jabber.c:705
+#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
 msgstr "Zaregistrovat nový účet Jabber"
 
-#: src/protocols/jabber/jabber.c:842
+#: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
 msgstr "Inicializuji proud"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:998
 msgid "Re-initializing Stream"
 msgstr "Reinicializuji proud"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
+#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7841
 msgid "Not Authorized"
 msgstr "Neautorizován"
 
-#: src/protocols/jabber/jabber.c:971
+#: ../src/protocols/jabber/jabber.c:1110
 msgid "Both"
 msgstr "Obojí"
 
-#: src/protocols/jabber/jabber.c:973
+#: ../src/protocols/jabber/jabber.c:1112
 msgid "From (To pending)"
 msgstr "Z (do čeká)"
 
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "Z"
-
-#: src/protocols/jabber/jabber.c:978
+#: ../src/protocols/jabber/jabber.c:1117
 msgid "To"
 msgstr "Do"
 
-#: src/protocols/jabber/jabber.c:980
+#: ../src/protocols/jabber/jabber.c:1119
 msgid "None (To pending)"
 msgstr "Žádné (do čeká)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "Žádné"
-
-#: src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "Subscription"
 msgstr "Přihlášení"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
+#: ../src/protocols/jabber/jabber.c:1220
 msgid "Priority"
-msgstr "Port"
-
-#: src/protocols/jabber/jabber.c:1093
+msgstr "Priorita"
+
+#: ../src/protocols/jabber/jabber.c:1249
 msgid "Password Changed"
 msgstr "Heslo změněno"
 
-#: src/protocols/jabber/jabber.c:1094
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Your password has been changed."
 msgstr "Vaše heslo bylo změněno."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
 msgid "Error changing password"
 msgstr "Chyba při změně hesla"
 
-#: src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/jabber/jabber.c:1311
 msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
 msgid "Change Jabber Password"
 msgstr "Změnit heslo Jabberu"
 
-#: src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1317
 msgid "Please enter your new password"
 msgstr "Zadejte prosím své nové heslo"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Nastavit informace o uživateli"
+#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8475
+#: ../src/protocols/silc/silc.c:1023
+msgid "Set User Info..."
+msgstr "Nastavit informace o uživateli..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Změnit heslo"
+#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8486
+#: ../src/protocols/silc/silc.c:1019
+msgid "Change Password..."
+msgstr "Změnit heslo..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
-msgstr "_Hledat:"
-
-#: src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1337
+msgid "Search for Users..."
+msgstr "Hledat uživatele..."
+
+#: ../src/protocols/jabber/jabber.c:1413
 msgid "Bad Request"
 msgstr "Špatný požadavek"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1415
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: src/protocols/jabber/jabber.c:1261
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Feature Not Implemented"
 msgstr "Funkce neimplementována"
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Forbidden"
 msgstr "Zakázáno"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Gone"
 msgstr "Pryč"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
 msgid "Internal Server Error"
 msgstr "Interní chyba serveru"
 
-#: src/protocols/jabber/jabber.c:1269
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Item Not Found"
 msgstr "Položka nenalezena"
 
-#: src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/jabber/jabber.c:1427
 msgid "Malformed Jabber ID"
 msgstr "Neplatné ID Jabberu"
 
-#: src/protocols/jabber/jabber.c:1273
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Not Acceptable"
 msgstr "Nepřijatelné"
 
-#: src/protocols/jabber/jabber.c:1275
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Not Allowed"
 msgstr "Nepovoleno"
 
-#: src/protocols/jabber/jabber.c:1279
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Payment Required"
 msgstr "Je vyžadována platba"
 
-#: src/protocols/jabber/jabber.c:1281
+#: ../src/protocols/jabber/jabber.c:1437
 msgid "Recipient Unavailable"
-msgstr "Přejemce nedostupný"
-
-#: src/protocols/jabber/jabber.c:1285
+msgstr "Příjemce nedostupný"
+
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Registration Required"
 msgstr "Je vyžadována registrace"
 
-#: src/protocols/jabber/jabber.c:1287
+#: ../src/protocols/jabber/jabber.c:1443
 msgid "Remote Server Not Found"
 msgstr "Vzdálený server nenalezen"
 
-#: src/protocols/jabber/jabber.c:1289
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Remote Server Timeout"
 msgstr "Vzdálenému serveru vypršel čas"
 
-#: src/protocols/jabber/jabber.c:1291
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Server Overloaded"
 msgstr "Server přetížen"
 
-#: src/protocols/jabber/jabber.c:1293
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Service Unavailable"
 msgstr "Služba nedostupná"
 
-#: src/protocols/jabber/jabber.c:1295
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Subscription Required"
 msgstr "Vyžadováno přihlášení"
 
-#: src/protocols/jabber/jabber.c:1297
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Unexpected Request"
 msgstr "Neočekávaný požadavek"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1460
 msgid "Authorization Aborted"
 msgstr "Autorizace přerušena"
 
-#: src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/jabber/jabber.c:1462
 msgid "Incorrect encoding in authorization"
 msgstr "Neplatné kódování v autorizaci"
 
-#: src/protocols/jabber/jabber.c:1309
+#: ../src/protocols/jabber/jabber.c:1465
 msgid "Invalid authzid"
 msgstr "Neplatné autzid"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1468
 msgid "Invalid Authorization Mechanism"
 msgstr "Neplatný mechanismus autorizace"
 
-#: src/protocols/jabber/jabber.c:1315
+#: ../src/protocols/jabber/jabber.c:1471
 msgid "Authorization mechanism too weak"
 msgstr "Mechanismus autorizace příliš slabý"
 
-#: src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1476
 msgid "Temporary Authentication Failure"
 msgstr "Dočasné selhání autentizace"
 
-#: src/protocols/jabber/jabber.c:1322
+#: ../src/protocols/jabber/jabber.c:1479
 msgid "Authentication Failure"
 msgstr "Selhání autentizace"
 
-#: src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Bad Format"
 msgstr "Špatný formát"
 
-#: src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1485
 msgid "Bad Namespace Prefix"
 msgstr "Špatná předpona prostoru jmen"
 
-#: src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1488
 msgid "Resource Conflict"
 msgstr "Konflikt zdrojů"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Spojení vypršel čas"
 
-#: src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Host Gone"
 msgstr "Počítač zmizel"
 
-#: src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1494
 msgid "Host Unknown"
 msgstr "Neznámý počítač"
 
-#: src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Improper Addressing"
 msgstr "Nesprávné adresování"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Invalid ID"
 msgstr "Neplatné ID"
 
-#: src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1502
 msgid "Invalid Namespace"
 msgstr "Neplatný prostor jmen"
 
-#: src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid XML"
 msgstr "Neplatné XML"
 
-#: src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Non-matching Hosts"
 msgstr "Neodpovídající počítače"
 
-#: src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Policy Violation"
 msgstr "Porušení pravidel"
 
-#: src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1512
 msgid "Remote Connection Failed"
 msgstr "Selhalo vzdálené připojení"
 
-#: src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Resource Constraint"
 msgstr "Omezení zdrojů"
 
-#: src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Restricted XML"
 msgstr "Omezené XML"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "See Other Host"
 msgstr "Zobrazit druhý počítač"
 
-#: src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "System Shutdown"
 msgstr "Vypnutí systému"
 
-#: src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "Undefined Condition"
 msgstr "Nedefinovaná podmínka"
 
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "Unsupported Encoding"
 msgstr "Nepodporované kódování"
 
-#: src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Unsupported Stanza Type"
 msgstr "Nepodporovaný typ stanza"
 
-#: src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Version"
 msgstr "Nepodporovaná verze"
 
-#: src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "XML Not Well Formed"
 msgstr "XML není well-formed"
 
-#: src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Stream Error"
 msgstr "Chyba proudu"
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1599
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nemohu zakázat uživatele %s"
 
-#: src/protocols/jabber/jabber.c:1464
-#, fuzzy, c-format
+#: ../src/protocols/jabber/jabber.c:1619
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Neznámý příkaz: %s"
-
-#: src/protocols/jabber/jabber.c:1469
-#, fuzzy, c-format
+msgstr "Neznámý vztah: \"%s\""
+
+#: ../src/protocols/jabber/jabber.c:1624
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Nemohu pozvat uživatele (%s)."
-
-#: src/protocols/jabber/jabber.c:1521
+msgstr "Nemohu nastavit vztah uživatele %s na \"%s\""
+
+#: ../src/protocols/jabber/jabber.c:1643
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "Neznámá role: \"%s\""
+
+#: ../src/protocols/jabber/jabber.c:1650
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Nemohu nastavit roli \"%s\" uživateli: %s"
+
+#: ../src/protocols/jabber/jabber.c:1703
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nemohu vykopnout uživatele %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: ../src/protocols/jabber/jabber.c:1734
 msgid "config:  Configure a chat room."
 msgstr "config: Nastavit místnost chatu."
 
-#: src/protocols/jabber/jabber.c:1551
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "configure:  Configure a chat room."
 msgstr "configure: Nastavit místnost chatu."
 
-#: src/protocols/jabber/jabber.c:1560
+#: ../src/protocols/jabber/jabber.c:1747
 msgid "part [room]:  Leave the room."
 msgstr "part [místnost]: Opustit místnost."
 
-#: src/protocols/jabber/jabber.c:1565
+#: ../src/protocols/jabber/jabber.c:1752
 msgid "register:  Register with a chat room."
-msgstr "register: Zaregistrovat se u místnísti chatu."
-
-#: src/protocols/jabber/jabber.c:1571
+msgstr "register: Zaregistrovat se u místnosti chatu."
+
+#: ../src/protocols/jabber/jabber.c:1758
 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:1577
+#: ../src/protocols/jabber/jabber.c:1764
 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:1583
+#: ../src/protocols/jabber/jabber.c:1770
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1589
-#, fuzzy
+msgstr "affiliate &lt;uživatel&gt; &lt;owner|admin|member|outcast|none&gt;: Nastavit uživatelův vztah k místnosti."
+
+#: ../src/protocols/jabber/jabber.c:1776
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr "role &lt;uživatel&gt; &lt;moderator|participant|visitor|none&gt;: Nastavit uživatelovu roli v místnosti."
+
+#: ../src/protocols/jabber/jabber.c:1782
 msgid "invite &lt;user&gt; [message]:  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:1595
+msgstr "invite &lt;uživatel&gt; [zpráva]: Pozvat uživatele do místnosti."
+
+#: ../src/protocols/jabber/jabber.c:1788
 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:1601
+#: ../src/protocols/jabber/jabber.c:1794
 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:1606
+#: ../src/protocols/jabber/jabber.c:1799
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -6384,96 +7092,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
 msgid "Jabber Protocol Plugin"
 msgstr "Zásuvný modul protokolu Jabber"
 
-#: src/protocols/jabber/jabber.c:1714
+#: ../src/protocols/jabber/jabber.c:1910
 msgid "Use TLS if available"
 msgstr "Používat TLS, pokud je k dispozici"
 
-#: src/protocols/jabber/jabber.c:1719
+#: ../src/protocols/jabber/jabber.c:1915
 msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
-#, fuzzy
+msgstr "Vyžadovat TLS"
+
+#: ../src/protocols/jabber/jabber.c:1918
 msgid "Force old (port 5223) SSL"
-msgstr "Vnutit staré SSL"
-
-#: src/protocols/jabber/jabber.c:1727
+msgstr "Vnutit staré SSL (port 5223)"
+
+#: ../src/protocols/jabber/jabber.c:1923
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Povolit textovou autentizaci po nešifrovaných proudech"
 
-#: src/protocols/jabber/jabber.c:1732
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1760
 msgid "Connect port"
-msgstr "Připojit"
+msgstr "Port spojení"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Server spojení"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Zpráva od %s"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s změnil téma na: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "Téma je: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Doručení zprávy pro %s selhalo: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Chyba zprávy Jabberu"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:300
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kód %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "Chyba zpracování XML"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:309
 msgid "Unknown Error in presence"
 msgstr "Neznámá chyba v přítomnosti"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů."
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "Autorizovat"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
-msgstr "Zamítnout"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
+#: ../src/protocols/oscar/oscar.c:7476
+msgid "_Authorize"
+msgstr "_Autorizovat"
+
+#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
+#: ../src/protocols/oscar/oscar.c:7477
+msgid "_Deny"
+msgstr "_Zamítnout"
+
+#: ../src/protocols/jabber/presence.c:380
+#: ../src/protocols/jabber/presence.c:381
 msgid "Create New Room"
-msgstr "Vytvočit novou místnost"
-
-#: src/protocols/jabber/presence.c:347
+msgstr "Vytvořit novou místnost"
+
+#: ../src/protocols/jabber/presence.c:382
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6481,39 +7186,39 @@
 "Vytváříte novou místnost. Chcete ji nastavit nebo použít implicitní "
 "nastavení?"
 
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr "Nastavit místnost"
-
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "Použít implicitní"
-
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:384
+msgid "_Configure Room"
+msgstr "_Nastavit místnost"
+
+#: ../src/protocols/jabber/presence.c:386
+msgid "_Accept Defaults"
+msgstr "_Přijmout implicitní"
+
+#: ../src/protocols/jabber/presence.c:423
 #, c-format
 msgid "Error in chat %s"
 msgstr "Chyba v chatu %s"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:426
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Chyba při připojování k chatu %s"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:726
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Nemohu odeslat soubor %s, uživatel nepodporuje přenosy souborů"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
 msgid "File Send Failed"
 msgstr "Odeslání souboru selhalo"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problém se synchronizací seznamu kamarádů v %s (%s)"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6522,7 +7227,7 @@
 "%s na místním seznamu je ve skupině \"%s\", ale ne v seznamu na serveru. "
 "Chcete přidat tohoto kamaráda?"
 
-#: src/protocols/msn/dialog.c:105
+#: ../src/protocols/msn/dialog.c:106
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6531,263 +7236,263 @@
 "%s je na místním seznamu, ale ne v seznamu na serveru. Chcete přidat tohoto "
 "kamaráda?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Nemohu zpracovat zprávu"
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaktická chyba (pravděpodobně chyba v Gaim)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "Neplatná e-mailová adresa"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "Uživatel neexistuje"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Chybí plně kvalifikovaný název domény"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Již přihlášen"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Neplatné jméno uživatele"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Neplatné přátelské jméno"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Seznam plný"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "Již tam"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Ne na seznamu"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "Uživatel je odpojen"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Již v daném režimu"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Již v opačném seznamu"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Příliš mnoho skupin"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Neplatná skupina"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "Uživatel není ve skupině"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Název skupiny příliš dlouhý"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Nemohu odstranit skupinu nula"
 
-#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "Pokus přidat kontakt do skupiny, která neexistuje"
-
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:95
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "Pokus přidat uživatele do skupiny, která neexistuje"
+
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Ústředna selhala"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Přenos upozornění selhal"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Vyžadovaná pole chybí"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "Příliš mnoho výsledků FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
 msgid "Not logged in"
 msgstr "Nepřihlášen."
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Služba momentálně není k dispozici"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Chyba databázového serveru"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Příkaz zakázán"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Chyba práce se soubory"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Chyba alokace paměti"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "Serveru odeslána špatná hodnota CHL"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Server zaneprázdněn"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Server nedostupný"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Server upozornění na partnera nedostupný"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Chyba připojení k databázi"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Server se vypíná (opusťte loď)"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Chyba vytváření spojení"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametry CVR nejsou známy nebo nejsou povoleny"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Nemohu zapisovat"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Sezení přetíženo"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "Uživatel je příliš aktivní"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Příliš mnoho sezení"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport nebyl ověřen"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "Špatný soubor přátel"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Neočekáváno"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "Přátelské jméno se mění příliš rychle"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Server je příliš zaneprázdněn"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
+#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Autentizace selhala"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Nedovoleno při odpojení"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Nepřijímám nové uživatele"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Passport dítěte bez souhlasu rodiče"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Účet passport ještě nebyl ověřen"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Špatný lístek"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Neznámý kód chyby %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Chyba MSN: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: src/protocols/msn/msn.c:138
+msgstr "Právě jste odeslali šťouchnutí!"
+
+#: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše nové přátelské jméno MSN je příliš dlouhé."
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Nastavit vaše přátelské jméno"
 
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Toto je jméno, pod kterým vás budou vidět ostatní kamarádi MSN."
 
-#: src/protocols/msn/msn.c:263
+#: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Nastavte své domácí telefonní číslo."
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Nastavte své pracovní telefonní číslo."
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Nastavte své mobilní telefonní číslo."
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Povolit stránky MSN Mobile?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307
 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?"
@@ -6795,29 +7500,29 @@
 "Chcete povolit nebo zakázat lidem na svém seznamu kamarádů posílat vám "
 "stránky MSN Mobile na váš mobilní telefon nebo jiné mobilní zařízení?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Povolit"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Zakázat"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: src/protocols/msn/msn.c:354
+msgstr "Tento účet Hotmail možná není aktivní."
+
+#: ../src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Odeslat mobilní zprávu."
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Stránka"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
+#: ../src/protocols/yahoo/yahoo.c:2881 ../src/protocols/yahoo/yahoo.c:2887
 #, c-format
 msgid ""
 "\n"
@@ -6826,67 +7531,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: ../src/protocols/msn/msn.c:557
 msgid "Has you"
 msgstr "Má vás"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
 msgid "Be Right Back"
 msgstr "Hned budu zpátky"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2712 ../src/protocols/yahoo/yahoo.c:3292
+msgid "Busy"
+msgstr "Zaneprázdněn"
+
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
+#: ../src/protocols/yahoo/yahoo.c:3304
+msgid "On the Phone"
 msgstr "Telefonuji"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
+#: ../src/protocols/yahoo/yahoo.c:3310
+msgid "Out to Lunch"
 msgstr "Na obědě"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "Skryt"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "Nastavit přátelské jméno"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "Nastavit domácí telefonní číslo"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "Nastavit pracovní telefonní číslo"
-
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "Nastavit mobilní telefonní číslo"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "Povolit/zakázat mobilní zařízení"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "Povolit/zakázat mobilní stránky"
-
-#: src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:623
+msgid "Set Friendly Name..."
+msgstr "Nastavit přátelské jméno..."
+
+#: ../src/protocols/msn/msn.c:628
+msgid "Set Home Phone Number..."
+msgstr "Nastavit domácí telefonní číslo..."
+
+#: ../src/protocols/msn/msn.c:632
+msgid "Set Work Phone Number..."
+msgstr "Nastavit pracovní telefonní číslo..."
+
+#: ../src/protocols/msn/msn.c:636
+msgid "Set Mobile Phone Number..."
+msgstr "Nastavit mobilní telefonní číslo..."
+
+#: ../src/protocols/msn/msn.c:642
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Povolit/zakázat mobilní zařízení..."
+
+#: ../src/protocols/msn/msn.c:647
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Povolit/zakázat mobilní stránky..."
+
+#: ../src/protocols/msn/msn.c:657
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+msgstr "Otevřít Příchozí poštu Hotmailu"
+
+#: ../src/protocols/msn/msn.c:681
 msgid "Send to Mobile"
 msgstr "Odeslat na mobil"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
 msgid "Initiate _Chat"
 msgstr "Začít _chat"
 
-#: src/protocols/msn/msn.c:717
+#: ../src/protocols/msn/msn.c:729
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6894,89 +7601,85 @@
 "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:745
+#: ../src/protocols/msn/msn.c:757
 msgid "Failed to connect to server."
 msgstr "Nemohu se připojit k serveru."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
 #, 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:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: ../src/protocols/msn/msn.c:1456
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Chyba při získávání profilu"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
 msgid "Age"
 msgstr "Věk"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Pohlaví"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
-msgid "Marital Status"
-msgstr "Stav"
-
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
-msgid "Location"
-msgstr "Umístění"
-
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Occupation"
 msgstr "Zaměstnání"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
-msgid "A Little About Me"
-msgstr "Něco o mě"
-
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
-msgid "Favorite Things"
-msgstr "Oblíbené věci"
-
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1045
+msgid "Location"
+msgstr "Umístění"
+
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
 msgid "Hobbies and Interests"
 msgstr "Koníčky a zájmy"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
+#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
+#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
+msgid "A Little About Me"
+msgstr "Něco o mě"
+
+#. Social
+#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
+msgid "Marital Status"
+msgstr "Stav"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
+#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
 msgid "Favorite Quote"
 msgstr "Oblíbený citát"
 
-#: src/protocols/msn/msn.c:1696
+#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
+#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
+msgid "Favorite Things"
+msgstr "Oblíbené věci"
+
+#: ../src/protocols/msn/msn.c:1765
 msgid "Last Updated"
 msgstr "Naposledy aktualizováno"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1802
 msgid "The user has not created a public profile."
 msgstr "Uživatel nevytvořit veřejný profil."
 
-#: src/protocols/msn/msn.c:1730
+#: ../src/protocols/msn/msn.c:1803
 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 "
@@ -6985,7 +7688,7 @@
 "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:1734
+#: ../src/protocols/msn/msn.c:1807
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6993,7 +7696,8 @@
 "Gaim nemohl najít v profilu uživatele žádné informace. Uživatel "
 "pravděpodobně neexistuje."
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/yahoo/yahoo_profile.c:1202
 msgid "Profile URL"
 msgstr "URL profilu"
 
@@ -7007,77 +7711,85 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
 msgid "MSN Protocol Plugin"
 msgstr "Zásuvný modul protokolu MSN"
 
-#: src/protocols/msn/msn.c:1963
+#: ../src/protocols/msn/msn.c:2043
 msgid "Login server"
 msgstr "Přihlašovací server"
 
-#: src/protocols/msn/msn.c:1972
+#: ../src/protocols/msn/msn.c:2052
 msgid "Use HTTP Method"
 msgstr "Používat metodu HTTP"
 
-#: src/protocols/msn/msn.c:1980
-#, fuzzy
-msgid "nudge: nudge a contact to get their attention"
-msgstr "buzz: Zkusit získat pozornost kontaktu zazvoněním"
-
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/msn/msn.c:2057
+msgid "Show custom smileys"
+msgstr "Zobrazovat systémové smajlíky"
+
+#: ../src/protocols/msn/msn.c:2065
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: získat pozornost uživatele šťouchnutím"
+
+#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Unable to connect"
 msgstr "Nemohu se připojit"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s není platná skupina."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
 
-#: src/protocols/msn/notification.c:498
+#: ../src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Nemohu přidat uživatele do %s (%s)"
 
-#: src/protocols/msn/notification.c:502
+#: ../src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Nemohu zablokovat uživatele na %s (%s)"
 
-#: src/protocols/msn/notification.c:506
+#: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Nemohu povolit uživatele na %s (%s)"
 
-#: src/protocols/msn/notification.c:514
+#: ../src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s nelze přidat, protože váš seznam kamarádů je plný."
 
-#: src/protocols/msn/notification.c:523
+#: ../src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s není platný účet passport."
 
-#: src/protocols/msn/notification.c:815
+#: ../src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Služba dočasně není k dispozici."
+
+#: ../src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "Nemohu přejmenovat skupinu"
 
-#: src/protocols/msn/notification.c:870
+#: ../src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "Nemohu odstranit skupinu"
 
-#: src/protocols/msn/notification.c:1303
+#: ../src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7109,200 +7821,209 @@
 "\n"
 "Až bude údržba dokončena, budete se moci přihlásit."
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Chyba zápisu"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Chyba čtení"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "Neznámá chyba"
-
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: ../src/protocols/msn/servconn.c:144
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Chyba spojení od serveru %s (%s):\n"
+"Chyba spojení od serveru %s:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "Server nepodporuje náš protokol."
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "Chyba při zpracovávání HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "Přihlásili jste se z jiného umístění."
 
-#: src/protocols/msn/session.c:328
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Servery MSN dočasně nejsou dostupné. Počkejte prosím a zkuste to znovu."
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "Servery MSN se dočasně vypínají."
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Nemohu se autentizovat: %s"
 
-#: src/protocols/msn/session.c:342
+#: ../src/protocols/msn/session.c:329
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Váš seznam kamarádů MSN dočasně není k dispozici. Počkejte prosím a zkuste "
 "to znovu."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "Vyjednávám"
 
-#: src/protocols/msn/session.c:364
+#: ../src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:353
 msgid "Starting authentication"
 msgstr "Spouštím autentizaci"
 
-#: src/protocols/msn/session.c:367
+#: ../src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "Získávám cookie"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "Odesílám cookie"
 
-#: src/protocols/msn/session.c:370
+#: ../src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
 msgstr "Získávám seznam kamarádů"
 
-#: src/protocols/msn/state.c:34
+#: ../src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Pryč od počítače"
 
-#: src/protocols/msn/switchboard.c:403
+#: ../src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Telefonuji"
+
+#: ../src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Na obědě"
+
+#: ../src/protocols/msn/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Zpráva možná nebyla odeslána, protože vypršel čas:"
 
-#: src/protocols/msn/switchboard.c:411
+#: ../src/protocols/msn/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Zprávu nelze odeslat, není to povoleno, když jste neviditelní:"
 
-#: src/protocols/msn/switchboard.c:415
+#: ../src/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "Zprávu nelze odeslat, protože uživatel je odpojen:"
 
-#: src/protocols/msn/switchboard.c:419
+#: ../src/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Zprávu nelze odeslat, protože došlo k chybě spojení:"
 
-#: src/protocols/msn/switchboard.c:423
+#: ../src/protocols/msn/switchboard.c:428
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Zprávu nelze odeslat, protože odesíláme příliš rychle:"
+
+#: ../src/protocols/msn/switchboard.c:432
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Zprávu nelze odeslat, protože došlo k chybě s ústřednou:"
 
-#: src/protocols/msn/switchboard.c:431
+#: ../src/protocols/msn/switchboard.c:440
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě:"
 
-#: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
+#: ../src/protocols/msn/switchboard.c:961
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s vám chce poslat soubor"
-
-#: src/protocols/msn/userlist.c:85
+msgstr "%s vám právě poslal šťouchnutí!"
+
+#: ../src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Uživatel %s (%s) chce přidat %s do svého seznamu kamarádů."
 
-#: src/protocols/msn/userlist.c:275
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů."
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
-#, fuzzy, c-format
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+msgid "Authorize"
+msgstr "Autorizovat"
+
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+msgid "Deny"
+msgstr "Zamítnout"
+
+#: ../src/protocols/msn/userlist.c:286
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s vás přidal do svého seznamu kamarádů."
+
+#: ../src/protocols/msn/userlist.c:350
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vás odstranil ze svého seznamu kamarádů."
+
+#: ../src/protocols/msn/userlist.c:678
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Nemohu číst soubor %s."
-
-#: src/protocols/msn/userlist.c:661
-#, fuzzy
+msgstr "Nemohu přidat \"%s\"."
+
+#: ../src/protocols/msn/userlist.c:680
 msgid "The screen name specified is invalid."
-msgstr "Zadaný klíč SecurID není platný."
-
-#: src/protocols/napster/napster.c:260
+msgstr "Zadané jméno uživatele není platné."
+
+#: ../src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "Nemohu číst hlavičku ze serveru"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "Nemohu číst zprávu ze serveru: %s. Příkaz je %hd, délka je %hd."
 
-#: src/protocols/napster/napster.c:290
-#, fuzzy
+#: ../src/protocols/napster/napster.c:296
 msgid "Unknown server error."
-msgstr "Neznámá chyba."
-
-#: src/protocols/napster/napster.c:339
+msgstr "Neznámá chyba serveru."
+
+#: ../src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "uživatelé: %s, soubory: %s, velikost: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Nemohu přidat \"%s\" do vašeho seznamu Napsteru"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "Byli jste odpojeni od serveru."
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s požádal o informace o vás"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: ../src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s požádal o PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
+#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "Nemohu se připojit."
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Skupina:"
 
@@ -7316,173 +8037,174 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: ../src/protocols/napster/napster.c:699
+#: ../src/protocols/napster/napster.c:701
 msgid "NAPSTER Protocol Plugin"
 msgstr "Zásuvný modul protokolu NAPSTER"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Nezadány vyžadované parametry"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Nemohu zapisovat na síť"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Nemohu číst ze sítě"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Chyba při komunikaci se serverem"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Konference nenalezena"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "Konference neexistuje"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../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:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Nepodporováno"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "Heslo vypršelo"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "Účet byl zakázán"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../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:1910
+#: ../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:1913
+#: ../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:1916
+#: ../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:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Nemohu vás přidat"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Hlavní archiv není správně nastaven"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Neplatné jméno uživatele nebo heslo"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../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:1932
+#: ../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:1935
+#: ../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:1939
+#: ../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:1942
+#: ../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:1945
+#: ../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:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Nekompatibilní verze protokolu"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "Uživatel vás zablokoval"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../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:1957
+#: ../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:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Neznámá chyba: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Přihlášení selhalo (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Nemohu odeslat zprávu. Nemohu zíslat detaily o uživateli (%s)."
-
-#: src/protocols/novell/novell.c:381
+msgstr "Nemohu odeslat zprávu. Nemohu získat detaily o uživateli (%s)."
+
+#: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Nemohu odeslat zprávu (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Nemohu pozvat uživatele (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Nemohu poslat zprávu %s. Nemohu vytvořit konferenci (%s)."
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Nemohu odeslat zprávu. Nemohu vytvořit konferenci (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7491,7 +8213,7 @@
 "Nemohu přesunout uživatele %s do složky %s v seznamu na serveru. Chyba při "
 "vytváření složky (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: ../src/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7500,67 +8222,67 @@
 "Nemohu přidat %s do vašeho seznamu kamarádů. Chyba při vytváření složky v "
 "seznamu na serveru (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: ../src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Nemohu získat detaily o uživateli %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Nemohu přidat uživatele do seznamu soukromí (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
-
-#: src/protocols/novell/novell.c:836
+msgstr "Nemohu přidat %s do seznamu zakázaných (%s)."
+
+#: ../src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
-
-#: src/protocols/novell/novell.c:904
+msgstr "Nemohu přidat %s do seznamu povolených (%s)."
+
+#: ../src/protocols/novell/novell.c:919
 #, c-format
 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:927 src/protocols/novell/novell.c:1628
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Nemohu změnit nastavení soukromí na straně serveru (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Nemohu vytvořit konferenci (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "Chyba při komunikaci se serverem. Zavírám spojení."
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefonní číslo"
 
-#: src/protocols/novell/novell.c:1456
+#: ../src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Oddělení"
 
-#: src/protocols/novell/novell.c:1458
+#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Osobní titul"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Poštovní schránka"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
+#: ../src/protocols/oscar/oscar.c:6185
 msgid "Email Address"
 msgstr "Emailová adresa"
 
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "ID uživatele"
 
@@ -7571,46 +8293,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/protocols/novell/novell.c:1618
+#: ../src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konference GroupWise %d"
 
-#: src/protocols/novell/novell.c:1643
+#: ../src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "Nemohu vytvořit připojení SSL k serveru."
 
-#: src/protocols/novell/novell.c:1673
-#, 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:1707
+#: ../src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/protocols/novell/novell.c:1719
+#: ../src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "Nemohu se připojit k serveru."
 
-#: src/protocols/novell/novell.c:1722
+#: ../src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "Čekám na odpověď..."
 
-#: src/protocols/novell/novell.c:1857
+#: ../src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s byl pozván do této konverzace."
 
-#: src/protocols/novell/novell.c:1885
+#: ../src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "Pozvání ke konverzaci"
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7621,16 +8338,16 @@
 "\n"
 "Odesláno: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: ../src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "Chcete se připojit k této konverzaci?"
 
-#: src/protocols/novell/novell.c:1995
+#: ../src/protocols/novell/novell.c:2014
 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:2051
+#: ../src/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7640,7 +8357,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: ../src/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7648,19 +8365,14 @@
 "Nemohu se připojit k serveru. Zadejte prosím adresu serveru, ke kterému se "
 "chcete připojit."
 
-#: src/protocols/novell/novell.c:2171
+#: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "Chyba. Není nainstalována podpora SSL."
 
-#: src/protocols/novell/novell.c:2475
+#: ../src/protocols/novell/novell.c:2499
 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:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "Vypadat odpojen"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7671,115 +8383,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Zásuvný modul protokolu Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3561
+#: ../src/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "Adresa serveru"
 
-#: src/protocols/novell/novell.c:3565
+#: ../src/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "Port serveru"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Invalid error"
 msgstr "Neplatná chyba"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Invalid SNAC"
 msgstr "Neplatné SNAC"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:205
 msgid "Rate to host"
 msgstr "Rychlost k hostiteli"
 
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Rate to client"
 msgstr "Rychlost ke klientovi"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:208
 msgid "Service unavailable"
 msgstr "Služba nedostupná"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:209
 msgid "Service not defined"
 msgstr "Služba nedefinována"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:210
 msgid "Obsolete SNAC"
 msgstr "Zastaralé SNAC"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Not supported by host"
 msgstr "Nepodporováno hostitelem"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Not supported by client"
 msgstr "Nepodporováno klientem"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Refused by client"
 msgstr "Odmítnuto klientem"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:214
 msgid "Reply too big"
 msgstr "Odpověď příliš velká"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:215
 msgid "Responses lost"
 msgstr "Odpovědi ztraceny"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:216
 msgid "Request denied"
 msgstr "Požadavek zamítnut"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:217
 msgid "Busted SNAC payload"
 msgstr "Poškozená data SNAC"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:218
 msgid "Insufficient rights"
 msgstr "Nedostatečná oprávnění"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:219
 msgid "In local permit/deny"
 msgstr "V místním povolit/zakázat"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:220
 msgid "Too evil (sender)"
 msgstr "Příliš zlý (odesílatel)"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:221
 msgid "Too evil (receiver)"
 msgstr "Příliš zlý (příjemce)"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:222
 msgid "User temporarily unavailable"
 msgstr "Uživatel dočasně nedostupný"
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:223
 msgid "No match"
 msgstr "Žádná shoda"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:224
 msgid "List overflow"
 msgstr "Přetečení seznamu"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:225
 msgid "Request ambiguous"
 msgstr "Požadavek nejednoznačný"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:226
 msgid "Queue full"
 msgstr "Fronta plná"
 
-#: src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:227
 msgid "Not while on AOL"
 msgstr "Ne když na AOL"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7787,158 +8499,158 @@
 "(Při přijímání 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:616
+#: ../src/protocols/oscar/oscar.c:702
 msgid "Voice"
 msgstr "Hlas"
 
-#: src/protocols/oscar/oscar.c:619
+#: ../src/protocols/oscar/oscar.c:705
 msgid "AIM Direct IM"
 msgstr "AIM Přímé IM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8166
 msgid "Get File"
 msgstr "Získat soubor"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:718
 msgid "Games"
 msgstr "Hry"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Add-Ins"
 msgstr "Přídavky"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:724
 msgid "Send Buddy List"
 msgstr "Odeslat seznam kamarádů"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:727
 msgid "ICQ Direct Connect"
 msgstr "Přímé spojení ICQ"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:730
 msgid "AP User"
 msgstr "Uživatel AP"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:733
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:736
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:739
 msgid "ICQ Server Relay"
 msgstr "Relay ICQ serveru"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:742
 msgid "Old ICQ UTF8"
 msgstr "Staré ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:745
 msgid "Trillian Encryption"
 msgstr "Šifrování Trillian"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:748
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: ../src/protocols/oscar/oscar.c:751
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../src/protocols/oscar/oscar.c:754
 msgid "Security Enabled"
 msgstr "Zabezpečení povoleno"
 
-#: src/protocols/oscar/oscar.c:671
+#: ../src/protocols/oscar/oscar.c:757
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:761
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:764
 msgid "Live Video"
 msgstr "Živé video"
 
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:767
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8028
 msgid "Free For Chat"
 msgstr "Volný pro chat"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8056
 msgid "Not Available"
 msgstr "Nejsem k dispozici"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8046
 msgid "Occupied"
 msgstr "Zaměstnán"
 
-#: src/protocols/oscar/oscar.c:709
+#: ../src/protocols/oscar/oscar.c:795
 msgid "Web Aware"
 msgstr "Ví o WWW"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: ../src/protocols/oscar/oscar.c:799
+msgid "Online"
+msgstr "Připojen"
+
+#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
 msgid "Warning Level"
 msgstr "Úroveň varování"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Schopnosti"
-
-#: src/protocols/oscar/oscar.c:801
+#: ../src/protocols/oscar/oscar.c:885
 msgid "Buddy Comment"
 msgstr "Poznámka o kamarádovi"
 
-#: src/protocols/oscar/oscar.c:958
+#: ../src/protocols/oscar/oscar.c:1034
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Přímé IM s %s zavřeno"
 
-#: src/protocols/oscar/oscar.c:960
+#: ../src/protocols/oscar/oscar.c:1036
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Přímé IM s %s selhalo"
 
-#: src/protocols/oscar/oscar.c:968
+#: ../src/protocols/oscar/oscar.c:1044
 msgid "Direct Connect failed"
 msgstr "Přímé spojení selhalo"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Přímé IM s %s navázáno"
 
-#: src/protocols/oscar/oscar.c:1126
+#: ../src/protocols/oscar/oscar.c:1205
 #, 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:1547
+#: ../src/protocols/oscar/oscar.c:1608
 #, 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:1552
+#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
 msgid "Unable to open Direct IM"
 msgstr "Nemohu otevřít Přímé IM"
 
-#: src/protocols/oscar/oscar.c:1587
+#: ../src/protocols/oscar/oscar.c:1696
 #, 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:1591
+#: ../src/protocols/oscar/oscar.c:1700
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7946,101 +8658,102 @@
 "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:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "Připojit"
-
-#: src/protocols/oscar/oscar.c:1661
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
+msgid "_Connect"
+msgstr "_Připojit"
+
+#: ../src/protocols/oscar/oscar.c:1782
+#, c-format
 msgid "You have lost your connection to chat room %s."
-msgstr "Byl jste odpojen z místnosti chatu %s."
-
-#: src/protocols/oscar/oscar.c:1684
+msgstr "Ztratili jste spojení s místností chatu %s."
+
+#: ../src/protocols/oscar/oscar.c:1805
 msgid "Chat is currently unavailable"
 msgstr "Chat je momentálně nedostupný"
 
-#: src/protocols/oscar/oscar.c:1754
+#: ../src/protocols/oscar/oscar.c:1877
 msgid "Screen name sent"
 msgstr "Jméno uživatele odesláno"
 
-#: src/protocols/oscar/oscar.c:1770
+#: ../src/protocols/oscar/oscar.c:1893
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Nemohu se přihlásit: Nemohu se přihlásit jako %s, protože jméno uživatele "
-"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:1799
+msgstr "Nemohu se přihlásit: Nemohu se přihlásit jako %s, protože jméno uživatele není platné. Jména uživatele musí buď začínat písmenem a obsahovat jen číslice, písmena a mezery, nebo musí obsahovat jen číslice."
+
+#: ../src/protocols/oscar/oscar.c:1921
 msgid "Unable to login to AIM"
 msgstr "Nemohu se přihlásit do AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
 msgid "Could Not Connect"
 msgstr "Nemohu se připojit"
 
-#: src/protocols/oscar/oscar.c:1911
+#: ../src/protocols/oscar/oscar.c:2035
 msgid "Connection established, cookie sent"
 msgstr "Spojení navázáno, cookie odesláno"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
+#. *
+#. * Above, we checked if we had previously attempted a connection
+#. * redirect to prevent a conflict with the joscar library
+#.
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:2194
 msgid "Attempting connection redirect..."
-msgstr "Pokouším se připojit k %s na %s:%hu pro přímé IM."
+msgstr "Pokouším se o přesměrování spojení..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: ../src/protocols/oscar/oscar.c:2240
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
+msgstr ""
+"Přenosu souboru %s vypršel čas.\n"
+" Zkuste povolit proxy servery pro přenos souborů v Účty->%s->Upravit účet->Pokročilé."
+
+#: ../src/protocols/oscar/oscar.c:2338
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
 msgid "Unable to establish file descriptor."
 msgstr "Nemohu získat deskriptor souboru."
 
-#: src/protocols/oscar/oscar.c:2211
+#: ../src/protocols/oscar/oscar.c:2343
 msgid "Unable to create new connection."
 msgstr "Nemohu vytvořit nové spojení."
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
+#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
 msgid "Unable to log into file transfer proxy."
-msgstr "Nemohu zapsat soubor %s."
-
-#: src/protocols/oscar/oscar.c:2532
-#, fuzzy
+msgstr "Nemohu se přihlásit k proxy pro přenos souborů."
+
+#: ../src/protocols/oscar/oscar.c:2668
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Nemohu vytvořit naslouchající socket."
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+msgstr "Nemohu vytvořit naslouchající socket nebo chybí připojení k proxy AOL."
+
+#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Nesprávná přezdívka nebo heslo."
 
-#: src/protocols/oscar/oscar.c:2738
+#: ../src/protocols/oscar/oscar.c:2911
 msgid "Your account is currently suspended."
 msgstr "Váš účet je momentálně suspendován."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:2915
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Služba AOL Instant Messenger je dočasně nedostupná."
 
-#: src/protocols/oscar/oscar.c:2747
+#: ../src/protocols/oscar/oscar.c:2920
 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."
@@ -8048,34 +8761,34 @@
 "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:2752
+#: ../src/protocols/oscar/oscar.c:2925
 #, 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:2783
+#: ../src/protocols/oscar/oscar.c:2953
 msgid "Internal Error"
 msgstr "Interní chyba"
 
-#: src/protocols/oscar/oscar.c:2853
+#: ../src/protocols/oscar/oscar.c:3023
 msgid "Received authorization"
 msgstr "Přijata autorizace"
 
-#: src/protocols/oscar/oscar.c:2877
+#: ../src/protocols/oscar/oscar.c:3047
 msgid "The SecurID key entered is invalid."
 msgstr "Zadaný klíč SecurID není platný."
 
-#: src/protocols/oscar/oscar.c:2891
+#: ../src/protocols/oscar/oscar.c:3061
 msgid "Enter SecurID"
 msgstr "Zadejte SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: ../src/protocols/oscar/oscar.c:3062
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Zadejte šesticiferné číslo z digitálního displeje."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
+#: ../src/protocols/oscar/oscar.c:3223
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8084,24 +8797,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:2935 src/protocols/oscar/oscar.c:2965
+#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
 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:3054
+#: ../src/protocols/oscar/oscar.c:3226
 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:3085
+#: ../src/protocols/oscar/oscar.c:3247
 msgid "Password sent"
 msgstr "Heslo odesláno"
 
-#: src/protocols/oscar/oscar.c:4352
+#: ../src/protocols/oscar/oscar.c:4555
 #, 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:4355
+#: ../src/protocols/oscar/oscar.c:4558
 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 "
@@ -8111,20 +8824,20 @@
 "Images. Protože bude odkryta vaše IP adresa, dá se to považovat za riziko "
 "pro soukromí."
 
-#: src/protocols/oscar/oscar.c:4394
+#: ../src/protocols/oscar/oscar.c:4597
 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:4402
+#: ../src/protocols/oscar/oscar.c:4605
 msgid "Authorization Request Message:"
 msgstr "Zpráva požadavku na autorizaci"
 
-#: src/protocols/oscar/oscar.c:4403
+#: ../src/protocols/oscar/oscar.c:4606
 msgid "Please authorize me!"
 msgstr "Autorizujte mě prosím!"
 
-#: src/protocols/oscar/oscar.c:4433
+#: ../src/protocols/oscar/oscar.c:4636
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8133,35 +8846,38 @@
 "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:4438 src/protocols/oscar/oscar.c:4440
+#: ../src/protocols/oscar/oscar.c:4641
 msgid "Request Authorization"
 msgstr "Požadovat autorizaci"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:4643
+msgid "_Request Authorization"
+msgstr "_Požádat o autorizaci"
+
+#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
+#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
+#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
 msgid "No reason given."
 msgstr "Neudán žádný důvod."
 
-#: src/protocols/oscar/oscar.c:4483
+#: ../src/protocols/oscar/oscar.c:4686
 msgid "Authorization Denied Message:"
 msgstr "Zpráva odmítnutí autorizace:"
 
-#: src/protocols/oscar/oscar.c:4590
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:4793
+#, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uživatel %u vás chce přidat do svého seznamu kamarádů z následujícího "
-"důvodu:\n"
+"Uživatel %u chce přidat %s do svého seznamu kamarádů z následujícího důvodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
 msgid "Authorization Request"
 msgstr "Požadavek na autorizaci"
 
-#: src/protocols/oscar/oscar.c:4612
+#: ../src/protocols/oscar/oscar.c:4815
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8172,18 +8888,18 @@
 "následujícího důvodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: ../src/protocols/oscar/oscar.c:4816
 msgid "ICQ authorization denied."
 msgstr "Autorizace ICQ odepřena."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: ../src/protocols/oscar/oscar.c:4823
 #, 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:4628
+#: ../src/protocols/oscar/oscar.c:4831
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8196,7 +8912,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:4839
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8209,7 +8925,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8222,20 +8938,20 @@
 "Zpráva je:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: ../src/protocols/oscar/oscar.c:4868
 #, 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:4671
+#: ../src/protocols/oscar/oscar.c:4874
 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:4675
-msgid "Decline"
-msgstr "Odmítnout"
-
-#: src/protocols/oscar/oscar.c:4759
+#: ../src/protocols/oscar/oscar.c:4878
+msgid "_Decline"
+msgstr "_Odmítnout"
+
+#: ../src/protocols/oscar/oscar.c:4962
 #, 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."
@@ -8243,7 +8959,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:4768
+#: ../src/protocols/oscar/oscar.c:4971
 #, 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."
@@ -8251,7 +8967,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:4777
+#: ../src/protocols/oscar/oscar.c:4980
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8264,7 +8980,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:4786
+#: ../src/protocols/oscar/oscar.c:4989
 #, 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."
@@ -8272,7 +8988,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:4795
+#: ../src/protocols/oscar/oscar.c:4998
 #, 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."
@@ -8280,7 +8996,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:4804
+#: ../src/protocols/oscar/oscar.c:5007
 #, 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."
@@ -8288,56 +9004,66 @@
 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:4863
+#: ../src/protocols/oscar/oscar.c:5066
 #, 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:4924
+#: ../src/protocols/oscar/oscar.c:5127
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC hodil chybu: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: ../src/protocols/oscar/oscar.c:5164
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nemohu odeslat zprávu: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
+#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
 msgid "Unknown reason."
 msgstr "Neznámý důvod."
 
-#: src/protocols/oscar/oscar.c:4964
+#: ../src/protocols/oscar/oscar.c:5167
+#: ../src/protocols/sametime/sametime.c:2373
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Nemohu odeslat zprávu k %s:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: ../src/protocols/oscar/oscar.c:5227
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informace o uživateli nejsou k dispozici: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: ../src/protocols/oscar/oscar.c:5230
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informace o uživateli %s nedostupné:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: ../src/protocols/oscar/oscar.c:5257
 msgid "Online Since"
 msgstr "Odpojen od"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: ../src/protocols/oscar/oscar.c:5262
+#: ../src/protocols/yahoo/yahoo_profile.c:1153
 msgid "Member Since"
 msgstr "Člen od"
 
-#: src/protocols/oscar/oscar.c:5142
+#: ../src/protocols/oscar/oscar.c:5267
+msgid "Capabilities"
+msgstr "Schopnosti"
+
+#: ../src/protocols/oscar/oscar.c:5285
+msgid "Available Message"
+msgstr "Zpráva o dostupnosti"
+
+#: ../src/protocols/oscar/oscar.c:5402
 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:5328
+#: ../src/protocols/oscar/oscar.c:5588
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8345,11 +9071,11 @@
 "[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
 "znaky.]"
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:5809
 msgid "Rate limiting error."
 msgstr "Chyba omezení rychlosti."
 
-#: src/protocols/oscar/oscar.c:5555
+#: ../src/protocols/oscar/oscar.c:5810
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8357,105 +9083,95 @@
 "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:5631
+#: ../src/protocols/oscar/oscar.c:5883
 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:5644 src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Byl jste odpojen z místnosti chatu %s."
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: ../src/protocols/oscar/oscar.c:5925
 msgid "Finalizing connection"
 msgstr "Dokončuji spojení"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "Mobilní telefon"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Žena"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Muž"
-
-#: src/protocols/oscar/oscar.c:5995
+#: ../src/protocols/oscar/oscar.c:6207
 msgid "Personal Web Page"
 msgstr "Osobní WWW stránka"
 
-#: src/protocols/oscar/oscar.c:5999
+#: ../src/protocols/oscar/oscar.c:6211
 msgid "Additional Information"
 msgstr "Přídavné informace"
 
-#: src/protocols/oscar/oscar.c:6004
+#: ../src/protocols/oscar/oscar.c:6216
 msgid "Home Address"
 msgstr "Domácí adresa"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "PSČ"
 
-#: src/protocols/oscar/oscar.c:6012
+#: ../src/protocols/oscar/oscar.c:6224
 msgid "Work Address"
 msgstr "Pracovní adresa"
 
-#: src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:6232
 msgid "Work Information"
 msgstr "Pracovní informace"
 
-#: src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/oscar.c:6233
 msgid "Company"
 msgstr "Společnost"
 
-#: src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/oscar/oscar.c:6234
 msgid "Division"
 msgstr "Oddělení"
 
-#: src/protocols/oscar/oscar.c:6023
+#: ../src/protocols/oscar/oscar.c:6235
 msgid "Position"
 msgstr "Pozice"
 
-#: src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:6237
 msgid "Web Page"
 msgstr "WWW stránka"
 
-#: src/protocols/oscar/oscar.c:6082
+#: ../src/protocols/oscar/oscar.c:6295
 msgid "Pop-Up Message"
 msgstr "Vyskakovací zpráva"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, 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:6140
+#: ../src/protocols/oscar/oscar.c:6335
+#, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "Následující jméno uživatele je asociováno s %s"
+msgstr[1] "Následující jména uživatele jsou asociována s %s"
+msgstr[2] "Následující jména uživatele jsou asociována s %s"
+
+#: ../src/protocols/oscar/oscar.c:6366
 #, 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:6161
+#: ../src/protocols/oscar/oscar.c:6387
 #, 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:6163
+#: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
 msgstr "Požadováno potvrzení účtu"
 
-#: src/protocols/oscar/oscar.c:6194
+#: ../src/protocols/oscar/oscar.c:6420
 msgid "Error Changing Account Info"
 msgstr "Chyba při změně informací o účtu"
 
-#: src/protocols/oscar/oscar.c:6197
+#: ../src/protocols/oscar/oscar.c:6423
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8464,14 +9180,12 @@
 "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:6200
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:6426
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"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:6203
+msgstr "Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože není platné."
+
+#: ../src/protocols/oscar/oscar.c:6429
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8480,7 +9194,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:6206
+#: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8489,7 +9203,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:6209
+#: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8498,7 +9212,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:6212
+#: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8507,12 +9221,12 @@
 "Chyba 0x%04x: Nemohu změnit emailovou adresu, protože zadaná adresa je "
 "neplatná."
 
-#: src/protocols/oscar/oscar.c:6215
+#: ../src/protocols/oscar/oscar.c:6441
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Chyba 0x%04x: Neznámá chyba."
 
-#: src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/oscar/oscar.c:6451
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8521,26 +9235,26 @@
 "Vaše jméno uživatele je aktuálně formátováno následovně:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
 msgid "Account Info"
 msgstr "Informace o účtu"
 
-#: src/protocols/oscar/oscar.c:6231
+#: ../src/protocols/oscar/oscar.c:6457
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Emailová adresa pro %s je %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: ../src/protocols/oscar/oscar.c:6535
 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:6480
+#: ../src/protocols/oscar/oscar.c:6775
 msgid "Unable to set AIM profile."
 msgstr "Nemohu nastavit profil AIM."
 
-#: src/protocols/oscar/oscar.c:6481
+#: ../src/protocols/oscar/oscar.c:6776
 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 "
@@ -8550,7 +9264,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:6495
+#: ../src/protocols/oscar/oscar.c:6790
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8565,11 +9279,11 @@
 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:6500
+#: ../src/protocols/oscar/oscar.c:6795
 msgid "Profile too long."
 msgstr "Profil příliš dlouhý"
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: ../src/protocols/oscar/oscar.c:6837
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8587,45 +9301,28 @@
 "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:6528 src/protocols/oscar/oscar.c:6601
+#: ../src/protocols/oscar/oscar.c:6842
 msgid "Away message too long."
 msgstr "Zpráva o nepřítomnosti příliš dlouhá."
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "Nemohu nastavit zprávu AIM o nepřítomnosti."
-
-#: src/protocols/oscar/oscar.c:6561
-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 ""
-"Pravděpodobně jste požádali o nastavení své zprávy o nepřítomnosti před "
-"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:6691
+#: ../src/protocols/oscar/oscar.c:6911
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
-msgstr ""
-"Nemohu přidat kamaráda %s, protože jméno uživatele 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:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+msgstr "Nemohu přidat kamaráda %s, protože jméno uživatele není platné. Jména uživatele musí buď začínat písmenem a obsahovat jen číslice, písmena a mezery, nebo musí obsahovat jen číslice."
+
+#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
+#: ../src/protocols/oscar/oscar.c:7334
 msgid "Unable To Add"
 msgstr "Nemohu přidat"
 
-#: src/protocols/oscar/oscar.c:6798
+#: ../src/protocols/oscar/oscar.c:7020
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nemohu získat seznam kamarádů"
 
-#: src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:7021
 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 "
@@ -8634,13 +9331,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:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
+#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
+#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
 msgid "Orphans"
 msgstr "Sirotci"
 
-#: src/protocols/oscar/oscar.c:7090
+#: ../src/protocols/oscar/oscar.c:7318
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8649,11 +9346,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:7090 src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
 msgid "(no name)"
 msgstr "(žádné jméno)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7332
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8663,7 +9360,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:7187
+#: ../src/protocols/oscar/oscar.c:7415
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8672,33 +9369,32 @@
 "Uživatel %s vám povolil přidat jej do vašeho seznamu kamarádů. Chcete jej "
 "přidat?"
 
-#: src/protocols/oscar/oscar.c:7193
+#: ../src/protocols/oscar/oscar.c:7421
 msgid "Authorization Given"
 msgstr "Autorizace udělena"
 
-#: src/protocols/oscar/oscar.c:7237
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:7465
+#, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Uživatel %s vás chce přidat do svého seznamu kamarádů z následujícího "
-"důvodu:\n"
+"Uživatel %s chce přidat %s do svého seznamu kamarádů z následujícího důvodu:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: ../src/protocols/oscar/oscar.c:7510
 #, 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:7283
+#: ../src/protocols/oscar/oscar.c:7511
 msgid "Authorization Granted"
 msgstr "Autorizace udělena"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:7514
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8709,96 +9405,88 @@
 "následujícího důvodu:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: ../src/protocols/oscar/oscar.c:7515
 msgid "Authorization Denied"
 msgstr "Autorizace zamítnuta"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Výměna:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: ../src/protocols/oscar/oscar.c:7588
 msgid "Invalid chat name specified."
 msgstr "Zadán neplatný název chatu."
 
-#: src/protocols/oscar/oscar.c:7430
+#: ../src/protocols/oscar/oscar.c:7658
 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:7565
-msgid "Away Message"
-msgstr "Zpráva o nepřítomnosti"
-
-#: src/protocols/oscar/oscar.c:7854
+#: ../src/protocols/oscar/oscar.c:7813
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(stahuji)</i>"
+
+#: ../src/protocols/oscar/oscar.c:8119
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Poznámka o kamarádovi %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: ../src/protocols/oscar/oscar.c:8120
 msgid "Buddy Comment:"
 msgstr "Poznámka o kamarádovi:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: ../src/protocols/oscar/oscar.c:8139
 msgid "Edit Buddy Comment"
 msgstr "Upravit poznámku o kamarádovi"
 
-#: src/protocols/oscar/oscar.c:7880
+#: ../src/protocols/oscar/oscar.c:8146
 msgid "Get Status Msg"
 msgstr "Získat zprávu o stavu"
 
-#: src/protocols/oscar/oscar.c:7892
+#: ../src/protocols/oscar/oscar.c:8159
 msgid "Direct IM"
 msgstr "Přímé IM"
 
-#: src/protocols/oscar/oscar.c:7909
+#: ../src/protocols/oscar/oscar.c:8178
 msgid "Re-request Authorization"
 msgstr "Znovu požádat o autorizaci"
 
-#: src/protocols/oscar/oscar.c:7969
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8235
 msgid "Require authorization"
 msgstr "Požadovat autorizaci"
 
-#: src/protocols/oscar/oscar.c:7972
-#, fuzzy
-msgid "Hide IP address"
-msgstr "IP adresa"
-
-#: src/protocols/oscar/oscar.c:7975
-#, fuzzy
-msgid "Web aware"
-msgstr "Ví o WWW"
-
-#: src/protocols/oscar/oscar.c:7980
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8238
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "Ví o WWW (povolení tohoto způsobí, že budete dostávat SPAM!)"
+
+#: ../src/protocols/oscar/oscar.c:8243
 msgid "ICQ Privacy Options"
-msgstr "Možnosti proxy"
-
-#: src/protocols/oscar/oscar.c:7997
+msgstr "Možnosti soukromí ICQ"
+
+#: ../src/protocols/oscar/oscar.c:8260
 msgid "The new formatting is invalid."
 msgstr "Nové formátování je neplatné."
 
-#: src/protocols/oscar/oscar.c:7998
+#: ../src/protocols/oscar/oscar.c:8261
 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:8005
+#: ../src/protocols/oscar/oscar.c:8268
 msgid "New screen name formatting:"
 msgstr "Nové formátování jména uživatele:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: ../src/protocols/oscar/oscar.c:8320
 msgid "Change Address To:"
 msgstr "Změnit adresu na:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: ../src/protocols/oscar/oscar.c:8365
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>nečekáte na autorizaci</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: ../src/protocols/oscar/oscar.c:8368
 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:8106
+#: ../src/protocols/oscar/oscar.c:8369
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8806,87 +9494,64 @@
 "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:8123
+#: ../src/protocols/oscar/oscar.c:8386
 msgid "Find Buddy by E-mail"
 msgstr "Hledat kamaráda podle emailu"
 
-#: src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:8387
 msgid "Search for a buddy by e-mail address"
 msgstr "Hledat kamaráda podle emailové adresy"
 
-#: src/protocols/oscar/oscar.c:8125
+#: ../src/protocols/oscar/oscar.c:8388
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Zadejte e-mailovou adresu kamaráda, kterého hledáte."
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "Nastavit informace o uživateli..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: ../src/protocols/oscar/oscar.c:8481
 msgid "Set User Info (URL)..."
 msgstr "Nastavit informace o uživateli (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "Změnit heslo..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: ../src/protocols/oscar/oscar.c:8492
 msgid "Change Password (URL)"
 msgstr "Změnit heslo (URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: ../src/protocols/oscar/oscar.c:8496
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavit předávání IM (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "Zobrazit více nastavení"
+#: ../src/protocols/oscar/oscar.c:8506
+msgid "Set Privacy Options..."
+msgstr "Nastavit možnosti soukromí..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: ../src/protocols/oscar/oscar.c:8513
 msgid "Format Screen Name..."
 msgstr "Formátovat jméno uživatele..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8517
 msgid "Confirm Account"
 msgstr "Potvrdit účet"
 
-#: src/protocols/oscar/oscar.c:8258
+#: ../src/protocols/oscar/oscar.c:8521
 msgid "Display Currently Registered Address"
 msgstr "Zobrazit aktuální registrovanou adresu"
 
-#: src/protocols/oscar/oscar.c:8262
+#: ../src/protocols/oscar/oscar.c:8525
 msgid "Change Currently Registered Address..."
 msgstr "Změnit aktuální registrovanou adresu..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:8532
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zobrazit kamarády čekající na autorizaci"
 
-#: src/protocols/oscar/oscar.c:8275
+#: ../src/protocols/oscar/oscar.c:8538
 msgid "Search for Buddy by Email..."
 msgstr "Hledat kamaráda podle emailu..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: ../src/protocols/oscar/oscar.c:8543
 msgid "Search for Buddy by Information"
 msgstr "Hledat kamaráda podle informací"
 
-#: src/protocols/oscar/oscar.c:8350
-#, fuzzy
-msgid "Use recent buddies group"
-msgstr "Uživatel není ve skupině"
-
-#: src/protocols/oscar/oscar.c:8353
-#, fuzzy
-msgid "Show how long you have been idle"
-msgstr "Umožňuje vám ručně nastavit, jak dlouho jste byli nečinní"
-
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8897,178 +9562,526 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:8721 ../src/protocols/oscar/oscar.c:8723
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Zásuvný modul protokolu AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8497
+#: ../src/protocols/oscar/oscar.c:8742
 msgid "Auth host"
 msgstr "Počítač autentizace"
 
-#: src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:8745
 msgid "Auth port"
 msgstr "Port autentizace"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:8748 ../src/protocols/zephyr/zephyr.c:2900
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/protocols/sametime/sametime.c:1134
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8752
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr ""
+"Používat proxy server AIM/ICQ\n"
+"(pomalejší, ale obvykle funguje)"
+
+#: ../src/protocols/sametime/sametime.c:415
+msgid "Connection closed (writing)"
+msgstr "Spojení uzavřeno (zápis)"
+
+#: ../src/protocols/sametime/sametime.c:1267
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Název skupiny:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1268
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>ID skupiny v Notes:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1270
+#, c-format
+msgid "Info for Group %s"
+msgstr "Informace o skupině %s"
+
+#: ../src/protocols/sametime/sametime.c:1272
+msgid "Notes Address Book Information"
+msgstr "Informace adresáře Notes"
+
+#: ../src/protocols/sametime/sametime.c:1304
+msgid "Invite Group to Conference..."
+msgstr "Pozvat skupinu ke konferenci..."
+
+#: ../src/protocols/sametime/sametime.c:1314
+msgid "Get Notes Address Book Info"
+msgstr "Získat informace adresáře Notes"
+
+#: ../src/protocols/sametime/sametime.c:1467
 msgid "Sending Handshake"
-msgstr "Odesílám cookie"
-
-#: src/protocols/sametime/sametime.c:1139
-#, fuzzy
+msgstr "Odesílám pozdrav"
+
+#: ../src/protocols/sametime/sametime.c:1472
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Čekám na začátek přenosu..."
-
-#: src/protocols/sametime/sametime.c:1144
+msgstr "Čekám na potvrzení pozdravu"
+
+#: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1149
+msgstr "Pozdrav potvrzen, odesílám přihlášení"
+
+#: ../src/protocols/sametime/sametime.c:1482
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
+msgstr "Čekám na potvrzení přihlášení"
+
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Login Redirected"
-msgstr "Přihlašovací server"
-
-#: src/protocols/sametime/sametime.c:1159
-#, fuzzy
+msgstr "Přihlášení přesměrováno"
+
+#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
-msgstr "Přihlašuji se"
-
-#: src/protocols/sametime/sametime.c:1163
+msgstr "Vynucuji přihlášení"
+
+#: ../src/protocols/sametime/sametime.c:1497
 msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
-msgid "Connected to Sametime Community Server"
-msgstr "Připojuji se k serveru SILC"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "Aktivní"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "Nemohu vytvořit socket"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Přezdívky IRC nemohou obsahovat mezery"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Zásuvný modul protokolu SILC"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Zásuvný modul protokolu SILC"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "ID uživatele"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "Žádná proxy"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "Žádná proxy"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+msgstr "Přihlášení potvrzeno"
+
+#: ../src/protocols/sametime/sametime.c:1502
+msgid "Starting Services"
+msgstr "Spouštím služby"
+
+#: ../src/protocols/sametime/sametime.c:1507
+msgid "Connected"
+msgstr "Připojen"
+
+#: ../src/protocols/sametime/sametime.c:1605
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr "Správce Sametime vydal na serveru %s následující oznámení"
+
+#: ../src/protocols/sametime/sametime.c:1610
+msgid "Sametime Administrator Announcement"
+msgstr "Oznámení správce Sametime"
+
+#: ../src/protocols/sametime/sametime.c:1662
+msgid "Connection reset"
+msgstr "Spojení přerušeno"
+
+#: ../src/protocols/sametime/sametime.c:1669
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Chyba při čtení ze socketu: %s"
+
+#. this is a regular connect, error out
+#: ../src/protocols/sametime/sametime.c:1698
+#: ../src/protocols/sametime/sametime.c:3696
+msgid "Unable to connect to host"
+msgstr "Nemohu se připojit k počítači"
+
+#: ../src/protocols/sametime/sametime.c:1736
+#, c-format
+msgid "Announcement from %s"
+msgstr "Oznámení od %s"
+
+#: ../src/protocols/sametime/sametime.c:1910
+msgid "Conference Closed"
+msgstr "Konference uzavřena"
+
+#: ../src/protocols/sametime/sametime.c:2367
+msgid "Unable to send message: "
+msgstr "Nemohu odeslat zprávu: "
+
+#: ../src/protocols/sametime/sametime.c:2926
+msgid "Place Closed"
+msgstr "Místo uzavřeno"
+
+#: ../src/protocols/sametime/sametime.c:3217
+msgid "Microphone"
+msgstr "Mikrofon"
+
+#: ../src/protocols/sametime/sametime.c:3218
+msgid "Speakers"
+msgstr "Reproduktory"
+
+#: ../src/protocols/sametime/sametime.c:3219
+msgid "Video Camera"
+msgstr "Videokamera"
+
+#: ../src/protocols/sametime/sametime.c:3223
+msgid "File Transfer"
+msgstr "Přenos souborů"
+
+#: ../src/protocols/sametime/sametime.c:3257
+#, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
+msgstr "\n<b>Podporuje:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:3262
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr "\n<b>Externí uživatel</b>"
+
+#: ../src/protocols/sametime/sametime.c:3368
+msgid "Create conference with user"
+msgstr "Vytvořit konferenci s uživatelem"
+
+#: ../src/protocols/sametime/sametime.c:3369
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr "Zadejte prosím téma nové konference a zvací zprávu, kterou poslat %s"
+
+#: ../src/protocols/sametime/sametime.c:3373
+msgid "New Conference"
+msgstr "Nová konference"
+
+#: ../src/protocols/sametime/sametime.c:3375
+msgid "Create"
+msgstr "Vytvořit"
+
+#: ../src/protocols/sametime/sametime.c:3439
+msgid "Available Conferences"
+msgstr "Dostupné konference"
+
+#: ../src/protocols/sametime/sametime.c:3445
+msgid "Create New Conference..."
+msgstr "Vytvořit novou konferenci..."
+
+#: ../src/protocols/sametime/sametime.c:3452
+msgid "Invite user to a conference"
+msgstr "Pozvat uživatele ke konferenci"
+
+#: ../src/protocols/sametime/sametime.c:3453
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr "Odešlete pozvánku uživateli %s zvolením konference ze seznamu níže. Zvolte \"Vytvořit novou konferenci\", pokud chcete vytvořit novou konferenci, do které pozvat tohoto uživatele."
+
+#: ../src/protocols/sametime/sametime.c:3458
+msgid "Invite to Conference"
+msgstr "Pozvat ke konferenci"
+
+#: ../src/protocols/sametime/sametime.c:3460
+msgid "Invite"
+msgstr "Pozvat"
+
+#: ../src/protocols/sametime/sametime.c:3548
+msgid "Invite to Conference..."
+msgstr "Pozvat ke konferenci..."
+
+#: ../src/protocols/sametime/sametime.c:3553
+msgid "Send TEST Announcement"
+msgstr "Odeslat testovací oznámení"
+
+#: ../src/protocols/sametime/sametime.c:3600
+msgid "No Sametime Community Server specified"
+msgstr "Nezadán server komunity Sametime"
+
+#: ../src/protocols/sametime/sametime.c:3622
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr "Pro účet Meanwhile %s nebyl nastaven počítač ani IP adresa. Pro pokračování v přihlašování jej prosím zadejte níže."
+
+#: ../src/protocols/sametime/sametime.c:3627
+msgid "Meanwhile Connection Setup"
+msgstr "Nastavení spojení Meanwhile"
+
+#: ../src/protocols/sametime/sametime.c:3628
+msgid "No Sametime Community Server Specified"
+msgstr "Nezadán server komunity Sametime"
+
+#: ../src/protocols/sametime/sametime.c:4085
+msgid "<b>External User</b><br>"
+msgstr "<b>Externí uživatel</b><br>"
+
+#: ../src/protocols/sametime/sametime.c:4088
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>ID Uživatele:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4094
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>Celé jméno:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4100
+msgid "<b>Last Known Client:</b> "
+msgstr "<b>Poslední známý klient:</b> "
+
+#: ../src/protocols/sametime/sametime.c:4108
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Neznámé (0x%04x)<br>"
+
+#: ../src/protocols/sametime/sametime.c:4115
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>Podporuje:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4121
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>Stav</b>: %s"
+
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5427
+msgid "User Name"
+msgstr "Jméno uživatele"
+
+#: ../src/protocols/sametime/sametime.c:4267
+#: ../src/protocols/sametime/sametime.c:5430
+msgid "Sametime ID"
+msgstr "ID Sametime"
+
+#: ../src/protocols/sametime/sametime.c:4291
+msgid "An ambiguous user ID was entered"
+msgstr "Bylo zadáno nejednoznačné ID uživatele"
+
+#: ../src/protocols/sametime/sametime.c:4292
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr "Identifikátor '%s' se může odkazovat na libovolného z následujících uživatelů. Uživatele prosím přidejte do vašeho seznamu kamarádů zvolením správného uživatele ze seznamu níže."
+
+#: ../src/protocols/sametime/sametime.c:4297
+msgid "Select User"
+msgstr "Vyberte uživatele"
+
+#: ../src/protocols/sametime/sametime.c:4367
+msgid "Unable to add user: user not found"
+msgstr "Nemohu přidat uživatele: uživatel nenalezen"
+
+#: ../src/protocols/sametime/sametime.c:4369
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr "Identifikátor '%s' neodpovídá žádnému uživateli ve vaší komunitě Sametime. Tato položka byla odstraněna z vašeho seznamu kamarádů."
+
+#: ../src/protocols/sametime/sametime.c:4374
+msgid "Unable to add user"
+msgstr "Nemohu přidat uživatele"
+
+#: ../src/protocols/sametime/sametime.c:4946
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Chyba při čtení souboru %s: \n"
+"%s\n"
+
+#: ../src/protocols/sametime/sametime.c:5077
+msgid "Remotely Stored Buddy List"
+msgstr "Vzdáleně uložený seznam kamarádů"
+
+#: ../src/protocols/sametime/sametime.c:5082
+msgid "Buddy List Storage Mode"
+msgstr "Režim ukládání seznamu kamarádů"
+
+#: ../src/protocols/sametime/sametime.c:5085
+msgid "Local Buddy List Only"
+msgstr "Jen místní seznam kamarádů"
+
+#: ../src/protocols/sametime/sametime.c:5087
+msgid "Merge List from Server"
+msgstr "Sloučit seznam kamarádů ze serveru"
+
+#: ../src/protocols/sametime/sametime.c:5089
+msgid "Merge and Save List to Server"
+msgstr "Sloučit a uložit seznam na server"
+
+#: ../src/protocols/sametime/sametime.c:5091
+msgid "Synchronize List with Server"
+msgstr "Synchronizovat seznam se serverem"
+
+#: ../src/protocols/sametime/sametime.c:5140
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "Importovat seznam Sametime pro účet %s"
+
+#: ../src/protocols/sametime/sametime.c:5179
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Exportovat seznam Sametime pro účet %s"
+
+#: ../src/protocols/sametime/sametime.c:5232
+msgid "Unable to add group: group exists"
+msgstr "Nemohu přidat skupinu: skupina existuje"
+
+#: ../src/protocols/sametime/sametime.c:5233
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "Skupina nazvaná '%s' již ve vašem seznamu kamarádů existuje."
+
+#: ../src/protocols/sametime/sametime.c:5236
+#: ../src/protocols/sametime/sametime.c:5365
+msgid "Unable to add group"
+msgstr "Nemohu přidat skupinu"
+
+#: ../src/protocols/sametime/sametime.c:5295
+msgid "Possible Matches"
+msgstr "Možné výskyty"
+
+#: ../src/protocols/sametime/sametime.c:5311
+msgid "Notes Address Book group results"
+msgstr "Výsledky skupiny v adresáři Notes"
+
+#: ../src/protocols/sametime/sametime.c:5312
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr "Identifikátor '%s' se může odkazovat na libovolnou z následujících skupin adresáře Notes. Skupinu prosím přidejte do vašeho seznamu kamarádů správné skupiny ze seznamu níže."
+
+#: ../src/protocols/sametime/sametime.c:5317
+msgid "Select Notes Address Book"
+msgstr "Zvolte adresář Notes"
+
+#: ../src/protocols/sametime/sametime.c:5359
+msgid "Unable to add group: group not found"
+msgstr "Nemohu přidat skupinu: skupina nenalezena"
+
+#: ../src/protocols/sametime/sametime.c:5361
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr "Identifikátor '%s' neodpovídá žádné skupině adresáře Notes ve vaší komunitě Sametime."
+
+#: ../src/protocols/sametime/sametime.c:5402
+msgid "Notes Address Book Group"
+msgstr "Skupina adresáře Notes"
+
+#: ../src/protocols/sametime/sametime.c:5403
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr "Skupinu a její členy přidáte do vašeho seznamu kamarádů zadáním názvu skupiny adresáře Notes do pole níže."
+
+#: ../src/protocols/sametime/sametime.c:5451
+#, c-format
+msgid "Search results for '%s'"
+msgstr "Výsledky hledání '%s'"
+
+#: ../src/protocols/sametime/sametime.c:5452
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr "Identifikátor '%s' se může odkazovat na libovolného z následujících uživatelů. Tyto uživatele můžete přidat do vašeho seznamu kamarádů nebo jim odeslat zprávy tlačítky níže."
+
+#: ../src/protocols/sametime/sametime.c:5484
+msgid "No matches"
+msgstr "Žádné shody"
+
+#: ../src/protocols/sametime/sametime.c:5485
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr "Identifikátor '%s' neodpovídá žádnému uživateli ve vaší komunitě Sametime."
+
+#: ../src/protocols/sametime/sametime.c:5489
+msgid "No Matches"
+msgstr "Žádné shody"
+
+#: ../src/protocols/sametime/sametime.c:5526
+msgid "Search for a user"
+msgstr "Hledat uživatele"
+
+#: ../src/protocols/sametime/sametime.c:5527
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr "Odpovídající uživatele ve vaší komunitě Sametime hledejte zadáním jména nebo částečného ID do pole níže."
+
+#: ../src/protocols/sametime/sametime.c:5530
+msgid "User Search"
+msgstr "Hledání uživatele"
+
+#: ../src/protocols/sametime/sametime.c:5542
+msgid "Import Sametime List..."
+msgstr "Importovat seznam Sametime..."
+
+#: ../src/protocols/sametime/sametime.c:5546
+msgid "Export Sametime List..."
+msgstr "Exportovat seznam Sametime..."
+
+#: ../src/protocols/sametime/sametime.c:5550
+msgid "Add Notes Address Book Group..."
+msgstr "Přidat skupinu adresáře Notes..."
+
+#: ../src/protocols/sametime/sametime.c:5554
+msgid "User Search..."
+msgstr "Hledání uživatele..."
+
+#: ../src/protocols/sametime/sametime.c:5651
+msgid "Force login (ignore server redirects)"
+msgstr "Vnutit přihlášení (ignorovat přesměrování serveru)"
+
+#. pretend to be Sametime Connect
+#: ../src/protocols/sametime/sametime.c:5661
+msgid "Hide client identity"
+msgstr "Skrýt identitu klienta"
+
+#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Uživatel %s není v síti přítomen"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Výměna klíčů"
 
-#: src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Nemohu provést výměnu klíčů"
 
-#: src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Při výměně klíčů došlo k chybě"
 
-#: src/protocols/silc/buddy.c:119
+#: ../src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Výměna klíčů selhala"
 
-#: src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Čas vypršel při výměně klíčů"
 
-#: src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Výměna klíčů byla přerušena"
 
-#: src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Výměna klíčů již byla spuštěna"
 
-#: src/protocols/silc/buddy.c:139
+#: ../src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Výměnu klíčů nemůžete spustit sami se sebou"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "Vzdálený uživatel již není v síti přítomen"
 
-#: src/protocols/silc/buddy.c:293
+#: ../src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -9076,7 +10089,7 @@
 msgstr ""
 "Byl přijat požadavek na výměnu klíčů od %s. Chcete provést výměnu klíčů?"
 
-#: src/protocols/silc/buddy.c:297
+#: ../src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9087,59 +10100,59 @@
 "Vzdálený počítač: %s\n"
 "Vzdálený port: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: ../src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Požadavek na výměnu klíčů"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "IM s heslem"
 
-#: src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Nemohu nastavit klíč IM"
 
-#: src/protocols/silc/buddy.c:464
+#: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Nastavit heslo IM"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Získat veřejný klíč"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "Nemohu získat veřejný klíč"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Zobrazit veřejný klíč"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "Nemohu načíst veřejný klíč"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Informace o uživateli"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Nemohu získat informace o uživateli"
 
-#: src/protocols/silc/buddy.c:734
+#: ../src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Kamarádovi %s se nedůvěřuje"
 
-#: src/protocols/silc/buddy.c:737
+#: ../src/protocols/silc/buddy.c:737
 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."
@@ -9148,16 +10161,16 @@
 "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:1028
+#: ../src/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Otevřít..."
 
-#: src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Kamarád %s není v síti přítomen"
 
-#: src/protocols/silc/buddy.c:1040
+#: ../src/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9165,15 +10178,15 @@
 "Pro přidání kamaráda musíte importovat jeho/její veřejný klíč. Veřejný klíč "
 "importujete stisknutím Importovat."
 
-#: src/protocols/silc/buddy.c:1043
-msgid "Import..."
-msgstr "Importovat..."
-
-#: src/protocols/silc/buddy.c:1130
+#: ../src/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "_Importovat..."
+
+#: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Zvolte správného uživatele"
 
-#: src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/buddy.c:1177
 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."
@@ -9181,7 +10194,7 @@
 "Byl nalezen více než jeden uživatel se stejným veřejným klíčem. Vyberte ze "
 "seznamu uživatele, kterého přidat do seznamu kamarádů."
 
-#: src/protocols/silc/buddy.c:1134
+#: ../src/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9189,326 +10202,322 @@
 "Byl nalezen více než jeden uživatel se stejným jménem. Zvolte ze seznamu "
 "uživatele, kterého přidat do seznamu kamarádů."
 
-#: src/protocols/silc/buddy.c:1415
+#: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Odpojen"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Indisponován"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "Probuďte mě"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Hyperaktivní"
 
-#: src/protocols/silc/buddy.c:1427
+#: ../src/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Šťastný"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "Smutný"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Rozzlobený"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Žárlivý"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Hanbící se"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Neporazitelný"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Zamilovaný"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Ospalý"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Znuděný"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Vzrušený"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
+#: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Nedočkavý"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Režimy uživatele"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Nálada"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "Text stavu"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Preferovaný kontakt"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Preferovaný jazyk"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Zařízení"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Časová zóna"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Zeměpisné umístění"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Vynulovat klíč IM"
 
-#: src/protocols/silc/buddy.c:1572
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "IM s výměnou klíčů"
 
-#: src/protocols/silc/buddy.c:1576
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "IM s heslem"
 
-#: src/protocols/silc/buddy.c:1588
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Získat veřejný klíč..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Zabít uživatele"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "Kreslit na tabuli"
+
+#: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Heslo:"
 
-#: src/protocols/silc/chat.c:79
+#: ../src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanál %s v síti neexistuje"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "Informace o kanálu"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Nemohu získat informace o kanálu"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Název kanálu:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Počet uživatelů:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Zakladatel kanálu:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Šifra kanálu:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: ../src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC kanálu:</b>\t%s"
 
-#: src/protocols/silc/chat.c:145
+#: ../src/protocols/silc/chat.c:146
 #, 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:150
+#: ../src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Režimy kanálu:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:164
 #, 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:164
+#: ../src/protocols/silc/chat.c:165
 #, 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:234
+#: ../src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "Přidat veřejný klíč kanálu"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "Otevřít veřejný klíč..."
 
-#: src/protocols/silc/chat.c:398
+#: ../src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "Heslo kanálu"
 
-#: src/protocols/silc/chat.c:405
+#: ../src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "Seznam veřejných klíčů kanálu"
 
-#: src/protocols/silc/chat.c:410
+#: ../src/protocols/silc/chat.c:411
 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 ""
-"Autentizace kanálů se používá pro zabezpečení kanálu před nepovoleným "
-"přístupem. Autentizace může být založena na heslu a digitálních podposech. "
-"Je-li nastaveno heslo, je vyžadováno pro umožnění připojení. Jsou-li "
-"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:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+msgstr "Autentizace kanálů se používá pro zabezpečení kanálu před nepovoleným přístupem. Autentizace může být založena na heslu a digitálních podpisech. Je-li nastaveno heslo, je vyžadováno pro umožnění připojení. Jsou-li 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:420 ../src/protocols/silc/chat.c:421
+#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "Autentizace kanálu"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "Přidat/odstranit"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "Název skupiny"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/protocols/silc/chat.c:591
+#: ../src/protocols/silc/chat.c:592
 #, 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:593
+#: ../src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "Přidat soukromou skupinu kanálu"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "Limit uživatelů"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 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:863
+#: ../src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "Info"
 
-#: src/protocols/silc/chat.c:871
+#: ../src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "Seznam pozvaných"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "Seznam zakázaných"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "Přidat soukromou skupinu"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "Zrušit trvalé"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "Nastavit trvalé"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "Nastavit limit uživatelů"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "Zrušit omezení tématu"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "Nastavit omezení tématu"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "Zrušit Soukromý kanál"
 
-#: src/protocols/silc/chat.c:933
+#: ../src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "Nastavit Soukromý kanál"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "Zrušit Tajný kanál"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "Nastavit Tajný kanál"
 
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:1033
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Jste zakladatel kanálu <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: ../src/protocols/silc/chat.c:1037
 #, 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:1071
+#: ../src/protocols/silc/chat.c:1096
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
@@ -9516,213 +10525,220 @@
 "Než se budete moci připojit k soukromé skupině, musíte se připojit ke kanálu "
 "%s"
 
-#: src/protocols/silc/chat.c:1073
+#: ../src/protocols/silc/chat.c:1098
 msgid "Join Private Group"
 msgstr "Připojit se k soukromé skupině"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1099
 msgid "Cannot join private group"
-msgstr "Nemohu sepřipojit k soukromé skupině"
-
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+msgstr "Nemohu se připojit k soukromé skupině"
+
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+msgid "Call Command"
+msgstr "Příkaz volání"
+
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Nemohu zavolat příkaz"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: 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:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: ../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:205
+#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Zabezpečený přenos souborů"
 
-#: 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
+#: ../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 "Chyba při přenosu souboru"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Přístup odepřen"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Výměna klíčů selhala"
 
-#: src/protocols/silc/ft.c:102
-#, fuzzy
+#: ../src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Sezení pro přenos souborů neexistuje"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Není aktivní sezení pro přenos souborů"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Přenos souborů již byl spuštěn"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Nemohu provést výměnu klíčů pro přenos souborů"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Nemohu spustit přenos souborů"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Nemohu odeslat soubor"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573
 #, 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:425
+#: ../src/protocols/silc/ops.c:639
 #, 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:429
+#: ../src/protocols/silc/ops.c:643
 #, 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:462
+#: ../src/protocols/silc/ops.c:676
 #, 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:470
+#: ../src/protocols/silc/ops.c:684
 #, 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:499
+#: ../src/protocols/silc/ops.c:713
 #, 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:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Byli jste zabiti v %s: (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Zabit od %s: (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "Odhlášení od serveru"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Osobní informace"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Datum narození"
 
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
-msgstr "Název zaměstnátí"
-
-#: src/protocols/silc/ops.c:834
+msgstr "Název zaměstnání"
+
+#: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Role v zaměstnání"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "Organizace"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Jednotka"
 
-#: src/protocols/silc/ops.c:861
+#: ../src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "E-mail"
 
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Poznámka"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Připojit se k chatu"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: ../src/protocols/silc/ops.c:1211
+msgid "Status Text"
+msgstr "Text stavu"
+
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Otisk veřejného klíče"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Babbleprint veřejného klíče"
 
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
-msgstr "Více..."
-
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: ../src/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "_Více..."
+
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "Odpojit se od serveru"
 
-#: src/protocols/silc/ops.c:1155
+#: ../src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Nemohu odpojit"
 
-#: src/protocols/silc/ops.c:1166
+#: ../src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Nemohu nastavit téma"
 
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Nemohu změnit přezdívku"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Seznam místností"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Nemohu získat seznam místností"
 
-#: src/protocols/silc/ops.c:1291
+#: ../src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Nebyl přijat veřejný klíč"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "Informace o serveru"
 
-#: src/protocols/silc/ops.c:1305
+#: ../src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "Nemohu získat informace o serveru"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "Statistika o serveru"
 
-#: src/protocols/silc/ops.c:1335
+#: ../src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "Nemohu získat statistiku o serveru"
 
-#: src/protocols/silc/ops.c:1344
+#: ../src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "Statistika o serveru není k dispozici"
 
-#: src/protocols/silc/ops.c:1366
+#: ../src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9752,108 +10768,108 @@
 "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 serverů: %d\n"
+"Celkem směrovačů: %d\n"
 "Celkem operátorů serverů: %d\n"
 "Celkem operátorů směrovačů: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: ../src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "Statistika o síti"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: ../src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping selhal"
 
-#: src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "Od serveru přijata odpověď na ping"
 
-#: src/protocols/silc/ops.c:1410
+#: ../src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "Nemohu zabít uživatele"
 
-#: src/protocols/silc/ops.c:1494
+#: ../src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "Chyba při připojování se k serveru SILC"
 
-#: src/protocols/silc/ops.c:1499
+#: ../src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "Výměna klíčů selhala"
 
-#: src/protocols/silc/ops.c:1508
+#: ../src/protocols/silc/ops.c:1722
 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:1543
+#: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "Odpojen serverem"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "Obnovuji sezení"
 
-#: src/protocols/silc/ops.c:1607
+#: ../src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "Autentizuji připojení"
 
-#: src/protocols/silc/ops.c:1654
+#: ../src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "Ověřuji veřejný klíč serveru"
 
-#: src/protocols/silc/ops.c:1695
+#: ../src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "Je vyžadováno heslo"
 
-#: src/protocols/silc/ops.c:1724
+#: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Chyba: Verze nesouhlasí, aktualizujte vašeho klienta"
 
-#: src/protocols/silc/ops.c:1727
+#: ../src/protocols/silc/ops.c:1941
 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:1730
+#: ../src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Chyba: Vzdálený nepodporuje navrženou skupinu KE"
 
-#: src/protocols/silc/ops.c:1733
+#: ../src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Chyba: Vzdálený nepodporuje navrženou šifru"
 
-#: src/protocols/silc/ops.c:1736
+#: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Chyba: Vzdálený nepodporuje navržený PKCS"
 
-#: src/protocols/silc/ops.c:1739
+#: ../src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Chyba: Vzdálený nepodporuje navrženou hašovací funkci"
 
-#: src/protocols/silc/ops.c:1742
+#: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Chyba: Vzdálený nepodporuje navržený HMAC"
 
-#: src/protocols/silc/ops.c:1744
+#: ../src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "Chyba: Nesprávný podpis"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "Chyba: Neplatný cookie"
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Autentizace selhala"
 
-#: src/protocols/silc/pk.c:103
+#: ../src/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9862,12 +10878,12 @@
 "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
+#: ../src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Přijat veřejný klíč %s. Chcete přijmout tento veřejný klíč?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9880,48 +10896,61 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Ověřit veřejný klíč"
 
-#: src/protocols/silc/pk.c:119
-msgid "View..."
-msgstr "Zobrazit..."
-
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:119
+msgid "_View..."
+msgstr "_Zobrazit..."
+
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Nepodporovaný typ veřejného klíče"
 
-#: src/protocols/silc/silc.c:154
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/protocols/silc/silc.c:186
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "Nemohu inicializovat připojení klienta SILC"
 
-#: src/protocols/silc/silc.c:197
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "Provádím výměnu klíčů"
 
-#: src/protocols/silc/silc.c:270
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
+#: ../src/protocols/silc/silc.c:328
+msgid "Cannot initialize SILC protocol"
+msgstr "Nemohu inicializovat protokol SILC"
+
+#: ../src/protocols/silc/silc.c:335
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Nemohu najít/přistupovat k adresáři ~/.silc"
+
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "Připojuji se k serveru SILC"
 
-#: src/protocols/silc/silc.c:630
+#: ../src/protocols/silc/silc.c:349
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Nemohu načíst pár klíčů SILC: %s"
+
+#: ../src/protocols/silc/silc.c:369
+msgid "Unable to create connection"
+msgstr "Nemohu vytvořit spojení"
+
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Vaše momentální nálada"
 
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr "Normální"
-
-#: src/protocols/silc/silc.c:657
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9929,43 +10958,43 @@
 "\n"
 "Vaše preferované metody kontaktu"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "Videokonference"
 
-#: src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Váš momentální stav"
 
-#: src/protocols/silc/silc.c:681
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "Služby online"
 
-#: src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/silc.c:722
 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:690
+#: ../src/protocols/silc/silc.c:728
 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:697
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "Váš soubor VCard"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "Atributy stavu online uživatele"
 
-#: src/protocols/silc/silc.c:712
+#: ../src/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9975,128 +11004,169 @@
 "vaše osobní informace. Zadejte prosím informace, které chcete, aby o vás "
 "ostatní uživatelé viděli."
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1435
 msgid "Message of the Day"
 msgstr "Zpráva dne"
 
-#: src/protocols/silc/silc.c:752
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "Zpráva dne není k dispozici"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
 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:800
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
+msgid "Create New SILC Key Pair"
+msgstr "Vytvořit nový pár klíčů SILC"
+
+#: ../src/protocols/silc/silc.c:841
+msgid "Passphrases do not match"
+msgstr "Hesla nesouhlasí"
+
+#: ../src/protocols/silc/silc.c:885
+msgid "Key Pair Generation failed"
+msgstr "Generování páru klíčů selhalo"
+
+#: ../src/protocols/silc/silc.c:924
+msgid "Key Length"
+msgstr "Délka klíče"
+
+#: ../src/protocols/silc/silc.c:926
+msgid "Public Key File"
+msgstr "Soubor veřejného klíče"
+
+#: ../src/protocols/silc/silc.c:928
+msgid "Private Key File"
+msgstr "Soubor soukromého klíče"
+
+#: ../src/protocols/silc/silc.c:937
+msgid "Real Name"
+msgstr "Skutečné jméno"
+
+#: ../src/protocols/silc/silc.c:951
+msgid "Re-type Passphrase"
+msgstr "Heslo (znovu)"
+
+#: ../src/protocols/silc/silc.c:958
+msgid "Generate Key Pair"
+msgstr "Generovat pár klíčů"
+
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "Stav připojení"
 
-#: src/protocols/silc/silc.c:809
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "Zobrazit zprávu dne"
 
-#: src/protocols/silc/silc.c:882
+#: ../src/protocols/silc/silc.c:1015
+msgid "Create SILC Key Pair..."
+msgstr "Vytvořit klíčů SILC..."
+
+#: ../src/protocols/silc/silc.c:1114
 #, 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:1033
+#: ../src/protocols/silc/silc.c:1306
 msgid "Topic too long"
 msgstr "Téma příliš dlouhé"
 
-#: src/protocols/silc/silc.c:1114
+#: ../src/protocols/silc/silc.c:1387
 msgid "You must specify a nick"
 msgstr "Musíte zadat přezdívku"
 
-#: src/protocols/silc/silc.c:1216
+#: ../src/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel %s not found"
 msgstr "kanál %s nenalezen"
 
-#: src/protocols/silc/silc.c:1221
+#: ../src/protocols/silc/silc.c:1494
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "režimy kanálu pro %s: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: ../src/protocols/silc/silc.c:1496
 #, 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:1236
+#: ../src/protocols/silc/silc.c:1509
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Nemohu nastavit režimy kanálu pro %s"
 
-#: src/protocols/silc/silc.c:1266
+#: ../src/protocols/silc/silc.c:1539
 #, 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:1329
+#: ../src/protocols/silc/silc.c:1602
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanál]: Opustit chat"
 
-#: src/protocols/silc/silc.c:1333
+#: ../src/protocols/silc/silc.c:1606
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanál]: Opustit chat"
 
-#: src/protocols/silc/silc.c:1337
+#: ../src/protocols/silc/silc.c:1610
 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:1342
+#: ../src/protocols/silc/silc.c:1615
 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:1346
+#: ../src/protocols/silc/silc.c:1619
 msgid "list:  List channels on this network"
 msgstr "list: Vypsat kanály v této síti"
 
-#: src/protocols/silc/silc.c:1350
+#: ../src/protocols/silc/silc.c:1623
 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:1354 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2602
 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:1358
+#: ../src/protocols/silc/silc.c:1631
 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:1362
+#: ../src/protocols/silc/silc.c:1635
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Zobrazit zprávu dne tohoto serveru"
 
-#: src/protocols/silc/silc.c:1366
+#: ../src/protocols/silc/silc.c:1639
 msgid "detach:  Detach this session"
 msgstr "detach: Odpojit toto sezení"
 
-#: src/protocols/silc/silc.c:1370
+#: ../src/protocols/silc/silc.c:1643
 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:1374
+#: ../src/protocols/silc/silc.c:1647
 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:1380
+#: ../src/protocols/silc/silc.c:1653
 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:1384
+#: ../src/protocols/silc/silc.c:1657
 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:1388
+#: ../src/protocols/silc/silc.c:1661
 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:1392
+#: ../src/protocols/silc/silc.c:1665
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10104,7 +11174,7 @@
 "cmode &lt;kanál&gt; [+|-&lt;režimy&gt]; [parametry]: Změnit nebo zobrazit "
 "režimy kanálu"
 
-#: src/protocols/silc/silc.c:1396
+#: ../src/protocols/silc/silc.c:1669
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10112,15 +11182,15 @@
 "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:1400
+#: ../src/protocols/silc/silc.c:1673
 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:1404
+#: ../src/protocols/silc/silc.c:1677
 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:1408
+#: ../src/protocols/silc/silc.c:1681
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10128,37 +11198,37 @@
 "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:1412
+#: ../src/protocols/silc/silc.c:1685
 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:1416
+#: ../src/protocols/silc/silc.c:1689
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]: Zobrazit administrativní podrobnosti o serveru"
 
-#: src/protocols/silc/silc.c:1420
+#: ../src/protocols/silc/silc.c:1693
 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:1424
+#: ../src/protocols/silc/silc.c:1697
 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:1428
+#: ../src/protocols/silc/silc.c:1701
 msgid "stats:  View server and network statistics"
 msgstr "stats: Zobrazit statistku o serveru a síti"
 
-#: src/protocols/silc/silc.c:1432
+#: ../src/protocols/silc/silc.c:1705
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: Poslat PING připojenému serveru"
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1710
 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:1441
+#: ../src/protocols/silc/silc.c:1714
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10166,30 +11236,6 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;kanál(y)&gt;: Vypsat "
 "konkrétní uživatele v kanálech"
 
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Instant Message"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "Digitálně podepisovat všechny instant message"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "Ověřovat podpisy všech zpráv IM"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Zprávy kanálu"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "Digitálně podepisovat všechny zprávy kanálu"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "Ověřovat podpisy všech zpráv kanálu"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10199,91 +11245,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../src/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "Zásuvný modul protokolu SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../src/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol Secure Internet Live Conferencing (SILC)"
 
-#: src/protocols/silc/silc.c:1600
+#: ../src/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "Soubor veřejného klíče"
 
-#: src/protocols/silc/silc.c:1604
+#: ../src/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "Soubor soukromého klíče"
 
-#: src/protocols/silc/silc.c:1607
+#: ../src/protocols/silc/silc.c:1876
+msgid "Cipher"
+msgstr "Šifra"
+
+#: ../src/protocols/silc/silc.c:1886
+msgid "HMAC"
+msgstr "HMAC"
+
+#: ../src/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "Autentizace veřejným klíčem"
 
-#: src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "Odmítnout sledování jinými uživateli"
 
-#: src/protocols/silc/silc.c:1614
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "Blokovat pozvání"
 
-#: src/protocols/silc/silc.c:1617
+#: ../src/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "Blokovat IM bez výměny klíčů"
 
-#: src/protocols/silc/silc.c:1620
+#: ../src/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "Odmítat požadavky na stav atributu stavu online"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/silc.c:1904
+msgid "Block messages to whiteboard"
+msgstr "Blokovat zprávy na tabuli"
+
+#: ../src/protocols/silc/silc.c:1907
+msgid "Automatically open whiteboard"
+msgstr "Automaticky otevírat tabuli"
+
+#: ../src/protocols/silc/silc.c:1910
+msgid "Digitally sign and verify all messages"
+msgstr "Digitálně podepisovat a ověřovat všechny zprávy"
+
+#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
 msgid "Creating SILC key pair..."
-msgstr "Vytvářím páč klíčů SILC..."
+msgstr "Vytvářím pár 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:313
+#: ../src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Skutečné jméno: \t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Jméno uživatele: \t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: ../src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Název počítače: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "OOrganizace: \t%s\n"
-
-#: src/protocols/silc/util.c:323
+msgstr "Organizace: \t%s\n"
+
+#: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Země: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmus: \t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Délka klíče: \t%d bitů\n"
 
-#: src/protocols/silc/util.c:327
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10294,7 +11360,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10303,140 +11369,223 @@
 "Babbleprint veřejného klíče:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "Informace o veřejném klíči"
 
-#: src/protocols/silc/util.c:515
+#: ../src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "Pager"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Počítač"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "Terminál"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s odeslal zprávu na tabuli. Chcete otevřít tabuli?"
+
+#: ../src/protocols/silc/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr "%s odeslal zprávu na tabuli na kanálu %s. Chcete otevřít tabuli?"
+
+#: ../src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr "Tabule"
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:409
+msgid "Could not write"
+msgstr "Nemohu zapisovat"
+
+#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
+msgid "Could not connect"
+msgstr "Nemohu se připojit"
+
+#: ../src/protocols/simple/simple.c:994
+msgid "Wrong Password"
+msgstr "Špatné heslo"
+
+#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
+#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
+msgid "Could not create listen socket"
+msgstr "Nemohu vytvořit socket pro poslouchání"
+
+#: ../src/protocols/simple/simple.c:1474
+msgid "Couldn't resolve host"
+msgstr "Nemohu najít počítač"
+
+#: ../src/protocols/simple/simple.c:1572
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "Jména uživatelů SIP nemohou obsahovat mezery ani symboly @"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../src/protocols/simple/simple.c:1734
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Zásuvný modul protokolu SIP/SIMPLE"
+
+#. *  summary
+#: ../src/protocols/simple/simple.c:1735
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "Zásuvný modul protokolu SIP/SIMPLE"
+
+#: ../src/protocols/simple/simple.c:1757
+msgid "Publish status (note: everyone may watch you)"
+msgstr "Zveřejnit stav (upozornění: všichni vás mohou sledovat)"
+
+#: ../src/protocols/simple/simple.c:1763
+msgid "Use UDP"
+msgstr "Používat UDP"
+
+#: ../src/protocols/simple/simple.c:1765
+msgid "Use proxy"
+msgstr "Používat proxy"
+
+#: ../src/protocols/simple/simple.c:1767
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../src/protocols/simple/simple.c:1769
+msgid "Auth User"
+msgstr "Uživatel pro autentizaci"
+
+#: ../src/protocols/simple/simple.c:1771
+msgid "Auth Domain"
+msgstr "Doména autentizace"
+
+#: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Vyhledávám %s"
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Spojení k %s selhalo"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Přihlásit: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nemohu zapsat soubor %s."
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nemohu číst soubor %s."
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Zpráva příliš dlouhá, posledních %s bajtů useknuto."
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s není momentálně přihlášen."
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Varování %s není povoleno."
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Zpráva byla zahozena, překračujete limit rychlosti serveru."
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat v %s není dostupný."
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Odesíláte zprávy pro %s příliš rychle."
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Přišli jste IM od %s, protože byla příliš dlouhá."
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Přišli jste o IM %s, protože byla odeslána příliš rychle."
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Selhání."
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Příliš mnoho odpovědí."
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Potřebuji více kvalifikátorů."
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Adresářová služba momentálně není k dispozici."
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "Vyhledávání podle emailu omezeno."
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Klíčové slovo ignorováno."
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "Žádné klíčové slovo."
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "Uživatel nemá žádné informace v adresáři."
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Země není podporována."
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Neznámé selhání: %s."
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Služba je dočasně nedostupná."
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Vaše úroveň výstrahy je momentálně příliš vysoká pro přihlášení."
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:552
 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."
@@ -10444,42 +11593,41 @@
 "Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
 "to znovu. Pokud to budete dále zkoušet, budete muset čekat ještě déle."
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr "Došlo k neznáme chybě při přihlašování: %s."
-
-#: src/protocols/toc/toc.c:557
+msgstr "Došlo k neznámé chybě při přihlašování: %s."
+
+#: ../src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Došlo k neznámé chybě, %d. Informace: %s"
 
-#: src/protocols/toc/toc.c:584
-#, fuzzy
+#: ../src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
-msgstr "Neplatná skupina"
-
-#: src/protocols/toc/toc.c:668
+msgstr "Neplatný název skupiny"
+
+#: ../src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Spojení uzavřeno"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Čekám na odpověď..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC se vrátil z přestávky. Nyní můžete zase odesílat zprávy."
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "Změna hesla úspěšná"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC odeslal příkaz PAUSE."
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:994
 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 "
@@ -10489,37 +11637,45 @@
 "vykopnout, pokud odešlete zprávu. Gaim zabrání, aby něco prošlo. Je to jen "
 "dočasné, buďte prosím trpěliví."
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Získat informace adresáře"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Nastavit informace o uživateli"
+
+#: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Nastavit informace adresáře"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Změnit heslo"
+
+#: ../src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Nemohu otevřít %s pro zápis!"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
+#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Nemohu se připojit pro přenos."
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Nemohu zapsat hlavičku souboru. Soubor nebude přenesen."
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Uložit jako..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223
 #, 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"
@@ -10527,7 +11683,7 @@
 msgstr[1] "%s požaduje, aby %s přijal %d soubory: %s (%.2f %s)%s%s"
 msgstr[2] "%s požaduje, aby %s přijal %d souborů: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vás žádá, abyste jim poslali soubor"
@@ -10542,27 +11698,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
 msgid "TOC Protocol Plugin"
 msgstr "Zásuvný modul protokolu TOC"
 
-#: src/protocols/toc/toc.c:2337
+#: ../src/protocols/toc/toc.c:2340
 msgid "TOC host"
 msgstr "Počítač TOC"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2344
 msgid "TOC port"
 msgstr "Port TOC"
 
-#: src/protocols/yahoo/yahoo.c:706
+#: ../src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše zpráva Yahoo! nebyla odeslána."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
 msgid "Buzz!!"
 msgstr "Crr!!"
 
-#: src/protocols/yahoo/yahoo.c:797
+#: ../src/protocols/yahoo/yahoo.c:810
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Zpráva systému Yahoo! pro %s:"
@@ -10570,23 +11726,22 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
-#, fuzzy, c-format
+#: ../src/protocols/yahoo/yahoo.c:906
+#, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů."
-
-#: src/protocols/yahoo/yahoo.c:893
-#, fuzzy
+msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů%s%s"
+
+#: ../src/protocols/yahoo/yahoo.c:912
 msgid "Message (optional) :"
-msgstr "Upozornění na zprávu"
-
-#: src/protocols/yahoo/yahoo.c:935
+msgstr "Zpráva (nepovinná):"
+
+#: ../src/protocols/yahoo/yahoo.c:954
 #, 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:938
+#: ../src/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10595,11 +11750,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:941
+#: ../src/protocols/yahoo/yahoo.c:960
 msgid "Add buddy rejected"
 msgstr "Přidání kamaráda zamítnuto"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: ../src/protocols/yahoo/yahoo.c:1703
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10610,11 +11765,11 @@
 "se pravděpodobně nebude moci úspěšně přihlásit k Yahoo. Hledejte aktualizace "
 "na %s."
 
-#: src/protocols/yahoo/yahoo.c:1687
+#: ../src/protocols/yahoo/yahoo.c:1706
 msgid "Failed Yahoo! Authentication"
 msgstr "Selhala autentizace Yahoo!"
 
-#: src/protocols/yahoo/yahoo.c:1760
+#: ../src/protocols/yahoo/yahoo.c:1772
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10623,19 +11778,19 @@
 "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:1763
+#: ../src/protocols/yahoo/yahoo.c:1775
 msgid "Ignore buddy?"
 msgstr "Ignorovat kamaráda?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: ../src/protocols/yahoo/yahoo.c:1809
 msgid "Invalid username."
 msgstr "Neplatné jméno uživatele."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid "Normal authentication failed!"
 msgstr "Normální autentizace selhala!"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10646,127 +11801,136 @@
 "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:1817
+#: ../src/protocols/yahoo/yahoo.c:1829
 msgid "Incorrect password."
 msgstr "Nesprávné heslo."
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1832
 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:1823
+#: ../src/protocols/yahoo/yahoo.c:1835
 #, 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:1877
+#: ../src/protocols/yahoo/yahoo.c:1889
 #, 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:1880
+#: ../src/protocols/yahoo/yahoo.c:1892
 msgid "Could not add buddy to server list"
-msgstr "Nemohu přidat kaamráda do seznamu na serveru"
-
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
-#: src/protocols/yahoo/ycht.c:413
+msgstr "Nemohu přidat kamaráda do seznamu na serveru"
+
+#: ../src/protocols/yahoo/yahoo.c:2011
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Slyšitelné %s/%s/%s.swf ] %s"
+
+#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
+#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Nemohu číst"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
+#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Problém se spojením"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
+msgid "Not at Home"
 msgstr "Nejsem doma"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
+#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
+msgid "Not at Desk"
 msgstr "Nejsem u stolu"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
+msgid "Not in Office"
 msgstr "Nejsem v kanceláři"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
 msgid "On Vacation"
 msgstr "Na dovolené"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
 msgid "Stepped Out"
 msgstr "Šel jsem ven"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
 msgid "Not on server list"
 msgstr "Není na seznamu serveru"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
 msgid "Appear Online"
-msgstr "Vypadat odpojen"
-
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
+msgstr "Vypadat připojen"
+
+#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
 msgid "Appear Permanently Offline"
+msgstr "Vypadat vždy odpojen"
+
+#: ../src/protocols/yahoo/yahoo.c:2888
+msgid "Presence"
+msgstr "Přítomnost"
+
+#: ../src/protocols/yahoo/yahoo.c:2931
+msgid "Appear Offline"
 msgstr "Vypadat odpojen"
 
-#: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
-msgid "Stealth"
-msgstr "Stát"
-
-#: src/protocols/yahoo/yahoo.c:2849
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2940
 msgid "Don't Appear Permanently Offline"
-msgstr "Vypadat odpojen"
-
-#: src/protocols/yahoo/yahoo.c:2896
+msgstr "Nevypadat vždy odpojen"
+
+#: ../src/protocols/yahoo/yahoo.c:2988
 msgid "Join in Chat"
 msgstr "Připojit se k chatu"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: ../src/protocols/yahoo/yahoo.c:2994
 msgid "Initiate Conference"
 msgstr "Začít konferenci"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:3022
+msgid "Presence Settings"
+msgstr "Nastavení přítomnosti"
+
+#: ../src/protocols/yahoo/yahoo.c:3028
 msgid "Start Doodling"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2963
+msgstr "Začít kreslit"
+
+#: ../src/protocols/yahoo/yahoo.c:3060
 msgid "Active which ID?"
 msgstr "Které ID aktivovat?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: ../src/protocols/yahoo/yahoo.c:3069
 msgid "Join who in chat?"
 msgstr "Připojit koho k chatu?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: ../src/protocols/yahoo/yahoo.c:3079
 msgid "Activate ID..."
 msgstr "Aktivovat ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
-msgstr "Připojit uživatele k chatu..."
-
-#: src/protocols/yahoo/yahoo.c:3541
+#: ../src/protocols/yahoo/yahoo.c:3083
+msgid "Join User in Chat..."
+msgstr "Připojit se k uživateli v chatu..."
+
+#: ../src/protocols/yahoo/yahoo.c:3621
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;místnost&gt;:  Připojit se k místnosti chatu v síti Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: Zkusit získat pozornost kontaktu zazvoněním"
-
-#: src/protocols/yahoo/yahoo.c:3550
+#: ../src/protocols/yahoo/yahoo.c:3626
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vypsat místnosti v síti Yahoo"
+
+#: ../src/protocols/yahoo/yahoo.c:3630
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Získat pozornost uživatele zabzučením"
+
+#: ../src/protocols/yahoo/yahoo.c:3634
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: Požádat uživatele, aby začal sezení kreslení"
 
 #. *< type
 #. *< ui_requirement
@@ -10778,69 +11942,77 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
 msgid "Yahoo Protocol Plugin"
 msgstr "Zásuvný modul protokolu Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../src/protocols/yahoo/yahoo.c:3746
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonsko"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: ../src/protocols/yahoo/yahoo.c:3749
 msgid "Pager host"
 msgstr "Počítač pageru"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: ../src/protocols/yahoo/yahoo.c:3752
 msgid "Japan Pager host"
 msgstr "Počítač pageru v Japonsku"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../src/protocols/yahoo/yahoo.c:3755
 msgid "Pager port"
 msgstr "Port pageru"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: ../src/protocols/yahoo/yahoo.c:3758
 msgid "File transfer host"
 msgstr "Počítač přenosu souborů"
 
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
+#: ../src/protocols/yahoo/yahoo.c:3761
+msgid "Japan file transfer host"
 msgstr "Počítač přenosu souborů v Japonsku"
 
-#: src/protocols/yahoo/yahoo.c:3676
+#: ../src/protocols/yahoo/yahoo.c:3764
 msgid "File transfer port"
 msgstr "Port přenosu souborů"
 
-#: src/protocols/yahoo/yahoo.c:3679
-#, fuzzy
-msgid "Chat Room Locale"
-msgstr "URL seznamu místností chatu"
-
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
+#: ../src/protocols/yahoo/yahoo.c:3767
+msgid "Chat room locale"
+msgstr "Locale místnosti chatu"
+
+#: ../src/protocols/yahoo/yahoo.c:3770
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorovat pozvání do konferencí a místností chatu"
+
+#: ../src/protocols/yahoo/yahoo.c:3774
+msgid "Chat room list URL"
 msgstr "URL seznamu místností chatu"
 
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
+#: ../src/protocols/yahoo/yahoo.c:3777
+msgid "YCHT host"
 msgstr "Počítač YCHT"
 
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
+#: ../src/protocols/yahoo/yahoo.c:3780
+msgid "YCHT port"
 msgstr "Port YCHT"
 
-#: src/protocols/yahoo/yahoo_profile.c:672
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "Chyba při zápisu"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP adresa:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonsko"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10848,7 +12020,7 @@
 "Lituji, v současné době nejsou podporovány profily označené jako obsahující "
 "obsah pro dospělé."
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: ../src/protocols/yahoo/yahoo_profile.c:830
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10856,55 +12028,53 @@
 "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:971
+#: ../src/protocols/yahoo/yahoo_profile.c:1006
 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
+#: ../src/protocols/yahoo/yahoo_profile.c:1078
+#: ../src/protocols/yahoo/yahoo_profile.c:1082
+#: ../src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Hobbies"
-msgstr "Končíčky"
-
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+msgstr "Koníčky"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/yahoo/yahoo_profile.c:1100
 msgid "Latest News"
 msgstr "Nejnovější zprávy"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Home Page"
 msgstr "Domovská stránka"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 msgid "Cool Link 1"
 msgstr "Skvělý odkaz 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: ../src/protocols/yahoo/yahoo_profile.c:1141
 msgid "Cool Link 2"
 msgstr "Skvělý odkaz 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1145
 msgid "Cool Link 3"
 msgstr "Skvělý odkaz 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid "Last Update"
-msgstr "Naposledy aktualizováno"
-
-#: src/protocols/yahoo/yahoo_profile.c:1129
+msgstr "Poslední aktualizace"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informace o uživateli %s nedostupné"
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-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:1151
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr "Lituji, tento profil je zřejmě v jazyce nebo formátu, který momentálně není podporován."
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1186
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10912,76 +12082,91 @@
 "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:1154
+#: ../src/protocols/yahoo/yahoo_profile.c:1189
 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:1162
+msgstr "Nemohu získat profil uživatele. To pravděpodobně znamená, že uživatel neexistuje; někdy 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:1197
 msgid "The user's profile is empty."
 msgstr "Profil uživatele je prázdný."
 
-#: src/protocols/yahoo/yahoochat.c:202
+#: ../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:204
+msgstr "%s odmítl vaše pozvání ke konferenci do místnosti \"%s\", protože \"%s\"."
+
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Pozvání odmítnuto"
 
-#: src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Nemohu se připojit k chatu"
 
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "Možná je místnost plná?"
-
-#: src/protocols/yahoo/yahoochat.c:435
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Neznámá místnost"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Možná je místnost plná"
+
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Není k dispozici"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr "Neznámá chyba. Možná se budete muset odhlásit a počkat pět minut, než se budete moci znovu připojit k místnosti chatu"
+
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Nyní diskutujete v %s."
 
-#: src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:626
 msgid "Failed to join buddy in chat"
 msgstr "Nemohu připojit kamaráda k chatu"
 
-#: src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Maybe they're not in a chat?"
 msgstr "Možná nejsou v chatu?"
 
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Fetching the room list failed."
 msgstr "Získávání seznamu místností selhalo."
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: ../src/protocols/yahoo/yahoochat.c:1433
 msgid "Voices"
 msgstr "Hlasy"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: ../src/protocols/yahoo/yahoochat.c:1436
 msgid "Webcams"
 msgstr "WWW kamery"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
 msgid "Unable to fetch room list."
 msgstr "Nemohu získat seznam místností."
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: ../src/protocols/yahoo/yahoochat.c:1510
 msgid "User Rooms"
 msgstr "Místnosti uživatele"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problém se spojením k servery YCHT."
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:331
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10989,81 +12174,80 @@
 "(Při konverzi této zprávy došlo k chybě. Zkontrolujte volbu 'Kódování' v "
 "Editoru účtů)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#: ../src/protocols/zephyr/zephyr.c:686
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Nemohu do chatu poslat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Uživatel:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Skrytý nebo nepřihlášen"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Na %s od %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
 msgid "Anyone"
 msgstr "Kdokoli"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2278
 msgid "_Class:"
 msgstr "_Třída:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2284
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2290
 msgid "_Recipient:"
 msgstr "_Příjemce:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2301
 #, 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:2602
+#: ../src/protocols/zephyr/zephyr.c:2607
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;přezdívka&gt;: Najít uživatele"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2612
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;přezdívka&gt;: Najít uživatele"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2617
 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:2617
+#: ../src/protocols/zephyr/zephyr.c:2622
 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:2622
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "topic &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:2628
+msgstr "topic &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
+
+#: ../src/protocols/zephyr/zephyr.c:2633
 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:2633
+#: ../src/protocols/zephyr/zephyr.c:2638
 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:2639
+#: ../src/protocols/zephyr/zephyr.c:2644
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11071,7 +12255,7 @@
 "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:2645
+#: ../src/protocols/zephyr/zephyr.c:2650
 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;"
@@ -11079,7 +12263,7 @@
 "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:2651
+#: ../src/protocols/zephyr/zephyr.c:2656
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11087,15 +12271,15 @@
 "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:2656
+#: ../src/protocols/zephyr/zephyr.c:2661
 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:2762
+#: ../src/protocols/zephyr/zephyr.c:2767
 msgid "Resubscribe"
 msgstr "Znovu se přihlásit"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2770
 msgid "Retrieve subscriptions from server"
 msgstr "Získat přihlášení od serveru"
 
@@ -11109,54 +12293,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
 msgid "Zephyr Protocol Plugin"
 msgstr "Zásuvný modul protokolu Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2882
 msgid "Export to .anyone"
 msgstr "Exportovat do .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2885
 msgid "Export to .zephyr.subs"
 msgstr "Exportovat do .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2888
 msgid "Import from .anyone"
-msgstr "Exportovat do .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
+msgstr "Importovat z .anyone"
+
+#: ../src/protocols/zephyr/zephyr.c:2891
 msgid "Import from .zephyr.subs"
-msgstr "Exportovat do .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
+msgstr "Importovat z .zephyr.subs"
+
+#: ../src/protocols/zephyr/zephyr.c:2894
 msgid "Realm"
-msgstr "Skutečné jméno"
-
-#: src/protocols/zephyr/zephyr.c:2889
+msgstr "Realm"
+
+#: ../src/protocols/zephyr/zephyr.c:2897
 msgid "Exposure"
 msgstr "Vystavení"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
+#: ../src/proxy.c:1338
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Chyba připojení k proxy %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: ../src/proxy.c:1327
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Přístup odepřen: proxy server zakazuje tunelování portu %d."
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Chyba připojení k proxy %d"
-
-#: src/proxy.c:1874
+#: ../src/proxy.c:2327
 msgid "Invalid proxy settings"
 msgstr "Neplatná nastavení proxy"
 
-#: src/proxy.c:1874
+#: ../src/proxy.c:2327
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11164,1315 +12345,162 @@
 "Buď jméno počítače nebo číslo portu uvedené pro vámi zadaný typ proxy je "
 "neplatné."
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "Přijmout"
-
-#: src/server.c:243
+#: ../src/savedstatuses.c:514
+msgid "saved statuses"
+msgstr "uložené stavy"
+
+#: ../src/savedstatuses.c:767
+msgid "I'm not here right now"
+msgstr "Teď tu zrovna nejsem"
+
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s je teď znám jako %s.\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d zpráva)"
-msgstr[1] "(%d zprávy)"
-msgstr[2] "(%d zpráv)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 zpráva)"
-
-#: src/server.c:859
-#, fuzzy, c-format
+#: ../src/server.c:681
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s zve %s do místnosti chatu %s\n"
-
-#: src/server.c:864
+msgstr ""
+"%s zve %s do místnosti chatu %s:\n"
+"%s"
+
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s zve %s do místnosti chatu %s\n"
 
-#: src/server.c:868
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "Přijmout pozvání k chatu?"
 
-#: src/status.c:153
-#, fuzzy
+#: ../src/status.c:153
 msgid "Unset"
-msgstr "Jednotka"
-
-#: src/status.c:156
+msgstr "Nenastaveno"
+
+#: ../src/status.c:156
 msgid "Unavailable"
 msgstr "Nedostupný"
 
-#: src/status.c:621
+#: ../src/status.c:160
+msgid "Mobile"
+msgstr "Mobilní"
+
+#: ../src/status.c:623
+#, c-format
+msgid "%s signed on"
+msgstr "%s se přihlásil"
+
+#: ../src/status.c:627
 #, c-format
 msgid "%s came back"
 msgstr "%s se vrátil"
 
-#: src/status.c:626
+#: ../src/status.c:634
+#, c-format
+msgid "%s signed off"
+msgstr "%s se odhlásil"
+
+#: ../src/status.c:638
 #, c-format
 msgid "%s went away"
 msgstr "%s šel pryč"
 
-#: src/status.c:1308
+#: ../src/status.c:1317
 #, c-format
 msgid "%s became idle"
 msgstr "%s se stal nečinným"
 
-#: src/status.c:1323
+#: ../src/status.c:1330
 #, c-format
 msgid "%s became unidle"
 msgstr "%s se stal činným"
 
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "Automatická nepřítomnost"
-
-#: src/util.c:2121
-#, fuzzy, c-format
+#: ../src/status.c:1392
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s se stal nečinným"
+
+#: ../src/status.c:1394
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s se stal činným"
+
+#: ../src/util.c:679
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2459
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"Chyba při čtení %s: \n"
-"%s.\n"
-
-#: src/util.c:2122
-#, fuzzy, c-format
+msgstr "Chyba při čtení %s"
+
+#: ../src/util.c:2460
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr ""
-"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/util.c:2567
+msgstr "Při čtení vašeho %s došlo k chybě. Nebylo načteno a starý soubor byl přejmenován na %s~."
+
+#: ../src/util.c:2899
 msgid "Calculating..."
 msgstr "Počítám..."
 
-#: src/util.c:2570
+#: ../src/util.c:2902
 msgid "Unknown."
 msgstr "Neznámá."
 
-#: src/util.c:2600
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekunda"
-msgstr[1] "sekundy"
-msgstr[2] "sekund"
-
-#: src/util.c:2614
-msgid "day"
-msgid_plural "days"
-msgstr[0] "den"
-msgstr[1] "dny"
-msgstr[2] "dnů"
-
-#: src/util.c:2622
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hodina"
-msgstr[1] "hodiny"
-msgstr[2] "hodin"
-
-#: src/util.c:2630
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuta"
-msgstr[1] "minuty"
-msgstr[2] "minut"
-
-#: src/util.c:3053
+#: ../src/util.c:2928
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekundy"
+msgstr[2] "%d sekund"
+
+#: ../src/util.c:2940
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d den"
+msgstr[1] "%d dny"
+msgstr[2] "%d dnů"
+
+#: ../src/util.c:2948
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d hodina"
+msgstr[1] "%s, %d hodiny"
+msgstr[2] "%s, %d hodin"
+
+#: ../src/util.c:2954
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hodina"
+msgstr[1] "%d hodiny"
+msgstr[2] "%d hodin"
+
+#: ../src/util.c:2962
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minuta"
+msgstr[1] "%s, %d minuty"
+msgstr[2] "%s, %d minut"
+
+#: ../src/util.c:2968
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minuty"
+msgstr[2] "%d minut"
+
+#: ../src/util.c:3443
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Chyba při otevírání spojení.\n"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Třídění seznamu kamarádů"
-
-#~ msgid "_Sorting:"
-#~ msgstr "_Třídění:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "Zobrazení kamarádů"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "Zobrazit detaily o uživateli"
-
-#~ msgid "Gnome Default"
-#~ msgstr "Implicitní pro Gnome"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "Zpráva o nepřítomnosti:"
-
-#, fuzzy
-#~ msgid "Quit message"
-#~ msgstr "(1 zpráva)"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Obnovit stav nepřítomnosti po znovupřipojení"
-
-#~ msgid "Mail Server"
-#~ msgstr "Poštovní server:"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d nových/%d celkem)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Zkontrolovat poštu"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Kontrolovat poštu každých X sekund.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Automatické přihlašování"
-
-#~ msgid "New..."
-#~ msgstr "Nový..."
-
-#~ msgid "Back"
-#~ msgstr "Zpět"
-
-#~ msgid "Signoff"
-#~ msgstr "Odhlásit"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Nastavení ikony v panelu"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Skrýt nové zprávy, dokud není kliknuto na ikonu v panelu"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientace"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Orientace oznamovací oblasti."
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "Nepřipojen k AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "Nezadána přezdívka."
-
-#~ msgid "No roomname given."
-#~ msgstr "Nezadán název místnosti."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "Neplatné URI AIM"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nemohu přiřadit %s k socketu:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "Nemohu otevřít socket"
-
-#~ msgid "Remote Control"
-#~ msgstr "Vzdálené ovládání"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Poskytuje vzdálené ovládání pro aplikace gaim."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "Dává Gaim schopnost být vzdáleně ovládán aplikacemi třetí strany nebo "
-#~ "nástrojem gaim-remote."
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "Test signálů GTK"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "Test pro zjištění, jestli všechny signály ui fungují správně."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Když je otevřena nová konverzace, tento zásuvný modul vloží poslední "
-#~ "konverzaci do aktuální konverzace."
-
-#~ msgid "_Apply"
-#~ msgstr "_Použít"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Zadokovaný _seznam kamarádů je vždy nahoře"
-
-#~ msgid "Away!"
-#~ msgstr "Pryč!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Upravit tuto zprávu"
-
-#~ msgid "I'm Back!"
-#~ msgstr "Jsem zpátky!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Jste si jisti, že chcete odstranit zprávu o nepřítomnosti \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Odstranit zprávu o nepřítomnosti"
-
-#~ msgid "Set All Away"
-#~ msgstr "Nastavit vše na nepřítomen"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "Nemůžete uložit zprávu o nepřítomnosti s prázdným nadpisem"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "Dejte prosím zprávě nadpis, nebo zvolte \"Použít\" pro použití bez "
-#~ "uložení."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Nemůžete vytvořit prázdnou zprávu o nepřítomnosti"
-
-#~ msgid "New away message"
-#~ msgstr "Nová zpráva o nepřítomnosti"
-
-#~ msgid "Away title: "
-#~ msgstr "Nadpis zprávy o nepřítomnosti: "
-
-#~ msgid "_Save"
-#~ msgstr "_Uložit"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Uložit _a použít"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Chyba seznamu kamarádů"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Velikost šipky rozbalovače"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Použití: %s příkaz [PŘEPÍNAČE] [URI]\n"
-#~ "\n"
-#~ "    PŘÍKAZY:\n"
-#~ "       uri                      Obsloužit URI AIM:\n"
-#~ "       away                     Zobrazit dialog o nepřítomnosti s "
-#~ "implicitní \n"
-#~ "                                zprávou\n"
-#~ "       back                     Odstranit dialog o nepřítomnosti\n"
-#~ "       quit                     Zavřít běžící kopii Gaim\n"
-#~ "\n"
-#~ "    PŘEPÍNAČE:\n"
-#~ "       -h, --help [příkaz]      Zobrazit nápovědu pro příkaz\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim neběží (v sezení 0)\n"
-#~ "Je načten zásuvný modul \"vzdálené ovládání\"?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Používání URI AIM:\n"
-#~ "Odeslání IM jménu uživatele:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Tučňák&message=ahoj+světe'\n"
-#~ "V tomto případě je 'Tučňák' jméno uživatele, kterého chcete IM a\n"
-#~ "'ahoj světe' je zpráva, kterou odeslat. Místo mezer musí být použito "
-#~ "'+'.\n"
-#~ "Všimněte si prosím výše použitého uzavření do apostrofů - pokud toto "
-#~ "spustíte\n"
-#~ "v shellu, musí být zrušen význam '&', nebo příkaz na tom místě končí.\n"
-#~ "Dále, následující prostě otevře okno konverzace s jménem uživatele,\n"
-#~ "beze zprávy:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Tučňák'\n"
-#~ "\n"
-#~ "Připojení se k chatu:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=HalaTučňáků'\n"
-#~ "...se připojí k místnosti chatu 'HalaTučňáků'.\n"
-#~ "\n"
-#~ "Přidání kamaráda do vašeho seznamu kamarádů:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Tučňák'\n"
-#~ "...vám nabídne přidat 'Tučňák'a do vašeho seznamu kamarádů.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Zavřít běžící kopii Gaim\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Označit všechny účty jako \"nepřítomen\" s implicitní zprávou.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nastavit všechny účty jako přítomné.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Zobrazit méně nastavení"
-
-#~ msgid "Information"
-#~ msgstr "Informace"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Kamarádi/_Odpojit"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Nástroje/_Pryč"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Nástroje/Akce zásuvných _modulů"
-
-#~ msgid "Rename Group"
-#~ msgstr "Přejmenovat skupinu"
-
-#~ msgid "New group name"
-#~ msgstr "Nový název skupiny"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Zadejte prosím nový název vybrané skupiny."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Účet:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Varován:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Varován (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Nástroje/Pryč"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Odeslat zprávu vybranému kamarádovi"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Získat informace o vybraném kamarádovi"
-
-#~ msgid "_Chat"
-#~ msgstr "_Chat"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Připojit se k místnosti chatu"
-
-#~ msgid "_Away"
-#~ msgstr "_Pryč"
-
-#~ msgid "Set an away message"
-#~ msgstr "Nastavit zprávu o nepřítomnosti"
-
-#~ msgid "Done."
-#~ msgstr "Hotovo."
-
-#~ msgid "Signon: "
-#~ msgstr "Přihlásit: "
-
-#~ msgid "Signon"
-#~ msgstr "Přihlášení"
-
-#~ msgid "Cancel All"
-#~ msgstr "Zrušit vše"
-
-#~ msgid "_Reconnect"
-#~ msgstr "_Znovu se připojit"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s byl odpojen.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Důvod není znám."
-
-#~ msgid "Reconnect _All"
-#~ msgstr "Znovu připojit _vše"
-
-#~ msgid "Time"
-#~ msgstr "Čas"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Získat zprávu o nepřítomnosti"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Konverzace/_Varovat..."
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/Konverzace/A_lias..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/Možnosti/Zobrazovat _časové značky"
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Konverzace/Varovat..."
-
-#~ msgid "Warn"
-#~ msgstr "Varovat"
-
-#~ msgid "Warn the user"
-#~ msgstr "Varovat uživatele"
-
-#~ msgid "Block the user"
-#~ msgstr "Blokovat uživatele"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Odeslat soubor uživateli"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Přidat uživatele do vašeho seznamu kamarádů"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Odstranit uživatele z vašeho seznamu kamarádů"
-
-#~ msgid "Send"
-#~ msgstr "Odeslat"
-
-#~ msgid "Invite"
-#~ msgstr "Pozvat"
-
-#~ msgid "Invite a user"
-#~ msgstr "Pozvat uživatele"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Přidat chat do vašeho seznamu kamarádů"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Konverzace/Zavřít"
-
-#~ msgid "former lead developer"
-#~ msgstr "dřívější vedoucí vývojář"
-
-#~ msgid "former maintainer"
-#~ msgstr "dřívější správce"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Ázerbajdžánština"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova a Vladimir (Kaladan) Petkov"
-
-#~ msgid "Burmese"
-#~ msgstr "Burmese"
-
-#, fuzzy
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norština"
-
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
-
-#~ msgid "Albanian"
-#~ msgstr "Albánština"
-
-#~ msgid "Turkish"
-#~ msgstr "Turečtina"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrajinština"
-
-#~ msgid "Chinese"
-#~ msgstr "Čínština"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Jméno uživatele"
-
-#~ msgid "Warn User"
-#~ msgstr "Varovat uživatele"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Varovat %s?</span>\n"
-#~ "\n"
-#~ "Toto zvýší úroveň varování %s a oni budou pod vlivem tvrdšího omezení "
-#~ "rychlosti.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Varovat _anonymně?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Anonymní varování jsou méně vážná.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Zobrazit detaily o přenosu"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "Z_obrazovat vzdálené přezdívky, pokud není nastaven alias"
-
-#~ msgid "Display"
-#~ msgstr "Zobrazení"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Zobrazovat _časovou značku u zpráv"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignorovat _barvy"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ignorovat _řezy písma"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignorovat _velikosti písma"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Implicitní formátování"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_Odesílat s odchozími zprávami implicitní formátování"
-
-#~ msgid "Send Message"
-#~ msgstr "Odeslat zprávu"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter _odešle zprávu"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "_Control-Enter odešle zprávu"
-
-#~ msgid "Window Closing"
-#~ msgstr "Zavírání okna"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape zavře okno"
-
-#~ msgid "Insertions"
-#~ msgstr "Vkládání"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} mění _formátování"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(číslo) vloží _smajlík"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Zobrazovat _tlačítka jako:"
-
-#~ msgid "Pictures"
-#~ msgstr "Obrázky"
-
-#~ msgid "Text"
-#~ msgstr "Text"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Obrázky a text"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "Z_výšit okno při událostech"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Zobrazovat úrovně _varování"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "_Automaticky rozbalovat kontakty"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Povolit příkazy s _lomítkem"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Zobrazovat a_liasy v záložkách/nadpisech"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "Z_výšit okno IM při událostech"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Zvý_šit okno chatu při událostech"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Používat v chatech jména uživatele s _více barvami"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "_Umístění záložek:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "_Umísťování nových konverzací:"
-
-#~ msgid "Message Logs"
-#~ msgstr "Záznamy zpráv"
-
-#~ msgid "System Logs"
-#~ msgstr "Záznamy systému"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_Povolit záznam systému"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Zaznamenávat, když se kamarádi _přihlásí/odhlásí"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Zaznamenávat, když se kamarádi stanou _nečinnými/činnými"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Zaznamenávat, když kamarádi odejdou _pryč/vrátí se"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Zaznamenávat _vlastní přihlášení/nečinnosti/odchody pryč"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "Hlášení _času nečinnosti:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Použití Gaim"
-
-#~ msgid "X usage"
-#~ msgstr "Použití X"
-
-#~ msgid "Windows usage"
-#~ msgstr "Použití Windows"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Napsal:</span>\t%s\n"
-#~ "<span weight=\"bold\">WWW stránka:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Název souboru:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Napsal:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">Název souboru:</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "Načítat"
-
-#~ msgid "Summary"
-#~ msgstr "Souhrn"
-
-#~ msgid "Details"
-#~ msgstr "Detaily"
-
-#~ msgid "_Edit"
-#~ msgstr "_Upravit"
-
-#~ msgid "Interface"
-#~ msgstr "Rozhraní"
-
-#~ msgid "Message Text"
-#~ msgstr "Text zprávy"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Zkratky"
-
-#~ msgid "Away Messages"
-#~ msgstr "Zprávy o nepřítomnosti"
-
-#~ msgid "Plugins"
-#~ msgstr "Zásuvné moduly"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Prostý text"
-
-#~ msgid "Please create an account."
-#~ msgstr "Vytvořte prosím účet."
-
-#~ msgid "Login"
-#~ msgstr "Přihlášení"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Účet:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>_Heslo:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "_Účty"
-
-#~ msgid "P_references"
-#~ msgstr "_Nastavení"
-
-#~ msgid "_Sign on"
-#~ msgstr "Při_hlášení"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Použití: %s [PŘEPÍNAČ]...\n"
-#~ "\n"
-#~ "  -a, --acct          zobrazit okno editoru účtů\n"
-#~ "  -w, --away[=ZPRÁVA] při přihlášení být pryč (nepovinný argument ZPRÁVA\n"
-#~ "                      určuje název zprávy o nepřítomnosti, kterou "
-#~ "používat)\n"
-#~ "  -l, --login[=JMÉNO] automaticky se přihlásit (nepovinný argument JMÉNO\n"
-#~ "                      určuje účty, které použít, oddělené čárkami)\n"
-#~ "  -n, --loginwin      nepřihlašovat se automaticky; zobrazit okno "
-#~ "přihlášení\n"
-#~ "  -u, --user=NÁZEV    použít účet NÁZEV\n"
-#~ "  -c, --config=ADR    použít adresář ADR pro soubry nastavení\n"
-#~ "  -d, --debug         tisknout na stdout ladicí zprávy\n"
-#~ "  -v, --version       zobrazit aktuální verzi a skončit\n"
-#~ "  -h, --help          zobrazit tuto nápovědu a skončit\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "Nemohu načíst nastavení"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim nemohl načíst vaše nastavení, protože jsou uloženy ve starém "
-#~ "formátu, který se už nepoužívá. Nastavte je prosím znovu pomocí okna "
-#~ "Nastavení."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Trošku méně nudné implicitní"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Přítomen jen pro přátele"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Pryč jen pro přátele"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Neviditelný jen pro přátele"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Nemohu nalézt jméno počítače."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "Chyba při čtení ze socketu."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Chyba při zápisu do socketu."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Autentizace selhala."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Neznámý kód chyby."
-
-#~ msgid "Status: %s"
-#~ msgstr "Stav: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "Nemohu se připojit"
-
-#~ msgid "Reading data"
-#~ msgstr "Čtu data"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Komunikace s balancerem"
-
-#~ msgid "Reading server key"
-#~ msgstr "Čtu na klíč serveru"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Vyměňuji hash klíčů"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Kritická chyba v knihovně GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "Nemohu pingnout server"
-
-#~ msgid "Send as message"
-#~ msgstr "Odeslat jako zprávu"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "Vyhledávám server GG"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "Zadáno neplatné UIN Gadu-Gadu"
-
-#~ 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."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "Nemohu získat výsledky hledání"
-
-#~ msgid "Birth Year"
-#~ msgstr "Rok narození"
-
-#~ msgid "Sex"
-#~ msgstr "Pohlaví"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Na serveru Gadu-Gadu není uložen seznam kamarádů."
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "Nemohu importovat seznam kamarádů ze serveru"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Seznam kamarádů úspěšně přenesen na server Gadu-Gadu."
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Nemohu přenést seznam kamarádů na server Gadu-Gadu"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Seznam kamarádů úspěšně odstraněn ze serveru Gadu-Gadu"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Nemohu odstranit seznam kamarádů ze serveru Gadu-Gadu"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "Heslo nemohlo být změněno"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Chyba při komunikaci se serverem Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "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."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Nemohu importovat seznam kamarádů Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Gaim se nemohl připojit k serveru seznamu kamarádů Gadu-Gadu. Zkuste to "
-#~ "prosím později."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Nemohu exportovat seznam kamarádů"
-
-#~ 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."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Nemohu odstranit seznam kamarádů Gadu-Gadu"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "Nemůžu přistupovat k adresáři"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim nemohl vyhledávat v adresáři, protože se nemohl připojit k serveru "
-#~ "adresáře. Zkuste to prosím později."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim nemohl změnit vaše heslo kvůli chybě při komunikaci se serverem Gadu-"
-#~ "Gadu. Zkuste to prosím později."
-
-#~ msgid "Directory Search"
-#~ msgstr "Hledání v adresáři"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "Nemohu přistupovat k profilu uživatele."
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim nemohl přistupovat k profilu tohoto uživatele kvůli chybě při "
-#~ "připojování k serveru adresáře. Zkuste to prosím později."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim se setkal s chybou při komunikaci se serverem ICQ."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "Uživatel %s (%s%s%s%s%s) chce, abyste je autorizovali."
-
-#~ msgid "Send message through server"
-#~ msgstr "Odeslat zprávu přes server"
-
-#~ msgid "Connecting..."
-#~ msgstr "Připojuji se..."
-
-#~ msgid "Nick:"
-#~ msgstr "Přezdívka:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Uživatel Gaim"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Přenos souboru přerušen"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Informace o kamarádovi %s"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Neplatná přezdívka '%s'"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "Neplatná přezdívka"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Profil Jabberu"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Chyba v seznamu místností"
-
-#~ msgid "Logged out"
-#~ msgstr "Odhlášen"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Skrýt operační systém"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "Uživatel %s si vás chce přidat do svého seznamu kamarádů."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Zobrazovat upozornění na zavřené konverzace"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Zobrazovat upozornění na vypršení času"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "Konverzace se stala neaktivní a její čas vypršel."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "Byli jste odpojeni od serveru, protože jste se přihlásili z jiného "
-#~ "umístění"
-
-#~ msgid "User Properties"
-#~ msgstr "Vlastnosti uživatele"
-
-#, fuzzy
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Přenos souboru %s dokončen"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Byli jste odpojeni protože jste se s tímto jménem uživatele přihlásili na "
-#~ "jiném místě."
-
-#~ msgid "Not specified"
-#~ msgstr "Neurčeno"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "Informace ICQ pro %s"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované "
-#~ "jméno uživatele končí mezerou."
-
-#~ msgid "Visible"
-#~ msgstr "Viditelný"
-
-#~ msgid "Available Message:"
-#~ msgstr "Zpráva o dostupnosti:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Pracuji a toužím po rozptýlení--pošlete mi IM!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Nastavit zprávu o dostupnosti..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Nemohu opustit kanál"
-
-#~ msgid "Basic Profile"
-#~ msgstr "Základní profil"
-
-#~ msgid "Profile Information"
-#~ msgstr "Informace o profilu"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "Instant Messengery"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "Jsem z"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Nastavte svá data profilu Trepia."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Set Profile"
-#~ msgstr "Nastavit profil"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Navštívit domovskou stránku"
-
-#~ msgid "Local Users"
-#~ msgstr "Místní uživatelé"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Zásuvný modul protokolu Trepia"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "Byli jste odhlášeni, protože jste se přihlásili z jiného počítače nebo "
-#~ "zařízení."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Zadejte prosím své heslo"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s přihlášen."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s se přihlásil"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s odhlášen."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s se odhlásil"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s byl právě varován od %s.\n"
-#~ "Vaše nová úroveň varování je %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "anonymní osoby"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s zve %s do místnosti chatu %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Promiňte, na chvíli jsem běžel ven!"
-
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Nemohu uhádnout typ obrázku podle dodané přípony souboru. Implicitně "
-#~ "používám PNG."
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "Implicitní pár klíčů SILC"
-
-#~ msgid "SILC Public Key"
-#~ msgstr "Veřejný klíč SILC"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "Soukromý klíč SILC"
-
-#~ msgid "Local Addressbook"
-#~ msgstr "Místní adresář"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Účty"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Nastavení"
-
-# "Různá chyba"
-#~ msgid "Miscellaneous error"
-#~ msgstr "Obecná chyba"
-
-#~ msgid "Initiate Chat"
-#~ msgstr "Začít chat"
-
-#~ msgid "Update Buddy Icon"
-#~ msgstr "Aktualizovat ikonu kamaráda"
-
-#~ msgid "Unable to connect to server"
-#~ msgstr "Nemohu se připojit k serveru"
-
-#~ msgid "Unknown error when attempting to authorize with MSN login server."
-#~ msgstr ""
-#~ "Neznámá chyba při pokusu autorizovat se u přihlašovacího serveru MSN."
-
-#~ msgid "Requesting to send password"
-#~ msgstr "Požaduji odeslání hesla"
-
-#~ msgid "Syncing with server"
-#~ msgstr "Synchronizuji se se serverem"
-
-#~ msgid "Unable to connect to %s server"
-#~ msgstr "Nemohu se připojit k serveru %s"
-
-#~ msgid "Error writing to %s server"
-#~ msgstr "Chyba při zápisu na server %s"
-
-#~ msgid "Error reading from %s server"
-#~ msgstr "Chyba při čtení ze serveru %s"
-
-#~ msgid "MSN error for account %s"
-#~ msgstr "Chyba MSN pro účet %s"
-
-#~ msgid "Received HTTP error. Please report this."
-#~ msgstr "Přijata chyba HTTP. Nahlaste to prosím."
-
-#~ msgid "(There was an error receiving this message)"
-#~ msgstr "(Při příjmu této zprávy došlo k chybě)"
-
-#~ msgid ""
-#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-#~ "(1,048,576 bytes)."
-#~ msgstr ""
-#~ "Gaim nemůže po Yahoo! posílat soubory, které jsou větší než jeden "
-#~ "megabajt (1.048.576 bajtů)."
-
-#~ msgid "Moving Gaim Settings.."
-#~ msgstr "Přesouvám nastavení Gaim.."
-
-#~ msgid "Moving Gaim user settings to: "
-#~ msgstr "Přesouvám nastavení uživatele Gaim do: "
-
-#~ msgid "Notification"
-#~ msgstr "Upozornění"
-
-#~ msgid "That file does not exist."
-#~ msgstr "Tento soubor neexistuje."
-
-#~ msgid "%s was not found.\n"
-#~ msgstr "%s nebyl nalezen.\n"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Userid"
-#~ msgstr "ID uživatele"
-
-#~ msgid "Your message did not get sent."
-#~ msgstr "Vaše zpráva nebyla odeslána."
-
-#~ msgid "Your message to %s did not get sent:"
-#~ msgstr "Vaše zpráva pro %s nebyla odeslána:"
--- a/po/he.po	Wed Mar 08 14:57:22 2006 +0000
+++ b/po/he.po	Wed Mar 08 17:43:55 2006 +0000
@@ -1,20 +1,20 @@
 # Gaim Hebrew translation
 # Copyright (C) 2003, Pavel Bibergal cyberkm@barak-online.net
-# Fixed & Updated 2006, Shalom Craimer <scraimer at gmail dot com>
-# 
+# Fixed & Updated 2005-2006, Shalom Craimer <scraimer at gmail dot com>
+#
 # This file is distributed under the same license as the Gaim package.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
-"POT-Creation-Date: 2006-03-05 00:00-0500\n"
-"PO-Revision-Date: 2005-11-22 11:00+0200\n"
+"POT-Creation-Date: 2006-03-08 00:00-0500\n"
+"PO-Revision-Date: 2006-03-08 09:36+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at gmail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
-"MIME-Version: 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../gaim.desktop.in.h:1
@@ -156,7 +156,7 @@
 
 #. add enabled / disabled
 #: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:577
+#: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "דלוק"
 
@@ -186,7 +186,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "לחיצה ימנית לעוד הודעות שלא נקראו...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3238
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -201,7 +201,7 @@
 #: ../src/protocols/jabber/buddy.c:1101 ../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:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
+#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
 msgid "Available"
 msgstr "זמין"
 
@@ -210,22 +210,22 @@
 #: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
 #: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
 #: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
+#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7873
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
 #: ../src/status.c:158
 msgid "Away"
 msgstr "רחוק מהמחשב"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
+#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
 #: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
 #: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
+#: ../src/protocols/oscar/oscar.c:7845 ../src/protocols/yahoo/yahoo.c:2733
 #: ../src/status.c:154
 msgid "Offline"
 msgstr "מנותק"
@@ -254,7 +254,7 @@
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
 msgid "Plugins"
 msgstr "תוספים"
 
@@ -591,7 +591,7 @@
 
 #. Extract their Name and put it in
 #: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
 #: ../src/protocols/msn/msn.c:1525
 msgid "Name"
@@ -609,14 +609,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8393
 #: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "חיפוש"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
-#: ../src/gtkblist.c:4934
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4534
+#: ../src/gtkblist.c:4898
 msgid "Group:"
 msgstr "קבוצה:"
 
@@ -656,8 +656,8 @@
 msgstr "ללא"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
-#: ../src/gtkblist.c:4379 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
+#: ../src/gtkblist.c:4343 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "אנשי קשר"
 
@@ -693,7 +693,7 @@
 msgstr "בחר את כל החשבונות שאליהם אנשי-קשר יתווספו אוטומטית."
 
 #: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1262
+#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "חשבון"
 
@@ -1572,7 +1572,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:262
+#: ../plugins/timestamp.c:254
 msgid "Timestamp"
 msgstr "חותמת זמן "
 
@@ -1580,7 +1580,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:265 ../plugins/timestamp.c:267
+#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "מוסיף חותמת זמן מהסוג שיש ב-iChat לשיחות, כל כמה דקות."
 
@@ -1683,19 +1683,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
 msgstr "שקיפות"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "שקיפות משתנה עבור רשימת אנשי הקשר וחלונות השיחה."
 
 #. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:663
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1720,7 +1720,7 @@
 msgstr "הפעל את Gaim בעת הפעלת חלונות"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3587
 msgid "Buddy List"
 msgstr "רשימת אנשי קשר"
 
@@ -1785,34 +1785,34 @@
 msgid "Save password"
 msgstr "שמור חדשה"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3507
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:789
-#: ../src/gtkrequest.c:275 ../src/protocols/gg/gg.c:454
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3471
+#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:785
+#: ../src/gtkrequest.c:271 ../src/protocols/gg/gg.c:454
 #: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
 #: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
 #: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8122
-#: ../src/protocols/oscar/oscar.c:8245 ../src/protocols/oscar/oscar.c:8270
-#: ../src/protocols/oscar/oscar.c:8322 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:8247 ../src/protocols/oscar/oscar.c:8272
+#: ../src/protocols/oscar/oscar.c:8324 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
 #: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:749 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
+#: ../src/protocols/yahoo/yahoo.c:3072
 msgid "OK"
 msgstr "אישור"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4975
-#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:790
-#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
-#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
-#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4939
+#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:805 ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:891 ../src/gtkdialogs.c:946 ../src/gtkdialogs.c:983
+#: ../src/gtkdialogs.c:1008 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:276 ../src/gtksavedstatuses.c:296
+#: ../src/gtkrequest.c:272 ../src/gtksavedstatuses.c:296
 #: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
 #: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
 #: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
@@ -1824,9 +1824,9 @@
 #: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
 #: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
 #: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8123 ../src/protocols/oscar/oscar.c:8246
-#: ../src/protocols/oscar/oscar.c:8271 ../src/protocols/oscar/oscar.c:8323
-#: ../src/protocols/oscar/oscar.c:8392
+#: ../src/protocols/oscar/oscar.c:8125 ../src/protocols/oscar/oscar.c:8248
+#: ../src/protocols/oscar/oscar.c:8273 ../src/protocols/oscar/oscar.c:8325
+#: ../src/protocols/oscar/oscar.c:8394
 #: ../src/protocols/sametime/sametime.c:3376
 #: ../src/protocols/sametime/sametime.c:3461
 #: ../src/protocols/sametime/sametime.c:3631
@@ -1835,9 +1835,9 @@
 #: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
-#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
+#: ../src/protocols/yahoo/yahoo.c:3073
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -1846,8 +1846,8 @@
 msgid "Missing protocol plugin for %s"
 msgstr "חסר תוסף הפרוטוקול עבור %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3499
-#: ../src/gtkblist.c:3505
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3463
+#: ../src/gtkblist.c:3469
 msgid "Connection Error"
 msgstr "שגיעת התחברות"
 
@@ -1886,7 +1886,7 @@
 msgid "Change user information for %s"
 msgstr "שנה פרטי משתמש עבור %s"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:282
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:278
 #: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "שמור"
@@ -1905,7 +1905,7 @@
 msgid "Chats"
 msgstr "שיחות"
 
-#: ../src/blist.c:1886
+#: ../src/blist.c:1894
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
@@ -1921,7 +1921,7 @@
 "%d אנשי קשר מהקבוצה %s לא הוסרו מכיוון שהחשבונות אליהם הם שייכים.אנשי לא "
 "מחוברים. אנשי קשר אלו והקבוצה לא הוסרו.\n"
 
-#: ../src/blist.c:1896
+#: ../src/blist.c:1904
 msgid "Group not removed"
 msgstr "הקבוצה לא הוסרה"
 
@@ -1986,7 +1986,7 @@
 msgid "%s left the room (%s)."
 msgstr "%s עזב את החדר (%s)."
 
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
 msgid "No name"
 msgstr "ללא שם"
 
@@ -2138,7 +2138,7 @@
 msgid "Password:"
 msgstr "סיסמא:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4553 ../src/gtkblist.c:4919
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4517 ../src/gtkblist.c:4883
 msgid "Alias:"
 msgstr "תיאור:"
 
@@ -2225,7 +2225,7 @@
 msgid "Add Account"
 msgstr "הוספת חשבון"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3508
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3472
 msgid "Modify Account"
 msgstr "עריכת החשבון"
 
@@ -2247,7 +2247,7 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "האם אתה בטוח שברצונך למחוק את %s?"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:279
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:275
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "מחק"
@@ -2270,229 +2270,229 @@
 msgid "Add buddy to your list?"
 msgstr "להוסיף את איש הקשר לרשימה שלך?"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4974 ../src/gtkconv.c:1594
-#: ../src/gtkrequest.c:280 ../src/protocols/gg/gg.c:811
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4938 ../src/gtkconv.c:1597
+#: ../src/gtkrequest.c:276 ../src/protocols/gg/gg.c:811
 #: ../src/protocols/oscar/oscar.c:4877
 #: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "הוסף"
 
-#: ../src/gtkblist.c:673
+#: ../src/gtkblist.c:669
 msgid "Join a Chat"
 msgstr "הצטרף לשיחה"
 
-#: ../src/gtkblist.c:694
+#: ../src/gtkblist.c:690
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "יש להזין את המידע המתאים על הצ'אט שברצונך להצטרף אליו.\n"
 
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:701 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "חש_בון:"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:945
 msgid "Get _Info"
 msgstr "הצג _פרטים"
 
-#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:948 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "הודעה"
 
-#: ../src/gtkblist.c:958
+#: ../src/gtkblist.c:954
 msgid "_Send File"
 msgstr "שלח קובץ"
 
-#: ../src/gtkblist.c:965
+#: ../src/gtkblist.c:961
 msgid "Add Buddy _Pounce"
 msgstr "להוסי_ף תגובה לפעולת איש קשר?"
 
-#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
+#: ../src/gtkblist.c:965 ../src/gtkblist.c:969 ../src/gtkblist.c:1068
+#: ../src/gtkblist.c:1091
 msgid "View _Log"
 msgstr "הצ_ג רישום"
 
-#: ../src/gtkblist.c:984
+#: ../src/gtkblist.c:980
 msgid "Alias..."
 msgstr "שם נוסף..."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1591 ../src/gtkrequest.c:281
+#: ../src/gtkblist.c:983 ../src/gtkconv.c:1594 ../src/gtkrequest.c:277
 msgid "Remove"
 msgstr "הסר"
 
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
+#: ../src/gtkblist.c:989 ../src/gtkblist.c:1076 ../src/gtkblist.c:1097
 msgid "_Alias..."
 msgstr "_שם נוסף..."
 
-#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
+#: ../src/gtkblist.c:991 ../src/gtkblist.c:1078 ../src/gtkblist.c:1099
 msgid "_Remove"
 msgstr "_הסר"
 
-#: ../src/gtkblist.c:1043
+#: ../src/gtkblist.c:1039
 msgid "Add a _Buddy"
 msgstr "הוספת _איש קשר"
 
-#: ../src/gtkblist.c:1045
+#: ../src/gtkblist.c:1041
 msgid "Add a C_hat"
 msgstr "הוסף _שיחה"
 
-#: ../src/gtkblist.c:1048
+#: ../src/gtkblist.c:1044
 msgid "_Delete Group"
 msgstr "הסר _קבוצה"
 
-#: ../src/gtkblist.c:1050
+#: ../src/gtkblist.c:1046
 msgid "_Rename"
 msgstr "_שנה שם"
 
 #. join button
-#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1064 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "הצ_טרף"
 
-#: ../src/gtkblist.c:1070
+#: ../src/gtkblist.c:1066
 msgid "Auto-Join"
 msgstr "הצטרף אוטומטית"
 
-#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
+#: ../src/gtkblist.c:1104 ../src/gtkblist.c:1127
 msgid "_Collapse"
 msgstr "_קפל"
 
-#: ../src/gtkblist.c:1136
+#: ../src/gtkblist.c:1132
 msgid "_Expand"
 msgstr "ה_רחב"
 
-#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3768
-#: ../src/gtkblist.c:3778
+#: ../src/gtkblist.c:1378 ../src/gtkblist.c:1390 ../src/gtkblist.c:3732
+#: ../src/gtkblist.c:3742
 msgid "/Tools/Mute Sounds"
 msgstr "/כלים/השתק צלילים"
 
-#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4193 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4197 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוסיף איש קשר זה."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2427
 msgid "/_Buddies"
 msgstr "/_אנשי קשר"
 
-#: ../src/gtkblist.c:2464
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/New Instant _Message..."
 msgstr "/אנשי קשר/הו_דעה חדשה..."
 
-#: ../src/gtkblist.c:2465
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/Join a _Chat..."
 msgstr "/אנשי קשר/הצטרף ל_שיחה..."
 
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Get User _Info..."
 msgstr "/אנשי קשר/הצג _פרטי משתמש..."
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/View User _Log..."
 msgstr "/אנשי קשר/הצג יומ_ן שיחות עם משתמש..."
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/אנשי קשר/הצג אנשי קשר ש_אינם מחוברים"
 
-#: ../src/gtkblist.c:2470
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/אנשי קשר/הצג _קבוצות ריקות"
 
-#: ../src/gtkblist.c:2471
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/אנשי קשר/הצג פר_טי אנשי-קשר"
 
-#: ../src/gtkblist.c:2472
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Idle _Times"
 msgstr "/אנשי קשר/הצג _זמני חוסר-פעילות"
 
-#: ../src/gtkblist.c:2473
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/_Sort Buddies"
 msgstr "/אנשי קשר/_מיין אנשי-קשר"
 
-#: ../src/gtkblist.c:2475
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/_Add Buddy..."
 msgstr "/אנשי קשר/_הוסף איש קשר..."
 
-#: ../src/gtkblist.c:2476
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Add C_hat..."
 msgstr "/אנשי קשר/הוסף צ'אט..."
 
-#: ../src/gtkblist.c:2477
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add _Group..."
 msgstr "/אנשי קשר/ הוסף קבוצה חדשה..."
 
-#: ../src/gtkblist.c:2479
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Quit"
 msgstr "/אנשי קשר/_יציאה"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2482
+#: ../src/gtkblist.c:2446
 msgid "/_Accounts"
 msgstr "/_חשבונות"
 
-#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5553
+#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5517
 msgid "/Accounts/Add\\/Edit"
 msgstr "/_חשבונות/הוסף/\\ערוך"
 
 #. Tools
-#: ../src/gtkblist.c:2486
+#: ../src/gtkblist.c:2450
 msgid "/_Tools"
 msgstr "/_כלים"
 
-#: ../src/gtkblist.c:2487
+#: ../src/gtkblist.c:2451
 msgid "/Tools/Buddy _Pounces"
 msgstr "/כלים/ת_גובות פעילות אנשי קשר"
 
-#: ../src/gtkblist.c:2488
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Plu_gins"
 msgstr "/כלים/תו_ספים"
 
-#: ../src/gtkblist.c:2489
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Pr_eferences"
 msgstr "/כלים/_העדפות"
 
-#: ../src/gtkblist.c:2490
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
-#: ../src/gtkblist.c:2492
+#: ../src/gtkblist.c:2456
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/העברת _קבצים..."
 
-#: ../src/gtkblist.c:2493
+#: ../src/gtkblist.c:2457
 msgid "/Tools/R_oom List"
 msgstr "/כלים/_רשימת החלונות"
 
-#: ../src/gtkblist.c:2494
+#: ../src/gtkblist.c:2458
 msgid "/Tools/System _Log"
 msgstr "/כלים/דו\"ח המערכת"
 
-#: ../src/gtkblist.c:2496
+#: ../src/gtkblist.c:2460
 msgid "/Tools/Mute _Sounds"
 msgstr "/כלים/ה_שתק צלילים"
 
 #. Help
-#: ../src/gtkblist.c:2499
+#: ../src/gtkblist.c:2463
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: ../src/gtkblist.c:2500
+#: ../src/gtkblist.c:2464
 msgid "/Help/Online _Help"
 msgstr "/עזרה/עזרה מקוונת"
 
-#: ../src/gtkblist.c:2501
+#: ../src/gtkblist.c:2465
 msgid "/Help/_Debug Window"
 msgstr "/עזרה/_חלון ניפוי באגים"
 
-#: ../src/gtkblist.c:2502
+#: ../src/gtkblist.c:2466
 msgid "/Help/_About"
 msgstr "/עזרה/_אודות"
 
-#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2498 ../src/gtkblist.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -2501,7 +2501,7 @@
 "\n"
 "<b>חשבון:</b> %s"
 
-#: ../src/gtkblist.c:2615
+#: ../src/gtkblist.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -2510,7 +2510,7 @@
 "\n"
 "<b>שם נוסף:</b> %s"
 
-#: ../src/gtkblist.c:2627
+#: ../src/gtkblist.c:2591
 #, c-format
 msgid ""
 "\n"
@@ -2519,7 +2519,7 @@
 "\n"
 "<b>כינוי:</b> %s"
 
-#: ../src/gtkblist.c:2636
+#: ../src/gtkblist.c:2600
 #, c-format
 msgid ""
 "\n"
@@ -2528,7 +2528,7 @@
 "\n"
 "<b>מחובר:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -2537,7 +2537,7 @@
 "\n"
 "<b>לא פעיל:</b> %s"
 
-#: ../src/gtkblist.c:2682
+#: ../src/gtkblist.c:2646
 #, c-format
 msgid ""
 "\n"
@@ -2546,7 +2546,7 @@
 "\n"
 "<b>נראה לאחרונה:</b> לפני %s"
 
-#: ../src/gtkblist.c:2691
+#: ../src/gtkblist.c:2655
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2554,7 +2554,7 @@
 "\n"
 "<b>מצב:</b> מנותק"
 
-#: ../src/gtkblist.c:2702
+#: ../src/gtkblist.c:2666
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2562,7 +2562,7 @@
 "\n"
 "<b>תיאור:</b> מפחיד"
 
-#: ../src/gtkblist.c:2704
+#: ../src/gtkblist.c:2668
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2570,7 +2570,7 @@
 "\n"
 "<b>מצב:</b> מדהים"
 
-#: ../src/gtkblist.c:2706
+#: ../src/gtkblist.c:2670
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2578,125 +2578,125 @@
 "\n"
 "<b>מצב:</b> מקפיץ"
 
-#: ../src/gtkblist.c:2995
+#: ../src/gtkblist.c:2959
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "לא פעיל %dש %02dד"
 
-#: ../src/gtkblist.c:2997
+#: ../src/gtkblist.c:2961
 #, c-format
 msgid "Idle %dm"
 msgstr "לא פעיל %d דקות"
 
 #. Idle stuff
-#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
+#: ../src/gtkblist.c:2964 ../src/gtkprefs.c:1745
 #: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
 #: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2730
+#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "חוסר פעילות"
 
-#: ../src/gtkblist.c:3132
+#: ../src/gtkblist.c:3096
 msgid "/Buddies/New Instant Message..."
 msgstr "/אנשי קשר/הו_דעה חדשה..."
 
-#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
+#: ../src/gtkblist.c:3097 ../src/gtkblist.c:3130
 msgid "/Buddies/Join a Chat..."
 msgstr "/אנשי קשר/הצטרף ל_שיחה..."
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3098
 msgid "/Buddies/Get User Info..."
 msgstr "/אנשי קשר/הצג _פרטי משתמש..."
 
-#: ../src/gtkblist.c:3135
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Add Buddy..."
 msgstr "/אנשי קשר/_הוסף איש קשר..."
 
-#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Add Chat..."
 msgstr "/אנשי קשר/הוסף צ'אט..."
 
-#: ../src/gtkblist.c:3137
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Add Group..."
 msgstr "/אנשי קשר/ הוסף קבוצה חדשה..."
 
-#: ../src/gtkblist.c:3172
+#: ../src/gtkblist.c:3136
 msgid "/Tools/Buddy Pounces"
 msgstr "/כלים/תגובות לפעילות אנשי קשר"
 
-#: ../src/gtkblist.c:3175
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Privacy"
 msgstr "/כלים/_פרטיות"
 
-#: ../src/gtkblist.c:3178
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Room List"
 msgstr "/כלים/_רשימת חדרי הצ'אט"
 
-#: ../src/gtkblist.c:3372
+#: ../src/gtkblist.c:3336
 msgid "Manually"
 msgstr "ידנית"
 
-#: ../src/gtkblist.c:3374
+#: ../src/gtkblist.c:3338
 msgid "Alphabetically"
 msgstr "אלפבתית"
 
-#: ../src/gtkblist.c:3375
+#: ../src/gtkblist.c:3339
 msgid "By status"
 msgstr "לפי מצב"
 
-#: ../src/gtkblist.c:3376
+#: ../src/gtkblist.c:3340
 msgid "By log size"
 msgstr "לפי גודל יומן השיחות"
 
-#: ../src/gtkblist.c:3493 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3457 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s מנותק"
 
-#: ../src/gtkblist.c:3509 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3473 ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "התחבר"
 
-#: ../src/gtkblist.c:3509 ../src/gtkblist.c:5652
+#: ../src/gtkblist.c:3473 ../src/gtkblist.c:5616
 msgid "Enable Account"
 msgstr "הפעל חשבון"
 
-#: ../src/gtkblist.c:3530
+#: ../src/gtkblist.c:3494
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s נותק: %s</span>"
 
-#: ../src/gtkblist.c:3657
+#: ../src/gtkblist.c:3621
 msgid "/Accounts"
 msgstr "/חשבונות"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3762
+#: ../src/gtkblist.c:3726
 msgid "/Buddies/Show Offline Buddies"
 msgstr "הצג גם _משתמשים מנותקים ברשימה"
 
-#: ../src/gtkblist.c:3765
+#: ../src/gtkblist.c:3729
 msgid "/Buddies/Show Empty Groups"
 msgstr "/אנשי קשר/הצג קבוצות ריקות"
 
-#: ../src/gtkblist.c:3771
+#: ../src/gtkblist.c:3735
 msgid "/Buddies/Show Buddy Details"
 msgstr "/אנשי קשר/הצג פרטי אנשי-קשר"
 
-#: ../src/gtkblist.c:3774
+#: ../src/gtkblist.c:3738
 msgid "/Buddies/Show Idle Times"
 msgstr "/אנשי קשר/הצג זמני חוסר פעילות"
 
-#: ../src/gtkblist.c:4486 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4450 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2977
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "הוסף איש קשר"
 
-#: ../src/gtkblist.c:4510
+#: ../src/gtkblist.c:4474
 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. "
@@ -2705,62 +2705,62 @@
 "יש להזין את שם המשתמש של אותו אתם רוצים להוסיף לרשימת הקשר..ישנה גם אפשרות "
 "לתת כינוי אשר יוצג במקום שם המשתמש\n"
 
-#: ../src/gtkblist.c:4532
+#: ../src/gtkblist.c:4496
 msgid "Screen Name:"
 msgstr "שם לתצוגה:"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4580 ../src/gtkblist.c:4899
+#: ../src/gtkblist.c:4544 ../src/gtkblist.c:4863
 msgid "Account:"
 msgstr "חשבון:"
 
-#: ../src/gtkblist.c:4832
+#: ../src/gtkblist.c:4796
 msgid "This protocol does not support chat rooms."
 msgstr "פרוטוקול זה אינו תומך בחדרי צ'אט"
 
-#: ../src/gtkblist.c:4848
+#: ../src/gtkblist.c:4812
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "אינך מחובר/ת בפרוטוקול כלשהו המאפשר שימוש בצ'אט."
 
-#: ../src/gtkblist.c:4865
+#: ../src/gtkblist.c:4829
 msgid "Add Chat"
 msgstr "הוסף שיחה"
 
-#: ../src/gtkblist.c:4889
+#: ../src/gtkblist.c:4853
 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:4971 ../src/protocols/sametime/sametime.c:5319
+#: ../src/gtkblist.c:4935 ../src/protocols/sametime/sametime.c:5319
 #: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "הוסף קבוצה"
 
-#: ../src/gtkblist.c:4972
+#: ../src/gtkblist.c:4936
 msgid "Please enter the name of the group to be added."
 msgstr "יש להזין את שם הקבוצה החדשה."
 
-#: ../src/gtkblist.c:5593
+#: ../src/gtkblist.c:5557
 msgid "_Edit Account"
 msgstr "_ערוך חשבון"
 
-#: ../src/gtkblist.c:5626 ../src/gtkblist.c:5632
+#: ../src/gtkblist.c:5590 ../src/gtkblist.c:5596
 msgid "No actions available"
 msgstr "לא ניתן לבצע פעולות"
 
-#: ../src/gtkblist.c:5640
+#: ../src/gtkblist.c:5604
 msgid "_Disable"
 msgstr "_בטל"
 
-#: ../src/gtkblist.c:5705
+#: ../src/gtkblist.c:5669
 msgid "/Tools"
 msgstr "/_כלים"
 
-#: ../src/gtkblist.c:5800
+#: ../src/gtkblist.c:5755
 msgid "/Buddies/Sort Buddies"
 msgstr "/אנשי קשר/מיין אנשי-קשר"
 
@@ -2843,7 +2843,7 @@
 msgid "_Message:"
 msgstr "ה_ודעה:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2377 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2380 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
@@ -2857,343 +2857,343 @@
 msgid "Save Conversation"
 msgstr "שמור שיחה"
 
-#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "חפש"
 
-#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_חפש בעבור: "
 
-#: ../src/gtkconv.c:1290
+#: ../src/gtkconv.c:1293
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "רישום הוחל. הודעות בשיחה זו יירשמו מעתה."
 
-#: ../src/gtkconv.c:1298
+#: ../src/gtkconv.c:1301
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מעתה."
 
-#: ../src/gtkconv.c:1556
+#: ../src/gtkconv.c:1559
 msgid "IM"
 msgstr "הודעה"
 
-#: ../src/gtkconv.c:1562 ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "שלח קובץ"
 
-#: ../src/gtkconv.c:1569
+#: ../src/gtkconv.c:1572
 msgid "Un-Ignore"
 msgstr "בטל כל התעלמות"
 
-#: ../src/gtkconv.c:1572
+#: ../src/gtkconv.c:1575
 msgid "Ignore"
 msgstr "התעלם"
 
-#: ../src/gtkconv.c:1578
+#: ../src/gtkconv.c:1581
 msgid "Info"
 msgstr "מידע"
 
-#: ../src/gtkconv.c:1584
+#: ../src/gtkconv.c:1587
 msgid "Get Away Message"
 msgstr "השג את הודעת ההתרחקות"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1602
 msgid "Last said"
 msgstr "נאמר לאחרונה"
 
-#: ../src/gtkconv.c:2385
+#: ../src/gtkconv.c:2388
 msgid "Unable to save icon file to disk."
 msgstr "לא ניתן לשמור את הסמל לדיסק."
 
-#: ../src/gtkconv.c:2408
+#: ../src/gtkconv.c:2412
 msgid "Save Icon"
 msgstr "שמירת סמל"
 
-#: ../src/gtkconv.c:2457
+#: ../src/gtkconv.c:2461
 msgid "Animate"
 msgstr "הנפש"
 
-#: ../src/gtkconv.c:2462
+#: ../src/gtkconv.c:2466
 msgid "Hide Icon"
 msgstr "הסתר סמל"
 
-#: ../src/gtkconv.c:2468
+#: ../src/gtkconv.c:2472
 msgid "Save Icon As..."
 msgstr "שמירת סמל בשם..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2609
+#: ../src/gtkconv.c:2613
 msgid "/_Conversation"
 msgstr "/_שיחה"
 
-#: ../src/gtkconv.c:2611
+#: ../src/gtkconv.c:2615
 msgid "/Conversation/New Instant _Message..."
 msgstr "/שיחה/הוד_עה חדשה..."
 
-#: ../src/gtkconv.c:2616
+#: ../src/gtkconv.c:2620
 msgid "/Conversation/_Find..."
 msgstr "/שיחה/_חפש..."
 
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2622
 msgid "/Conversation/View _Log"
 msgstr "/שיחה/ה_צג יומן שיחות"
 
-#: ../src/gtkconv.c:2619
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/_Save As..."
 msgstr "/שיחה/_שמור בשם..."
 
-#: ../src/gtkconv.c:2621
+#: ../src/gtkconv.c:2625
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/שיחה/נ_קה גלילה לאחור"
 
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Se_nd File..."
 msgstr "/שיחה/ש_לח קובץ..."
 
-#: ../src/gtkconv.c:2626
+#: ../src/gtkconv.c:2630
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/שיחה/הוסף פ_עולת תגובה..."
 
-#: ../src/gtkconv.c:2628
+#: ../src/gtkconv.c:2632
 msgid "/Conversation/_Get Info"
 msgstr "/שיחה/הצג מידע"
 
-#: ../src/gtkconv.c:2630
+#: ../src/gtkconv.c:2634
 msgid "/Conversation/In_vite..."
 msgstr "/שיחה/הז_מן..."
 
-#: ../src/gtkconv.c:2635
-msgid "/Conversation/Al_ias..."
-msgstr "/שיחה/כ_ינוי..."
-
-#: ../src/gtkconv.c:2637
-msgid "/Conversation/_Block..."
-msgstr "/שיחה/חסו_ם..."
-
 #: ../src/gtkconv.c:2639
+msgid "/Conversation/Al_ias..."
+msgstr "/שיחה/כ_ינוי..."
+
+#: ../src/gtkconv.c:2641
+msgid "/Conversation/_Block..."
+msgstr "/שיחה/חסו_ם..."
+
+#: ../src/gtkconv.c:2643
 msgid "/Conversation/_Add..."
 msgstr "/שיחה/הוס_ף"
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2645
 msgid "/Conversation/_Remove..."
 msgstr "/שיחה/הס_ר..."
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2650
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/שיחה/הכנס קיש_ור..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2652
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/שיחה/הכנס ת_מונה..."
 
-#: ../src/gtkconv.c:2653
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/_Close"
 msgstr "/שיחה/_סגור"
 
 #. Options
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2661
 msgid "/_Options"
 msgstr "/_אפשרויות"
 
-#: ../src/gtkconv.c:2658
+#: ../src/gtkconv.c:2662
 msgid "/Options/Enable _Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../src/gtkconv.c:2659
+#: ../src/gtkconv.c:2663
 msgid "/Options/Enable _Sounds"
 msgstr "/אפשרויות/אפשר _צלילים"
 
-#: ../src/gtkconv.c:2660
+#: ../src/gtkconv.c:2664
 msgid "/Options/Show Buddy _Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2666
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../src/gtkconv.c:2663
+#: ../src/gtkconv.c:2667
 msgid "/Options/Show Ti_mestamps"
 msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
 
-#: ../src/gtkconv.c:2755
+#: ../src/gtkconv.c:2759
 msgid "/Conversation/View Log"
 msgstr "שיחה/הצג יומן שיחות/"
 
-#: ../src/gtkconv.c:2761
+#: ../src/gtkconv.c:2765
 msgid "/Conversation/Send File..."
 msgstr "שיחה/שלח קובץ.../"
 
-#: ../src/gtkconv.c:2765
+#: ../src/gtkconv.c:2769
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "שיחה/הוסף פעולת תגובה לאירועי איש קשר.../"
 
-#: ../src/gtkconv.c:2771
+#: ../src/gtkconv.c:2775
 msgid "/Conversation/Get Info"
 msgstr "/שיחה/הצג מידע"
 
-#: ../src/gtkconv.c:2775
+#: ../src/gtkconv.c:2779
 msgid "/Conversation/Invite..."
 msgstr "/שיחה/הזמן..."
 
-#: ../src/gtkconv.c:2781
+#: ../src/gtkconv.c:2785
 msgid "/Conversation/Alias..."
 msgstr "/שיחה/כינוי..."
 
-#: ../src/gtkconv.c:2785
+#: ../src/gtkconv.c:2789
 msgid "/Conversation/Block..."
 msgstr "/שיחה/חסום..."
 
-#: ../src/gtkconv.c:2789
+#: ../src/gtkconv.c:2793
 msgid "/Conversation/Add..."
 msgstr "/שיחה/הוסף..."
 
-#: ../src/gtkconv.c:2793
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Remove..."
 msgstr "/שיחה/הסר..."
 
-#: ../src/gtkconv.c:2799
+#: ../src/gtkconv.c:2803
 msgid "/Conversation/Insert Link..."
 msgstr "/שיחה/הכנס ק_ישור..."
 
-#: ../src/gtkconv.c:2803
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Insert Image..."
 msgstr "/שיחה/הכנס תמונה..."
 
-#: ../src/gtkconv.c:2809
+#: ../src/gtkconv.c:2813
 msgid "/Options/Enable Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../src/gtkconv.c:2812
+#: ../src/gtkconv.c:2816
 msgid "/Options/Enable Sounds"
 msgstr "/אפשרויות/אפשר צלילים"
 
-#: ../src/gtkconv.c:2825
+#: ../src/gtkconv.c:2829
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../src/gtkconv.c:2828
+#: ../src/gtkconv.c:2832
 msgid "/Options/Show Timestamps"
 msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
 
-#: ../src/gtkconv.c:2831
+#: ../src/gtkconv.c:2835
 msgid "/Options/Show Buddy Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../src/gtkconv.c:2911
+#: ../src/gtkconv.c:2915
 msgid "User is typing..."
 msgstr "המשתמש כותב כרגע..."
 
-#: ../src/gtkconv.c:2914
+#: ../src/gtkconv.c:2918
 msgid "User has typed something and stopped"
 msgstr "המשתמש כתב משהו ועצר"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3097
+#: ../src/gtkconv.c:3101
 msgid "_Send To"
 msgstr "שלח _אל"
 
-#: ../src/gtkconv.c:3749
+#: ../src/gtkconv.c:3753
 msgid "_Send"
 msgstr "ש_לח"
 
-#: ../src/gtkconv.c:3804 ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3808 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "כותרת:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3856
+#: ../src/gtkconv.c:3860
 msgid "0 people in room"
 msgstr "0 אנשים בחדר זה"
 
-#: ../src/gtkconv.c:3935
+#: ../src/gtkconv.c:3939
 msgid "IM the user"
 msgstr "שלח הודעה מיידית למשתמש זה"
 
-#: ../src/gtkconv.c:3948
+#: ../src/gtkconv.c:3952
 msgid "Ignore the user"
 msgstr "התעלם מהמשתמש"
 
-#: ../src/gtkconv.c:3960
+#: ../src/gtkconv.c:3964
 msgid "Get the user's information"
 msgstr "הצג מידע על המשתמש"
 
-#: ../src/gtkconv.c:4933 ../src/gtkconv.c:5042
+#: ../src/gtkconv.c:4938 ../src/gtkconv.c:5047
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "איש %d בחדר זה"
 msgstr[1] "%d אנשים בחדר זה"
 
-#: ../src/gtkconv.c:6515
+#: ../src/gtkconv.c:6520
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;message&gt;:  שלח הודעה כרגיל, כאילו לא דרך פקודה."
 
-#: ../src/gtkconv.c:6518
+#: ../src/gtkconv.c:6523
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט פעולה נוסח IRC."
 
-#: ../src/gtkconv.c:6521
+#: ../src/gtkconv.c:6526
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  שלח כל מיני רסיסי מידע לחלון שיחה הנוכחי."
 
-#: ../src/gtkconv.c:6524
+#: ../src/gtkconv.c:6529
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: נקה את תוכן חלון השיחה."
 
-#: ../src/gtkconv.c:6527
+#: ../src/gtkconv.c:6532
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  עזרה על פקודה ספציפית."
 
-#: ../src/gtkconv.c:6686
+#: ../src/gtkconv.c:6691
 msgid "Confirm close"
 msgstr "אשר סגירה"
 
-#: ../src/gtkconv.c:6718
+#: ../src/gtkconv.c:6723
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "יש לך הודעות שלא נקראו. האם ברצונך לסגור את החלון?"
 
-#: ../src/gtkconv.c:7240
+#: ../src/gtkconv.c:7245
 msgid "Close other tabs"
 msgstr "סגור את שאר הטאבים"
 
-#: ../src/gtkconv.c:7246
+#: ../src/gtkconv.c:7251
 msgid "Close all tabs"
 msgstr "סגור את כל הטאבים"
 
-#: ../src/gtkconv.c:7254
+#: ../src/gtkconv.c:7259
 msgid "Detach this tab"
 msgstr "נתק טאב זה"
 
-#: ../src/gtkconv.c:7260
+#: ../src/gtkconv.c:7265
 msgid "Close this tab"
 msgstr "סגור טאב זה"
 
-#: ../src/gtkconv.c:7522
+#: ../src/gtkconv.c:7527
 msgid "Close conversation"
 msgstr "סגור חלון"
 
-#: ../src/gtkconv.c:7986
+#: ../src/gtkconv.c:7991
 msgid "Last created window"
 msgstr "חלון אחרון שנוצר"
 
-#: ../src/gtkconv.c:7988
+#: ../src/gtkconv.c:7993
 msgid "Separate IM and Chat windows"
 msgstr "הפרד בין חלונות של הודעות וצ'אטים"
 
-#: ../src/gtkconv.c:7990 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:7995 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "חלון חדש"
 
-#: ../src/gtkconv.c:7992
+#: ../src/gtkconv.c:7997
 msgid "By group"
 msgstr "לפי קבוצות"
 
-#: ../src/gtkconv.c:7994
+#: ../src/gtkconv.c:7999
 msgid "By account"
 msgstr "לפי חשבון"
 
@@ -3510,11 +3510,11 @@
 msgid "Debugging Information"
 msgstr "מידע לניפוי באגים"
 
-#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:766
 msgid "_Name"
 msgstr "שם_"
 
-#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:771
 msgid "_Account"
 msgstr " חשבון"
 
@@ -3537,48 +3537,48 @@
 "like to view."
 msgstr "יש להזין את שם המשתמש או הכינוי של האדם שברצונכם לקרוא את פרטיו."
 
-#: ../src/gtkdialogs.c:784
+#: ../src/gtkdialogs.c:780
 msgid "View User Log"
 msgstr "הצג יומן שיחות עם המשתמש"
 
-#: ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:782
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "יש להזין את שם המשתמש או הכינוי של האדם שברצונכם לקרוא יומן השיחות איתו."
 
-#: ../src/gtkdialogs.c:805
+#: ../src/gtkdialogs.c:801
 msgid "Alias Contact"
 msgstr "שם נוסף לאיש קשר"
 
-#: ../src/gtkdialogs.c:806
+#: ../src/gtkdialogs.c:802
 msgid "Enter an alias for this contact."
 msgstr "הזן שם נוסף עבור איש קשר זה."
 
-#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
-#: ../src/gtkrequest.c:283 ../src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:804 ../src/gtkdialogs.c:826 ../src/gtkdialogs.c:846
+#: ../src/gtkrequest.c:279 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "שם נוסף"
 
-#: ../src/gtkdialogs.c:826
+#: ../src/gtkdialogs.c:822
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ".%s הזן כינוי חדש עבור"
 
-#: ../src/gtkdialogs.c:828
+#: ../src/gtkdialogs.c:824
 msgid "Alias Buddy"
 msgstr "שם נוסף לאיש הקשר"
 
-#: ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:843
 msgid "Alias Chat"
 msgstr "שם נוסף לשיחה"
 
-#: ../src/gtkdialogs.c:848
+#: ../src/gtkdialogs.c:844
 msgid "Enter an alias for this chat."
 msgstr "הזן שם נוסף לשיחה זו."
 
-#: ../src/gtkdialogs.c:885
+#: ../src/gtkdialogs.c:881
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3593,55 +3593,55 @@
 "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים "
 "בתוכו מתוך רשימת אנשי הקשר שלך?"
 
-#: ../src/gtkdialogs.c:893
+#: ../src/gtkdialogs.c:889
 msgid "Remove Contact"
 msgstr "הסר איש קשר"
 
-#: ../src/gtkdialogs.c:894
+#: ../src/gtkdialogs.c:890
 msgid "_Remove Contact"
 msgstr "ה_סר איש קשר"
 
-#: ../src/gtkdialogs.c:945
+#: ../src/gtkdialogs.c:941
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הקבוצה %s וכל חבריה מרשימת אנשי הקשר שלך?"
 
-#: ../src/gtkdialogs.c:948
+#: ../src/gtkdialogs.c:944
 msgid "Remove Group"
 msgstr "הסר קבוצה"
 
-#: ../src/gtkdialogs.c:949
+#: ../src/gtkdialogs.c:945
 msgid "_Remove Group"
 msgstr "הסר _קבוצה"
 
-#: ../src/gtkdialogs.c:982
+#: ../src/gtkdialogs.c:978
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את %s מרשימת אנשי הקשר שלך?"
 
-#: ../src/gtkdialogs.c:985
+#: ../src/gtkdialogs.c:981
 msgid "Remove Buddy"
 msgstr "הסר איש קשר"
 
-#: ../src/gtkdialogs.c:986
+#: ../src/gtkdialogs.c:982
 msgid "_Remove Buddy"
 msgstr "הסר איש קשר"
 
-#: ../src/gtkdialogs.c:1007
+#: ../src/gtkdialogs.c:1003
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הצ'אט %s מרשימת אנשי הקשר שלך?"
 
-#: ../src/gtkdialogs.c:1010
+#: ../src/gtkdialogs.c:1006
 msgid "Remove Chat"
 msgstr "הסר שיחה"
 
-#: ../src/gtkdialogs.c:1011
+#: ../src/gtkdialogs.c:1007
 msgid "_Remove Chat"
 msgstr "הס_ר שיחה"
 
@@ -3959,56 +3959,56 @@
 msgid "Insert smiley"
 msgstr "הכנס חיוך"
 
-#: ../src/gtklog.c:202
+#: ../src/gtklog.c:188
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>השיחה בתוך %s ב-%s</span>"
 
-#: ../src/gtklog.c:207
+#: ../src/gtklog.c:193
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>שיחה עם %s ב-%s</span>"
 
-#: ../src/gtklog.c:258
+#: ../src/gtklog.c:242
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:311
+#: ../src/gtklog.c:295
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr "אירועי מערכת רק יירשמו אם סומן \"רשום כל שינויי סטטוס ליומן המערכת\"."
 
-#: ../src/gtklog.c:315
+#: ../src/gtklog.c:299
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "הודעות רק יירשמו אם סומן \"רשום את כל ההודעות\"."
 
-#: ../src/gtklog.c:318
+#: ../src/gtklog.c:302
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "צ'אטים רק יירשמו אם סומן \"רשום את כל הצ'אטים\"."
 
-#: ../src/gtklog.c:322
+#: ../src/gtklog.c:306
 msgid "No logs were found"
 msgstr "לא נמצאו יומני רישום"
 
-#: ../src/gtklog.c:398
+#: ../src/gtklog.c:382
 msgid "Total log size:"
 msgstr "גודל יומן סה\"כ:"
 
-#: ../src/gtklog.c:474
+#: ../src/gtklog.c:458
 #, c-format
 msgid "Conversations in %s"
 msgstr "שיחות בתוך %s"
 
-#: ../src/gtklog.c:482 ../src/gtklog.c:533
+#: ../src/gtklog.c:466 ../src/gtklog.c:517
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s שיחות עם"
 
-#: ../src/gtklog.c:558
+#: ../src/gtklog.c:542
 msgid "System Log"
 msgstr "דו\"ח מערכת"
 
@@ -4078,34 +4078,34 @@
 "מידע ליצור קשר עם שון ולוק בפרוטוקולים אחרים נמצא ב:\n"
 "%scontactinfo.php\n"
 
-#: ../src/gtknotify.c:305
+#: ../src/gtknotify.c:327
 msgid "New Mail"
 msgstr "דוא\"ל חדש"
 
-#: ../src/gtknotify.c:321
+#: ../src/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "פתח את כל ההודעות"
 
-#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1114
+#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1114
 msgid "From"
 msgstr "מאת"
 
-#: ../src/gtknotify.c:390
+#: ../src/gtknotify.c:418
 msgid "Subject"
 msgstr "הנדון"
 
-#: ../src/gtknotify.c:399
+#: ../src/gtknotify.c:427
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">דואר חדש נכנס!</span>"
 
-#: ../src/gtknotify.c:451
+#: ../src/gtknotify.c:493
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "יש ל-%s %d הודעה חדשה."
 msgstr[1] "יש ל-%s %d הודעות חדשות."
 
-#: ../src/gtknotify.c:456
+#: ../src/gtknotify.c:498
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4115,52 +4115,52 @@
 "<span size=\"larger\" weight=\"bold\">דואר חדש נכנס!</span>\n"
 "%s"
 
-#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "תוצאות חיפוש"
 
-#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:5061
+#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
 #, c-format
 msgid "Info for %s"
 msgstr "מידע עבור %s"
 
-#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "מידע עבור איש הקשר"
 
-#: ../src/gtknotify.c:840
+#: ../src/gtknotify.c:882
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "הפקודה <b>%s</b> לדפדפן, אינה תקפה."
 
-#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
-#: ../src/gtknotify.c:992
+#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "URLלא ניתן לפתוח את ה-"
 
-#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
+#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "שגיאה בהפעלת הפקודה <b>%s</b>: %s"
 
-#: ../src/gtknotify.c:993
+#: ../src/gtknotify.c:1035
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע."
 
-#: ../src/gtkplugin.c:275
+#: ../src/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "התוספים שלהלן ייפרקו מן הזיכרון."
 
-#: ../src/gtkplugin.c:294
+#: ../src/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "תוספים מרובים ייפרקו מן הזיכרון."
 
-#: ../src/gtkplugin.c:296
+#: ../src/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "פרוק תוספים"
 
-#: ../src/gtkplugin.c:410
+#: ../src/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4171,7 +4171,7 @@
 "<span weight=\"bold\">אתר:</span>\t\t%s\n"
 "<span weight=\"bold\">שם קובץ:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:420
+#: ../src/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4182,11 +4182,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">שגיאה: %s\n"
 "בדוק את אתר התוסף לעידכון.</span>"
 
-#: ../src/gtkplugin.c:546
+#: ../src/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "הגדר את התוסף"
 
-#: ../src/gtkplugin.c:604
+#: ../src/gtkplugin.c:601
 msgid "<b>Plugin Details</b>"
 msgstr "<b>פרטי התוסף</b>"
 
@@ -4636,7 +4636,7 @@
 msgid "Quiet"
 msgstr "שקט"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "רגיל"
 
@@ -4783,7 +4783,7 @@
 msgid "Sounds"
 msgstr "צלילים"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1847
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "רשת"
 
@@ -4880,42 +4880,42 @@
 msgid "Are you sure you want to block %s?"
 msgstr "האם את/ה בטוח/ה שברצונך לחסום את %s?"
 
-#: ../src/gtkrequest.c:273 ../src/protocols/msn/dialog.c:114
+#: ../src/gtkrequest.c:269 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "כן"
 
-#: ../src/gtkrequest.c:274 ../src/protocols/msn/dialog.c:115
+#: ../src/gtkrequest.c:270 ../src/protocols/msn/dialog.c:115
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "לא"
 
-#: ../src/gtkrequest.c:277
+#: ../src/gtkrequest.c:273
 msgid "Apply"
 msgstr "החל"
 
-#: ../src/gtkrequest.c:278 ../src/protocols/msn/msn.c:357
+#: ../src/gtkrequest.c:274 ../src/protocols/msn/msn.c:357
 #: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "סגור"
 
-#: ../src/gtkrequest.c:1473
+#: ../src/gtkrequest.c:1469
 msgid "That file already exists"
 msgstr "הקובץ כבר קיים"
 
-#: ../src/gtkrequest.c:1474
+#: ../src/gtkrequest.c:1470
 msgid "Would you like to overwrite it?"
 msgstr "לשכתב?"
 
-#: ../src/gtkrequest.c:1518 ../src/gtkrequest.c:1559
+#: ../src/gtkrequest.c:1514 ../src/gtkrequest.c:1555
 msgid "Save File..."
 msgstr "שמירה בשם..."
 
-#: ../src/gtkrequest.c:1519 ../src/gtkrequest.c:1560
+#: ../src/gtkrequest.c:1515 ../src/gtkrequest.c:1556
 msgid "Open File..."
 msgstr "פתח..."
 
@@ -4949,24 +4949,24 @@
 #. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
-#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
-#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1417
+#: ../src/protocols/gg/gg.c:1427 ../src/protocols/gg/gg.c:1433
+#: ../src/protocols/gg/gg.c:1442 ../src/protocols/gg/gg.c:1447
 #: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
 #: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
 #: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
 #: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
 #: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7794
-#: ../src/protocols/oscar/oscar.c:7808 ../src/protocols/oscar/oscar.c:7813
-#: ../src/protocols/oscar/oscar.c:8022 ../src/protocols/oscar/oscar.c:8034
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7795
+#: ../src/protocols/oscar/oscar.c:7810 ../src/protocols/oscar/oscar.c:7815
+#: ../src/protocols/oscar/oscar.c:8024 ../src/protocols/oscar/oscar.c:8036
 #: ../src/protocols/sametime/sametime.c:3274
 #: ../src/protocols/sametime/sametime.c:3280
 #: ../src/protocols/sametime/sametime.c:3286
 #: ../src/protocols/sametime/sametime.c:3365
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
-#: ../src/protocols/zephyr/zephyr.c:2261
+#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "הודעה"
 
@@ -4988,13 +4988,13 @@
 msgstr "שונה"
 
 #: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/gg/gg.c:1400 ../src/protocols/gg/gg.c:1404
 #: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
 #: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
 #: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
 #: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2881
+#: ../src/protocols/yahoo/yahoo.c:2882
 msgid "Status"
 msgstr "מצב"
 
@@ -5061,19 +5061,19 @@
 msgid "Someone says your name in chat"
 msgstr "מישהו מזכיר את שמך בשיחה"
 
-#: ../src/gtksound.c:488
+#: ../src/gtksound.c:489
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "לא ניתן להשמיע צליל, מכוון שקובץ \"%s\" לא קיים."
 
-#: ../src/gtksound.c:504
+#: ../src/gtksound.c:505
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 "לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
 
-#: ../src/gtksound.c:516
+#: ../src/gtksound.c:517
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5091,8 +5091,8 @@
 #: ../src/protocols/napster/napster.c:536
 #: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
 #: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2571
-#: ../src/protocols/zephyr/zephyr.c:1547
+#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "מתחבר"
 
@@ -5202,7 +5202,7 @@
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../src/gtkwhiteboard.c:344 ../src/protocols/yahoo/yahoo_doodle.c:96
+#: ../src/gtkwhiteboard.c:343 ../src/protocols/yahoo/yahoo_doodle.c:96
 msgid "Sent Doodle request."
 msgstr "נשלחה בקשר לקשקש."
 
@@ -5361,7 +5361,7 @@
 msgstr "משתמש ב Gaim"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "שם שרת"
 
@@ -5369,7 +5369,7 @@
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
 #: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "י_ציאה"
 
@@ -5384,7 +5384,7 @@
 
 #: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
 #: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
+#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
 #: ../src/protocols/silc/util.c:512
 #: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
@@ -5506,16 +5506,16 @@
 msgid "Please, fill in the following fields"
 msgstr "יש למלא את השדות הבאים"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
+#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1606
 msgid "Unable to initiate a new search"
 msgstr "לא ניתן לאתחל חיפוש חדש"
 
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
+#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1607
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "יש לך חיפוש בפעולה. יש לחכות לסיומו."
 
 #: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
 #: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
 #: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
 #: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
@@ -5655,67 +5655,67 @@
 msgid "Your buddy list was stored on the server."
 msgstr "רשימת אנשי הקשר שלך אוכסנה על השרת"
 
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1528
 msgid "Connection failed."
 msgstr "ההתחברות נכשלה."
 
-#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1441 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "חסום"
 
-#: ../src/protocols/gg/gg.c:1468
+#: ../src/protocols/gg/gg.c:1464
 msgid "Add to chat"
 msgstr "הוסף לשיחה"
 
-#: ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1473
 msgid "Unblock"
 msgstr "הסר חסימה"
 
-#: ../src/protocols/gg/gg.c:1481
+#: ../src/protocols/gg/gg.c:1477
 msgid "Block"
 msgstr "חסום"
 
-#: ../src/protocols/gg/gg.c:1498
+#: ../src/protocols/gg/gg.c:1494
 msgid "Chat _name:"
 msgstr "שם _צ'אט:"
 
-#: ../src/protocols/gg/gg.c:1724
+#: ../src/protocols/gg/gg.c:1718
 msgid "Chat error"
 msgstr "שגיאה בצ'אט"
 
-#: ../src/protocols/gg/gg.c:1725
+#: ../src/protocols/gg/gg.c:1719
 msgid "This chat name is already in use"
 msgstr "שם הצ'אט הזה כבר בשימוש"
 
-#: ../src/protocols/gg/gg.c:1808
+#: ../src/protocols/gg/gg.c:1802
 msgid "Not connected to the server."
 msgstr "לא מחובר לשרת."
 
-#: ../src/protocols/gg/gg.c:1831
+#: ../src/protocols/gg/gg.c:1825
 msgid "Find buddies..."
 msgstr "חפש אנשי קשר..."
 
-#: ../src/protocols/gg/gg.c:1837
+#: ../src/protocols/gg/gg.c:1831
 msgid "Change password..."
 msgstr "שנה סיסמא..."
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:1837
 msgid "Upload buddylist to Server"
 msgstr "שלח את רשימת אנשי הקשר לשרת"
 
-#: ../src/protocols/gg/gg.c:1847
+#: ../src/protocols/gg/gg.c:1841
 msgid "Download buddylist from Server"
 msgstr "שלוף את רשימת אנשי הקשר מהשרת"
 
-#: ../src/protocols/gg/gg.c:1851
+#: ../src/protocols/gg/gg.c:1845
 msgid "Delete buddylist from Server"
 msgstr "מחק את רשימת אנשי קשר מהשרת"
 
-#: ../src/protocols/gg/gg.c:1855
+#: ../src/protocols/gg/gg.c:1849
 msgid "Save buddylist to file..."
 msgstr "שמור את רשימת אנשי הקשר לקובץ..."
 
-#: ../src/protocols/gg/gg.c:1859
+#: ../src/protocols/gg/gg.c:1853
 msgid "Load buddylist from file..."
 msgstr "טען את רשימת אנשי הקשר מקובץ..."
 
@@ -5730,32 +5730,32 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1955
+#: ../src/protocols/gg/gg.c:1949
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "תוסף פרוטוקול Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1956
+#: ../src/protocols/gg/gg.c:1950
 msgid "Polish popular IM"
 msgstr "מערכת הודעות פופולרית בפולין"
 
-#: ../src/protocols/gg/gg.c:2004
+#: ../src/protocols/gg/gg.c:1998
 msgid "Gadu-Gadu User"
 msgstr "משתמש Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
 #, c-format
 msgid "Unknown command: %s"
 msgstr "פקודה בלתי מוכרת: %s"
 
 #: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1290
+#: ../src/protocols/silc/silc.c:1294
 #, c-format
 msgid "current topic is: %s"
 msgstr "הנושא הוא: %s"
 
 #: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/silc/silc.c:1298
 msgid "No topic is set"
 msgstr "אין כותרת"
 
@@ -5868,7 +5868,7 @@
 #: ../src/protocols/jabber/jabber.c:1904
 #: ../src/protocols/napster/napster.c:719
 #: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1753
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
 msgid "Server"
 msgstr "שרת"
 
@@ -5880,7 +5880,7 @@
 #: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:929
+#: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "שם משתמש"
 
@@ -5963,140 +5963,140 @@
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>שם התואר המגדיר:</b> מהמם<br>"
 
-#: ../src/protocols/irc/msgs.c:316
+#: ../src/protocols/irc/msgs.c:318
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s שינה את הנושא להיות: %s"
 
-#: ../src/protocols/irc/msgs.c:321
+#: ../src/protocols/irc/msgs.c:325
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "הנושא של %s הוא: %s"
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:343
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "הודעת לא מוכרת '%s'"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:344
 msgid "Unknown message"
 msgstr "הודעת לא מוכרת"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:344
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "גיים שלך הודעה ששרת ה-IRC לא הבין."
 
-#: ../src/protocols/irc/msgs.c:362
+#: ../src/protocols/irc/msgs.c:367
 #, c-format
 msgid "Users on %s: %s"
 msgstr "משתמשים ב-%s: %s"
 
-#: ../src/protocols/irc/msgs.c:490
+#: ../src/protocols/irc/msgs.c:495
 msgid "Time Response"
 msgstr "מענה זמן"
 
-#: ../src/protocols/irc/msgs.c:491
+#: ../src/protocols/irc/msgs.c:496
 msgid "The IRC server's local time is:"
 msgstr "השעה מקומית אצל שרת ה-IRC היא:"
 
-#: ../src/protocols/irc/msgs.c:502
+#: ../src/protocols/irc/msgs.c:507
 msgid "No such channel"
 msgstr "אין כזה ערוץ"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:518
 msgid "no such channel"
 msgstr "אין כזה ערוץ"
 
-#: ../src/protocols/irc/msgs.c:516
-msgid "User is not logged in"
-msgstr "המשתמש לא מחובר"
-
 #: ../src/protocols/irc/msgs.c:521
+msgid "User is not logged in"
+msgstr "המשתמש לא מחובר"
+
+#: ../src/protocols/irc/msgs.c:526
 msgid "No such nick or channel"
 msgstr "לא קיים כזה משתמש או ערוץ"
 
-#: ../src/protocols/irc/msgs.c:541
+#: ../src/protocols/irc/msgs.c:546
 msgid "Could not send"
 msgstr "שליחת המסר נכשלה"
 
-#: ../src/protocols/irc/msgs.c:597
+#: ../src/protocols/irc/msgs.c:602
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "הצטרפות ל %s דורשת הזמנה."
 
-#: ../src/protocols/irc/msgs.c:598
+#: ../src/protocols/irc/msgs.c:603
 msgid "Invitation only"
 msgstr "בהזמנה בלבד"
 
-#: ../src/protocols/irc/msgs.c:699
+#: ../src/protocols/irc/msgs.c:704
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "נבעטת ע\"י: %s (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "נבעט ע\"י %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:727
+#: ../src/protocols/irc/msgs.c:732
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "מצב (%s %s) ע\"י %s"
 
-#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
 msgid "Invalid nickname"
 msgstr "שם המשתמש לא חוקי"
 
-#: ../src/protocols/irc/msgs.c:814
+#: ../src/protocols/irc/msgs.c:819
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "הכינוי שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-#: ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:823
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "שם החשבון שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:863
 msgid "Cannot change nick"
 msgstr "כשל בשינוי הכינוי"
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:863
 msgid "Could not change nick"
 msgstr "אין אפשרות לשנות כינוי"
 
-#: ../src/protocols/irc/msgs.c:879
+#: ../src/protocols/irc/msgs.c:884
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "עזבת את הערוץ%s%s"
 
-#: ../src/protocols/irc/msgs.c:921
+#: ../src/protocols/irc/msgs.c:926
 msgid "Error: invalid PONG from server"
 msgstr "שגיאה: התקבל PONG לא תקף מהשרת"
 
-#: ../src/protocols/irc/msgs.c:923
+#: ../src/protocols/irc/msgs.c:928
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "מענה PING – בהשהייה של: %lu שניות"
 
-#: ../src/protocols/irc/msgs.c:998
+#: ../src/protocols/irc/msgs.c:1003
 #, c-format
 msgid "Cannot join %s:"
 msgstr "לא ניתן להצטרף ל %s:"
 
-#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "לא ניתן להצטרף לערוץ"
 
-#: ../src/protocols/irc/msgs.c:1033
+#: ../src/protocols/irc/msgs.c:1038
 msgid "Nick or channel is temporarily unavailable."
 msgstr "שם הכינוי או הערוץ לא זמינים כרגע."
 
-#: ../src/protocols/irc/msgs.c:1045
+#: ../src/protocols/irc/msgs.c:1050
 #, c-format
 msgid "Wallops from %s"
 msgstr "כאפה מ-%s"
@@ -6411,7 +6411,7 @@
 msgstr "מיקוד"
 
 #: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:939
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "מדינה"
 
@@ -6512,7 +6512,7 @@
 msgstr "העדרות ממושכת"
 
 #: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8051
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8053
 #: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
@@ -6692,7 +6692,7 @@
 msgstr "מחוז"
 
 #: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "טלפון"
 
@@ -6722,7 +6722,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
 #: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7841
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7843
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
@@ -6776,14 +6776,14 @@
 msgid "Please enter your new password"
 msgstr "הזן את הסיסמה החדשה שלך."
 
-#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8475
-#: ../src/protocols/silc/silc.c:1019
+#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8477
+#: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "קבע את המידע על המשתמש..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8486
-#: ../src/protocols/silc/silc.c:1015
+#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8488
+#: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "שנה סיסמא..."
 
@@ -7105,12 +7105,12 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "אפשר אישרור לא מוצפן בתקשורת לא מוצפנת"
 
-#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1759
+#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1760
 msgid "Connect port"
 msgstr "יציאת ההתחברות"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1851
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "שרת ההתחברות"
 
@@ -7166,42 +7166,42 @@
 msgid "_Deny"
 msgstr "דחה"
 
-#: ../src/protocols/jabber/presence.c:380
 #: ../src/protocols/jabber/presence.c:381
+#: ../src/protocols/jabber/presence.c:382
 msgid "Create New Room"
 msgstr "צור חדר חדש"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../src/protocols/jabber/presence.c:383
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 "החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
 
-#: ../src/protocols/jabber/presence.c:384
+#: ../src/protocols/jabber/presence.c:386
 msgid "_Configure Room"
 msgstr "הגדרות החדר"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../src/protocols/jabber/presence.c:388
 msgid "_Accept Defaults"
 msgstr "קבל את ברירות המחדל"
 
-#: ../src/protocols/jabber/presence.c:423
+#: ../src/protocols/jabber/presence.c:426
 #, c-format
 msgid "Error in chat %s"
 msgstr "שגיאה בשיחה %s"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../src/protocols/jabber/presence.c:429
 #, c-format
 msgid "Error joining chat %s"
 msgstr "שגיאה בהצטרפות לצ'אט %s"
 
-#: ../src/protocols/jabber/si.c:726
+#: ../src/protocols/jabber/si.c:727
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "לא ניתן לשלוח את הקובץ אל %s, המשתמש לא תומך בהעברות קבצים"
 
-#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
+#: ../src/protocols/jabber/si.c:728 ../src/protocols/jabber/si.c:729
 msgid "File Send Failed"
 msgstr "כשל בשליחת קובץ"
 
@@ -7270,7 +7270,7 @@
 msgid "Not on list"
 msgstr "לא נמצא ברשימה"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
 msgid "User is offline"
 msgstr "המשתמש לא מחובר"
 
@@ -7512,7 +7512,7 @@
 
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
 #: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2881 ../src/protocols/yahoo/yahoo.c:2887
+#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
 #, c-format
 msgid ""
 "\n"
@@ -7526,24 +7526,24 @@
 msgstr "יש אותך"
 
 #: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
 msgid "Be Right Back"
 msgstr "חוזר עוד שניה"
 
 #: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
 #: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2712 ../src/protocols/yahoo/yahoo.c:3292
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
-#: ../src/protocols/yahoo/yahoo.c:3304
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3305
 msgid "On the Phone"
 msgstr "משוחח בטלפון"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
-#: ../src/protocols/yahoo/yahoo.c:3310
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/yahoo/yahoo.c:3311
 msgid "Out to Lunch"
 msgstr "יצא לאכול"
 
@@ -7596,14 +7596,14 @@
 msgstr "כשל בהתחברות לשרת"
 
 #: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, 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:1373 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1056
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
@@ -7890,36 +7890,36 @@
 msgid "Out To Lunch"
 msgstr "אוכל"
 
-#: ../src/protocols/msn/switchboard.c:408
+#: ../src/protocols/msn/switchboard.c:406
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "ההודעה אולי לא נשלחה כיוון שהזמן הקצוב אזל:"
 
-#: ../src/protocols/msn/switchboard.c:416
+#: ../src/protocols/msn/switchboard.c:414
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "לא ניתן לשלוח את ההודעה, אסור כאשר בלתי-נראה:"
 
-#: ../src/protocols/msn/switchboard.c:420
+#: ../src/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because the user is offline:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שהמשתמש לא מחובר:"
 
-#: ../src/protocols/msn/switchboard.c:424
+#: ../src/protocols/msn/switchboard.c:422
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאירעה שגיאת תקשורת:"
 
-#: ../src/protocols/msn/switchboard.c:428
+#: ../src/protocols/msn/switchboard.c:426
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאני שולחים מהר מדי:"
 
-#: ../src/protocols/msn/switchboard.c:432
+#: ../src/protocols/msn/switchboard.c:430
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאירעה שגיאה עם המרכזייה:"
 
-#: ../src/protocols/msn/switchboard.c:440
+#: ../src/protocols/msn/switchboard.c:438
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "ההודעה אולי לא נשלחה מכיוון שאירעה שגיאה לא מוכרת:"
 
-#: ../src/protocols/msn/switchboard.c:961
+#: ../src/protocols/msn/switchboard.c:959
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s שלח לך הרגע דחיפה קלה!"
@@ -7929,11 +7929,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "המשתמש %s (%s) רוצה להוסיף %s לרשימת אנשי הקשר שלו."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
 msgid "Authorize"
 msgstr "אישור"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
 msgid "Deny"
 msgstr "דחה"
 
@@ -7947,12 +7947,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה."
 
-#: ../src/protocols/msn/userlist.c:678
+#: ../src/protocols/msn/userlist.c:679
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "אין אפשרות להוסיף \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:680
+#: ../src/protocols/msn/userlist.c:681
 msgid "The screen name specified is invalid."
 msgstr "השם שניתן לתצוגה אינו חוקי."
 
@@ -7995,8 +7995,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
+#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8481,12 +8481,12 @@
 msgid "AIM Direct IM"
 msgstr "הודעות ישירות של AIM"
 
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
 #: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "שיחה"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8166
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8168
 msgid "Get File"
 msgstr "קבל קובץ"
 
@@ -8558,15 +8558,15 @@
 msgid "Camera"
 msgstr "מצלמה"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8028
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8030
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8056
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8058
 msgid "Not Available"
 msgstr "לא זמין"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8046
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8048
 msgid "Occupied"
 msgstr "עסוק"
 
@@ -9368,72 +9368,72 @@
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "הודעת התמונה לא נשלחה. לא ניתן לשלוח תמונות לצ'אטים ב-AIM."
 
-#: ../src/protocols/oscar/oscar.c:7813
+#: ../src/protocols/oscar/oscar.c:7815
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(שולף)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8119
+#: ../src/protocols/oscar/oscar.c:8121
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "הערת איש קשר עבור %s"
 
-#: ../src/protocols/oscar/oscar.c:8120
+#: ../src/protocols/oscar/oscar.c:8122
 msgid "Buddy Comment:"
 msgstr "הערת איש קשר:"
 
-#: ../src/protocols/oscar/oscar.c:8139
+#: ../src/protocols/oscar/oscar.c:8141
 msgid "Edit Buddy Comment"
 msgstr "ערוך הערת איש קשר"
 
-#: ../src/protocols/oscar/oscar.c:8146
+#: ../src/protocols/oscar/oscar.c:8148
 msgid "Get Status Msg"
 msgstr "הורד הודעת מצב"
 
-#: ../src/protocols/oscar/oscar.c:8159
+#: ../src/protocols/oscar/oscar.c:8161
 msgid "Direct IM"
 msgstr "תקשורת ישירה להודעות"
 
-#: ../src/protocols/oscar/oscar.c:8178
+#: ../src/protocols/oscar/oscar.c:8180
 msgid "Re-request Authorization"
 msgstr "בקש הרשאה שוב"
 
-#: ../src/protocols/oscar/oscar.c:8235
+#: ../src/protocols/oscar/oscar.c:8237
 msgid "Require authorization"
 msgstr "דרוש הרשאה"
 
-#: ../src/protocols/oscar/oscar.c:8238
+#: ../src/protocols/oscar/oscar.c:8240
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "מכיר-אינטרנט (הפעלה של זה תביא לדואר שלך SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:8243
+#: ../src/protocols/oscar/oscar.c:8245
 msgid "ICQ Privacy Options"
 msgstr "אפשרויות פרטיות של ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8260
+#: ../src/protocols/oscar/oscar.c:8262
 msgid "The new formatting is invalid."
 msgstr "הפורמט החדש אינו תקני."
 
-#: ../src/protocols/oscar/oscar.c:8261
+#: ../src/protocols/oscar/oscar.c:8263
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "פירמוט של שם משתמש רק יכולה לשנות אותיות גדולות/קטנות ורווחים."
 
-#: ../src/protocols/oscar/oscar.c:8268
+#: ../src/protocols/oscar/oscar.c:8270
 msgid "New screen name formatting:"
 msgstr "פורמט חדש לשם המשתמש:"
 
-#: ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/oscar/oscar.c:8322
 msgid "Change Address To:"
 msgstr "שנה כתובת ל:"
 
-#: ../src/protocols/oscar/oscar.c:8365
+#: ../src/protocols/oscar/oscar.c:8367
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>אינך מחכה להרשאה</i>"
 
-#: ../src/protocols/oscar/oscar.c:8368
+#: ../src/protocols/oscar/oscar.c:8370
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"
 
-#: ../src/protocols/oscar/oscar.c:8369
+#: ../src/protocols/oscar/oscar.c:8371
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9441,61 +9441,61 @@
 "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
 "ולבחור \"בקש הרשאה שוב\"."
 
-#: ../src/protocols/oscar/oscar.c:8386
+#: ../src/protocols/oscar/oscar.c:8388
 msgid "Find Buddy by E-mail"
 msgstr "מצא איש קשר לפי דוא\"ל"
 
-#: ../src/protocols/oscar/oscar.c:8387
+#: ../src/protocols/oscar/oscar.c:8389
 msgid "Search for a buddy by e-mail address"
 msgstr "חפש איש קשר לפי כתובת בדואר האלרקטרוני שלו"
 
-#: ../src/protocols/oscar/oscar.c:8388
+#: ../src/protocols/oscar/oscar.c:8390
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "הקלד את כתובת הדוא\"ל של איש הקשר אותו אתה מחפש."
 
-#: ../src/protocols/oscar/oscar.c:8481
+#: ../src/protocols/oscar/oscar.c:8483
 msgid "Set User Info (URL)..."
 msgstr "קבע את המידע על המשתמש (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8492
+#: ../src/protocols/oscar/oscar.c:8494
 msgid "Change Password (URL)"
 msgstr "שנה סיסמא (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8496
+#: ../src/protocols/oscar/oscar.c:8498
 msgid "Configure IM Forwarding (URL)"
 msgstr "הגדרות עקוב-אחרי להודעות (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8506
+#: ../src/protocols/oscar/oscar.c:8508
 msgid "Set Privacy Options..."
 msgstr "קבע אפשרויות פרטיות..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8513
+#: ../src/protocols/oscar/oscar.c:8515
 msgid "Format Screen Name..."
 msgstr "פרמט את שם המשתמש..."
 
-#: ../src/protocols/oscar/oscar.c:8517
+#: ../src/protocols/oscar/oscar.c:8519
 msgid "Confirm Account"
 msgstr "אשר חשבון"
 
-#: ../src/protocols/oscar/oscar.c:8521
+#: ../src/protocols/oscar/oscar.c:8523
 msgid "Display Currently Registered Address"
 msgstr "הצב את הכתובת הרשומה כרגע"
 
-#: ../src/protocols/oscar/oscar.c:8525
+#: ../src/protocols/oscar/oscar.c:8527
 msgid "Change Currently Registered Address..."
 msgstr "שנה את הכתובת הרשומה כרגע"
 
-#: ../src/protocols/oscar/oscar.c:8532
+#: ../src/protocols/oscar/oscar.c:8534
 msgid "Show Buddies Awaiting Authorization"
 msgstr "הצג את אנשי הקשר שמחכים לאישור"
 
-#: ../src/protocols/oscar/oscar.c:8538
+#: ../src/protocols/oscar/oscar.c:8540
 msgid "Search for Buddy by Email..."
 msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 
-#: ../src/protocols/oscar/oscar.c:8543
+#: ../src/protocols/oscar/oscar.c:8545
 msgid "Search for Buddy by Information"
 msgstr "חפש איש-קשר עפ\"י מידע"
 
@@ -9509,23 +9509,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8721 ../src/protocols/oscar/oscar.c:8723
+#: ../src/protocols/oscar/oscar.c:8723 ../src/protocols/oscar/oscar.c:8725
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "תוסף פרוטוקולים Aim/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8742
+#: ../src/protocols/oscar/oscar.c:8744
 msgid "Auth host"
 msgstr "שרת הרשאה"
 
-#: ../src/protocols/oscar/oscar.c:8745
+#: ../src/protocols/oscar/oscar.c:8747
 msgid "Auth port"
 msgstr "יציאת הרשאה"
 
-#: ../src/protocols/oscar/oscar.c:8748 ../src/protocols/zephyr/zephyr.c:2900
+#: ../src/protocols/oscar/oscar.c:8750 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "קידוד"
 
-#: ../src/protocols/oscar/oscar.c:8752
+#: ../src/protocols/oscar/oscar.c:8754
 msgid ""
 "Use AIM/ICQ proxy server\n"
 "(slower, but usually works)"
@@ -10189,57 +10189,57 @@
 msgid "Robot"
 msgstr "רובוט"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
 #: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "שמח"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
 #: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "עצוב"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
 #: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "כועס"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
 #: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "מקנא"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
 #: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "מבוייש"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
 #: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "בלתי מנוצח"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
 #: ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "מאוהב"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
 #: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "ישנוני"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
 #: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "משועמם"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
 #: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "נלהב"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
 #: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "לחוץ"
@@ -10265,7 +10265,7 @@
 msgstr "מכשיר"
 
 #: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "איזור זמן"
 
@@ -10403,7 +10403,7 @@
 msgstr "שם קבוצה"
 
 #: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:944
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "סיסמא"
 
@@ -10500,15 +10500,15 @@
 msgid "Cannot join private group"
 msgstr "לא ניתן להצטרף לקבוצה הפרטית"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "בצע פקודה"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "לא יכול לבצע פקודה"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "פקודה לא מוכרת"
 
@@ -10621,7 +10621,7 @@
 msgid "Job Role"
 msgstr "תפקיד"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "אירגון"
 
@@ -10657,7 +10657,7 @@
 msgid "_More..."
 msgstr "עוד..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "הנתק מן השרת"
 
@@ -10778,7 +10778,7 @@
 msgstr "נותק ע\"י השרת"
 
 #: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "ממשיך תהליך פעולה"
 
@@ -10873,49 +10873,49 @@
 msgid "Unsupported public key type"
 msgstr "סוג מפתח ציבורי שאינו נתמך"
 
-#: ../src/protocols/silc/silc.c:155
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "ההתחברות נכשלה"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "לא ניתן לאתחל חיבור לקוח של SILC"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "מבצע החלפת מפתחות"
 
-#: ../src/protocols/silc/silc.c:283
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "אזל הזיכרון"
 
-#: ../src/protocols/silc/silc.c:324
+#: ../src/protocols/silc/silc.c:328
 msgid "Cannot initialize SILC protocol"
 msgstr "לא ניתן לאתחל את פרוטוקול SILC"
 
-#: ../src/protocols/silc/silc.c:331
+#: ../src/protocols/silc/silc.c:335
 msgid "Cannot find/access ~/.silc directory"
 msgstr "לא ניתן לגשת/למצוא את ספריית ~/.silc"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:336
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "מתחבר לשרת ה-SILC"
 
-#: ../src/protocols/silc/silc.c:345
+#: ../src/protocols/silc/silc.c:349
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC: %s"
 
-#: ../src/protocols/silc/silc.c:365
+#: ../src/protocols/silc/silc.c:369
 msgid "Unable to create connection"
 msgstr "לא ניתן ליצור חיבור"
 
-#: ../src/protocols/silc/silc.c:664
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "מצב הרוח הנוכחי שלך"
 
-#: ../src/protocols/silc/silc.c:691
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10923,43 +10923,43 @@
 "\n"
 "צורת הקשר המועדפת עליך"
 
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
+#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "ועידת וידאו"
 
-#: ../src/protocols/silc/silc.c:708
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "מצבך הנוכחי"
 
-#: ../src/protocols/silc/silc.c:715
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "שירותים מקוונים"
 
-#: ../src/protocols/silc/silc.c:718
+#: ../src/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "אפשר לאחרים לראות באילו שירות את/ה משתמש/ת"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../src/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "אפשר לאחרים לראות באיזה מחשב את/ה משתמש/ת"
 
-#: ../src/protocols/silc/silc.c:731
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "קובץ ה-VCard שלך"
 
-#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "מאפייני מצב משתמש זמין ומחובר"
 
-#: ../src/protocols/silc/silc.c:745
+#: ../src/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -10968,189 +10968,189 @@
 "ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את "
 "המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
 
-#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
-#: ../src/protocols/silc/silc.c:1431
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1435
 msgid "Message of the Day"
 msgstr "ההודעה להיום"
 
-#: ../src/protocols/silc/silc.c:785
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "לא קיימת הודעה להיום"
 
-#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
 msgid "There is no Message of the Day associated with this connection"
 msgstr "אין הודעה להיום המשוייכת לחיבור זה"
 
-#: ../src/protocols/silc/silc.c:837 ../src/protocols/silc/silc.c:881
-#: ../src/protocols/silc/silc.c:952 ../src/protocols/silc/silc.c:953
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr "צור זוג מפתחות SILC חדש"
 
-#: ../src/protocols/silc/silc.c:837
+#: ../src/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "כשל בעת יצירה של זוג מפתחות"
 
-#: ../src/protocols/silc/silc.c:920
+#: ../src/protocols/silc/silc.c:924
 msgid "Key Length"
 msgstr "אורך מפתח"
 
-#: ../src/protocols/silc/silc.c:922
+#: ../src/protocols/silc/silc.c:926
 msgid "Public Key File"
 msgstr "קובץ מפתח ציבורי"
 
-#: ../src/protocols/silc/silc.c:924
+#: ../src/protocols/silc/silc.c:928
 msgid "Private Key File"
 msgstr "קובץ מפתח פרטי"
 
-#: ../src/protocols/silc/silc.c:933
+#: ../src/protocols/silc/silc.c:937
 msgid "Real Name"
 msgstr "שם אמיתי"
 
-#: ../src/protocols/silc/silc.c:947
+#: ../src/protocols/silc/silc.c:951
 msgid "Re-type Passphrase"
 msgstr "רשום סיסמא בשנית"
 
-#: ../src/protocols/silc/silc.c:954
+#: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "צור זוג מפתחות"
 
-#: ../src/protocols/silc/silc.c:998
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "זמינות"
 
-#: ../src/protocols/silc/silc.c:1007
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "הצג את הודעת היום"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../src/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr "צור זוג מפתחות SILC..."
 
-#: ../src/protocols/silc/silc.c:1110
+#: ../src/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "המתשמש <I>%s</I> אינו נוכח ברשת"
 
-#: ../src/protocols/silc/silc.c:1302
+#: ../src/protocols/silc/silc.c:1306
 msgid "Topic too long"
 msgstr "הנושא ארוך מדי"
 
-#: ../src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1387
 msgid "You must specify a nick"
 msgstr "חובה לציין כינוי משתמש"
 
-#: ../src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel %s not found"
 msgstr "הערוץ %s לא נמצא"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../src/protocols/silc/silc.c:1494
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "מצבי ערוץ %s: %s"
 
-#: ../src/protocols/silc/silc.c:1492
+#: ../src/protocols/silc/silc.c:1496
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "אין מצבים שנקבעו על הערוץ %s"
 
-#: ../src/protocols/silc/silc.c:1505
+#: ../src/protocols/silc/silc.c:1509
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "כשל בקביעת מצבי ערוץ עבור %s"
 
-#: ../src/protocols/silc/silc.c:1535
+#: ../src/protocols/silc/silc.c:1539
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "פקודה לא מוכרת: %s, )ייתכן וזהו באג בגיים("
 
-#: ../src/protocols/silc/silc.c:1598
+#: ../src/protocols/silc/silc.c:1602
 msgid "part [channel]:  Leave the chat"
 msgstr "part [ערוץ]: עזוב את הערוץ "
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1606
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [ערוץ]: עזוב את הערוץ"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1610
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;נושא חדש&gt;]: הצג או שנה את הנושא "
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1615
 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:1615
+#: ../src/protocols/silc/silc.c:1619
 msgid "list:  List channels on this network"
 msgstr "list:  הצג את רשימת הערוצים ברשת זו"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1623
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;כינוי משתמש&gt;:  צפה במידע אודות המשתמש"
 
-#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
 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:1627
+#: ../src/protocols/silc/silc.c:1631
 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:1631
+#: ../src/protocols/silc/silc.c:1635
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  צפה בהודעת היום של השרת"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../src/protocols/silc/silc.c:1639
 msgid "detach:  Detach this session"
 msgstr "detach:  נתק תהליך פעולות זה מהשרת"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1643
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [הודעה]:  ניתוק מן השרת, עם אפשרות להודעה"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1647
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;פקודה&gt;:  קרא לפקודת לקוח כלשהי של silc"
 
-#: ../src/protocols/silc/silc.c:1649
+#: ../src/protocols/silc/silc.c:1653
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;שם כינוי&gt; [-pubkey|&lt;סיבה&gt;]:  הרוג משתמש"
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../src/protocols/silc/silc.c:1657
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;שם כינוי חדש&gt;:  שינוי הכינוי שלך"
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../src/protocols/silc/silc.c:1661
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;שם כינוי&gt;:  הצג מידע על משתמש"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1665
 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:1665
+#: ../src/protocols/silc/silc.c:1669
 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:1669
+#: ../src/protocols/silc/silc.c:1673
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;מצבי משתמש&gt;:  קביעת מצבי המשתמש שלך ברשת"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1677
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;שם כינוי&gt; [-pubkey]:  השג הרשאות מפעיל שרת"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1681
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11158,35 +11158,35 @@
 "invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת "
 "ההזמנות של הערוץ"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1685
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;ערוץ&gt; &lt;שם כינוי&gt; [הערה]:  בעט משתמש מן הערוץ"
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../src/protocols/silc/silc.c:1689
 msgid "info [server]:  View server administrative details"
 msgstr "info [שרת]:  הצג מידע תפעולי על השרת"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1693
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;ערוץ&gt; +|-&lt;שם כינוי&gt;]:  חסום משתמש מן הערוץ"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1697
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;שמם כינוי|שרת&gt;:  השג מפתח ציבורי של שרת או משתמש"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1701
 msgid "stats:  View server and network statistics"
 msgstr "stats:  הצג מידע סטטיסטי על השרת והרשת"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1705
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  שלח PING לשרת המחובר"
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../src/protocols/silc/silc.c:1710
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;ערוץ&gt;:  הצג את רשימת הערוצים"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1714
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11203,60 +11203,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1819
+#: ../src/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1821
+#: ../src/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "פרוטוקול תקשורת בזמן-אמת מאובטחת(SILC)"
 
-#: ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "קובץ מפתח ציבורי"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../src/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "קובץ מפתח פרטי"
 
-#: ../src/protocols/silc/silc.c:1872
+#: ../src/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr "צופן"
 
-#: ../src/protocols/silc/silc.c:1882
+#: ../src/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1885
+#: ../src/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "אימות עפ\"י מפתח ציבורי"
 
-#: ../src/protocols/silc/silc.c:1888
+#: ../src/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "סרב צפייה ע\"י משתמשים אחרים"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "חסום הזמנות"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../src/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "חסום הודעות מידיות ללא החלפת מפתחות"
 
-#: ../src/protocols/silc/silc.c:1897
+#: ../src/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "סרב לבקשות מצב חיבור"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../src/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "חסום הודעות ללוח-הלבן"
 
-#: ../src/protocols/silc/silc.c:1903
+#: ../src/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
 msgstr "פתח לוח-לבן אוטומטית"
 
-#: ../src/protocols/silc/silc.c:1906
+#: ../src/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
 msgstr "חתום דיגיטלית וודא את כל ההודעות המיידיות "
 
@@ -11397,36 +11397,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1733
+#: ../src/protocols/simple/simple.c:1734
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "תוסף פרוטוקול SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1734
+#: ../src/protocols/simple/simple.c:1735
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "תוסף הפרוטוקול SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1756
+#: ../src/protocols/simple/simple.c:1757
 msgid "Publish status (note: everyone may watch you)"
 msgstr "ייצא סטטוס (הערה: כולם יוכלו לצפות בך)"
 
-#: ../src/protocols/simple/simple.c:1762
+#: ../src/protocols/simple/simple.c:1763
 msgid "Use UDP"
 msgstr "השתמש ב-UDP"
 
-#: ../src/protocols/simple/simple.c:1764
+#: ../src/protocols/simple/simple.c:1765
 msgid "Use proxy"
 msgstr "השתמש במתווך"
 
-#: ../src/protocols/simple/simple.c:1766
+#: ../src/protocols/simple/simple.c:1767
 msgid "Proxy"
 msgstr "מתווך"
 
-#: ../src/protocols/simple/simple.c:1768
+#: ../src/protocols/simple/simple.c:1769
 msgid "Auth User"
 msgstr "משתמש לאימות"
 
-#: ../src/protocols/simple/simple.c:1770
+#: ../src/protocols/simple/simple.c:1771
 msgid "Auth Domain"
 msgstr "דומיין לאימות"
 
@@ -11670,11 +11670,11 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "הודעת ה Yahoo שלך לא נשלחה."
 
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
+#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
 msgid "Buzz!!"
 msgstr "באזז!!"
 
-#: ../src/protocols/yahoo/yahoo.c:810
+#: ../src/protocols/yahoo/yahoo.c:811
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "הודעת מערכת עבור %s מ-Yahoo!:"
@@ -11682,21 +11682,21 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:906
+#: ../src/protocols/yahoo/yahoo.c:907
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "המשתמש %s רוצה להוסיף את %s לרשימת אנשי הקשר שלו%s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:912
+#: ../src/protocols/yahoo/yahoo.c:913
 msgid "Message (optional) :"
 msgstr "הודעה (לא חובה) :"
 
-#: ../src/protocols/yahoo/yahoo.c:954
+#: ../src/protocols/yahoo/yahoo.c:955
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך."
 
-#: ../src/protocols/yahoo/yahoo.c:957
+#: ../src/protocols/yahoo/yahoo.c:958
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11705,11 +11705,11 @@
 "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: "
 "%s."
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../src/protocols/yahoo/yahoo.c:961
 msgid "Add buddy rejected"
 msgstr "הוספת איש קשר נדחתה"
 
-#: ../src/protocols/yahoo/yahoo.c:1703
+#: ../src/protocols/yahoo/yahoo.c:1704
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11719,11 +11719,11 @@
 "שרת ה-Yahoo ביקש תצורת אימות לא מוכרת. גירסא זו של גיים קרוב לוודאי לא תוכל "
 "להתחבר בהצלחה ל-Yahoo. בדוק ב-%s לעידכונים."
 
-#: ../src/protocols/yahoo/yahoo.c:1706
+#: ../src/protocols/yahoo/yahoo.c:1707
 msgid "Failed Yahoo! Authentication"
 msgstr "כישלון באימות מול Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1773
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11732,19 +11732,19 @@
 "ניסית להתעלם מ-%s, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" "
 "תסיר ותתעלם מן המשתמש."
 
-#: ../src/protocols/yahoo/yahoo.c:1775
+#: ../src/protocols/yahoo/yahoo.c:1776
 msgid "Ignore buddy?"
 msgstr "התעלם ממשתמש?"
 
-#: ../src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1810
 msgid "Invalid username."
 msgstr "שם המשתמש שגוי."
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid "Normal authentication failed!"
 msgstr "אימות רגיל נכשל!"
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1822
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11755,134 +11755,134 @@
 "השתנתה. גיים ינסה להיכנס בעזרת אימות של Web Messanger, אשר יאפשר רק יכולות "
 "מוגבלות של הפרוטוקול."
 
-#: ../src/protocols/yahoo/yahoo.c:1829
+#: ../src/protocols/yahoo/yahoo.c:1830
 msgid "Incorrect password."
 msgstr "סיסמה לא נכונה."
 
-#: ../src/protocols/yahoo/yahoo.c:1832
+#: ../src/protocols/yahoo/yahoo.c:1833
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "חשבונך נעול, יש לגשת לאתר של Yahoo."
 
-#: ../src/protocols/yahoo/yahoo.c:1835
+#: ../src/protocols/yahoo/yahoo.c:1836
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה."
 
-#: ../src/protocols/yahoo/yahoo.c:1889
+#: ../src/protocols/yahoo/yahoo.c:1890
 #, 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:1892
+#: ../src/protocols/yahoo/yahoo.c:1893
 msgid "Could not add buddy to server list"
 msgstr "לא ניתן להוסיף את איש הקשר לרשימה בשרת"
 
-#: ../src/protocols/yahoo/yahoo.c:2011
+#: ../src/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ בר-שמיעה %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
-#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
+#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "לא ניתן לקרוא"
 
-#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
-#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
+#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "תקלת תקשורת"
 
-#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
 msgid "Not at Home"
 msgstr "לא נמצא בבית"
 
-#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
 msgid "Not at Desk"
 msgstr "לא ליד השולחן"
 
-#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
 msgid "Not in Office"
 msgstr "לא נמצא במשרד"
 
-#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
 msgid "On Vacation"
 msgstr "בחופשה"
 
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
+#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
 msgid "Stepped Out"
 msgstr "יצא לרגע"
 
-#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
 msgid "Not on server list"
 msgstr "לא ברשימת השרתים"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
+#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
 msgid "Appear Online"
 msgstr "נראה מחובר"
 
-#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
+#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
 msgid "Appear Permanently Offline"
 msgstr "נראה מנותק לעד"
 
-#: ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/yahoo/yahoo.c:2889
 msgid "Presence"
 msgstr "נוכחות"
 
-#: ../src/protocols/yahoo/yahoo.c:2931
+#: ../src/protocols/yahoo/yahoo.c:2932
 msgid "Appear Offline"
 msgstr "ככל הנראה מנותק"
 
-#: ../src/protocols/yahoo/yahoo.c:2940
+#: ../src/protocols/yahoo/yahoo.c:2941
 msgid "Don't Appear Permanently Offline"
 msgstr "אל תיראה מנותק לעד"
 
-#: ../src/protocols/yahoo/yahoo.c:2988
+#: ../src/protocols/yahoo/yahoo.c:2989
 msgid "Join in Chat"
 msgstr "הצטרף לשיחה"
 
-#: ../src/protocols/yahoo/yahoo.c:2994
+#: ../src/protocols/yahoo/yahoo.c:2995
 msgid "Initiate Conference"
 msgstr "יזום ועידה"
 
-#: ../src/protocols/yahoo/yahoo.c:3022
+#: ../src/protocols/yahoo/yahoo.c:3023
 msgid "Presence Settings"
 msgstr "אפשרויות נוכחות"
 
-#: ../src/protocols/yahoo/yahoo.c:3028
+#: ../src/protocols/yahoo/yahoo.c:3029
 msgid "Start Doodling"
 msgstr "התחל לקשקש"
 
-#: ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3061
 msgid "Active which ID?"
 msgstr "איזה ID להפעיל?"
 
-#: ../src/protocols/yahoo/yahoo.c:3069
+#: ../src/protocols/yahoo/yahoo.c:3070
 msgid "Join who in chat?"
 msgstr "להצטרף למי בצ'אט?"
 
-#: ../src/protocols/yahoo/yahoo.c:3079
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Activate ID..."
 msgstr "הפעל ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3083
+#: ../src/protocols/yahoo/yahoo.c:3084
 msgid "Join User in Chat..."
 msgstr "הצטרף למשתמש בצ'אט..."
 
-#: ../src/protocols/yahoo/yahoo.c:3621
+#: ../src/protocols/yahoo/yahoo.c:3622
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;חדר&gt;:  הצטרף לחדר צ'אט ברשת Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3626
+#: ../src/protocols/yahoo/yahoo.c:3627
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: הצג את רשימת החדרים ברשת Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3630
+#: ../src/protocols/yahoo/yahoo.c:3631
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: שלח זימזום למשתמש כדי להשיג את תשומת ליבם"
 
-#: ../src/protocols/yahoo/yahoo.c:3634
+#: ../src/protocols/yahoo/yahoo.c:3635
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle"
 
@@ -11896,55 +11896,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
+#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
 msgid "Yahoo Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3746
+#: ../src/protocols/yahoo/yahoo.c:3747
 msgid "Yahoo Japan"
 msgstr "Yahoo יפן"
 
-#: ../src/protocols/yahoo/yahoo.c:3749
+#: ../src/protocols/yahoo/yahoo.c:3750
 msgid "Pager host"
 msgstr "שרת ה-Pager"
 
-#: ../src/protocols/yahoo/yahoo.c:3752
+#: ../src/protocols/yahoo/yahoo.c:3753
 msgid "Japan Pager host"
 msgstr "שרת ה-Pager ביפן"
 
-#: ../src/protocols/yahoo/yahoo.c:3755
+#: ../src/protocols/yahoo/yahoo.c:3756
 msgid "Pager port"
 msgstr "יציאת Pager"
 
-#: ../src/protocols/yahoo/yahoo.c:3758
+#: ../src/protocols/yahoo/yahoo.c:3759
 msgid "File transfer host"
 msgstr "שרת להעברת קבצים"
 
-#: ../src/protocols/yahoo/yahoo.c:3761
+#: ../src/protocols/yahoo/yahoo.c:3762
 msgid "Japan file transfer host"
 msgstr "שרת יפני להעברת קבצים"
 
-#: ../src/protocols/yahoo/yahoo.c:3764
+#: ../src/protocols/yahoo/yahoo.c:3765
 msgid "File transfer port"
 msgstr "יציאה להעברת קבצים"
 
-#: ../src/protocols/yahoo/yahoo.c:3767
+#: ../src/protocols/yahoo/yahoo.c:3768
 msgid "Chat room locale"
 msgstr "הגדרה איזורית לחדר צ'אט"
 
-#: ../src/protocols/yahoo/yahoo.c:3770
+#: ../src/protocols/yahoo/yahoo.c:3771
 msgid "Ignore conference and chatroom invitations"
 msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../src/protocols/yahoo/yahoo.c:3775
 msgid "Chat room list URL"
 msgstr "מיקום של רשימת חדרי הצ'אט"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
+#: ../src/protocols/yahoo/yahoo.c:3778
 msgid "YCHT host"
 msgstr "שרת YCHT"
 
-#: ../src/protocols/yahoo/yahoo.c:3780
+#: ../src/protocols/yahoo/yahoo.c:3781
 msgid "YCHT port"
 msgstr "יציאה ל-YCHT"
 
@@ -12121,89 +12121,89 @@
 msgid "Connection problem with the YCHT server."
 msgstr "שגיאה בתקשורת עם שרת ה-YCHT."
 
-#: ../src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:346
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "(הייתה שגיאה בהמרת ההודעה.\t בדוק את הגדרות ה'קידוד' בעורך החשבונות)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:701
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "לא ניתן לשלוח לצ'אט %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
+#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>משתמש:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
+#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>חבוי או לא מחובר"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
+#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>ב-%s מאז %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
+#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
 msgid "Anyone"
 msgstr "כל אחד"
 
-#: ../src/protocols/zephyr/zephyr.c:2278
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
 msgstr "_מחלקה:"
 
-#: ../src/protocols/zephyr/zephyr.c:2284
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
 msgstr "_ישות:"
 
-#: ../src/protocols/zephyr/zephyr.c:2290
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
 msgstr "_נמען:"
 
-#: ../src/protocols/zephyr/zephyr.c:2301
+#: ../src/protocols/zephyr/zephyr.c:2321
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "ניסיון לעשות מנוי על %s,%s,%s נכשל"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;שם כינוי&gt;: איתור משתמש"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2632
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;שם כינוי&gt;: איתור משתמש"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2637
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2642
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../src/protocols/zephyr/zephyr.c:2647
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2653
 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:2638
+#: ../src/protocols/zephyr/zephyr.c:2658
 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:2644
+#: ../src/protocols/zephyr/zephyr.c:2664
 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:2650
+#: ../src/protocols/zephyr/zephyr.c:2670
 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;"
@@ -12211,7 +12211,7 @@
 "zcir &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,"
 "<i>ישות</i>,<i>נמען</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2676
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12219,15 +12219,15 @@
 "zir &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</"
 "i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2661
+#: ../src/protocols/zephyr/zephyr.c:2681
 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:2767
+#: ../src/protocols/zephyr/zephyr.c:2787
 msgid "Resubscribe"
 msgstr "הרשם מחדש למנוי"
 
-#: ../src/protocols/zephyr/zephyr.c:2770
+#: ../src/protocols/zephyr/zephyr.c:2790
 msgid "Retrieve subscriptions from server"
 msgstr "שלוף את המנויים מהשרת"
 
@@ -12241,51 +12241,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
+#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
 msgid "Zephyr Protocol Plugin"
 msgstr "תוסף פרוטוקול Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2882
+#: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "ייצא ל-.anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2885
+#: ../src/protocols/zephyr/zephyr.c:2905
 msgid "Export to .zephyr.subs"
 msgstr "ייצא ל-.zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2888
+#: ../src/protocols/zephyr/zephyr.c:2908
 msgid "Import from .anyone"
 msgstr "ייבא מ-.anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2891
+#: ../src/protocols/zephyr/zephyr.c:2911
 msgid "Import from .zephyr.subs"
 msgstr "ייבא מ-.zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2894
+#: ../src/protocols/zephyr/zephyr.c:2914
 msgid "Realm"
 msgstr "איזור"
 
-#: ../src/protocols/zephyr/zephyr.c:2897
+#: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
 msgstr "חשיפה"
 
-#: ../src/proxy.c:1205 ../src/proxy.c:1261 ../src/proxy.c:1309
-#: ../src/proxy.c:1336
+#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
+#: ../src/proxy.c:1338
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "שגיאה בשרת התיווך %d"
 
 #. Forbidden
-#: ../src/proxy.c:1325
+#: ../src/proxy.c:1327
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "אין הרשאה: שרת התיווך אוסר על תיעול ליציאה %d."
 
-#: ../src/proxy.c:2325
+#: ../src/proxy.c:2327
 msgid "Invalid proxy settings"
 msgstr "הגדרות לא תקפות של מתווכים"
 
-#: ../src/proxy.c:2325
+#: ../src/proxy.c:2327
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -12299,12 +12299,12 @@
 msgid "I'm not here right now"
 msgstr "אני לא כאן כרגע"
 
-#: ../src/server.c:225
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ידוע כעת בשם %s.\n"
 
-#: ../src/server.c:675
+#: ../src/server.c:681
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12313,12 +12313,12 @@
 "%s הזמין את %s לחדר הצ'אט %s:\n"
 "%s"
 
-#: ../src/server.c:680
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s הזמין את %s לחדר הצ'אט %s\n"
 
-#: ../src/server.c:684
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "לקבל הזמנה לצ'אט?"
 
@@ -12374,17 +12374,17 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s החל בפעילות"
 
-#: ../src/util.c:670
+#: ../src/util.c:679
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2460
+#: ../src/util.c:2457
 #, c-format
 msgid "Error Reading %s"
 msgstr "שגיאה בקריאת %s"
 
-#: ../src/util.c:2461
+#: ../src/util.c:2458
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12392,57 +12392,57 @@
 msgstr ""
 "חלה שגיאה בעת קריאת ה-%s שלך.  הם לא נטענו, ושם הקובץ הישן הוחלף ל-%s~."
 
-#: ../src/util.c:2900
+#: ../src/util.c:2897
 msgid "Calculating..."
 msgstr "מחשב..."
 
-#: ../src/util.c:2903
+#: ../src/util.c:2900
 msgid "Unknown."
 msgstr "לא ידוע"
 
-#: ../src/util.c:2929
+#: ../src/util.c:2926
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d שנייה"
 msgstr[1] "%d שניות"
 
-#: ../src/util.c:2941
+#: ../src/util.c:2938
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d יום"
 msgstr[1] "%d ימים"
 
-#: ../src/util.c:2949
+#: ../src/util.c:2946
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d שעה"
 msgstr[1] "%s, %d שעות"
 
-#: ../src/util.c:2955
+#: ../src/util.c:2952
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d שעה"
 msgstr[1] "%d שעות"
 
-#: ../src/util.c:2963
+#: ../src/util.c:2960
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d דקה"
 msgstr[1] "%s, %d דקות"
 
-#: ../src/util.c:2969
+#: ../src/util.c:2966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d דקה"
 msgstr[1] "%d דקות"
 
-#: ../src/util.c:3444
+#: ../src/util.c:3441
 msgid "g003: Error opening connection.\n"
 msgstr "g003: שגיאה בעת פתיחת חיבור תקשורת.\n"
 
@@ -12690,47 +12690,40 @@
 #~ msgid "Connected to Sametime Community Server"
 #~ msgstr "מחובר לשרת קהילה של Sametime"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status</b>: %s"
-#~ msgstr "<b>מצב:</b> %s"
-
-#, fuzzy
+#~ msgstr ""
+#~ "\n"
+#~ "<b>מצב:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Message</b>: %s"
 #~ msgstr ""
 #~ "\n"
-#~ "<b>%s:</b> %s"
-
-#, fuzzy
+#~ "<b>הודעה</b>: %s"
+
 #~ msgid "Add User"
-#~ msgstr "AP משתמש"
-
-#, fuzzy
+#~ msgstr "הוסף משתמש"
+
 #~ msgid "Active Message"
-#~ msgstr "שליחת הודעה"
-
-#, fuzzy
+#~ msgstr "הודעה פעילה"
+
 #~ msgid "Busy Message"
 #~ msgstr "הודעת ריחוק מהמחשב"
 
-#, fuzzy
 #~ msgid "Default status messages"
-#~ msgstr "_רשום את כל ההודעות"
-
-#, fuzzy
+#~ msgstr "הודעות ברירת-מחדל"
+
 #~ msgid "Edit Status Messages"
-#~ msgstr "ערוך הודעה זו"
-
-#, fuzzy
+#~ msgstr "ערוך הודעות מצב"
+
 #~ msgid "Set Status Messages..."
-#~ msgstr "הורד הודעת מצב"
-
-#, fuzzy
+#~ msgstr "קבע הודעות מצב..."
+
 #~ msgid "NotesBuddy Encoding"
-#~ msgstr "קידוד שלא נתמך"
+#~ msgstr "קידוד NotesBuddy"
 
 #~ msgid "Thomas Butter <butter@uni-mannheim.de>"
 #~ msgstr "Thomas Butter <butter@uni-mannheim.de>"
--- a/po/zh_CN.po	Wed Mar 08 14:57:22 2006 +0000
+++ b/po/zh_CN.po	Wed Mar 08 17:43:55 2006 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim oldstatus\n"
+"Project-Id-Version: gaim HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-08-08 13:08+0800\n"
+"POT-Creation-Date: 2006-03-08 00:00-0500\n"
+"PO-Revision-Date: 2006-03-08 18:28+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"
@@ -28,77 +28,60 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "通过多种协议发送即时消息"
 
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "错误消息屏蔽"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "隐藏断开连接错误"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "隐藏登录错误"
-
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "隐藏断开连接错误"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "自动重连"
+#: ../plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "如果您被踢出来了,程序将会自动重新连接。"
-
-#: plugins/contact_priority.c:84
+#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr ""
+
+#: ../plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "好友正发呆"
+
+#: ../plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "好友已离开"
+
+#: ../plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "好友为“扩展”离开"
+
+#. Not used yet.
+#: ../plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr ""
+
+#: ../plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "好友离线"
+
+#: ../plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "程序内部所用的权值,当..."
 
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "好友离线:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "好友离开:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "好友瞌睡:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "使用最后一个匹配的好友"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"分值最低的好友是联系人中有优先权的好友。\n"
-"使用默认值(离线=4,离开=2,瞌睡=1)时,内置顺序将为: 在线->瞌睡->离开+瞌睡->离"
-"线。"
-
-#: plugins/contact_priority.c:144
-#, fuzzy
+#: ../plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+#: ../plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+#: ../plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "账户的权值..."
 
@@ -108,76 +91,75 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
+#: ../plugins/contact_priority.c:182
 msgid "Contact Priority"
 msgstr "联系人优先级"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
+#: ../plugins/contact_priority.c:185
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "允许控制好友不同状态所对应的值。"
 
 #. *< description
-#: plugins/contact_priority.c:200
+#: ../plugins/contact_priority.c:187
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr "允许在进行好友优先级比较时为瞌睡/离开/离线状态所用的权值。"
-
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - 已登出"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - 离开"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "好友列表"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "新消息..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "加入聊天..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "静音"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "文件传送"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "账户"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "首选项"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "退出"
+msgstr "允许在进行好友优先级比较时为发呆/离开/离线状态所用的权值。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "建立 Crazychat 会话的插件。"
+
+#. *  description
+#: ../plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr ""
+
+#. make the network configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "网络配置"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "TCP 端口"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "UDP 端口"
+
+#. make the feature configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "特性校正"
+
+#. add enabled / disabled
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
+#: ../src/gtkplugin.c:574
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "已禁用"
 
 #. *< type
 #. *< ui_requirement
@@ -185,42 +167,190 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: ../plugins/dbus-example.c:135
+msgid "DBus"
+msgstr "DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+msgid "DBus Plugin Example"
+msgstr "DBus 插件示例"
+
+#: ../plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "用鼠标右键单击可查看更多未读消息...\n"
+
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3238
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
+
+#: ../plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "更改状态"
+
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
+#: ../src/protocols/jabber/buddy.c:1101 ../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:2845
+#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
+msgid "Available"
+msgstr "可用"
+
+#. Away stuff
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
+#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
+#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7873
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
+#: ../src/status.c:158
+msgid "Away"
+msgstr "离开"
+
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
+#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/status.c:157
+msgid "Invisible"
+msgstr "隐身"
+
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
+#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
+#: ../src/protocols/oscar/oscar.c:7845 ../src/protocols/yahoo/yahoo.c:2733
+#: ../src/status.c:154
+msgid "Offline"
+msgstr "离线"
+
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
+msgid "New..."
+msgstr "新建..."
+
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
+msgid "Saved..."
+msgstr "已存..."
+
+#: ../plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "显示好友列表"
+
+#: ../plugins/docklet/docklet.c:489
+msgid "Unread Messages"
+msgstr "未读消息"
+
+#: ../plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "新消息..."
+
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+msgid "Accounts"
+msgstr "账户"
+
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
+msgid "Plugins"
+msgstr "插件"
+
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "静音"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "退出"
+
+#: ../plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr "有未读消息时闪烁托盘图标..."
+
+#: ../plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr "即时消息(_I):"
+
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+msgid "Never"
+msgstr "从不"
+
+#: ../plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "于隐藏对话"
+
+#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+msgid "Always"
+msgstr "总是"
+
+#: ../plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "聊天消息(_H):"
+
+#: ../plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "谈到我的昵称时"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: ../plugins/docklet/docklet.c:725
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"在系统的托盘区(如 GNOME,KDE 或 Windows)显示一个图标,表示 Gaim 的当前状态,"
-"并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
-"似,还可以将消息存入队列。"
-
-#: plugins/extplacement.c:79
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
+msgstr ""
+"在系统的托盘区(如 GNOME、KDE 或 Windows)显示一个图标,表示 Gaim 的当前状态,"
+"并允许快速访问常用的功能,以及切换好友列表的显示。同时还提供有未读消息时闪烁"
+"的选项。"
+
+#: ../plugins/docklet/eggtrayicon.c:123
+msgid "Orientation"
+msgstr "方向"
+
+#: ../plugins/docklet/eggtrayicon.c:124
+msgid "The orientation of the tray."
+msgstr "托盘的方向。"
+
+#: ../plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "按对话计数"
 
-#: plugins/extplacement.c:100
+#: ../plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "交谈放置"
 
-#: plugins/extplacement.c:105
+#: ../plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
 
-#: plugins/extplacement.c:111
+#: ../plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "按数字放置时分离即时消息和聊天窗口"
 
@@ -230,19 +360,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
 msgstr "扩展放置"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
 msgstr "额外的对话放置选项。"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: ../plugins/extplacement.c:139
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -254,7 +384,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Gaim 文件控制"
 
@@ -262,7 +392,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制 Gaim。"
 
@@ -272,19 +402,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim 演示插件"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "一个范例插件 - 参看描述。"
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -296,102 +426,128 @@
 "- 颠倒所有收到的文本\n"
 "- 当您的好友登入后立即给他们发送信息"
 
-#: plugins/gaimrc.c:40
+#: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
+msgstr "光标颜色"
+
+#: ../plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-#, fuzzy
+msgstr "次要光标颜色"
+
+#: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "超级链接颜色"
 
-#: plugins/gaimrc.c:53
-#, fuzzy
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
-msgstr "扩展柄大小"
-
-#: plugins/gaimrc.c:72
-#, fuzzy
+msgstr "GtkTreeView 扩展柄大小"
+
+#: ../plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView 水平分隔"
+
+#: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
-msgstr "对话"
-
-#: plugins/gaimrc.c:73
-#, fuzzy
+msgstr "对话项"
+
+#: ../plugins/gaimrc.c:77
 msgid "Conversation History"
-msgstr "对话"
-
-#: plugins/gaimrc.c:74
-#, fuzzy
+msgstr "对话历史"
+
+#: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
-msgstr "登录服务器"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
+msgstr "日志查看器"
+
+#: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
-msgstr "请求含糊"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
+msgstr "请求对话框"
+
+#: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
-msgstr "提醒"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
+msgstr "提醒对话框"
+
+#: ../plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView 缩进扩展柄"
+
+#: ../plugins/gaimrc.c:287
+#, c-format
 msgid "Select Color for %s"
-msgstr "选择文字颜色"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
+msgstr "选择 %s 的颜色"
+
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
-msgstr "选择文字颜色"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
+msgstr "选择颜色"
+
+#: ../plugins/gaimrc.c:324
+#, c-format
 msgid "Select Font for %s"
-msgstr "选择字体"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
+msgstr "选择 %s 的字体"
+
+#: ../plugins/gaimrc.c:362
 msgid "Select Interface Font"
-msgstr "选择字体"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
+msgstr "选择界面字体"
+
+#: ../plugins/gaimrc.c:415
+msgid "General"
+msgstr "常规"
+
+#: ../plugins/gaimrc.c:420
 msgid "GTK+ Interface Font"
-msgstr "界面选项"
-
-#: plugins/gaimrc.c:362
+msgstr "GTK+ 界面字体"
+
+#: ../plugins/gaimrc.c:440
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-#, fuzzy
+msgstr "GTK+ 文字快捷方式主题"
+
+#: ../plugins/gaimrc.c:475
+msgid "Interface colors"
+msgstr "界面颜色"
+
+#: ../plugins/gaimrc.c:499
+msgid "Widget Sizes"
+msgstr "部件大小"
+
+#: ../plugins/gaimrc.c:520
+msgid "Fonts"
+msgstr "字体"
+
+#: ../plugins/gaimrc.c:543
+msgid "Tools"
+msgstr "工具"
+
+#: ../plugins/gaimrc.c:548
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "将设置写入 %s%sgtkrc-2.0"
+
+#: ../plugins/gaimrc.c:556
+msgid "Re-read gtkrc files"
+msgstr "重新读取 gtkrc 文件"
+
+#: ../plugins/gaimrc.c:583
 msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim 文件控制"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr "Gaim GTK+ 主题控制"
+
+#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "提供对常用 gtkrc 设置的访问。"
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: ../plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "鼠标手势配置"
 
-#: plugins/gestures/gestures.c:250
+#: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "鼠标中键"
 
-#: plugins/gestures/gestures.c:255
+#: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "鼠标右键"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: ../plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "可视手势显示(_V)"
 
@@ -401,19 +557,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: ../plugins/gestures/gestures.c:289
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:292
 msgid "Provides support for mouse gestures"
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: ../plugins/gestures/gestures.c:294
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -429,102 +585,109 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#. Extract their Name and put it in
+#: ../plugins/gevolution/add_buddy_dialog.c:131
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
+#: ../src/protocols/msn/msn.c:1525
 msgid "Name"
 msgstr "名称"
 
-#: plugins/gevolution/add_buddy_dialog.c:142
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "即时通讯"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:454
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8393
+#: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "搜索"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: ../plugins/gevolution/add_buddy_dialog.c:548
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4534
+#: ../src/gtkblist.c:4898
 msgid "Group:"
-msgstr "组:"
+msgstr "组:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/assoc-buddy.c:464
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:591
 msgid "Select Buddy"
 msgstr "选择好友"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+#: ../plugins/gevolution/assoc-buddy.c:340
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
 
 #. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
+#: ../plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
-msgstr "隐藏用户细节"
+msgstr "用户资料(_D)"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
+#: ../plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1121
+msgid "None"
+msgstr "无"
+
+#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
+#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
+#: ../src/gtkblist.c:4343 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "无法发送消息。"
-
-#: plugins/gevolution/gevolution.c:263
+msgstr "无法发送电子邮件。"
+
+#: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
+msgstr "Evolution 可执行文件未在 PATH 中找到。"
+
+#: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+msgstr "指定的好友未在 Evolution 联系人中找到。"
+
+#: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
-msgstr "电子邮件"
+msgstr "发送电子邮件"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
+#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "账户"
 
@@ -534,7 +697,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -542,79 +705,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
-msgstr "提供与 Ximian Evolution 的集成。"
-
-#: plugins/gevolution/new_person_dialog.c:266
+msgstr "提供与 Evolution 的集成。"
+
+#: ../plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
-msgstr "账户类型:"
-
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
-msgstr "用户名:"
+msgstr "账户类型:"
+
+#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+msgid "Screen name:"
+msgstr "用户名:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
-msgstr "额外信息:"
+msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
-msgstr "名:"
-
-#: plugins/gevolution/new_person_dialog.c:361
+msgstr "名:"
+
+#: ../plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
-msgstr "姓:"
-
-#: plugins/gevolution/new_person_dialog.c:381
+msgstr "姓:"
+
+#: ../plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
-msgstr "电子邮件:"
-
-#: plugins/history.c:146
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:147
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:186
-msgid "History"
-msgstr "历史"
-
-#: plugins/history.c:188
-msgid "Shows recently logged conversations in new conversations."
-msgstr "在新对话中显示显示最近记录的对话。"
-
-#: plugins/history.c:189
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
+msgstr "电子邮件:"
 
 #. *< type
 #. *< ui_requirement
@@ -622,7 +755,56 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: ../plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK 信号测试"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "测试看看所有的 UI 信号是否都工作正确。"
+
+#: ../plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>与 %s 在 %s 的谈话</b><br>"
+
+#: ../plugins/history.c:147
+msgid "History Plugin Requires Logging"
+msgstr "历史插件请求登录"
+
+#: ../plugins/history.c:148
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+#: ../plugins/history.c:188
+msgid "History"
+msgstr "历史"
+
+#: ../plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "在新对话中显示显示最近记录的对话。"
+
+#: ../plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "离开后变为图标"
 
@@ -630,48 +812,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
-#: plugins/idle.c:115
+#: ../plugins/idle.c:152 ../plugins/idle.c:210
 msgid "Minutes"
 msgstr "分钟"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
+#: ../plugins/idle.c:306
 msgid "I'dle Mak'er"
-msgstr "瞌睡虫"
-
-#: plugins/idle.c:123 plugins/idle.c:181
+msgstr "发呆器"
+
+#: ../plugins/idle.c:160 ../plugins/idle.c:249
 msgid "Set Account Idle Time"
-msgstr "设定账户瞌睡时间"
-
-#: plugins/idle.c:126
+msgstr "设定账户发呆时间"
+
+#: ../plugins/idle.c:163 ../plugins/idle.c:221
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: ../plugins/idle.c:177
+msgid "None of your accounts are idle."
+msgstr "您的全部账户都没有设为发呆。"
+
+#: ../plugins/idle.c:193 ../plugins/idle.c:253
 msgid "Unset Account Idle Time"
-msgstr "设定账户瞌睡时间"
-
-#: plugins/idle.c:153
-#, fuzzy
+msgstr "取消账户发呆时间的设定"
+
+#: ../plugins/idle.c:196
 msgid "_Unset"
-msgstr "使用(_U)"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr "取消设置(_U)"
+
+#: ../plugins/idle.c:218 ../plugins/idle.c:257
+msgid "Set Idle Time for All Accounts"
+msgstr "设定全部账户的发呆时间"
+
+#: ../plugins/idle.c:262
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "取消全部账户的发呆时间"
+
+#: ../plugins/idle.c:308 ../plugins/idle.c:309
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "允许您手动配置您睡了多长时间"
+msgstr "允许您手动配置您发了多长时间呆"
 
 #. *< type
 #. *< ui_requirement
@@ -679,19 +867,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC 测试客户"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "测试插件 IPC 支持,作为客户。"
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -703,103 +891,275 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC 测试服务器"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "测试插件 IPC 支持,作为服务器。"
 
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "测试插件 IPC 支持,作为服务器。这将注册 IPC 命令。"
 
-#: plugins/mailchk.c:160
+#: ../plugins/log_reader.c:1407
+msgid "User is offline."
+msgstr "用户离线。"
+
+#: ../plugins/log_reader.c:1413
+msgid "Auto-response sent:"
+msgstr "自动响应发送:"
+
+#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
+#: ../plugins/statenotify.c:79
+#, c-format
+msgid "%s has signed off."
+msgstr "%s 已登出。"
+
+#: ../plugins/log_reader.c:1440
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "您已经断开与服务器的连接。"
+
+#: ../plugins/log_reader.c:1458
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr "您目前已被断开。除非您再次登录,否则无法收到消息。"
+
+#: ../plugins/log_reader.c:1473
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "消息未发出,因为超过了最大长度。"
+
+#: ../plugins/log_reader.c:1478
+msgid "Message could not be sent."
+msgstr "无法发送消息。"
+
+#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
+msgid "Adium"
+msgstr "Adium"
+
+#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
+msgid "Fire"
+msgstr "Fire"
+
+#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../plugins/log_reader.c:1912
+msgid "General Log Reading Configuration"
+msgstr "常规日志读取配置"
+
+#: ../plugins/log_reader.c:1916
+msgid "Fast size calculations"
+msgstr "快速计算大小"
+
+#: ../plugins/log_reader.c:1920
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: ../plugins/log_reader.c:1926
+msgid "Log Directory"
+msgstr "日志目录"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/log_reader.c:1969
+msgid "Log Reader"
+msgstr "日志读取器"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../plugins/log_reader.c:1973
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "在日志查看器中包含其它即时通讯客户的日志。"
+
+#. * description
+#: ../plugins/log_reader.c:1977
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr ""
+"查看日志时,此插件将包含其它即时通讯客户端的日志。目前支持的即时通讯客户端包"
+"括 Adium、Fire、Messenger Plus!、MSN Messenger 和 Trillian。"
+
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "邮件检查器"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "检查新的本地邮件。"
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
+#: ../plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono 插件装入器"
+
+#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "装入 Mono 编写的 .NET 插件。"
+
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr "请求了音乐信使会话。请单击 MM 图标接受。"
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "音乐信使会话已确认。"
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+msgid "Music Messaging"
+msgstr "音乐信使"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr "运行命令时发生了冲突:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+msgid "Error Running Editor"
+msgstr "运行编辑器出错"
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "发生了下列错误:"
+
+#. Configuration frame
+#: ../plugins/musicmessaging/musicmessaging.c:623
+msgid "Music Messaging Configuration"
+msgstr "音乐信使配置"
+
+#: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr "计分编辑器路径"
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "合作作曲的音乐信使插件。"
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr "音乐信使插件允许多个用户同时在同一份曲谱上工作。"
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:642
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:649
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:656
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your nick"
+msgstr "\t仅当别人在聊天中提到您的名字(_O)"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:671
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
-msgstr "在窗口标题前追加字符串(_S):"
+msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:690
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
 #. Raise window method button
-#: plugins/notify.c:706
-#, fuzzy
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
-msgstr "即时消息对话窗口"
+msgstr "升起对话窗口(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -809,7 +1169,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "消息通知"
 
@@ -817,9 +1177,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "提供各种方法通知您有消息邮件。"
+msgstr "提供各种方法通知您有未读消息。"
 
 #. *< type
 #. *< ui_requirement
@@ -827,26 +1187,56 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:587
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
-#: plugins/raw.c:151
+#: ../plugins/psychic.c:22
+msgid "Psychic Mode"
+msgstr ""
+
+#: ../plugins/psychic.c:23
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+#: ../plugins/psychic.c:24
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+
+#: ../plugins/psychic.c:60
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+#: ../plugins/psychic.c:79
+msgid "Only enable for users on the buddy list"
+msgstr "仅对好友列表中的用户启用"
+
+#: ../plugins/psychic.c:84
+msgid "Disable when away"
+msgstr "离开时禁用"
+
+#: ../plugins/psychic.c:88
+msgid "Display notification message in conversations"
+msgstr "对话时显示通知消息"
+
+#: ../plugins/raw.c:175
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:153
+#: ../plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "允许您发送原样输入基于文本的协议。"
 
-#: plugins/raw.c:154
+#: ../plugins/raw.c:178
 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."
@@ -854,12 +1244,12 @@
 "允许您将输入原样发送给基于文本的协议(Jabber,MSN,IRC,TOC)。在输入框中按回车"
 "键可以发送。看看调试窗口。"
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "您正在使用 Gaim 版本 %s。而当前版本为 %s。<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -868,7 +1258,7 @@
 "<b>更新记录:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -877,7 +1267,7 @@
 "您可以从下面的地址获得版本 %s:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78 plugins/relnot.c:79
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "新版本可用"
 
@@ -887,19 +1277,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "版本通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "定期检查新版本。"
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -911,7 +1301,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: ../plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -919,7 +1309,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -929,7 +1319,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "简单插件"
 
@@ -937,55 +1327,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: ../plugins/simple.c:37 ../plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:1788
+#: ../plugins/spellchk.c:1917
 msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1789
+msgstr "重复更正"
+
+#: ../plugins/spellchk.c:1918
 msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1948
+msgstr "指定的单词已经在更正列表中存在了。"
+
+#: ../plugins/spellchk.c:2127
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:1972
+#: ../plugins/spellchk.c:2150
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:1984
+#: ../plugins/spellchk.c:2164
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:1996
+#: ../plugins/spellchk.c:2178
 msgid "Whole words only"
-msgstr ""
-
-#: plugins/spellchk.c:2022
+msgstr "整个单词"
+
+#: ../plugins/spellchk.c:2190
+msgid "Case sensitive"
+msgstr "区分大小写"
+
+#: ../plugins/spellchk.c:2216
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:2032
+#: ../plugins/spellchk.c:2232
 msgid "You _type:"
-msgstr "输入文字(_T):"
-
-#: plugins/spellchk.c:2048
+msgstr "输入文字(_T):"
+
+#: ../plugins/spellchk.c:2249
 msgid "You _send:"
-msgstr "送出文字(_S):"
-
-#: plugins/spellchk.c:2060
+msgstr "送出文字(_S):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../plugins/spellchk.c:2261
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "区分大小写匹配(不选中代表自动处理大小写)"
+
+#: ../plugins/spellchk.c:2263
 msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2097
+msgstr "只替换整个单词(_W)"
+
+#: ../plugins/spellchk.c:2288
+msgid "General Text Replacement Options"
+msgstr "常规文本替换选项"
+
+#: ../plugins/spellchk.c:2289
+msgid "Enable replacement of last word on send"
+msgstr "允许在发送时替换最后一个单词"
+
+#: ../plugins/spellchk.c:2314
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -995,7 +1402,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1003,7 +1410,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
 msgstr "提供通过 GNUTLS 的 SSL 支持。"
 
@@ -1013,7 +1420,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412
 msgid "NSS"
 msgstr "NSS"
 
@@ -1021,7 +1428,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
 
@@ -1031,7 +1438,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1039,41 +1446,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
 
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s 走了。"
-
-#: plugins/statenotify.c:49
+#: ../plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 回来了。"
 
-#: plugins/statenotify.c:56
+#: ../plugins/statenotify.c:51
+#, c-format
+msgid "%s has gone away."
+msgstr "%s 走了。"
+
+#: ../plugins/statenotify.c:61
 #, c-format
 msgid "%s has become idle."
-msgstr "%s 打起瞌睡。"
-
-#: plugins/statenotify.c:63
+msgstr "%s 发起了呆。"
+
+#: ../plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s 睡醒了。"
-
-#: plugins/statenotify.c:74
+msgstr "%s 发完呆了。"
+
+#: ../plugins/statenotify.c:72
+#, c-format
+msgid "%s has signed on."
+msgstr "%s 已登入。"
+
+#: ../plugins/statenotify.c:90
 msgid "Notify When"
 msgstr "通知情况"
 
-#: plugins/statenotify.c:77
+#: ../plugins/statenotify.c:93
 msgid "Buddy Goes _Away"
 msgstr "好友离开(_A)"
 
-#: plugins/statenotify.c:80
+#: ../plugins/statenotify.c:96
 msgid "Buddy Goes _Idle"
-msgstr "好友瞌睡(_I)"
+msgstr "好友发呆(_I)"
+
+#: ../plugins/statenotify.c:99
+msgid "Buddy _Signs On/Off"
+msgstr "好友登入/登出(_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -1081,7 +1497,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:141
 msgid "Buddy State Notification"
 msgstr "好友状态通知"
 
@@ -1089,17 +1505,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
-
-#: plugins/tcl/tcl.c:363
+msgstr "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"
+
+#: ../plugins/tcl/tcl.c:369
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
@@ -1109,7 +1525,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "好友点点通"
 
@@ -1117,19 +1533,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "iChat 时间戳"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "延迟"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "分钟。"
 
@@ -1139,7 +1555,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: ../plugins/timestamp.c:254
 msgid "Timestamp"
 msgstr "时间戳"
 
@@ -1147,53 +1563,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "不透明度:"
-
-#. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "即时消息对话窗口"
-
-#: plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "即时消息窗口透明度(_I)"
-
-#: plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "在即时消息窗口中显示滑块(_S)"
-
-#: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
-msgid "Remove IM window transparency on focus"
-msgstr "即时消息窗口透明度(_I)"
-
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
-msgid "Always on top"
-msgstr "给联系人起名"
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "好友列表窗口"
-
-#: plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "好友列表窗口的透明度(_B)"
-
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
-msgid "Remove Buddy List window transparency on focus"
-msgstr "好友列表窗口的透明度(_B)"
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "时间戳格式选项"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "强制使用 24 小时制(_F)"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "显示日期于..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "对话(_N):"
+
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "对迟发的消息"
+
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "对迟发的消息和聊天"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "消息日志(_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -1201,20 +1601,84 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "消息时间戳格式"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "自定义消息时间戳的格式。"
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr "此插件允许用户自定义会话和日志消息的时间戳格式。"
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "不透明度:"
+
+#. IM Convo trans options
+#: ../plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "即时消息对话窗口"
+
+#: ../plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "即时消息窗口透明度(_I)"
+
+#: ../plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "在即时消息窗口中显示滑块(_S)"
+
+#: ../plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "聚焦时取消即时通讯窗口透明度"
+
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "常居顶端"
+
+#. Buddy List trans options
+#: ../plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "好友列表窗口"
+
+#: ../plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "好友列表窗口的透明度(_B)"
+
+#: ../plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "聚焦时取消好友列表窗口透明度"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:662
-#, fuzzy
+#: ../plugins/win32/transparency/win2ktrans.c:663
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1223,350 +1687,343 @@
 msgstr ""
 "此插件能够让对话窗口和好友列表有可变的 alpha 透明度。\n"
 "\n"
-"* 注意: 此插件需要 Win2000 或 WinXP。"
-
-#: plugins/win32/winprefs/winprefs.c:385
+"* 注意: 此插件需要 Win2000 或更高版本。"
+
+#: ../plugins/win32/winprefs/winprefs.c:397
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ 运行时刻版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: ../plugins/win32/winprefs/winprefs.c:405
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/win32/winprefs/winprefs.c:394
+#: ../plugins/win32/winprefs/winprefs.c:406
 msgid "_Start Gaim on Windows startup"
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3587
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:418
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:422
 msgid "_Keep Buddy List window on top:"
-msgstr "好友列表窗口常居顶端(_K)"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "从不"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "离开"
+msgstr "好友列表窗口常居顶端(_K):"
 
 #. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
+#: ../plugins/win32/winprefs/winprefs.c:427
 msgid "Only when docked"
-msgstr ""
+msgstr "仅停靠时"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1864
 msgid "Conversations"
 msgstr "对话"
 
-#: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:432
 msgid "_Flash window when messages are received"
 msgstr "收到信息时闪烁窗口(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:443
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: ../plugins/win32/winprefs/winprefs.c:458
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: plugins/win32/winprefs/winprefs.c:446
+#: ../plugins/win32/winprefs/winprefs.c:459
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-#, fuzzy
+msgstr "提供 Gaim 在 Windows 下特定的选项,比如好友列表停靠和对话闪烁。"
+
+#: ../src/account.c:773
 msgid "accounts"
 msgstr "账户"
 
-#: src/account.c:915
-#, fuzzy
+#: ../src/account.c:923
 msgid "Password is required to sign on."
-msgstr "密码已过期"
-
-#: src/account.c:940
+msgstr "需要密码才能登入。"
+
+#: ../src/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "输入 %s(%s) 的密码"
 
-#: src/account.c:947
-#, fuzzy
+#: ../src/account.c:955
 msgid "Enter Password"
-msgstr "更改密码"
-
-#: src/account.c:952
-#, fuzzy
+msgstr "输入密码"
+
+#: ../src/account.c:960
 msgid "Save password"
-msgstr "新密码"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+msgstr "保存密码"
+
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3471
+#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:785
+#: ../src/gtkrequest.c:271 ../src/protocols/gg/gg.c:454
+#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
+#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
+#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
+#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:8247 ../src/protocols/oscar/oscar.c:8272
+#: ../src/protocols/oscar/oscar.c:8324 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
+#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
+#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
+#: ../src/protocols/yahoo/yahoo.c:3072
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4939
+#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:805 ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:891 ../src/gtkdialogs.c:946 ../src/gtkdialogs.c:983
+#: ../src/gtkdialogs.c:1008 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:272 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
+#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
+#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
+#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
+#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
+#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
+#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
+#: ../src/protocols/oscar/oscar.c:8125 ../src/protocols/oscar/oscar.c:8248
+#: ../src/protocols/oscar/oscar.c:8273 ../src/protocols/oscar/oscar.c:8325
+#: ../src/protocols/oscar/oscar.c:8394
+#: ../src/protocols/sametime/sametime.c:3376
+#: ../src/protocols/sametime/sametime.c:3461
+#: ../src/protocols/sametime/sametime.c:3631
+#: ../src/protocols/sametime/sametime.c:5320
+#: ../src/protocols/sametime/sametime.c:5409
+#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
+#: ../src/protocols/yahoo/yahoo.c:3073
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:986 src/connection.c:96
+#: ../src/account.c:994 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "缺少 %s 的协议插件"
 
-#: src/account.c:988 src/connection.c:99
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3463
+#: ../src/gtkblist.c:3469
 msgid "Connection Error"
 msgstr "连接错误"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/protocols/jabber/jabber.c:1271
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/account.c:1061
+#: ../src/account.c:1085
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/account.c:1085
+#: ../src/account.c:1108
 msgid "Original password"
 msgstr "旧密码"
 
-#: src/account.c:1092
+#: ../src/account.c:1115
 msgid "New password"
 msgstr "新密码"
 
-#: src/account.c:1099
+#: ../src/account.c:1122
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: src/account.c:1105
+#: ../src/account.c:1128
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: src/account.c:1113
+#: ../src/account.c:1136
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
-#: src/account.c:1146
+#: ../src/account.c:1169
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:278
+#: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: ../src/account.c:1679 ../src/gtkft.c:157
+#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
+#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:545
-#, fuzzy
+#: ../src/blist.c:543
 msgid "buddy list"
 msgstr "好友列表"
 
-#: src/blist.c:1162
+#: ../src/blist.c:1173
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
+#: ../src/blist.c:1894
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
 msgstr[0] ""
-"%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
-"除。\n"
-
-#: src/blist.c:1872
+"%2$s 组中的 %1$d 个好友未删除,原因是他们属于目前已禁用或离线的账户。这些好友"
+"和该组不会被删除。\n"
+
+#: ../src/blist.c:1904
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/connection.c:98
+#: ../src/connection.c:98
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: src/conversation.c:205
-#, fuzzy
+#: ../src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s 已登入"
+
+#: ../src/connection.c:322
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s 已登出"
+
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
-msgstr "无法发送消息。消息太大。"
-
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+msgstr "无法发送消息: 消息太大。"
+
+#: ../src/conversation.c:166 ../src/conversation.c:179
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "无法给 %s 发送消息:"
-
-#: src/conversation.c:209
+msgstr "无法给 %s 发送消息。"
+
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "消息太长。"
 
-#: src/conversation.c:218
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1497
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1499
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:1598
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:1613
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:1669
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s 离开了聊天室(%s)。"
-
-#: src/conversation.c:1671
+#: ../src/conversation.c:1720
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(还有 %d 人)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr "离开了聊天室(%s)。"
-
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: ../src/conversation.c:1723
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s 离开了聊天室(%s)。"
+
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
+msgid "No name"
+msgstr "无名称"
+
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-"读取 %s 出错:\n"
+"读取 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:192
+#: ../src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"写入 %s 出错:\n"
+"写入 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:196
+#: ../src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"访问 %s出错:\n"
+"访问 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:229
+#: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:239
+#: ../src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: src/ft.c:248
+#: ../src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:306
+#: ../src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:313
+#: ../src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: src/ft.c:354
+#: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:358
+#: ../src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1577,65 +2034,65 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:382
+#: ../src/ft.c:391
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 正在发送文件 %s"
 
-#: src/ft.c:422
+#: ../src/ft.c:442
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:443
+#: ../src/ft.c:463
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:454
-#, fuzzy, c-format
+#: ../src/ft.c:474
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "接受来自 %s 的文件传送吗?"
-
-#: src/ft.c:608
+msgstr "开始来自 %2$s 的 %1$s 传送"
+
+#: ../src/ft.c:628
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: src/ft.c:611
+#: ../src/ft.c:631
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: src/ft.c:995
+#: ../src/ft.c:1022
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:1000
+#: ../src/ft.c:1027
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: src/ft.c:1057
+#: ../src/ft.c:1084
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:1062
+#: ../src/ft.c:1089
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: src/ft.c:1119
-#, fuzzy, c-format
+#: ../src/ft.c:1146
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "您中止了给 %s 的文件传送。\n"
-
-#: src/ft.c:1121
-#, fuzzy, c-format
+msgstr "给 %s 传送文件失败。"
+
+#: ../src/ft.c:1148
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "%s 中止了给您的文件传送。\n"
-
-#: src/gtkaccount.c:362
+msgstr "来自 %s 的文件传送失败。"
+
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1647,597 +2104,577 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
 msgid "Protocol:"
-msgstr "协议:"
-
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "用户名:"
-
-#: src/gtkaccount.c:825
+msgstr "协议:"
+
+#: ../src/gtkaccount.c:858
 msgid "Password:"
-msgstr "密码:"
-
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+msgstr "密码:"
+
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4517 ../src/gtkblist.c:4883
 msgid "Alias:"
-msgstr "别名:"
-
-#: src/gtkaccount.c:834
+msgstr "别名:"
+
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:892
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:901
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
-msgstr "好友图标:"
+msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "无代理"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1249
+#: ../src/gtkaccount.c:1297
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1253
+#: ../src/gtkaccount.c:1301
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1269
+#: ../src/gtkaccount.c:1317
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
 msgid "Proxy _type:"
-msgstr "代理类型(_T):"
-
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+msgstr "代理类型(_T):"
+
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
 msgid "_Host:"
-msgstr "主机(_H):"
-
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+msgstr "主机(_H):"
+
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
 msgid "_Port:"
-msgstr "端口(_P):"
-
-#: src/gtkaccount.c:1308
+msgstr "端口(_P):"
+
+#: ../src/gtkaccount.c:1352
 msgid "_Username:"
-msgstr "用户名(_U):"
-
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+msgstr "用户名(_U):"
+
+#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
 msgid "Pa_ssword:"
-msgstr "密码(_S):"
-
-#: src/gtkaccount.c:1700
+msgstr "密码(_S):"
+
+#: ../src/gtkaccount.c:1736
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1702
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3472
 msgid "Modify Account"
 msgstr "修改账户"
 
+#: ../src/gtkaccount.c:1760
+msgid "_Basic"
+msgstr "基本(_B)"
+
+#: ../src/gtkaccount.c:1771
+msgid "_Advanced"
+msgstr "高级(_A)"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:275
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
+#: ../src/protocols/oscar/oscar.c:5252
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2210
-#, fuzzy
-msgid "Enabled"
-msgstr "已失败"
-
-#: src/gtkaccount.c:2218
+#: ../src/gtkaccount.c:2259
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2550
-#, 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:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"您是否想要将他/她添加为您的好友?"
-
-#: src/gtkaccount.c:2572
+#: ../src/gtkaccount.c:2586
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s 已经将 %s 加为好友%s%s"
+
+#: ../src/gtkaccount.c:2635
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4938 ../src/gtkconv.c:1597
+#: ../src/gtkrequest.c:276 ../src/protocols/gg/gg.c:811
+#: ../src/protocols/oscar/oscar.c:4877
+#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:595
+#: ../src/gtkblist.c:669
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:616
+#: ../src/gtkblist.c:690
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:701 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
-msgstr "账户(_A):"
-
-#: src/gtkblist.c:935
+msgstr "账户(_A):"
+
+#: ../src/gtkblist.c:945
 msgid "Get _Info"
-msgstr "获取信息(_I)"
-
-#: src/gtkblist.c:938
+msgstr "资料(_I)"
+
+#: ../src/gtkblist.c:948 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:944
+#: ../src/gtkblist.c:954
 msgid "_Send File"
-msgstr "发送文件(_S)"
-
-#: src/gtkblist.c:950
+msgstr "传送(_S)"
+
+#: ../src/gtkblist.c:961
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: ../src/gtkblist.c:965 ../src/gtkblist.c:969 ../src/gtkblist.c:1068
+#: ../src/gtkblist.c:1091
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "好友别名(_A)..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "删除好友(_R)"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "给联系人起别名..."
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "删除联系人"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: ../src/gtkblist.c:980
+msgid "Alias..."
+msgstr "别名..."
+
+#: ../src/gtkblist.c:983 ../src/gtkconv.c:1594 ../src/gtkrequest.c:277
+msgid "Remove"
+msgstr "删除"
+
+#: ../src/gtkblist.c:989 ../src/gtkblist.c:1076 ../src/gtkblist.c:1097
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: ../src/gtkblist.c:991 ../src/gtkblist.c:1078 ../src/gtkblist.c:1099
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1028
+#: ../src/gtkblist.c:1039
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1030
+#: ../src/gtkblist.c:1041
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1032
+#: ../src/gtkblist.c:1044
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1034
+#: ../src/gtkblist.c:1046
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: ../src/gtkblist.c:1064 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1054
+#: ../src/gtkblist.c:1066
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: ../src/gtkblist.c:1104 ../src/gtkblist.c:1127
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1120
+#: ../src/gtkblist.c:1132
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-#, fuzzy
+#: ../src/gtkblist.c:1378 ../src/gtkblist.c:1390 ../src/gtkblist.c:3732
+#: ../src/gtkblist.c:3742
 msgid "/Tools/Mute Sounds"
-msgstr "静音"
-
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+msgstr "/工具(T)/静音(S)"
+
+#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4197 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: ../src/gtkblist.c:2427
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2330
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2331
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2332
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2333
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2335
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2336
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/好友(B)/显示离线好友(O)"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "/好友(B)/显示离线好友(O)"
-
-#: src/gtkblist.c:2340
+msgstr "/好友(B)/显示好友详细资料(_D)"
+
+#: ../src/gtkblist.c:2436
+msgid "/Buddies/Show Idle _Times"
+msgstr "/好友(B)/显示发呆时间(_T)"
+
+#: ../src/gtkblist.c:2437
+msgid "/Buddies/_Sort Buddies"
+msgstr "/好友(B)/好友排序(_S)"
+
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2341
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2342
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2344
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
+#. Accounts menu
+#: ../src/gtkblist.c:2446
+msgid "/_Accounts"
+msgstr "/账户(_A)"
+
+#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5517
+msgid "/Accounts/Add\\/Edit"
+msgstr "/账户(A)/添加\\/编辑"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: ../src/gtkblist.c:2450
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
+#: ../src/gtkblist.c:2451
+msgid "/Tools/Buddy _Pounces"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/工具(T)/账户操作(_T)"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/工具(T)/账户(_C)"
-
-#: src/gtkblist.c:2352
+#: ../src/gtkblist.c:2452
+msgid "/Tools/Plu_gins"
+msgstr "/工具(T)/插件(_G)"
+
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/工具(T)/插件操作(U)"
-
-#: src/gtkblist.c:2354
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2355
+#: ../src/gtkblist.c:2456
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2356
+#: ../src/gtkblist.c:2457
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2358
-#, fuzzy
+#: ../src/gtkblist.c:2458
+msgid "/Tools/System _Log"
+msgstr "/工具(T)/系统日志(_L)"
+
+#: ../src/gtkblist.c:2460
 msgid "/Tools/Mute _Sounds"
-msgstr "静音"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/工具(T)/查看系统日志(_L)"
+msgstr "/工具(T)/静音(_S)"
 
 #. Help
-#: src/gtkblist.c:2362
+#: ../src/gtkblist.c:2463
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2363
+#: ../src/gtkblist.c:2464
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2364
+#: ../src/gtkblist.c:2465
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2365
+#: ../src/gtkblist.c:2466
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: ../src/gtkblist.c:2498 ../src/gtkblist.c:2567
 #, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr ""
 "\n"
-"<b>账户:</b>%s"
-
-#: src/gtkblist.c:2473
-#, fuzzy, c-format
+"<b>账户:</b>%s"
+
+#: ../src/gtkblist.c:2579
+#, c-format
 msgid ""
 "\n"
-"<b>Contact Alias:</b> %s"
+"<b>Buddy Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>联系人别名:</b>"
-
-#: src/gtkblist.c:2481
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>别名:</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
+"<b>好友别名:</b>%s"
+
+#: ../src/gtkblist.c:2591
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
 msgstr ""
 "\n"
-"<b>昵称:</b>"
-
-#: src/gtkblist.c:2498
-#, fuzzy, c-format
+"<b>昵称:</b>%s"
+
+#: ../src/gtkblist.c:2600
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
 msgstr ""
 "\n"
-"<b>登入:</b>"
-
-#: src/gtkblist.c:2510
-#, fuzzy, c-format
+"<b>登入:</b>%s"
+
+#: ../src/gtkblist.c:2611
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>瞌睡:</b>"
-
-#: src/gtkblist.c:2546
-#, fuzzy, c-format
+"<b>发呆:</b>%s"
+
+#: ../src/gtkblist.c:2646
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
-
-#: src/gtkblist.c:2554
+"<b>上次看见:</b>%s前"
+
+#: ../src/gtkblist.c:2655
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
 msgstr ""
 "\n"
-"<b>状态:</b> 离线"
-
-#: src/gtkblist.c:2577
+"<b>状态:</b>离线"
+
+#: ../src/gtkblist.c:2666
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 "\n"
-"<b>描述:</b>健谈"
-
-#: src/gtkblist.c:2579
-#, fuzzy
+"<b>描述:</b>健谈"
+
+#: ../src/gtkblist.c:2668
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>状态</b>: 可怕"
-
-#: src/gtkblist.c:2581
-#, fuzzy
+"<b>状态:</b>可怕"
+
+#: ../src/gtkblist.c:2670
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>状态</b>: 混乱"
-
-#: src/gtkblist.c:2843
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "瞌睡中 (%d小时%02d分) "
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "瞌睡中 (%d分) "
-
-#: src/gtkblist.c:2848
-#, fuzzy
-msgid "Idle "
-msgstr "瞌睡"
-
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "离线 "
-
-#: src/gtkblist.c:2968
-#, fuzzy
+"<b>状态:</b>混乱"
+
+#: ../src/gtkblist.c:2959
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "发呆中 (%d小时%02d分) "
+
+#: ../src/gtkblist.c:2961
+#, c-format
+msgid "Idle %dm"
+msgstr "发呆 %d分"
+
+#. Idle stuff
+#: ../src/gtkblist.c:2964 ../src/gtkprefs.c:1745
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
+#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/protocols/yahoo/yahoo_profile.c:691
+msgid "Idle"
+msgstr "发呆"
+
+#: ../src/gtkblist.c:3096
 msgid "/Buddies/New Instant Message..."
-msgstr "/好友(B)/新即时消息(_M)..."
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+msgstr "/好友(B)/新即时消息..."
+
+#: ../src/gtkblist.c:3097 ../src/gtkblist.c:3130
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:2970
-#, fuzzy
+#: ../src/gtkblist.c:3098
 msgid "/Buddies/Get User Info..."
-msgstr "/好友(B)/获取用户信息(_I)..."
-
-#: src/gtkblist.c:2971
-#, fuzzy
+msgstr "/好友(B)/获取用户信息..."
+
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Add Buddy..."
-msgstr "/好友(B)/添加好友(_A)..."
-
-#: src/gtkblist.c:2972
-#, fuzzy
+msgstr "/好友(B)/添加好友..."
+
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Add Chat..."
-msgstr "/好友(B)/添加聊天(_H)..."
-
-#: src/gtkblist.c:2973
-#, fuzzy
+msgstr "/好友(B)/添加聊天..."
+
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Add Group..."
-msgstr "/好友(B)/添加组(_G)..."
-
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/工具(T)/房间列表(O)"
-
-#: src/gtkblist.c:3009
+msgstr "/好友(B)/添加组..."
+
+#: ../src/gtkblist.c:3136
+msgid "/Tools/Buddy Pounces"
+msgstr "/工具(T)/好友千里眼(P)"
+
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: ../src/gtkblist.c:3142
+msgid "/Tools/Room List"
+msgstr "/工具(T)/房间列表(O)"
+
+#: ../src/gtkblist.c:3336
 msgid "Manually"
 msgstr "手动"
 
-#: src/gtkblist.c:3087
-#, fuzzy
+#: ../src/gtkblist.c:3338
 msgid "Alphabetically"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3088
+#: ../src/gtkblist.c:3339
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3089
+#: ../src/gtkblist.c:3340
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/工具(T)/好友千里眼(P)"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/工具(T)/账户操作(T)"
+#: ../src/gtkblist.c:3457 ../src/gtkconn.c:196
+#, c-format
+msgid "%s disconnected"
+msgstr "%s 已断开连接"
+
+#: ../src/gtkblist.c:3473 ../src/protocols/sametime/sametime.c:3630
+msgid "Connect"
+msgstr "连接"
+
+#: ../src/gtkblist.c:3473 ../src/gtkblist.c:5616
+msgid "Enable Account"
+msgstr "启用账户"
+
+#: ../src/gtkblist.c:3494
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s 已经断开连接:%s</span>"
+
+#: ../src/gtkblist.c:3621
+msgid "/Accounts"
+msgstr "/账户(A)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: ../src/gtkblist.c:3726
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3324
+#: ../src/gtkblist.c:3729
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: ../src/gtkblist.c:3735
 msgid "/Buddies/Show Buddy Details"
-msgstr "/好友(B)/显示离线好友(O)"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/好友(B)/显示好友详细资料(D)"
+
+#: ../src/gtkblist.c:3738
+msgid "/Buddies/Show Idle Times"
+msgstr "/好友(B)/显示发呆时间(T)"
+
+#: ../src/gtkblist.c:4450 ../src/protocols/silc/buddy.c:736
+#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:4029
+#: ../src/gtkblist.c:4474
 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. "
@@ -2246,74 +2683,81 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
+#: ../src/gtkblist.c:4496
+msgid "Screen Name:"
+msgstr "用户名:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: ../src/gtkblist.c:4544 ../src/gtkblist.c:4863
 msgid "Account:"
-msgstr "账户:"
-
-#: src/gtkblist.c:4357
+msgstr "账户:"
+
+#: ../src/gtkblist.c:4796
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4373
+#: ../src/gtkblist.c:4812
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4390
+#: ../src/gtkblist.c:4829
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4414
+#: ../src/gtkblist.c:4853
 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:4493
+#: ../src/gtkblist.c:4935 ../src/protocols/sametime/sametime.c:5319
+#: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4494
+#: ../src/gtkblist.c:4936
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:5025
+#: ../src/gtkblist.c:5557
+msgid "_Edit Account"
+msgstr "编辑账户(_E)"
+
+#: ../src/gtkblist.c:5590 ../src/gtkblist.c:5596
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: ../src/gtkblist.c:5604
+msgid "_Disable"
+msgstr "禁用(_D)"
+
+#: ../src/gtkblist.c:5669
 msgid "/Tools"
-msgstr "/工具(_T)"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "已断开连接。"
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and reenable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "我正在使用 Gaim v%s。"
-
-#: src/gtkconv.c:334
+msgstr "/工具(T)"
+
+#: ../src/gtkblist.c:5755
+msgid "/Buddies/Sort Buddies"
+msgstr "/好友(B)/好友排序(S)"
+
+#: ../src/gtkconn.c:197
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and reenable the account."
+msgstr ""
+
+#: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:371
+#: ../src/gtkconv.c:409
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:374
+#: ../src/gtkconv.c:412
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2321,761 +2765,792 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:446
+#: ../src/gtkconv.c:484
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: src/gtkconv.c:453
+#: ../src/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: src/gtkconv.c:458
+#: ../src/gtkconv.c:496
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:465
-#, fuzzy
+#: ../src/gtkconv.c:503
 msgid "That command only works in chats, not IMs."
-msgstr "命令只在聊天中可用,对话中无效。"
-
-#: src/gtkconv.c:468
-#, fuzzy
+msgstr "该命令只在聊天中可用,对话中无效。"
+
+#: ../src/gtkconv.c:506
 msgid "That command only works in IMs, not chats."
-msgstr "命令只在对话中可用,聊天中无效。"
-
-#: src/gtkconv.c:472
+msgstr "该命令只在对话中可用,聊天中无效。"
+
+#: ../src/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
+#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "该好友不在此聊天的协议中"
-
-#: src/gtkconv.c:719
+msgstr "该好友不在此聊天的协议中。"
+
+#: ../src/gtkconv.c:764
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: src/gtkconv.c:772
+#: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: ../src/gtkconv.c:847
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:823
+#: ../src/gtkconv.c:868
 msgid "_Buddy:"
-msgstr "好友(_B):"
-
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+msgstr "好友(_B):"
+
+#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
+#: ../src/gtksavedstatuses.c:1444
 msgid "_Message:"
-msgstr "消息(_M):"
-
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+msgstr "消息(_M):"
+
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2380 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:906
+#: ../src/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:930
+#: ../src/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
 msgid "_Search for:"
-msgstr "搜索文字(_S):"
-
-#: src/gtkconv.c:1227
+msgstr "搜索文字(_S):"
+
+#: ../src/gtkconv.c:1293
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: src/gtkconv.c:1235
+msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
+
+#: ../src/gtkconv.c:1301
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: src/gtkconv.c:1489
+msgstr "记录已停止。此会话中的后续消息将不会被记录。"
+
+#: ../src/gtkconv.c:1559
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1502
+#: ../src/gtkconv.c:1572
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1505
+#: ../src/gtkconv.c:1575
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gtkconv.c:1511
+#: ../src/gtkconv.c:1581
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1517
-#, fuzzy
+#: ../src/gtkconv.c:1587
 msgid "Get Away Message"
-msgstr "新建离开消息"
-
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "删除"
-
-#: src/gtkconv.c:2236
+msgstr "获得离开消息"
+
+#: ../src/gtkconv.c:1602
+msgid "Last said"
+msgstr "上次说道"
+
+#: ../src/gtkconv.c:2388
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2259
+#: ../src/gtkconv.c:2412
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2308
+#: ../src/gtkconv.c:2461
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2313
+#: ../src/gtkconv.c:2466
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2319
+#: ../src/gtkconv.c:2472
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: ../src/gtkconv.c:2613
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2369
+#: ../src/gtkconv.c:2615
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:2374
+#: ../src/gtkconv.c:2620
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:2376
+#: ../src/gtkconv.c:2622
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:2377
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/对话(C)/清除"
-
-#: src/gtkconv.c:2383
+#: ../src/gtkconv.c:2625
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/对话(C)/清除回滚(_R)"
+
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:2384
+#: ../src/gtkconv.c:2630
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:2386
+#: ../src/gtkconv.c:2632
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:2388
+#: ../src/gtkconv.c:2634
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:2393
+#: ../src/gtkconv.c:2639
 msgid "/Conversation/Al_ias..."
-msgstr "/对话(C)/别名(I)..."
-
-#: src/gtkconv.c:2395
+msgstr "/对话(C)/别名(_L)..."
+
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:2397
+#: ../src/gtkconv.c:2643
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:2399
+#: ../src/gtkconv.c:2645
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:2404
+#: ../src/gtkconv.c:2650
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:2406
+#: ../src/gtkconv.c:2652
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:2411
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2415
+#: ../src/gtkconv.c:2661
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2416
+#: ../src/gtkconv.c:2662
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2417
+#: ../src/gtkconv.c:2663
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2418
-#, fuzzy
+#: ../src/gtkconv.c:2664
+msgid "/Options/Show Buddy _Icon"
+msgstr "/选项(O)/显示好友图标(_I)"
+
+#: ../src/gtkconv.c:2666
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:2419
+#: ../src/gtkconv.c:2667
 msgid "/Options/Show Ti_mestamps"
-msgstr "/选项(O)/显示时间戳(_M)"
-
-#: src/gtkconv.c:2420
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "显示好友图标(_I)"
-
-#: src/gtkconv.c:2460
+msgstr "/选项(O)/显示时间戳(_I)"
+
+#: ../src/gtkconv.c:2759
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:2466
+#: ../src/gtkconv.c:2765
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:2470
+#: ../src/gtkconv.c:2769
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:2476
+#: ../src/gtkconv.c:2775
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:2480
+#: ../src/gtkconv.c:2779
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:2486
+#: ../src/gtkconv.c:2785
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:2490
+#: ../src/gtkconv.c:2789
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:2494
+#: ../src/gtkconv.c:2793
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:2498
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:2504
+#: ../src/gtkconv.c:2803
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:2508
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2514
+#: ../src/gtkconv.c:2813
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2517
+#: ../src/gtkconv.c:2816
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:2520
-#, fuzzy
+#: ../src/gtkconv.c:2829
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:2523
+#: ../src/gtkconv.c:2832
 msgid "/Options/Show Timestamps"
-msgstr "/选项/显示时间戳(I)"
-
-#: src/gtkconv.c:2526
-#, fuzzy
+msgstr "/选项(O)/显示时间戳(I)"
+
+#: ../src/gtkconv.c:2835
 msgid "/Options/Show Buddy Icon"
-msgstr "显示好友图标(_I)"
-
-#: src/gtkconv.c:2597
+msgstr "/选项(O)/显示好友图标(I)"
+
+#: ../src/gtkconv.c:2915
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: ../src/gtkconv.c:2918
+msgid "User has typed something and stopped"
 msgstr "用户打了几个字,停了一下"
 
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#. Build the Send To menu
+#: ../src/gtkconv.c:3101
 msgid "_Send To"
-msgstr "发送身份(_S)"
-
-#: src/gtkconv.c:3373
+msgstr "发送到(_S)"
+
+#: ../src/gtkconv.c:3753
+msgid "_Send"
+msgstr "发送(_S)"
+
+#: ../src/gtkconv.c:3808 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
-msgstr "话题:"
+msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: ../src/gtkconv.c:3860
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3500
+#: ../src/gtkconv.c:3939
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3513
+#: ../src/gtkconv.c:3952
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3525
+#: ../src/gtkconv.c:3964
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: ../src/gtkconv.c:4938 ../src/gtkconv.c:5047
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5582
+#: ../src/gtkconv.c:6520
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:5585
+#: ../src/gtkconv.c:6523
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:5588
+#: ../src/gtkconv.c:6526
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:5591
+#: ../src/gtkconv.c:6529
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: 清除对话回滚。"
 
-#: src/gtkconv.c:5594
+#: ../src/gtkconv.c:6532
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkconv.c:5709
-#, fuzzy
+#: ../src/gtkconv.c:6691
 msgid "Confirm close"
-msgstr "确认账户"
-
-#: src/gtkconv.c:5741
-#, fuzzy
+msgstr "确认关闭"
+
+#: ../src/gtkconv.c:6723
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "您真的想要删除 %s 吗?"
-
-#: src/gtkconv.c:6408
+msgstr "您有未读取的消息。您确定真的想要关闭窗口吗?"
+
+#: ../src/gtkconv.c:7245
+msgid "Close other tabs"
+msgstr "关闭其它标签"
+
+#: ../src/gtkconv.c:7251
+msgid "Close all tabs"
+msgstr "关闭全部标签"
+
+#: ../src/gtkconv.c:7259
+msgid "Detach this tab"
+msgstr "此标签漂移"
+
+#: ../src/gtkconv.c:7265
+msgid "Close this tab"
+msgstr "关闭此标签"
+
+#: ../src/gtkconv.c:7527
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:6872
+#: ../src/gtkconv.c:7991
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/gtkconv.c:6874
+#: ../src/gtkconv.c:7993
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: ../src/gtkconv.c:7995 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/gtkconv.c:6878
+#: ../src/gtkconv.c:7997
 msgid "By group"
 msgstr "按组"
 
-#: src/gtkconv.c:6880
+#: ../src/gtkconv.c:7999
 msgid "By account"
 msgstr "按账户"
 
-#: src/gtkdebug.c:232
+#: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:586
-#, fuzzy
+#: ../src/gtkdebug.c:586
 msgid "Invert"
-msgstr "插入(_I)"
-
-#: src/gtkdebug.c:589
+msgstr "反转"
+
+#: ../src/gtkdebug.c:589
 msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:636
+msgstr "突出显示匹配项"
+
+#: ../src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:689
-#, fuzzy
+#: ../src/gtkdebug.c:689
 msgid "Clear"
-msgstr "关闭"
-
-#: src/gtkdebug.c:698
+msgstr "清除"
+
+#: ../src/gtkdebug.c:698
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkdebug.c:724
-#, fuzzy
+#: ../src/gtkdebug.c:724
 msgid "Filter"
-msgstr "已失败"
-
-#: src/gtkdebug.c:743
-#, fuzzy
+msgstr "过滤"
+
+#: ../src/gtkdebug.c:743
 msgid "Right click for more options."
-msgstr "显示全部选项"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "用右键单击可查看更多选项。"
+
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
+#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
+#: ../src/gtkdialogs.c:74
 msgid "developer"
 msgstr "开发者"
 
-#: src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:64
+msgid "win32 port"
+msgstr "Win32 移植"
+
+#: ../src/gtkdialogs.c:66
 msgid "developer & webmaster"
 msgstr "开发者和网管"
 
-#: src/gtkdialogs.c:62
-msgid "win32 port"
-msgstr "Win32 移植"
-
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:72
 msgid "support"
 msgstr "支持"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
 msgid "maintainer"
 msgstr "维护者"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
+#: ../src/gtkdialogs.c:96
 msgid "libfaim maintainer"
-msgstr "先前 libfaim 维护者"
-
-#: src/gtkdialogs.c:92
-#, fuzzy
-msgid "Jabber developer"
-msgstr "先前 Jabber 开发者"
-
-#: src/gtkdialogs.c:93
-msgid "original author"
-msgstr "原作者"
-
-#: src/gtkdialogs.c:94
+msgstr "libfaim 维护者"
+
+#: ../src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:98
+msgid "Jabber developer"
+msgstr "Jabber 开发者"
+
+#: ../src/gtkdialogs.c:99
+msgid "original author"
+msgstr "原作者"
+
+#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/gtkdialogs.c:101
+#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+msgid "Bengali"
+msgstr ""
+
+#: ../src/gtkdialogs.c:110
 #, fuzzy
 msgid "Bosnian"
-msgstr "爱沙尼亚语"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "罗马尼亚语"
+
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:113
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
 msgid "German"
 msgstr "德语"
 
-#: src/gtkdialogs.c:106
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+msgid "Greek"
+msgstr "希腊语"
+
+#: ../src/gtkdialogs.c:117
 msgid "Australian English"
 msgstr "澳大利亚英语"
 
-#: src/gtkdialogs.c:107
+#: ../src/gtkdialogs.c:118
+msgid "Canadian English"
+msgstr "加拿大英语"
+
+#: ../src/gtkdialogs.c:119
 msgid "British English"
 msgstr "英国英语"
 
-#: src/gtkdialogs.c:108
-msgid "Canadian English"
-msgstr "加拿大英语"
-
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+#, fuzzy
+msgid "Persian"
+msgstr "塞尔维亚语"
+
+#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "French"
 msgstr "法语"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:125
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:126
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:127
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:178
 msgid "Japanese"
 msgstr "日语"
 
-#: src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
+#, fuzzy
+msgid "Georgian"
+msgstr "德语"
+
+#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
+msgid "Korean"
+msgstr "朝鲜语"
+
+#: ../src/gtkdialogs.c:132
+#, fuzzy
+msgid "Kurdish"
+msgstr "土耳其语"
+
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/gtkdialogs.c:118
-msgid "Georgian"
-msgstr "格鲁吉亚语"
-
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
-msgid "Korean"
-msgstr "朝鲜语"
-
-#: src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:134
+msgid "Macedonian"
+msgstr "马其顿语"
+
+#: ../src/gtkdialogs.c:135
 #, fuzzy
 msgid "Dutch, Flemish"
 msgstr "荷兰语"
 
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "马其顿语"
-
-#: src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:136
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:139
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:140
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:141
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
 msgid "Russian"
 msgstr "俄语"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:145
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:147
+msgid "Tamil"
+msgstr ""
+
+#: ../src/gtkdialogs.c:148
 msgid "Telugu"
 msgstr ""
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:149
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: ../src/gtkdialogs.c:150
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:150
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:159
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:186
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/gtkdialogs.c:202
+#: ../src/gtkdialogs.c:230
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:226
-#, fuzzy
+#: ../src/gtkdialogs.c:254
 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 GNU GPL.<BR><BR>"
-msgstr ""
-"Gaim 是模块化的即时通讯客户程序,同时支持 AIM、MSN、Yahoo!、Jabber、ICQ、"
-"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
-"成,并以 GPL 许可协议发行。<BR><BR>"
-
-#: src/gtkdialogs.c:235
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+"file for the complete list of contributors.  We provide no warranty for this "
+"program.<BR><BR>"
+msgstr ""
+
+#: ../src/gtkdialogs.c:268
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: ../src/gtkdialogs.c:271
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
+#: ../src/gtkdialogs.c:277
+msgid "Current Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:259
+#: ../src/gtkdialogs.c:292
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:307
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:322
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:309
+#: ../src/gtkdialogs.c:342
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:327
-#, fuzzy
+#: ../src/gtkdialogs.c:360
 msgid "Debugging Information"
-msgstr "用户信息"
-
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
+msgstr "调试信息"
+
+#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:766
 msgid "_Name"
-msgstr "名称"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+msgstr "名称(_N)"
+
+#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:771
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/gtkdialogs.c:502
+#: ../src/gtkdialogs.c:579
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/gtkdialogs.c:504
-#, fuzzy
+#: ../src/gtkdialogs.c:581
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "您想要跟谁聊?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:643
+msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
+
+#: ../src/gtkdialogs.c:716
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:645
-#, fuzzy
+#: ../src/gtkdialogs.c:718
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
-msgstr "您想要查看谁的信息?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:699
-#, fuzzy
+msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
+
+#: ../src/gtkdialogs.c:780
 msgid "View User Log"
-msgstr "获取用户日志"
-
-#: src/gtkdialogs.c:701
-#, fuzzy
+msgstr "查看用户日志"
+
+#: ../src/gtkdialogs.c:782
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
-msgstr "您想要查看谁的日志?请输入他/她的用户名。"
-
-#: src/gtkdialogs.c:720
+msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
+
+#: ../src/gtkdialogs.c:801
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:721
+#: ../src/gtkdialogs.c:802
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:804 ../src/gtkdialogs.c:826 ../src/gtkdialogs.c:846
+#: ../src/gtkrequest.c:279 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:822
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:743
+#: ../src/gtkdialogs.c:824
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:843
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:763
+#: ../src/gtkdialogs.c:844
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:800
-#, fuzzy, c-format
+#: ../src/gtkdialogs.c:881
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -3086,198 +3561,223 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:867
+#: ../src/gtkdialogs.c:889
+msgid "Remove Contact"
+msgstr "删除联系人"
+
+#: ../src/gtkdialogs.c:890
+msgid "_Remove Contact"
+msgstr "删除联系人(_R)"
+
+#: ../src/gtkdialogs.c:941
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: ../src/gtkdialogs.c:944
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:909
+#: ../src/gtkdialogs.c:945
+msgid "_Remove Group"
+msgstr "删除组(_R)"
+
+#: ../src/gtkdialogs.c:978
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: ../src/gtkdialogs.c:981
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:951
+#: ../src/gtkdialogs.c:982
+msgid "_Remove Buddy"
+msgstr "删除好友(_R)"
+
+#: ../src/gtkdialogs.c:1003
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: ../src/gtkdialogs.c:1006
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/gtkft.c:138
+#: ../src/gtkdialogs.c:1007
+msgid "_Remove Chat"
+msgstr "删除聊天(_R)"
+
+#: ../src/gtkft.c:139
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: ../src/gtkft.c:160 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: ../src/gtkft.c:163 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: ../src/gtkft.c:166 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
-#: src/gtkft.c:218
+#: ../src/gtkft.c:219
 msgid "<b>Receiving As:</b>"
-msgstr "<b>接收为:</b>"
-
-#: src/gtkft.c:220
+msgstr "<b>接收为:</b>"
+
+#: ../src/gtkft.c:221
 msgid "<b>Receiving From:</b>"
-msgstr "<b>发送方:</b>"
-
-#: src/gtkft.c:224
+msgstr "<b>发送方:</b>"
+
+#: ../src/gtkft.c:225
 msgid "<b>Sending To:</b>"
-msgstr "<b>接收方:</b>"
-
-#: src/gtkft.c:226
+msgstr "<b>接收方:</b>"
+
+#: ../src/gtkft.c:227
 msgid "<b>Sending As:</b>"
-msgstr "<b>发送为:</b>"
-
-#: src/gtkft.c:442
+msgstr "<b>发送为:</b>"
+
+#: ../src/gtkft.c:443
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:447
+#: ../src/gtkft.c:448
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
-#: src/gtkft.c:467
-#, fuzzy, c-format
+#: ../src/gtkft.c:485
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "调用 <b>%s</b> 出错: %s"
-
-#: src/gtkft.c:476
-#, fuzzy, c-format
+msgstr "调用 %s 出错:%s"
+
+#: ../src/gtkft.c:494
+#, c-format
 msgid "Error running %s"
-msgstr "加入聊天 %s 出错"
-
-#: src/gtkft.c:477
+msgstr "运行 %s 出错"
+
+#: ../src/gtkft.c:495
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+msgstr "进程返回了错误代码 %d"
+
+#: ../src/gtkft.c:589
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:579
+#: ../src/gtkft.c:596
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:586
+#: ../src/gtkft.c:603
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:593
+#: ../src/gtkft.c:610
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:624
+#: ../src/gtkft.c:641
 msgid "Filename:"
-msgstr "文件名:"
-
-#: src/gtkft.c:625
+msgstr "文件名:"
+
+#: ../src/gtkft.c:642
 msgid "Local File:"
-msgstr "本地文件:"
-
-#: src/gtkft.c:626
+msgstr "本地文件:"
+
+#: ../src/gtkft.c:643
 msgid "Status:"
-msgstr "状态:"
-
-#: src/gtkft.c:627
+msgstr "状态:"
+
+#: ../src/gtkft.c:644
 msgid "Speed:"
-msgstr "速度:"
-
-#: src/gtkft.c:628
+msgstr "速度:"
+
+#: ../src/gtkft.c:645
 msgid "Time Elapsed:"
-msgstr "已过时间:"
-
-#: src/gtkft.c:629
+msgstr "已过时间:"
+
+#: ../src/gtkft.c:646
 msgid "Time Remaining:"
-msgstr "剩余时间:"
-
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "保持对话框打开(_K)"
-
-#: src/gtkft.c:725
-#, fuzzy
+msgstr "剩余时间:"
+
+#: ../src/gtkft.c:708
+msgid "File Transfers"
+msgstr "文件传送"
+
+#: ../src/gtkft.c:731
+msgid "Close this window when all transfers _finish"
+msgstr "全部传送完成时关闭此窗口(_F)"
+
+#: ../src/gtkft.c:741
 msgid "C_lear finished transfers"
-msgstr "清除未完成的传送(_C)"
+msgstr "清除未完成的传送(_L)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: ../src/gtkft.c:750
 msgid "File transfer _details"
-msgstr "隐藏下载细节"
+msgstr "文件传送细节(_D)"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: ../src/gtkft.c:780 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:774
+#: ../src/gtkft.c:790
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:988
+#: ../src/gtkft.c:1005
 msgid "Failed"
 msgstr "已失败"
 
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "粘贴为文本(_S)"
-
-#: src/gtkimhtml.c:1313
+#: ../src/gtkimhtml.c:821
+msgid "Paste as Plain _Text"
+msgstr "粘贴为纯文本(_T)"
+
+#. XXX: make this new with mnemonic, and HIG-happy after string thaw
+#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
+msgid "Clear formatting"
+msgstr "清除格式"
+
+#: ../src/gtkimhtml.c:1328
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1314
+#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1317
-#, fuzzy
+#: ../src/gtkimhtml.c:1332
 msgid "Hyperlink prelight color"
-msgstr "超级链接颜色"
-
-#: src/gtkimhtml.c:1318
-#, fuzzy
+msgstr "超级链接悬停颜色"
+
+#: ../src/gtkimhtml.c:1333
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "绘制超级链接的颜色。"
-
-#: src/gtkimhtml.c:1537
+msgstr "绘制超级链接悬停时的颜色。"
+
+#: ../src/gtkimhtml.c:1554
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1549
+#: ../src/gtkimhtml.c:1566
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1559
+#: ../src/gtkimhtml.c:1576
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:3234
+#: ../src/gtkimhtml.c:3273
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3287,7 +3787,7 @@
 "\n"
 "默认为 PNG。"
 
-#: src/gtkimhtml.c:3237
+#: ../src/gtkimhtml.c:3276
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3297,7 +3797,7 @@
 "\n"
 "默认为 PNG。"
 
-#: src/gtkimhtml.c:3250
+#: ../src/gtkimhtml.c:3289
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3308,7 +3808,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: ../src/gtkimhtml.c:3292
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3319,175 +3819,173 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:3373
+#: ../src/gtkimhtml.c:3412
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "存储图像失败: %s\n"
-
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+msgstr "存储图像失败:%s\n"
+
+#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:916
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:927
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:938
+#: ../src/gtkimhtmltoolbar.c:945
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:966
+#: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:983
+#: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:995
+#: ../src/gtkimhtmltoolbar.c:1002
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:1007
+#: ../src/gtkimhtmltoolbar.c:1014
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
-msgid "Clear formatting"
-msgstr "清除格式(_C)"
-
-#: src/gtkimhtmltoolbar.c:1038
+#: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:1048
+#: ../src/gtkimhtmltoolbar.c:1055
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:1059
+#: ../src/gtkimhtmltoolbar.c:1066
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "与 %s 的对话"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "与 %s 的对话"
-
-#: src/gtklog.c:309
+#: ../src/gtklog.c:188
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>于 %2$s 在 %1$s 的对话</span>"
+
+#: ../src/gtklog.c:193
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>在 %2$s 与 %1$s 的对话</span>"
+
+#: ../src/gtklog.c:242
+msgid "%B %Y"
+msgstr ""
+
+#: ../src/gtklog.c:295
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:313
+msgstr "仅当启用了“将全部状态更改记录到系统日志”首选项时才会记录系统日志。"
+
+#: ../src/gtklog.c:299
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
+msgstr "仅当启用了“记录全部即时消息”时才会记录即时消息。"
+
+#: ../src/gtklog.c:302
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "仅当启用了“记录所有聊天”首选项时才会记录聊天。"
+
+#: ../src/gtklog.c:306
 msgid "No logs were found"
-msgstr ""
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "未找到日志。"
+
+#: ../src/gtklog.c:382
 msgid "Total log size:"
-msgstr "按日志大小"
-
-#: src/gtklog.c:472
-#, fuzzy, c-format
+msgstr "总计日志大小:"
+
+#: ../src/gtklog.c:458
+#, c-format
 msgid "Conversations in %s"
 msgstr "与 %s 的对话"
 
-#: src/gtklog.c:480 src/gtklog.c:531
+#: ../src/gtklog.c:466 ../src/gtklog.c:517
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/gtklog.c:556
+#: ../src/gtklog.c:542
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/gtkmain.c:326
+#: ../src/gtkmain.c:308
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/gtkmain.c:328
+#: ../src/gtkmain.c:310
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3501,45 +3999,66 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
-msgid "Default"
-msgstr "GNOME 默认"
-
-#. Descriptive label
-#: src/gtknotify.c:275
+"Gaim %s\n"
+"用法: %s [选项]...\n"
+"\n"
+"  -c, --config=目录   使用“目录”存储配置文件\n"
+"  -d, --debug         将调试信息打印到标准输出\n"
+"  -h, --help          显示帮助并退出\n"
+"  -n, --nologin       不自动登入\n"
+"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
+"  -v, --version       显示当前版本并退出\n"
+
+#: ../src/gtkmain.c:493
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+
+#: ../src/gtknotify.c:327
+msgid "New Mail"
+msgstr "新邮件"
+
+#: ../src/gtknotify.c:343
+msgid "Open All Messages"
+msgstr "打开全部消息"
+
+#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1114
+msgid "From"
+msgstr "来自"
+
+#: ../src/gtknotify.c:418
+msgid "Subject"
+msgstr "主题"
+
+#: ../src/gtknotify.c:427
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
+
+#: ../src/gtknotify.c:493
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">来自:</span> %s\n"
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">主题:</span> %s\n"
-
-#: src/gtknotify.c:303
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
+#: ../src/gtknotify.c:498
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3550,397 +4069,476 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: src/gtknotify.c:687
+#: ../src/gtknotify.c:882
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "浏览器命令 <b>%s</b> 无效。"
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "调用 <b>%s</b> 出错: %s"
 
-#: src/gtknotify.c:839
+#: ../src/gtknotify.c:1035
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtkpounce.c:130
+#: ../src/gtkplugin.c:274
+msgid "The following plugins will be unloaded."
+msgstr "下列插件将会被卸载。"
+
+#: ../src/gtkplugin.c:293
+msgid "Multiple plugins will be unloaded."
+msgstr "多个插件将会被卸载。"
+
+#: ../src/gtkplugin.c:295
+msgid "Unload Plugins"
+msgstr "卸载插件"
+
+#: ../src/gtkplugin.c:407
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s %s<span weight=\"bold\">编写者:</span>\t%s\n"
+"<span weight=\"bold\">网站:</span>\t\t%s\n"
+"<span weight=\"bold\">文件名:</span>\t%s"
+
+#: ../src/gtkplugin.c:417
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+#: ../src/gtkplugin.c:543
+msgid "Configure Pl_ugin"
+msgstr "配置插件(_U)"
+
+#: ../src/gtkplugin.c:601
+msgid "<b>Plugin Details</b>"
+msgstr "<b>插件细节</b>"
+
+#: ../src/gtkpounce.c:162
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:259
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:503
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:503
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
+#. Create the "Pounce on Whom" frame.
+#: ../src/gtkpounce.c:520
+msgid "Pounce on Whom"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:435
+#: ../src/gtkpounce.c:547
 msgid "_Buddy name:"
-msgstr "好友名称(_B):"
-
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "监视的事件"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
+msgstr "好友名称(_B):"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../src/gtkpounce.c:573
+msgid "Pounce When Buddy..."
+msgstr "监视好友的行动..."
+
+#: ../src/gtkpounce.c:581
+msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "登出(_O)"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
+#: ../src/gtkpounce.c:583
+msgid "Signs o_ff"
+msgstr "登出(_F)"
+
+#: ../src/gtkpounce.c:585
+msgid "Goes a_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "回来(_R)"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "瞌睡(_I)"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "睡醒了(_N)"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "好友开始打字(_T)"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "好友停止打字(_Y)"
-
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "采取操作"
-
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
-msgstr "打开即时消息窗口(_E)"
-
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#: ../src/gtkpounce.c:587
+msgid "Ret_urns from away"
+msgstr "回来(_U)"
+
+#: ../src/gtkpounce.c:589
+msgid "Becomes _idle"
+msgstr "发起了呆(_I)"
+
+#: ../src/gtkpounce.c:591
+msgid "Is no longer i_dle"
+msgstr "发完了呆(_D)"
+
+#: ../src/gtkpounce.c:593
+msgid "Starts _typing"
+msgstr "开始打字(_T)"
+
+#: ../src/gtkpounce.c:595
+msgid "Stops t_yping"
+msgstr "停止打字(_Y)"
+
+#: ../src/gtkpounce.c:597
+msgid "Sends a _message"
+msgstr "发送消息(_M)"
+
+#. Create the "Action" frame.
+#: ../src/gtkpounce.c:629
+msgid "Action"
+msgstr "动作"
+
+#: ../src/gtkpounce.c:637
+msgid "Ope_n an IM window"
+msgstr "打开即时消息窗口(_N)"
+
+#: ../src/gtkpounce.c:639
+msgid "_Pop up a notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:641
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:643
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:645
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
-msgstr "浏览(_R)..."
-
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "浏览(_W)..."
-
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:650
+msgid "Brows_e..."
+msgstr "浏览(_E)..."
+
+#: ../src/gtkpounce.c:652
+msgid "Br_owse..."
+msgstr "浏览(_O)..."
+
+#: ../src/gtkpounce.c:653
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "激活后保存此千里眼(_E)"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "删除好友千里眼"
-
-#: src/gtkpounce.c:964
+#. Create the "Options" frame.
+#: ../src/gtkpounce.c:765
+msgid "Options"
+msgstr "选项"
+
+#: ../src/gtkpounce.c:773
+msgid "P_ounce only when my status is not available"
+msgstr "仅当我的状态不可用时才监视(_O)"
+
+#: ../src/gtkpounce.c:778
+msgid "_Recurring"
+msgstr "再现(_R)"
+
+#: ../src/gtkpounce.c:1092
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "您真的想要删除 %s 吗?"
+
+#: ../src/gtkpounce.c:1240
+msgid "Pounce Target"
+msgstr "监视目标"
+
+#: ../src/gtkpounce.c:1275
+msgid "Recurring"
+msgstr "在线"
+
+#: ../src/gtkpounce.c:1322
+msgid "Buddy Pounces"
+msgstr "好友千里眼"
+
+#: ../src/gtkpounce.c:1449
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:1451
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:1453
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s 睡醒了(%s)"
-
-#: src/gtkpounce.c:970
+msgstr "%s 发完呆了(%s)"
+
+#: ../src/gtkpounce.c:1455
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:1457
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:1459
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:1461
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s 打起瞌睡(%s)"
-
-#: src/gtkpounce.c:978
+msgstr "%s 发起了呆(%s)"
+
+#: ../src/gtkpounce.c:1463
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:1465
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s 给您发送了消息。(%s)"
+
+#: ../src/gtkpounce.c:1466
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:623
+#: ../src/gtkprefs.c:512
+msgid "Smiley theme failed to unpack."
+msgstr "表情主题解包失败。"
+
+#: ../src/gtkprefs.c:638
 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:658
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
+#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:805
+#: ../src/gtkprefs.c:821
+msgid "_Hide new IM conversations"
+msgstr "隐藏新的 IM 对话(_H)"
+
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+msgid "When away"
+msgstr "离开时"
+
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "将未知的斜线命令发送为消息(_S)"
 
-#: src/gtkprefs.c:807
-#, fuzzy
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
-msgstr "显示格式工具栏(_F)"
-
-#: src/gtkprefs.c:809
+msgstr "收到的消息显示格式(_F)"
+
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:811
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: src/gtkprefs.c:813
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
-msgstr "突出显示拼错的单词(_H)"
-
-#: src/gtkprefs.c:834
+#: ../src/gtkprefs.c:845
+msgid "Highlight _misspelled words"
+msgstr "突出显示拼错的单词(_M)"
+
+#: ../src/gtkprefs.c:849
+msgid "Use smooth-scrolling"
+msgstr "使用平滑滚动"
+
+#: ../src/gtkprefs.c:865
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:858
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:872
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
 msgstr "在标签上显示关闭按钮(_U)"
 
-#: src/gtkprefs.c:878
-#, fuzzy
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
-msgstr "扩展放置"
-
-#: src/gtkprefs.c:880
+msgstr "放置(_P):"
+
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:881
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:882
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:883
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:885
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
 msgstr ""
 
-#: src/gtkprefs.c:886
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
 msgstr ""
 
-#: src/gtkprefs.c:891
-#, fuzzy
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
-msgstr "关闭对话"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "新建对话(_E):"
+
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
+#: ../src/protocols/oscar/oscar.c:6172
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:944
-#, fuzzy
-msgid "STUN Server:"
-msgstr "服务器(_S):"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
+#: ../src/gtkprefs.c:975
+msgid "ST_UN server:"
+msgstr "STUN 服务器(_U):"
+
+#: ../src/gtkprefs.c:977
+msgid "_Autodetect IP address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:955
+#: ../src/gtkprefs.c:986
 msgid "Public _IP:"
-msgstr "公网 _IP:"
-
-#: src/gtkprefs.c:979
+msgstr "公网 _IP:"
+
+#: ../src/gtkprefs.c:1014
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:982
+#: ../src/gtkprefs.c:1017
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
-msgstr "起始端口(_S):"
-
-#: src/gtkprefs.c:992
-msgid "_End Port:"
-msgstr "终止端口(_E):"
-
-#: src/gtkprefs.c:999
+#: ../src/gtkprefs.c:1020
+msgid "_Start port:"
+msgstr "起始端口(_S):"
+
+#: ../src/gtkprefs.c:1027
+msgid "_End port:"
+msgstr "终止端口(_E):"
+
+#: ../src/gtkprefs.c:1035
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1039
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1059
+#: ../src/gtkprefs.c:1095
 msgid "_User:"
-msgstr "用户(_U):"
-
-#: src/gtkprefs.c:1119
+msgstr "用户(_U):"
+
+#: ../src/gtkprefs.c:1157
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: ../src/gtkprefs.c:1158
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: ../src/gtkprefs.c:1159
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: ../src/gtkprefs.c:1160
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: ../src/gtkprefs.c:1161
 msgid "GNOME Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1124
+#: ../src/gtkprefs.c:1162
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: ../src/gtkprefs.c:1163
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: ../src/gtkprefs.c:1164
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: ../src/gtkprefs.c:1165
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: ../src/gtkprefs.c:1174
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1189
+#: ../src/gtkprefs.c:1227
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1193
+#: ../src/gtkprefs.c:1231
 msgid "_Browser:"
-msgstr "浏览器(_B):"
-
-#: src/gtkprefs.c:1201
+msgstr "浏览器(_B):"
+
+#: ../src/gtkprefs.c:1239
 msgid "_Open link in:"
-msgstr "打开链接的方式(_O):"
-
-#: src/gtkprefs.c:1203
+msgstr "打开链接的方式(_O):"
+
+#: ../src/gtkprefs.c:1241
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1204
+#: ../src/gtkprefs.c:1242
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1206
+#: ../src/gtkprefs.c:1244
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1258
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3949,57 +4547,83 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
-msgstr "日志格式(_F):"
-
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: ../src/gtkprefs.c:1297
+msgid "Log _format:"
+msgstr "日志格式(_F):"
+
+#: ../src/gtkprefs.c:1302
 msgid "Log all _instant messages"
-msgstr "记录所有即时消息(_L)"
-
-#: src/gtkprefs.c:1266
+msgstr "记录所有即时消息(_I)"
+
+#: ../src/gtkprefs.c:1304
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1306
 msgid "Log all _status changes to system log"
 msgstr ""
 
-#: src/gtkprefs.c:1400
+#: ../src/gtkprefs.c:1454
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1462
+msgid "Quietest"
+msgstr "最小"
+
+#: ../src/gtkprefs.c:1464
+msgid "Quieter"
+msgstr "较小"
+
+#: ../src/gtkprefs.c:1466
+msgid "Quiet"
+msgstr "小"
+
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
+msgid "Normal"
+msgstr "普通"
+
+#: ../src/gtkprefs.c:1470
+msgid "Loud"
+msgstr "大"
+
+#: ../src/gtkprefs.c:1472
+msgid "Louder"
+msgstr "较大"
+
+#: ../src/gtkprefs.c:1474
+msgid "Loudest"
+msgstr "最大"
+
+#: ../src/gtkprefs.c:1537
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1455
+#: ../src/gtkprefs.c:1538
 msgid "_Method:"
-msgstr "方式(_M):"
-
-#: src/gtkprefs.c:1457
+msgstr "方式(_M):"
+
+#: ../src/gtkprefs.c:1540
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1459
+#: ../src/gtkprefs.c:1542
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1547
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1465
-#, fuzzy
+#: ../src/gtkprefs.c:1548
 msgid "No sounds"
-msgstr "声音"
-
-#: src/gtkprefs.c:1473
+msgstr "无声音"
+
+#: ../src/gtkprefs.c:1556
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4008,556 +4632,549 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1499
+#: ../src/gtkprefs.c:1582
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1500
+#: ../src/gtkprefs.c:1583
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1502
+#: ../src/gtkprefs.c:1585
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1512
+#: ../src/gtkprefs.c:1592
+msgid "Volume:"
+msgstr "音量:"
+
+#: ../src/gtkprefs.c:1620
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1671
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1570
+#: ../src/gtkprefs.c:1678
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1589
+#: ../src/gtkprefs.c:1697
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1593
+#: ../src/gtkprefs.c:1701
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1597
+#: ../src/gtkprefs.c:1705
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "离开"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "离开时把新消息存入队列(_Q)"
-
-#: src/gtkprefs.c:1655
+#: ../src/gtkprefs.c:1747
+msgid "_Report idle time:"
+msgstr "报告发呆时间(_R):"
+
+#: ../src/gtkprefs.c:1750
+msgid "From last sent message"
+msgstr "根据上次发送的消息"
+
+#: ../src/gtkprefs.c:1752
+msgid "Based on keyboard or mouse use"
+msgstr "根据键盘或鼠标使用"
+
+#: ../src/gtkprefs.c:1761
 msgid "_Auto-reply:"
-msgstr "自动回复(_A):"
-
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "离开时"
-
-#: src/gtkprefs.c:1659
-#, fuzzy
+msgstr "自动回复(_A):"
+
+#: ../src/gtkprefs.c:1765
 msgid "When both away and idle"
-msgstr "离开和瞌睡时"
-
-#: src/gtkprefs.c:1662
-#, fuzzy
-msgid "_Report idle time"
-msgstr "显示瞌睡时间(_T)"
-
-#: src/gtkprefs.c:1665
+msgstr "离开和发呆时"
+
+#. Auto-away stuff
+#: ../src/gtkprefs.c:1771
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: ../src/gtkprefs.c:1773
 msgid "Change status when _idle"
-msgstr "瞌睡后即设置离开(_W)"
-
-#: src/gtkprefs.c:1670
-#, fuzzy
+msgstr "发呆时更改状态(_I)"
+
+#: ../src/gtkprefs.c:1777
 msgid "_Minutes before changing status:"
-msgstr "设置离开前等几分钟(_M):"
-
-#: src/gtkprefs.c:1678
-#, fuzzy
+msgstr "更改状态前等几分钟(_M):"
+
+#: ../src/gtkprefs.c:1785
 msgid "Change _status to:"
-msgstr "将地址更改为:"
-
-#: src/gtkprefs.c:1728
+msgstr "将状态更改为(_S):"
+
+#. Signon status stuff
+#: ../src/gtkprefs.c:1806
+msgid "Status at startup"
+msgstr "启动时的状态"
+
+#: ../src/gtkprefs.c:1808
+msgid "Use status from last _exit at startup"
+msgstr "启动时使用上次退出时的状态(_E)"
+
+#: ../src/gtkprefs.c:1814
+msgid "Status to a_pply at startup:"
+msgstr "启动时应用的状态(_P):"
+
+#: ../src/gtkprefs.c:1865
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:1729
+#: ../src/gtkprefs.c:1866
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:1735
+#: ../src/gtkprefs.c:1872
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:1739
+#: ../src/gtkprefs.c:1876
 msgid "Away / Idle"
-msgstr "离开/瞌睡"
-
-#: src/gtkprivacy.c:79
+msgstr "离开/发呆"
+
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "只允许我的好友"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "屏蔽全部用户"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
-msgstr "设置隐私的账户:"
-
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+msgstr "设置隐私的账户:"
+
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "允许"
-
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+msgid "_Permit"
+msgstr "允许(_P)"
+
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "屏蔽"
-
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+msgid "_Block"
+msgstr "屏蔽(_B)"
+
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: ../src/gtkrequest.c:269 ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: ../src/gtkrequest.c:270 ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
+#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:263
+#: ../src/gtkrequest.c:273
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:274 ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1796
+#: ../src/gtkrequest.c:1469
 msgid "That file already exists"
 msgstr "该文件已存在"
 
-#: src/gtkrequest.c:1797
+#: ../src/gtkrequest.c:1470
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: ../src/gtkrequest.c:1514 ../src/gtkrequest.c:1555
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: ../src/gtkrequest.c:1515 ../src/gtkrequest.c:1556
 msgid "Open File..."
 msgstr "打开文件..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "添加(_A)"
+
+#: ../src/gtkroomlist.c:354
 msgid "Room List"
 msgstr "房间列表"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:424
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#. add button
+#: ../src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "添加聊天(_A)"
+
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
+#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
 msgid "Title"
 msgstr "标题"
 
-#: src/gtksavedstatuses.c:377
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+msgstr "类型"
+
+#. Available status messages are plain text
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1417
+#: ../src/protocols/gg/gg.c:1427 ../src/protocols/gg/gg.c:1433
+#: ../src/protocols/gg/gg.c:1442 ../src/protocols/gg/gg.c:1447
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
+#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
+#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
+#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7795
+#: ../src/protocols/oscar/oscar.c:7810 ../src/protocols/oscar/oscar.c:7815
+#: ../src/protocols/oscar/oscar.c:8024 ../src/protocols/oscar/oscar.c:8036
+#: ../src/protocols/sametime/sametime.c:3274
+#: ../src/protocols/sametime/sametime.c:3280
+#: ../src/protocols/sametime/sametime.c:3286
+#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "消息"
 
-#: src/gtksavedstatuses.c:451
-#, fuzzy
+#: ../src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
-msgstr "服务器统计"
+msgstr "已存状态"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: src/gtksavedstatuses.c:584
+#: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:675
-#, fuzzy
-msgid "Custom status"
-msgstr "按状态"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+msgstr "标题已在使用中。您必须选择唯一的标题。"
+
+#: ../src/gtksavedstatuses.c:879
+msgid "Different"
+msgstr "不同"
+
+#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
+#: ../src/protocols/gg/gg.c:1400 ../src/protocols/gg/gg.c:1404
+#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
+#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
+#: ../src/protocols/yahoo/yahoo.c:2882
 msgid "Status"
 msgstr "状态"
 
-#: src/gtksavedstatuses.c:797
-#, fuzzy
+#: ../src/gtksavedstatuses.c:1073
 msgid "_Title:"
-msgstr "标题"
-
-#: src/gtksavedstatuses.c:817
-#, fuzzy
+msgstr "标题(_T):"
+
+#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
 msgid "_Status:"
-msgstr "状态:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "状态(_S):"
+
+#. Different status message expander
+#: ../src/gtksavedstatuses.c:1124
 msgid "Use a _different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:61
+msgstr "为某些账户使用不同的状态(_D)"
+
+#. Save & Use button
+#: ../src/gtksavedstatuses.c:1188
+msgid "Sa_ve & Use"
+msgstr "保存并使用(_V)"
+
+#: ../src/gtksavedstatuses.c:1394
+#, c-format
+msgid "Status for %s"
+msgstr "%s 的状态"
+
+#: ../src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:63
 msgid "Message received"
 msgstr "消息已收到"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "收到的消息开始对话"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:65
 msgid "Message sent"
 msgstr "消息已送出"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "有人进入聊天"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "有人离开聊天"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "您在聊天中发言"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#: src/gtksound.c:72
+#: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:414
+#: ../src/gtksound.c:489
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:430
+#: ../src/gtksound.c:505
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:442
+#: ../src/gtksound.c:517
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
-#: src/gtkstatusbox.c:197
-#, fuzzy
+#: ../src/gtkstatusbox.c:366
 msgid "Typing"
-msgstr "Ping"
+msgstr "正打字"
 
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
+#: ../src/protocols/sametime/sametime.c:3693
+#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
-msgstr "正在连接"
-
-#. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 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:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "可用"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "隐身"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "离线"
-
-#: src/gtkstatusbox.c:299
-#, fuzzy
-msgid "Custom..."
-msgstr "自定义"
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
-msgid "Saved..."
-msgstr "保存文件..."
-
-#: src/gtkstock.c:117
+msgstr "正连接"
+
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/gtkstock.c:119
+#: ../src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "关闭标签(_T)"
+
+#: ../src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "获得信息(_G)"
+
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "邀请(_I)"
 
-#: src/gtkstock.c:120
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/gtkstock.c:121
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "警告(_W)"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
+#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "发生了未知登入错误: %s。"
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
+msgstr "装入 %s 时发生了下列错误: %s。"
+
+#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
 msgid "Failed to load image"
-msgstr "存储图像失败: %s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
+msgstr "装入图像失败"
+
+#: ../src/gtkutils.c:1408
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "无法发送文件"
-
-#: src/gtkutils.c:1497
+msgstr "无法发送文件夹 %s。"
+
+#: ../src/gtkutils.c:1410
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
-msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
+msgstr "Gaim 无法传送文件夹。您需要选择需要传送的单个文件"
+
+#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
 msgid "You have dragged an image"
-msgstr "您输入了无效的用户名"
-
-#: src/gtkutils.c:1526
+msgstr "您拖曳了图像"
+
+#: ../src/gtkutils.c:1439
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
+"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
+
+#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
-msgstr "显示好友图标(_I)"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
+msgstr "设置为好友头像"
+
+#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
 msgid "Send image file"
-msgstr "发送消息"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
+msgstr "发送图像文件"
+
+#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
 msgid "Insert in message"
-msgstr "插入图像"
-
-#: src/gtkutils.c:1535
-#, fuzzy
+msgstr "在消息中插入"
+
+#: ../src/gtkutils.c:1448
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "您是否想要加入对话?"
-
-#: src/gtkutils.c:1540
+msgstr "您是否想要将其设置为此用户的头像?"
+
+#: ../src/gtkutils.c:1453
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-
-#: src/gtkutils.c:1542
+"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友图"
+"标。"
+
+#: ../src/gtkutils.c:1455
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr ""
+msgstr "您可以通过文件传送发送此图像,或者将其用作此用户的头像。"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
-#, fuzzy
+#: ../src/gtkutils.c:1509
 msgid "Cannot send launcher"
-msgstr "无法发送文件"
-
-#: src/gtkutils.c:1596
+msgstr "无法发送启动器"
+
+#: ../src/gtkutils.c:1509
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
-
-#: src/log.c:129
+"您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而"
+"非启动器自身。"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/gtkwhiteboard.c:343 ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr ""
+
+#: ../src/log.c:167
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:577
+#: ../src/log.c:549
+msgid "HTML"
+msgstr "HTML"
+
+#: ../src/log.c:560
+msgid "Plain text"
+msgstr "纯文本"
+
+#: ../src/log.c:571
+msgid "Old Gaim"
+msgstr "旧 Gaim"
+
+#: ../src/log.c:666
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
+msgstr "此对话的记录失败。"
+
+#: ../src/log.c:1009
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: ../src/log.c:1077
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4566,7 +5183,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:906
+#: ../src/log.c:1079
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4575,60 +5192,97 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:957 src/log.c:1074
+#: ../src/log.c:1136 ../src/log.c:1262
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:967 src/log.c:1086
+#: ../src/log.c:1148 ../src/log.c:1276
 #, 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:1019
+#: ../src/log.c:1205
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/plugin.c:331
+#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: ../src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr ""
+
+#: ../src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr ""
+
+#: ../src/plugin.c:458
+msgid "Plugin does not implement all required functions"
+msgstr ""
+
+#: ../src/plugin.c:523
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim 无法装入您的插件。"
-
-#: src/plugin.c:360
+#: ../src/plugin.c:528
+#, fuzzy
+msgid "Gaim encountered errors loading the plugin."
+msgstr "Gaim 与 ICQ 服务器通讯错误。"
+
+#: ../src/plugin.c:551
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "瞌睡"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#: ../src/plugin.c:555
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim 无法装入您的插件。"
+
+#: ../src/plugin.c:657
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "依赖的插件 %s 装入失败。"
+
+#: ../src/plugin.c:662
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "Gaim 卸载插件时遇到了错误。"
+
+#. Send a message about the connection error
+#: ../src/protocols/bonjour/bonjour.c:111
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "无法监听连入的 IM 连接\n"
+
+#: ../src/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "无法建立与本地 mDNS 服务器的连接。服务器是否在运行中?"
+
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3251
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>状态</b>: 可怕"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+"<b>状态:</b> %s"
+
+#: ../src/protocols/bonjour/bonjour.c:339
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>消息:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4640,350 +5294,417 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:433
+#: ../src/protocols/bonjour/bonjour.c:435
 msgid "Bonjour Protocol Plugin"
-msgstr "Yahoo 协议插件"
+msgstr "Bonjour 协议插件"
+
+#: ../src/protocols/bonjour/bonjour.c:471
+#: ../src/protocols/bonjour/bonjour.c:479
+#: ../src/protocols/bonjour/bonjour.c:537
+msgid "Gaim User"
+msgstr "Gaim 用户"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "姓:"
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
+msgid "Hostname"
+msgstr "主机名"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
+#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
+#: ../src/protocols/gg/gg.c:971
 msgid "First name"
-msgstr "名:"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+msgstr "名"
+
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
 msgid "Last name"
-msgstr "姓:"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
+msgstr "姓"
+
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
+#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
+#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/bonjour/bonjour.h:35
-msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
-msgid "Save Buddylist..."
-msgstr "发送好友列表"
-
-#: src/protocols/gg/gg.c:137
-msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
-msgid "Couldn't open file"
-msgstr "无法发送文件"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
-msgid "Buddylist saved successfully!"
-msgstr "密码成功更改"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "无法发送文件"
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
-msgid "Load Buddylist..."
-msgstr "好友别名(_A)..."
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
-msgid "Buddylist loaded successfully!"
-msgstr "密码成功更改"
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
-msgid "Save buddylist..."
-msgstr "发送好友列表"
-
-#: src/protocols/gg/gg.c:254
-msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
-msgid "Passwords do not match."
-msgstr "新密码不相同。"
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "无法创建新连接。"
-
-#: src/protocols/gg/gg.c:279
-msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
-msgid "Registration completed successfully!"
-msgstr "注册成功"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
-msgid "Nickname"
-msgstr "昵称"
-
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
-msgid "City"
-msgstr "城市"
-
-#: src/protocols/gg/gg.c:417
-msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
-#, fuzzy
-msgid "Only online"
-msgstr "在线"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
-msgid "Find buddies"
-msgstr "显示睡着的好友(_D)"
-
-#: src/protocols/gg/gg.c:432
-#, fuzzy
-msgid "Please, enter your search criteria below"
-msgstr "请输入您的新密码"
-
-#: src/protocols/gg/gg.c:465
-msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
-msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
-#, fuzzy
-msgid "Unable to change password. Error occured.\n"
-msgstr "无法更改 Gadu-Gadu 密码"
-
-#: src/protocols/gg/gg.c:500
-#, fuzzy
-msgid "Change password for the Gadu-Gadu account"
-msgstr "更改 %s 的密码"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
-msgid "Password was changed successfully!"
-msgstr "密码成功更改"
-
-#: src/protocols/gg/gg.c:535
+#: ../src/protocols/bonjour/jabber.c:357
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s 已经关闭了对话。"
+
+#: ../src/protocols/bonjour/jabber.c:439
+msgid "Cannot open socket"
+msgstr "无法打开套接字"
+
+#: ../src/protocols/bonjour/jabber.c:447
+#, fuzzy
+msgid "Error setting socket options"
+msgstr "创建连接出错"
+
+#: ../src/protocols/bonjour/jabber.c:458
+#, fuzzy
+msgid "Cannot bind socket to port"
+msgstr "无法设定话题"
+
+#: ../src/protocols/bonjour/jabber.c:465
+#, fuzzy
+msgid "Cannot listen on socket"
+msgstr "无法创建套接字"
+
+#: ../src/protocols/bonjour/jabber.c:559
+#, fuzzy
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "无法发送消息: 消息太大。"
+
+#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
+#: ../src/protocols/gg/gg.c:137
 #, fuzzy
 msgid "Token Error"
 msgstr "未知错误"
 
-#: src/protocols/gg/gg.c:536
+#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
+#: ../src/protocols/gg/gg.c:138
 #, fuzzy
 msgid "Unable to fetch the token.\n"
 msgstr "无法获取房间列表。"
 
-#: src/protocols/gg/gg.c:551
-#, fuzzy
-msgid "Current password"
-msgstr "密码不对。"
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
+#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#, fuzzy
+msgid "Save Buddylist..."
+msgstr "发送好友列表"
+
+#: ../src/protocols/gg/gg.c:227
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#, fuzzy
+msgid "Couldn't open file"
+msgstr "无法发送文件"
+
+#: ../src/protocols/gg/gg.c:246
+#, fuzzy
+msgid "Buddylist saved successfully!"
+msgstr "密码成功更改"
+
+#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#, fuzzy
+msgid "Couldn't load buddylist"
+msgstr "无法导出好友列表"
+
+#: ../src/protocols/gg/gg.c:281
+#, fuzzy
+msgid "Load Buddylist..."
+msgstr "好友别名(_A)..."
+
+#: ../src/protocols/gg/gg.c:282
+#, fuzzy
+msgid "Buddylist loaded successfully!"
+msgstr "密码成功更改"
+
+#: ../src/protocols/gg/gg.c:293
+#, fuzzy
+msgid "Save buddylist..."
+msgstr "好友列表"
+
+#: ../src/protocols/gg/gg.c:337
+msgid "Fill in the registration fields."
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:342
+#, fuzzy
+msgid "Passwords do not match."
+msgstr "新密码不相同。"
+
+#: ../src/protocols/gg/gg.c:351
+#, fuzzy
+msgid "Unable to register new account. Error occurred.\n"
+msgstr "无法创建新连接。"
+
+#: ../src/protocols/gg/gg.c:364
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:365
+#, fuzzy
+msgid "Registration completed successfully!"
+msgstr "注册成功"
+
+#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
+msgid "E-Mail"
+msgstr "电子邮件"
+
+#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
+#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
 #, fuzzy
 msgid "Password (retype)"
 msgstr "密码已送出"
 
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
+#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
 #, fuzzy
 msgid "Enter current token"
 msgstr "%s 目前未登入。"
 
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
+#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
 #, fuzzy
 msgid "Current token"
 msgstr "目前位于"
 
-#: src/protocols/gg/gg.c:574
+#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#, fuzzy
+msgid "Register New Gadu-Gadu Account"
+msgstr "注册新的 Jabber 账户"
+
+#: ../src/protocols/gg/gg.c:452
+msgid "Please, fill in the following fields"
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1606
+#, fuzzy
+msgid "Unable to initiate a new search"
+msgstr "无法写入网络"
+
+#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1607
+#, fuzzy
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "您给 %s 发送消息的速度太快。"
+
+#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
+#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
+#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
+#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1035
+msgid "Nickname"
+msgstr "昵称"
+
+#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
+#: ../src/protocols/oscar/oscar.c:6226
+msgid "City"
+msgstr "城市"
+
+#: ../src/protocols/gg/gg.c:577
+msgid "Year of birth"
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/yahoo/yahoo_profile.c:1060
+msgid "Gender"
+msgstr "性别"
+
+#: ../src/protocols/gg/gg.c:581
+msgid "Male or female"
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+msgid "Male"
+msgstr "男"
+
+#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+msgid "Female"
+msgstr "女"
+
+#: ../src/protocols/gg/gg.c:587
+#, fuzzy
+msgid "Only online"
+msgstr "在线"
+
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+msgid "Find buddies"
+msgstr "查找好友"
+
+#: ../src/protocols/gg/gg.c:593
+msgid "Please, enter your search criteria below"
+msgstr "请在下面输入您的搜索条件"
+
+#: ../src/protocols/gg/gg.c:630
+msgid "Fill in the fields."
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:642
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:656
+msgid "Unable to change password. Error occured.\n"
+msgstr "无法更改密码。发生了错误。\n"
+
+#: ../src/protocols/gg/gg.c:665
+msgid "Change password for the Gadu-Gadu account"
+msgstr "更改 Gadu-Gadu 帐户的密码"
+
+#: ../src/protocols/gg/gg.c:666
+msgid "Password was changed successfully!"
+msgstr "密码成功更改!"
+
+#: ../src/protocols/gg/gg.c:699
+msgid "Current password"
+msgstr "当前密码"
+
+#: ../src/protocols/gg/gg.c:724
 #, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "请输入您目前的密码和新密码。"
 
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
 #, fuzzy
 msgid "Change Gadu-Gadu Password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:649
+#. TODO: s/screenname/alias/
+#: ../src/protocols/gg/gg.c:804
 #, fuzzy, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "从您的好友列表中删除聊天"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+msgstr "选择 %s 的字体"
+
+#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
 #, fuzzy
 msgid "Add to chat..."
 msgstr "添加聊天(_H)"
 
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "无法读取套接字"
-
-#: src/protocols/gg/gg.c:959
+#: ../src/protocols/gg/gg.c:950
+#, fuzzy
+msgid "No matching users found"
+msgstr "不匹配的主机"
+
+#: ../src/protocols/gg/gg.c:951
+msgid "There are no users matching your search criteria."
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/oscar/oscar.c:6329
+#, fuzzy
+msgid "Unable to display the search results."
+msgstr "无法邀请用户(%s)。"
+
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
+msgid "UIN"
+msgstr "UIN"
+
+#: ../src/protocols/gg/gg.c:980
+msgid "Birth year"
+msgstr "出生年份"
+
+#: ../src/protocols/gg/gg.c:1020
 msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: src/protocols/gg/gg.c:960
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1021
 msgid "Search results"
 msgstr "搜索结果"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "在线"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "忙碌"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+msgid "Unable to read socket"
+msgstr "无法读取套接字"
+
+#: ../src/protocols/gg/gg.c:1201
+msgid "Buddy list downloaded"
+msgstr "好友列表已下载"
+
+#: ../src/protocols/gg/gg.c:1202
+#, fuzzy
+msgid "Your buddy list was downloaded from the server."
+msgstr "您已经断开与服务器的连接。"
+
+#: ../src/protocols/gg/gg.c:1209
+msgid "Buddy list uploaded"
+msgstr "好友列表已上传"
+
+#: ../src/protocols/gg/gg.c:1210
+#, fuzzy
+msgid "Your buddy list was stored on the server."
+msgstr "Gadu-Gadu 服务器没有存储好友列表。"
+
+#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1528
+#, fuzzy
+msgid "Connection failed."
+msgstr "连接失败"
+
+#: ../src/protocols/gg/gg.c:1441 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "被屏蔽"
 
-#: src/protocols/gg/gg.c:1129
+#: ../src/protocols/gg/gg.c:1464
 #, fuzzy
 msgid "Add to chat"
 msgstr "添加聊天"
 
-#: src/protocols/gg/gg.c:1133
+#: ../src/protocols/gg/gg.c:1473
 #, fuzzy
 msgid "Unblock"
 msgstr "屏蔽"
 
-#: src/protocols/gg/gg.c:1149
+#: ../src/protocols/gg/gg.c:1477
+msgid "Block"
+msgstr "屏蔽"
+
+#: ../src/protocols/gg/gg.c:1494
 #, fuzzy
 msgid "Chat _name:"
-msgstr "姓:"
-
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
-msgid "Connection failed."
-msgstr "连接失败"
-
-#: src/protocols/gg/gg.c:1357
+msgstr "姓:"
+
+#: ../src/protocols/gg/gg.c:1718
 #, fuzzy
 msgid "Chat error"
 msgstr "读取错误"
 
-#: src/protocols/gg/gg.c:1358
+#: ../src/protocols/gg/gg.c:1719
 #, fuzzy
 msgid "This chat name is already in use"
 msgstr "该文件已存在"
 
-#: src/protocols/gg/gg.c:1435
+#: ../src/protocols/gg/gg.c:1802
 #, fuzzy
 msgid "Not connected to the server."
 msgstr "您已经断开与服务器的连接。"
 
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "电子邮件"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "注册新的 Jabber 账户"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
-msgid "Change password"
-msgstr "更改密码"
-
-#: src/protocols/gg/gg.c:1520
+#: ../src/protocols/gg/gg.c:1825
+#, fuzzy
+msgid "Find buddies..."
+msgstr "显示睡着的好友(_D)"
+
+#: ../src/protocols/gg/gg.c:1831
+#, fuzzy
+msgid "Change password..."
+msgstr "更改密码..."
+
+#: ../src/protocols/gg/gg.c:1837
 #, fuzzy
 msgid "Upload buddylist to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1523
+#: ../src/protocols/gg/gg.c:1841
 #, fuzzy
 msgid "Download buddylist from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1526
+#: ../src/protocols/gg/gg.c:1845
 #, fuzzy
 msgid "Delete buddylist from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
-msgid "Load buddylist from file"
-msgstr "从服务器导入好友列表"
+#: ../src/protocols/gg/gg.c:1849
+msgid "Save buddylist to file..."
+msgstr ""
+
+#: ../src/protocols/gg/gg.c:1853
+msgid "Load buddylist from file..."
+msgstr ""
 
 #. magic
 #. major_version
@@ -4996,119 +5717,120 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../src/protocols/gg/gg.c:1949
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../src/protocols/gg/gg.c:1950
 msgid "Polish popular IM"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1665
+#: ../src/protocols/gg/gg.c:1998
 #, fuzzy
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/silc/silc.c:1294
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/silc/silc.c:1298
 msgid "No topic is set"
 msgstr "未设定话题"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
+#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
-msgstr "文件传送已取消"
-
-#: src/protocols/irc/dcc_send.c:273
+msgstr "文件传送失败"
+
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 无法打开监听端口。"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "显示 MOTD 出错"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "没有可用的 MOTD"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "没有与此连接关联的 MOTD"
 
-#: src/protocols/irc/irc.c:83
+#: ../src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
-#: src/protocols/irc/irc.c:188
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
-msgstr "频道(_C):"
-
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+msgstr "频道(_C):"
+
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
-msgstr "密码(_P):"
-
-#: src/protocols/irc/irc.c:238
+msgstr "密码(_P):"
+
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
+#: ../src/protocols/jabber/jabber.c:890
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
+#: ../src/protocols/simple/simple.c:1518
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
+#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
+#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "话题"
 
@@ -5120,34 +5842,37 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../src/protocols/irc/irc.c:877
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../src/protocols/irc/irc.c:878
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/jabber/jabber.c:1904
+#: ../src/protocols/napster/napster.c:719
+#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:825
+#: ../src/protocols/irc/irc.c:903
 msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
+#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
+#: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/irc.c:831
+#: ../src/protocols/irc/irc.c:909
 msgid "Real name"
 msgstr "真名"
 
@@ -5155,223 +5880,237 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
-#, fuzzy
+#: ../src/protocols/irc/irc.c:917
 msgid "Use SSL"
-msgstr "SSL"
-
-#: src/protocols/irc/msgs.c:105
+msgstr "使用 SSL"
+
+#: ../src/protocols/irc/msgs.c:103
 msgid "Bad mode"
 msgstr "无效模式"
 
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:114
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被 %s 屏蔽了。"
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:115
 msgid "Banned"
 msgstr "屏蔽"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:132
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "无法屏蔽 %s: 屏蔽列表已满"
-
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+msgstr "无法屏蔽 %s:屏蔽列表已满"
+
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
+#: ../src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/irc/msgs.c:216
+#: ../src/protocols/irc/msgs.c:214
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:215
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
+#: ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1040
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "目前位于"
 
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:242
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>瞌睡了:</b> %s<br>"
-
-#: src/protocols/irc/msgs.c:246
+msgstr "<b>发呆了:</b> %s<br>"
+
+#: ../src/protocols/irc/msgs.c:244
 msgid "Online since"
 msgstr "上线时间"
 
-#: src/protocols/irc/msgs.c:249
+#: ../src/protocols/irc/msgs.c:248
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>定义形容词:</b>显赫<br>"
 
-#: src/protocols/irc/msgs.c:317
+#: ../src/protocols/irc/msgs.c:318
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:322
+#: ../src/protocols/irc/msgs.c:325
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:343
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:344
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:344
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:363
+#: ../src/protocols/irc/msgs.c:367
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: ../src/protocols/irc/msgs.c:495
 msgid "Time Response"
 msgstr "时间响应"
 
-#: src/protocols/irc/msgs.c:483
+#: ../src/protocols/irc/msgs.c:496
 msgid "The IRC server's local time is:"
 msgstr "IRC 服务器的本地时间为:"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:507
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../src/protocols/irc/msgs.c:518
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:508
+#: ../src/protocols/irc/msgs.c:521
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:526
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:533
+#: ../src/protocols/irc/msgs.c:546
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:589
+#: ../src/protocols/irc/msgs.c:602
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:590
+#: ../src/protocols/irc/msgs.c:603
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:692
+#: ../src/protocols/irc/msgs.c:704
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:697
+#. Remove user from channel
+#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:721
+#: ../src/protocols/irc/msgs.c:732
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:805
+#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
+msgid "Invalid nickname"
+msgstr "无效的昵称"
+
+#: ../src/protocols/irc/msgs.c:819
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr "您所选的昵称被服务器拒绝。其中可能包含无效的字符。"
+
+#: ../src/protocols/irc/msgs.c:823
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:863
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:863
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:865
+#: ../src/protocols/irc/msgs.c:884
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: ../src/protocols/irc/msgs.c:926
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:909
+#: ../src/protocols/irc/msgs.c:928
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:984
+#: ../src/protocols/irc/msgs.c:1003
 #, c-format
 msgid "Cannot join %s:"
-msgstr "无法加入 %s:"
-
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+msgstr "无法加入 %s:"
+
+#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:1019
-#, fuzzy
+#: ../src/protocols/irc/msgs.c:1038
 msgid "Nick or channel is temporarily unavailable."
-msgstr "服务暂时不可用。"
-
-#: src/protocols/irc/msgs.c:1031
+msgstr "昵称或频道暂时不可用。"
+
+#: ../src/protocols/irc/msgs.c:1050
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: src/protocols/irc/parse.c:116
+#: ../src/protocols/irc/parse.c:116
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: 向 chanserv 发送命令"
+
+#: ../src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 "deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5380,13 +6119,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5394,7 +6133,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5402,879 +6141,900 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:125
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: 向 memoserv 发送命令"
+
+#: ../src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:130
+#, fuzzy
+msgid "nickserv: Send a command to nickserv"
+msgstr "quot [……]: 向服务器发送原始命令。"
+
+#: ../src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:129
+#: ../src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:133
+#, fuzzy
+msgid "operserv: Send a command to operserv"
+msgstr "quot [……]: 向服务器发送原始命令。"
+
+#: ../src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
 
-#: src/protocols/irc/parse.c:422
+#: ../src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
+#: ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
-msgstr ""
-"服务器需要 TLS/SSL 才能登录。请在账户属性中选择“如果可用的话请使用 TLS”"
-
-#: src/protocols/jabber/auth.c:53
+msgstr "服务器需要 TLS/SSL 登录。请在账户属性中选择“若可用则使用 TLS”"
+
+#: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "服务器的响应无效。"
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:234
+msgid "Server couldn't authenticate you without a password"
+msgstr ""
+
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "服务器的响应无效。"
+
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: ../src/protocols/jabber/auth.c:719
+msgid "SASL error"
+msgstr "SASL 错误"
+
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "邮政编码"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:768
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
+#: ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:569
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
+#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:725
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:839
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../src/protocols/jabber/buddy.c:1042
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../src/protocols/jabber/buddy.c:1046
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1054
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:1051
+#: ../src/protocols/jabber/buddy.c:1061
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../src/protocols/jabber/buddy.c:1070
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8053
+#: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/buddy.c:1235
+#: ../src/protocols/jabber/buddy.c:1289
 msgid "The following are the results of your search"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1327
+#: ../src/protocols/jabber/buddy.c:1388
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../src/protocols/jabber/buddy.c:1407
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
 msgid "Search for Jabber users"
-msgstr "按电子邮件地址搜索好友"
-
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
+msgstr "搜索 Jabber 用户"
+
+#: ../src/protocols/jabber/buddy.c:1431
 msgid "Invalid Directory"
-msgstr "无效错误"
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
+msgstr "无效的目录"
+
+#: ../src/protocols/jabber/buddy.c:1448
 msgid "Enter a User Directory"
-msgstr "无法发送目录。"
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
+msgstr "进入用户目录"
+
+#: ../src/protocols/jabber/buddy.c:1449
 msgid "Select a user directory to search"
-msgstr "选择要查询的会议服务器"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
+msgstr "选择要搜索的用户目录"
+
+#: ../src/protocols/jabber/buddy.c:1452
 msgid "Search Directory"
-msgstr "搜索文字(_S):"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+msgstr "搜索目录"
+
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
+#: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
-msgstr "房间(_R):"
-
-#: src/protocols/jabber/chat.c:47
+msgstr "房间(_R):"
+
+#: ../src/protocols/jabber/chat.c:47
 msgid "_Server:"
-msgstr "服务器(_S):"
-
-#: src/protocols/jabber/chat.c:53
+msgstr "服务器(_S):"
+
+#: ../src/protocols/jabber/chat.c:53
 msgid "_Handle:"
-msgstr "昵称(_H):"
-
-#: src/protocols/jabber/chat.c:223
+msgstr "昵称(_H):"
+
+#: ../src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
-#, fuzzy
+#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:215
+#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
+#: ../src/protocols/jabber/jabber.c:303
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:473
+#: ../src/protocols/jabber/jabber.c:590
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:643
-msgid "E-Mail"
-msgstr "电子邮件"
-
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
+#: ../src/protocols/oscar/oscar.c:6227
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:693
+#: ../src/protocols/jabber/jabber.c:810
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../src/protocols/jabber/jabber.c:818
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:842
+#: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:998
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
+#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7843
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:971
+#: ../src/protocols/jabber/jabber.c:1110
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:973
+#: ../src/protocols/jabber/jabber.c:1112
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "来自"
-
-#: src/protocols/jabber/jabber.c:978
+#: ../src/protocols/jabber/jabber.c:1117
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:980
+#: ../src/protocols/jabber/jabber.c:1119
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "无"
-
-#: src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
+#: ../src/protocols/jabber/jabber.c:1220
 msgid "Priority"
-msgstr "端口"
-
-#: src/protocols/jabber/jabber.c:1093
+msgstr "优先级"
+
+#: ../src/protocols/jabber/jabber.c:1249
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:1094
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/jabber/jabber.c:1311
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1317
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "设置用户信息"
+#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8477
+#: ../src/protocols/silc/silc.c:1023
+msgid "Set User Info..."
+msgstr "设置用户信息..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "更改密码"
+#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8488
+#: ../src/protocols/silc/silc.c:1019
+msgid "Change Password..."
+msgstr "更改密码..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
-msgstr "搜索文字(_S):"
-
-#: src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1337
+msgid "Search for Users..."
+msgstr "搜索用户..."
+
+#: ../src/protocols/jabber/jabber.c:1413
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1415
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1261
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1269
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/jabber/jabber.c:1427
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1273
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1275
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1279
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1281
+#: ../src/protocols/jabber/jabber.c:1437
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1285
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1287
+#: ../src/protocols/jabber/jabber.c:1443
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1289
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1291
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1293
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1295
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1297
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1460
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/jabber/jabber.c:1462
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1309
+#: ../src/protocols/jabber/jabber.c:1465
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1468
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1315
+#: ../src/protocols/jabber/jabber.c:1471
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1476
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1322
+#: ../src/protocols/jabber/jabber.c:1479
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1485
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1488
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1494
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1502
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1512
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1599
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1464
+#: ../src/protocols/jabber/jabber.c:1619
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1624
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "无法邀请用户(%s)。"
 
-#: src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1643
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "未知角色:“%s”"
+
+#: ../src/protocols/jabber/jabber.c:1650
+#, fuzzy, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "无法发送消息: %s"
+
+#: ../src/protocols/jabber/jabber.c:1703
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: ../src/protocols/jabber/jabber.c:1734
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1551
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1560
+#: ../src/protocols/jabber/jabber.c:1747
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1565
+#: ../src/protocols/jabber/jabber.c:1752
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1571
+#: ../src/protocols/jabber/jabber.c:1758
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1577
+#: ../src/protocols/jabber/jabber.c:1764
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1583
+#: ../src/protocols/jabber/jabber.c:1770
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1589
+#: ../src/protocols/jabber/jabber.c:1776
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+
+#: ../src/protocols/jabber/jabber.c:1782
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
 
-#: src/protocols/jabber/jabber.c:1595
+#: ../src/protocols/jabber/jabber.c:1788
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1601
+#: ../src/protocols/jabber/jabber.c:1794
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1606
+#: ../src/protocols/jabber/jabber.c:1799
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
@@ -6289,405 +7049,404 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1714
+#: ../src/protocols/jabber/jabber.c:1910
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1719
+#: ../src/protocols/jabber/jabber.c:1915
 msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
-#, fuzzy
+msgstr "需要 TLS"
+
+#: ../src/protocols/jabber/jabber.c:1918
 msgid "Force old (port 5223) SSL"
-msgstr "强制旧 SSL"
-
-#: src/protocols/jabber/jabber.c:1727
+msgstr "强制旧 SSL(5223 端口)"
+
+#: ../src/protocols/jabber/jabber.c:1923
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
-#: src/protocols/jabber/jabber.c:1732
+#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1760
 #, fuzzy
 msgid "Connect port"
 msgstr "连接"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "来自 %s 的消息"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "话题为: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Jabber 消息错误"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:300
 #, c-format
 msgid " (Code %s)"
 msgstr " (代码 %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:309
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "用户 %s 想要将 %s 添加为好友。"
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "同意"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
-msgstr "拒绝"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
+#: ../src/protocols/oscar/oscar.c:7476
+msgid "_Authorize"
+msgstr "同意(_A)"
+
+#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
+#: ../src/protocols/oscar/oscar.c:7477
+msgid "_Deny"
+msgstr "拒绝(_D)"
+
+#: ../src/protocols/jabber/presence.c:381
+#: ../src/protocols/jabber/presence.c:382
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:347
+#: ../src/protocols/jabber/presence.c:383
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr "配置房间"
-
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "接受默认值"
-
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:386
+msgid "_Configure Room"
+msgstr "配置房间(_C)"
+
+#: ../src/protocols/jabber/presence.c:388
+msgid "_Accept Defaults"
+msgstr "接受默认值(_A)"
+
+#: ../src/protocols/jabber/presence.c:426
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:429
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:727
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:728 ../src/protocols/jabber/si.c:729
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "%s (%s) 的好友列表同步问题"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s 出现于组“%s”的本地列表中,但并未出现于服务器列表。您想要添加此好友吗?"
-
-#: src/protocols/msn/dialog.c:105
+"本地列表中的 %s 位于组“%s”中,但未出现在服务器列表中。您是否想要添加此好友?"
+
+#: ../src/protocols/msn/dialog.c:106
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr "%s 位于本地列表但并未出现于服务器列表。您想要添加此好友吗?"
-
-#: src/protocols/msn/error.c:35
+msgstr "本地列表中的 %s 未出现在服务器列表中。您是否想要添加此好友?"
+
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "无法处理消息"
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "错误(可能是 Gaim 的 bug)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "无效的电子邮件地址"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "用户不存在"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "缺少全称域名"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "已登入"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "用户名无效"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "友好的名称无效"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "列表满"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "已列出"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
 msgid "User is offline"
 msgstr "用户离线"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "已在模式中"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "已在相对列表"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "组太多"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "无效的组"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "用户未在组中"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "组名太长"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "无法删除零组"
 
-#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
+#: ../src/protocols/msn/error.c:95
+#, fuzzy
+msgid "Tried to add a user to a group that doesn't exist"
 msgstr "试图向不存在的组中添加联系人"
 
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "通知传送失败"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "缺少必需域"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
 msgid "Not logged in"
 msgstr "未登入"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "服务暂时不可用"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "数据库服务器错误"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "命令已禁用"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "文件操作错误"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "内存分配错误"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "给服务器发送的 CHL 值错误"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "服务器忙"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "点通知服务器维护中"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "数据库连接错误"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "服务器即将维护"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "会话过载"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "用户太活跃"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "会话太多"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport 未验证"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "未期待"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "友好的名称更改太频繁"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
+#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "没有父母在的儿童 Passport"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "无效的票证"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的错误代码 %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: src/protocols/msn/msn.c:138
+#: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:263
+#: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307
 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?"
@@ -6695,29 +7454,29 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: src/protocols/msn/msn.c:354
+#: ../src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
+#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
 #, c-format
 msgid ""
 "\n"
@@ -6726,67 +7485,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: ../src/protocols/msn/msn.c:557
 msgid "Has you"
 msgstr "有你"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
+msgid "Busy"
+msgstr "忙碌"
+
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3305
+msgid "On the Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/yahoo/yahoo.c:3311
+msgid "Out to Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "隐身"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "设置友好的名称"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "设置家庭电话号码"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "设置工作电话号码"
-
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "设置移动电话号码"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "启用/禁用移动设备"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "允许/禁止移动寻呼"
-
-#: src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:623
+msgid "Set Friendly Name..."
+msgstr "设置友好的名称..."
+
+#: ../src/protocols/msn/msn.c:628
+msgid "Set Home Phone Number..."
+msgstr "设置家庭电话号码..."
+
+#: ../src/protocols/msn/msn.c:632
+msgid "Set Work Phone Number..."
+msgstr "设置工作电话号码..."
+
+#: ../src/protocols/msn/msn.c:636
+msgid "Set Mobile Phone Number..."
+msgstr "设置移动电话号码..."
+
+#: ../src/protocols/msn/msn.c:642
+msgid "Enable/Disable Mobile Devices..."
+msgstr "启用/禁用移动设备..."
+
+#: ../src/protocols/msn/msn.c:647
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "允许/禁止移动寻呼..."
+
+#: ../src/protocols/msn/msn.c:657
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+msgstr "打开 Hotmail 收件箱"
+
+#: ../src/protocols/msn/msn.c:681
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
-#: src/protocols/msn/msn.c:717
+#: ../src/protocols/msn/msn.c:729
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6794,89 +7555,85 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:745
+#: ../src/protocols/msn/msn.c:757
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, 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:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1471
+#: ../src/protocols/msn/msn.c:1456
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
 msgid "Age"
 msgstr "年龄"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "性别"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
-msgid "Marital Status"
-msgstr "婚姻状况"
-
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
-msgid "Location"
-msgstr "位置"
-
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
-msgid "A Little About Me"
-msgstr "自我介绍"
-
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
-msgid "Favorite Things"
-msgstr "收藏"
-
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1045
+msgid "Location"
+msgstr "位置"
+
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
+#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
+#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
+msgid "A Little About Me"
+msgstr "自我介绍"
+
+#. Social
+#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
+msgid "Marital Status"
+msgstr "婚姻状况"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
+#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1696
+#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
+#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
+msgid "Favorite Things"
+msgstr "收藏"
+
+#: ../src/protocols/msn/msn.c:1765
 msgid "Last Updated"
 msgstr "上次更新"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1802
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1730
+#: ../src/protocols/msn/msn.c:1803
 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 "
@@ -6885,13 +7642,14 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1734
+#: ../src/protocols/msn/msn.c:1807
 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:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/yahoo/yahoo_profile.c:1202
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
@@ -6905,77 +7663,85 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1963
+#: ../src/protocols/msn/msn.c:2043
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1972
+#: ../src/protocols/msn/msn.c:2052
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/msn.c:1980
-#, fuzzy
-msgid "nudge: nudge a contact to get their attention"
-msgstr "buzz: 呼叫联系人,以吸引其注意"
-
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/msn/msn.c:2057
+msgid "Show custom smileys"
+msgstr "显示自定义如下:"
+
+#: ../src/protocols/msn/msn.c:2065
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge:向用户发送闪屏震动,以便引起他的注意"
+
+#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是有效的组名。"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s(%3$s) 上的 %1$s"
 
-#: src/protocols/msn/notification.c:498
+#: ../src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "无法添加 %s (%s) 上的用户"
-
-#: src/protocols/msn/notification.c:502
+msgstr "无法在 %s(%s) 上添加用户"
+
+#: ../src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "无法屏蔽 %s (%s) 上的用户"
-
-#: src/protocols/msn/notification.c:506
+msgstr "无法在 %s(%s) 上屏蔽用户"
+
+#: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "无法允许 %s (%s) 上的用户"
-
-#: src/protocols/msn/notification.c:514
+msgstr "无法允许 %s(%s) 上的拥护"
+
+#: ../src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "无法添加 %s,因为您的好友列表已满。"
-
-#: src/protocols/msn/notification.c:523
+msgstr "无法添加 %s,原因是您的好友列表已满。"
+
+#: ../src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s 不是有效的 Passport 账户。"
-
-#: src/protocols/msn/notification.c:815
+msgstr "%s 不是有效的通行证账户。"
+
+#: ../src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "服务暂时不可用。"
+
+#: ../src/protocols/msn/notification.c:821
 msgid "Unable to rename group"
 msgstr "无法重命名组"
 
-#: src/protocols/msn/notification.c:870
+#: ../src/protocols/msn/notification.c:876
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: src/protocols/msn/notification.c:1303
+#: ../src/protocols/msn/notification.c:1309
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6997,198 +7763,208 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "写入错误"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "读取错误"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: ../src/protocols/msn/servconn.c:144
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%s 服务器的连接错误(%s):\n"
+"%s 服务器的连接错误:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:304
 msgid "Our protocol is not supported by the server."
 msgstr "服务器不支持此协议。"
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:308
 msgid "Error parsing HTTP."
 msgstr "分析 HTTP 出错。"
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/session.c:328
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:320
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:324
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "无法进行身份验证: %s"
-
-#: src/protocols/msn/session.c:342
+msgstr "无法通过身份验证: %s"
+
+#: ../src/protocols/msn/session.c:329
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
 msgid "Handshaking"
 msgstr "握手"
 
-#: src/protocols/msn/session.c:364
+#: ../src/protocols/msn/session.c:351
 msgid "Transferring"
 msgstr "文件传送"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:353
 msgid "Starting authentication"
-msgstr "开始验证身份"
-
-#: src/protocols/msn/session.c:367
+msgstr "开始身份验证"
+
+#: ../src/protocols/msn/session.c:354
 msgid "Getting cookie"
 msgstr "获得 cookie"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:356
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: src/protocols/msn/session.c:370
+#: ../src/protocols/msn/session.c:357
 msgid "Retrieving buddy list"
-msgstr "获取好友列表"
-
-#: src/protocols/msn/state.c:34
+msgstr "正在获取好友列表"
+
+#: ../src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/switchboard.c:403
+#: ../src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "接听电话"
+
+#: ../src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "外出就餐"
+
+#: ../src/protocols/msn/switchboard.c:406
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "消息未发出,因为发生了超时:"
-
-#: src/protocols/msn/switchboard.c:411
+msgstr "消息未发出,因为发生了超时:"
+
+#: ../src/protocols/msn/switchboard.c:414
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "消息未发出,隐身时不允许:"
-
-#: src/protocols/msn/switchboard.c:415
+msgstr "消息未发出,隐身时不允许:"
+
+#: ../src/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because the user is offline:"
-msgstr "消息未发出,因为用户离线:"
-
-#: src/protocols/msn/switchboard.c:419
+msgstr "消息未发出,因为用户离线:"
+
+#: ../src/protocols/msn/switchboard.c:422
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "消息未发出,因为发生了连接错误:"
-
-#: src/protocols/msn/switchboard.c:423
+msgstr "消息未发出,因为发生了连接错误:"
+
+#: ../src/protocols/msn/switchboard.c:426
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "消息未发出,因为发送的频率太高:"
+
+#: ../src/protocols/msn/switchboard.c:430
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr "消息未发出,因为切换板发生了错误:"
-
-#: src/protocols/msn/switchboard.c:431
+msgstr "消息未发出,因为切换板发生了错误:"
+
+#: ../src/protocols/msn/switchboard.c:438
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "消息未发出,因为发生了未知错误:"
-
-#: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
+msgstr "消息未发出,因为发生了未知错误:"
+
+#: ../src/protocols/msn/switchboard.c:959
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s 想要给您发送文件"
-
-#: src/protocols/msn/userlist.c:85
+msgstr "%s 刚刚给您发送了闪屏振动!"
+
+#: ../src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
 
-#: src/protocols/msn/userlist.c:275
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "用户 %s 想要将 %s 添加为好友。"
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
+msgid "Authorize"
+msgstr "同意"
+
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
+msgid "Deny"
+msgstr "拒绝"
+
+#: ../src/protocols/msn/userlist.c:286
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 已将您添加为好友。"
+
+#: ../src/protocols/msn/userlist.c:350
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 已经将您从好友名单中删除。"
+
+#: ../src/protocols/msn/userlist.c:679
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "无法添加“%s”。"
 
-#: src/protocols/msn/userlist.c:661
+#: ../src/protocols/msn/userlist.c:681
 msgid "The screen name specified is invalid."
 msgstr "指定的用户名无效。"
 
-#: src/protocols/napster/napster.c:260
+#: ../src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "无法从服务器 %s 读取信息。命令为 %hd,长度为 %hd。"
 
-#: src/protocols/napster/napster.c:290
-#, fuzzy
+#: ../src/protocols/napster/napster.c:296
 msgid "Unknown server error."
-msgstr "未知错误。"
-
-#: src/protocols/napster/napster.c:339
+msgstr "未知服务器错误。"
+
+#: ../src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数: %s,文件数: %s,大小: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "您已经断开与服务器的连接。"
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: ../src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
+#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
-msgstr "组(_G):"
+msgstr "组(_G):"
 
 #. *< type
 #. *< ui_requirement
@@ -7200,246 +7976,247 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: ../src/protocols/napster/napster.c:699
+#: ../src/protocols/napster/napster.c:701
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "请求的参数未传入"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "无法写入网络"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "无法从网络读取套接字"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "与服务器通讯出错"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "会议未找到"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "会议不存在"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "已存在同名文件夹"
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "支持"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "密码已过期"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "无效的密码"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "用户未找到"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "账户已经被禁用"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "服务器无法访问目录"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系统管理员已经禁用此操作"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "服务器不可用;请稍候再试"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "无法为同一个文件夹添加两次联系人"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "无法添加您自己"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "无效的用户名或密码"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"
 
-#: src/protocols/novell/nmuser.c:1932
+#: ../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:1935
+#: ../src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您无法将同一个人两次添加到对话"
 
-#: src/protocols/novell/nmuser.c:1939
+#: ../src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您达到了所允许联系人的最大数目"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "您输入了无效的用户名"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "更新目录时发生了错误"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "不兼容的协议版本"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "用户已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../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:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "用户或者离线,或者已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "登录失败(%s)。"
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "无法发送消息。无法获得用户的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:381
+#: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "无法将 %s 添加到您的好友列表中(%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "无法发送消息(%s)。"
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "无法邀请用户(%s)。"
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "无法给 %s 发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "无法发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:617
+#: ../src/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:690
+#: ../src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "无法获得用户 %s 的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "无法将用户添加到您的隐私列表中(%s)。"
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "无法将“%s”添加到您的好友列表中(%s)。"
 
-#: src/protocols/novell/novell.c:836
+#: ../src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "无法将 %s 添加到您的许可列表中(%s)。"
 
-#: src/protocols/novell/novell.c:904
+#: ../src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "电话号码"
 
-#: src/protocols/novell/novell.c:1456
+#: ../src/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "部门"
 
-#: src/protocols/novell/novell.c:1458
+#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "个人称谓"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
+#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
+#: ../src/protocols/oscar/oscar.c:6185
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "用户 ID"
 
@@ -7450,46 +8227,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1520
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1618
+#: ../src/protocols/novell/novell.c:1644
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1643
+#: ../src/protocols/novell/novell.c:1669
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "处理事件或响应出错(%s)。"
-
-#: src/protocols/novell/novell.c:1707
+#: ../src/protocols/novell/novell.c:1726
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1719
+#: ../src/protocols/novell/novell.c:1738
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/novell/novell.c:1722
+#: ../src/protocols/novell/novell.c:1741
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1857
+#: ../src/protocols/novell/novell.c:1876
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1885
+#: ../src/protocols/novell/novell.c:1904
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1905
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7500,15 +8272,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: ../src/protocols/novell/novell.c:1907
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1995
+#: ../src/protocols/novell/novell.c:2014
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:2051
+#: ../src/protocols/novell/novell.c:2070
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7518,25 +8290,20 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: ../src/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2171
+#: ../src/protocols/novell/novell.c:2190
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2475
+#: ../src/protocols/novell/novell.c:2499
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "显示为离线"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7547,296 +8314,296 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3561
+#: ../src/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3565
+#: ../src/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "服务器端口"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:205
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:208
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:209
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:210
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:214
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:215
 msgid "Responses lost"
 msgstr "响应丢失"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:216
 msgid "Request denied"
 msgstr "请求被禁止"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:217
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:218
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:219
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:220
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:221
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:222
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:223
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:224
 msgid "List overflow"
 msgstr "列表溢出"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:225
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:226
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:227
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
-#: src/protocols/oscar/oscar.c:616
+#: ../src/protocols/oscar/oscar.c:702
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:619
+#: ../src/protocols/oscar/oscar.c:705
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8168
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:718
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:724
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:727
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:730
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:733
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:736
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:739
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:742
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:745
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:748
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: ../src/protocols/oscar/oscar.c:751
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../src/protocols/oscar/oscar.c:754
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:671
+#: ../src/protocols/oscar/oscar.c:757
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:761
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:764
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:767
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8030
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8058
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8048
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:709
+#: ../src/protocols/oscar/oscar.c:795
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: ../src/protocols/oscar/oscar.c:799
+msgid "Online"
+msgstr "在线"
+
+#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "能力"
-
-#: src/protocols/oscar/oscar.c:801
+#: ../src/protocols/oscar/oscar.c:885
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:958
+#: ../src/protocols/oscar/oscar.c:1034
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:960
+#: ../src/protocols/oscar/oscar.c:1036
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:968
+#: ../src/protocols/oscar/oscar.c:1044
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:1126
+#: ../src/protocols/oscar/oscar.c:1205
 #, 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:1547
+#: ../src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1552
+#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1587
+#: ../src/protocols/oscar/oscar.c:1696
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1591
+#: ../src/protocols/oscar/oscar.c:1700
 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:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "连接"
-
-#: src/protocols/oscar/oscar.c:1661
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
+msgid "_Connect"
+msgstr "连接(_C)"
+
+#: ../src/protocols/oscar/oscar.c:1782
+#, c-format
 msgid "You have lost your connection to chat room %s."
-msgstr "您已经断开与聊天室 %s 的连接。"
-
-#: src/protocols/oscar/oscar.c:1684
+msgstr "您已经丢失与聊天室 %s 的连接。"
+
+#: ../src/protocols/oscar/oscar.c:1805
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1754
+#: ../src/protocols/oscar/oscar.c:1877
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1770
+#: ../src/protocols/oscar/oscar.c:1893
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7846,73 +8613,76 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1799
+#: ../src/protocols/oscar/oscar.c:1921
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1911
+#: ../src/protocols/oscar/oscar.c:2035
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
 #. clientip & verifiedip failed, request a redirect
 #. * that is, we want the sender to connect to us
+#. *
+#. * Above, we checked if we had previously attempted a connection
+#. * redirect to prevent a conflict with the joscar library
+#.
 #. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:2194
 msgid "Attempting connection redirect..."
-msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
+msgstr "正在尝试连接重定向..."
 
 #. proxyip timed out
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
+#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
+#: ../src/protocols/oscar/oscar.c:2240
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
+" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
+">Advanced."
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:2338
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:2211
+#: ../src/protocols/oscar/oscar.c:2343
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
+#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
 msgid "Unable to log into file transfer proxy."
-msgstr "无法写入文件 %s。"
-
-#: src/protocols/oscar/oscar.c:2532
+msgstr "无法登录到文件传送代理服务器。"
+
+#: ../src/protocols/oscar/oscar.c:2668
 #, fuzzy
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:2738
+#: ../src/protocols/oscar/oscar.c:2911
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:2915
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2747
+#: ../src/protocols/oscar/oscar.c:2920
 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."
@@ -7920,33 +8690,33 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2752
+#: ../src/protocols/oscar/oscar.c:2925
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2783
+#: ../src/protocols/oscar/oscar.c:2953
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2853
+#: ../src/protocols/oscar/oscar.c:3023
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2877
+#: ../src/protocols/oscar/oscar.c:3047
 msgid "The SecurID key entered is invalid."
 msgstr "输入的 SecurID 密钥无效。"
 
-#: src/protocols/oscar/oscar.c:2891
+#: ../src/protocols/oscar/oscar.c:3061
 msgid "Enter SecurID"
 msgstr "输入 SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: ../src/protocols/oscar/oscar.c:3062
 msgid "Enter the 6 digit number from the digital display."
-msgstr "输入显示的六位数字。"
-
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+msgstr "输入所显示的六位数字。"
+
+#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
+#: ../src/protocols/oscar/oscar.c:3223
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7954,24 +8724,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:3054
+#: ../src/protocols/oscar/oscar.c:3226
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:3085
+#: ../src/protocols/oscar/oscar.c:3247
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/oscar/oscar.c:4352
+#: ../src/protocols/oscar/oscar.c:4555
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:4355
+#: ../src/protocols/oscar/oscar.c:4558
 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 "
@@ -7980,73 +8750,77 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:4394
+#: ../src/protocols/oscar/oscar.c:4597
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:4402
+#: ../src/protocols/oscar/oscar.c:4605
 msgid "Authorization Request Message:"
-msgstr "认证请求消息:"
-
-#: src/protocols/oscar/oscar.c:4403
+msgstr "认证请求消息:"
+
+#: ../src/protocols/oscar/oscar.c:4606
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:4433
+#: ../src/protocols/oscar/oscar.c:4636
 #, 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:4438 src/protocols/oscar/oscar.c:4440
+#: ../src/protocols/oscar/oscar.c:4641
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:4643
+msgid "_Request Authorization"
+msgstr "请求认证(_R)"
+
+#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
+#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
+#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:4483
+#: ../src/protocols/oscar/oscar.c:4686
 msgid "Authorization Denied Message:"
-msgstr "认证拒绝消息:"
-
-#: src/protocols/oscar/oscar.c:4590
-#, fuzzy, c-format
+msgstr "认证拒绝消息:"
+
+#: ../src/protocols/oscar/oscar.c:4793
+#, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %u 想要将您加为他/她的好友,理由如下:\n"
+"用户 %u 想要将 %s 加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:4612
+#: ../src/protocols/oscar/oscar.c:4815
 #, 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:4613
+#: ../src/protocols/oscar/oscar.c:4816
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: ../src/protocols/oscar/oscar.c:4823
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:4628
+#: ../src/protocols/oscar/oscar.c:4831
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8059,7 +8833,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:4839
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8069,10 +8843,10 @@
 msgstr ""
 "您收到了 ICQ 寻呼\n"
 "\n"
-"发出人: %s [%s]\n"
+"发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8082,35 +8856,35 @@
 msgstr ""
 "您从 %s [%s]收到了 ICQ 电子邮件\n"
 "\n"
-"内容是:\n"
+"内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: ../src/protocols/oscar/oscar.c:4868
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
-
-#: src/protocols/oscar/oscar.c:4671
+msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
+
+#: ../src/protocols/oscar/oscar.c:4874
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:4675
-msgid "Decline"
-msgstr "拒绝"
-
-#: src/protocols/oscar/oscar.c:4759
+#: ../src/protocols/oscar/oscar.c:4878
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../src/protocols/oscar/oscar.c:4962
 #, 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:4768
+#: ../src/protocols/oscar/oscar.c:4971
 #, 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:4777
+#: ../src/protocols/oscar/oscar.c:4980
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8118,84 +8892,94 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:4786
+#: ../src/protocols/oscar/oscar.c:4989
 #, 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:4795
+#: ../src/protocols/oscar/oscar.c:4998
 #, 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:4804
+#: ../src/protocols/oscar/oscar.c:5007
 #, 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:4863
+#: ../src/protocols/oscar/oscar.c:5066
 #, 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:4924
+msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
+
+#: ../src/protocols/oscar/oscar.c:5127
 #, c-format
 msgid "SNAC threw error: %s\n"
-msgstr "SNAC 扔出错误: %s\n"
+msgstr "SNAC 扔出错误:%s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: ../src/protocols/oscar/oscar.c:5164
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
+#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4964
+#: ../src/protocols/oscar/oscar.c:5167
+#: ../src/protocols/sametime/sametime.c:2373
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr "无法给 %s 发送消息:"
-
-#: src/protocols/oscar/oscar.c:5024
+msgstr "无法给 %s 发送消息:"
+
+#: ../src/protocols/oscar/oscar.c:5227
 #, c-format
 msgid "User information not available: %s"
-msgstr "用户信息不可用: %s"
-
-#: src/protocols/oscar/oscar.c:5027
+msgstr "用户信息不可用:%s"
+
+#: ../src/protocols/oscar/oscar.c:5230
 #, c-format
 msgid "User information for %s unavailable:"
-msgstr "%s 的用户信息不可用:"
-
-#: src/protocols/oscar/oscar.c:5054
+msgstr "%s 的用户信息不可用:"
+
+#: ../src/protocols/oscar/oscar.c:5257
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: ../src/protocols/oscar/oscar.c:5262
+#: ../src/protocols/yahoo/yahoo_profile.c:1153
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:5142
+#: ../src/protocols/oscar/oscar.c:5267
+msgid "Capabilities"
+msgstr "能力"
+
+#: ../src/protocols/oscar/oscar.c:5285
+msgid "Available Message"
+msgstr "可用消息"
+
+#: ../src/protocols/oscar/oscar.c:5402
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: ../src/protocols/oscar/oscar.c:5588
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:5809
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:5555
+#: ../src/protocols/oscar/oscar.c:5810
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8203,177 +8987,165 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:5631
+#: ../src/protocols/oscar/oscar.c:5883
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
 #. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
+#: ../src/protocols/oscar/oscar.c:5925
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "女"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "男"
-
-#: src/protocols/oscar/oscar.c:5995
+#: ../src/protocols/oscar/oscar.c:6207
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5999
+#: ../src/protocols/oscar/oscar.c:6211
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:6004
+#: ../src/protocols/oscar/oscar.c:6216
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:6012
+#: ../src/protocols/oscar/oscar.c:6224
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:6232
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/oscar.c:6233
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/oscar/oscar.c:6234
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:6023
+#: ../src/protocols/oscar/oscar.c:6235
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:6237
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:6082
+#: ../src/protocols/oscar/oscar.c:6295
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "下列用户名已经和 %s 关联"
-
-#: src/protocols/oscar/oscar.c:6140
+#: ../src/protocols/oscar/oscar.c:6335
+#, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "下列用户名已经和 %s 关联"
+
+#: ../src/protocols/oscar/oscar.c:6366
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:6161
+#: ../src/protocols/oscar/oscar.c:6387
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:6163
+#: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:6194
+#: ../src/protocols/oscar/oscar.c:6420
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:6197
+#: ../src/protocols/oscar/oscar.c:6423
 #, 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:6200
-#, fuzzy, c-format
+msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名与原始用户名不符。"
+
+#: ../src/protocols/oscar/oscar.c:6426
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名太长。"
-
-#: src/protocols/oscar/oscar.c:6203
+msgstr "错误 0x%04x:无法格式化用户名,原因是用户名无效。"
+
+#: ../src/protocols/oscar/oscar.c:6429
 #, 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:6206
+msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名太长。"
+
+#: ../src/protocols/oscar/oscar.c:6432
 #, 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:6209
+msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
+
+#: ../src/protocols/oscar/oscar.c:6435
 #, 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:6212
+msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
+
+#: ../src/protocols/oscar/oscar.c:6438
 #, 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:6215
+msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址无效。"
+
+#: ../src/protocols/oscar/oscar.c:6441
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "错误 0x%04x: 未知错误。"
-
-#: src/protocols/oscar/oscar.c:6225
+msgstr "错误 0x%04x:未知错误。"
+
+#: ../src/protocols/oscar/oscar.c:6451
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-"您的用户名格式化后如下:\n"
+"您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:6231
+#: ../src/protocols/oscar/oscar.c:6457
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: ../src/protocols/oscar/oscar.c:6535
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:6480
+#: ../src/protocols/oscar/oscar.c:6775
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:6481
+#: ../src/protocols/oscar/oscar.c:6776
 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 "
@@ -8382,7 +9154,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:6495
+#: ../src/protocols/oscar/oscar.c:6790
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8392,11 +9164,11 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:6500
+#: ../src/protocols/oscar/oscar.c:6795
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: ../src/protocols/oscar/oscar.c:6837
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8408,24 +9180,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: ../src/protocols/oscar/oscar.c:6842
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "无法设置 AIM 离开消息。"
-
-#: src/protocols/oscar/oscar.c:6561
-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:6691
+#: ../src/protocols/oscar/oscar.c:6911
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8435,16 +9194,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
+#: ../src/protocols/oscar/oscar.c:7334
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:6798
+#: ../src/protocols/oscar/oscar.c:7020
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:7021
 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 "
@@ -8453,13 +9212,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
+#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
+#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:7090
+#: ../src/protocols/oscar/oscar.c:7318
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8467,11 +9226,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:7332
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8481,137 +9240,129 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:7187
+#: ../src/protocols/oscar/oscar.c:7415
 #, 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:7193
+#: ../src/protocols/oscar/oscar.c:7421
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:7237
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:7465
+#, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %s 想要将您加为好友,原因如下:\n"
+"用户 %s 想要将 %s 加为好友,原因如下:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: ../src/protocols/oscar/oscar.c:7510
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:7283
+#: ../src/protocols/oscar/oscar.c:7511
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:7514
 #, 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:7287
+#: ../src/protocols/oscar/oscar.c:7515
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
-msgstr "交换(_E):"
-
-#: src/protocols/oscar/oscar.c:7360
+msgstr "交换(_E):"
+
+#: ../src/protocols/oscar/oscar.c:7588
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:7430
+#: ../src/protocols/oscar/oscar.c:7658
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:7565
-msgid "Away Message"
-msgstr "离开消息"
-
-#: src/protocols/oscar/oscar.c:7854
+#: ../src/protocols/oscar/oscar.c:7815
+msgid "<i>(retrieving)</i>"
+msgstr "<i>(正获取)</i>"
+
+#: ../src/protocols/oscar/oscar.c:8121
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:7855
+#: ../src/protocols/oscar/oscar.c:8122
 msgid "Buddy Comment:"
-msgstr "好友注释:"
-
-#: src/protocols/oscar/oscar.c:7874
+msgstr "好友注释:"
+
+#: ../src/protocols/oscar/oscar.c:8141
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:7880
+#: ../src/protocols/oscar/oscar.c:8148
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:7892
+#: ../src/protocols/oscar/oscar.c:8161
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7909
+#: ../src/protocols/oscar/oscar.c:8180
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7969
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8237
 msgid "Require authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:7972
-#, fuzzy
-msgid "Hide IP address"
-msgstr "IP 地址"
-
-#: src/protocols/oscar/oscar.c:7975
-#, fuzzy
-msgid "Web aware"
-msgstr "网上留意"
-
-#: src/protocols/oscar/oscar.c:7980
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8240
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:8245
 msgid "ICQ Privacy Options"
-msgstr "代理选项"
-
-#: src/protocols/oscar/oscar.c:7997
+msgstr "ICQ 隐私选项"
+
+#: ../src/protocols/oscar/oscar.c:8262
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7998
+#: ../src/protocols/oscar/oscar.c:8263
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:8005
+#: ../src/protocols/oscar/oscar.c:8270
 msgid "New screen name formatting:"
-msgstr "新的用户名格式化:"
-
-#: src/protocols/oscar/oscar.c:8057
+msgstr "新的用户名格式化:"
+
+#: ../src/protocols/oscar/oscar.c:8322
 msgid "Change Address To:"
-msgstr "将地址更改为:"
-
-#: src/protocols/oscar/oscar.c:8102
+msgstr "将地址更改为:"
+
+#: ../src/protocols/oscar/oscar.c:8367
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: ../src/protocols/oscar/oscar.c:8370
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:8106
+#: ../src/protocols/oscar/oscar.c:8371
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8619,87 +9370,64 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:8123
+#: ../src/protocols/oscar/oscar.c:8388
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:8389
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:8125
+#: ../src/protocols/oscar/oscar.c:8390
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "设置用户信息..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: ../src/protocols/oscar/oscar.c:8483
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "更改密码..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: ../src/protocols/oscar/oscar.c:8494
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: ../src/protocols/oscar/oscar.c:8498
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-#, fuzzy
-msgid "Show privacy options..."
-msgstr "显示全部选项"
+#: ../src/protocols/oscar/oscar.c:8508
+msgid "Set Privacy Options..."
+msgstr "显示隐私选项..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: ../src/protocols/oscar/oscar.c:8515
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8519
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:8258
+#: ../src/protocols/oscar/oscar.c:8523
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:8262
+#: ../src/protocols/oscar/oscar.c:8527
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:8534
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:8275
+#: ../src/protocols/oscar/oscar.c:8540
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: ../src/protocols/oscar/oscar.c:8545
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:8350
-#, fuzzy
-msgid "Use recent buddies group"
-msgstr "用户未在组中"
-
-#: src/protocols/oscar/oscar.c:8353
-#, fuzzy
-msgid "Show how long you have been idle"
-msgstr "允许您手动配置您睡了多长时间"
-
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8710,185 +9438,544 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:8723 ../src/protocols/oscar/oscar.c:8725
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:8497
+#: ../src/protocols/oscar/oscar.c:8744
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:8500
+#: ../src/protocols/oscar/oscar.c:8747
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:8750 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/sametime/sametime.c:1134
-#, fuzzy
+#: ../src/protocols/oscar/oscar.c:8754
+msgid ""
+"Use AIM/ICQ proxy server\n"
+"(slower, but usually works)"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:415
+msgid "Connection closed (writing)"
+msgstr "连接已关闭(写入)"
+
+#: ../src/protocols/sametime/sametime.c:1267
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>组标题:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1268
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Notes 组 ID:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1270
+#, c-format
+msgid "Info for Group %s"
+msgstr "组 %s 的信息"
+
+#: ../src/protocols/sametime/sametime.c:1272
+msgid "Notes Address Book Information"
+msgstr "Notes 地址簿信息"
+
+#: ../src/protocols/sametime/sametime.c:1304
+msgid "Invite Group to Conference..."
+msgstr "邀请组加入会议..."
+
+#: ../src/protocols/sametime/sametime.c:1314
+msgid "Get Notes Address Book Info"
+msgstr "获得 Notes 地址簿信息"
+
+#: ../src/protocols/sametime/sametime.c:1467
 msgid "Sending Handshake"
-msgstr "发送 cookie"
-
-#: src/protocols/sametime/sametime.c:1139
-#, fuzzy
+msgstr "发送握手"
+
+#: ../src/protocols/sametime/sametime.c:1472
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "正在传送开始"
-
-#: src/protocols/sametime/sametime.c:1144
+msgstr "等候握手应答"
+
+#: ../src/protocols/sametime/sametime.c:1477
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1149
+#: ../src/protocols/sametime/sametime.c:1482
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Login Redirected"
-msgstr "登录服务器"
-
-#: src/protocols/sametime/sametime.c:1159
-#, fuzzy
+msgstr "登录被重定向"
+
+#: ../src/protocols/sametime/sametime.c:1493
 msgid "Forcing Login"
-msgstr "登入"
-
-#: src/protocols/sametime/sametime.c:1163
+msgstr "强制登入"
+
+#: ../src/protocols/sametime/sametime.c:1497
 msgid "Login Acknowledged"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
-msgid "Connected to Sametime Community Server"
-msgstr "连接到 SILC 服务器"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "活跃"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "无法创建套接字"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC 昵称不能包含空格"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC 协议插件"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC 协议插件"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "用户 ID"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "无代理"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "无代理"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+msgstr "登录被接受"
+
+#: ../src/protocols/sametime/sametime.c:1502
+msgid "Starting Services"
+msgstr "启动服务"
+
+#: ../src/protocols/sametime/sametime.c:1507
+msgid "Connected"
+msgstr "已连接"
+
+#: ../src/protocols/sametime/sametime.c:1605
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1610
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1662
+msgid "Connection reset"
+msgstr "连接重置"
+
+#: ../src/protocols/sametime/sametime.c:1669
+#, fuzzy, c-format
+msgid "Error reading from socket: %s"
+msgstr "从套接字读取时出错。"
+
+#. this is a regular connect, error out
+#: ../src/protocols/sametime/sametime.c:1698
+#: ../src/protocols/sametime/sametime.c:3696
+#, fuzzy
+msgid "Unable to connect to host"
+msgstr "无法连接到服务器。"
+
+#: ../src/protocols/sametime/sametime.c:1736
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1910
+msgid "Conference Closed"
+msgstr "会议已关闭"
+
+#: ../src/protocols/sametime/sametime.c:2367
+#, fuzzy
+msgid "Unable to send message: "
+msgstr "无法发送消息: %s"
+
+#: ../src/protocols/sametime/sametime.c:2926
+#, fuzzy
+msgid "Place Closed"
+msgstr "已取消"
+
+#: ../src/protocols/sametime/sametime.c:3217
+msgid "Microphone"
+msgstr "话筒"
+
+#: ../src/protocols/sametime/sametime.c:3218
+msgid "Speakers"
+msgstr "扬声器"
+
+#: ../src/protocols/sametime/sametime.c:3219
+msgid "Video Camera"
+msgstr "摄像头"
+
+#: ../src/protocols/sametime/sametime.c:3223
+msgid "File Transfer"
+msgstr "文件传送"
+
+#: ../src/protocols/sametime/sametime.c:3257
+#, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
+msgstr ""
+"\n"
+"<b>支持:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:3262
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>外部用户</b>"
+
+#: ../src/protocols/sametime/sametime.c:3368
+msgid "Create conference with user"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3369
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3373
+msgid "New Conference"
+msgstr "新建会议"
+
+#: ../src/protocols/sametime/sametime.c:3375
+msgid "Create"
+msgstr "创建"
+
+#: ../src/protocols/sametime/sametime.c:3439
+msgid "Available Conferences"
+msgstr "可用会议"
+
+#: ../src/protocols/sametime/sametime.c:3445
+msgid "Create New Conference..."
+msgstr "创建新会议..."
+
+#: ../src/protocols/sametime/sametime.c:3452
+msgid "Invite user to a conference"
+msgstr "邀请用户加入会议"
+
+#: ../src/protocols/sametime/sametime.c:3453
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3458
+msgid "Invite to Conference"
+msgstr "邀请会议"
+
+#: ../src/protocols/sametime/sametime.c:3460
+msgid "Invite"
+msgstr "邀请"
+
+#: ../src/protocols/sametime/sametime.c:3548
+msgid "Invite to Conference..."
+msgstr "邀请会议..."
+
+#: ../src/protocols/sametime/sametime.c:3553
+msgid "Send TEST Announcement"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3600
+msgid "No Sametime Community Server specified"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3622
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3627
+#, fuzzy
+msgid "Meanwhile Connection Setup"
+msgstr "远程连接失败"
+
+#: ../src/protocols/sametime/sametime.c:3628
+msgid "No Sametime Community Server Specified"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:4085
+msgid "<b>External User</b><br>"
+msgstr "<b>外部用户</b><br>"
+
+#: ../src/protocols/sametime/sametime.c:4088
+#, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>用户 ID:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4094
+#, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>全名:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4100
+msgid "<b>Last Known Client:</b> "
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:4108
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "未知 (0x%04x)<br>"
+
+#: ../src/protocols/sametime/sametime.c:4115
+#, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>支持:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4121
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>状态:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5427
+msgid "User Name"
+msgstr "用户名"
+
+#: ../src/protocols/sametime/sametime.c:4267
+#: ../src/protocols/sametime/sametime.c:5430
+msgid "Sametime ID"
+msgstr "Sametime ID"
+
+#: ../src/protocols/sametime/sametime.c:4291
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:4292
+#, fuzzy, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
+
+#: ../src/protocols/sametime/sametime.c:4297
+msgid "Select User"
+msgstr "选择用户"
+
+#: ../src/protocols/sametime/sametime.c:4367
+#, fuzzy
+msgid "Unable to add user: user not found"
+msgstr "无法添加 %s (%s) 上的用户"
+
+#: ../src/protocols/sametime/sametime.c:4369
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:4374
+msgid "Unable to add user"
+msgstr "无法添加用户"
+
+#: ../src/protocols/sametime/sametime.c:4946
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"读取文件 %s 出错:\n"
+"%s。\n"
+
+#: ../src/protocols/sametime/sametime.c:5077
+msgid "Remotely Stored Buddy List"
+msgstr "远程存储好友列表"
+
+#: ../src/protocols/sametime/sametime.c:5082
+msgid "Buddy List Storage Mode"
+msgstr "好友列表存储模式"
+
+#: ../src/protocols/sametime/sametime.c:5085
+msgid "Local Buddy List Only"
+msgstr "本地好友列表"
+
+#: ../src/protocols/sametime/sametime.c:5087
+msgid "Merge List from Server"
+msgstr "与服务器上的列表合并"
+
+#: ../src/protocols/sametime/sametime.c:5089
+msgid "Merge and Save List to Server"
+msgstr "合并并将列表保存到服务器"
+
+#: ../src/protocols/sametime/sametime.c:5091
+msgid "Synchronize List with Server"
+msgstr "与服务器同步列表"
+
+#: ../src/protocols/sametime/sametime.c:5140
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr "为账户 %s 导入 Sametime 列表"
+
+#: ../src/protocols/sametime/sametime.c:5179
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "为账户 %s 导出 Sametime 列表"
+
+#: ../src/protocols/sametime/sametime.c:5232
+msgid "Unable to add group: group exists"
+msgstr "无法添加组:组已经存在"
+
+#: ../src/protocols/sametime/sametime.c:5233
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5236
+#: ../src/protocols/sametime/sametime.c:5365
+msgid "Unable to add group"
+msgstr "无法添加组"
+
+#: ../src/protocols/sametime/sametime.c:5295
+msgid "Possible Matches"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5311
+msgid "Notes Address Book group results"
+msgstr "Notes 地址簿组结果"
+
+#: ../src/protocols/sametime/sametime.c:5312
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5317
+msgid "Select Notes Address Book"
+msgstr "选择 Notes 地址簿"
+
+#: ../src/protocols/sametime/sametime.c:5359
+#, fuzzy
+msgid "Unable to add group: group not found"
+msgstr "无法从网络读取套接字"
+
+#: ../src/protocols/sametime/sametime.c:5361
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5402
+#, fuzzy
+msgid "Notes Address Book Group"
+msgstr "添加到地址簿"
+
+#: ../src/protocols/sametime/sametime.c:5403
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5451
+#, c-format
+msgid "Search results for '%s'"
+msgstr "“%s”的搜索结果"
+
+#: ../src/protocols/sametime/sametime.c:5452
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5484
+#, fuzzy
+msgid "No matches"
+msgstr "无匹配"
+
+#: ../src/protocols/sametime/sametime.c:5485
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5489
+msgid "No Matches"
+msgstr "无匹配"
+
+#: ../src/protocols/sametime/sametime.c:5526
+msgid "Search for a user"
+msgstr "搜索用户"
+
+#: ../src/protocols/sametime/sametime.c:5527
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5530
+msgid "User Search"
+msgstr "用户搜索"
+
+#: ../src/protocols/sametime/sametime.c:5542
+msgid "Import Sametime List..."
+msgstr "导入 Sametime 列表..."
+
+#: ../src/protocols/sametime/sametime.c:5546
+msgid "Export Sametime List..."
+msgstr "导出 Sametime 列表..."
+
+#: ../src/protocols/sametime/sametime.c:5550
+msgid "Add Notes Address Book Group..."
+msgstr "添加 Notes 地址簿组..."
+
+#: ../src/protocols/sametime/sametime.c:5554
+msgid "User Search..."
+msgstr "用户搜索..."
+
+#: ../src/protocols/sametime/sametime.c:5651
+msgid "Force login (ignore server redirects)"
+msgstr "强制登录(忽略服务器重定向)"
+
+#. pretend to be Sametime Connect
+#: ../src/protocols/sametime/sametime.c:5661
+msgid "Hide client identity"
+msgstr "隐藏客户端身份"
+
+#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "用户 %s 未出现于网络中"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "密钥协议"
 
-#: src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "无法执行密钥协议"
 
-#: src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "密钥协议中发生了错误"
 
-#: src/protocols/silc/buddy.c:119
+#: ../src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "密钥协议失败"
 
-#: src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "密钥协议时超时"
 
-#: src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "密钥协议已中止"
 
-#: src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "密钥协议已经开始"
 
-#: src/protocols/silc/buddy.c:139
+#: ../src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "无法与您自己进行密钥协议"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "远程用户已经从网络中消失了"
 
-#: src/protocols/silc/buddy.c:293
+#: ../src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
 
-#: src/protocols/silc/buddy.c:297
+#: ../src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8899,59 +9986,59 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: ../src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "密钥协议请求"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "无法设定聊天密钥"
 
-#: src/protocols/silc/buddy.c:464
+#: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "设定聊天密码"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "显示公钥"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:236
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
-#: src/protocols/silc/buddy.c:734
+#: ../src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s 好友不可信"
 
-#: src/protocols/silc/buddy.c:737
+#: ../src/protocols/silc/buddy.c:737
 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."
@@ -8960,250 +10047,250 @@
 "钥。"
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: ../src/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "打开..."
 
-#: src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s 好友未出现于网络中"
 
-#: src/protocols/silc/buddy.c:1040
+#: ../src/protocols/silc/buddy.c:1076
 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:1043
-msgid "Import..."
-msgstr "导入..."
-
-#: src/protocols/silc/buddy.c:1130
+#: ../src/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "导入(_I)..."
+
+#: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "选择正确用户"
 
-#: src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/buddy.c:1177
 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:1134
+#: ../src/protocols/silc/buddy.c:1179
 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:1415
+#: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "已脱离"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "不舒服"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "叫醒我"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "多动"
 
-#: src/protocols/silc/buddy.c:1427
+#: ../src/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
+#: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "用户模式"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "状态文本"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "地理位置"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "重置聊天密钥"
 
-#: src/protocols/silc/buddy.c:1572
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "带密钥交换开聊"
 
-#: src/protocols/silc/buddy.c:1576
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1588
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "杀死用户"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+msgid "Draw On Whiteboard"
+msgstr "在白板上绘画"
+
+#: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
-msgstr "密码句(_P):"
-
-#: src/protocols/silc/chat.c:79
+msgstr "密码句(_P):"
+
+#: ../src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
 msgid "Channel Information"
 msgstr "频道信息"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>频道名称:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>用户数:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>频道创建人:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>频道密码句:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: ../src/protocols/silc/chat.c:141
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>频道 HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: ../src/protocols/silc/chat.c:146
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>频道话题:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: ../src/protocols/silc/chat.c:151
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>频道模式:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:164
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>创建者密钥指纹:</b><br%s"
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>创建者密钥漏印:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: ../src/protocols/silc/chat.c:235
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:290
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: src/protocols/silc/chat.c:398
+#: ../src/protocols/silc/chat.c:399
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: src/protocols/silc/chat.c:405
+#: ../src/protocols/silc/chat.c:406
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: src/protocols/silc/chat.c:410
+#: ../src/protocols/silc/chat.c:411
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9215,316 +10302,324 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
+#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:905
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
 msgid "Add / Remove"
 msgstr "添加/删除"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:577
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "密码句"
 
-#: src/protocols/silc/chat.c:591
+#: ../src/protocols/silc/chat.c:592
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: src/protocols/silc/chat.c:593
+#: ../src/protocols/silc/chat.c:594
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:721
 msgid "User Limit"
 msgstr "允许限制"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: src/protocols/silc/chat.c:863
+#: ../src/protocols/silc/chat.c:877
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:871
+#: ../src/protocols/silc/chat.c:885
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:890
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:898
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:911
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:916
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:924
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:930
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:935
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:942
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:933
+#: ../src/protocols/silc/chat.c:947
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:954
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:959
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:1033
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:1012
+#: ../src/protocols/silc/chat.c:1037
 #, 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:1071
+#: ../src/protocols/silc/chat.c:1096
 #, 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:1073
+#: ../src/protocols/silc/chat.c:1098
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1099
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+msgid "Call Command"
+msgstr "调用命令"
+
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: 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:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: ../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:205
+#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全文件传送"
 
-#: 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
+#: ../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 "文件传送时出错"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "权限被禁止"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "密钥协议失败"
 
-#: src/protocols/silc/ft.c:102
-#, fuzzy
+#: ../src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "文件传送会话不存在"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "没有激活的文件传送会话"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "文件传送已开始"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "无法执行文件传送的密钥协议"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "无法开始传送文件"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "无法发送文件"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573
 #, 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:425
+#: ../src/protocols/silc/ops.c:639
 #, 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:429
+#: ../src/protocols/silc/ops.c:643
 #, 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:462
+#: ../src/protocols/silc/ops.c:676
 #, 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:470
+#: ../src/protocols/silc/ops.c:684
 #, 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:499
+#: ../src/protocols/silc/ops.c:713
 #, 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:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s (%s) 杀死了"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s (%s) 杀死"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "服务器登出"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "职称"
 
-#: src/protocols/silc/ops.c:834
+#: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "职位"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "组织"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "单元"
 
-#: src/protocols/silc/ops.c:861
+#: ../src/protocols/silc/ops.c:1075
 msgid "EMail"
 msgstr "电子邮件"
 
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "备注"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: ../src/protocols/silc/ops.c:1211
+msgid "Status Text"
+msgstr "状态文本"
+
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
-msgstr "更多..."
-
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: ../src/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "更多(_M)..."
+
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: src/protocols/silc/ops.c:1155
+#: ../src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: src/protocols/silc/ops.c:1166
+#: ../src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "更改昵称失败"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "房间列表"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "无法获取房间列表"
 
-#: src/protocols/silc/ops.c:1291
+#: ../src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1305
+#: ../src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "服务器统计"
 
-#: src/protocols/silc/ops.c:1335
+#: ../src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "无法获取服务器统计"
 
-#: src/protocols/silc/ops.c:1344
+#: ../src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
-#: src/protocols/silc/ops.c:1366
+#: ../src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9559,113 +10654,113 @@
 "总计服务器管理员数: %d\n"
 "总计路由器管理员数: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: ../src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "网络统计"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: ../src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping 失败"
 
-#: src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "服务器对 ping 的响应"
 
-#: src/protocols/silc/ops.c:1410
+#: ../src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1494
+#: ../src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1499
+#: ../src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1508
+#: ../src/protocols/silc/ops.c:1722
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1543
+#: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1607
+#: ../src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1654
+#: ../src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1695
+#: ../src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1724
+#: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1727
+#: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1730
+#: ../src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1733
+#: ../src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1736
+#: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1739
+#: ../src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1742
+#: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1744
+#: ../src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
-#: src/protocols/silc/pk.c:103
+#: ../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 "收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
 
-#: src/protocols/silc/pk.c:108
+#: ../src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "收到了 %s 的公钥。您想要接受此公钥吗?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9678,48 +10773,64 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "校验公钥"
 
-#: src/protocols/silc/pk.c:119
-msgid "View..."
+#: ../src/protocols/silc/pk.c:119
+#, fuzzy
+msgid "_View..."
 msgstr "查看..."
 
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "不支持的公钥类型"
 
-#: src/protocols/silc/silc.c:154
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/protocols/silc/silc.c:186
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
-#: src/protocols/silc/silc.c:197
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-#: src/protocols/silc/silc.c:270
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "内存溢出"
 
+#: ../src/protocols/silc/silc.c:328
+#, fuzzy
+msgid "Cannot initialize SILC protocol"
+msgstr "无法初始化 SILC 客户连接"
+
+#: ../src/protocols/silc/silc.c:335
+#, fuzzy
+msgid "Cannot find/access ~/.silc directory"
+msgstr "无法发送目录。"
+
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:630
+#: ../src/protocols/silc/silc.c:349
+#, fuzzy, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "无法装入公钥"
+
+#: ../src/protocols/silc/silc.c:369
+msgid "Unable to create connection"
+msgstr "无法创建连接"
+
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr "普通"
-
-#: src/protocols/silc/silc.c:657
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9727,43 +10838,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "短信"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "彩信"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:681
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:712
+#: ../src/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9772,182 +10883,233 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1435
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:752
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:800
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
+#, fuzzy
+msgid "Create New SILC Key Pair"
+msgstr "创建 SILC 密钥对..."
+
+#: ../src/protocols/silc/silc.c:841
+#, fuzzy
+msgid "Passphrases do not match"
+msgstr "新密码不相同。"
+
+#: ../src/protocols/silc/silc.c:885
+#, fuzzy
+msgid "Key Pair Generation failed"
+msgstr "密钥协议失败"
+
+#: ../src/protocols/silc/silc.c:924
+#, fuzzy
+msgid "Key Length"
+msgstr "密钥长度:\t%d 位\n"
+
+#: ../src/protocols/silc/silc.c:926
+#, fuzzy
+msgid "Public Key File"
+msgstr "公钥文件"
+
+#: ../src/protocols/silc/silc.c:928
+#, fuzzy
+msgid "Private Key File"
+msgstr "私钥文件"
+
+#: ../src/protocols/silc/silc.c:937
+#, fuzzy
+msgid "Real Name"
+msgstr "真名"
+
+#: ../src/protocols/silc/silc.c:951
+#, fuzzy
+msgid "Re-type Passphrase"
+msgstr "密码句"
+
+#: ../src/protocols/silc/silc.c:958
+#, fuzzy
+msgid "Generate Key Pair"
+msgstr "私钥文件"
+
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:809
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:882
+#: ../src/protocols/silc/silc.c:1015
+#, fuzzy
+msgid "Create SILC Key Pair..."
+msgstr "创建 SILC 密钥对..."
+
+#: ../src/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:1033
+#: ../src/protocols/silc/silc.c:1306
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: src/protocols/silc/silc.c:1114
+#: ../src/protocols/silc/silc.c:1387
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: src/protocols/silc/silc.c:1216
+#: ../src/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: src/protocols/silc/silc.c:1221
+#: ../src/protocols/silc/silc.c:1494
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: ../src/protocols/silc/silc.c:1496
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: src/protocols/silc/silc.c:1236
+#: ../src/protocols/silc/silc.c:1509
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: src/protocols/silc/silc.c:1266
+#: ../src/protocols/silc/silc.c:1539
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知命令: %s,(可能是 Gaim bug)"
 
-#: src/protocols/silc/silc.c:1329
+#: ../src/protocols/silc/silc.c:1602
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1333
+#: ../src/protocols/silc/silc.c:1606
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1337
+#: ../src/protocols/silc/silc.c:1610
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1342
+#: ../src/protocols/silc/silc.c:1615
 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:1346
+#: ../src/protocols/silc/silc.c:1619
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1350
+#: ../src/protocols/silc/silc.c:1623
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
 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:1358
+#: ../src/protocols/silc/silc.c:1631
 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:1362
+#: ../src/protocols/silc/silc.c:1635
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1366
+#: ../src/protocols/silc/silc.c:1639
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1370
+#: ../src/protocols/silc/silc.c:1643
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: src/protocols/silc/silc.c:1374
+#: ../src/protocols/silc/silc.c:1647
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: src/protocols/silc/silc.c:1380
+#: ../src/protocols/silc/silc.c:1653
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: src/protocols/silc/silc.c:1384
+#: ../src/protocols/silc/silc.c:1657
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: src/protocols/silc/silc.c:1388
+#: ../src/protocols/silc/silc.c:1661
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1392
+#: ../src/protocols/silc/silc.c:1665
 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:1396
+#: ../src/protocols/silc/silc.c:1669
 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:1400
+#: ../src/protocols/silc/silc.c:1673
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: src/protocols/silc/silc.c:1404
+#: ../src/protocols/silc/silc.c:1677
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: src/protocols/silc/silc.c:1408
+#: ../src/protocols/silc/silc.c:1681
 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:1412
+#: ../src/protocols/silc/silc.c:1685
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: src/protocols/silc/silc.c:1416
+#: ../src/protocols/silc/silc.c:1689
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: src/protocols/silc/silc.c:1420
+#: ../src/protocols/silc/silc.c:1693
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: src/protocols/silc/silc.c:1424
+#: ../src/protocols/silc/silc.c:1697
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: src/protocols/silc/silc.c:1428
+#: ../src/protocols/silc/silc.c:1701
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: src/protocols/silc/silc.c:1432
+#: ../src/protocols/silc/silc.c:1705
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1710
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: src/protocols/silc/silc.c:1441
+#: ../src/protocols/silc/silc.c:1714
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9955,30 +11117,6 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
 "户"
 
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "即时消息"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "对全部聊天消息进行数字签名"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "校验全部聊天消息签名"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "频道消息"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "对全部频道消息进行数字签名"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "校验全部频道消息签名"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9988,91 +11126,112 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../src/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../src/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1600
+#: ../src/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1604
+#: ../src/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1607
+#: ../src/protocols/silc/silc.c:1876
+msgid "Cipher"
+msgstr ""
+
+#: ../src/protocols/silc/silc.c:1886
+msgid "HMAC"
+msgstr ""
+
+#: ../src/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1614
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1617
+#: ../src/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1620
+#: ../src/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/silc.c:1904
+msgid "Block messages to whiteboard"
+msgstr ""
+
+#: ../src/protocols/silc/silc.c:1907
+msgid "Automatically open whiteboard"
+msgstr "自动打开白板"
+
+#: ../src/protocols/silc/silc.c:1910
+#, fuzzy
+msgid "Digitally sign and verify all messages"
+msgstr "对全部聊天消息进行数字签名"
+
+#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
 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:313
+#: ../src/protocols/silc/util.c:314
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "真名:\t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:316
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "用户名:\t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: ../src/protocols/silc/util.c:318
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "电子邮件:\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:320
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主机名:\t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:322
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "组织:\t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国家:\t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "算法:\t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:326
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
-#: src/protocols/silc/util.c:327
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10083,7 +11242,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:329
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10092,140 +11251,234 @@
 "公钥漏印:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
 msgid "Public Key Information"
 msgstr "公钥信息"
 
-#: src/protocols/silc/util.c:515
+#: ../src/protocols/silc/util.c:516
 msgid "Paging"
 msgstr "寻呼"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "计算机"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:544
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:546
 msgid "Terminal"
 msgstr "终端"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#: ../src/protocols/silc/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+#: ../src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr ""
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:409
+#, fuzzy
+msgid "Could not write"
+msgstr "无法发送"
+
+#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
+msgid "Could not connect"
+msgstr "无法连接"
+
+#: ../src/protocols/simple/simple.c:994
+msgid "Wrong Password"
+msgstr "密码错误"
+
+#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
+#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
+#, fuzzy
+msgid "Could not create listen socket"
+msgstr "无法创建套接字"
+
+#: ../src/protocols/simple/simple.c:1474
+#, fuzzy
+msgid "Couldn't resolve host"
+msgstr "无法连接到主机"
+
+#: ../src/protocols/simple/simple.c:1572
+#, fuzzy
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "IRC 昵称不能包含空格"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../src/protocols/simple/simple.c:1734
+#, fuzzy
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SILC 协议插件"
+
+#. *  summary
+#: ../src/protocols/simple/simple.c:1735
+#, fuzzy
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SILC 协议插件"
+
+#: ../src/protocols/simple/simple.c:1757
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+#: ../src/protocols/simple/simple.c:1763
+#, fuzzy
+msgid "Use UDP"
+msgstr "用户 ID"
+
+#: ../src/protocols/simple/simple.c:1765
+#, fuzzy
+msgid "Use proxy"
+msgstr "无代理"
+
+#: ../src/protocols/simple/simple.c:1767
+#, fuzzy
+msgid "Proxy"
+msgstr "无代理"
+
+#: ../src/protocols/simple/simple.c:1769
+#, fuzzy
+msgid "Auth User"
+msgstr "AP 用户"
+
+#: ../src/protocols/simple/simple.c:1771
+#, fuzzy
+msgid "Auth Domain"
+msgstr "自动"
+
+#: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败: %s。"
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:552
 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."
@@ -10233,42 +11486,41 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误: %s。"
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息: %s"
 
-#: src/protocols/toc/toc.c:584
-#, fuzzy
+#: ../src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
-msgstr "无效的组"
-
-#: src/protocols/toc/toc.c:668
+msgstr "无效的组名"
+
+#: ../src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:994
 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 "
@@ -10278,43 +11530,51 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "设置用户信息"
+
+#: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "更改密码"
+
+#: ../src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
+#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223
 #, 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 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -10329,60 +11589,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2337
+#: ../src/protocols/toc/toc.c:2340
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2344
 msgid "TOC port"
 msgstr "TOC 端口"
 
-#: src/protocols/yahoo/yahoo.c:706
+#: ../src/protocols/yahoo/yahoo.c:712
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
 msgid "Buzz!!"
-msgstr "呼叫朋友"
-
-#: src/protocols/yahoo/yahoo.c:797
+msgstr "闪屏震动"
+
+#: ../src/protocols/yahoo/yahoo.c:811
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr "%s 的 Yahoo! 系统消息:"
+msgstr "%s 的 Yahoo! 系统消息:"
 
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
+#: ../src/protocols/yahoo/yahoo.c:907
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "用户 %s 想要将 %s 添加为好友%s%s。"
 
-#: src/protocols/yahoo/yahoo.c:893
+#: ../src/protocols/yahoo/yahoo.c:913
 msgid "Message (optional) :"
-msgstr "消息(可选):"
-
-#: src/protocols/yahoo/yahoo.c:935
+msgstr "消息(可选):"
+
+#: ../src/protocols/yahoo/yahoo.c:955
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:938
+#: ../src/protocols/yahoo/yahoo.c:958
 #, 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:941
+msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
+
+#: ../src/protocols/yahoo/yahoo.c:961
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: ../src/protocols/yahoo/yahoo.c:1704
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10392,11 +11652,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1687
+#: ../src/protocols/yahoo/yahoo.c:1707
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1760
+#: ../src/protocols/yahoo/yahoo.c:1773
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10404,19 +11664,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: ../src/protocols/yahoo/yahoo.c:1776
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: ../src/protocols/yahoo/yahoo.c:1810
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1822
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10427,125 +11687,136 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1817
+#: ../src/protocols/yahoo/yahoo.c:1830
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1833
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1823
+#: ../src/protocols/yahoo/yahoo.c:1836
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: ../src/protocols/yahoo/yahoo.c:1890
 #, 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:1880
+#: ../src/protocols/yahoo/yahoo.c:1893
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
-#: src/protocols/yahoo/ycht.c:413
+#: ../src/protocols/yahoo/yahoo.c:2012
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
+#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
+#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
+msgid "Not at Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
+msgid "Not at Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
+msgid "Not in Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
 msgid "Appear Online"
-msgstr "显示为离线"
-
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
+msgstr "显示为在线"
+
+#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
 msgid "Appear Permanently Offline"
+msgstr "显示为临时离线"
+
+#: ../src/protocols/yahoo/yahoo.c:2889
+#, fuzzy
+msgid "Presence"
+msgstr "首选项"
+
+#: ../src/protocols/yahoo/yahoo.c:2932
+msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
-msgid "Stealth"
-msgstr "州/省"
-
-#: src/protocols/yahoo/yahoo.c:2849
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2941
 msgid "Don't Appear Permanently Offline"
-msgstr "显示为离线"
-
-#: src/protocols/yahoo/yahoo.c:2896
+msgstr "不显示临时离线"
+
+#: ../src/protocols/yahoo/yahoo.c:2989
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: ../src/protocols/yahoo/yahoo.c:2995
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:3023
+#, fuzzy
+msgid "Presence Settings"
+msgstr "使用环境设置"
+
+#: ../src/protocols/yahoo/yahoo.c:3029
 msgid "Start Doodling"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: ../src/protocols/yahoo/yahoo.c:3061
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: ../src/protocols/yahoo/yahoo.c:3070
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
+#: ../src/protocols/yahoo/yahoo.c:3084
+msgid "Join User in Chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:3541
+#: ../src/protocols/yahoo/yahoo.c:3622
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天聊天室"
-
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: 呼叫联系人,以吸引其注意"
-
-#: src/protocols/yahoo/yahoo.c:3550
+msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
+
+#: ../src/protocols/yahoo/yahoo.c:3627
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: 列出 Yahoo 网络上的房间"
+
+#: ../src/protocols/yahoo/yahoo.c:3631
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
+
+#: ../src/protocols/yahoo/yahoo.c:3635
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10559,132 +11830,141 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../src/protocols/yahoo/yahoo.c:3747
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3661
+#: ../src/protocols/yahoo/yahoo.c:3750
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3664
+#: ../src/protocols/yahoo/yahoo.c:3753
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../src/protocols/yahoo/yahoo.c:3756
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3670
+#: ../src/protocols/yahoo/yahoo.c:3759
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
+#: ../src/protocols/yahoo/yahoo.c:3762
+msgid "Japan file transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3676
+#: ../src/protocols/yahoo/yahoo.c:3765
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
+#: ../src/protocols/yahoo/yahoo.c:3768
+msgid "Chat room locale"
 msgstr "聊天房间语系"
 
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
+#: ../src/protocols/yahoo/yahoo.c:3771
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#: ../src/protocols/yahoo/yahoo.c:3775
+msgid "Chat room list URL"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
+#: ../src/protocols/yahoo/yahoo.c:3778
+msgid "YCHT host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
+#: ../src/protocols/yahoo/yahoo.c:3781
+msgid "YCHT port"
 msgstr "YCHT 端口"
 
-#: src/protocols/yahoo/yahoo_profile.c:672
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "写错误"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 地址:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo 日本资料"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 资料"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: ../src/protocols/yahoo/yahoo_profile.c:830
 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:971
+#: ../src/protocols/yahoo/yahoo_profile.c:1006
 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
+#: ../src/protocols/yahoo/yahoo_profile.c:1078
+#: ../src/protocols/yahoo/yahoo_profile.c:1082
+#: ../src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/yahoo/yahoo_profile.c:1096
+#: ../src/protocols/yahoo/yahoo_profile.c:1100
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: ../src/protocols/yahoo/yahoo_profile.c:1141
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1145
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid "Last Update"
 msgstr "上次更新"
 
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr "抱歉,此配置文件似乎是目前并不支持的语言。"
-
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr "抱歉,此配置文件似乎是目前并不支持的语言或格式。"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1186
 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:1154
+#: ../src/protocols/yahoo/yahoo_profile.c:1189
 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 "
@@ -10693,148 +11973,166 @@
 "无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个"
 "人资料。如果您确定用户存在的话,请稍候再试。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: ../src/protocols/yahoo/yahoo_profile.c:1197
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/yahoo/yahoochat.c:202
+#: ../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:204
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "邀请已拒绝"
 
-#: src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "可能房间已满?"
-
-#: src/protocols/yahoo/yahoochat.c:435
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "未知房间"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "可能房间已满"
+
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "不可用"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您现在正在 %s 中聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:626
 msgid "Failed to join buddy in chat"
 msgstr "在聊天中加入好友失败"
 
-#: src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Maybe they're not in a chat?"
 msgstr "可能他们未在聊天中?"
 
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Fetching the room list failed."
 msgstr "获取房间列表失败。"
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: ../src/protocols/yahoo/yahoochat.c:1433
 msgid "Voices"
 msgstr "语音"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: ../src/protocols/yahoo/yahoochat.c:1436
 msgid "Webcams"
 msgstr "摄像头"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: ../src/protocols/yahoo/yahoochat.c:1510
 msgid "User Rooms"
 msgstr "用户房间"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT 服务器连接出现问题。"
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:346
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "(转换此信息出错。\t请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#: ../src/protocols/zephyr/zephyr.c:701
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
-msgstr "类(_C):"
-
-#: src/protocols/zephyr/zephyr.c:2279
+msgstr "类(_C):"
+
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
-msgstr "实例(_I):"
-
-#: src/protocols/zephyr/zephyr.c:2285
+msgstr "实例(_I):"
+
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
-msgstr "接收者(_R):"
-
-#: src/protocols/zephyr/zephyr.c:2296
+msgstr "接收者(_R):"
+
+#: ../src/protocols/zephyr/zephyr.c:2321
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2632
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2637
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2642
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2622
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2647
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
-
-#: src/protocols/zephyr/zephyr.c:2628
+msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
+
+#: ../src/protocols/zephyr/zephyr.c:2653
 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:2633
+#: ../src/protocols/zephyr/zephyr.c:2658
 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:2639
+#: ../src/protocols/zephyr/zephyr.c:2664
 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:2645
+#: ../src/protocols/zephyr/zephyr.c:2670
 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;"
@@ -10842,7 +12140,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: ../src/protocols/zephyr/zephyr.c:2676
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10850,15 +12148,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2681
 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:2762
+#: ../src/protocols/zephyr/zephyr.c:2787
 msgid "Resubscribe"
 msgstr "重订"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2790
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10872,1209 +12170,201 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2905
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2908
 msgid "Import from .anyone"
-msgstr "导出到 .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
+msgstr "从 .anyone 导入"
+
+#: ../src/protocols/zephyr/zephyr.c:2911
 msgid "Import from .zephyr.subs"
-msgstr "导出到 .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
+msgstr "从 .zephyr.subs 导入"
+
+#: ../src/protocols/zephyr/zephyr.c:2914
 msgid "Realm"
-msgstr "真名"
-
-#: src/protocols/zephyr/zephyr.c:2889
+msgstr "域"
+
+#: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
 msgstr "暴露"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
+#: ../src/proxy.c:1338
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "代理服务器连接错误 %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: ../src/proxy.c:1327
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "代理服务器连接错误 %d"
-
-#: src/proxy.c:1874
+#: ../src/proxy.c:2327
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1874
+#: ../src/proxy.c:2327
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "接受"
-
-#: src/server.c:243
+#: ../src/savedstatuses.c:514
+msgid "saved statuses"
+msgstr "已存状态"
+
+#: ../src/savedstatuses.c:767
+msgid "I'm not here right now"
+msgstr "我目前不在"
+
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 现在叫做 %s。\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d 条消息)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 条消息)"
-
-#: src/server.c:859
-#, fuzzy, c-format
+#: ../src/server.c:681
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s 邀请了 %s 加入聊天室 %s\n"
-
-#: src/server.c:864
+msgstr ""
+"%s 邀请了 %s 加入聊天室 %s:\n"
+"%s"
+
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀请了 %s 加入聊天室 %s\n"
 
-#: src/server.c:868
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
-#: src/status.c:153
-#, fuzzy
+#: ../src/status.c:153
 msgid "Unset"
-msgstr "单元"
-
-#: src/status.c:156
+msgstr "取消设置"
+
+#: ../src/status.c:156
 msgid "Unavailable"
 msgstr "不可用"
 
-#: src/status.c:621
+#: ../src/status.c:160
+msgid "Mobile"
+msgstr "移动"
+
+#: ../src/status.c:623
+#, c-format
+msgid "%s signed on"
+msgstr "%s 已登入"
+
+#: ../src/status.c:627
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/status.c:626
+#: ../src/status.c:634
+#, c-format
+msgid "%s signed off"
+msgstr "%s 已登出"
+
+#: ../src/status.c:638
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/status.c:1308
+#: ../src/status.c:1317
 #, c-format
 msgid "%s became idle"
-msgstr "%s 打起瞌睡"
-
-#: src/status.c:1323
+msgstr "%s 发起了呆"
+
+#: ../src/status.c:1330
 #, c-format
 msgid "%s became unidle"
-msgstr "%s 睡醒了"
-
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "自动离开"
-
-#: src/util.c:2121
-#, fuzzy, c-format
+msgstr "%s 发完呆了"
+
+#: ../src/status.c:1392
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s 发起了呆"
+
+#: ../src/status.c:1394
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s 发完呆了"
+
+#: ../src/util.c:679
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2457
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"读取 %s 出错:\n"
-"%s。\n"
-
-#: src/util.c:2122
-#, fuzzy, c-format
+msgstr "读取 %s 出错"
+
+#: ../src/util.c:2458
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr ""
-"分析您的好友列表时出错。好友列表未装入,旧文件被移动到 blist.xml~ 中了。"
-
-#: src/util.c:2567
+msgstr "读取您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
+
+#: ../src/util.c:2897
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2570
+#: ../src/util.c:2900
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2600
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "秒"
-
-#: src/util.c:2614
-msgid "day"
-msgid_plural "days"
-msgstr[0] "天"
-
-#: src/util.c:2622
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "小时"
-
-#: src/util.c:2630
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分"
-
-#: src/util.c:3053
+#: ../src/util.c:2926
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#: ../src/util.c:2938
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 天"
+
+#: ../src/util.c:2946
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s %d 小时"
+
+#: ../src/util.c:2952
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
+
+#: ../src/util.c:2960
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s %d 分"
+
+#: ../src/util.c:2966
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分"
+
+#: ../src/util.c:3441
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
-#~ msgid "Buddy List Sorting"
-#~ msgstr "好友列表排序"
-
-#~ msgid "_Sorting:"
-#~ msgstr "排序(_S):"
-
-#~ msgid "Buddy Display"
-#~ msgstr "好友显示"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "显示用户细节"
-
-#~ msgid "Gnome Default"
-#~ msgstr "GNOME 默认"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "离开消息(_E):"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "退出消息"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "重新连接时恢复离开状态"
-
-#~ msgid "Mail Server"
-#~ msgstr "邮件服务器"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d 封新邮件/共 %d 封)"
-
-#~ msgid "Check Mail"
-#~ msgstr "检查邮件"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "每隔 X 秒检查邮件。\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "自动登录"
-
-#~ msgid "New..."
-#~ msgstr "新建..."
-
-#~ msgid "Back"
-#~ msgstr "回来"
-
-#~ msgid "Signoff"
-#~ msgstr "登出"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "托盘图标配置"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "直到点击托盘图标才显示新消息(_H)"
-
-#~ msgid "Orientation"
-#~ msgstr "方向"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "托盘的方向。"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "未连接到 AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "没有给出用户名。"
-
-#~ msgid "No roomname given."
-#~ msgstr "没有给出聊天室名。"
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "无效的 AIM URI"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "将 %s 指派给套接字失败:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "无法打开套接字"
-
-#~ msgid "Remote Control"
-#~ msgstr "远程控制"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "提供 gaim 程序的远程控制。"
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr "为 Gaim 添加可通过第三方应用程序或 gaim-remote 工具远程控制的能力。"
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "GTK 信号测试"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "测试看看所有的 UI 信号是否都工作正确。"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
-
-#~ msgid "_Apply"
-#~ msgstr "应用(_A)"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "停靠的好友列表常居顶端(_B)"
-
-#~ msgid "Away!"
-#~ msgstr "离开!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "编辑此消息"
-
-#~ msgid "I'm Back!"
-#~ msgstr "我回来了!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "您真的想要删除离开消息“%s”吗?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "删除离开消息"
-
-#~ msgid "Set All Away"
-#~ msgstr "全部设为离开"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "您不能保存空标题的离开消息"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "请给消息指定标题,或者不保存直接“使用”。"
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "您不能创建空的离开消息"
-
-#~ msgid "New away message"
-#~ msgstr "新建离开消息"
-
-#~ msgid "Away title: "
-#~ msgstr "离开标题:"
-
-#~ msgid "_Save"
-#~ msgstr "保存(_S)"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "保存并使用(_V)"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "好友列表出错"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "扩展箭头的大小"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "用法: %s 命令 [选项] [URI]\n"
-#~ "\n"
-#~ "    命令:\n"
-#~ "       uri                      处理 AIM: URI\n"
-#~ "       away                     弹出带默认信息的离开对话框\n"
-#~ "       back                     删除离开对话框\n"
-#~ "       quit                     关闭 Gaim 的运行副本\n"
-#~ "\n"
-#~ "    选项:\n"
-#~ "       -h, --help [命令]        显示命令帮助\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim 未运行(会话 0)\n"
-#~ "是否装入了“远程控制”插件?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "使用 AIM: URIs:\n"
-#~ "给用户名发送即时消息:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "在这种情况下,“Penguin”就是想要开聊的用户名,而“hello world”是\n"
-#~ "想要发送的消息。“+”用来替代空格。请注意上面使用的内容 - 如果您想\n"
-#~ "要从 shell 运行此命令,“&”就必须转码,否则命令将会在该处停止。\n"
-#~ "同时,下列命令将打开和用户名开聊的对话窗口,而不发送消息:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "加入聊天:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...加入“PenguinLounge”聊天室。\n"
-#~ "\n"
-#~ "添加好友:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...提示您将“Penguin”加为好友。\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "关闭 Gaim 的运行副本\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "将全部账户都设为“离开”默认消息。\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "将全部账户设为未离开。\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "显示主要选项"
-
-#~ msgid "Information"
-#~ msgstr "信息"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/好友(B)/登出(_S)"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/工具(T)/离开(_A)"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/工具(T)/插件操作(_U)"
-
-#~ msgid "Rename Group"
-#~ msgstr "重命名组"
-
-#~ msgid "New group name"
-#~ msgstr "新组名称"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "请输入选中组的新名字。"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>账户:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>警告:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "警告 (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/工具(T)/离开(A)"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "向选中好友发送消息"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "获取选中好友的信息"
-
-#~ msgid "_Chat"
-#~ msgstr "聊天(_C)"
-
-#~ msgid "Join a chat room"
-#~ msgstr "加入聊天室"
-
-#~ msgid "_Away"
-#~ msgstr "离开(_A)"
-
-#~ msgid "Set an away message"
-#~ msgstr "设置离开消息"
-
-#~ msgid "Done."
-#~ msgstr "完成。"
-
-#~ msgid "Signon: "
-#~ msgstr "登入:"
-
-#~ msgid "Signon"
-#~ msgstr "登入"
-
-#~ msgid "Cancel All"
-#~ msgstr "全部取消"
-
-#~ msgid "_Reconnect"
-#~ msgstr "重新连接(_R)"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s 已经断开连接。</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "原因未知。"
-
-#~ msgid "Reconnect _All"
-#~ msgstr "全部重新连接(_A)"
-
-#~ msgid "Time"
-#~ msgstr "时间"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "获得离开消息"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/对话(C)/警告(_W)..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/对话(C)/警告(W)..."
-
-#~ msgid "Warn"
-#~ msgstr "警告"
-
-#~ msgid "Warn the user"
-#~ msgstr "警告用户"
-
-#~ msgid "Block the user"
-#~ msgstr "屏蔽用户"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "给用户发送文件"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "将用户加为好友"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "从您的好友列表中删除该用户"
-
-#~ msgid "Send"
-#~ msgstr "发送"
-
-#~ msgid "Invite"
-#~ msgstr "邀请"
-
-#~ msgid "Invite a user"
-#~ msgstr "邀请用户"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "将聊天添加到您的好友列表"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/对话(C)/关闭(C)"
-
-#~ msgid "former lead developer"
-#~ msgstr "先前领导开发者"
-
-#~ msgid "former maintainer"
-#~ msgstr "先前维护者"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "阿塞拜疆语"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova 和 Vladimir (Kaladan) Petkov"
-
-#~ msgid "Burmese"
-#~ msgstr "缅甸语"
-
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "挪威语(Nynorsk)"
-
-#~ msgid "Punjabi"
-#~ msgstr "旁遮普语"
-
-#~ msgid "Albanian"
-#~ msgstr "阿尔巴尼亚语"
-
-#~ msgid "Turkish"
-#~ msgstr "土耳其语"
-
-#~ msgid "Ukrainian"
-#~ msgstr "乌克兰语"
-
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
-
-#~ msgid "Chinese"
-#~ msgstr "中文"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "用户名(_S)"
-
-#~ msgid "Warn User"
-#~ msgstr "警告用户"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">警告 %s 吗?</span>\n"
-#~ "\n"
-#~ "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "匿名警告吗(_A)?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>匿名警告较不容易引起注意。</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "显示下载细节"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "如果未设置别名则显示远程昵称(_I)"
-
-#~ msgid "Display"
-#~ msgstr "显示"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "消息显示时间戳(_T)"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "忽略颜色(_O)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "忽略字体(_F)"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "较大字体(_Z)"
-
-#~ msgid "Default Formatting"
-#~ msgstr "默认格式"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "送出信息使用默认格式(_S)"
-
-#~ msgid "Send Message"
-#~ msgstr "发送消息"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "回车键发送消息(_S)"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "Ctrl+回车键发送消息(_O)"
-
-#~ msgid "Window Closing"
-#~ msgstr "窗口关闭"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "Esc 键关闭窗口(_E)"
-
-#~ msgid "Insertions"
-#~ msgstr "插入"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Ctrl+{B/I/U} 更改格式(_F)"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Ctrl+数字键插入笑脸(_I)"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "将按钮显示为(_B):"
-
-#~ msgid "Pictures"
-#~ msgstr "图片"
-
-#~ msgid "Text"
-#~ msgstr "文字"
-
-#~ msgid "Pictures and text"
-#~ msgstr "图片和文字"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "发生事件时激活窗口(_R)"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "显示警告级别(_W)"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "自动展开联系人(_A)"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "允许斜线开头的命令(_S)"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "在标签/标题中显示别名(_A)"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "发生事件时激活对话窗口(_R)"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "发生事件时激活聊天窗口(_W)"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "在聊天中使用多种颜色来区分用户名(_M)"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "标签位置(_L):"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "新对话放置(_P):"
-
-#~ msgid "Message Logs"
-#~ msgstr "消息日志"
-
-#~ msgid "System Logs"
-#~ msgstr "系统日志"
-
-#~ msgid "_Enable system log"
-#~ msgstr "启用系统日志(_E)"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "记录好友的登入/登出(_S)"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "记录好友的瞌睡/睡醒(_I)"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "记录好友的离开/回来(_B)"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "记录您自己的登入/瞌睡/离开(_O)"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "瞌睡时间报告(_T):"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Gaim 使用"
-
-#~ msgid "X usage"
-#~ msgstr "X 使用"
-
-#~ msgid "Windows usage"
-#~ msgstr "窗口使用"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">编写者:</span>\t%s\n"
-#~ "<span weight=\"bold\">网站:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">文件名:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">编写者:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">文件名:</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "装入"
-
-#~ msgid "Summary"
-#~ msgstr "概览"
-
-#~ msgid "Details"
-#~ msgstr "细节"
-
-#~ msgid "_Edit"
-#~ msgstr "编辑(_E)"
-
-#~ msgid "Interface"
-#~ msgstr "界面"
-
-#~ msgid "Message Text"
-#~ msgstr "消息文本"
-
-#~ msgid "Shortcuts"
-#~ msgstr "快捷键"
-
-#~ msgid "Away Messages"
-#~ msgstr "离开消息"
-
-#~ msgid "Plugins"
-#~ msgstr "插件"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "纯文本"
-
-#~ msgid "Please create an account."
-#~ msgstr "请创建一个账户。"
-
-#~ msgid "Login"
-#~ msgstr "登入"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>账户(_A):</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>密码(_P):</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "账户(_C)"
-
-#~ msgid "P_references"
-#~ msgstr "首选项(_R)"
-
-#~ msgid "_Sign on"
-#~ msgstr "登入(_S)"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "用法: %s [选项]...\n"
-#~ "\n"
-#~ "  -a, --acct          显示账户编辑窗口\n"
-#~ "  -w, --away[=消息]   登入后设为离开(可选“消息”指定要使用的离开消息名称)\n"
-#~ "  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
-#~ "  -n, --loginwin      不自动登入;显示登录窗口\n"
-#~ "  -u, --user=名称     使用指定账户\n"
-#~ "  -f, --file=文件     使用指定文件的配置\n"
-#~ "  -c, --config=目录   使用“目录”存储配置文件\n"
-#~ "  -d, --debug         将调试信息打印到标准输出\n"
-#~ "  -v, --version       显示当前版本并退出\n"
-#~ "  -h, --help          显示帮助并退出\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "无法装入首选项"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim 无法装入您的首选项,原因是存储首选项所用的的格式太老,目前已不支持。"
-#~ "请使用首选项窗口重新配置您的设置。"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "烦死我了"
-
-#~ msgid "Available for friends only"
-#~ msgstr "只对好友可用"
-
-#~ msgid "Away for friends only"
-#~ msgstr "只对好友离开"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "只对好友隐身"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "无法解析主机名。"
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "从套接字读取时出错。"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "向套接字写入时出错。"
-
-#~ msgid "Authentication failed."
-#~ msgstr "认证失败。"
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "未知的错误代码。"
-
-#~ msgid "Status: %s"
-#~ msgstr "状态: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "无法连接"
-
-#~ msgid "Reading data"
-#~ msgstr "读取数据"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "平衡器握手"
-
-#~ msgid "Reading server key"
-#~ msgstr "读取服务器密钥"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "交换密钥"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "GG 库的关键错误\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "无法连通服务器"
-
-#~ msgid "Send as message"
-#~ msgstr "发送为消息"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "正在查阅 GG 服务器"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "指定的 Gadu-Gadu UIN 无效"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "无法获取搜索结果"
-
-#~ msgid "Birth Year"
-#~ msgstr "出生年份"
-
-#~ msgid "Sex"
-#~ msgstr "性别"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Gadu-Gadu 服务器没有存储好友列表。"
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "无法从服务器导入好友列表"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "密码无法更改"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "与 Gadu-Gadu 服务器通讯出错"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后"
-#~ "再试一次。"
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "无法导入 Gadu-Gadu 好友列表"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "无法导出好友列表"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server.  Please try again "
-#~ "later."
-#~ msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "无法删除 Gadu-Gadu 好友列表"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "无法访问目录"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
-
-#~ 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 服务器连接出错。请稍后再试一次。"
-
-#~ msgid "Directory Search"
-#~ msgstr "目录搜索"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "无法访问用户配置文件。"
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim 无法访问用户的配置文件,原因是与目录服务器连接出错。请稍后再试一次。"
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim 与 ICQ 服务器通讯错误。"
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
-
-#~ msgid "Send message through server"
-#~ msgstr "通过服务器中转消息"
-
-#~ msgid "Connecting..."
-#~ msgstr "正在连接..."
-
-#~ msgid "Nick:"
-#~ msgstr "昵称:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim 用户"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "文件传送中止"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s 的好友信息"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "无效的昵称“%s”"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "无效的昵称"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber 资料"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "房间列表错误"
-
-#~ msgid "Logged out"
-#~ msgstr "已登出"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "隐藏操作系统"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "用户 %s 想要将您添加为好友。"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "显示对话关闭通知"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "显示超时通知"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "对话已停止并超时。"
-
-#~ msgid "%s has closed the conversation window."
-#~ msgstr "%s 已经关闭了对话窗口。"
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
-
-#~ msgid "User Properties"
-#~ msgstr "用户属性"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "文件 %s 传送超时。"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
-
-#~ msgid "Not specified"
-#~ msgstr "未指定"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "%s 的 ICQ 信息"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名以空格结尾。"
-
-#~ msgid "Visible"
-#~ msgstr "显身"
-
-#~ msgid "Available Message:"
-#~ msgstr "可用消息:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "我正在工作,渴望被打扰 - 呼我!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "设置可用消息..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "离开频道失败"
-
-#~ msgid "Basic Profile"
-#~ msgstr "基本信息"
-
-#~ msgid "Profile Information"
-#~ msgstr "个人信息"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "即时通讯程序"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "来自"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "设置您的 Trepia 资料。"
-
-#~ msgid "Profile"
-#~ msgstr "资料"
-
-#~ msgid "Set Profile"
-#~ msgstr "设置资料"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "浏览主页"
-
-#~ msgid "Local Users"
-#~ msgstr "本地用户"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia 协议插件"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
-
-#~ msgid "Please enter your password"
-#~ msgstr "请输入您的密码"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s 登入了。"
-
-#~ msgid "%s signed on"
-#~ msgstr "%s 已登入"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s 登出了。"
-
-#~ msgid "%s signed off"
-#~ msgstr "%s 已登出"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s 刚刚被 %s 警告。\n"
-#~ "您新的警告级别是 %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "无名氏"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s 邀请了 %s 加入聊天室 %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "抱歉,我现在不在。请稍候再与我联系。"