changeset 9321:542ad8b1a50f

[gaim-migrate @ 10129] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 20 Jun 2004 00:09:34 +0000 (2004-06-20)
parents 7a9261d979df
children 119f8a2c00b6
files po/ChangeLog po/ru.po src/about.c
diffstat 3 files changed, 5896 insertions(+), 4467 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Sat Jun 19 20:54:13 2004 +0000
+++ b/po/ChangeLog	Sun Jun 20 00:09:34 2004 +0000
@@ -5,6 +5,7 @@
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* German Translation updated (Bjoern Voigt)
+	* Russian translation updated (Dmitry Beloglazov)
 	* gaim.desktop updated for Danish translation ((Morten Brix Pedersen
 	  (mbrix))
 
--- a/po/ru.po	Sat Jun 19 20:54:13 2004 +0000
+++ b/po/ru.po	Sun Jun 20 00:09:34 2004 +0000
@@ -2,20 +2,33 @@
 # Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
 # Sergey Volozhanin <svo@asplinux.ru>, 2001.
 # Alexandre Prokoudine <avp@altlinux.ru>, 2003, 2004.
+# Dmitry Beloglazov <dmaa@lipetsk.ru>, 2004.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
-"PO-Revision-Date: 2004-01-12 11:44+0300\n"
-"Last-Translator: Alexandre Prokoudine <avp@altlinux.ru>\n"
+"POT-Creation-Date: 2004-06-16 23:00+0400\n"
+"PO-Revision-Date: 2004-06-17 02:00+0400\n"
+"Last-Translator: Dmitry Beloglazov <dmaa@lipetsk.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr "�仂亟舒于仍亠仆亳亠 �仂仂弍�亠仆亳亶 仂弍 仂�亳弍从舒�"
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr "弌从���� 仂�亳弍从亳 �舒亰��于舒 �仂亠亟亳仆亠仆亳�"
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr "弌从���� 仂�亳弍从亳 于�仂亟舒"
 
 #. *< api_version
 #. *< type
@@ -24,17 +37,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
-msgstr "�于�仂仗亠�亠�仂亠亟亳仆亠仆亳亠"
+msgstr "�于�仂仄舒�亳�亠�从仂亠 仗亠�亠�仂亠亟亳仆亠仆亳亠"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
-msgstr "�亠�亠仗仂亟从仍��亠仆亳亠 仗�亳 仆亠仂亢亳亟舒仆仆仂仄 仂��仂亠亟亳仆亠仆亳亳."
+msgstr "�亠�亠�仂亠亟亳仆亠仆亳亠 仗�亳 仆亠仂亢亳亟舒仆仆仂仄 仂��仂亠亟亳仆亠仆亳亳."
 
 #: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
 msgid "Mail Server"
@@ -59,19 +72,19 @@
 
 #: plugins/contact_priority.c:91
 msgid "Buddy is offline:"
-msgstr "弌仂弍亠�亠亟仆亳从 于仆亠 �亠�亳:"
+msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳:"
 
 #: plugins/contact_priority.c:105
 msgid "Buddy is away:"
-msgstr "弌仂弍亠�亠亟仆亳从 仂�仂��仍:"
+msgstr "�仂仍�亰仂于舒�亠仍� 仂�仂��仍:"
 
 #: plugins/contact_priority.c:119
 msgid "Buddy is idle:"
-msgstr "弌仂弍亠�亠亟仆亳从 弍亠亰亟亠亶��于�亠�:"
+msgstr "�仂仍�亰仂于舒�亠仍� 弍亠亰亟亠亶��于�亠�:"
 
 #: plugins/contact_priority.c:133
 msgid "Use last matching buddy"
-msgstr ""
+msgstr "��仗仂仍�亰仂于舒�� 仗仂�仍亠亟仆亠亞仂 �仂仂�于亠���于���亠亞仂 仗仂仍�亰仂于舒�亠仍�"
 
 #. Explanation
 #: plugins/contact_priority.c:139
@@ -96,7 +109,7 @@
 #. *< id
 #: plugins/contact_priority.c:191
 msgid "Contact Priority"
-msgstr "��亳仂�亳�亠� 从仂仆�舒从�仂于"
+msgstr "��亳仂�亳�亠� 从仂仆�舒从�舒"
 
 #. *< name
 #. *< version
@@ -122,15 +135,15 @@
 
 #: plugins/docklet/docklet-win32.c:45
 msgid "Gaim - Signed off"
-msgstr "Gaim揃-揃仂�从仍��亳仍��."
+msgstr "Gaim - ��从仍��亠仆"
 
 #: plugins/docklet/docklet-win32.c:46
 msgid "Gaim - Away"
-msgstr "Gaim - ��仂�亠仍!"
+msgstr "Gaim - ��仂��仍"
 
 #: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
 msgid "Auto-login"
-msgstr "�于�仂�仂亠亟亳仆亠仆亳亠"
+msgstr "��仂亟亳�� 舒于�仂仄舒�亳�亠�从亳"
 
 #: plugins/docklet/docklet.c:117
 msgid "New Message..."
@@ -138,48 +151,49 @@
 
 #: plugins/docklet/docklet.c:118
 msgid "Join A Chat..."
-msgstr "�仂亟从仍��亳���� 从 �舒��..."
+msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��..."
 
 #: plugins/docklet/docklet.c:149
 msgid "New..."
 msgstr "�仂于仂亠..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1792 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
+#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
+#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "��仂��仍"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
 msgid "Back"
 msgstr "�亠�仆�仍��"
 
 #: plugins/docklet/docklet.c:167
 msgid "Mute Sounds"
-msgstr "��亳亞仍��亳�� 亰于�从亳"
-
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+msgstr "��从仍��亳�� 亰于�从亳"
+
+#: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
 msgid "Accounts"
 msgstr "丕���仆�亠 亰舒仗亳�亳"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2482
 msgid "Preferences"
-msgstr "�舒���仂亳��..."
+msgstr "�舒���仂亶从亳"
 
 #: plugins/docklet/docklet.c:183
 msgid "Signoff"
-msgstr "�舒于亠��亳�� �亠舒仆�"
+msgstr "��从仍��亳����"
 
 #: plugins/docklet/docklet.c:187
 msgid "Quit"
@@ -187,11 +201,11 @@
 
 #: plugins/docklet/docklet.c:478
 msgid "Tray Icon Configuration"
-msgstr "�舒���仂亶从舒 仗亳从�仂亞�舒仄仄� 仍仂�从舒"
+msgstr "�舒���仂亶从舒 亰仆舒�从舒 仍仂�从舒"
 
 #: plugins/docklet/docklet.c:482
 msgid "_Hide new messages until tray icon is clicked"
-msgstr "_����舒�� 仆仂于�亠 �仂仂弍�亠仆亳� 亟仂 �亠仍�从舒 仗仂 仗亳从�仂亞�舒仄仄亠 于 仍仂�从亠"
+msgstr "����舒�� 仆仂于�亠 �仂仂弍�亠仆亳� 亟仂 �亠仍�从舒 仗仂 亰仆舒�从� 于 仍仂�从亠"
 
 #. *< api_version
 #. *< type
@@ -202,14 +216,14 @@
 #. *< id
 #: plugins/docklet/docklet.c:506
 msgid "System Tray Icon"
-msgstr "�亳从�仂亞�舒仄仄舒 �亳��亠仄仆仂亞仂 仍仂�从舒"
+msgstr "�仆舒�仂从 �亳��亠仄仆仂亞仂 仍仂�从舒"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/docklet/docklet.c:509
 msgid "Displays an icon for Gaim in the system tray."
-msgstr "��仂弍�舒亢舒亠� 仗亳从�仂亞�舒仄仄� Gaim 于 �亳��亠仄仆仂亶 仂弍仍舒��亳"
+msgstr "��仂弍�舒亢舒亠� 亰仆舒�仂从 Gaim 于 �亳��亠仄仆仂仄 仍仂�从亠."
 
 #. *  description
 #: plugins/docklet/docklet.c:511
@@ -219,6 +233,50 @@
 "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:68
+msgid "By conversation count"
+msgstr "�仂 从仂仍亳�亠��于� 亟亳舒仍仂亞仂于"
+
+#: plugins/extplacement.c:89
+msgid "Conversation Placement"
+msgstr "�舒�仗仂仍仂亢亠仆亳亠 弍亠�亠亟"
+
+#: plugins/extplacement.c:94
+msgid "Number of conversations per window"
+msgstr "�仂仍亳�亠��于仂 弍亠�亠亟 于 仂从仆亠"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/extplacement.c:114
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+#: plugins/extplacement.c:116
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+#: plugins/extplacement.c:118
+msgid ""
+"Either restrict the number of conversations per windows or use separate "
+"windows for IMs and Chats"
+msgstr ""
+"�亞�舒仆亳���亠 �亳�仍仂 弍亠�亠亟 于 仂从仆亠 亳仍亳 亳�仗仂仍�亰�亶�亠 仂�亟亠仍�仆�亠 仂从仆舒 亟仍� 弍亠�亠亟 亳 "
+"�舒�仂于"
 
 #. *< api_version
 #. *< type
@@ -229,7 +287,7 @@
 #. *< id
 #: plugins/filectl.c:222
 msgid "Gaim File Control"
-msgstr "�仂仆��仂仍� �舒亶仍仂于 于 Gaim"
+msgstr "丕仗�舒于仍亠仆亳亠 Gaim 亳亰 �舒亶仍舒"
 
 #. *< name
 #. *< version
@@ -237,7 +295,7 @@
 #. *  description
 #: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "�仂亰于仂仍�亠� �仗�舒于仍��� Gaim 仗�亳 仗仂仄仂�亳 从仂仄舒仆亟"
+msgstr "�仂亰于仂仍�亠� �仗�舒于仍��� Gaim � 仗仂仄仂��� 于于仂亟舒 从仂仄舒仆亟 于 �舒亶仍."
 
 #: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
@@ -245,27 +303,28 @@
 
 #: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
-msgstr "�亠 亰舒亟舒仆 仗�亠于亟仂仆亳仄."
+msgstr "�亠 亰舒亟舒仆 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�."
 
 #: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
-msgstr "�仄� 从仂仄仆舒�� 仆亠 �从舒亰舒仆仂."
+msgstr "�亠 亰舒亟舒仆仂 亳仄� 从仂仄仆舒��."
 
 #: plugins/gaim-remote/remote.c:193
 msgid "Invalid AIM URI"
 msgstr "�亠于亠�仆�亶 AIM URI"
 
 #: plugins/gaim-remote/remote.c:651
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
 "%s"
-msgstr "�亠 �亟舒仍仂�� �仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠: %s\n"
+msgstr ""
+"�亠 �亟舒仍仂�� 仆舒亰仆舒�亳�� %s �仂从亠��:\n"
+"%s"
 
 #: plugins/gaim-remote/remote.c:674
-#, fuzzy
 msgid "Unable to open socket"
-msgstr "�亠� 于仂亰仄仂亢仆仂��亳 仗�仂�亳�舒�� �仂从亠�"
+msgstr "�亠 �亟舒���� 仂�从���� �仂从亠�"
 
 #. *< api_version
 #. *< type
@@ -283,7 +342,7 @@
 #. *  summary
 #: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
-msgstr "��亠亟仂��舒于仍�亠� 于仂亰仄仂亢仆仂��� 亟亳��舒仆�亳仂仆仆仂亞仂 �仗�舒于仍亠仆亳� Gaim"
+msgstr "��亠亟仂��舒于仍�亠� 于仂亰仄仂亢仆仂��� 亟亳��舒仆�亳仂仆仆仂亞仂 �仗�舒于仍亠仆亳� Gaim."
 
 #. *  description
 #: plugins/gaim-remote/remote.c:727
@@ -291,6 +350,8 @@
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
 msgstr ""
+"��亠亟仂��舒于仍�亠� 于仂亰仄仂亢仆仂��� �仗�舒于仍��� Gaim 亟亳��舒仆�亳仂仆仆仂 仗仂��亠亟��于仂仄 仗�亳仍仂亢亠仆亳亶 "
+"��亠��亳� �舒亰�舒弍仂��亳从仂于 亳仍亳 � 仗仂仄仂��� 亳仆����仄亠仆�舒 gaim-remote."
 
 #. *< api_version
 #. *< type
@@ -309,8 +370,7 @@
 #: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
-"��仂��仂 亟亠仄仂仆���舒�亳仂仆仆�亶 仄仂亟�仍� Gaim, 从仂�仂��亶 亟亠仍舒亠� 于��从�� 于���亳仆� - �亳�舒亶�亠 "
-"仂仗亳�舒仆亳亠."
+"�亠仄仂仆���舒�亳仂仆仆�亶 仄仂亟�仍�, 从仂�仂��亶 亟亠仍舒亠� 于��从亳亠 于亠�亳 - �仄仂��亳�亠 仂仗亳�舒仆亳亠."
 
 #. *  description
 #: plugins/gaiminc.c:92
@@ -320,6 +380,10 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
+"亅�仂 亟亠亶��于亳�亠仍�仆仂 亰舒仄亠�舒�亠仍�仆�亶 仄仂亟�仍�, 从仂�仂��亶 亟亠仍舒亠� 仄仆仂亢亠��于仂 于亠�亠亶:\n"
+"- 弌仂仂弍�舒亠� 于舒仄, 从�仂 仆舒仗亳�舒仍 ��� 仗�仂亞�舒仄仄�, 从仂亞亟舒 于� 于�仂亟亳�亠\n"
+"- �亠�亠于仂�舒�亳于舒亠� 于亠�� 仗�亳�仂亟��亳亶 �亠从��\n"
+"- ��仗�舒于仍�亠� �仂仂弍�亠仆亳亠 仗仂仍�亰仂于舒�亠仍�仄 亳亰 于舒�亠亞仂 �仗亳�从舒 ��舒亰� 仗仂�仍亠 仗仂亟从仍��亠仆亳�"
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:220
@@ -337,7 +401,7 @@
 #. "Visual gesture display" checkbox
 #: plugins/gestures/gestures.c:244
 msgid "_Visual gesture display"
-msgstr "_�亳亰�舒仍�仆仂亠 仂�仂弍�舒亢亠仆亳亠 亢亠��仂于"
+msgstr "�亳亰�舒仍�仆仂亠 仂�仂弍�舒亢亠仆亳亠 亢亠��仂于"
 
 #. *< api_version
 #. *< type
@@ -355,7 +419,7 @@
 #. *  summary
 #: plugins/gestures/gestures.c:274
 msgid "Provides support for mouse gestures"
-msgstr "����亠��于仍�亠� 仗仂亟亟亠�亢从� �仗�舒于仍亠仆亳� 仗�仂亞�舒仄仄仂亶 亢亠��舒仄亳 仄����"
+msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� 亢亠��仂于 仄����."
 
 #. *  description
 #: plugins/gestures/gestures.c:276
@@ -377,44 +441,42 @@
 
 #: plugins/gevolution/add_buddy_dialog.c:136
 #: plugins/gevolution/assoc-buddy.c:74
-#, fuzzy
 msgid "Local Addressbook"
-msgstr "�亟�亠� e-mail"
+msgstr "�仂从舒仍�仆舒� 舒亟�亠�仆舒� 从仆亳亞舒"
 
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: src/gtkblist.c:2954 src/gtkprefs.c:913 src/gtkprefs.c:966
+#: src/gtkprefs.c:1805 src/protocols/jabber/jabber.c:923
 msgid "None"
 msgstr "�亠�"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2154
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
+#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "�仄�"
 
 #: plugins/gevolution/add_buddy_dialog.c:201
-#, fuzzy
 msgid "Instant Messaging"
-msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠"
+msgstr "�弍仄亠仆 �仂仂弍�亠仆亳�仄亳"
 
 #. Add the label.
 #: plugins/gevolution/add_buddy_dialog.c:482
 msgid "Select a person from your address book below, or add a new person."
-msgstr ""
+msgstr "�亳亢亠 于�弍亠�亳�亠 仗亠��仂仆� 亳亰 舒亟�亠�仆仂亶 从仆亳亞亳 亳仍亳 亟仂弍舒于��亠 仆仂于�� 仗亠��仂仆�"
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
 msgid "Search"
 msgstr "��从舒��"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
+#: src/gtkblist.c:4311
 msgid "Group:"
 msgstr "���仗仗舒:"
 
@@ -422,13 +484,12 @@
 #: plugins/gevolution/add_buddy_dialog.c:592
 #: plugins/gevolution/assoc-buddy.c:486
 msgid "New Person"
-msgstr ""
+msgstr "�仂于舒� 仗亠��仂仆舒"
 
 #. "Select Buddy" button
 #: plugins/gevolution/add_buddy_dialog.c:609
-#, fuzzy
 msgid "Select Buddy"
-msgstr "丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍�"
+msgstr "��弍�舒�� 仗仂仍�亰仂于舒�亠仍�"
 
 #. Add the label.
 #: plugins/gevolution/assoc-buddy.c:370
@@ -436,46 +497,46 @@
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
+"��弍亠�亳�亠 仗亠��仂仆� 亳亰 舒亟�亠�仆仂亶 从仆亳亞亳, 从 从仂�仂�仂亶 �仍亠亟�亠� 亟仂弍舒于亳�� ��仂亞仂 "
+"仗仂仍�亰仂于舒�亠仍�, 亳仍亳 �仂亰亟舒亶�亠 仆仂于�� 仗亠��仂仆�."
 
 #. Add the disclosure
 #: plugins/gevolution/assoc-buddy.c:449
-#, fuzzy
 msgid "Show user details"
-msgstr "�仂从舒亰�于舒�� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
+msgstr "�仂从舒亰舒�� 仗仂亟�仂弍仆仂��亳 仂 仗仂仍�亰仂于舒�亠仍亠"
 
 #: plugins/gevolution/assoc-buddy.c:450
-#, fuzzy
 msgid "Hide user details"
-msgstr "弌仗���舒�� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
+msgstr "弌从���� 仗仂亟�仂弍仆仂��亳 仂 仗仂仍�亰仂于舒�亠仍亠"
 
 #. "Associate Buddy" button
 #: plugins/gevolution/assoc-buddy.c:503
-#, fuzzy
 msgid "_Associate Buddy"
-msgstr "��亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�"
+msgstr "弌仂仂�仆亠��亳 仗仂仍�亰仂于舒�亠仍�"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: src/blist.c:772 src/blist.c:960 src/blist.c:2057 src/gtkblist.c:3804
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
-msgstr "弌仂弍亠�亠亟仆亳从亳"
-
-#: plugins/gevolution/gevolution.c:214
+msgstr "�仂仍�亰仂于舒�亠仍亳"
+
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
-msgstr ""
+msgstr "�仂弍舒于亳�� 于 舒亟�亠�仆�� 从仆亳亞�"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
-#, fuzzy
+#: plugins/gevolution/gevolution.c:352
 msgid "Evolution Integration Configuration"
-msgstr "�舒���仂亶从舒 仗亳从�仂亞�舒仄仄� 仍仂�从舒"
+msgstr "�舒���仂亶从舒 亳仆�亠亞�舒�亳亳 � Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:355
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
-
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+"��弍亠�亳�亠 于�亠 ����仆�亠 亰舒仗亳�亳, 仗仂仍�亰仂于舒�亠仍亳 从仂�仂��� 亟仂仍亢仆� 弍��� 亟仂弍舒于仍亠仆� "
+"舒于�仂仄舒�亳�亠�从亳."
+
+#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "丕���仆舒� 亰舒仗亳��"
 
@@ -486,77 +547,73 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
-#, fuzzy
+#: plugins/gevolution/gevolution.c:466
 msgid "Evolution Integration"
-msgstr "�仂仗仂仍仆亳�亠仍�仆舒� 亳仆�仂�仄舒�亳�"
+msgstr "�仆�亠亞�舒�亳� � Evolution"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
 msgid "Provides integration with Ximian Evolution."
-msgstr ""
+msgstr "��亠亟仂��舒于仍�亠� 亳仆�亠亞�舒�亳� � Ximian Evolution."
 
 #: plugins/gevolution/new_person_dialog.c:270
-#, fuzzy
 msgid "Please enter the person's information below."
-msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
+msgstr "�亳亢亠 于于亠亟亳�亠 亳仆�仂�仄舒�亳� 仂 仗亠��仂仆亠."
 
 #: plugins/gevolution/new_person_dialog.c:274
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
+"�亳亢亠 于于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗仂仍�亰仂于舒�亠仍� 亳 �亳仗 ����仆仂亶 亰舒仗亳�亳."
 
 #: plugins/gevolution/new_person_dialog.c:294
-#, fuzzy
 msgid "Account type:"
-msgstr "丕���仆a� 亰舒仗亳��:"
+msgstr "丐亳仗 ����仆仂亶 亰舒仗亳�亳:"
 
 #: plugins/gevolution/new_person_dialog.c:298
 msgid "Screenname:"
-msgstr "�仂仄亠� (UIN)"
+msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
 #. Optional Information section
 #: plugins/gevolution/new_person_dialog.c:318
-#, fuzzy
 msgid "Optional information:"
-msgstr "�仂仗仂仍仆亳�亠仍�仆舒� 亳仆�仂�仄舒�亳�"
+msgstr "�亠仂弍�亰舒�亠仍�仆舒� 亳仆�仂�仄舒�亳�:"
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
-msgstr "�从仂仆从亳 仗仂仍�亰仂于舒�亠仍亠亶"
+msgstr "�仆舒�仂从 仗仂仍�亰仂于舒�亠仍�"
 
 #: plugins/gevolution/new_person_dialog.c:353
-#, fuzzy
 msgid "First name:"
-msgstr "�仄�"
+msgstr "�仄�:"
 
 #: plugins/gevolution/new_person_dialog.c:365
-#, fuzzy
 msgid "Last name:"
-msgstr "个舒仄亳仍亳�"
+msgstr "个舒仄亳仍亳�:"
 
 #: plugins/gevolution/new_person_dialog.c:385
-#, fuzzy
 msgid "E-mail:"
-msgstr "e-mail"
-
-#: plugins/history.c:70
+msgstr "E-mail:"
+
+#: plugins/history.c:88
 msgid "History"
 msgstr "���仂�亳�"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
-msgstr "�仂从舒亰�于舒�� 亢��仆舒仍 仆亠亟舒于仆亳� 弍亠�亠亟 于 仂从仆舒� c 仆仂于�仄亳 弍亠�亠亟舒仄亳."
-
-#: plugins/history.c:73
+msgstr "�仂从舒亰�于舒亠� 亰舒仗亳�亳 仆亠亟舒于仆亳� 弍亠�亠亟 于 仆仂于�� 弍亠�亠亟舒�."
+
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
+"�仂亞亟舒 仂�从�仂亠��� 仆仂于舒� 弍亠�亠亟舒, ��仂� 仄仂亟�仍� 于��舒于亳� 仗仂�仍亠亟仆�� 弍亠�亠亟� 于 �亠从���� "
+"弍亠�亠亟�."
 
 #. *< api_version
 #. *< type
@@ -567,7 +624,7 @@
 #. *< id
 #: plugins/iconaway.c:80
 msgid "Iconify on Away"
-msgstr "弌于仂�舒�亳于舒�� 仗�亳 ��仂亟亠"
+msgstr "弌于仂�舒�亳于舒�� 仗�亳 仂������于亳亳"
 
 #. *< name
 #. *< version
@@ -575,35 +632,31 @@
 #. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "弌于����于舒亠� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳 于�亠 弍亠�亠亟� 仗�亳 ��舒���亠 \"��仂��仍\"."
-
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "��亠仄� 弍亠亰亟亠亶��于亳�"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "丕��舒仆仂于亳��"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "弍亠亰亟亠亶��于�亠� 于 �亠�亠仆亳亠"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "仄亳仆��."
-
-#: plugins/idle.c:96
-msgid "_Set"
-msgstr "_丕��舒仆仂于亳��"
-
-#: plugins/idle.c:119
+msgstr "弌于仂�舒�亳于舒亠� �仗亳�仂从 从仂仆�舒从�仂于 亳 于�亠 弍亠�亠亟�, 从仂亞亟舒 于� 仂������于�亠�亠."
+
+#: plugins/idle.c:55
+msgid "Minutes"
+msgstr "�亳仆���"
+
+#: plugins/idle.c:62 plugins/idle.c:95
 msgid "I'dle Mak'er"
 msgstr "�舒��亠� 弍亠亰亟亠亶��于亳�"
 
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:63 plugins/idle.c:78
+msgid "Set Account Idle Time"
+msgstr "丕��舒仆仂于亳�� 于�亠仄� 弍亠亰亟亠亶��于亳� ����仆仂亶 亰舒仗亳�亳"
+
+#: plugins/idle.c:66
+msgid "_Set"
+msgstr "丕��舒仆仂于亳��"
+
+#: plugins/idle.c:67 src/dialogs.c:786
+msgid "_Cancel"
+msgstr "��仄亠仆舒"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
-msgstr "�仂亰于仂仍�亠� ���舒仆舒于仍亳于舒�� 亳仆�亠�于舒仍 仗亠�亠�仂亟舒 于 弍亠亰亟亠亶��于亳亠"
+msgstr "�仂亰于仂仍�亠� 仆舒���舒亳于舒�� 于�亠仄� 弍亠亰亟亠亶��于亳� 于���仆��."
 
 #. *< api_version
 #. *< type
@@ -614,14 +667,14 @@
 #. *< id
 #: plugins/ipc-test-client.c:84
 msgid "IPC Test Client"
-msgstr ""
+msgstr "丐亠��仂于�亶 从仍亳亠仆� IPC"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/ipc-test-client.c:87
 msgid "Test plugin IPC support, as a client."
-msgstr ""
+msgstr "丐亠��仂于�亶 仄仂亟�仍� 仗仂亟亟亠�亢从亳 IPC 于 从舒�亠��于亠 从仍亳亠仆�舒."
 
 #. *  description
 #: plugins/ipc-test-client.c:89
@@ -629,6 +682,8 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
+"丐亠��仂于�亶 仄仂亟�仍� 仗仂亟亟亠�亢从亳 IPC 于 从舒�亠��于亠 从仍亳亠仆�舒. �仗�亠亟亠仍�亠� 仄亠��仂仆舒�仂亢亟亠仆亳亠 "
+"�亠�于亠�仆仂亞仂 仄仂亟�仍� 亳 于�亰�于舒亠� 亰舒�亠亞亳���亳�仂于舒仆仆�亠 从仂仄舒仆亟�."
 
 #. *< api_version
 #. *< type
@@ -639,19 +694,20 @@
 #. *< id
 #: plugins/ipc-test-server.c:71
 msgid "IPC Test Server"
-msgstr "丐亠��仂于�亶 IPC-�亠�于亠�"
+msgstr "丐亠��仂于�亶 �亠�于亠� IPC"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/ipc-test-server.c:74
 msgid "Test plugin IPC support, as a server."
-msgstr ""
+msgstr "丐亠��仂于�亶 仄仂亟�仍� 仗仂亟亟亠�亢从亳 IPC 于 从舒�亠��于亠 �亠�于亠�舒."
 
 #. *  description
 #: plugins/ipc-test-server.c:76
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
+"丐亠��仂于�亶 仄仂亟�仍� 仗仂亟亟亠�亢从亳 IPC 于 从舒�亠��于亠 �亠�于亠�舒. �亠亞亳���亳��亠� 从仂仄舒仆亟� IPC."
 
 #: plugins/mailchk.c:157
 msgid "Mail Checker"
@@ -664,72 +720,74 @@
 #: plugins/mailchk.c:160
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
+"�仂弍舒于仍�亠� 仆亠弍仂仍���� 仂弍仍舒��� 从 �仗亳�从� 从仂仆�舒从�仂于, 于 从仂�仂�仂亶 �仂仂弍�舒亠��� 仂 "
+"仆舒仍亳�亳亳 仆仂于仂亶 仗仂���."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:572
+#: plugins/notify.c:595
 msgid "Notify For"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 亟仍�"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:599
 msgid "_IM windows"
-msgstr "_�从仆舒 Gaim"
-
-#: plugins/notify.c:583
+msgstr "�从仆舒 弍亠�亠亟"
+
+#: plugins/notify.c:606
 msgid "C_hat windows"
-msgstr "_�从仆舒 弍亠�亠亟"
-
-#: plugins/notify.c:590
+msgstr "�从仆舒 �舒�仂于"
+
+#: plugins/notify.c:613
 msgid "_Focused windows"
-msgstr "_�从仆舒 于 �仂从��亠"
+msgstr "�从仆舒 于 �仂从��亠"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:598
+#: plugins/notify.c:621
 msgid "Notification Methods"
 msgstr "�亠�仂亟� �于亠亟仂仄仍亠仆亳�"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:628
 msgid "Prepend _string into window title:"
-msgstr ""
+msgstr "�仂弍舒于仍��� ���仂从� 于 仆舒�舒仍仂 亰舒亞仂仍仂于从舒 仂从仆舒:"
 
 #. Count method button
-#: plugins/notify.c:624
+#: plugins/notify.c:647
 msgid "Insert c_ount of new messages into window title"
-msgstr ""
+msgstr "���舒于仍��� 从仂仍亳�亠��于仂 仆仂于�� �仂仂弍�亠仆亳亶 于 亰舒亞仂仍仂于仂从 仂从仆舒"
 
 #. Urgent method button
-#: plugins/notify.c:633
+#: plugins/notify.c:655
 msgid "Set window manager \"_URGENT\" hint"
-msgstr ""
+msgstr "丕��舒仆仂于亳�� 仗仂亟�从舒亰从� \"弌��丼��\" 仄亠仆亠亟亢亠�舒 仂从仂仆"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:663
 msgid "Notification Removal"
 msgstr "丕亟舒仍亠仆亳亠 �于亠亟仂仄仍亠仆亳亶"
 
 #. Remove on focus button
-#: plugins/notify.c:646
+#: plugins/notify.c:668
 msgid "Remove when conversation window _gains focus"
-msgstr "丕亟舒仍亳��, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� _仂从舒亰�于舒亠��� 于 �仂从��亠"
+msgstr "丕亟舒仍���, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 仂从舒亰�于舒亠��� 于 �仂从��亠"
 
 #. Remove on click button
-#: plugins/notify.c:654
+#: plugins/notify.c:675
 msgid "Remove when conversation window _receives click"
-msgstr ""
+msgstr "丕亟舒仍���, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 仗仂仍��舒亠� �亠仍�仂从"
 
 #. Remove on type button
-#: plugins/notify.c:662
+#: plugins/notify.c:683
 msgid "Remove when _typing in conversation window"
-msgstr ""
+msgstr "丕亟舒仍���, 从仂亞亟舒 于� 仆舒�亳仆舒亠�亠 仗亳�舒�� 于 仂从仆亠 弍亠�亠亟�"
 
 #. Remove on message send button
-#: plugins/notify.c:670
+#: plugins/notify.c:691
 msgid "Remove when a _message gets sent"
-msgstr "丕亟舒仍亳�� 仗仂�仍亠 仗亠�亠��仍从亳 _�仂仂弍�亠仆亳�"
+msgstr "丕亟舒仍��� 仗仂�仍亠 仂�仗�舒于从亳 �仂仂弍�亠仆亳�"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:679
-msgid "Remove on conversation ta_b switch"
-msgstr ""
+#: plugins/notify.c:700
+msgid "Remove on switch to conversation ta_b"
+msgstr "丕亟舒仍��� 仗�亳 仗亠�亠从仍��亠仆亳亳 仆舒 于从仍舒亟从� 弍亠�亠亟�"
 
 #. *< api_version
 #. *< type
@@ -738,7 +796,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:762
+#: plugins/notify.c:788
 msgid "Message Notification"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 �仂仂弍�亠仆亳亳"
 
@@ -746,9 +804,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:765 plugins/notify.c:767
+#: plugins/notify.c:791 plugins/notify.c:793
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "�仆舒亠� 仄仆仂亢亠��于仂 �仗仂�仂弍仂于 �于亠亟仂仄亳�� 于舒� 仂 仆亠仗�仂���仆仆�� �仂仂弍�亠仆亳亶."
+msgstr ""
+"��亠亟仂��舒于仍�亠� 仄仆仂亢亠��于仂 �仗仂�仂弍仂于 �于亠亟仂仄仍亠仆亳� 于舒� 仂 仆亠仗�仂���仆仆�� �仂仂弍�亠仆亳��."
 
 #. *< api_version
 #. *< type
@@ -766,27 +825,31 @@
 #. *< summary
 #: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
-msgstr "�从仍��舒亠� 仗仂亟亟亠�亢从� 仄仂亟�仍亠亶 仆舒 �亰�从亠 Perl"
+msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� 亰舒亞��亰从亳 仄仂亟�仍亠亶 perl."
 
 #: plugins/raw.c:154
 msgid "Raw"
-msgstr ""
+msgstr "�亠仂弍�舒弍仂�舒仆仆�亶"
 
 #: plugins/raw.c:156
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
+"�仂亰于仂仍�亠� 于舒仄 仂�仗�舒于仍��� 仆亠仂弍�舒弍仂�舒仆仆�亶 于于仂亟, 亳�仗仂仍�亰�� 仗�仂�仂从仂仍�, "
+"弍舒亰亳����亳亠�� 仆舒 �亠从��亠."
 
 #: plugins/raw.c:157
 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."
 msgstr ""
+"�仂亰于仂仍�亠� 于舒仄 仂�仗�舒于仍��� 仆亠仂弍�舒弍仂�舒仆仆�亶 于于仂亟, 亳�仗仂仍�亰�� 仗�仂�仂从仂仍�, "
+"弍舒亰亳����亳亠�� 仆舒 �亠从��亠 (Jabber, MSN, IRC, TOC). �仍� 仂�仗�舒于从亳 仆舒亢仄亳�亠 'Enter' "
+"于 仂弍仍舒��亳 于于仂亟舒. 弌仄仂��亳�亠 亰舒 仂从仆仂仄 仂�仍舒亟从亳."
 
 #: plugins/relnot.c:62
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr ""
-"�� 亳�仗仂仍�亰�亠�亠 Gaim 于亠��亳亳 %s.  �舒亳弍仂仍亠亠 �于亠亢亠亶 于亠��亳亠亶 �于仍�亠��� %s.<hr>"
+msgstr "�� 亳�仗仂仍�亰�亠�亠 Gaim 于亠��亳亳 %s. �仂�仍亠亟仆�� 亟仂���仗仆舒� 于亠��亳� %s.<hr>"
 
 #: plugins/relnot.c:68
 #, c-format
@@ -794,7 +857,7 @@
 "<b>ChangeLog:</b>\n"
 "%s<br><br>"
 msgstr ""
-"<b>丱�仂仆亳从舒 亳亰仄亠仆亠仆亳亶:</b>\n"
+"<b>弌仗亳�仂从 亳亰仄亠仆亠仆亳亶:</b>\n"
 "%s<br><br>"
 
 #: plugins/relnot.c:73
@@ -808,7 +871,7 @@
 
 #: plugins/relnot.c:77 plugins/relnot.c:78
 msgid "New Version Available"
-msgstr "�仂���仗仆舒 仆仂于舒� 于亠��亳� 仗�仂亞�舒仄仄�"
+msgstr "�仂���仗仆舒 仆仂于舒� 于亠��亳�"
 
 #. *< api_version
 #. *< type
@@ -819,14 +882,14 @@
 #. *< id
 #: plugins/relnot.c:134
 msgid "Release Notification"
-msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 于�仗��从亠 于亠��亳亳 仗�仂亞�舒仄仄�"
+msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 于�仗��从亠"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/relnot.c:137
 msgid "Checks periodically for new releases."
-msgstr "�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 弍仂仍亠亠 仆仂于�� 于亠��亳亶."
+msgstr "�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 仆仂于�� 于亠��亳亶."
 
 #. *  description
 #: plugins/relnot.c:139
@@ -834,8 +897,8 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 弍仂仍亠亠 仆仂于�� 于亠��亳亶 亳 �于亠亟仂仄仍�亠� 仂 仆亳� "
-"仗仂仍�亰仂于舒�亠仍亠亶, 仗�亳于仂亟� �仗亳�仂从 亳亰仄亠仆亠仆亳亶."
+"�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 仆仂于�� 于亠��亳亶 亳 �于亠亟仂仄仍�亠� 仂 仆亳� 仗仂仍�亰仂于舒�亠仍�, "
+"仗�亳于仂亟� �仗亳�仂从 亳亰仄亠仆亠仆亳亶."
 
 #. *< api_version
 #. *< type
@@ -844,17 +907,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:554
 msgid "Signals Test"
-msgstr "��仂弍舒 �亳亞仆舒仍仂于"
+msgstr "��仂于亠�从舒 �亳亞仆舒仍仂于"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:557 plugins/signals-test.c:559
 msgid "Test to see that all signals are working properly."
-msgstr "��仂于亠��亠�, 于�� 仍亳 仆仂�仄舒仍�仆仂 �舒弍仂�舒亠�."
+msgstr "��仂于亠��亠�, 于�亠 仍亳 �亳亞仆舒仍� �舒弍仂�舒�� 亳�仗�舒于仆仂."
 
 #. *< api_version
 #. *< type
@@ -873,11 +936,11 @@
 #. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
-msgstr "��仂于亠��亠�, 于�� 仍亳 仆仂�仄舒仍�仆仂 �舒弍仂�舒亠�."
+msgstr "��仂于亠��亠�, 于�� 仍亳 �舒弍仂�舒亠�."
 
 #: plugins/spellchk.c:412
 msgid "Text Replacements"
-msgstr "�舒仄亠仆舒 �亠从��舒"
+msgstr "�舒仄亠�亠仆亳亠 �亠从��舒"
 
 #: plugins/spellchk.c:436
 msgid "You type"
@@ -893,11 +956,11 @@
 
 #: plugins/spellchk.c:481
 msgid "You _type:"
-msgstr "�� 仗亳�亠�亠"
+msgstr "�� 仗亳�亠�亠:"
 
 #: plugins/spellchk.c:495
 msgid "You _send:"
-msgstr "�� 仂�仗�舒于仍�亠�亠"
+msgstr "�� 仂�仗�舒于仍�亠�亠:"
 
 #: plugins/spellchk.c:535
 msgid "Text replacement"
@@ -906,6 +969,8 @@
 #: plugins/spellchk.c:537 plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
+"�舒仄亠�舒亠� �亠从�� 于 亳��仂亟��亳� �仂仂弍�亠仆亳�� 于 �仂仂�于亠���于亳亳 � 仗�舒于亳仍舒仄亳, "
+"仂仗�亠亟亠仍�仆仆�仄亳 仗仂仍�亰仂于舒�亠仍亠仄."
 
 #. *< api_version
 #. *< type
@@ -916,7 +981,7 @@
 #. *< id
 #: plugins/ssl/ssl-gnutls.c:223
 msgid "GNUTLS"
-msgstr ""
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
@@ -924,7 +989,7 @@
 #. *  description
 #: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
-msgstr ""
+msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� SSL �亠�亠亰 GNUTLS."
 
 #. *< api_version
 #. *< type
@@ -943,7 +1008,7 @@
 #. *  description
 #: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
+msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� SSL �亠�亠亰 Mozilla NSS."
 
 #. *< api_version
 #. *< type
@@ -962,9 +1027,9 @@
 #. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+msgstr "��亠亟仂��舒于仍�亠� 仂弍���从� 于仂从��亞 弍亳弍仍亳仂�亠从 仗仂亟亟亠�亢从亳 SSL."
+
+#: plugins/statenotify.c:30
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 仂�仂��仍."
@@ -972,17 +1037,17 @@
 #: plugins/statenotify.c:36
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s 弍仂仍��亠 仆亠 于 �亠�亳."
+msgstr "%s 于亠�仆�仍��."
 
 #: plugins/statenotify.c:42
 #, c-format
 msgid "%s has become idle."
-msgstr "%s ��舒仍 弍亠亰亟亠亶��于���亳仄."
+msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��."
 
 #: plugins/statenotify.c:48
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s揃弍仂仍��亠 仆亠 于 �亠�亳"
+msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��."
 
 #. *< api_version
 #. *< type
@@ -993,7 +1058,7 @@
 #. *< id
 #: plugins/statenotify.c:78
 msgid "Buddy State Notification"
-msgstr "弌�舒���仆仂亠 �于亠亟仂仄仍亠仆亳亠"
+msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 ��舒���亠 仗仂仍�亰仂于舒�亠仍�"
 
 #. *< name
 #. *< version
@@ -1004,14 +1069,16 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-
-#: plugins/tcl/tcl.c:350
+"丕于亠亟仂仄仍�亠� 于 仂从仆亠 弍亠�亠亟�, 从仂亞亟舒 仗仂仍�亰仂于舒�亠仍� 仂��仂亟亳� 亳仍亳 于仂亰于�舒�舒亠���, 仍亳弍仂 "
+"仆舒�亳仆舒亠� 亳仍亳 仗亠�亠��舒亠� 弍亠亰亟亠亶��于仂于舒��."
+
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "�舒亞��亰�亳从 仄仂亟�仍亠亶 Tcl"
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
-msgstr "�从仍��舒亠� 仗仂亟亟亠�亢从� 仄仂亟�仍亠亶 仆舒 �亰�从亠 Tcl"
+msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� 仄仂亟�仍亠亶 仆舒 �亰�从亠 Tcl"
 
 #. *< api_version
 #. *< type
@@ -1022,7 +1089,7 @@
 #. *< id
 #: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
-msgstr "�亠仆�舒 �仂弍亠�亠亟仆亳从仂于"
+msgstr "�亠仆�舒 从仂仆�舒从�仂于"
 
 #. *< name
 #. *< version
@@ -1030,19 +1097,23 @@
 #. *  description
 #: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "�仂�亳亰仂仆�舒仍�仆舒� 仗�仂从���从舒 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于."
-
-#: plugins/timestamp.c:95
+msgstr "�仂�亳亰仂仆�舒仍�仆舒� 仗�仂从���从舒 �仗亳�从舒 从仂仆�舒从�仂于."
+
+#: plugins/timestamp.c:185
 msgid "iChat Timestamp"
-msgstr "��仄亠�从舒 于�亠仄亠仆亳 于 ��亳仍亠 iChat"
-
-#: plugins/timestamp.c:102
+msgstr "��仄亠�从舒 于�亠仄亠仆亳 iChat"
+
+#: plugins/timestamp.c:192
 msgid "Delay"
 msgstr "�舒亟亠�亢从舒"
 
-#: plugins/timestamp.c:115
+#: plugins/timestamp.c:199
+msgid "minutes."
+msgstr "仄亳仆��."
+
+#: plugins/timestamp.c:205
 msgid "_Apply"
-msgstr "_��亳仄亠仆亳��"
+msgstr "��亳仄亠仆亳��"
 
 #. *< api_version
 #. *< type
@@ -1051,45 +1122,45 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:173
+#: plugins/timestamp.c:268
 msgid "Timestamp"
-msgstr "��仄亠�从舒 于�亠仄亠仆亳"
+msgstr "��亠仄�"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "�仂弍舒于仍�亠� 于 弍亠�亠亟� 仂�仄亠�从亳 于�亠仄亠仆亳 于 ��亳仍亠 iChat 从舒亢亟�亠 N 仄亳仆��."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:389
+#: plugins/win32/transparency/win2ktrans.c:420
 msgid "Opacity:"
 msgstr "�亠仗�仂亰�舒�仆仂���:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "IM Conversation Windows"
-msgstr "�从仆舒 亟亳舒仍仂亞仂于"
-
-#: plugins/win32/transparency/win2ktrans.c:330
+msgstr "�从仆舒 弍亠�亠亟"
+
+#: plugins/win32/transparency/win2ktrans.c:371
 msgid "_IM window transparency"
-msgstr "_��仂亰�舒�仆仂��� 仂从仆舒 亟亳舒仍仂亞仂于"
-
-#: plugins/win32/transparency/win2ktrans.c:340
+msgstr "��仂亰�舒�仆仂��� 仂从仆舒 弍亠�亠亟�"
+
+#: plugins/win32/transparency/win2ktrans.c:381
 msgid "_Show slider bar in IM window"
-msgstr "_�仂从舒亰�于舒�� 仗仂仍仂�� 仗�仂从���从亳 于 亟亳舒仍仂亞舒�"
+msgstr "�仂从舒亰�于舒�� 仗仂仍仂�� 仗�仂从���从亳 于 仂从仆舒� 弍亠�亠亟"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
 msgid "Buddy List Window"
-msgstr "�从仆仂 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
-
-#: plugins/win32/transparency/win2ktrans.c:366
+msgstr "�从仆仂 �仗亳�从舒 从仂仆�舒从�仂于"
+
+#: plugins/win32/transparency/win2ktrans.c:407
 msgid "_Buddy List window transparency"
-msgstr "_��仂亰�舒�仆仂��� 仂从仆舒 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
+msgstr "��仂亰�舒�仆仂��� 仂从仆舒 �仗亳�从舒 从仂仆�舒从�仂于"
 
 #. *< api_version
 #. *< type
@@ -1098,21 +1169,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:463
 msgid "Transparency"
 msgstr "��仂亰�舒�仆仂���"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:466
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "�舒��亳��亠仄舒� 仗�仂亰�舒�仆仂��� 亟仍� �仗亳�从舒 从仂仆�舒从�仂于 亳 弍亠�亠亟."
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
-#: plugins/win32/transparency/win2ktrans.c:427
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+#: plugins/win32/transparency/win2ktrans.c:468
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
+"亅�仂� 仄仂亟�仍� 于从仍��舒亠� 于舒��亳��亠仄�� 舒仍��舒-仗�仂亰�舒�仆仂��� 仂从仆仂仆 弍亠�亠亟 亳 �仗亳�从舒 "
+"从仂仆�舒从�仂于.\n"
+"\n"
+"* �舒仄亠�舒仆亳亠: 亅�仂� 仄仂亟�仍� ��亠弍�亠� Win2000 亳仍亳 WinXP."
 
 #: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
@@ -1125,37 +1204,37 @@
 
 #: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
-msgstr "_�舒亞��亢舒�� Gaim 于仄亠��亠 � Windows"
+msgstr "�舒仗��从舒�� Gaim 仗�亳 亰舒亞��亰从亠 Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2995
+#: src/gtkprefs.c:2391
 msgid "Buddy List"
-msgstr "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
+msgstr "弌仗亳�仂从 从仂仆�舒从�仂于"
 
 #: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
-msgstr "_�仍舒于舒��亳亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
+msgstr "�舒从�亠仗仍�仆仆�亶 �仗亳�仂从 从仂仆�舒从�仂于"
 
 #. Docked Blist On Top
 #: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
-msgstr "��亳从仍亠亠仆仆�亶 �仗亳�仂从 _�仂弍亠�亠亟仆亳从仂于 于�亠亞亟舒 仗仂于亠�� 亟��亞亳� 仂从仂仆"
+msgstr "�舒从�亠仗仍�仆仆�亶 �仗亳�仂从 从仂仆�舒从�仂于 于�亠亞亟舒 仆舒于亠���"
 
 #. Blist On Top
 #: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
-msgstr "_�亠�亢舒�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 仗仂于亠�� 亟��亞亳� 仂从仂仆"
+msgstr "�亠�亢舒�� 仂从仆仂 �仗亳�从舒 从仂仆�舒从�仂于 仆舒于亠���"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
+#: src/gtkprefs.c:2392 src/protocols/msn/msn.c:1611
 msgid "Conversations"
 msgstr "�亠�亠亟�"
 
 #: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
-msgstr "_�亠��舒�� 仂从仆舒仄亳 仗�亳 仗仂仍��亠仆亳亳 �仂仂弍�亠仆亳亶"
+msgstr "�亠��舒�� 仂从仆仂仄 仗�亳 仗�亳仆��亳亳 �仂仂弍�亠仆亳亶"
 
 #: plugins/win32/winprefs/winprefs.c:405
 msgid "WinGaim Options"
@@ -1165,329 +1244,356 @@
 msgid "Options specific to Windows Gaim."
 msgstr "弌仗亠�亳�亳�仆�亠 亟仍� Windows 仗舒�舒仄亠��� Gaim"
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
-msgstr "� 仗�仂亞�舒仄仄亠 Gaim"
-
-#: src/about.c:74
+msgstr "� Gaim"
+
+#: src/about.c:75
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:95
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
-"Gaim ��仂 仄仂亟�仍�仆�亶 从仍亳亠仆� 仄亞仆仂于亠仆仆仂亞仂 仂弍仄亠仆舒 �仂仂弍�亠仆亳�仄亳 � 于仂亰仄仂亢仆仂���� "
-"亳�仗仂仍�亰仂于舒�� AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr 亳 Gadu-Gadu "
-"仂亟仆仂于�亠仄亠仆仆仂. �仆 仆舒仗亳�舒仆 � 亳�仗仂仍�亰仂于舒仆亳亠仄 GTK+ 亳 �舒�仗�仂���舒仆�亠��� 仗仂亟 "
+"Gaim - ��仂 仄仂亟�仍�仆�亶 从仍亳亠仆� 仂弍仄亠仆舒 �仂仂弍�亠仆亳�仄亳, 仗仂亰于仂仍���亳亶 亳�仗仂仍�亰仂于舒�� "
+"AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, Zephyr 亳 Gadu-Gadu "
+"仂亟仆仂于�亠仄亠仆仆仂. �仆 仆舒仗亳�舒仆 � 亳�仗仂仍�亰仂于舒仆亳亠仄 Gtk+ 亳 �舒�仗�仂���舒仆�亠��� 仗仂亟 "
 "仍亳�亠仆亰亳亠亶 GPL.<BR><BR>"
 
-#: src/about.c:104
-#, fuzzy
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-
-#: src/about.c:109
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim 仆舒 irc.freenode.net<BR><BR>"
+
+#: src/about.c:110
 msgid "Active Developers"
 msgstr "�从�亳于仆�亠 �舒亰�舒弍仂��亳从亳"
 
-#: src/about.c:110
+#: src/about.c:111
 msgid "maintainer"
 msgstr "仂�于亠���于亠仆仆�亶"
 
-#: src/about.c:112
+#: src/about.c:113
 msgid "lead developer"
-msgstr "亞仍舒于仆�亶 �舒亰�舒弍仂��亳从"
-
-#: src/about.c:115
+msgstr "于亠亟��亳亶 �舒亰�舒弍仂��亳从"
+
+#: src/about.c:116
 msgid "developer & webmaster"
 msgstr "�舒亰�舒弍仂��亳从 亳 于亠弍-仄舒��亠�"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "win32 port"
-msgstr "�仂�� 仆舒 Win32"
-
-#: src/about.c:119 src/about.c:120 src/about.c:121
+msgstr "仗仂�� win32"
+
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "�舒亰�舒弍仂��亳从"
 
-#: src/about.c:122
+#: src/about.c:124
 msgid "support"
 msgstr "仗仂亟亟亠�亢从舒"
 
-#: src/about.c:129
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "�亟亠�亢亳仄�亠 舒于�仂�� 亰舒仗仍舒�仂从"
 
-#: src/about.c:144
-msgid "Retired Developers"
-msgstr "�舒亰�舒弍仂��亳从亳, 仂�仂�亠亟�亳亠 仂� 亟亠仍"
-
-#: src/about.c:145
-msgid "former libfaim maintainer"
-msgstr "仗�亠亟�亟��亳亶 仂�于亠���于亠仆仆�亶 亰舒 libfaim"
-
 #: src/about.c:146
+msgid "Retired Developers"
+msgstr "�舒亰�舒弍仂��亳从亳, 仂�仂�亠亟�亳亠 仂� 亟亠仍"
+
+#: src/about.c:147
+msgid "former libfaim maintainer"
+msgstr "仗�亠亟�亟��亳亶 �仂仗�仂于仂亢亟舒��亳亶 libfaim"
+
+#: src/about.c:148
 msgid "former lead developer"
-msgstr "仗�亠亟�亟��亳亶 亞仍舒于仆�亶 �舒亰�舒弍仂��亳从"
-
-#: src/about.c:149
-msgid "former maintainer"
-msgstr "仗�亠亟�亟��亠亠 仂�于亠���于亠仆仆仂亠 仍亳�仂"
-
-#: src/about.c:150
-msgid "former Jabber developer"
-msgstr "仗�亠亟�亟��亳亶 �舒亰�舒弍仂��亳从 Jabber-仄仂亟�仍�"
+msgstr "仗�亠亟�亟��亳亶 于亠亟��亳亶 �舒亰�舒弍仂��亳从"
 
 #: src/about.c:151
+msgid "former maintainer"
+msgstr "仗�亠亟�亟��亳亶 �仂仗�仂于仂亢亟舒��亳亶"
+
+#: src/about.c:152
+msgid "former Jabber developer"
+msgstr "仗�亠亟�亟��亳亶 �舒亰�舒弍仂��亳从 Jabber"
+
+#: src/about.c:153
 msgid "original author"
 msgstr "亳��仂亟仆�亶 舒于�仂�"
 
-#: src/about.c:154
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: src/about.c:162
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "丐亠从��亳亠 仗亠�亠于仂亟�亳从亳"
 
-#: src/about.c:163 src/about.c:197
+#: src/about.c:165 src/about.c:203
 msgid "Catalan"
 msgstr "�舒�舒仍仂仆�从亳亶"
 
-#: src/about.c:164 src/about.c:198
+#: src/about.c:166 src/about.c:204
 msgid "Czech"
 msgstr "丼亠��从亳亶"
 
-#: src/about.c:165
+#: src/about.c:167
 msgid "Danish"
 msgstr "�舒��从亳亶"
 
-#: src/about.c:166
+#: src/about.c:168
 msgid "British English"
 msgstr "��亳�舒仆�从亳亶 舒仆亞仍亳亶�从亳亶"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:169
+msgid "Canadian English"
+msgstr "�舒仆舒亟�从亳亶 舒仆亞仍亳亶�从亳亶"
+
+#: src/about.c:170 src/about.c:205
 msgid "German"
 msgstr "�亠仄亠�从亳亶"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:171 src/about.c:206
 msgid "Spanish"
 msgstr "��仗舒仆�从亳亶"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:172 src/about.c:207
 msgid "Finnish"
 msgstr "个亳仆�从亳亶"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:173 src/about.c:208
 msgid "French"
 msgstr "个�舒仆��亰�从亳亶"
 
-#: src/about.c:171
+#: src/about.c:174
+msgid "Hebrew"
+msgstr "�于�亳�"
+
+#: src/about.c:175
 msgid "Hindi"
 msgstr "丱亳仆亟亳"
 
-#: src/about.c:172
+#: src/about.c:176
 msgid "Hungarian"
 msgstr "�亠仆亞亠��从亳亶"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:177 src/about.c:209
 msgid "Italian"
 msgstr "��舒仍��仆�从亳亶"
 
-#: src/about.c:174 src/about.c:206
+#: src/about.c:178 src/about.c:211
 msgid "Korean"
 msgstr "�仂�亠亶�从亳亶"
 
-#: src/about.c:175
+#: src/about.c:179
 msgid "Dutch; Flemish"
-msgstr "�舒��从亳亶, �仍舒仄舒仆亟�从亳亶 亟亳舒仍亠从�"
-
-#: src/about.c:176
-msgid "Macedonian"
-msgstr ""
-
-#: src/about.c:177
-msgid "Norwegian"
-msgstr "�仂�于亠亢�从亳亶"
-
-#: src/about.c:178 src/about.c:207
-msgid "Polish"
-msgstr "�仂仍��从亳亶"
-
-#: src/about.c:179
-msgid "Portuguese"
-msgstr "�仂���亞舒仍��从亳亶"
+msgstr "�舒��从亳亶; �仍舒仄舒仆亟�从亳亶"
 
 #: src/about.c:180
-msgid "Portuguese-Brazil"
-msgstr "�仂���亞舒仍��从亳亶-��舒亰亳仍��从亳亶"
+msgid "Macedonian"
+msgstr "�舒从亠亟仂仆�从亳亶"
 
 #: src/about.c:181
-msgid "Romanian"
-msgstr "��仄�仆�从亳亶"
-
-#: src/about.c:182 src/about.c:208
-msgid "Russian"
-msgstr "����从亳亶"
+msgid "Norwegian"
+msgstr "�仂�于亠亢�从亳亶"
+
+#: src/about.c:182 src/about.c:212
+msgid "Polish"
+msgstr "�仂仍��从亳亶"
 
 #: src/about.c:183
-msgid "Serbian"
-msgstr "弌亠�弍�从亳亶"
-
-#: src/about.c:184 src/about.c:210
-msgid "Swedish"
-msgstr "丿于亠亟�从亳亶"
+msgid "Portuguese"
+msgstr "�仂���亞舒仍��从亳亶"
+
+#: src/about.c:184
+msgid "Portuguese-Brazil"
+msgstr "�仂���亞舒仍��从亳亶-弍�舒亰亳仍��从亳亶"
 
 #: src/about.c:185
-msgid "Vietnamese"
-msgstr "��亠�仆舒仄�从亳亶"
-
-#: src/about.c:185
-msgid "Gnome Vi Team"
-msgstr "�仂仄舒仆亟舒 GNOME Vi"
-
-#: src/about.c:186
-msgid "Simplified Chinese"
-msgstr "丕仗�仂��仆仆�亶 从亳�舒亶�从亳亶"
+msgid "Romanian"
+msgstr "��仄�仆�从亳亶"
+
+#: src/about.c:186 src/about.c:213
+msgid "Russian"
+msgstr "����从亳亶"
 
 #: src/about.c:187
+msgid "Serbian"
+msgstr "弌亠�弍�从亳亶"
+
+#: src/about.c:188
+msgid "Slovenian"
+msgstr "弌仍仂于亠仆�从亳亶"
+
+#: src/about.c:189 src/about.c:215
+msgid "Swedish"
+msgstr "丿于亠亟�从亳亶"
+
+#: src/about.c:190
+msgid "Vietnamese"
+msgstr "��亠�仆舒仄�从亳亶"
+
+#: src/about.c:190
+msgid "Gnome Vi Team"
+msgstr "�仂仄舒仆亟舒 Gnome Vi"
+
+#: src/about.c:192
+msgid "Simplified Chinese"
+msgstr "丕仗�仂��仆仆�亶 从亳�舒亶�从亳亶"
+
+#: src/about.c:193
 msgid "Traditional Chinese"
 msgstr "丐�舒亟亳�亳仂仆仆�亶 从亳�舒亶�从亳亶"
 
-#: src/about.c:194
+#: src/about.c:200
 msgid "Past Translators"
 msgstr "��亠亟�亟��亳亠 仗亠�亠于仂亟�亳从亳"
 
-#: src/about.c:195
+#: src/about.c:201
 msgid "Amharic"
-msgstr ""
-
-#: src/about.c:196
+msgstr "�仄�舒��从亳亶"
+
+#: src/about.c:202
 msgid "Bulgarian"
 msgstr "�仂仍亞舒��从亳亶"
 
-#: src/about.c:203
-msgid "Hebrew"
-msgstr "�亟亳�"
-
-#: src/about.c:205
+#: src/about.c:210
 msgid "Japanese"
 msgstr "亊仗仂仆�从亳亶"
 
-#: src/about.c:209
+#: src/about.c:214
 msgid "Slovak"
 msgstr "弌仍仂于舒�从亳亶"
 
-#: src/about.c:211
+#: src/about.c:216
 msgid "Chinese"
 msgstr "�亳�舒亶�从亳亶"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:278 src/protocols/jabber/jabber.c:1000
 msgid "New passwords do not match."
-msgstr "�舒�仂仍亳 仆亠 �仂于仗舒亟舒��."
-
-#: src/account.c:288
+msgstr "�仂于�亠 仗舒�仂仍亳 仆亠 �仂于仗舒亟舒��."
+
+#: src/account.c:287
 msgid "Fill out all fields completely."
 msgstr "�舒仗仂仍仆亳�亠 于�亠 仗仂仍�."
 
-#: src/account.c:313
+#: src/account.c:312
 msgid "Original password"
 msgstr "���仂亟仆�亶 仗舒�仂仍�"
 
-#: src/account.c:320
+#: src/account.c:319
 msgid "New password"
 msgstr "�仂于�亶 仗舒�仂仍�"
 
-#: src/account.c:327
+#: src/account.c:326
 msgid "New password (again)"
 msgstr "�仂于�亶 仗舒�仂仍� (亠�� �舒亰)"
 
-#: src/account.c:333
+#: src/account.c:332
 #, c-format
 msgid "Change password for %s"
-msgstr "弌仄亠仆舒 仗舒�仂仍� 亟仍� '%s':"
-
-#: src/account.c:341
+msgstr "�亰仄亠仆亳�� 仗舒�仂仍� 亟仍� %s"
+
+#: src/account.c:340
 msgid "Please enter your current password and your new password."
-msgstr "�仂亢舒仍�亶��舒, 于于亠亟亳�亠 �亠从��亳亶, 舒 亰舒�亠仄 仆仂于�亶 仗舒�仂仍亳"
+msgstr "�于亠亟亳�亠 于舒� �亠从��亳亶 亳 于舒� 仆仂于�亶 仗舒�仂仍亳"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
+#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
+#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
+#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
+#: src/protocols/yahoo/yahoo.c:2806 src/protocols/yahoo/yahoo.c:2815
+#: src/request.h:1242
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
+#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2342 src/gtkblist.c:4349
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
+#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
+#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
+#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
+#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
+#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
+#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2816
+#: src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "��仄亠仆舒"
 
-#: src/account.c:374
+#: src/account.c:373
 #, c-format
 msgid "Change user information for %s"
-msgstr "�亰仄亠仆亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 '%s'"
-
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+msgstr "�亰仄亠仆亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 %s"
+
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "弌仂��舒仆亳��"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "��仂��仍!"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "亊 于亠�仆�仍��!"
 
-#: src/away.c:375
+#: src/away.c:330
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 \"%s\"?"
+
+#: src/away.c:332 src/away.c:423
+msgid "Remove Away Message"
+msgstr "丕亟舒仍亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
+
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1356 src/gtkconv.c:3537 src/gtkconv.c:3636
+#: src/gtkrequest.c:241
+msgid "Remove"
+msgstr "丕亟舒仍亳��"
+
+#: src/away.c:403
 msgid "New Away Message"
 msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: src/away.c:395
-msgid "Remove Away Message"
-msgstr "丕亟舒仍亳�� 仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
-
-#: src/away.c:590
+#: src/away.c:618
 msgid "Set All Away"
-msgstr "丕��舒仆仂于亳�� 于亠亰亟亠 \"仂�仂�亠仍\""
-
-#: src/blist.c:590 src/gtkprefs.c:2508
+msgstr "丕��舒仆仂于亳�� 于亠亰亟亠 \"��仂��仍\""
+
+#: src/blist.c:678
 msgid "Chats"
 msgstr "丼舒��"
 
-#: src/blist.c:1192
+#: src/blist.c:1318
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1496,119 +1602,130 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 msgstr[0] ""
+"%d 仗仂仍�亰仂于舒�亠仍� 亳亰 亞��仗仗� %s 仆亠 弍�仍 �亟舒仍�仆, �舒从 从舒从 仆亠 弍�仍 仂���亠��于仍�仆 于�仂亟 "
+"� �仂仂�于亠���于���亠亶 亠仄� ����仆仂亶 亰舒仗亳���. 亅�仂� 仗仂仍�亰仂于舒�亠仍� 亳 亞��仗仗舒 仆亠 弍�仍亳 "
+"�亟舒仍亠仆�.\n"
 msgstr[1] ""
-
-#: src/blist.c:1201
+"%d 仗仂仍�亰仂于舒�亠仍亠亶 亳亰 亞��仗仗� %s 仆亠 弍�仍亳 �亟舒仍亠仆�, �舒从 从舒从 仆亠 弍�仍 仂���亠��于仍�仆 "
+"于�仂亟 � �仂仂�于亠���于���亠亶 亳仄 ����仆仂亶 亰舒仗亳���. 亅�亳 仗仂仍�亰仂于舒�亠仍亳 亳 亞��仗仗舒 仆亠 弍�仍亳 "
+"�亟舒仍亠仆�.\n"
+
+#: src/blist.c:1327
 msgid "Group not removed"
 msgstr "���仗仗舒 仆亠 �亟舒仍亠仆舒"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
+#: src/blist.c:1390 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:721
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
 msgid "Unknown"
-msgstr "�亠亳亰于亠��仆�亶"
-
-#: src/blist.c:1578
+msgstr "�亠亳亰于亠��仆仂"
+
+#: src/blist.c:1718
 msgid "Invalid Groupname"
 msgstr "�亠于亠�仆仂亠 亳仄� 亞��仗仗�"
 
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-
-#: src/blist.c:2222
+#: src/blist.c:2189
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+"��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 �舒亰弍仂�亠 �仗亳�从舒 从仂仆�舒从�仂于. 弌仗亳�仂从 仆亠 弍�仍 亰舒亞��亢亠仆, 舒 "
+"��舒��亶 �舒亶仍 弍�仍 仗亠�亠亳仄亠仆仂于舒仆 于 blist.xml~."
+
+#: src/blist.c:2192
 msgid "Buddy List Error"
-msgstr "��亳弍从舒 �仂 c仗亳�从仂仄 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/connection.c:119 src/connection.c:170
+msgstr "��亳弍从舒 c仗亳�从舒 从仂仆�舒从�仂于"
+
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "�������于�亠� 仄仂亟�仍� 仗�仂�仂从仂仍舒 亟仍� %s"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
-msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 �亠亞亳���舒�亳亳"
-
-#: src/connection.c:175
+msgstr "��亳弍从舒 �亠亞亳���舒�亳亳"
+
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳�"
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
-msgstr "�于亟亳�亠 仗舒�仂仍� 亟仍� %s"
-
-#: src/conversation.c:296
+msgstr "�于亠亟亳�亠 仗舒�仂仍� 亟仍� %s"
+
+#: src/conversation.c:271
 msgid "Unable to send message. The message is too large."
-msgstr "弌仂仂弍�亠仆亳亠 仆亠 仗亠�亠�仍舒仆仂, �舒从 从舒从 仂仆仂 �仍亳�从仂仄 于亠仍亳从仂."
-
-#: src/conversation.c:304
+msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠. 弌仂仂弍�亠仆亳亠 �仍亳�从仂仄 于亠仍亳从仂."
+
+#: src/conversation.c:279
 msgid "Unable to send message."
-msgstr "弌仂仂弍�亠仆亳亠 仆亠 仗亠�亠�仍舒仆仂."
-
-#: src/conversation.c:1969
+msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
+
+#: src/conversation.c:1957
 #, c-format
 msgid "%s entered the room."
-msgstr "%s 于仂�亠仍 于 亟舒仆仆�亶 �舒�"
-
-#: src/conversation.c:1972
+msgstr "%s 于仂��仍 于 从仂仄仆舒��."
+
+#: src/conversation.c:1960
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s揃[<I>%s</I>] 于仂�亠仍 于 亟舒仆仆�亶 �舒�"
-
-#: src/conversation.c:2064
-#, fuzzy, c-format
+msgstr "%s [<I>%s</I>] 于仂��仍 于 从仂仄仆舒��."
+
+#: src/conversation.c:2051
+#, c-format
 msgid "You are now known as %s"
-msgstr "%s 弍�亟亠� %s"
-
-#: src/conversation.c:2067
+msgstr "�� �亠仗亠�� 亳亰于亠��仆� 从舒从 %s"
+
+#: src/conversation.c:2054
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s 弍�亟亠� %s"
-
-#: src/conversation.c:2110
+msgstr "%s �亠仗亠�� 亳亰于亠��亠仆 从舒从 %s"
+
+#: src/conversation.c:2096
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s 仗仂从亳仆�仍 亟舒仆仆�亶 �舒� (%s)"
-
-#: src/conversation.c:2112
+msgstr "%s 于��亠仍 亳亰 从仂仄仆舒�� (%s)."
+
+#: src/conversation.c:2098
 #, c-format
 msgid "%s left the room."
-msgstr "%s 仗仂从亳仆�仍 亟舒仆仆�亶 �舒�"
-
-#: src/conversation.c:2185
+msgstr "%s 于��亠仍 亳亰 从仂仄仆舒��."
+
+#: src/conversation.c:2169
 #, c-format
 msgid "(+%d more)"
-msgstr "(+%d �仂仂弍�亠仆亳亶)"
-
-#: src/conversation.c:2187
+msgstr "(+%d 亠��)"
+
+#: src/conversation.c:2171
 #, c-format
 msgid " left the room (%s)."
-msgstr " 仗仂从亳仆�仍 亟舒仆仆�亶 �舒� (%s)"
+msgstr " 于��亠仍 亳亰 从仂仄仆舒�� (%s)."
+
+#: src/conversation.c:2461
+msgid "Last created window"
+msgstr "�仂�仍亠亟仆亠亠 �仂亰亟舒仆仆仂亠 仂从仆仂"
+
+#: src/conversation.c:2463
+msgid "Separate IM and Chat windows"
+msgstr "��亟亠仍�仆�亠 仂从仆舒 弍亠�亠亟 亳 �舒�仂于"
+
+#: src/conversation.c:2465 src/gtkprefs.c:1331
+msgid "New window"
+msgstr "�仂于仂亠 仂从仆仂"
 
 #: src/conversation.c:2467
-msgid "Last created window"
-msgstr "�仂�仍亠亟仆亠亠 �仂亰亟舒仆仆仂亠 仂从仆仂"
-
-#: src/conversation.c:2469 src/gtkprefs.c:1413
-msgid "New window"
-msgstr "�仂于仂亠 仂从仆仂"
-
-#: src/conversation.c:2471
 msgid "By group"
 msgstr "�仂 亞��仗仗亠"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2469
 msgid "By account"
 msgstr "�仂 ����仆仂亶 亰舒仗亳�亳"
 
-#: src/dialogs.c:154
+#: src/dialogs.c:149
 msgid "Warn User"
-msgstr ""
-"弌亟亠仍舒�� \n"
-"仗�亠亟�仗�亠亢亟亠仆亳亠"
-
-#: src/dialogs.c:173
+msgstr "弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/dialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1616,187 +1733,197 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 msgstr ""
-
-#: src/dialogs.c:182
+"<span weight=\"bold\" size=\"larger\">弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠 %s?</span>\n"
+"\n"
+"亅�仂 �于亠仍亳�亳� ��仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳� %s, 亳 仗仂仍�亰仂于舒�亠仍� 弍�亟亠� 仗仂亟于亠�亢亠仆 "
+"�亢亠��仂�亠仆亳� 仂亞�舒仆亳�亠仆亳� ��仂于仆�.\n"
+
+#: src/dialogs.c:177
 msgid "Warn _anonymously?"
-msgstr "��亠亟�仗�亠亟亳�� _舒仆仂仆亳仄仆仂?"
-
-#: src/dialogs.c:189
+msgstr "弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠 舒仆仂仆亳仄仆仂?"
+
+#: src/dialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>�仆仂仆亳仄仆�亠 仗�亠亟�仗�亠亢亟亠仆亳� 仄亠仆亠亠 仆舒亟仂亠亟仍亳于�.</b>"
-
-#: src/dialogs.c:301
+msgstr "<b>�仆仂仆亳仄仆�亠 仗�亠亟�仗�亠亢亟亠仆亳� 仄亠仆亠亠 �亠���亰仆�.</b>"
+
+#: src/dialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "�亠亶��于亳�亠仍�仆仂 �亟舒仍亳�� '%s' 亳亰 �仗亳�从舒 仗仂仍�亰仂于舒�亠仍亠亶?"
-
-#: src/dialogs.c:303 src/dialogs.c:304
+msgstr "�� �亟舒仍亳�亠 %s 亳亰 �仗亳�从舒 从仂仆�舒从�仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
+
+#: src/dialogs.c:297 src/dialogs.c:298
 msgid "Remove Buddy"
 msgstr "丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/dialogs.c:313
+#: src/dialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "�亠亶��于亳�亠仍�仆仂 �亟舒仍亳�� �舒� '%s' 亳亰 �仗亳�从舒 仗仂仍�亰仂于舒�亠仍亠亶?"
-
-#: src/dialogs.c:315 src/dialogs.c:316
+msgstr "�� �亟舒仍亳�亠 �舒� %s 亳亰 �仗亳�从舒 从仂仆�舒从�仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
+
+#: src/dialogs.c:309 src/dialogs.c:310
 msgid "Remove Chat"
 msgstr "丕亟舒仍亳�� �舒�"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
-msgstr "�亠亶��于亳�亠仍�仆仂 �亟舒仍亳�� 亞��仗仗� '%s' 亳亰 �仗亳�从舒 仗仂仍�亰仂于舒�亠仍亠亶?"
-
-#: src/dialogs.c:328 src/dialogs.c:329
+msgstr ""
+"�� �亟舒仍亳�亠 亞��仗仗� %s 亳 于�亠� 亠� �仍亠仆仂于 亳亰 �仗亳�从舒 从仂仆�舒从�仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
+
+#: src/dialogs.c:322 src/dialogs.c:323
 msgid "Remove Group"
 msgstr "丕亟舒仍亳�� ���仗仗�"
 
-#: src/dialogs.c:346
+#: src/dialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
-"�亠亶��于亳�亠仍�仆仂 �亟舒仍亳�� 从仂仆�舒从�, �仂亟亠�亢舒�亳亶 '%s', &s 亳 亟��亞亳� �仂弍亠�亠亟仆亳从仂于 亳亰 "
-"�仗亳�从舒 仗仂仍�亰仂于舒�亠仍亠亶?"
-
-#: src/dialogs.c:349 src/dialogs.c:350
+"�� �亟舒仍亳�亠 从仂仆�舒从�, �仂亟亠�亢舒�亳亶 %s 亳 %d 亟��亞亳� 仗仂仍�亰仂于舒�亠仍亠亶 亳亰 �仗亳�从舒 "
+"从仂仆�舒从�仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
+
+#: src/dialogs.c:343 src/dialogs.c:344
 msgid "Remove Contact"
 msgstr "丕亟舒仍亳�� 从仂仆�舒从�"
 
-#: src/dialogs.c:453 src/dialogs.c:509
-#, fuzzy
+#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
 msgid "_Screen name"
-msgstr "_�仂仍�亰仂于舒�亠仍� (UIN)"
-
-#: src/dialogs.c:459 src/dialogs.c:515
-#, fuzzy
+msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
 msgid "_Account"
-msgstr "_丕���仆a� 亰舒仗亳��:"
-
-#: src/dialogs.c:466
+msgstr "丕���仆a� 亰舒仗亳��"
+
+#: src/dialogs.c:457
 msgid "New Instant Message"
 msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠"
 
-#: src/dialogs.c:468
-#, fuzzy
+#: src/dialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
-msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂仄� �仂�亳�亠 仗亠�亠�仍舒�� �仂仂弍�亠仆亳亠.\n"
-
-#: src/dialogs.c:522
+msgstr ""
+"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗亠��仂仆�, 从仂�仂�仂亶 于� �仂�亠仍亳 弍� 仂�仗�舒于亳�� "
+"�仂仂弍�亠仆亳亠."
+
+#: src/dialogs.c:513
 msgid "Get User Info"
-msgstr "�仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠"
-
-#: src/dialogs.c:524
-#, fuzzy
+msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
+
+#: src/dialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
-msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂仄� �仂�亳�亠 仗亠�亠�仍舒�� �仂仂弍�亠仆亳亠.\n"
-
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr "��弍仂� �于亠�舒 �亠从��舒"
-
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "��弍仂� �于亠�舒 �仂仆舒"
-
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "��弍仂� ��亳��舒"
-
-#: src/dialogs.c:692
+msgstr ""
+"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗亠��仂仆�, 亳仆�仂�仄舒�亳� 仂 从仂�仂�仂亶 于� �仂�亠仍亳 "
+"弍� 仗�仂�仄仂��亠��."
+
+#: src/dialogs.c:566
+msgid "Get User Log"
+msgstr "�仂仍��亳�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/dialogs.c:568
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr ""
+"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗亠��仂仆�, 亢��仆舒仍 从仂�仂�仂亶 于� �仂�亠仍亳 弍� "
+"仗�仂�仄仂��亠��."
+
+#: src/dialogs.c:623
 msgid "You cannot save an away message with a blank title"
-msgstr "�� 仆亠 仄仂亢亠�亠 �仂��舒仆亳�� ��舒���仆仂亠 �于亠亟仂仄仍亠仆亳亠 弍亠亰 亰舒亞仂仍仂于从舒"
-
-#: src/dialogs.c:694
+msgstr "�� 仆亠 仄仂亢亠�亠 �仂��舒仆亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 弍亠亰 仆舒亰于舒仆亳�"
+
+#: src/dialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
-
-#: src/dialogs.c:704
+"�舒亶�亠 �仂仂弍�亠仆亳� 仆舒亰于舒仆亳亠 亳仍亳 于�弍亠�亳�亠 \"��亳仄亠仆亳��\" 亟仍� 亳�仗仂仍�亰仂于舒仆亳� 弍亠亰 "
+"�仂��舒仆亠仆亳�."
+
+#: src/dialogs.c:635
 msgid "You cannot create an empty away message"
-msgstr "�� 仆亠 仄仂亢亠�亠 �仂亰亟舒�� 仗���仂亠 �仂仂弍�亠仆亳亠 仂������于亳�"
-
-#: src/dialogs.c:766
+msgstr "�� 仆亠 仄仂亢亠�亠 �仂亰亟舒�� 仗���仂亠 �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
+
+#: src/dialogs.c:697
 msgid "New away message"
-msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠 仂������于亳�"
-
-#: src/dialogs.c:787
+msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
+
+#: src/dialogs.c:718
 msgid "Away title: "
-msgstr "�舒亞仂仍仂于仂从 仂������于亳�:"
-
-#: src/dialogs.c:843
-msgid "Save & Use"
+msgstr "�舒亰于舒仆亳亠 �仂仂弍�亠仆亳� 仂弍 仂������于亳亳: "
+
+#: src/dialogs.c:774
+msgid "_Save"
+msgstr "弌仂��舒仆亳��"
+
+#: src/dialogs.c:778
+msgid "Sa_ve & Use"
 msgstr "弌仂��舒仆亳�� 亳 仗�亳仄亠仆亳��"
 
-#: src/dialogs.c:847
-msgid "Use"
+#: src/dialogs.c:782
+msgid "_Use"
 msgstr "��亳仄亠仆亳��"
 
-#: src/dialogs.c:868
+#: src/dialogs.c:804
 msgid "Alias Chat"
 msgstr "��亠于亟仂仆亳仄 �舒�舒"
 
-#: src/dialogs.c:869
+#: src/dialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 �舒�舒."
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
-#, fuzzy
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:569
 msgid "Alias"
-msgstr "��亠于亟仂仆亳仄:"
-
-#: src/dialogs.c:885
+msgstr "��亠于亟仂仆亳仄"
+
+#: src/dialogs.c:820
 msgid "Alias Contact"
 msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"
 
-#: src/dialogs.c:886
+#: src/dialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 从仂仆�舒从�舒."
 
-#: src/dialogs.c:903
+#: src/dialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� %s."
 
-#: src/dialogs.c:905
+#: src/dialogs.c:839
 msgid "Alias Buddy"
 msgstr "��亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�"
 
 #: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "'%s' 仆亠 �于仍�亠��� 从仂��亠从�仆�仄 亳仄亠仆亠仄 �舒亶仍舒.\n"
+msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 亳仄亠仆亠仄 �舒亶仍舒.\n"
 
 #: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
-msgstr "%s 仆亠 弍�仍 仆舒亶亟亠仆was not found.\n"
+msgstr "%s 仆亠 弍�仍仂 仆舒亶亟亠仆仂.\n"
 
 #: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
-msgstr "�亠�亠亟舒�舒 �舒亶仍舒 亟仍� '%s' 仗�亠�于舒仆舒.\n"
+msgstr "�亠�亠亟舒�舒 �舒亶仍舒 亟仍� %s 仗�亠�于舒仆舒.\n"
 
 #: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
-msgstr "�亠�亠亟舒�舒 �舒亶仍舒 仂� '%s' 仗�亠�于舒仆舒.\n"
+msgstr "�亠�亠亟舒�舒 �舒亶仍舒 仂� %s 仗�亠�于舒仆舒.\n"
 
 #: src/gaim-disclosure.c:253
 msgid "Expander Size"
-msgstr ""
+msgstr "�舒亰仄亠� �舒��亳�亳�亠仍�"
 
 #: src/gaim-disclosure.c:254
 msgid "Size of the expander arrow"
-msgstr ""
+msgstr "�舒亰仄亠� �从舒亰舒�亠仍� �舒��亳�亳�亠仍�"
 
 #: src/gaim-remote.c:65
 #, c-format
@@ -1808,16 +1935,16 @@
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -h, --help [command]    Show help for command\n"
+"       -h, --help [command]     Show help for command\n"
 msgstr ""
 "��仗仂仍�亰仂于舒仆亳亠: %s 从仂仄舒仆亟舒 [������丐�乘] [URI]\n"
 "\n"
 "    ������乘:\n"
-"       uri                      Handle AIM: URI\n"
-"       quit                     �舒从���� �亠从���� 从仂仗亳� Gaim\n"
+"       uri                      丕仗�舒于仍��� AIM: URI\n"
+"       quit                     �舒从���� 亰舒仗��亠仆仆�� 从仂仗亳� Gaim\n"
 "\n"
 "    ������丐�乘:\n"
-"       -h, --help [从仂仄舒仆亟舒]    �仂从舒亰舒�� �仗�舒于从� 仗仂 从仂仄舒仆亟亠\n"
+"       -h, --help [从仂仄舒仆亟舒]     �仂从舒亰舒�� 仗仂仄仂�� 亟仍� 从仂仄舒仆亟�\n"
 
 #: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
@@ -1852,26 +1979,26 @@
 "Close running copy of Gaim\n"
 msgstr ""
 "\n"
-"�舒从���� 亰舒仗��亠仆仆�� 从仂仗亳�揃Gaim\n"
+"�舒从���� 亰舒仗��亠仆仆�� 从仂仗亳� Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
 #: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
-msgstr "亳亰于亳仆亳�亠, � 于�弍亠亢舒仍 仆舒 仄亳仆��从�. �从仂�仂 于亠�仆���"
-
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+msgstr ""
+
+#: src/gaimrc.c:372 src/gaimrc.c:1409
 msgid "boring default"
 msgstr ""
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1219 src/gtkblist.c:2956
 msgid "Alphabetical"
 msgstr "�仂 舒仍�舒于亳��"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1221 src/gtkblist.c:2957
 msgid "By status"
 msgstr "�仂 ��舒����"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1223 src/gtkblist.c:2958
 msgid "By log size"
 msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"
 
@@ -1882,9 +2009,9 @@
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 msgstr ""
-"<b>个舒亶仍:</b>揃%s\n"
-"<b>�舒亰仄亠� �舒亶仍舒:</b>揃%s\n"
-"<b>�舒亰仄亠� 亳亰仂弍�舒亢亠仆亳�:</b>揃%dx%d"
+"<b>个舒亶仍:</b> %s\n"
+"<b>�舒亰仄亠� �舒亶仍舒:</b> %s\n"
+"<b>�舒亰仄亠� 亳亰仂弍�舒亢亠仆亳�:</b> %dx%d"
 
 #. Build the login options frame.
 #: src/gtkaccount.c:384
@@ -1895,15 +2022,15 @@
 msgid "Protocol:"
 msgstr "��仂�仂从仂仍:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:406 src/gtkblist.c:3955
 msgid "Screen Name:"
-msgstr "�仂仍�亰仂于舒�亠仍� (UIN):"
+msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
 #: src/gtkaccount.c:479
 msgid "Password:"
-msgstr "�舒�仂仍�"
-
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+msgstr "�舒�仂仍�:"
+
+#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4297
 msgid "Alias:"
 msgstr "��亠于亟仂仆亳仄:"
 
@@ -1914,23 +2041,23 @@
 #. Build the user options frame.
 #: src/gtkaccount.c:542
 msgid "User Options"
-msgstr "�舒�舒仄亠��� 仗�仂从�亳"
+msgstr "�舒�舒仄亠��� 仗仂仍�亰仂于舒�亠仍�"
 
 #: src/gtkaccount.c:555
 msgid "New mail notifications"
-msgstr "��亠亟�仗�亠亢亟亠仆亳� 仂 仆仂于仂亶 仗仂��亠"
+msgstr "�亰于亠�亠仆亳� 仂 仆仂于仂亶 仗仂��亠"
 
 #: src/gtkaccount.c:564
 msgid "Buddy icon file:"
-msgstr "个舒亶仍 仗亳从�仂亞�舒仄仄 仗仂仍�亰仂于舒�亠仍亠亶:"
+msgstr "个舒亶仍 亰仆舒�从仂于 仗仂仍�亰仂于舒�亠仍亠亶:"
 
 #: src/gtkaccount.c:574
 msgid "_Browse"
-msgstr "_��舒�亰亠�"
+msgstr "��从����"
 
 #: src/gtkaccount.c:580
 msgid "_Reset"
-msgstr "_弌弍�仂�"
+msgstr "弌弍�仂�亳��"
 
 #. Build the protocol options frame.
 #: src/gtkaccount.c:642
@@ -1946,7 +2073,7 @@
 #. No Proxy
 #: src/gtkaccount.c:784 src/gtkaccount.c:832
 msgid "No Proxy"
-msgstr "�亠亰 仗�仂从�亳"
+msgstr "�亠� 仗�仂从�亳"
 
 #. HTTP
 #: src/gtkaccount.c:790 src/gtkaccount.c:839
@@ -1964,41 +2091,41 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1135
 msgid "Use Environmental Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仂从��亢亠仆亳�"
 
 #: src/gtkaccount.c:899
 msgid "you can see the butterflies mating"
-msgstr ""
+msgstr "于� 仄仂亢亠�亠 �于亳亟亠�� �仗舒�亳于舒��亳��� 弍舒弍仂�亠从"
 
 #: src/gtkaccount.c:903
 msgid "If you look real closely"
-msgstr ""
+msgstr "��仍亳 仗�亳亞仍�亟亳�亠��"
 
 #: src/gtkaccount.c:919
 msgid "Proxy Options"
-msgstr "�舒���仂亶从亳 仗�仂从�亳"
-
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+msgstr "�舒�舒仄亠��� 仗�仂从�亳"
+
+#: src/gtkaccount.c:937 src/gtkprefs.c:1129
 msgid "Proxy _type:"
-msgstr "丐亳仗 _仗�仂从�亳:"
-
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+msgstr "丐亳仗 仗�仂从�亳:"
+
+#: src/gtkaccount.c:946 src/gtkprefs.c:1156
 msgid "_Host:"
-msgstr "_丱仂��"
-
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+msgstr "丕亰亠仍:"
+
+#: src/gtkaccount.c:950 src/gtkprefs.c:1174
 msgid "_Port:"
-msgstr "_�仂��"
+msgstr "�仂��:"
 
 #: src/gtkaccount.c:958
 msgid "_Username:"
-msgstr "_�仂仍�亰仂于舒�亠仍� (UIN):"
-
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�:"
+
+#: src/gtkaccount.c:963 src/gtkprefs.c:1211
 msgid "Pa_ssword:"
-msgstr "_�舒�仂仍�:"
+msgstr "�舒�仂仍�:"
 
 #: src/gtkaccount.c:1331
 msgid "Add Account"
@@ -2011,34 +2138,35 @@
 #. Add the disclosure
 #: src/gtkaccount.c:1357
 msgid "Show more options"
-msgstr "�仂从舒亰�于舒��揃弍仂仍��亠揃仆舒���仂亠从揃仗�仂从�亳"
+msgstr "�仂从舒亰舒�� 弍仂仍��亠 仗舒�舒仄亠��仂于"
 
 #: src/gtkaccount.c:1358
 msgid "Show fewer options"
-msgstr "�仂从舒亰�于舒�� 仄亠仆��亠 仆舒���仂亠从 仗�仂从�亳"
+msgstr "�仂从舒亰舒�� 仄亠仆��亠 仗舒�舒仄亠��仂于"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:665
 msgid "Register"
-msgstr "�亠亞亳���舒�亳�"
+msgstr "�舒�亠亞亳���亳�仂于舒��"
 
 #: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "�� �仂亞仍舒�仆� �亟舒仍亳�� %s?"
+msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� %s?"
 
 #: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "丕亟舒仍亳��"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3981
 msgid "Screen Name"
-msgstr "�仂仍�亰仂于舒�亠仍� (UIN)"
-
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:957
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
+#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2553 src/protocols/zephyr/zephyr.c:1167
+#: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "� �亠�亳"
 
@@ -2049,7 +2177,7 @@
 #: src/gtkaccount.c:2210
 #, 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"
+msgstr ""
 
 #: src/gtkaccount.c:2224
 msgid ""
@@ -2059,7 +2187,7 @@
 msgstr ""
 "\n"
 "\n"
-"�仂弍舒于亳�� 于 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍�?"
+"丱仂�亳�亠 亟仂弍舒于亳�� 亠亞仂 亳仍亳 亠� 于 �于仂亶 �仗亳�仂从 从仂仆�舒从�仂于?"
 
 #: src/gtkaccount.c:2228
 msgid "Information"
@@ -2067,220 +2195,221 @@
 
 #: src/gtkaccount.c:2232
 msgid "Add buddy to your list?"
-msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从?"
+msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1358
+#: src/gtkconv.c:3530 src/gtkconv.c:3629 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
+#: src/protocols/silc/chat.c:578
 msgid "Add"
 msgstr "�仂弍舒于亳��"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "�� 仆亠 仗仂亟从仍��亠仆� 仗仂 仗�仂�仂从仂仍舒仄 � 仗仂亟亟亠�亢从仂亶 �舒�仂于."
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:810
 msgid "Join a Chat"
-msgstr "�仂亶�亳 于 �舒�"
-
-#: src/gtkblist.c:835
+msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
+
+#: src/gtkblist.c:831
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "�于亠亟亳�亠 仆亠仂弍�仂亟亳仄�� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 于 从仂�仂��亶 �仂�亳�亠 于仂亶�亳.\n"
-
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgstr ""
+"�于亠亟亳�亠 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从 从仂�仂�仂仄� 于� �仂�亠仍亳 弍� "
+"仗�亳�仂亠亟亳仆亳����.\n"
+
+#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
 msgid "_Account:"
-msgstr "_丕���仆a� 亰舒仗亳��:"
-
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
-#, fuzzy
+msgstr "丕���仆a� 亰舒仗亳��:"
+
+#: src/gtkblist.c:1128 src/gtkblist.c:3149
 msgid "Get _Info"
-msgstr "� 仗亠��仂仆亠"
-
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
-#, fuzzy
+msgstr "�仆�仂�仄舒�亳�"
+
+#: src/gtkblist.c:1131 src/gtkblist.c:3140
 msgid "I_M"
-msgstr "��仗�舒于亳��"
-
-#: src/gtkblist.c:1092
+msgstr "弌仂仂弍�亠仆亳亠"
+
+#: src/gtkblist.c:1133
 msgid "Add Buddy _Pounce"
-msgstr "�仂弍舒于亳�� 仂仗仂于亠_�亠仆亳亠"
-
-#: src/gtkblist.c:1094
+msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂"
+
+#: src/gtkblist.c:1135
 msgid "View _Log"
-msgstr "��仂�亳�舒�� _亢��仆舒仍"
-
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+msgstr "��仂�仄仂��亠�� _亢��仆舒仍"
+
+#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
 msgid "_Alias..."
-msgstr "_��亠于亟仂仆亳仄..."
-
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+msgstr "��亠于亟仂仆亳仄..."
+
+#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
 #: src/gtkconn.c:361
 msgid "_Remove"
-msgstr "_丕亟舒仍亳��"
-
-#: src/gtkblist.c:1206
+msgstr "丕亟舒仍亳��"
+
+#: src/gtkblist.c:1191
 msgid "Add a _Buddy"
-msgstr "�仂弍舒于亳�� _�仂弍亠�亠亟仆亳从舒"
-
-#: src/gtkblist.c:1208
+msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/gtkblist.c:1193
 msgid "Add a C_hat"
-msgstr "�仂弍舒于亳�� _�舒�"
-
-#: src/gtkblist.c:1210
+msgstr "�仂弍舒于亳�� �舒�"
+
+#: src/gtkblist.c:1195
 msgid "_Delete Group"
-msgstr "丕亟舒仍亳�� _亞��仗仗�"
-
-#: src/gtkblist.c:1212
+msgstr "丕亟舒仍亳�� 亞��仗仗�"
+
+#: src/gtkblist.c:1197
 msgid "_Rename"
-msgstr "�亠�亠_亳仄亠仆仂于舒��"
+msgstr "�亠�亠亳仄亠仆仂于舒��"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
-msgstr "�仂亶_�亳"
-
-#: src/gtkblist.c:1240
+msgstr "��亳�仂亠亟亳仆亳����"
+
+#: src/gtkblist.c:1221
 msgid "Auto-Join"
-msgstr "�仂亟从仍��亳���� 舒于�仂仄舒�亳�亠�从亳"
-
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"
+
+#: src/gtkblist.c:1245 src/gtkblist.c:1274
 msgid "_Collapse"
-msgstr "_�舒从����"
-
-#: src/gtkblist.c:1307
+msgstr "弌于亠�仆���"
+
+#: src/gtkblist.c:1279
 msgid "_Expand"
-msgstr "_�舒亰于亠�仆���"
-
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
+msgstr "�舒亰于亠�仆���"
+
+#: src/gtkblist.c:1935 src/gtkconv.c:4162 src/gtkpounce.c:347
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"�� 仆亠 仗仂亟从仍��亠仆� 仗仂 ����仆仂亶 亰舒仗亳�亳 � 于仂亰仄仂亢仆仂���� 亟仂弍舒于仍��� �仂弍亠�亠亟仆亳从仂于."
+"�� 仆亠 仗仂亟从仍��亠仆� 仗仂 ����仆仂亶 亰舒仗亳�亳 � 于仂亰仄仂亢仆仂���� 亟仂弍舒于仍��� 仗仂仍�亰仂于舒�亠仍亠亶."
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2286
 msgid "/_Buddies"
-msgstr "/_弌仂弍亠�亠亟仆亳从亳"
-
-#: src/gtkblist.c:2313
+msgstr "/_�仂仆�舒从��"
+
+#: src/gtkblist.c:2287
 msgid "/Buddies/New Instant _Message..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/_�仂于仂亠 �仂仂弍�亠仆亳亠..."
+msgstr "/�仂仆�舒从��/�仂于仂亠 �仂仂弍�亠仆亳亠..."
+
+#: src/gtkblist.c:2288
+msgid "/Buddies/Join a _Chat..."
+msgstr "/�仂仆�舒从��/��亳�仂亠亟亳仆亳���� 从 �舒��..."
+
+#: src/gtkblist.c:2289
+msgid "/Buddies/Get User _Info..."
+msgstr "/�仂仆�舒从��/�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠..."
+
+#: src/gtkblist.c:2290
+msgid "/Buddies/View User _Log..."
+msgstr "/�仂仆�舒从��/��仂�仄仂��亠�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�..."
+
+#: src/gtkblist.c:2292
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仂������于���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/gtkblist.c:2293
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仗����亠 亞��仗仗�"
+
+#: src/gtkblist.c:2294
+msgid "/Buddies/_Add Buddy..."
+msgstr "/�仂仆�舒从��/�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�..."
+
+#: src/gtkblist.c:2295
+msgid "/Buddies/Add C_hat..."
+msgstr "/�仂仆�舒从��/�仂弍舒于亳�� �舒�..."
+
+#: src/gtkblist.c:2296
+msgid "/Buddies/Add _Group..."
+msgstr "/�仂仆�舒从��/�仂弍舒于亳�� 亞��仗仗�..."
+
+#: src/gtkblist.c:2298
+msgid "/Buddies/_Signoff"
+msgstr "/�仂仆�舒从��/��从仍��亳����"
+
+#: src/gtkblist.c:2299
+msgid "/Buddies/_Quit"
+msgstr "/�仂仆�舒从��/��亶�亳"
+
+#. Tools
+#: src/gtkblist.c:2302
+msgid "/_Tools"
+msgstr "/_弌亠�于亳�"
+
+#: src/gtkblist.c:2303
+msgid "/Tools/_Away"
+msgstr "/弌亠�于亳�/弌�舒���"
+
+#: src/gtkblist.c:2304
+msgid "/Tools/Buddy _Pounce"
+msgstr "/弌亠�于亳�/弌仍亠亢亠仆亳亠 亰舒 仗仂仍�亰仂于舒�亠仍�仄亳"
+
+#: src/gtkblist.c:2305
+msgid "/Tools/Account Ac_tions"
+msgstr "/弌亠�于亳�/�亠亶��于亳� � ����仆�仄亳 亰舒仗亳��仄亳"
+
+#: src/gtkblist.c:2306
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/弌亠�于亳�/�亠亶��于亳� � 仄仂亟�仍�仄亳"
+
+#: src/gtkblist.c:2308
+msgid "/Tools/A_ccounts"
+msgstr "/弌亠�于亳�/丕���仆�亠 亰舒仗亳�亳"
+
+#: src/gtkblist.c:2309
+msgid "/Tools/_File Transfers"
+msgstr "/弌亠�于亳�/�亠�亠亟舒�舒 �舒亶仍仂于"
+
+#: src/gtkblist.c:2310
+msgid "/Tools/R_oom List"
+msgstr "/弌亠�于亳�/弌仗亳�仂从 从仂仄仆舒�"
+
+#: src/gtkblist.c:2311
+msgid "/Tools/Pr_eferences"
+msgstr "/弌亠�于亳�/_�舒���仂亶从亳"
+
+#: src/gtkblist.c:2312
+msgid "/Tools/Pr_ivacy"
+msgstr "/弌亠�于亳�/�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
 #: src/gtkblist.c:2314
-msgid "/Buddies/Join a _Chat..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 _�舒��..."
-
-#: src/gtkblist.c:2315
-#, fuzzy
-msgid "/Buddies/Get User _Info..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠..."
-
+msgid "/Tools/View System _Log"
+msgstr "/弌亠�于亳�/��仂�仄仂��亠�� �亳��亠仄仆�亶 亢��仆舒仍"
+
+#. Help
 #: src/gtkblist.c:2317
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� _仂������于���亳�"
+msgid "/_Help"
+msgstr "/_�仂仄仂��"
 
 #: src/gtkblist.c:2318
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� _仗����亠 亞��仗仗�"
+msgid "/Help/Online _Help"
+msgstr "/�仂仄仂��/�仂仄仂�� 于 �亠�亳"
 
 #: src/gtkblist.c:2319
-msgid "/Buddies/_Add Buddy..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� _�仂弍亠�亠亟仆亳从舒..."
+msgid "/Help/_Debug Window"
+msgstr "/�仂仄仂��/�从仆仂 仂�仍舒亟从亳"
 
 #: src/gtkblist.c:2320
-msgid "/Buddies/Add C_hat..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� _�舒�"
-
-#: src/gtkblist.c:2321
-msgid "/Buddies/Add _Group..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� _亞��仗仗�"
-
-#: src/gtkblist.c:2323
-msgid "/Buddies/_Signoff"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/_�舒于亠��亳�� �亠舒仆�"
-
-#: src/gtkblist.c:2324
-msgid "/Buddies/_Quit"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/_��亶�亳"
-
-#. Tools
-#: src/gtkblist.c:2327
-msgid "/_Tools"
-msgstr "/_弌亠�于亳�"
-
-#: src/gtkblist.c:2328
-msgid "/Tools/_Away"
-msgstr "/弌亠�于亳�/_��仂��仍"
-
-#: src/gtkblist.c:2329
-msgid "/Tools/Buddy _Pounce"
-msgstr "/弌亠�于亳�/�仗仂于亠��亳�� �仂_弍亠�亠亟仆亳从舒"
-
-#: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/弌亠�于亳�/�亠亶��于亳� _仗�仂�仂从仂仍舒"
-
-#: src/gtkblist.c:2332
-msgid "/Tools/A_ccounts"
-msgstr "/弌亠�于亳�/_丕���仆�亠 亰舒仗亳�亳"
-
-#: src/gtkblist.c:2333
-msgid "/Tools/_File Transfers"
-msgstr "/弌亠�于亳�/�亠�亠亟舒�舒 _�舒亶仍仂于..."
-
-#: src/gtkblist.c:2334
-#, fuzzy
-msgid "/Tools/R_oom List"
-msgstr "/弌亠�于亳�/�亠亶��于亳� _仗�仂�仂从仂仍舒"
-
-#: src/gtkblist.c:2335
-msgid "/Tools/Pr_eferences"
-msgstr "/弌亠�于亳�/_�舒���仂亳��..."
-
-#: src/gtkblist.c:2336
-msgid "/Tools/Pr_ivacy"
-msgstr "/弌亠�于亳�/�仂仆�亳亟亠仆�亳舒仍�仆仂���"
+msgid "/Help/_About"
+msgstr "/�仂仄仂��/� 仗�仂亞�舒仄仄亠"
+
+#: src/gtkblist.c:2338
+msgid "Rename Group"
+msgstr "�亠�亠亳仄亠仆仂于舒�� 亞��仗仗�"
 
 #: src/gtkblist.c:2338
-msgid "/Tools/View System _Log"
-msgstr "/弌亠�于亳�/弌亳��亠仄仆�亶 _亢��仆舒仍"
-
-#. Help
-#: src/gtkblist.c:2341
-msgid "/_Help"
-msgstr "/_?"
-
-#: src/gtkblist.c:2342
-msgid "/Help/Online _Help"
-msgstr "/_?/亅仍亠从��仂仆仆舒� _�仗�舒于从舒"
-
-#: src/gtkblist.c:2343
-msgid "/Help/_Debug Window"
-msgstr "/_?/�从仆仂 _仂�仍舒亟从亳"
-
-#: src/gtkblist.c:2344
-msgid "/Help/_About"
-msgstr "/_?/_� 仗�仂亞�舒仄仄亠..."
-
-#: src/gtkblist.c:2360
-msgid "Rename Group"
-msgstr "�亠�亠亳仄亠仆仂于舒�� ���仗仗�"
-
-#: src/gtkblist.c:2360
 msgid "New group name"
 msgstr "�仂于仂亠 亳仄� 亞��仗仗�"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2339
 msgid "Please enter a new name for the selected group."
-msgstr "�仂亢舒仍�亶��舒, 于于亠亟亳�亠 仆仂于仂亠 亳仄� 于�弍�舒仆仆仂亶 亞��仗仗�."
-
-#: src/gtkblist.c:2389
+msgstr "�于亠亟亳�亠 仆仂于仂亠 亳仄� 亟仍� 于�弍�舒仆仆仂亶 亞��仗仗�."
+
+#: src/gtkblist.c:2367
 #, c-format
 msgid ""
 "\n"
@@ -2289,16 +2418,20 @@
 "\n"
 "<b>丕���仆舒� 亰舒仗亳��:</b> %s"
 
-#: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
-msgstr "<b>弌�舒���:</b> ��从仍���仆"
-
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2431
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>弌�舒���:</b> �亠 于 �亠�亳"
+
+#: src/gtkblist.c:2446
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2462
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2306,39 +2439,39 @@
 "\n"
 "<b>丕���仆舒� 亰舒仗亳��:</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2463
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
 msgstr ""
 "\n"
-"<b>�亰于亠��亠仆 从舒从:</b>"
-
-#: src/gtkblist.c:2486
+"<b>��亠于亟仂仆亳仄 从仂仆�舒从�舒:</b>"
+
+#: src/gtkblist.c:2464
 msgid ""
 "\n"
 "<b>Alias:</b>"
 msgstr ""
 "\n"
-"<b>�亰于亠��亠仆 从舒从:</b>"
-
-#: src/gtkblist.c:2487
+"<b>��亠于亟仂仆亳仄:</b>"
+
+#: src/gtkblist.c:2465
 msgid ""
 "\n"
 "<b>Nickname:</b>"
 msgstr ""
 "\n"
-"<b>��亠于亟仂仆亳仄:</b>"
-
-#: src/gtkblist.c:2488
+"<b>��亳亞亳仆舒仍�仆�亶 仗�亠于亟仂仆亳仄:</b>"
+
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Logged In:</b>"
 msgstr ""
 "\n"
-"<b>�仂亟从仍��亠仆:</b>"
-
-#: src/gtkblist.c:2489
+"<b>� �亠�亳:</b>"
+
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2346,7 +2479,7 @@
 "\n"
 "<b>�亠亰亟亠亶��于�亠�:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2354,126 +2487,146 @@
 "\n"
 "<b>��亠亟�仗�亠亢亟�仆:</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
-"\n"
-"<b>�仗亳�舒仆亳亠:</b>揃弌��舒�仆�亶"
-
-#: src/gtkblist.c:2493
+
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
-"\n"
-"<b>弌�舒���:</b>: ��亠于仂��仂亟仆�亶"
-
-#: src/gtkblist.c:2494
+
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
-"\n"
-"<b>弌�舒���</b>:揃Rockin'"
-
-#: src/gtkblist.c:2764
+
+#: src/gtkblist.c:2743
 #, c-format
 msgid "Idle (%dh%02dm) "
-msgstr "�亠亰亟亠亶��于�亠� (%dh%02dm)揃"
-
-#: src/gtkblist.c:2766
+msgstr "�亠亰亟亠亶��于�亠� (%dh%02dm) "
+
+#: src/gtkblist.c:2745
 #, c-format
 msgid "Idle (%dm) "
-msgstr "�亠亰亟亠亶��于�亠�揃(%dm)揃"
-
-#: src/gtkblist.c:2771
+msgstr "�亠亰亟亠亶��于�亠� (%dm) "
+
+#: src/gtkblist.c:2750
 #, c-format
 msgid "Warned (%d%%) "
-msgstr "��亠亟�仗�亠亢亟亠仆: (%d%%) "
-
-#: src/gtkblist.c:2774
+msgstr "��亠亟�仗�亠亢亟�仆 (%d%%) "
+
+#: src/gtkblist.c:2753
 msgid "Offline "
-msgstr "�仆亠 �亠�亳"
-
-#: src/gtkblist.c:3032
+msgstr "�亠 于 �亠�亳 "
+
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2871
+msgid "/Buddies/Join a Chat..."
+msgstr "/�仂仆�舒从��/��亳�仂亠亟亳仆亳���� 从 �舒��..."
+
+#: src/gtkblist.c:2874
+msgid "/Tools/Room List"
+msgstr "/弌亠�于亳�/弌仗亳�仂从 从仂仄仆舒�"
+
+#: src/gtkblist.c:2877
+msgid "/Tools/Privacy"
+msgstr "/弌亠�于亳�/�仂仆�亳亟亠仆�亳舒仍�仆仂���"
+
+#: src/gtkblist.c:3022
 msgid "/Tools/Away"
-msgstr "/�仆����仄亠仆��/��仂��仍"
-
-#: src/gtkblist.c:3035
+msgstr "/弌亠�于亳�/弌�舒���"
+
+#: src/gtkblist.c:3025
 msgid "/Tools/Buddy Pounce"
-msgstr "/�仆����仄亠仆��/�仗仂于亠�亠仆亳亠"
-
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
-msgstr "/�仆����仄亠仆��/�亠亶��于亳� � 仗�仂�仂从仂仍仂仄"
+msgstr "/弌亠�于亳�/弌仍亠亢亠仆亳亠 亰舒 仗仂仍�亰仂于舒�亠仍�仄亳"
+
+#: src/gtkblist.c:3028
+msgid "/Tools/Account Actions"
+msgstr "/弌亠�于亳�/�亠亶��于亳� � ����仆�仄亳 亰舒仗亳��仄亳"
+
+#: src/gtkblist.c:3031
+msgid "/Tools/Plugin Actions"
+msgstr "/弌亠�于亳�/�亠亶��于亳� � 仄仂亟�仍�仄亳"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3120
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� 仂������于���亳� �仂弍亠�亠亟仆亳从仂于"
-
-#: src/gtkblist.c:3128
+msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仂������于���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/gtkblist.c:3122
 msgid "/Buddies/Show Empty Groups"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� 仗����亠 亞��仗仗�"
-
-#: src/gtkblist.c:3152
+msgstr "/�仂仆�舒从��/�仂从舒亰�于舒�� 仗����亠 亞��仗仗�"
+
+#: src/gtkblist.c:3146
 msgid "Send a message to the selected buddy"
-msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠 于�弍�舒仆仆仂亶 仗亠��仂仆亠"
-
-#: src/gtkblist.c:3161
+msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠 于�弍�舒仆仆仂仄� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/gtkblist.c:3155
 msgid "Get information on the selected buddy"
-msgstr "�仆�仂�仄舒�亳� 仂弍 ��仂仄 �仂弍亠�亠亟仆亳从亠"
-
-#: src/gtkblist.c:3164
-#, fuzzy
+msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 于�弍�舒仆仆仂仄 仗仂仍�亰仂于舒�亠仍亠"
+
+#: src/gtkblist.c:3158
 msgid "_Chat"
 msgstr "丼舒�"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3163
 msgid "Join a chat room"
-msgstr "�仂亶�亳 于 �舒�"
-
-#: src/gtkblist.c:3172
-#, fuzzy
+msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
+
+#: src/gtkblist.c:3166
 msgid "_Away"
-msgstr "��仂��仍"
-
-#: src/gtkblist.c:3177
+msgstr "弌�舒���"
+
+#: src/gtkblist.c:3171
 msgid "Set an away message"
-msgstr "丕��舒仆仂于亳�� �仂仂弍�亠仆亳亠 仂������于亳�"
-
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+msgstr "丕��舒仆仂于亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
+
+#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2733
 msgid "Add Buddy"
 msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkblist.c:3932
+#: src/gtkblist.c:3933
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 亟仂弍舒于亳�� 于 �于仂亶 "
-"�仗亳�仂从 �仂弍亠�亠亟仆亳从仂于. ��亳 亢亠仍舒仆亳亳 ��舒亰� 仄仂亢仆仂 �从舒亰舒�� 仗�亠于亟仂仆亳仄 ��仂亞仂 "
-"仗仂仍�亰仂于舒�亠仍�, 仗仂 从仂�仂�仂仄� 于� 弍�亟亠�亠 仂仗仂亰仆舒于舒�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�从亠.\n"
+"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仗亠��仂仆�, 从仂�仂��� 于� �仂�亠仍亳 弍� 亟仂弍舒于亳�� 于 "
+"�仗亳�仂从 从仂仆�舒从�仂于. �� 仄仂亢亠�亠 于于亠��亳 仆亠仂弍�亰舒�亠仍�仆�亶 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 "
+"仗仂仍�亰仂于舒�亠仍�. ��亠于亟仂仆亳仄 弍�亟亠� 仗仂从舒亰�于舒���� 于仄亠��仂 亳亟亠仆�亳�亳从舒�仂�舒 "
+"仗仂仍�亰仂于舒�亠仍�, 从仂亞亟舒 ��仂 于仂亰仄仂亢仆仂.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:3993 src/gtkblist.c:4277
 msgid "Account:"
 msgstr "丕���仆a� 亰舒仗亳��:"
 
+#: src/gtkblist.c:4236
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "�� 仆亠 仗仂亟从仍��亠仆� 仗仂 仗�仂�仂从仂仍舒仄, 从仂�仂��亠 亳仄亠�� 仗仂亟亟亠�亢从� �舒�仂于."
+
 #: src/gtkblist.c:4243
 msgid "Add Chat"
 msgstr "�仂弍舒于亳�� �舒�"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4267
 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:4345
 msgid "Add Group"
@@ -2483,29 +2636,29 @@
 msgid "Please enter the name of the group to be added."
 msgstr "�于亠亟亳�亠 亳仄� 亟仂弍舒于仍�亠仄仂亶 亞��仗仗�."
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4913 src/gtkblist.c:5010
 msgid "No actions available"
-msgstr "�亠亶��于亳� 仆亠亟仂���仗仆�"
+msgstr "�亠� 亟仂���仗仆�� 亟亠亶��于亳亶"
 
 #: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
-msgstr "弌亟亠仍舒仆仂."
+msgstr "�仂�仂于仂."
 
 #: src/gtkconn.c:157
 msgid "Signon: "
-msgstr "��仂亟: "
+msgstr "�仂亟从仍��亠仆亳亠: "
 
 #: src/gtkconn.c:203
 msgid "Signon"
-msgstr "�仂亟从仍��亳����"
+msgstr "�仂亟从仍��亠仆亳亠"
 
 #: src/gtkconn.c:216
 msgid "Cancel All"
-msgstr "��仄亠仆亳�� 于��"
+msgstr "��仄亠仆亳�� 于�亠"
 
 #: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
-msgstr "_�亠�亠�仂亠亟亳仆亠仆亳亠"
+msgstr "�亠�亠�仂亠亟亳仆亠仆亳亠"
 
 #: src/gtkconn.c:557
 #, c-format
@@ -2515,6 +2668,10 @@
 "%s\n"
 "%s"
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">弌于�亰� � %s 弍�仍舒 �舒亰仂�于舒仆舒.</span>\n"
+"\n"
+"%s\n"
+"%s"
 
 #: src/gtkconn.c:559
 msgid "Reason Unknown."
@@ -2522,590 +2679,712 @@
 
 #: src/gtkconn.c:598
 msgid "Reconnect _All"
-msgstr "�舒仆仂于仂 �仂亠亟亳仆亳�� _于�亠"
+msgstr "�亠�亠�仂亠亟亳仆亳�� 于�亠"
 
 #: src/gtkconn.c:628
 msgid "Time"
 msgstr "��亠仄�"
 
 #: src/gtkconv.c:172
-#, fuzzy, c-format
+#, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "�亠�亠亟舒 � %s"
-
-#: src/gtkconv.c:190
+msgstr "<h1>�亠�亠亟舒 � %s</h1>\n"
+
+#: src/gtkconv.c:190 src/gtkdebug.c:212
 msgid "That file already exists"
-msgstr "亅�仂� �舒亶仍 �亢亠 ���亠��于�亠�"
-
-#: src/gtkconv.c:191 src/gtkft.c:1106
+msgstr "丐舒从仂亶 �舒亶仍 �亢亠 ���亠��于�亠�"
+
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
-msgstr "丱仂�亳�亠 仗亠�亠亰舒仗亳�舒��?"
-
-#: src/gtkconv.c:505
+msgstr "�� �仂�亠仍亳 弍� 仗亠�亠亰舒仗亳�舒�� 亠亞仂?"
+
+#: src/gtkconv.c:369
+#, c-format
+msgid "me is using Gaim v%s."
+msgstr ""
+
+#: src/gtkconv.c:378
+msgid "Supported debug options are:  version"
+msgstr "�仂亟亟亠�亢亳于舒亠仄�亠 仗舒�舒仄亠��� 仂�仍舒亟从亳:  version"
+
+#: src/gtkconv.c:391
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"��仗仂仍�亰�亶�亠 \"/help &lt;从仂仄舒仆亟舒&gt;\" 亟仍� 仗仂仄仂�亳 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠.\n"
+"弌仍亠亟���亳亠 从仂仄舒仆亟� 亟仂���仗仆� 于 ��仂仄 从仂仆�亠从��亠:\n"
+
+#: src/gtkconv.c:425
+msgid "No such command (in this context)."
+msgstr "�亠� �舒从仂亶 从仂仄舒仆亟� (于 ��仂仄 从仂仆�亠从��亠)."
+
+#: src/gtkconv.c:472
+msgid ""
+"No such command. If you didn't mean to type a command, you can turn commands "
+"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
+"commands."
+msgstr ""
+
+#: src/gtkconv.c:480
+msgid ""
+"Syntax Error:  You typed the wrong number of arguments to that command. If "
+"you didn't mean to type a command, you can turn commands off from Tools-"
+">Preferences->Interface->Conversation->Enable \"slash\" commands."
+msgstr ""
+
+#: src/gtkconv.c:487
+msgid "Your command failed for an unknown reason."
+msgstr "�舒�舒 从仂仄舒仆亟舒 仆亠 弍�仍舒 于�仗仂仍仆亠仆舒 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
+
+#: src/gtkconv.c:494
+msgid "That command only works in Chats, not IMs."
+msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 �舒�舒�, 仆亠 于 弍亠�亠亟舒�."
+
+#: src/gtkconv.c:497
+msgid "That command only works in IMs, not Chats."
+msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 弍亠�亠亟舒�, 仆亠 于 �舒�舒�."
+
+#: src/gtkconv.c:501
+msgid "That command doesn't work on this protocol."
+msgstr "亅�舒 从仂仄舒仆亟舒 仆亠 �舒弍仂�舒亠� � ��亳仄 仗�仂�仂从仂仍仂仄"
+
+#: src/gtkconv.c:717
 msgid "Invite Buddy Into Chat Room"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 �舒�"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:533
+#: src/gtkconv.c:745
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-
-#: src/gtkconv.c:554
+"�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 仗�亳亞仍舒�亳��, 于仄亠��亠 � "
+"仆亠仂弍�亰舒�亠仍�仆�仄 �亠从��仂仄 仗�亳亞仍舒�亠仆亳�."
+
+#: src/gtkconv.c:766
 msgid "_Buddy:"
-msgstr "_弌仂弍亠�亠亟仆亳从:"
-
-#: src/gtkconv.c:574
+msgstr "�仂仍�亰仂于舒�亠仍�:"
+
+#: src/gtkconv.c:786
 msgid "_Message:"
-msgstr "_弌仂仂弍�亠仆亳亠:"
-
-#: src/gtkconv.c:667
+msgstr "弌仂仂弍�亠仆亳亠:"
+
+#: src/gtkconv.c:894 src/gtkdebug.c:127
 msgid "Find"
 msgstr "�舒亶�亳"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:920 src/gtkdebug.c:155
 msgid "_Search for:"
-msgstr "_��从舒��:"
-
-#: src/gtkconv.c:1071
+msgstr "��从舒��:"
+
+#: src/gtkconv.c:1316
 msgid "IM"
-msgstr "��仗�舒于亳��"
-
-#: src/gtkconv.c:1079
+msgstr "弌仂仂弍�亠仆亳亠"
+
+#: src/gtkconv.c:1324
 msgid "Un-Ignore"
-msgstr ""
-
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+msgstr "�亠 亳亞仆仂�亳�仂于舒��"
+
+#: src/gtkconv.c:1326 src/gtkprefs.c:778
 msgid "Ignore"
 msgstr "�亞仆仂�亳�仂于舒��"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1335 src/gtkconv.c:3544
 msgid "Info"
 msgstr "�仆�仂�仄舒�亳�"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1344
 msgid "Get Away Msg"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "丕亟舒仍亳��"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2434
 msgid "Animate"
 msgstr "�仆亳仄亳�仂于舒��"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2439
 msgid "Hide Icon"
-msgstr "弌仗���舒�� 亳从仂仆从�"
-
-#: src/gtkconv.c:2212
+msgstr "弌从���� 亰仆舒�仂从"
+
+#: src/gtkconv.c:2445
 msgid "Save Icon As..."
-msgstr "弌仂��舒仆亳�� 亳从仂仆从� 从舒从..."
-
-#: src/gtkconv.c:2579
+msgstr "弌仂��舒仆亳�� 亰仆舒�仂从 从舒从..."
+
+#: src/gtkconv.c:2814
 msgid "User is typing..."
-msgstr "弌仂弍亠�亠亟仆亳从 仗亳�亠� 仂�于亠�..."
-
-#: src/gtkconv.c:2587
+msgstr "�仂仍�亰仂于舒�亠仍� 仗亳�亠�..."
+
+#: src/gtkconv.c:2822
 msgid "User has typed something and paused"
-msgstr "弌仂弍亠�亠亟仆亳从 ��仂-�仂 仆舒仗亳�舒仍, 舒 仗仂�仂仄 仂��舒仆仂于亳仍��"
+msgstr "�仂仍�亰仂于舒�亠仍� ��仂-�仂 仆舒仗亳�舒仍 亳 仂��舒仆仂于亳仍��"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2925
 msgid "_Send As"
-msgstr "_��仗�舒于亳�� 从舒从"
-
-#: src/gtkconv.c:3110
+msgstr "��仗�舒于亳�� 从舒从"
+
+#: src/gtkconv.c:3302
 msgid "Save Conversation"
 msgstr "弌仂��舒仆亳�� 弍亠�亠亟�"
 
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3319
 msgid "/_Conversation"
 msgstr "/_�亠�亠亟舒"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3321
 msgid "/Conversation/New Instant _Message..."
-msgstr "/�亠�亠亟舒/�仂于仂亠 _�仂仂弍�亠仆亳亠..."
-
-#: src/gtkconv.c:3134
+msgstr "/�亠�亠亟舒/�仂于仂亠 �仂仂弍�亠仆亳亠..."
+
+#: src/gtkconv.c:3326
 msgid "/Conversation/_Find..."
-msgstr "/�亠�亠亟舒/_�舒亶�亳..."
-
-#: src/gtkconv.c:3136
+msgstr "/�亠�亠亟舒/�舒亶�亳..."
+
+#: src/gtkconv.c:3328
 msgid "/Conversation/View _Log"
-msgstr "/�亠�亠亟舒/�仂�仄仂��亠�� _亳��仂�亳�..."
-
-#: src/gtkconv.c:3137
+msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"
+
+#: src/gtkconv.c:3329
 msgid "/Conversation/_Save As..."
-msgstr "/�亠�亠亟舒/_弌仂��舒仆亳�� 从舒从..."
-
-#: src/gtkconv.c:3142
+msgstr "/�亠�亠亟舒/弌仂��舒仆亳�� 从舒从..."
+
+#: src/gtkconv.c:3331
+msgid "/Conversation/Clear"
+msgstr "/�亠�亠亟舒/��亳��亳��"
+
+#: src/gtkconv.c:3335
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/�亠�亠亟舒/�仂弍舒于亳�� _仂仗仂于亠�亠仆亳亠"
-
-#: src/gtkconv.c:3144
+msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."
+
+#: src/gtkconv.c:3337
 msgid "/Conversation/_Get Info"
-msgstr "/�亠�亠亟舒/� _�仂弍亠�亠亟仆亳从亠"
-
-#: src/gtkconv.c:3146
+msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
+
+#: src/gtkconv.c:3339
 msgid "/Conversation/_Warn..."
-msgstr "/�亠�亠亟舒/�_�亠亟�仗�亠亟亳��..."
-
-#: src/gtkconv.c:3148
+msgstr "/�亠�亠亟舒/弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠..."
+
+#: src/gtkconv.c:3341
 msgid "/Conversation/In_vite..."
-msgstr "/�亠�亠亟舒/��_亳亞仍舒�亳��..."
-
-#: src/gtkconv.c:3153
+msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."
+
+#: src/gtkconv.c:3346
 msgid "/Conversation/A_lias..."
-msgstr "/�亠�亠亟舒/_��亠于亟仂仆亳仄"
-
-#: src/gtkconv.c:3155
+msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
+
+#: src/gtkconv.c:3348
 msgid "/Conversation/_Block..."
-msgstr "/�亠�亠亟舒/_�仍仂从亳�仂于舒��..."
-
-#: src/gtkconv.c:3157
+msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
+
+#: src/gtkconv.c:3350
 msgid "/Conversation/_Add..."
-msgstr "/�亠�亠亟舒/_�仂弍舒于亳��..."
-
-#: src/gtkconv.c:3159
+msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
+
+#: src/gtkconv.c:3352
 msgid "/Conversation/_Remove..."
-msgstr "/�亠�亠亟舒/_丕亟舒仍亳��..."
-
-#: src/gtkconv.c:3164
+msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."
+
+#: src/gtkconv.c:3357
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/�亠�亠亟舒/���舒于亳�� ��_�仍从�..."
-
-#: src/gtkconv.c:3166
+msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
+
+#: src/gtkconv.c:3359
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/�亠�亠亟舒/���舒于亳�� _亳亰仂弍�舒亢亠仆亳亠..."
-
-#: src/gtkconv.c:3171
+msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."
+
+#: src/gtkconv.c:3364
 msgid "/Conversation/_Close"
-msgstr "/�亠�亠亟舒/_�舒从����"
+msgstr "/�亠�亠亟舒/�舒从����"
 
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3368
 msgid "/_Options"
 msgstr "/_�舒�舒仄亠���"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3369
 msgid "/Options/Enable _Logging"
-msgstr "/�舒�舒仄亠���/�舒亰�亠�亳�� 亰舒仗亳�� _亳��仂�亳亳"
-
-#: src/gtkconv.c:3177
+msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"
+
+#: src/gtkconv.c:3370
 msgid "/Options/Enable _Sounds"
-msgstr "/�舒�舒仄亠���/�舒亰�亠�亳�� _亰于�从"
-
-#: src/gtkconv.c:3178
+msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
+
+#: src/gtkconv.c:3371
 msgid "/Options/Show Formatting _Toolbar"
-msgstr ""
-
-#: src/gtkconv.c:3220
+msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍� 亳仆����仄亠仆�仂于 �仂�仄舒�亳�仂于舒仆亳�"
+
+#: src/gtkconv.c:3372
+msgid "/Options/Show T_imestamps"
+msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
+
+#: src/gtkconv.c:3414
 msgid "/Conversation/View Log"
-msgstr "/�亠�亠亟舒/�仂�仄仂��亠�� 亳��仂�亳�"
-
-#: src/gtkconv.c:3225
+msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"
+
+#: src/gtkconv.c:3419
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仂仗仂于亠�亠仆亳亠..."
-
-#: src/gtkconv.c:3231
+msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."
+
+#: src/gtkconv.c:3425
 msgid "/Conversation/Get Info"
-msgstr "/�亠�亠亟舒/� �仂弍亠�亠亟仆亳从亠..."
-
-#: src/gtkconv.c:3235
+msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
+
+#: src/gtkconv.c:3429
 msgid "/Conversation/Warn..."
-msgstr "/�亠�亠亟舒/��亠亟�仗�亠亟亳��..."
-
-#: src/gtkconv.c:3239
+msgstr "/�亠�亠亟舒/弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠..."
+
+#: src/gtkconv.c:3433
 msgid "/Conversation/Invite..."
 msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3439
 msgid "/Conversation/Alias..."
 msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3443
 msgid "/Conversation/Block..."
 msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3447
 msgid "/Conversation/Add..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
 
-#: src/gtkconv.c:3257
+#: src/gtkconv.c:3451
 msgid "/Conversation/Remove..."
 msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3457
 msgid "/Conversation/Insert Link..."
 msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3461
 msgid "/Conversation/Insert Image..."
-msgstr "/�亠�亠亟舒/���舒于亳�� 从舒��亳仆从�..."
-
-#: src/gtkconv.c:3273
+msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."
+
+#: src/gtkconv.c:3467
 msgid "/Options/Enable Logging"
-msgstr "/�舒�舒仄亠���/�舒亰�亠�亳�� 亰舒仗亳�� 亳��仂�亳亳"
-
-#: src/gtkconv.c:3276
+msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"
+
+#: src/gtkconv.c:3470
 msgid "/Options/Enable Sounds"
-msgstr "/�舒�舒仄亠���/�舒亰�亠�亳�� 亰于�从"
-
-#: src/gtkconv.c:3279
+msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
+
+#: src/gtkconv.c:3473
 msgid "/Options/Show Formatting Toolbar"
-msgstr ""
+msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍� 亳仆����仄亠仆�仂于 �仂�仄舒�亳�仂于舒仆亳�"
+
+#: src/gtkconv.c:3476
+msgid "/Options/Show Timestamps"
+msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3500 src/gtkconv.c:3502 src/gtkconv.c:3608 src/gtkconv.c:3610
 msgid "Send"
 msgstr "��仗�舒于亳��"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3516
 msgid "Warn"
-msgstr "��亠亟�仗�亠亢亟亠仆亳亠"
-
-#: src/gtkconv.c:3321
+msgstr "弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠"
+
+#: src/gtkconv.c:3519
 msgid "Warn the user"
-msgstr "��亠亟�仗�亠亟亳�� 仗仂仍�亰仂于舒�亠仍�"
+msgstr "弌亟亠仍舒�� 仗仂仍�亰仂于舒�亠仍� 仗�亠亟�仗�亠亢亟亠仆亳亠"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3523 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "�仍仂从亳�仂于舒��"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3526
 msgid "Block the user"
-msgstr "�舒弍仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
-
-#: src/gtkconv.c:3335
+msgstr "�仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/gtkconv.c:3533
 msgid "Add the user to your buddy list"
-msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从"
-
-#: src/gtkconv.c:3342
+msgstr "�仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从 从仂仆�舒从�仂于"
+
+#: src/gtkconv.c:3540
 msgid "Remove the user from your buddy list"
-msgstr "丕亟舒仍亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒 亳亰 �仗亳�从舒."
-
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+msgstr "丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 �仗亳�从舒 从仂仆�舒从�仂于"
+
+#: src/gtkconv.c:3547 src/gtkconv.c:3891
 msgid "Get the user's information"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3622
 msgid "Invite"
-msgstr "��亳亞仍舒�亠仆亳亠"
-
-#: src/gtkconv.c:3419
+msgstr "��亳亞仍舒�亳��"
+
+#: src/gtkconv.c:3625
 msgid "Invite a user"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3632
 msgid "Add the chat to your buddy list"
-msgstr "�仂弍舒于亳�� �舒� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
-
-#: src/gtkconv.c:3433
+msgstr "�仂弍舒于亳�� �舒� 于 �仗亳�仂从 从仂仆�舒从�仂于"
+
+#: src/gtkconv.c:3639
 msgid "Remove the chat from your buddy list"
-msgstr "丕亟舒仍亳�� �舒� 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
-
-#: src/gtkconv.c:3533
+msgstr "丕亟舒仍亳�� �舒� 亳亰 �仗亳�从舒 从仂仆�舒从�仂于"
+
+#: src/gtkconv.c:3749
 msgid "Topic:"
-msgstr "丐亠仄舒"
+msgstr "丐亠仄舒:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3813
 msgid "0 people in room"
-msgstr "0 仗仂仍�亰仂于舒�亠仍亠亶 于 亟舒仆仆仂仄 �舒�亠"
-
-#: src/gtkconv.c:3648
+msgstr "0 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
+
+#: src/gtkconv.c:3868
 msgid "IM the user"
-msgstr ""
-
-#: src/gtkconv.c:3660
+msgstr "��仗�舒于亳�� 仗仂仍�亰仂于舒�亠仍� �仂仂弍�亠仆亳亠"
+
+#: src/gtkconv.c:3880
 msgid "Ignore the user"
 msgstr "�亞仆仂�亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4453
 msgid "Close conversation"
-msgstr "�舒于亠��亳�� �舒亰亞仂于仂�"
-
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+msgstr "�舒从���� 弍亠�亠亟�"
+
+#: src/gtkconv.c:4994 src/gtkconv.c:5026 src/gtkconv.c:5147 src/gtkconv.c:5214
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒�亠"
-msgstr[1] "0 仗仂仍�亰仂于舒�亠仍亠亶 于 亟舒仆仆仂仄 �舒�亠"
-
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+msgstr[1] "%d 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
+
+#: src/gtkconv.c:5729 src/gtkconv.c:5732
 msgid "<main>/Conversation/Close"
 msgstr "<main>/�亠�亠亟舒/�舒从����"
 
-#: src/gtkdebug.c:135
+#: src/gtkconv.c:6103
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;亟亠亶��于亳亠&gt;:  ��仗�舒于亳�� 亟亠亶��于亳亠 于 ��亳仍亠 IRC 仗仂仍�亰仂于舒�亠仍� 亳仍亳 于 �舒�."
+
+#: src/gtkconv.c:6106
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;仗舒�舒仄亠��&gt;:  ��仗�舒于亳�� �舒亰仍亳�仆�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 �亠从���� "
+"弍亠�亠亟�."
+
+#: src/gtkconv.c:6110
+msgid "help:  List available commands."
+msgstr "help:  ��于亠��亳 �仗亳�仂从 亟仂���仗仆�� 从仂仄舒仆亟."
+
+#: src/gtkconv.c:6114
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;从仂仄舒仆亟舒&gt;:  �仂仍��亳�� 仗仂仄仂�� 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠."
+
+#: src/gtkdebug.c:226
+msgid "Save Debug Log"
+msgstr "弌仂��舒仆亳�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 亢��仆舒仍"
+
+#: src/gtkdebug.c:289
 msgid "Debug Window"
 msgstr "�从仆仂 仂�仍舒亟从亳"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:327
 msgid "Pause"
 msgstr "�舒�亰舒"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:333
 msgid "Timestamps"
-msgstr "��仄亠�从舒 于�亠仄亠仆亳"
-
-#: src/gtkft.c:135
+msgstr "��亠仄�"
+
+#: src/gtkft.c:143
 #, c-format
 msgid "%.2f KB/s"
-msgstr ""
-
-#: src/gtkft.c:156 src/gtkft.c:957
-#, fuzzy
+msgstr "%.2f KB/s"
+
+#: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
-msgstr "个亳仆�从亳亶"
-
-#: src/gtkft.c:209
+msgstr "�舒于亠��亠仆仂"
+
+#: src/gtkft.c:167 src/gtkft.c:925
+msgid "Canceled"
+msgstr "��仄亠仆亠仆仂"
+
+#: src/gtkft.c:170
+msgid "Waiting for transfer to begin"
+msgstr "�亢亳亟舒仆亳亠 仆舒�舒仍舒 仗亠�亠亟舒�亳"
+
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
-msgstr "<b>�仂仍��舒亠��� 仂�:</b>"
-
-#: src/gtkft.c:212
+msgstr "<b>��亳�仄 仂�:</b>"
+
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
-msgstr "<b>�亠�亠��仍舒亠��� 亟仍�:</b>"
-
-#: src/gtkft.c:386
+msgstr "<b>��仗�舒于从舒 亟仍�:</b>"
+
+#: src/gtkft.c:400
 msgid "There is no application configured to open this type of file."
-msgstr ""
-
-#: src/gtkft.c:391
+msgstr "�亠� 仗�亳仍仂亢亠仆亳�, �仂仗仂��舒于仍亠仆仆仂亞仂 ��仂仄� �亳仗� �舒亶仍舒."
+
+#: src/gtkft.c:405
 msgid "An error occurred while opening the file."
-msgstr ""
-
-#: src/gtkft.c:482
+msgstr "��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 仂�从���亳亳 �舒亶仍舒."
+
+#: src/gtkft.c:496
 msgid "Progress"
 msgstr "��仂亞�亠��"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Filename"
 msgstr "�仄� �舒亶仍舒"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Size"
 msgstr "�舒亰仄亠�"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "���舒仍仂��"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:547
 msgid "Filename:"
 msgstr "�仄� �舒亶仍舒:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:548
 msgid "Status:"
 msgstr "弌�舒���:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:549
 msgid "Speed:"
 msgstr "弌从仂�仂���:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:550
 msgid "Time Elapsed:"
-msgstr "���舒仍仂�� 于�亠仄亠仆亳:"
-
-#: src/gtkft.c:537
+msgstr "��仂�仍仂 于�亠仄亠仆亳:"
+
+#: src/gtkft.c:551
 msgid "Time Remaining:"
 msgstr "���舒仍仂�� 于�亠仄亠仆亳:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:648
 msgid "_Keep the dialog open"
-msgstr "_�亠�亢舒�� 亟亳舒仍仂亞 仂�从����仄"
-
-#: src/gtkft.c:644
+msgstr "�亠�亢舒�� 亟亳舒仍仂亞 仂�从����仄"
+
+#: src/gtkft.c:658
 msgid "_Clear finished transfers"
-msgstr "_丕亟舒仍��� 亟舒仆仆�亠 仂 仗亠�亠亟舒仆仆�� �舒亶仍舒�"
+msgstr "��亳�舒�� 亰舒于亠���仆仆�亠 仗亠�亠亟舒�亳 �舒亶仍仂于"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:667
 msgid "Show transfer details"
-msgstr "�仂从舒亰�于舒�� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
-
-#: src/gtkft.c:654
+msgstr "�仂从舒亰舒�� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
+
+#: src/gtkft.c:668
 msgid "Hide transfer details"
-msgstr "弌仗���舒�� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
+msgstr "弌从���� 仗仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:710 src/stock.c:90
 msgid "_Pause"
-msgstr "_�舒�亰舒"
+msgstr "�舒�亰舒"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:720
 msgid "_Resume"
-msgstr "��仂亟仂仍亢亳��"
-
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "��仄亠仆亠仆仂"
-
-#: src/gtkft.c:910
+msgstr "�仂亰仂弍仆仂于亳��"
+
+#: src/gtkft.c:927
 msgid "Failed"
 msgstr "�亠 �亟舒仍仂��"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1099
 msgid "That file does not exist."
-msgstr "亅�仂� �舒亶仍 仆亠 ���亠��于�亠�."
-
-#: src/gtkft.c:1091
+msgstr "丐舒从仂亞仂 �舒亶仍舒 仆亠 ���亠��于�亠�."
+
+#: src/gtkft.c:1108
 msgid "Cannot send a file of 0 bytes."
-msgstr "�亠 �亟舒���� 仗仂�仍舒�� �舒亶仍 �舒亰仄亠�仂仄揃0揃弍舒亶�仂于."
-
-#: src/gtkft.c:1105
+msgstr "�亠仍�亰� 仂�仗�舒于亳�� �舒亶仍 �舒亰仄亠�仂仄 0 弍舒亶�仂于."
+
+#: src/gtkft.c:1122
 msgid "That file already exists."
-msgstr "个舒亶仍 � �舒从亳仄 亳仄亠仆亠仄 �亢亠 ���亠��于�亠�."
-
-#: src/gtkft.c:1131
+msgstr "丐舒从仂亶 �舒亶仍 �亢亠 ���亠��于�亠�."
+
+#. Open file selector to select the public key.
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr "��从����..."
 
-#: src/gtkft.c:1133
+#: src/gtkft.c:1150
 msgid "Save As..."
 msgstr "弌仂��舒仆亳�� 从舒从..."
 
-#: src/gtkft.c:1183
+#: src/gtkft.c:1200
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s揃�仂�亠��� 仗亠�亠�仍舒�� 于舒仄揃%s揃(%s)"
-
-#: src/gtkft.c:1216
+msgstr "%s �仂�亠� 仂�仗�舒于亳�� 于舒仄 %s (%s)"
+
+#: src/gtkft.c:1233
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr ""
-
-#: src/gtkft.c:1220
+msgstr "丕亟仂于仍亠�于仂�亳�� 亰舒仗�仂� 仗亠�亠亟舒�亳 �舒亶仍舒 %s?"
+
+#: src/gtkft.c:1237
 #, c-format
 msgid ""
 "A file is available for download from:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-
-#: src/gtkimhtml.c:1139
+"个舒亶仍 亟仂���仗亠仆 亟仍� 亰舒亞��亰从亳 �:\n"
+"丕亟舒仍�仆仆�亶 �亰亠仍: %s\n"
+"丕亟舒仍�仆仆�亶 仗仂��: %d"
+
+#: src/gtkimhtml.c:548
+msgid "Pa_ste As Text"
+msgstr "���舒于亳�� 从舒从 �亠从��"
+
+#: src/gtkimhtml.c:993
+msgid "Hyperlink color"
+msgstr "丶于亠� 亞亳仗亠����仍从亳"
+
+#: src/gtkimhtml.c:994
+msgid "Color to draw hyperlinks."
+msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从."
+
+#: src/gtkimhtml.c:1200
 msgid "_Copy E-Mail Address"
-msgstr "_弌从仂仗亳�仂于舒�� 舒亟�亠� e-mail"
-
-#: src/gtkimhtml.c:1151
+msgstr "弌从仂仗亳�仂于舒�� 舒亟�亠� E-Mail"
+
+#: src/gtkimhtml.c:1212
 msgid "_Copy Link Location"
-msgstr "_弌从仂仗亳�仂于舒�� ���仍从�"
-
-#: src/gtkimhtml.c:1161
+msgstr "弌从仂仗亳�仂于舒�� ���仍从�"
+
+#: src/gtkimhtml.c:1222
 msgid "_Open Link in Browser"
-msgstr "_��从���� ���仍从� 于 弍�舒�亰亠�亠"
-
-#: src/gtkimhtml.c:2643
+msgstr "��从���� ���仍从� 于 弍�舒�亰亠�亠"
+
+#: src/gtkimhtml.c:2658
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2666
 #, c-format
 msgid "Error saving image: %s"
-msgstr "��亳弍从舒 仗�亳 �仂��舒仆亠仆亳亳 亳亰仂弍�舒亢亠仆亳�: '%s'"
-
-#: src/gtkimhtml.c:2660
+msgstr "��亳弍从舒 �仂��舒仆亠仆亳� 亳亰仂弍�舒亢亠仆亳�: %s"
+
+#: src/gtkimhtml.c:2675
 msgid "Save Image"
 msgstr "弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2698
 msgid "_Save Image..."
-msgstr "_弌仂��舒仆亳�� 从舒��亳仆从� 从舒从..."
-
-#: src/gtkimhtmltoolbar.c:383
-#, fuzzy
-msgid "_URL"
-msgstr "_URL:"
-
-#: src/gtkimhtmltoolbar.c:387
-#, fuzzy
-msgid "_Description"
-msgstr "_�仗亳�舒仆亳亠:"
+msgstr "弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠..."
+
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "��弍仂� ��亳��舒"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr "��弍仂� �于亠�舒 �亠从��舒"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "��弍仂� �于亠�舒 �仂仆舒"
 
 #: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "���舒于亳�� ���仍从�"
-
-#: src/gtkimhtmltoolbar.c:394
-#, fuzzy
+msgid "_URL"
+msgstr "_URL"
+
+#: src/gtkimhtmltoolbar.c:397
+msgid "_Description"
+msgstr "�仗亳�舒仆亳亠"
+
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
-msgstr "�于亠亟亳�亠 URL 亳 亠亞仂 仂仗亳�舒仆亳亠 (仆亠仂弍�亰舒�亠仍�仆仂).\n"
-
-#: src/gtkimhtmltoolbar.c:398
+msgstr ""
+"�于亠亟亳�亠 URL 亳 仂仗亳�舒仆亳亠 ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��. �仗亳�舒仆亳亠 "
+"仆亠仂弍�亰舒�亠仍�仆仂."
+
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "�于亠亟亳�亠 URL ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��."
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "���舒于亳�� ���仍从�"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "_���舒于亳��"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:472
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "�亠 �亟舒仍仂�� �仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠: %s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:498
 msgid "Insert Image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
+#: src/gtkimhtmltoolbar.c:637
+msgid "This theme has no available smileys."
+msgstr ""
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:652
 msgid "Smile!"
 msgstr "弌仄舒亶仍!"
 
-#: src/gtkimhtmltoolbar.c:825
+#: src/gtkimhtmltoolbar.c:870
 msgid "Bold"
 msgstr "�亳�仆�亶"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:881
 msgid "Italic"
 msgstr "�舒从仍仂仆仆�亶"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:892
 msgid "Underline"
 msgstr "�仂亟�亠�从仆���亶"
 
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:908
 msgid "Larger font size"
 msgstr "�仂仍��亳亶 �舒亰仄亠� ��亳��舒"
 
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:920
 msgid "Smaller font size"
 msgstr "�亠仆��亳亶 �舒亰仄亠� ��亳��舒 "
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:937
 msgid "Font Face"
 msgstr "��弍仂� ��亳��舒"
 
-#: src/gtkimhtmltoolbar.c:904
+#: src/gtkimhtmltoolbar.c:949
 msgid "Foreground font color"
 msgstr "丶于亠� ��亳��舒"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:961
 msgid "Background color"
 msgstr "丶于亠� �仂仆舒"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:976
 msgid "Insert link"
 msgstr "���舒于亳�� ���仍从�"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:986
 msgid "Insert image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:997
 msgid "Insert smiley"
 msgstr "���舒于亳�� �仄舒亶仍亳从"
 
@@ -3114,7 +3393,7 @@
 msgstr "�亠�亠亟� �"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:372 src/gtklog.c:388
 msgid "System Log"
 msgstr "弌亳��亠仄仆�亶 亢��仆舒仍"
 
@@ -3123,662 +3402,534 @@
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "丕 %s 于�亠亞仂 %d 仆仂于�� �仂仂弍�亠仆亳亶."
-msgstr[1] "%s 仂�仂��仍."
-
-#: src/gtknotify.c:229
+msgstr[0] "%s 亳仄亠亠� %d 仆仂于仂亠 �仂仂弍�亠仆亳亠."
+msgstr[1] "%s 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳亶."
+
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">��:</span> %s\n"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr ""
-
-#: src/gtknotify.c:239
+msgstr "<span weight=\"bold\">丐亠仄舒:</span> %s\n"
+
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 "\n"
 "%s%s%s%s"
 msgstr ""
-
-#: src/gtknotify.c:255
+"<span weight=\"bold\" size=\"larger\">�舒仄 仗�亳�仍舒 仗仂��舒!</span>\n"
+"\n"
+"%s%s%s%s"
+
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 "\n"
 "%s"
 msgstr ""
-
-#: src/gtknotify.c:441
-#, fuzzy, c-format
+"<span weight=\"bold\" size=\"larger\">�舒仄 仗�亳�仍舒 仗仂��舒!</span>\n"
+"\n"
+"%s"
+
+#: src/gtknotify.c:429
+#, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 仆亠从仂��亠从�仆仂."
-
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+msgstr "�仂仄舒仆亟舒 弍�舒�亰亠�舒 \"%s\" 仆亠从仂��亠从�仆舒."
+
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "�亠 �亟舒���� 仂�从���� URL"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
-#, fuzzy, c-format
+#: src/gtknotify.c:443 src/gtknotify.c:458
+#, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "��亳弍从舒 仗�亳 于�仗仂仍仆亠仆亳亳 \"从仂仄舒仆亟�\": '%s'"
-
-#: src/gtknotify.c:582
+msgstr "��亳弍从舒 亰舒仗��从舒 \"%s\": %s"
+
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:144
 msgid "Select a file"
 msgstr "��弍�舒�� �舒亶仍"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:194
 msgid "Please enter a buddy to pounce."
 msgstr "�于亠亟亳�亠 仗仂仍�亰仂于舒�亠仍�."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:420 src/gtkpounce.c:923
 msgid "New Buddy Pounce"
-msgstr "�仂于仂亠 仂仗仂于亠�亠仆亳亠"
-
-#: src/gtkpounce.c:336
+msgstr "�仂于仂亠 仗�舒于亳仍仂"
+
+#: src/gtkpounce.c:420
 msgid "Edit Buddy Pounce"
-msgstr "�亰仄亠仆亳�� 仂仗仂于亠�亠仆亳亠"
+msgstr "�亰仄亠仆亳�� 仗�舒于亳仍仂"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:438
 msgid "Pounce Who"
-msgstr "�仂亞仂 仂仗仂于亠��亳��"
-
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
-msgstr "_�仄� �仂弍亠�亠亟仆亳从舒:"
+msgstr "�舒 从亠仄 �仍亠亟亳��"
+
+#: src/gtkpounce.c:465
+msgid "_Buddy name:"
+msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:489
 msgid "Pounce When"
-msgstr "�仂亞亟舒 仂仗仂于亠�舒��"
-
-#: src/gtkpounce.c:412
-#, fuzzy
+msgstr "�仂亞亟舒 �亠舒亞亳�仂于舒��"
+
+#: src/gtkpounce.c:497 src/main.c:296
 msgid "_Sign on"
-msgstr "�仂亶�亳"
-
-#: src/gtkpounce.c:414
-#, fuzzy
+msgstr "��仂亟"
+
+#: src/gtkpounce.c:499
 msgid "Sign _off"
-msgstr "���亠仍"
-
-#: src/gtkpounce.c:416
-#, fuzzy
+msgstr "���仂亟"
+
+#: src/gtkpounce.c:501
 msgid "A_way"
 msgstr "��仂��仍"
 
-#: src/gtkpounce.c:418
-#, fuzzy
+#: src/gtkpounce.c:503
 msgid "Re_turn from away"
 msgstr "�亠�仆�仍��"
 
-#: src/gtkpounce.c:420
-#, fuzzy
+#: src/gtkpounce.c:505
 msgid "_Idle"
-msgstr "�亠亰亟亠亶��于亳亠"
-
-#: src/gtkpounce.c:422
-#, fuzzy
+msgstr "�亠亰亟亠亶��于�亠�"
+
+#: src/gtkpounce.c:507
 msgid "Retur_n from idle"
-msgstr "�从�亳于亠仆"
-
-#: src/gtkpounce.c:424
-#, fuzzy
+msgstr "�亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
+
+#: src/gtkpounce.c:509
 msgid "Buddy starts _typing"
-msgstr "�舒�舒仍 仆舒弍亳�舒�� �亠从��"
-
-#: src/gtkpounce.c:426
-#, fuzzy
+msgstr "�仂仍�亰仂于舒�亠仍� 仆舒�舒仍 仗亳�舒��"
+
+#: src/gtkpounce.c:511
 msgid "Buddy stops t_yping"
-msgstr "��亠从�舒�亳仍 仆舒弍亳�舒�� �亠从��"
+msgstr "�仂仍�亰仂于舒�亠仍� 仗亠�亠��舒仍 仗亳�舒��"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:540
 msgid "Pounce Action"
-msgstr "�亠��于亳亠 仗�亳 仂仗仂于亠�亠仆亳亳"
-
-#: src/gtkpounce.c:462
-#, fuzzy
+msgstr "丼�仂 亟亠仍舒��"
+
+#: src/gtkpounce.c:548
 msgid "Op_en an IM window"
 msgstr "��从���� 仂从仆仂 弍亠�亠亟�"
 
-#: src/gtkpounce.c:463
-#, fuzzy
+#: src/gtkpounce.c:550
 msgid "_Popup notification"
-msgstr "��仗仍�于舒��亠亠 �于亠亟仂仄仍亠仆亳亠"
-
-#: src/gtkpounce.c:464
-#, fuzzy
+msgstr "�仂从舒亰舒�� �于亠亟仂仄仍亠仆亳亠"
+
+#: src/gtkpounce.c:552
 msgid "Send a _message"
 msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
 
-#: src/gtkpounce.c:465
-#, fuzzy
+#: src/gtkpounce.c:554
 msgid "E_xecute a command"
-msgstr "��仗仂仍仆亳�� 从仂仄舒仆亟� 仗�亳 仂仗仂于亠�亠仆亳亳"
-
-#: src/gtkpounce.c:466
-#, fuzzy
-msgid "P_lay a sound"
-msgstr "�仂�仗�仂亳亰于仂亟亳�� 亰于�从 仗�亳 仂仗仂于亠�亠仆亳亳"
-
-#: src/gtkpounce.c:470
-#, fuzzy
-msgid "B_rowse..."
-msgstr "��仂�仄仂��"
-
-#: src/gtkpounce.c:472
-#, fuzzy
-msgid "Bro_wse..."
-msgstr "��仂�仄仂��"
-
-#: src/gtkpounce.c:473
-msgid "Pre_view"
-msgstr ""
+msgstr "��仗仂仍仆亳�� 从仂仄舒仆亟�"
 
 #: src/gtkpounce.c:556
-#, fuzzy
+msgid "P_lay a sound"
+msgstr "�仂�仗�仂亳亰于亠��亳 亰于�从"
+
+#: src/gtkpounce.c:560
+msgid "B_rowse..."
+msgstr "��从����..."
+
+#: src/gtkpounce.c:562
+msgid "Bro_wse..."
+msgstr "��从����..."
+
+#: src/gtkpounce.c:563
+msgid "Pre_view"
+msgstr "丐亠��"
+
+#: src/gtkpounce.c:646
 msgid "Sav_e this pounce after activation"
-msgstr "_弌仂��舒仆亳�� ��仂 仂仗仂于亠�亠仆亳亠 仗仂�仍亠 舒从�亳于舒�亳亳"
+msgstr "弌仂��舒仆亳�� ��仂 仗�舒于亳仍仂 仗仂�仍亠 舒从�亳于舒�亳亳"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:930
 msgid "Remove Buddy Pounce"
-msgstr "丕亟舒仍亳�� 仂仗仂于亠�亠仆亳亠"
-
-#: src/gtkpounce.c:813
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s揃仆舒�舒仍 仆舒弍亳�舒�� 于舒仄 仂�于亠�"
-
-#: src/gtkpounce.c:814
-#, c-format
-msgid "%s has signed on"
-msgstr "%s 于仂�亠仍"
-
-#: src/gtkpounce.c:815
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s 弍仂仍��亠 仆亠 弍亠亰亟亠亶��于�亠�"
-
-#: src/gtkpounce.c:816
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s 于亠�仆�仍��"
-
-#: src/gtkpounce.c:817
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr ""
-
-#: src/gtkpounce.c:818
-#, c-format
-msgid "%s has signed off"
-msgstr "%s 于��亠仍"
-
-#: src/gtkpounce.c:819
-#, c-format
-msgid "%s has become idle"
-msgstr "%s 仗仂仍��亳仍 ��舒��� 弍亠亰亟亠亶��于���亠亞仂"
-
-#: src/gtkpounce.c:821
+msgstr "丕亟舒仍亳�� 仗�舒于亳仍仂"
+
+#: src/gtkpounce.c:994
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s 仆舒�舒仍 仗亳�舒�� 于舒仄 (%s)"
+
+#: src/gtkpounce.c:996
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s 于仂��仍 (%s)"
+
+#: src/gtkpounce.c:998
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
+
+#: src/gtkpounce.c:1000
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s 于亠�仆�仍�� (%s)"
+
+#: src/gtkpounce.c:1002
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s 仗亠�亠��舒仍 仗亳�舒�� 于舒仄 (%s)"
+
+#: src/gtkpounce.c:1004
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s 于��亠仍 (%s)"
+
+#: src/gtkpounce.c:1006
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
+
+#: src/gtkpounce.c:1008
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s 仂�仂��仍 (%s)"
+
+#: src/gtkpounce.c:1009
 msgid "Unknown pounce event. Please report this!"
-msgstr ""
-
-#: src/gtkprefs.c:399
+msgstr "�亠亳亰于亠��仆仂亠 �仂弍��亳亠 仗�舒于亳仍舒. 弌仂仂弍�亳�亠 仂弍 ��仂仄!"
+
+#: src/gtkprefs.c:401
 msgid "Interface Options"
 msgstr "�舒�舒仄亠��� 于仆亠�仆亠亞仂 于亳亟舒"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:403
 msgid "D_isplay remote nicknames if no alias is set"
-msgstr "��仂弍�舒亢舒�� 仆仂仄亠� 舒从舒�仆�舒, 亠�仍亳 仗�亠于亟仂仆亳仄 仆亠 ���舒仆仂于仍亠仆"
-
-#: src/gtkprefs.c:595
+msgstr "��仂弍�舒亢舒�� 仂�亳亞亳仆舒仍�仆�亶 仗�亠于亟仂仆亳仄, 亠�仍亳 仗�亠于亟仂仆亳仄 仆亠 ���舒仆仂于仍亠仆"
+
+#: src/gtkprefs.c:627
 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:630
+"��弍亠�亳�亠 �亠仄� �仄舒亶仍亳从仂于, 从仂�仂��� 于� �仂�亠仍亳 弍� 亳�仗仂仍�亰仂于舒��. �仂于�亠 �亠仄� 仄仂亞�� "
+"弍��� ���舒仆仂于仍亠仆� 仗亠�亠�舒�从亳于舒仆亳亠仄 亳� 于 �仗亳�仂从 �亠仄."
+
+#: src/gtkprefs.c:667
 msgid "Icon"
-msgstr "�从仂仆从舒"
-
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+msgstr "�仆舒�仂从"
+
+#: src/gtkprefs.c:674 src/gtkprefs.c:2191 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "�仗亳�舒仆亳亠"
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr "弌�亳仍�"
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr "_�亳�仆�亶"
-
-#: src/gtkprefs.c:707
-#, fuzzy
-msgid "_Italic"
-msgstr "_�舒从仍仂仆仆�亶"
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr "_�仂亟���从仆���亶"
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr "_�舒���从仆���亶 �亠从��"
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr "丿�亳��"
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr "��仗仂仍�亰仂于舒�� 亰舒亟舒仆仆�亶 ��亳��"
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr "��仗仂仍�亰仂于舒�� 亰舒亟舒仆仆�亶 �舒亰仄亠�"
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr "丶于亠�"
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr "丶于亠� �亠从��舒"
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr "丶于亠� �仂仆舒"
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
+#: src/gtkprefs.c:770
 msgid "Display"
 msgstr "��仂弍�舒亢亠仆亳亠"
 
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr "�仂从舒亰�于舒�� 亞�舒�亳�亠�从亳亠 �仄舒亶仍亳从亳"
-
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:771
 msgid "Show _timestamp on messages"
-msgstr "�仂从舒亰�于舒�� _于�亠仄� �仂仂弍�亠仆亳亶"
-
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr "�仂从舒亰�于舒�� _URL 从舒从 ���仍从亳"
-
-#: src/gtkprefs.c:814
+msgstr "�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
+
+#: src/gtkprefs.c:774
 msgid "_Highlight misspelled words"
-msgstr "_�仂亟�于亠�亳于舒�� �仍仂于舒仄亳 � 仂�亳弍从舒仄亳"
-
-#: src/gtkprefs.c:818
+msgstr "�仂亟�于亠�亳于舒�� �仍仂于舒 � 仂�亳弍从舒仄亳"
+
+#: src/gtkprefs.c:779
 msgid "Ignore c_olors"
 msgstr "�亞仆仂�亳�仂于舒�� _�于亠�舒"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:781
 msgid "Ignore font _faces"
 msgstr "�亞仆仂�亳�仂于舒�� _仂弍仍亳从 ��亳��舒"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:783
 msgid "Ignore font si_zes"
 msgstr "�亞仆仂�亳�仂于舒�� _�舒亰仄亠� ��亳��舒"
 
-#: src/gtkprefs.c:835
-msgid "Send Message"
-msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
-
-#: src/gtkprefs.c:836
-msgid "Enter _sends message"
-msgstr "C仂仂弍�亠仆亳亠 _仗亠�亠��仍舒亠��� 仗仂 仆舒亢舒�亳� Enter"
-
-#: src/gtkprefs.c:838
-msgid "C_ontrol-Enter sends message"
-msgstr "C仂仂弍�亠仆亳亠揃仗亠�亠��仍舒亠���揃仗仂揃仆舒亢舒�亳�揃_Ctrl-Enter"
-
-#: src/gtkprefs.c:841
-msgid "Window Closing"
-msgstr "�舒从���亳亠 仂从仆舒"
-
-#: src/gtkprefs.c:842
-msgid "_Escape closes window"
-msgstr "�从仆仂 亰舒从��于舒亠��� 仗仂 仆舒亢舒�亳� Esc"
-
-#: src/gtkprefs.c:845
-msgid "Insertions"
-msgstr "���舒于从亳"
-
-#: src/gtkprefs.c:846
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "�仂 仆舒亢舒�亳� Ctrl-{B/I/U/S} 于��舒于仍����� ��亞亳 _HTML"
-
-#: src/gtkprefs.c:848
-msgid "Control-(number) _inserts smileys"
-msgstr "�仂 仆舒亢舒�亳� Ctrl-(�亳��舒) _于��舒于仍����� �仄舒亶仍亳从亳"
+#: src/gtkprefs.c:786
+msgid "_Ignore formatting on incoming messages"
+msgstr "�亞仆仂�亳�仂于舒�� �仂�仄舒�亳�仂于舒仆亳亠 于�仂亟��亳� �仂仂弍�亠仆亳亶"
+
+#: src/gtkprefs.c:790
+msgid "Default Formatting"
+msgstr "个仂�仄舒�亳�仂于舒仆亳亠 仗仂 �仄仂仍�舒仆亳�"
+
+#: src/gtkprefs.c:792
+msgid "_Send default formatting with outgoing messages"
+msgstr "��仗�舒于仍��� 亳��仂亟��亳亠 �仂仂弍�亠仆亳� 仂��仂�仄舒�亳�仂于舒仆仆�仄亳 仗仂 �仄仂仍�舒仆亳�"
+
+#: src/gtkprefs.c:824
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"丐舒从 弍�亟亠� 于�亞仍�亟亠�� �亠从�� 于舒�亳� �仂仂弍�亠仆亳亶 � 亳�仗仂仍�亰仂于舒仆亳亠仄 仗�仂�仂从仂仍仂于, "
+"仗仂亟亟亠�亢亳于舒��亳� �仂�仄舒�亳�仂于舒仆亳亠. :)"
+
+#: src/gtkprefs.c:827
+msgid "_Clear Formatting"
+msgstr "��亳��亳�� �仂�仄舒�亳�仂于舒仆亳亠"
 
 #: src/gtkprefs.c:864
+msgid "Send Message"
+msgstr "��仗�舒于从舒 �仂仂弍�亠仆亳�"
+
+#: src/gtkprefs.c:865
+msgid "Enter _sends message"
+msgstr "Enter 仂�仗�舒于仍�亠� �仂仂弍�亠仆亳亠"
+
+#: src/gtkprefs.c:867
+msgid "C_ontrol-Enter sends message"
+msgstr "C_ontrol-Enter 仂�仗�舒于仍�亠� �仂仂弍�亠仆亳亠"
+
+#: src/gtkprefs.c:870
+msgid "Window Closing"
+msgstr "�舒从���亳亠 仂从仆舒"
+
+#: src/gtkprefs.c:871
+msgid "_Escape closes window"
+msgstr "_Escape 亰舒从��于舒亠� 仂从仆仂"
+
+#: src/gtkprefs.c:874
+msgid "Insertions"
+msgstr "���舒于从舒"
+
+#: src/gtkprefs.c:875
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U} 亳亰仄亠仆�亠� �仂�仄舒�亳�仂于舒仆亳亠"
+
+#: src/gtkprefs.c:877
+msgid "Control-(number) _inserts smileys"
+msgstr "Control-(�亳��舒) 于��舒于仍�亠� �仄舒亶仍亳从亳"
+
+#: src/gtkprefs.c:893
 msgid "Buddy List Sorting"
-msgstr "弌仂��亳�仂于从舒 �仗亳�从舒 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/gtkprefs.c:873
-#, fuzzy
-msgid "_Sorting:"
-msgstr "弌仂��亳�仂于从舒:"
-
-#: src/gtkprefs.c:878
-msgid "Buddy List Toolbar"
-msgstr "�舒仆亠仍� 亳仆����仄亠仆�仂于 �仗亳�仂从舒 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
-msgid "Show _buttons as:"
-msgstr "�仂从舒亰�于舒�� _从仆仂仗从亳 从舒从:"
-
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
-msgid "Pictures"
-msgstr "�舒��亳仆从亳"
-
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
-msgid "Text"
-msgstr "丐亠从��"
-
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
-msgid "Pictures and text"
-msgstr "�舒��亳仆从亳 亳 �亠从��"
-
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
-msgid "_Raise window on events"
-msgstr "_�于�仂于�仗仍��亳亠 仂从仆舒 仗�亳 �仂弍��亳��"
-
-#: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr "��仂弍�舒亢亠仆亳亠 亞��仗仗�"
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr "�仂从舒亰�于舒�� _从仂仍亳�亠��于仂 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/gtkprefs.c:895
-msgid "Buddy Display"
-msgstr "��仂弍�舒亢亠仆亳亠 仗仂仍�亰仂于舒�亠仍�"
-
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
-msgid "Show buddy _icons"
-msgstr "�仂从舒亰舒�� 弍仂仍��亳亠 _仗亳从�仂亞�舒仄仄� ��舒���舒"
-
-#: src/gtkprefs.c:898
-msgid "Show _warning levels"
-msgstr "�仂从舒亰�于舒�� _��仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
-
-#: src/gtkprefs.c:900
-msgid "Show idle _times"
-msgstr "�仂从舒亰舒�� 于�亠仄� _弍亠亰亟亠亶��于亳�"
+msgstr "弌仂��亳�仂于从舒 �仗亳�从舒 从仂仆�舒从�仂于"
 
 #: src/gtkprefs.c:902
+msgid "_Sorting:"
+msgstr "弌仂��亳�仂于舒��:"
+
+#: src/gtkprefs.c:908 src/gtkprefs.c:961
+msgid "Show _buttons as:"
+msgstr "�仂从舒亰�于舒�� 从仆仂仗从亳 从舒从:"
+
+#: src/gtkprefs.c:910 src/gtkprefs.c:963
+msgid "Pictures"
+msgstr "�仆舒�从亳"
+
+#: src/gtkprefs.c:911 src/gtkprefs.c:964
+msgid "Text"
+msgstr "丐亠从��"
+
+#: src/gtkprefs.c:912 src/gtkprefs.c:965
+msgid "Pictures and text"
+msgstr "�仆舒�从亳 亳 �亠从��"
+
+#: src/gtkprefs.c:915 src/gtkprefs.c:980
+msgid "_Raise window on events"
+msgstr "_�仂亟仆亳仄舒�� 仂从仆仂 仗�亳 �仂弍��亳��"
+
+#: src/gtkprefs.c:918
+msgid "Buddy Display"
+msgstr "��仂弍�舒亢亠仆亳亠 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/gtkprefs.c:919 src/gtkprefs.c:976
+msgid "Show buddy _icons"
+msgstr "�仂从舒亰�于舒�� 亰仆舒�从亳 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/gtkprefs.c:921
+msgid "Show _warning levels"
+msgstr "�仂从舒亰�于舒�� ��仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
+
+#: src/gtkprefs.c:923
+msgid "Show idle _times"
+msgstr "�仂从舒亰�于舒�� 于�亠仄� 弍亠亰亟亠亶��于亳�"
+
+#: src/gtkprefs.c:925
 msgid "Dim i_dle buddies"
-msgstr "_�舒�亠仆��� 弍亠亰亟亠亶��于���亳�"
-
-#: src/gtkprefs.c:904
+msgstr "�舒�亠仆��� 弍亠亰亟亠亶��于���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/gtkprefs.c:927
 msgid "_Automatically expand contacts"
-msgstr ""
-
-#: src/gtkprefs.c:929
-msgid "_Placement:"
-msgstr "�舒�仗仂仍仂亢亠仆亳亠:"
-
-#: src/gtkprefs.c:936
-#, fuzzy
-msgid "Send _URLs as links"
-msgstr "�仂从舒亰�于舒�� URL 从舒从 _���仍从�"
-
-#: src/gtkprefs.c:939
-#, fuzzy
+msgstr "�于�仂仄舒�亳�亠�从亳 �舒�从��于舒�� 从仂仆�舒从��"
+
+#: src/gtkprefs.c:972
 msgid "Show _formatting toolbar"
-msgstr "�仂从舒亰�于舒�� 仗舒仆亠仍� � 亳仆����仄亠仆�舒仄亳 �仂�仄舒�亳�仂于舒仆亳�"
-
-#: src/gtkprefs.c:942
-msgid "Show a_liases in tabs/titles"
-msgstr "�仂从舒亰�于舒�� _仗�亠于亟仂仆亳仄� 于仂 于从仍舒亟从舒�/亰舒亞仂仍仂于从舒�"
-
-#: src/gtkprefs.c:945
-msgid "Tab Options"
-msgstr "弌于仂亶��于舒 于从仍舒亟仂从"
-
-#: src/gtkprefs.c:947
-msgid "_Tab Placement:"
-msgstr "�舒�仗仂仍仂亢亠仆亳亠 于从仍舒亟仂从:"
-
-#: src/gtkprefs.c:949
-msgid "Top"
-msgstr "�于亠���"
-
-#: src/gtkprefs.c:950
-msgid "Bottom"
-msgstr "�仆亳亰�"
-
-#: src/gtkprefs.c:951
-msgid "Left"
-msgstr "弌仍亠于舒"
-
-#: src/gtkprefs.c:952
-msgid "Right"
-msgstr "弌仗�舒于舒"
-
-#: src/gtkprefs.c:958
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "�仂从舒亰�于舒�� 于�亠 弍亠�亠亟� 亳 �舒�� 于 仂从仆舒� �仂 _于从仍舒亟从舒仄亳"
-
-#: src/gtkprefs.c:961
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "�仂从舒亰�于舒�� 于�亠 �舒�� 于 _�仂仄 亢亠 仂从仆亠 �仂 于从仍舒亟从舒仄亳"
-
-#: src/gtkprefs.c:971
-msgid "Show _close button on tabs"
-msgstr "�仂从舒亰�于舒�� 从仆仂仗从亳 _亰舒从���亳� 仂�亟亠仍�仆�� 于从仍舒亟仂从"
+msgstr "�仂从舒亰�于舒�� 仗舒仆亠仍� 亳仆����仄亠仆�仂于 �仂�仄舒�亳�仂于舒仆亳�"
+
+#: src/gtkprefs.c:974
+msgid "Show _aliases in tabs/titles"
+msgstr "�仂从舒亰�于舒�� 仗�亠于亟仂仆亳仄� 于仂 于从仍舒亟从舒�/亰舒亞仂仍仂于从舒�"
+
+#: src/gtkprefs.c:978
+msgid "Enable buddy ic_on animation"
+msgstr "�仆亳仄亳�仂于舒�� 亰仆舒�从亳 仗仂仍�亰仂于舒�亠仍亠亶"
 
 #: src/gtkprefs.c:982
-msgid "Show status _icons on tabs"
-msgstr "�仂从舒亰�于舒�� _仗亳从�仂亞�舒仄仄� ��舒���舒 仆舒 于从仍舒亟从舒�"
-
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
-msgid "Window"
-msgstr "�从仆仂"
-
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
-msgid "New window _width:"
-msgstr "丿亳�亳仆舒 仆仂于仂亞仂 仂从仆舒:"
-
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
-msgid "New window _height:"
-msgstr "���仂�舒 仆仂于仂亞仂 仂从仆舒:"
-
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
-msgid "_Entry field height:"
-msgstr "���仂�舒 仗仂仍� 于于仂亟舒:"
-
-#: src/gtkprefs.c:1027
-msgid "Hide window on _send"
-msgstr "弌仗���舒�� 仂从仆仂 仗仂�仍亠 _仂�仗�舒于从亳"
-
-#: src/gtkprefs.c:1031
-msgid "Buddy Icons"
-msgstr "�从仂仆从亳 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/gtkprefs.c:1034
-msgid "Enable buddy icon a_nimation"
-msgstr "�舒亰�亠�亳�� _舒仆亳仄舒�亳� 仗亳从�仂亞�舒仄仄 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr "�仂从舒亰�于舒�� _仗仂亟从仍��亠仆亳� 于 仂从仆亠"
-
-#: src/gtkprefs.c:1041
-msgid "Typing Notification"
-msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 仆舒弍仂�亠 �亠从��舒"
-
-#: src/gtkprefs.c:1042
-msgid "Notify buddies that you are _typing to them"
-msgstr "丕于亠亟仂仄仍��� �仂弍亠�亠亟仆亳从仂于, ��仂 于� 亳仄 ��仂-�仂 _仗亳�亠�亠"
-
-#: src/gtkprefs.c:1079
-msgid "Tab Completion"
-msgstr "�亠亢亳仄 亟仂仗仂仍仆亠仆亳亶"
-
-#: src/gtkprefs.c:1080
-msgid "_Tab-complete nicks"
-msgstr "_Tab - �仂仗仂仍仆亳�� 仗�亠于亟仂仆亳仄"
-
-#: src/gtkprefs.c:1082
-msgid "_Old-style tab completion"
-msgstr "_弌�舒��亶 ��亳仍� 亟仂仗仂仍仆亠仆亳�"
-
-#: src/gtkprefs.c:1086
-msgid "_Show people joining in window"
-msgstr "�仂从舒亰�于舒�� _于仂�亠亟�亳� 于 仂从仆亠"
-
-#: src/gtkprefs.c:1088
-msgid "_Show people leaving in window"
-msgstr "�仂从舒亰�于舒�� 于_��亠亟�亳� 于 仂从仆亠"
-
-#: src/gtkprefs.c:1090
-#, fuzzy
-msgid "Co_lorize screen names"
-msgstr "�舒�_从�舒�亳�� 亳仄亠仆舒 �仂弍亠�亠亟仆亳从仂于"
-
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
-#, fuzzy
+msgid "_Notify buddies that you are typing to them"
+msgstr "丕于亠亟仂仄仍��� 仗仂仍�亰仂于舒�亠仍亠亶, ��仂 于� 仗亳�亠�亠 亳仄"
+
+#: src/gtkprefs.c:984
+msgid "Enable \"_slash\" commands"
+msgstr "�从仍��亳�� \"�仍��\"-从仂仄舒仆亟�"
+
+#: src/gtkprefs.c:986
+msgid "Use _multi-colored screen names in chats"
+msgstr "��仗仂仍�亰仂于舒�� �舒亰仆仂�于亠�仆�亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍� 于 �舒�舒�"
+
+#. All the tab options!
+#: src/gtkprefs.c:990
+msgid "Tab Options"
+msgstr "�舒�舒仄亠��� 于从仍舒亟仂从"
+
+#: src/gtkprefs.c:992
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "�仂从舒亰�于舒�� 亟亳舒仍仂亞亳 亳 �舒�� 于 仂从仆舒� �仂 于从仍舒亟从舒仄亳"
+
+#: src/gtkprefs.c:1007
+msgid "Show _close button on tabs"
+msgstr "�仂从舒亰�于舒�� 从仆仂仗从亳 _亰舒从���亳� 仆舒 于从仍舒亟从舒�"
+
+#: src/gtkprefs.c:1010
+msgid "Tab p_lacement:"
+msgstr "�舒�仗仂仍仂亢亠仆亳亠 于从仍舒亟仂从:"
+
+#: src/gtkprefs.c:1012
+msgid "Top"
+msgstr "�于亠���"
+
+#: src/gtkprefs.c:1013
+msgid "Bottom"
+msgstr "�仆亳亰�"
+
+#: src/gtkprefs.c:1014
+msgid "Left"
+msgstr "弌仍亠于舒"
+
+#: src/gtkprefs.c:1015
+msgid "Right"
+msgstr "弌仗�舒于舒"
+
+#: src/gtkprefs.c:1021
+msgid "New conversation _placement:"
+msgstr "�舒�仗仂仍仂亢亠仆亳亠 仆仂于�� 弍亠�亠亟:"
+
+#: src/gtkprefs.c:1072 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4837
 msgid "IP Address"
-msgstr "�亟�亠�"
+msgstr "IP-舒亟�亠�"
+
+#: src/gtkprefs.c:1074
+msgid "_Autodetect IP Address"
+msgstr "�仗�亠亟亠仍��� IP-舒亟�亠� 舒于�仂仄舒�亳�亠�从亳"
+
+#: src/gtkprefs.c:1083
+msgid "Public _IP:"
+msgstr "��弍仍亳�仆�亶 IP:"
+
+#: src/gtkprefs.c:1107
+msgid "Ports"
+msgstr "�仂���"
+
+#: src/gtkprefs.c:1110
+msgid "_Manually specify range of ports to listen on"
+msgstr "丕从舒亰舒�� 亟亳舒仗舒亰仂仆 �仍��舒亠仄�� 仗仂��仂于 _于���仆��"
 
 #: src/gtkprefs.c:1113
-#, fuzzy
-msgid "_Autodetect IP Address"
-msgstr "�亟�亠� 亟仂仄舒"
-
-#: src/gtkprefs.c:1122
-msgid "Public _IP:"
-msgstr ""
-
-#: src/gtkprefs.c:1146
-#, fuzzy
-msgid "Ports"
-msgstr "�仂��"
-
-#: src/gtkprefs.c:1149
-msgid "_Manually specify range of ports to listen on"
-msgstr ""
-
-#: src/gtkprefs.c:1152
-#, fuzzy
 msgid "_Start Port:"
-msgstr "_��从舒��:"
-
-#: src/gtkprefs.c:1159
-#, fuzzy
+msgstr "_�舒�舒仍�仆�亶 仗仂��:"
+
+#: src/gtkprefs.c:1120
 msgid "_End Port:"
-msgstr "_�仂��"
-
-#: src/gtkprefs.c:1207
-msgid "Proxy Type"
-msgstr "丐亳仗 Proxy"
-
-#: src/gtkprefs.c:1210
+msgstr "_�仂仆亠�仆�亶 仗仂��:"
+
+#: src/gtkprefs.c:1127
+msgid "Proxy Server"
+msgstr "��仂从�亳-�亠�于亠�"
+
+#: src/gtkprefs.c:1131
 msgid "No proxy"
-msgstr "��仂从�亳 仂������于�亠�"
-
-#: src/gtkprefs.c:1217
-msgid "Proxy Server"
-msgstr "Proxy �亠�于亠�"
-
-#: src/gtkprefs.c:1275
+msgstr "�亠� 仗�仂从�亳"
+
+#: src/gtkprefs.c:1193
 msgid "_User:"
-msgstr "�仂_仍�亰仂于舒�亠仍�:"
-
-#: src/gtkprefs.c:1331
+msgstr "�仂仍�亰仂于舒�亠仍�:"
+
+#: src/gtkprefs.c:1249
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1250
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1251
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1252
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1253
 msgid "Galeon"
-msgstr "�舒仍亠仂仆"
-
-#: src/gtkprefs.c:1336
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1254
 msgid "Firebird"
-msgstr ""
-
-#: src/gtkprefs.c:1337
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1255
 msgid "Firefox"
-msgstr ""
-
-#: src/gtkprefs.c:1338
-#, fuzzy
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1256
 msgid "Gnome Default"
-msgstr "�仂仄舒仆亟舒 GNOME Vi"
-
-#: src/gtkprefs.c:1347
+msgstr "��舒�亰亠� Gnome 仗仂 �仄仂仍�舒仆亳�"
+
+#: src/gtkprefs.c:1265
 msgid "Manual"
 msgstr "���亞仂亶"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1316
 msgid "Browser Selection"
 msgstr "��弍仂� 弍�舒�亰亠�舒"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1320
 msgid "_Browser:"
-msgstr "_��舒�亰亠�:"
-
-#: src/gtkprefs.c:1409
-#, fuzzy
+msgstr "��舒�亰亠�:"
+
+#: src/gtkprefs.c:1327
 msgid "_Open link in:"
-msgstr "_��从���� ���仍从� 于 弍�舒�亰亠�亠"
-
-#: src/gtkprefs.c:1411
-#, fuzzy
+msgstr "��从��于舒�� ���仍从� 于:"
+
+#: src/gtkprefs.c:1329
 msgid "Browser default"
-msgstr "��弍仂� 弍�舒�亰亠�舒"
-
-#: src/gtkprefs.c:1412
+msgstr "�仂 �仄仂仍�舒仆亳�"
+
+#: src/gtkprefs.c:1330
 msgid "Existing window"
-msgstr ""
-
-#: src/gtkprefs.c:1414
+msgstr "弌��亠��于���亠亠 仂从仆仂"
+
+#: src/gtkprefs.c:1332
 msgid "New tab"
-msgstr ""
-
-#: src/gtkprefs.c:1428
+msgstr "�仂于舒� 于从仍舒亟从舒"
+
+#: src/gtkprefs.c:1346
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3787,160 +3938,171 @@
 "_����仆��:\n"
 "(%s 亟仍� URL)"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1383
 msgid "Message Logs"
 msgstr "���仆舒仍� �仂仂弍�亠仆亳亶"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1386
 msgid "Log _Format:"
 msgstr "个仂�仄舒� _亢��仆舒仍舒:"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1389
 msgid "_Log all instant messages"
-msgstr "_���仆舒仍亳�仂于舒�� 于�亠 �仂仂弍�亠仆亳�"
-
-#: src/gtkprefs.c:1473
+msgstr "�舒仗亳��于舒�� 于�亠 �仂仂弍�亠仆亳�"
+
+#: src/gtkprefs.c:1391
 msgid "Log all c_hats"
-msgstr "���仆舒仍亳�仂于舒�� 于�亠 �舒��"
-
-#: src/gtkprefs.c:1476
+msgstr "�舒仗亳��于舒�� 于�亠 �舒��"
+
+#: src/gtkprefs.c:1394
 msgid "System Logs"
-msgstr "���仆舒仍 �亳��亠仄仆�� �仂仂弍�亠仆亳亶"
-
-#: src/gtkprefs.c:1478
+msgstr "弌亳��亠仄仆�亠 亢��仆舒仍�"
+
+#: src/gtkprefs.c:1396
 msgid "_Enable system log"
-msgstr ""
-
-#: src/gtkprefs.c:1481
+msgstr "�亠��亳 �亳��亠仄仆�亶 亢��仆舒仍"
+
+#: src/gtkprefs.c:1399
 msgid "Log when buddies _sign on/sign off"
-msgstr "�舒仗亳��于舒�� _仗仂亟从仍��亠仆亳�/仂�从仍��亠仆亳� �仂弍亠�亠亟仆亳从仂于"
-
-#: src/gtkprefs.c:1487
+msgstr "�舒仗亳��于舒��, 从仂亞亟舒 仗仂仍�亰仂于舒�亠仍亳 仗仂亟从仍��舒����/仂�从仍��舒����"
+
+#: src/gtkprefs.c:1405
 msgid "Log when buddies become _idle/un-idle"
-msgstr "�舒仗亳��于舒�� 亳亰仄亠仆亠仆亳� ��舒���舒 _弍亠亰亟亠亶��于亳� �仂弍亠�亠亟仆亳从仂于"
-
-#: src/gtkprefs.c:1493
+msgstr "�舒仗亳��于舒��, 从仂亞亟舒 仗仂仍�亰仂于舒�亠仍亳 仆舒�亳仆舒��/仗亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒��"
+
+#: src/gtkprefs.c:1411
 msgid "Log when buddies go away/come _back"
-msgstr "�舒仗亳��于舒�� _��仂亟/于仂亰于�舒�亠仆亳亠 �仂弍亠�亠亟仆亳从仂于"
-
-#: src/gtkprefs.c:1499
+msgstr "�舒仗亳��于舒��, 从仂亞亟舒 仗仂仍�亰仂于舒�亠仍亳 仂��仂亟��/于仂亰于�舒�舒����"
+
+#: src/gtkprefs.c:1417
 msgid "Log your _own signons/idleness/awayness"
-msgstr "�舒仗亳��于舒�� �仂弍��于亠仆仆�亶 _��仂亟/于仂亰于�舒�亠仆亳亠/弍亠亰亟亠亶��于亳亠"
-
-#: src/gtkprefs.c:1550
+msgstr "�舒仗亳��于舒�� �仂弍��于亠仆仆�亠 仗仂亟从仍��亠仆亳�/弍亠亰亟亠亶��于亳�/仂������于亳�"
+
+#: src/gtkprefs.c:1555
+msgid "Sound Selection"
+msgstr "��弍仂� 亰于�从舒"
+
+#: src/gtkprefs.c:1630
 msgid "Sound Options"
 msgstr "�舒���仂亶从亳 亰于�从舒"
 
-#: src/gtkprefs.c:1551
-#, fuzzy
-msgid "Sounds when you _log in"
-msgstr "_�亠亰 亰于�从舒 仗�亳 仗仂亟从仍��亠仆亳亳"
-
-#: src/gtkprefs.c:1553
-#, fuzzy
+#: src/gtkprefs.c:1631
 msgid "Sounds when conversation has _focus"
-msgstr "丕亟舒仍亳��, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� _仂从舒亰�于舒亠��� 于 �仂从��亠"
-
-#: src/gtkprefs.c:1555
+msgstr "�于�从亳, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 于 �仂从��亠"
+
+#: src/gtkprefs.c:1633
 msgid "_Sounds while away"
 msgstr "�于�从亳 于仂 于�亠仄� _仂������于亳�"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1637
 msgid "Sound Method"
-msgstr "弌仗仂�仂弍 亰于�从仂于仂亞仂 仂仗仂于亠�亠仆亳�"
-
-#: src/gtkprefs.c:1560
+msgstr "�亠�仂亟 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒"
+
+#: src/gtkprefs.c:1638
 msgid "_Method:"
 msgstr "_�亠�仂亟:"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1640
 msgid "Console beep"
 msgstr "弌亳亞仆舒仍 亟亳仆舒仄亳从仂仄"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1642
 msgid "Automatic"
 msgstr "�于�仂仄舒�亳�亠�从亳"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1649
 msgid "Command"
 msgstr "�仂仄舒仆亟舒"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1657
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"�仂仄舒仆亟舒 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒\n"
-"(%s 亰舒仄亠仆亳�� 仆舒 亳仄� �舒亶仍舒)"
-
-#: src/gtkprefs.c:1638
-msgid "_Sending messages removes away status"
-msgstr "_��仗�舒于从舒 �仂仂弍�亠仆亳亶 仗�亳于仂亟亳� 从 �仄亠仆亠 ��舒���舒 \"���仍\""
-
-#: src/gtkprefs.c:1640
+"�仂仄舒仆亟舒 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒:\n"
+"(%s 亟仍� 亳仄亠仆亳 �舒亶仍舒)"
+
+#: src/gtkprefs.c:1684
+msgid "Sound Events"
+msgstr "�于�从仂于�亠 �仂弍��亳�"
+
+#: src/gtkprefs.c:1735
+msgid "Play"
+msgstr "�仂�仗�仂亳亰于亠��亳"
+
+#: src/gtkprefs.c:1742
+msgid "Event"
+msgstr "弌仂弍��亳亠"
+
+#: src/gtkprefs.c:1761
+msgid "Test"
+msgstr "丐亠��"
+
+#: src/gtkprefs.c:1765
+msgid "Reset"
+msgstr "弌弍�仂�"
+
+#: src/gtkprefs.c:1769
+msgid "Choose..."
+msgstr "��弍�舒��..."
+
+#: src/gtkprefs.c:1793
 msgid "_Queue new messages when away"
-msgstr ""
-
-#: src/gtkprefs.c:1643
+msgstr "�仂仄亠�舒�� 仆仂于�亠 �仂仂弍�亠仆亳� 于 仂�亠�亠亟� 于仂 于�亠仄� 仂������于亳�"
+
+#: src/gtkprefs.c:1796
 msgid "Auto-response"
 msgstr "�于�仂仂�于亠��亳从"
 
-#: src/gtkprefs.c:1646
-msgid "Seconds before _resending:"
-msgstr "弌亠从�仆亟 亟仂 _仗亠�亠仗仂��仍舒:"
-
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1797
 msgid "_Send auto-response"
-msgstr "_�亠�亠亟舒于舒�� 舒于�仂仂�于亠�"
-
-#: src/gtkprefs.c:1651
+msgstr "��仗�舒于仍��� 舒于�仂仄舒�亳�亠�从亳亶 仂�于亠�"
+
+#: src/gtkprefs.c:1799
 msgid "_Only send auto-response when idle"
-msgstr "�亠�亠亟舒于舒�� 舒于�仂仂�于亠� _�仂仍�从仂 仗�亳 弍亠亰亟亠亶��于亳亳"
-
-#: src/gtkprefs.c:1653
-msgid "Send auto-response in _active conversations"
-msgstr "�亠�亠亟舒于舒�� 舒于�仂仂�于亠� 于 _于亠亟��亳亠�� 弍亠�亠亟�"
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
-#: src/protocols/yahoo/yahoo.c:2295
+msgstr "��仗�舒于仍��� 舒于�仂仄舒�亳�亠�从亳亶 仂�于亠� �仂仍�从仂 于仂 于�亠仄� 弍亠亰亟亠亶��于亳�"
+
+#: src/gtkprefs.c:1802 src/protocols/msn/msn.c:1156
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
+#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2549
+#: src/protocols/yahoo/yahoo_profile.c:653
 msgid "Idle"
 msgstr "�亠亰亟亠亶��于亳亠"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1803
 msgid "Idle _time reporting:"
-msgstr ""
-
-#: src/gtkprefs.c:1666
+msgstr "弌仂仂弍�亠仆亳亠 于�亠仄亠仆亳 弍亠亰亟亠亶��于亳�:"
+
+#: src/gtkprefs.c:1806
 msgid "Gaim usage"
 msgstr "��仗仂仍�亰仂于舒仆亳亠 Gaim"
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1809
 msgid "X usage"
 msgstr "��仗仂仍�亰仂于舒仆亳亠 X"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1811
 msgid "Windows usage"
 msgstr "��仗仂仍�亰仂于舒仆亳亠 仂从仂仆"
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1819
 msgid "Auto-away"
-msgstr "�于�仂���舒仆仂于仍亠仆亳亠 ��舒���舒 \"��仂��仍\""
-
-#: src/gtkprefs.c:1680
+msgstr "�于�仂-\"��仂��仍\""
+
+#: src/gtkprefs.c:1820
 msgid "Set away _when idle"
-msgstr ""
-
-#: src/gtkprefs.c:1684
+msgstr "丕��舒仆舒于仍亳于舒�� ��舒��� \"��仂��仍\" 舒于�仂仄舒�亳�亠�从亳"
+
+#: src/gtkprefs.c:1824
 msgid "_Minutes before setting away:"
-msgstr "_�亳仆�� 亟仂 亳亰仄亠仆亠仆亳� ��舒���舒 仆舒 '仂�仂��仍':"
-
-#: src/gtkprefs.c:1692
+msgstr "�亳仆�� 亟仂 ���舒仆仂于仍亠仆亳� ��舒���舒 \"��仂��仍\":"
+
+#: src/gtkprefs.c:1832
 msgid "Away m_essage:"
-msgstr "弌仂仂弍�亠仆亳亠 仂弍 _仂������于亳亳:"
-
-#: src/gtkprefs.c:1767
+msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳:"
+
+#: src/gtkprefs.c:1909
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3950,7 +4112,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1914
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3960,111 +4122,66 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:2147
 msgid "Load"
 msgstr "�舒亞��亰亳��"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:2161
 msgid "Summary"
-msgstr ""
-
-#: src/gtkprefs.c:2061
+msgstr "��舒�从仂亠 仂仗亳�舒仆亳亠"
+
+#: src/gtkprefs.c:2209
 msgid "Details"
 msgstr "�仂亟�仂弍仆仂��亳"
 
-#: src/gtkprefs.c:2188
-msgid "Sound Selection"
-msgstr "��弍仂� 亰于�从舒"
-
-#: src/gtkprefs.c:2295
-msgid "Play"
-msgstr "�仂�仗�."
-
-#: src/gtkprefs.c:2302
-msgid "Event"
-msgstr "弌仂弍��亳亠"
-
-#: src/gtkprefs.c:2321
-msgid "Test"
-msgstr "丐亠��"
-
-#: src/gtkprefs.c:2325
-msgid "Reset"
-msgstr "弌弍�仂�"
-
-#: src/gtkprefs.c:2329
-msgid "Choose..."
-msgstr "��弍�舒��"
-
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2354
 msgid "_Edit"
-msgstr "_�亰仄亠仆亳��"
-
-#: src/gtkprefs.c:2500
+msgstr "�亰仄亠仆亳��"
+
+#: src/gtkprefs.c:2390
 msgid "Interface"
 msgstr "�仆亠�仆亳亶 于亳亟"
 
-#: src/gtkprefs.c:2501
-msgid "Smiley Themes"
-msgstr "���仗仗� �仄舒亶仍亳从仂于"
-
-#: src/gtkprefs.c:2502
-msgid "Fonts"
-msgstr "丿�亳���"
-
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2393
 msgid "Message Text"
 msgstr "丐亠从�� �仂仂弍�亠仆亳�"
 
-#: src/gtkprefs.c:2504
+#: src/gtkprefs.c:2394
 msgid "Shortcuts"
-msgstr "�仂仄弍亳仆舒�亳亳 从仆仂仗仂从"
-
-#: src/gtkprefs.c:2507
-msgid "IMs"
-msgstr "弌仂仂弍�亠仆亳�"
-
-#: src/gtkprefs.c:2509
+msgstr "�仂���亳亠 从仍舒于亳�亳"
+
+#: src/gtkprefs.c:2395
+msgid "Smiley Themes"
+msgstr "丐亠仄� �仄舒亶仍亳从仂于"
+
+#: src/gtkprefs.c:2396
+msgid "Sounds"
+msgstr "�于�从亳"
+
+#: src/gtkprefs.c:2397
 msgid "Network"
-msgstr ""
-
-#: src/gtkprefs.c:2510
-msgid "Proxy"
-msgstr "��仂从�亳"
+msgstr "弌亠��"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2400
 msgid "Browser"
 msgstr "��舒�亰亠�"
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2402
 msgid "Logging"
-msgstr "���仆舒仍"
-
-#: src/gtkprefs.c:2516
-msgid "Sounds"
-msgstr "�于�从亳"
-
-#: src/gtkprefs.c:2517
-msgid "Sound Events"
-msgstr "�于�从仂于�亠 �仂弍��亳�"
-
-#: src/gtkprefs.c:2518
+msgstr "���仆舒仍�"
+
+#: src/gtkprefs.c:2403
 msgid "Away / Idle"
-msgstr "��仂��仍 / 仆亠舒从�亳于亠仆"
-
-#: src/gtkprefs.c:2519
+msgstr "�������于亳亠 / �亠亰亟亠亶��于亳亠"
+
+#: src/gtkprefs.c:2404
 msgid "Away Messages"
-msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳(Away)"
-
-#: src/gtkprefs.c:2522
-#, fuzzy
-msgid "Protocols"
-msgstr "��仂�仂从仂仍"
-
-#: src/gtkprefs.c:2523
+msgstr "弌仂仂弍�亠仆亳� 仂弍 仂������于亳亳"
+
+#: src/gtkprefs.c:2407
 msgid "Plugins"
-msgstr "�仂仗仂仍仆亠仆亳�"
+msgstr "�仂亟�仍亳"
 
 #: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
@@ -4072,92 +4189,95 @@
 
 #: src/gtkprivacy.c:78
 msgid "Allow only the users on my buddy list"
-msgstr "�舒亰�亠�亳�� 亟仂���仗 �仂仍�从仂 �仂弍亠�亠亟仆亳从舒仄 亳亰 于舒�亠亞仂 �仗亳�从舒"
+msgstr "�舒亰�亠�亳�� 亟仂���仗 �仂仍�从仂 仗仂仍�亰仂于舒�亠仍�仄 亳亰 �仗亳�从舒 从仂仆�舒从�仂于"
 
 #: src/gtkprivacy.c:79
 msgid "Allow only the users below"
-msgstr "�舒亰�亠�亳�� 亟仂���仗 于�弍�舒仆仆�仄 仗仂仍�亰仂于舒�亠仍�仄"
+msgstr "�舒亰�亠�亳�� 亟仂���仗 �仂仍�从仂 仗仂仍�亰仂于舒�亠仍�仄, �从舒亰舒仆仆�仄 仆亳亢亠"
 
 #: src/gtkprivacy.c:80
 msgid "Block all users"
 msgstr "�仍仂从亳�仂于舒�� 于�亠� 仗仂仍�亰仂于舒�亠仍亠亶"
 
 #: src/gtkprivacy.c:81
-#, fuzzy
 msgid "Block only the users below"
-msgstr "�舒仗�亠�亳��  亟仂���仗 亳亰 '�亠�仆仂亞仂 �仗亳�从舒'"
-
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+msgstr "�仍仂从亳�仂于舒�� �仂仍�从仂 仗仂仍�亰仂于舒�亠仍亠亶, �从舒亰舒仆仆�� 仆亳亢亠"
+
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
 msgid "Privacy"
 msgstr "�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:400
 msgid "Changes to privacy settings take effect immediately."
-msgstr "�亰仄亠仆亠仆亳�, 从舒�舒��亳亠�� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳, 于���仗舒�� 于 �亳仍� 仆亠仄亠亟仍亠仆仆仂."
+msgstr "�亰仄亠仆亠仆亳� 仆舒���仂亠从 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 于���仗舒�� 于 �亳仍� 仆亠仄亠亟仍亠仆仆仂."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:412
 msgid "Set privacy for:"
-msgstr "丕��舒仆仂于亳�� 仗�亳于舒� 亟仍�:"
-
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+msgstr "�舒���仂亳�� 从仂仆�亳亟亠仆�亳舒仍�仆仂��� 亟仍�:"
+
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
 msgid "Permit User"
-msgstr "�舒亰�亠�亳�� 仗仂仍�亰仂于舒�亠仍�"
-
-#: src/gtkprivacy.c:570
+msgstr "�仂仗���亳�� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/gtkprivacy.c:582
 msgid "Type a user you permit to contact you."
-msgstr ""
-
-#: src/gtkprivacy.c:571
+msgstr "丕从舒亢亳�亠 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� 亟仂仗��从舒亠�亠 从 仂弍�亠仆亳� � 于舒仄亳."
+
+#: src/gtkprivacy.c:583
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, � 从仂�仂��仄 �仂�亳�亠 ���舒仆仂于亳�� 从仂仆�舒从�."
-
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+msgstr ""
+"�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂仄� 于� �仂�亳�亠 亟舒�� 于仂亰仄仂亢仆仂��� 仂弍�舒���� � "
+"于舒仄亳."
+
+#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
 msgid "Permit"
-msgstr "�舒亰�亠�亳��"
-
-#: src/gtkprivacy.c:579
+msgstr "�仂仗���亳��"
+
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "�舒亰�亠�亳�� %s 亟仂���仗 从 于舒仄?"
-
-#: src/gtkprivacy.c:581
+msgstr "�仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
+
+#: src/gtkprivacy.c:593
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "�� �仂亞仍舒�仆� �舒亰�亠�亳�� '%s' 仂弍�舒���� � 于舒仄亳?"
-
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 仗仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
+
+#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
 msgid "Block User"
 msgstr "�仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:621
 msgid "Type a user to block."
-msgstr "�于亠亟亳�亠 亳仄� 弍仍仂从亳��亠仄仂亞仂 仗仂仍�亰仂于舒�亠仍�."
-
-#: src/gtkprivacy.c:610
+msgstr "丕从舒亢亳�亠 弍仍仂从亳��亠仄仂亞仂 仗仂仍�亰仂于舒�亠仍�."
+
+#: src/gtkprivacy.c:622
 msgid "Please enter the name of the user you wish to block."
-msgstr "�仂亢舒仍�亶��舒, 于于亠亟亳�亠 亳仄� 弍仍仂从亳��亠仄仂亞仂 仗仂仍�亰仂于舒�亠仍�."
-
-#: src/gtkprivacy.c:617
+msgstr "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 弍仍仂从亳�仂于舒��."
+
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Block %s?"
-msgstr "�仍仂从亳�仂于舒�� '%s'?"
-
-#: src/gtkprivacy.c:619
+msgstr "�仍仂从亳�仂于舒�� %s?"
+
+#: src/gtkprivacy.c:631
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "�� �仂亞仍舒�仆� 亰舒弍仍仂从亳�仂于舒�� '%s'?"
+msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍仍仂从亳�仂于舒�� %s?"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
+#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "�舒"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "�亠�"
 
@@ -4165,34 +4285,27 @@
 msgid "Apply"
 msgstr "��亳仄亠仆亳��"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
+#: src/protocols/silc/util.c:311
 msgid "Close"
 msgstr "�舒从����"
 
-#: src/gtkroomlist.c:322
-#, fuzzy
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr "�� 仆亠 仗仂亟从仍��亠仆� 仗仂 仗�仂�仂从仂仍舒仄 � 仗仂亟亟亠�亢从仂亶 �舒�仂于."
-
-#: src/gtkroomlist.c:335
-#, fuzzy
+#: src/gtkroomlist.c:330
 msgid "Room List"
-msgstr "�������于�亠� 于 �仗亳�从亠"
+msgstr "弌仗亳�仂从 从仂仄仆舒�"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:402
 msgid "_Get List"
-msgstr ""
+msgstr "�仂仍��亳�� �仗亳�仂从"
 
 #: src/gtksound.c:62
 msgid "Buddy logs in"
-msgstr "��仂亟 �仂弍亠�亠亟仆亳从舒"
+msgstr "�仂仍�亰仂于舒�亠仍� 于�仂亟亳� 于 �亠��"
 
 #: src/gtksound.c:63
 msgid "Buddy logs out"
-msgstr "���仂亟 �仂弍亠�亠亟仆亳从舒"
+msgstr "�仂仍�亰仂于舒�亠仍� 于��仂亟亳� 亳亰 �亠�亳"
 
 #: src/gtksound.c:64
 msgid "Message received"
@@ -4200,7 +4313,7 @@
 
 #: src/gtksound.c:65
 msgid "Message received begins conversation"
-msgstr "��亳仆���仄 �仂仂弍�亠仆亳亠仄 仆舒�亳仆舒亠��� 弍亠�亠亟�"
+msgstr "��亳仆��仂 �仂仂弍�亠仆亳亠, 仆舒�亳仆舒��亠亠 弍亠�亠亟�"
 
 #: src/gtksound.c:66
 msgid "Message sent"
@@ -4208,119 +4321,126 @@
 
 #: src/gtksound.c:67
 msgid "Person enters chat"
-msgstr "弌仂弍亠�亠亟仆亳从 于�仂亟亳� 于 �舒�"
+msgstr "�仂仍�亰仂于舒�亠仍� 于�仂亟亳� 于 �舒�"
 
 #: src/gtksound.c:68
 msgid "Person leaves chat"
-msgstr "弌仂弍亠�亠亟仆亳从 ��仂亟亳� 亳亰 �舒�舒"
+msgstr "�仂仍�亰仂于舒�亠仍� 于��仂亟亳� 亳亰 �舒�舒"
 
 #: src/gtksound.c:69
 msgid "You talk in chat"
-msgstr "�� 仗亳�亠�亠 �仂仂弍�亠仆亳亠 于 �舒�"
+msgstr "�� 亞仂于仂�亳�亠 于 �舒�亠"
 
 #: src/gtksound.c:70
 msgid "Others talk in chat"
-msgstr "���亞亳亠 仗亳��� �仂仂弍�亠仆亳� 于 �舒�"
+msgstr "���亞亳亠 亞仂于仂��� 于 �舒�亠"
 
 #: src/gtksound.c:73
 msgid "Someone says your name in chat"
-msgstr "��仂-�仂 �仗仂仄�仆�仍 于舒�亠 亳仄� 于 �舒�亠"
-
-#: src/gtksound.c:158
+msgstr "��仂-�仂 仆舒亰于舒仍 于舒�亠 亳仄� 于 �舒�亠"
+
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "�亠 �亟舒���� 于仂�仗�仂亳于亠��亳 亰于�从 亰舒 仂������于亳亠仄 �从舒亰舒仆仆仂亞仂 �舒亶仍舒 (%s)."
-
-#: src/gtksound.c:174
+msgstr ""
+"�亠于仂亰仄仂亢仆仂 于仂�仗�仂亳于亠��亳 亰于�从, �舒从 从舒从 �从舒亰舒仆仆�亶 �舒亶仍 (%s) 仆亠 ���亠��于�亠�."
+
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
-
-#: src/gtksound.c:186
+"�亠于仂亰仄仂亢仆仂 于仂�仗�仂亳亰于亠��亳 亰于�从, �舒从 从舒从 于�弍�舒仆 仄亠�仂亟 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒 "
+"'Command', 仆仂 从仂仄舒仆亟舒 仆亠 弍�仍舒 亰舒亟舒仆舒."
+
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
-
-#: src/gtkutils.c:133
+"�亠于仂亰仄仂亢仆仂 于仂�仗�仂亳亰于亠��亳 亰于�从, �舒从 从舒从 亰舒亟舒仆仆舒� 从仂仄舒仆亟舒 仆亠 仄仂亞仍舒 弍��� "
+"于�仗仂仍仆亠仆舒: %s"
+
+#: src/gtkutils.c:149
 msgid "Can't save icon file to disk."
-msgstr "�亠 �亟舒���� �仂��舒仆亳�� 仗亳从�仂亞�舒仄仄� 仆舒 亟亳�从."
-
-#: src/gtkutils.c:168
+msgstr "�亠 �亟舒���� �仂��舒仆亳�� �舒亶仍 亰仆舒�从舒 仆舒 亟亳�从."
+
+#: src/gtkutils.c:184
 msgid "Save Icon"
-msgstr "弌仂��舒仆亳�� 仗亳从�仂亞�舒仄仄�"
+msgstr "弌仂��舒仆亳�� 亰仆舒�仂从"
 
 #: src/log.c:106
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: src/log.c:476
+#: src/log.c:486
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:561
+#: src/log.c:571
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:563
+#: src/log.c:573
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:614 src/log.c:800
+#: src/log.c:624 src/log.c:811
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:634 src/log.c:823
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: src/log.c:661
+#: src/log.c:671
 msgid "HTML"
-msgstr ""
-
-#: src/log.c:745
+msgstr "HTML"
+
+#: src/log.c:756
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr ""
-
-#: src/log.c:845
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+
+#: src/log.c:856
 msgid "Plain text"
-msgstr ""
-
-#: src/main.c:155
-#, fuzzy
+msgstr "��仂��仂亶 �亠从��"
+
+#: src/main.c:153
 msgid "Please create an account."
-msgstr "�仂亢舒仍�亶��舒, 于于亠亟亳�亠 于舒�亠 亳仄�."
-
-#: src/main.c:237
+msgstr "弌仂亰亟舒亶�亠 ����仆�� 亰舒仗亳��."
+
+#: src/main.c:235
 msgid "Login"
 msgstr "��仂亟"
 
-#: src/main.c:255
-#, fuzzy
-msgid "<b>Screen Name:</b>"
-msgstr "�仂仍�亰仂于舒�亠仍� (UIN):"
-
-#: src/main.c:269
-#, fuzzy
-msgid "<b>Password:</b>"
-msgstr "�舒�仂仍�"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "�仂亶�亳"
+#: src/main.c:253
+msgid "<b>_Account:</b>"
+msgstr "<b>丕���仆舒� 亰舒仗亳��:</b>"
+
+#: src/main.c:267
+msgid "<b>_Password:</b>"
+msgstr "<b>�舒�仂仍�:</b>"
+
+#. And now for the buttons
+#: src/main.c:284
+msgid "_Accounts"
+msgstr "丕���仆�亠 亰舒仗亳�亳"
+
+#: src/main.c:290
+msgid "_Preferences"
+msgstr "�舒���仂亶从亳"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4338,40 +4458,59 @@
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
 msgstr ""
+"Gaim %s\n"
+"Usage: %s [������丐�]...\n"
+"\n"
+"  -a, --acct          于�于亠��亳 仂从仆仂 �亠亟舒从�仂�舒 ����仆�� 亰舒仗亳�亠亶\n"
+"  -w, --away[=弌���乂]  ���舒仆仂于亳�� ��舒��� \"��仂��仍\" 仗仂�仍亠 于�仂亟舒 "
+"(仆亠仂弍�亰舒�亠仍�仆�亶 \n"
+"                      舒�亞�仄亠仆� 弌���乂 �从舒亰�于舒亠� 亳仄� �仂仂弍�亠仆亳� 仂弍 仂������于亳亳)\n"
+"  -l, --login[=��亊]   于仂亶�亳 舒于�仂仄舒�亳�亠�从亳 (仆亠仂弍�亰舒�亠仍�仆�亶 舒�亞�仄亠仆� ��亊 "
+"�从舒亰�于舒亠�\n"
+"                      仂亟仆� 亳仍亳 仆亠�从仂仍�从仂 ����仆�� 亰舒仗亳�亠亶, �舒亰亟亠仍�仆仆�� "
+"亰舒仗���仄亳)\n"
+"  -n, --loginwin      仆亠 于�仂亟亳�� 舒于�仂仄舒�亳�亠�从亳; 于�于亠��亳 仂从仆仂 于�仂亟舒\n"
+"  -u, --user=��亊      亳�仗仂仍�亰仂于舒�� ����仆�� 亰舒仗亳�� ��亊\n"
+"  -c, --config=��丐    亳�仗仂仍�亰仂于舒�� 从舒�舒仍仂亞 ��丐 亟仍� �舒亶仍仂于 从仂仆�亳亞��舒�亳亳\n"
+"  -d, --debug         于�于仂亟亳�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 仆舒 ��舒仆亟舒��仆�亶 于�于仂亟\n"
+"  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
+"  -h, --help          仗仂从舒亰舒�� ��� �仗�舒于从� 亳 于�亶�亳\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim揃%s.揃�舒弍亠�亳�亠 `%s揃-h'揃亟�仍 仗仂仍��亠仆亳� 弍仂仍亠亠 仗仂亟�仂弍仆仂亶 亳仆�仂�仄舒�亳亳.\n"
-
-#: src/plugin.c:277
+msgstr "Gaim %s. �舒弍亠�亳�亠 `%s -h' 亟仍� 仗仂仍��亠仆亳� 弍仂仍亠亠 仗仂仍仆仂亶 亳仆�仂�仄舒�亳亳.\n"
+
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-
-#: src/plugin.c:282 src/plugin.c:310
+"�亠仂弍�仂亟亳仄�亶 仄仂亟�仍� %s 仆亠 弍�仍 仆舒亶亟亠仆. 丕��舒仆仂于亳�亠 ��仂� 仄仂亟�仍� 亳 仗仂仗�仂弍�亶�亠 "
+"�仆仂于舒."
+
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
-msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� ��仂� 仄仂亟�仍�."
-
-#: src/plugin.c:306
+msgstr "Gaim 仆亠 �亟舒仍仂�� 亰舒亞��亰亳�� 于舒� 仄仂亟�仍�."
+
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr ""
+msgstr "�亠仂弍�仂亟亳仄�亶 仄仂亟�仍� %s 仆亠 �亟舒仍仂�� 亰舒亞��亰亳��."
 
 #: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
-msgstr ""
+msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 仗仂 �仄仂仍�舒仆亳�"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
-#: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
+#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Available"
 msgstr "�仂���仗亠仆"
 
@@ -4381,14 +4520,14 @@
 
 #: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
-msgstr "��仂�亠仍 �仂仍�从仂 亟仍� 亟��亰亠亶"
-
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+msgstr "��仂��仍 �仂仍�从仂 亟仍� 亟��亰亠亶"
+
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
+#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
+#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2547
+#: src/protocols/yahoo/yahoo.c:2922 src/protocols/yahoo/yahoo.c:3027
 msgid "Invisible"
 msgstr "�亠于亳亟亳仄�亶"
 
@@ -4404,16 +4543,16 @@
 msgid "Unable to resolve hostname."
 msgstr "�亠� 于仂亰仄仂亢仆仂��亳 仂仗�亠亟亠仍亳�� 亳仄� �仂��舒."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
 msgid "Unable to connect to server."
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄."
 
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:104
+#: src/protocols/jabber/jabber.c:105
 msgid "Invalid response from server."
-msgstr "��亳弍仂�仆�亶 仂�于亠� �亠�于亠�舒"
+msgstr "�亠亟仂仗���亳仄�亶 仂�从仍亳从 仂� �亠�于亠�舒."
 
 #: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
@@ -4425,262 +4564,272 @@
 
 #: src/protocols/gg/gg.c:151
 msgid "Authentication failed."
-msgstr "�于�仂�亳亰舒�亳� 仗�仂于舒仍亠仆舒."
+msgstr "�于�仂�亳亰舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂."
 
 #: src/protocols/gg/gg.c:154
 msgid "Unknown Error Code."
 msgstr "�亠亳亰于亠��仆�亶 从仂亟 仂�亳弍从亳."
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:253
 #, c-format
 msgid "Status: %s"
 msgstr "弌�舒���: %s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:406
 msgid "Could not connect"
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:413
 msgid "Unable to read socket"
-msgstr "�亠� 于仂亰仄仂亢仆仂��亳 仗�仂�亳�舒�� �仂从亠�"
+msgstr "�亠 �亟舒���� 仗�仂�亠��� �仂从亠�"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2200
+#: src/protocols/yahoo/yahoo.c:2231 src/protocols/yahoo/yahoo.c:2294
+#: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
-msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
-
-#: src/protocols/gg/gg.c:418
+msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠."
+
+#: src/protocols/gg/gg.c:616
 msgid "Reading data"
 msgstr "丼�亠仆亳亠 亟舒仆仆��"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:619
 msgid "Balancer handshake"
-msgstr "�舒仍舒仆�亳�仂于舒�仆舒� ���舒仆仂于从舒 �于�亰亳"
-
-#: src/protocols/gg/gg.c:424
+msgstr "弌�舒弍亳仍亳亰亳����亠亠 �仂亞仍舒�仂于舒仆亳亠"
+
+#: src/protocols/gg/gg.c:622
 msgid "Reading server key"
-msgstr "丼亳�舒亠��� 从仍�� �亠�于亠�舒"
-
-#: src/protocols/gg/gg.c:427
+msgstr "丼�亠仆亳亠 从仍��舒 �亠�于亠�舒"
+
+#: src/protocols/gg/gg.c:625
 msgid "Exchanging key hash"
-msgstr "�弍仄亠仆舒 从仍��舒仄亳"
-
-#: src/protocols/gg/gg.c:437
+msgstr "�弍仄亠仆 ���舒仄亳 从仍��亠亶"
+
+#: src/protocols/gg/gg.c:635
 msgid "Critical error in GG library\n"
 msgstr "��亳�亳�亠�从舒� 仂�亳弍从舒 于 弍亳弍仍亳仂�亠从亠 GG\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
-msgstr "弌仂亠亟亳仆亠仆亳亠 � %s 仗�仂于舒仍亳仍仂��"
-
-#: src/protocols/gg/gg.c:503
+msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � %s"
+
+#: src/protocols/gg/gg.c:701
 msgid "Unable to ping server"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:713
 msgid "Send as message"
 msgstr "��仗�舒于亳�� 从舒从 �仂仂弍�亠仆亳亠"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:718
 msgid "Looking up GG server"
 msgstr "�仂亳�从 GG �亠�于亠�舒"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:721
 msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "丕从舒亰舒仆 仆亠于亠�仆�亶 Gadu-Gadu UIN"
-
-#: src/protocols/gg/gg.c:570
+msgstr "丕从舒亰舒仆 仆亠亟仂仗���亳仄�亶 Gadu-Gadu UIN"
+
+#: src/protocols/gg/gg.c:768
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-msgstr "�� 仗��舒亠�亠�� 仗亠�亠亟舒�� �仂仂弍�亠仆亳亠 仆舒 仆亠从仂��亠从�仆�亶 Gadu-Gadu UIN!"
-
-#: src/protocols/gg/gg.c:632
+msgstr "�� 仗��舒亠�亠�� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 仆舒 仆亠亟仂仗���亳仄�亶 Gadu-Gadu UIN."
+
+#: src/protocols/gg/gg.c:835
 msgid "Couldn't get search results"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� �亠亰�仍��舒�� 仗仂亳�从舒"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Search Engine"
 msgstr "�仂亳�从仂于舒� �亳��亠仄舒 Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:866
 msgid "Active"
 msgstr "�从�亳于亠仆"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "�仄�"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
+#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "个舒仄亳仍亳�"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1622
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
 msgid "Nick"
 msgstr "��亠于亟仂仆亳仄"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
-#, fuzzy
+#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
 msgid "Birth Year"
 msgstr "�仂亟 �仂亢亟亠仆亳�"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
+#: src/protocols/gg/gg.c:904
 msgid "Sex"
 msgstr "�仂仍"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "�仂�仂亟"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
+#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
+#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
+#: src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:785
+#: src/protocols/yahoo/yahoo_profile.c:837
+#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
-msgstr "�仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠"
-
-#: src/protocols/gg/gg.c:744
+msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
+
+#: src/protocols/gg/gg.c:951
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
-msgstr "弌仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 仆舒 �亠�于亠�亠 Gadu-Gadu 仆亠 仂弍仆舒��亢亠仆."
-
-#: src/protocols/gg/gg.c:752
+msgstr "�亠� �仗亳�从舒 从仂仆�舒从�仂于, �仂��舒仆亠仆仆仂亞仂 仆舒 �亠�于亠�亠 Gadu-Gadu."
+
+#: src/protocols/gg/gg.c:959
 msgid "Couldn't Import Buddy List from Server"
-msgstr "�亠 �亟舒���� 仗仂仍��亳�� �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 � �亠�于亠�舒"
-
-#: src/protocols/gg/gg.c:815
+msgstr "�亠 �亟舒���� 亳仄仗仂��亳�仂于舒�� �仗亳�仂从 从仂仆�舒从�仂于 � �亠�于亠�舒"
+
+#: src/protocols/gg/gg.c:1021
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
-msgstr "弌仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 ��仗亠�仆仂 仗亠�亠亟舒仆 仆舒 �亠�于亠� Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:823
+msgstr "弌仗亳�仂从 从仂仆�舒从�仂于 ��仗亠�仆仂 仗亠�亠亟舒仆 仆舒 �亠�于亠� Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:1029
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-msgstr "�亠 �亟舒���� 仗亠�亠亟舒�� �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 仆舒 �亠�于亠� Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:831
+msgstr "�亠 �亟舒���� 仗亠�亠亟舒�� �仗亳�仂从 从仂仆�舒从�仂于 仆舒 �亠�于亠� Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:1037
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
-msgstr "弌仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 ��仗亠�仆仂 �亟舒仍�仆 � �亠�于亠�舒 Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:839
+msgstr "弌仗亳�仂从 从仂仆�舒从�仂于 ��仗亠�仆仂 �亟舒仍�仆 � �亠�于亠�舒 Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:1045
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-msgstr "�亠 �亟舒���� �亟舒仍亳�� �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 � �亠�于亠�舒 Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:847
+msgstr "�亠 �亟舒���� �亟舒仍亳�� �仗亳�仂从 从仂仆�舒从�仂于 � �亠�于亠�舒 Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:1054
 msgid "Password changed successfully"
 msgstr "�舒�仂仍� ��仗亠�仆仂 亳亰仄亠仆�仆"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1061
 msgid "Password couldn't be changed"
 msgstr "�舒�仂仍� 仆亠 仄仂亢亠� 弍��� 亳亰仄亠仆�仆"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1180
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "��亳弍从舒 �于�亰亳 � �亠�于亠�仂仄 Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
-
-#: src/protocols/gg/gg.c:1000
+"Gaim 仆亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 于舒� 亰舒仗�仂� 亳亰-亰舒 仗�仂弍仍亠仄� �仂 �于�亰�� � HTTP-"
+"�亠�于亠�仂仄 Gadu-Gadu. �仂于�仂�亳�亠 仗仂仗��从� 仗仂亰亢亠."
+
+#: src/protocols/gg/gg.c:1210
 msgid "Unable to import Gadu-Gadu buddy list"
-msgstr "�亠 �亟舒���� 亳仄仗仂��亳�仂于舒�� �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1001
+msgstr "�亠 �亟舒���� 亳仄仗仂��亳�仂于舒�� �仗亳�仂从 从仂仆�舒从�仂于 Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:1211
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
-"Gaim 仆亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亠�于亠�仂仄 Gadu-Gadu 亳 仗仂仍��亳�� �仗亳�仂从 "
-"�仂弍亠�亠亟仆亳从仂于. �仂仗�仂弍�亶�亠 仗仂亰亢亠."
-
-#: src/protocols/gg/gg.c:1074
+"Gaim 仆亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亠�于亠�仂仄 �仗亳�从舒 从仂仆�舒从�仂于 Gadu-Gadu. �仂于�仂�亳�亠 "
+"仗仂仗��从� 仗仂亰亢亠."
+
+#: src/protocols/gg/gg.c:1284
 msgid "Couldn't export buddy list"
-msgstr "�亠 �亟舒���� �从�仗仂��亳�仂于舒�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
-
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+msgstr "�亠 �亟舒���� �从�仗仂��亳�仂于舒�� �仗亳�仂从 从仂仆�舒从�仂于"
+
+#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
-"gaim 仆亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亠�于亠�仂仄 亳 仗仂仍��亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于. "
-"�仂仗�仂弍�亶�亠 仗仂亰亢亠"
-
-#: src/protocols/gg/gg.c:1097
+"Gaim 仆亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亠�于亠�仂仄 �仗亳�从舒 从仂仆�舒从�仂于. �仂于�仂�亳�亠 仗仂仗��从� "
+"仗仂亰亢亠."
+
+#: src/protocols/gg/gg.c:1307
 msgid "Unable to delete Gadu-Gadu buddy list"
-msgstr "�亠 �亟舒���� �亟舒仍亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1146
+msgstr "�亠 �亟舒���� �亟舒仍亳�� �仗亳�仂从 从仂仆�舒从�仂于 Gadu-Gadu"
+
+#: src/protocols/gg/gg.c:1358
 msgid "Unable to access directory"
-msgstr "�亠� 亟仂���仗舒 从 从舒�舒仍仂亞�"
-
-#: src/protocols/gg/gg.c:1147
+msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亟仂���仗 从 从舒�舒仍仂亞�"
+
+#: src/protocols/gg/gg.c:1359
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
-
-#: src/protocols/gg/gg.c:1180
+"Gaim 仆亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 仗仂亳�从 于 从舒�舒仍仂亞亠, 仗仂�仂仄� ��仂 仆亠 �亟舒仍仂�� "
+"�仂亠亟亳仆亳���� � �亠�于亠�仂仄 从舒�舒仍仂亞舒. �仂于�仂�亳�亠 仗仂仗��从� 仗仂亰亢亠."
+
+#: src/protocols/gg/gg.c:1393
 msgid "Unable to change Gadu-Gadu password"
 msgstr "�亠 �亟舒���� �仄亠仆亳�� 仗舒�仂仍� Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1394
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
-
-#: src/protocols/gg/gg.c:1198
+"Gaim 仆亠 �亟舒仍仂�� �仄亠仆亳�� 于舒� 仗舒�仂仍� 亳亰-亰舒 仂�亳弍从亳 �仂亠亟亳仆亠仆亳� � �亠�于亠�仂仄 Gadu-"
+"Gadu. �仂于�仂�亳�亠 仗仂仗��从� 仗仂亰亢亠."
+
+#: src/protocols/gg/gg.c:1410
 msgid "Directory Search"
 msgstr "�仂亳�从 于 从舒�舒仍仂亞亠"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
-#: src/protocols/toc/toc.c:1546
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "弌仄亠仆亳�� 仗舒�仂仍�"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1419
 msgid "Import Buddy List from Server"
-msgstr "�仄仗仂��亳�仂于舒�� �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 � �亠�于亠�舒"
-
-#: src/protocols/gg/gg.c:1221
+msgstr "�仄仗仂��亳�仂于舒�� �仗亳�仂从 从仂仆�舒从�仂于 � �亠�于亠�舒"
+
+#: src/protocols/gg/gg.c:1423
 msgid "Export Buddy List to Server"
-msgstr "亅从�仗仂��亳�仂于舒�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 仆舒 �亠�于亠�"
-
-#: src/protocols/gg/gg.c:1227
+msgstr "亅从�仗仂��亳�仂于舒�� �仗亳�仂从 从仂仆�舒从�仂于 仆舒 �亠�于亠�"
+
+#: src/protocols/gg/gg.c:1427
 msgid "Delete Buddy List from Server"
-msgstr "丕亟舒仍亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 � �亠�于亠�舒"
-
-#: src/protocols/gg/gg.c:1260
+msgstr "丕亟舒仍亳�� �仗亳�仂从 从仂仆�舒从�仂于 � �亠�于亠�舒"
+
+#: src/protocols/gg/gg.c:1460
 msgid "Unable to access user profile."
-msgstr "�亠� 亟仂���仗舒 从 仗�仂�亳仍� 仗仂仍�亰仂于舒�亠仍�."
-
-#: src/protocols/gg/gg.c:1261
+msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亟仂���仗 从 仗�仂�亳仍� 仗仂仍�亰仂于舒�亠仍�."
+
+#: src/protocols/gg/gg.c:1461
 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 仆亠 �亟舒仍仂�� 仗仂仍��亳�� 亟仂���仗 从 仗�仂�亳仍� ��仂亞仂 仗仂仍�亰仂于舒�亠仍� 亳亰-亰舒 仂�亳弍从亳 "
+"�仂亠亟亳仆亠仆亳� � �亠�于亠�仂仄 从舒�舒仍仂亞舒. �仂于�仂�亳�亠 仗仂仗��从� 仗仂亰亢亠."
 
 #. *< api_version
 #. *< type
@@ -4693,46 +4842,44 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Gadu-Gadu"
 
 #: src/protocols/icq/gaim_icq.c:224
 msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr ""
+msgstr "Gaim ��仂仍从仆�仍�� � 仂�亳弍从仂亶 �仂亠亟亳仆亠仆亳� � �亠�于亠�仂仄 ICQ."
 
 #: src/protocols/icq/gaim_icq.c:294
 #, c-format
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-msgstr "�仂仍�亰仂于舒�亠仍� %s (%s%s%s%s%s) 仗�仂�亳� �舒�亠亶 舒于�仂�亳亰舒�亳亳."
-
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+msgstr "�仂仍�亰仂于舒�亠仍� %s (%s%s%s%s%s) �仂�亠�, ��仂弍� 于� 舒于�仂�亳亰仂于舒仍亳 亠亞仂."
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:231
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:6100
 msgid "Authorize"
 msgstr "�于�仂�亳亰仂于舒��"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
+#: src/protocols/oscar/oscar.c:6101
 msgid "Deny"
-msgstr "�舒仗�亠�亳��"
+msgstr "��从舒亰舒��"
 
 #: src/protocols/icq/gaim_icq.c:310
 msgid "Send message through server"
-msgstr "��仗�舒于亳�� �亠�亠亰 �亠�于亠�"
+msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠 �亠�亠亰 �亠�于亠�"
 
 #: src/protocols/icq/gaim_icq.c:352
 msgid "Connecting..."
-msgstr "弌仂亠亟亳仆�亠仄��..."
-
-#: src/protocols/icq/gaim_icq.c:497
+msgstr "弌仂亠亟亳仆亠仆亳亠..."
+
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Nick:"
 msgstr "��亠于亟仂仆亳仄:"
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:499
 msgid "Gaim User"
 msgstr "�仂仍�亰仂于舒�亠仍� Gaim"
 
@@ -4741,97 +4888,91 @@
 msgid "Unknown command: %s"
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒: %s"
 
-#: src/protocols/irc/cmds.c:137
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-msgstr ""
-
-#: src/protocols/irc/cmds.c:146
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-
-#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "�亠从��舒� �亠仄舒: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "丐亠仄舒 仆亠 亰舒亟舒仆舒"
 
 #: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
+#: src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/yahoo/yahoo_filexfer.c:228
 msgid "File Transfer Aborted"
-msgstr "�亠�亠亟舒�舒 �舒亶仍舒 仂�仄亠仆亠仆舒"
+msgstr "�亠�亠亟舒�舒 �舒亶仍舒 仗�亠�于舒仆舒"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
-msgstr ""
-
-#: src/protocols/irc/irc.c:73
+msgstr "Gaim 仆亠 �亟舒仍仂�� 仂�从���� 仗仂�� 亟仍� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�."
+
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
-msgstr ""
-
-#: src/protocols/irc/irc.c:73
+msgstr "��亳弍从舒 仗仂从舒亰舒 MOTD"
+
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
-msgstr ""
-
-#: src/protocols/irc/irc.c:74
+msgstr "MOTD 仆亠 亟仂���仗仆仂"
+
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
-msgstr ""
-
-#: src/protocols/irc/irc.c:77
+msgstr "�亠� MOTD, �仂仂�仆亠��仆仆仂亞仂 � ��亳仄 �仂亠亟亳仆亠仆亳亠仄."
+
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
-msgstr ""
-
-#: src/protocols/irc/irc.c:140
+msgstr "MOTD 亟仍� %s"
+
+#: src/protocols/irc/irc.c:141
 msgid "View MOTD"
-msgstr ""
-
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
-#: src/protocols/yahoo/yahoo.c:2456
+msgstr "��仂�仄仂��亠�� MOTD"
+
+#. FIXME: remove this when the ui does it for us.
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
+#: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
+#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2752
 msgid "Send File"
 msgstr "��仗�舒于亳�� �舒亶仍"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
 msgid "_Channel:"
-msgstr "_�舒仆舒仍:"
-
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+msgstr "�舒仆舒仍:"
+
+#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
 msgid "_Password:"
-msgstr "_�舒�仂仍�:"
-
-#: src/protocols/irc/irc.c:193
+msgstr "�舒�仂仍�:"
+
+#: src/protocols/irc/irc.c:207
 msgid "IRC nicks may not contain whitespace"
-msgstr ""
-
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+msgstr "��亠于亟仂仆亳仄� IRC 仆亠 仄仂亞�� �仂亟亠�亢舒�� 仗�仂弍亠仍�"
+
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
-msgstr "�仂亟从仍��亳仍��: %s"
-
-#: src/protocols/irc/irc.c:221
+msgstr "�仂亟从仍��亠仆亳亠: %s"
+
+#: src/protocols/irc/irc.c:235
 msgid "Couldn't create socket"
-msgstr "�亠 �亟舒仍仂�� �仂亰亟舒�� �仂从亠�"
-
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂从亠�"
+
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
+#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
+msgid "Couldn't connect to host"
+msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亰仍仂仄"
+
+#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "��亳弍从舒 ��亠仆亳�"
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
-#, fuzzy
+#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
+#: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
-msgstr "��亳仄亠仆亳��"
-
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
-#, fuzzy
+msgstr "�仂仍�亰仂于舒�亠仍亳"
+
+#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "丐亠仄舒"
 
@@ -4844,34 +4985,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:642
 msgid "IRC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:643
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "�舒亳弍仂仍亠亠 \"于仄亠仆�亠仄�亶\" 仗�仂�仂从仂仍 IRC"
-
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
+msgstr "�舒亳仄亠仆亠亠 仗舒��亳于�亶 仗�仂�仂从仂仍 IRC"
+
+#: src/protocols/irc/irc.c:662 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1555 src/protocols/napster/napster.c:641
+#: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "弌亠�于亠�"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:665 src/protocols/jabber/jabber.c:1576
+#: src/protocols/msn/msn.c:1728 src/protocols/napster/napster.c:646
+#: src/protocols/silc/silc.c:1362 src/protocols/trepia/trepia.c:1294
 msgid "Port"
 msgstr "�仂��"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:668 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "�仂亟亳�仂于从舒"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:671 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
+#: src/protocols/silc/ops.c:931
 msgid "Username"
-msgstr "弌仂弍亠�亠亟仆亳从"
+msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
 
 #: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
@@ -4880,36 +5023,37 @@
 #: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
-msgstr "�舒� 于�从亳仆�仍亳 亳亰 %s."
+msgstr "�舒� 于�亞仆舒仍亳 亳亰 %s."
 
 #: src/protocols/irc/msgs.c:110
 msgid "Banned"
-msgstr "��从亳仆�仍亳"
+msgstr "��亞仆舒仆"
 
 #: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
-msgstr ""
+msgstr " <i>(ircop)</i>"
 
 #: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+msgstr " <i>(亳亟亠仆�亳�亳�亳�仂于舒仆)</i>"
+
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Realname"
 msgstr "�舒��仂��亠亠 亳仄�"
 
 #: src/protocols/irc/msgs.c:202
 msgid "Currently on"
-msgstr "� 仆舒��仂��亠亠 于�亠仄� "
+msgstr "弌亠亶�舒� 仆舒"
 
 #: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
-msgstr ""
+msgstr "<b>�亠亰亟亠亶��于�亠�:</b> %s<br>"
 
 #: src/protocols/irc/msgs.c:209
 msgid "Online since"
-msgstr "� �亠�亳"
+msgstr "� �亠�亳 �"
 
 #: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
@@ -4918,12 +5062,12 @@
 #: src/protocols/irc/msgs.c:219
 #, c-format
 msgid "Buddy Information for %s"
-msgstr "�仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠 '%s'"
+msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 %s"
 
 #: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s �仄亠仆亳仍(舒) �亠仄� 仆舒: %s"
+msgstr "%s �仄亠仆亳仍 �亠仄� 仆舒: %s"
 
 #: src/protocols/irc/msgs.c:283
 #, c-format
@@ -4941,160 +5085,327 @@
 
 #: src/protocols/irc/msgs.c:300
 msgid "Gaim has sent a message the IRC server did not understand."
-msgstr ""
-
-#: src/protocols/irc/msgs.c:403
+msgstr "Gaim 仂�仗�舒于亳仍 �仂仂弍�亠仆亳亠, 从仂�仂�仂亠 仆亠 仗仂仆�仍 �亠�于亠� IRC."
+
+#: src/protocols/irc/msgs.c:323
+#, c-format
+msgid "Users on %s: %s"
+msgstr ""
+
+#: src/protocols/irc/msgs.c:405
 msgid "No such channel"
-msgstr "丐舒从仂亞仂 从舒仆舒仍舒 仆亠�"
+msgstr "�亠� �舒从仂亞仂 从舒仆舒仍舒"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:416
 msgid "no such channel"
 msgstr "仆亠� �舒从仂亞仂 从舒仆舒仍舒"
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:419
 msgid "User is not logged in"
-msgstr "�亠 于 �亠�亳"
-
-#: src/protocols/irc/msgs.c:422
+msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"
+
+#: src/protocols/irc/msgs.c:424
 msgid "No such nick or channel"
-msgstr "�亠� �舒从仂亞仂 仗�亠于亟仂仆亳仄舒/从舒仆舒仍舒"
-
-#: src/protocols/irc/msgs.c:442
+msgstr "�亠� �舒从仂亞仂 仗�亠于亟仂仆亳仄舒 亳仍亳 从舒仆舒仍舒"
+
+#: src/protocols/irc/msgs.c:444
 msgid "Could not send"
-msgstr "�亠�亠��仍从舒 仆亠 �亟舒仍舒��"
-
-#: src/protocols/irc/msgs.c:498
+msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳��"
+
+#: src/protocols/irc/msgs.c:500
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "��亳�仂亠亟亳仆亠仆亳亠 从 %s ��亠弍�亠� 仗�亳亞仍舒�亠仆亳�."
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:501
 msgid "Invitation only"
 msgstr "丐仂仍�从仂 仗仂 仗�亳亞仍舒�亠仆亳�"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:604
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "�舒� 于�从亳仆�仍亳 亳亰 �舒�舒 %s: (%s)"
-
-#: src/protocols/irc/msgs.c:600
+msgstr "�� 弍�仍亳 于�弍�仂�亠仆� 亳亰 �舒�舒 %s: (%s)"
+
+#: src/protocols/irc/msgs.c:609
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "��亳仆�亟亳�亠仍�仆仂 �亟舒仍�仆 %s (%s)"
-
-#: src/protocols/irc/msgs.c:621
+msgstr "��弍�仂�亠仆� by %s (%s)"
+
+#: src/protocols/irc/msgs.c:630
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:700
+msgstr "�亠亢亳仄 (%s %s) by %s"
+
+#: src/protocols/irc/msgs.c:709
 msgid "Could not change nick"
-msgstr "�亠 �亟舒仍仂�� �仄亠仆亳�� 仗�亠于亟仂仆亳仄"
-
-#: src/protocols/irc/msgs.c:701
+msgstr "�亠 �亟舒仍仂�� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"
+
+#: src/protocols/irc/msgs.c:710
 msgid "Cannot change nick"
 msgstr "�亠 �亟舒���� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:731
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:762
+msgstr "�� 仂��仂亠亟亳仆亳仍亳�� 仂� 从舒仆舒仍舒 %s%s"
+
+#: src/protocols/irc/msgs.c:771
 msgid "Error: invalid PONG from server"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:764
+msgstr "��亳弍从舒: 仆亠亟仂仗���亳仄�亶 PONG � �亠�于亠�舒"
+
+#: src/protocols/irc/msgs.c:773
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:839
+msgstr "��于亠� PING -- 亰舒亟亠�亢从舒: %lu �亠从�仆亟"
+
+#: src/protocols/irc/msgs.c:848
 #, c-format
 msgid "Cannot join %s:"
-msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � '%s'"
-
-#: src/protocols/irc/msgs.c:840
+msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 %s:"
+
+#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
-msgstr "�亠 �亟舒���� 仗仂亟从仍��亳���� 从 从舒仆舒仍�"
-
-#: src/protocols/irc/msgs.c:870
+msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 从舒仆舒仍�"
+
+#: src/protocols/irc/msgs.c:885
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:109
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;亟亠亶��于亳亠 亟仍� 于�仗仂仍仆亠仆亳�&gt;:  ��仗仂仍仆亳�� 亟亠亶��于亳亠."
+
+#: src/protocols/irc/parse.c:110
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [�仂仂弍�亠仆亳亠]:  丕��舒仆仂于亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳. ��仍亳 �仂仂弍�亠仆亳亠 仆亠 "
+"亰舒亟舒仆仂, �亟舒仍亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳."
+
+#: src/protocols/irc/parse.c:111
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;仗�亠于亟仂仆亳仄1&gt; [仗�亠于亟仂仆亳仄2] ...:  ��仂弍�舒�� � 仗仂仍�亰仂于舒�亠仍� ��舒��� "
+"仂仗亠�舒�仂�舒 从舒仆舒仍舒. �� 亟仂仍亢仆� 弍��� 仂仗亠�舒�仂�仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂."
+
+#: src/protocols/irc/parse.c:112
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:113
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+
+#: src/protocols/irc/parse.c:114
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: src/protocols/irc/parse.c:115
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: src/protocols/irc/parse.c:116
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;仗�亠于亟仂仆亳仄&gt; [�仂仂弍�亠仆亳亠]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� � 从舒仆舒仍舒. �� "
+"亟仂仍亢仆� 弍��� 仂仗亠�舒�仂仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂"
+
+#: src/protocols/irc/parse.c:117
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  ��于亠��亳 �仗亳�仂从 从舒仆舒仍仂于 于 �亠�亳. <i>��亟��亠 仂��仂�仂亢仆�, 仆亠从仂�仂��亠 �亠�于亠�� "
+"亰舒 ��仂 仄仂亞�� �舒亰仂�于舒�� � 于舒仄亳 �仂亠亟亳仆亠仆亳亠.</i>"
+
+#: src/protocols/irc/parse.c:118
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;亟亠亶��于亳亠 亟仍� 于�仗仂仍仆亠仆亳�&gt;:  ��仗仂仍仆亳�� 亟亠亶��于亳亠."
+
+#: src/protocols/irc/parse.c:119
+msgid ""
+"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;仗�亠于亟仂仆亳仄|从舒仆舒仍&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  丕��舒仆仂于亳�� 亳仍亳 "
+"�亟舒仍亳�� �亠亢亳仄 仗仂仍�亰仂于舒�亠仍� 亳仍亳 从舒仆舒仍舒."
+
+#: src/protocols/irc/parse.c:120
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: src/protocols/irc/parse.c:121
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr ""
+
+#: src/protocols/irc/parse.c:123
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:124
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+#: src/protocols/irc/parse.c:125
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+
+#: src/protocols/irc/parse.c:126
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+
+#: src/protocols/irc/parse.c:127
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: src/protocols/irc/parse.c:128
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [�仂仂弍�亠仆亳亠]:  ���仂亠亟亳仆亳���� 仂� �亠�于亠�舒. 弌仂仂弍�亠仆亳亠 仆亠仂弍�亰舒�亠仍�仆仂."
+
+#: src/protocols/irc/parse.c:129
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+#: src/protocols/irc/parse.c:130
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:131
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+#: src/protocols/irc/parse.c:132
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+#: src/protocols/irc/parse.c:133
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:134
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+#: src/protocols/irc/parse.c:135
+msgid "whois &lt;nick&gt;:  Get information on a user."
+msgstr ""
+
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr ""
-
-#: src/protocols/irc/parse.c:318
+"(��亳弍从舒 从仂仆于亠��舒�亳亳 ��仂亞仂 �仂仂弍�亠仆亳�. ��仂于亠���亠 仗舒�舒仄亠�� '�仂亟亳�仂于从舒' 于 "
+"�亠亟舒从�仂�亠 ����仆�� 亰舒仗亳�亠亶)"
+
+#: src/protocols/irc/parse.c:382
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "��亠仄� 仂�于亠�舒 仂�揃%s:揃%lu揃�亠从�仆亟"
-
-#: src/protocols/irc/parse.c:319
+msgstr "��亠仄� 仂�于亠�舒 仂� %s: %lu �亠从�仆亟"
+
+#: src/protocols/irc/parse.c:383
 msgid "PONG"
-msgstr ""
-
-#: src/protocols/irc/parse.c:319
+msgstr "PONG"
+
+#: src/protocols/irc/parse.c:383
 msgid "CTCP PING reply"
-msgstr ""
-
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+msgstr "��于亠� CTCP PING"
+
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂."
 
 #: src/protocols/jabber/auth.c:51
 msgid "Server requires SSL for login"
-msgstr ""
+msgstr "弌亠�于亠� ��亠弍�亠� SSL 亟仍� 于�仂亟舒"
 
 #: src/protocols/jabber/auth.c:111
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
+msgstr "弌亠�于亠� ��亠弍�亠� 亳亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亶 仗仂�仂从"
 
 #: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
 #: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
-#, fuzzy
 msgid "Plaintext Authentication"
-msgstr "���亠仆�亳�亳从舒�亳� Yahoo! 仆亠 �亟舒仍舒��"
+msgstr "�亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄"
 
 #: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
+"亅�仂� �亠�于亠� ��亠弍�亠� 亳亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆仂亠 "
+"�仂亠亟亳仆亠仆亳亠. �仂亰于仂仍亳�� ��仂 亳 仗�仂亟仂仍亢亳�� 亳亟亠仆�亳�亳从舒�亳�?"
 
 #: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
-msgstr ""
+msgstr "弌亠�于亠� 仆亠 亳�仗仂仍�亰�亠� 仆亳 仂亟仆仂亞仂 仗仂亟亟亠�亢亳于舒亠仄仂亞仂 仄亠�仂亟舒 亳亟亠仆�亳�亳从舒�亳亳"
 
 #: src/protocols/jabber/auth.c:375
 msgid "Invalid challenge from server"
-msgstr "��亳弍仂�仆�亶 仂�于亠� �亠�于亠�舒"
-
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+msgstr "�亠亟仂仗���亳仄�亶 亰舒仗�仂� � �亠�于亠�舒"
+
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:770
 msgid "Full Name"
 msgstr "�仂仍仆仂亠 �仄�"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:782
 msgid "Family Name"
 msgstr "个舒仄亳仍亳�"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "�亠于亳��� �舒仄亳仍亳�"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
+#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Nickname"
 msgstr "��亠于亟仂仆亳仄"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
 msgid "URL"
 msgstr "URL"
 
@@ -5115,7 +5426,7 @@
 msgstr "�亠亞亳仂仆"
 
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/jabber.c:637
 msgid "Postal Code"
 msgstr "�仂��仂于�亶 从仂亟"
 
@@ -5131,9 +5442,10 @@
 msgstr "丐亠仍亠�仂仆"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
 msgid "Email"
-msgstr "e-mail"
+msgstr "Email"
 
 #: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
@@ -5141,53 +5453,55 @@
 
 #: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
-msgstr "�仂仍亢仆仂���"
+msgstr "�仂亟�舒亰亟亠仍亠仆亳亠"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
-msgstr "�舒亞仂仍仂于仂从"
+msgstr "�舒亰于舒仆亳亠"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
-msgstr "�仂仍�"
+msgstr "�仂仍亢仆仂���"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/oscar/oscar.c:4865
 msgid "Birthday"
 msgstr "�舒�舒 �仂亢亟亠仆亳�"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
-msgstr "�亠亟舒从�亳�仂于舒�� Jabber vCard"
-
-#: src/protocols/jabber/buddy.c:510
+msgstr "�亰仄亠仆亳�� Jabber vCard"
+
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "弌仍亠亟���舒� 亳仆�仂�仄舒�亳� 仆亠 仂弍�亰舒�亠仍�仆舒. �舒仗仂仍仆��� 仗仂 亢亠仍舒仆亳�."
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
+#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
+#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
+#: src/protocols/yahoo/yahoo.c:2672
 msgid "Status"
 msgstr "弌�舒���"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1558
 msgid "Resource"
 msgstr "�亠����"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
 msgid "Middle Name"
 msgstr "���亠��于仂"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
+#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
+#: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "�亟�亠�"
 
@@ -5207,23 +5521,27 @@
 msgid "Jabber Profile"
 msgstr "��仂�亳仍� Jabber"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:936
 msgid "Un-hide From"
 msgstr "��从������ 亟仍�"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:939
 msgid "Temporarily Hide From"
 msgstr "��亠仄亠仆仆仂 �从������ 仂�"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:946
 msgid "Cancel Presence Notification"
 msgstr "��仄亠仆亳�� �于亠亟仂仄仍亠仆亳亠 仂 仗�亳�����于亳亳"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:952
 msgid "(Re-)Request authorization"
 msgstr "(�仂于�仂�仆仂) �舒仗�仂�亳�� 舒于�仂�亳亰舒�亳�"
 
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:960
 msgid "Unsubscribe"
 msgstr "��仗亳�舒����"
 
@@ -5239,509 +5557,524 @@
 msgid "_Handle:"
 msgstr "_�仗亳�舒仆亳亠:"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "'%s' 仆亠 �于仍�亠��� 从仂��亠从�仆�仄 亳仄亠仆亠仄 从仂仄仆舒��."
-
-#: src/protocols/jabber/chat.c:165
+msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 亳仄亠仆亠仄 从仂仄仆舒��"
+
+#: src/protocols/jabber/chat.c:177
 msgid "Invalid Room Name"
 msgstr "�亠于亠�仆仂亠 亳仄� 从仂仄仆舒��"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:182
 #, c-format
 msgid "%s is not a valid server name"
-msgstr "'%s' 仆亠 �于仍�亠��� 从仂��亠从�仆�仄 亳仄亠仆亠仄 �亠�于亠�舒"
-
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 亳仄亠仆亠仄 �亠�于亠�舒"
+
+#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
 msgid "Invalid Server Name"
 msgstr "�亠于亠�仆仂亠 亳仄� �亠�于亠�舒"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:188
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
 msgid "Invalid Room Handle"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:332
+#: src/protocols/jabber/chat.c:349
 msgid "Configuration error"
-msgstr "��亳弍从舒 仆舒���仂亶从亳"
-
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+msgstr "��亳弍从舒 从仂仆�亳亞��舒�亳亳"
+
+#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
 msgid "Unable to configure"
 msgstr "�亠 �亟舒���� 仆舒���仂亳��"
 
-#: src/protocols/jabber/chat.c:357
+#: src/protocols/jabber/chat.c:374
 msgid "Room Configuration Error"
-msgstr "��亳弍从舒 仆舒���仂亶从亳 从仂仄仆舒��"
-
-#: src/protocols/jabber/chat.c:358
+msgstr "��亳弍从舒 从仂仆�亳亞��舒�亳亳 从仂仄仆舒��"
+
+#: src/protocols/jabber/chat.c:375
 msgid "This room is not capable of being configured"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+msgstr "亅�舒 从仂仄仆舒�舒 仆亠 亳仄亠亠� 于仂亰仄仂亢仆仂��亳 仆舒���仂亶从亳"
+
+#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
 msgid "Registration error"
-msgstr "��亳弍从舒 仗�亳 �亠亞亳���舒�亳亳"
-
-#: src/protocols/jabber/chat.c:556
+msgstr "��亳弍从舒 �亠亞亳���舒�亳亳"
+
+#: src/protocols/jabber/chat.c:573
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
-#, fuzzy
+msgstr "弌仄亠仆舒 仗�亠于亟仂仆亳仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠��� 于 仆亠-MUC �舒�-从仂仄仆舒�舒�"
+
+#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
 msgid "Roomlist Error"
-msgstr "��亳弍从舒 仆舒���仂亶从亳 从仂仄仆舒��"
-
-#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
-#, fuzzy
+msgstr "��亳弍从舒 �仗亳�从舒 从仂仄仆舒�"
+
+#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
 msgid "Error retreiving roomlist"
-msgstr "��亳弍从舒 仗�亳 ��亠仆亳亳 仂� �亠�于亠�舒"
-
-#: src/protocols/jabber/chat.c:652
-#, fuzzy
+msgstr "��亳弍从舒 仗仂仍��亠仆亳� �仗亳�从舒 从仂仄仆舒�"
+
+#: src/protocols/jabber/chat.c:669
 msgid "Invalid Server"
-msgstr "�亠于亠�仆仂亠 亳仄� �亠�于亠�舒"
-
-#: src/protocols/jabber/chat.c:689
-#, fuzzy
+msgstr "�亠亟仂仗���亳仄�亶 �亠�于亠�"
+
+#: src/protocols/jabber/chat.c:706
 msgid "Enter a Conference Server"
-msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳�"
-
-#: src/protocols/jabber/chat.c:690
+msgstr "�仂亶�亳 仆舒 �亠�于亠� 从仂仆�亠�亠仆�亳亶"
+
+#: src/protocols/jabber/chat.c:707
 msgid "Select a conference server to query"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:693
+msgstr "��弍亠�亳�亠 �亠�于亠� 从仂仆�亠�亠仆�亳亶 亟仍� 仂仗�仂�舒"
+
+#: src/protocols/jabber/chat.c:710
 msgid "Find Rooms"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:74
+msgstr "��从舒�� 从仂仄仆舒��"
+
+#: src/protocols/jabber/jabber.c:75
 msgid "Error initializing session"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
-#: src/protocols/trepia/trepia.c:1186
+msgstr "��亳弍从舒 亳仆亳�亳舒仍亳亰舒�亳亳 �亠��亳亳"
+
+#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "��亳弍从舒 亰舒仗亳�亳"
 
-#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
 msgid "Read Error"
 msgstr "��亳弍从舒 ��亠仆亳�"
 
-#: src/protocols/jabber/jabber.c:317
-#, fuzzy
+#: src/protocols/jabber/jabber.c:323
 msgid "Connection Failed"
-msgstr "丕亟舒仍�仆仆仂亠 �仂亠亟亳仆亠仆亳亠 仆亠 �亟舒仍仂��"
-
-#: src/protocols/jabber/jabber.c:320
+msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/jabber/jabber.c:326
 msgid "SSL Handshake Failed"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+msgstr "�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 �仂亞仍舒�仂于舒仆亳亠 SSL"
+
+#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
 msgid "Invalid Jabber ID"
-msgstr "�亠于亠�仆�亶 Jabber ID"
-
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+msgstr "�亠亟仂仗���亳仄�亶 Jabber ID"
+
+#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
 msgid "SSL support unavailable"
-msgstr "�仂亟亟亠�亢从舒 SSL 仂�从仍��亠仆舒"
-
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+msgstr "�仂亟亟亠�亢从舒 SSL 仆亠亟仂���仗仆舒"
+
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂从亠�"
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:432
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "丕�仗亠�仆舒� �亠亞亳���舒�亳� '%s@%s'!"
-
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+msgstr "�亠亞亳���舒�亳� %s@%s 亰舒于亠��亠仆舒 ��仗亠�仆仂"
+
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
 msgid "Registration Successful"
-msgstr "丕�仗亠�仆舒� �亠亞亳���舒�亳�!"
-
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+msgstr "�亠亞亳���舒�亳� 亰舒于亠��亠仆舒 ��仗亠�仆仂"
+
+#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
 msgid "Unknown Error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
 msgid "Registration Failed"
-msgstr "�亠亞亳���舒�亳� 仆亠 �亟舒仍舒��"
-
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+msgstr "�亠亞亳���舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
+
+#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
 msgid "Already Registered"
-msgstr "�亠亞亳���舒�亳� �亢亠 亠���"
-
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+msgstr "丕亢亠 亰舒�亠亞亳���亳�仂于舒仆仂"
+
+#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
 msgid "Password"
 msgstr "�舒�仂仍�"
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:602
 msgid "E-Mail"
 msgstr "E-mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
+#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "�亠�仗�弍仍亳从舒/�弍仍舒���"
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "丐亠仍亠�仂仆"
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:652
 msgid "Date"
 msgstr "�舒�舒"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:660
 msgid "Please fill out the information below to register your new account."
-msgstr "�舒仗仂仍仆亳�亠 �仍亠亟���亳亠 仆亳亢亠 仗仂仍� 舒仆从亠�� 亟仍� �亠亞亳���舒�亳亳 ����仆仂亶 亰舒仗亳�亳."
-
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+msgstr "�舒仗仂仍仆亳�亠 仆亳亢亠�仍亠亟���亳亠 仗仂仍� 亟仍� �亠亞亳���舒�亳亳 仆仂于仂亶 ����仆仂亶 亰舒仗亳�亳."
+
+#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
 msgid "Register New Jabber Account"
 msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� Jabber"
 
+#: src/protocols/jabber/jabber.c:743
+msgid "Logged out"
+msgstr "�亠 于 �亠�亳"
+
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
+#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2419 src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
-msgstr "弌仂亠亟亳仆�亠仄��"
-
-#: src/protocols/jabber/jabber.c:779
+msgstr "弌仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/jabber/jabber.c:786
 msgid "Initializing Stream"
-msgstr "�仆亳�亳亳��亠��� 仗仂�仂从"
-
-#: src/protocols/jabber/jabber.c:785
+msgstr "�仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
+
+#: src/protocols/jabber/jabber.c:792
 msgid "Authenticating"
-msgstr "���亠仆�亳�亳从舒�亳�"
-
-#: src/protocols/jabber/jabber.c:794
+msgstr "�亟亠仆�亳�亳从舒�亳�"
+
+#: src/protocols/jabber/jabber.c:801
 msgid "Re-initializing Stream"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+msgstr "�仂于�仂�仆舒� 亳仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
+
+#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
 msgid "Not Authorized"
 msgstr "�亠 舒于�仂�亳亰仂于舒仆"
 
-#: src/protocols/jabber/jabber.c:905
-#, fuzzy
+#: src/protocols/jabber/jabber.c:912
 msgid "Both"
-msgstr "�仆亳亰�"
-
-#: src/protocols/jabber/jabber.c:907
-msgid "From (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:909
-msgid "From"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:912
-#, fuzzy
-msgid "To"
-msgstr "�于亠���"
+msgstr "�弍舒"
 
 #: src/protocols/jabber/jabber.c:914
+msgid "From (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:916
+msgid "From"
+msgstr "��"
+
+#: src/protocols/jabber/jabber.c:919
+msgid "To"
+msgstr "�仍�"
+
+#: src/protocols/jabber/jabber.c:921
 msgid "None (To pending)"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:918
-#, fuzzy
+#: src/protocols/jabber/jabber.c:925
 msgid "Subscription"
-msgstr "�仗亳�舒仆亳亠"
-
-#: src/protocols/jabber/jabber.c:938
+msgstr "�仂亟仗亳��"
+
+#: src/protocols/jabber/jabber.c:945
 msgid "Error"
 msgstr "��亳弍从舒"
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
-msgstr "�仂�仂于(舒) 仗仂弍仂仍�舒��"
-
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+msgstr "�仂�仂于 仗仂仂弍�舒����"
+
+#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
-msgstr "�舒��亳�亠仆仆�亶 于舒�亳舒仆� \"仂�仂��仍\""
-
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""
+
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:6663
 msgid "Do Not Disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:978
 msgid "Password Changed"
-msgstr "�舒�仂仍� �仄亠仆亳仍��"
-
-#: src/protocols/jabber/jabber.c:972
+msgstr "�舒�仂仍� 亳亰仄亠仆�仆"
+
+#: src/protocols/jabber/jabber.c:979
 msgid "Your password has been changed."
-msgstr "�舒�仂仍� 弍�仍 亳亰仄亠仆�仆."
-
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
-#, fuzzy
+msgstr "�舒� 仗舒�仂仍� 弍�仍 亳亰仄亠仆�仆."
+
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
 msgid "Error changing password"
-msgstr "��亳弍从舒 仗�亳 �仄亠仆亠 仗舒�仂仍�: (%s)"
-
-#: src/protocols/jabber/jabber.c:1031
+msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 仗舒�仂仍�"
+
+#: src/protocols/jabber/jabber.c:1040
 msgid "Password (again)"
-msgstr "�仂于�亶 仗舒�仂仍� (亠�� �舒亰)"
-
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+msgstr "�舒�仂仍� (亠�� �舒亰)"
+
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
 msgid "Change Jabber Password"
-msgstr "弌仄亠仆亳�� 仗舒�仂仍� 亟仍� Jabber"
-
-#: src/protocols/jabber/jabber.c:1037
+msgstr "弌仄亠仆亳�� 仗舒�仂仍� Jabber"
+
+#: src/protocols/jabber/jabber.c:1046
 msgid "Please enter your new password"
-msgstr "�于亠亟亳�亠 �于仂亶 仆仂于�亶 仗舒�仂仍�"
-
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+msgstr "�于亠亟亳�亠 仆仂于�亶 仗舒�仂仍�"
+
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
-#: src/protocols/jabber/jabber.c:1133
+#: src/protocols/jabber/jabber.c:1138
 msgid "Bad Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1135
-#, fuzzy
+msgstr "�亠于亠�仆�亶 亰舒仗�仂�"
+
+#: src/protocols/jabber/jabber.c:1140
 msgid "Conflict"
-msgstr "弌仂亠亟亳仆亳����"
-
-#: src/protocols/jabber/jabber.c:1137
+msgstr "�仂仆�仍亳从�"
+
+#: src/protocols/jabber/jabber.c:1142
 msgid "Feature Not Implemented"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1139
-#, fuzzy
+msgstr "�仂亰仄仂亢仆仂��� 仆亠 �亠舒仍亳亰仂于舒仆舒"
+
+#: src/protocols/jabber/jabber.c:1144
 msgid "Forbidden"
-msgstr "�亠于亳亟亳仄�亶"
-
-#: src/protocols/jabber/jabber.c:1141
-#, fuzzy
+msgstr "�舒仗�亠�亠仆仂"
+
+#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
-msgstr "�亠�"
-
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+msgstr "丕��仍"
+
+#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
 msgid "Internal Server Error"
 msgstr "�仆���亠仆�� 仂�亳弍从舒 �亠�于亠�舒"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1150
 msgid "Item Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1147
-#, fuzzy
+msgstr "亅仍亠仄亠仆� 仆亠 仆舒亶亟亠仆"
+
+#: src/protocols/jabber/jabber.c:1152
 msgid "Malformed Jabber ID"
 msgstr "�亠于亠�仆�亶 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1149
-#, fuzzy
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Acceptable"
-msgstr "�亠 亟仂���仗亠仆"
-
-#: src/protocols/jabber/jabber.c:1151
-#, fuzzy
+msgstr "�亠亟仂仗���亳仄仂"
+
+#: src/protocols/jabber/jabber.c:1156
 msgid "Not Allowed"
-msgstr "�亠 亟仂���仗亠仆"
-
-#: src/protocols/jabber/jabber.c:1155
-#, fuzzy
+msgstr "�亠 �舒亰�亠�亠仆仂"
+
+#: src/protocols/jabber/jabber.c:1160
 msgid "Payment Required"
-msgstr "�亠仂弍�仂亟亳仄仂 �亳��仂于舒仆亳亠"
-
-#: src/protocols/jabber/jabber.c:1157
-#, fuzzy
+msgstr "丐�亠弍�亠��� 仗仍舒�舒"
+
+#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
-msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
-
-#: src/protocols/jabber/jabber.c:1161
-#, fuzzy
+msgstr "�仂仍��舒�亠仍� 仆亠亟仂���仗亠仆"
+
+#: src/protocols/jabber/jabber.c:1166
 msgid "Registration Required"
-msgstr "�亠亞亳���舒�亳� 仆亠 �亟舒仍舒��"
-
-#: src/protocols/jabber/jabber.c:1163
+msgstr "丐�亠弍�亠��� �亠亞亳���舒�亳�"
+
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1165
+msgstr "丕亟舒仍�仆仆�亶 �亠�于亠� 仆亠 仆舒亶亟亠仆"
+
+#: src/protocols/jabber/jabber.c:1170
 msgid "Remote Server Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1167
-#, fuzzy
+msgstr "丐舒亶仄-舒�� �亟舒仍�仆仆仂亞仂 �亠�于亠�舒"
+
+#: src/protocols/jabber/jabber.c:1172
 msgid "Server Overloaded"
-msgstr "弌亠�于亠� 仆亠亟仂���仗亠仆"
-
-#: src/protocols/jabber/jabber.c:1169
-#, fuzzy
+msgstr "弌亠�于亠� 仗亠�亠亞��亢亠仆"
+
+#: src/protocols/jabber/jabber.c:1174
 msgid "Service Unavailable"
 msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
 
-#: src/protocols/jabber/jabber.c:1171
-#, fuzzy
+#: src/protocols/jabber/jabber.c:1176
 msgid "Subscription Required"
-msgstr "�亠仂弍�仂亟亳仄仂 �亳��仂于舒仆亳亠"
-
-#: src/protocols/jabber/jabber.c:1173
+msgstr "丐�亠弍�亠��� 仗仂亟仗亳�从舒"
+
+#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1180
-#, fuzzy
-msgid "Authorization Aborted"
-msgstr "�于�仂�亳亰舒�亳� �舒亰�亠�亠仆舒"
-
-#: src/protocols/jabber/jabber.c:1182
-#, fuzzy
-msgid "Incorrect encoding in authorization"
-msgstr "�于�仂�亳亰舒�亳� 仗�亳仆��舒"
+msgstr "�亠仗�亠亟于亳亟亠仆仆�亶 亰舒仗�仂�"
 
 #: src/protocols/jabber/jabber.c:1185
+msgid "Authorization Aborted"
+msgstr "�于�仂�亳亰舒�亳� 仗�亠�于舒仆舒"
+
+#: src/protocols/jabber/jabber.c:1187
+msgid "Incorrect encoding in authorization"
+msgstr "�亠从仂��亠从�仆舒� 从仂亟亳�仂于从舒 于 舒于�仂�亳亰舒�亳亳"
+
+#: src/protocols/jabber/jabber.c:1190
 msgid "Invalid authzid"
-msgstr "�亠从仂��亠从�仆�亶 id 舒于�仂�亳亰舒�亳亳"
-
-#: src/protocols/jabber/jabber.c:1188
-#, fuzzy
+msgstr "�亠亟仂仗���亳仄�亶 亳亟亠仆�亳�亳从舒�仂� 舒于�仂�亳亰舒�亳亳"
+
+#: src/protocols/jabber/jabber.c:1193
 msgid "Invalid Authorization Mechanism"
-msgstr "�亠从仂��亠从�仆�亶 仄亠�舒仆亳亰仄"
-
-#: src/protocols/jabber/jabber.c:1191
-#, fuzzy
-msgid "Authorization mechanism too weak"
-msgstr "�于�仂�亳亰舒�亳� 亰舒仗�亠�亠仆舒"
+msgstr "�亠亟仂仗���亳仄�亶 仄亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳"
 
 #: src/protocols/jabber/jabber.c:1196
+msgid "Authorization mechanism too weak"
+msgstr "�亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳 �仍亳�从仂仄 �仍舒弍"
+
+#: src/protocols/jabber/jabber.c:1201
 msgid "Temporary Authentication Failure"
-msgstr "��亠仄亠仆仆舒� 仂�亳弍从舒 舒于�仂�亳亰舒�亳亳"
-
-#: src/protocols/jabber/jabber.c:1198
+msgstr "��亠仄亠仆仆舒� 仂�亳弍从舒 亳亟亠仆�亳�亳从舒�亳亳"
+
+#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
-msgstr "��亳弍从舒 舒于�仂�亳亰舒�亳�"
-
-#: src/protocols/jabber/jabber.c:1202
+msgstr "��亳弍从舒 亳亟亠仆�亳�亳从舒�亳亳"
+
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Format"
 msgstr "�亠于亠�仆�亶 �仂�仄舒�"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1209
 msgid "Bad Namespace Prefix"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1207
+msgstr "�亠于亠�仆�亶 仗�亠�亳从� 仗�仂���舒仆��于舒 亳仄�仆"
+
+#: src/protocols/jabber/jabber.c:1212
 msgid "Resource Conflict"
 msgstr "�仂仆�仍亳从� �亠����仂于"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
-msgstr "丐舒亶仄-舒�� �仂亠亟亳仆亠仆亳�"
-
-#: src/protocols/jabber/jabber.c:1211
+msgstr "��亠于��亠仆 亳仆�亠�于舒仍 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�"
+
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1213
+msgstr "丕亰亠仍 ���仍"
+
+#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "丕亰亠仍 仆亠亳亰于亠��亠仆"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1220
 msgid "Improper Addressing"
-msgstr "�亠从仂��亠从�仆舒� 舒亟�亠�舒�亳�"
-
-#: src/protocols/jabber/jabber.c:1219
+msgstr "�亠仗�舒于亳仍�仆舒� 舒亟�亠�舒�亳�"
+
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid ID"
-msgstr "�亠于亠�仆�亶 ID"
-
-#: src/protocols/jabber/jabber.c:1221
+msgstr "�亠亟仂仗���亳仄�亶 ID"
+
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid Namespace"
-msgstr "�亠从仂��亠从�仆仂亠 仗�仂���舒仆��于仂 亳仄�仆"
-
-#: src/protocols/jabber/jabber.c:1223
+msgstr "�亠亟仂仗���亳仄仂亠 仗�仂���舒仆��于仂 亳仄�仆"
+
+#: src/protocols/jabber/jabber.c:1228
 msgid "Invalid XML"
-msgstr "�亠于舒仍亳亟仆�亶 XML"
-
-#: src/protocols/jabber/jabber.c:1225
+msgstr "�亠亟仂仗���亳仄�亶 XML"
+
+#: src/protocols/jabber/jabber.c:1230
 msgid "Non-matching Hosts"
-msgstr "�亠�仂于仗舒亟舒��亳亠 亳仄亠仆舒 �亰仍仂于"
-
-#: src/protocols/jabber/jabber.c:1229
+msgstr "�亠�仂�亠�舒亠仄�亠 �亰仍�"
+
+#: src/protocols/jabber/jabber.c:1234
 msgid "Policy Violation"
 msgstr "�舒���亠仆亳亠 仗�舒于亳仍"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1236
 msgid "Remote Connection Failed"
-msgstr "丕亟舒仍�仆仆仂亠 �仂亠亟亳仆亠仆亳亠 仆亠 �亟舒仍仂��"
-
-#: src/protocols/jabber/jabber.c:1233
+msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �亟舒仍�仆仆仂亠 �仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/jabber/jabber.c:1238
 msgid "Resource Constraint"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1240
 msgid "Restricted XML"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1242
 msgid "See Other Host"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1239
+msgstr "�弍�舒�亳�亠�� 从 亟��亞仂仄� �亰仍�"
+
+#: src/protocols/jabber/jabber.c:1244
 msgid "System Shutdown"
-msgstr "���仂亟 亳亰 �亳��亠仄�"
-
-#: src/protocols/jabber/jabber.c:1241
+msgstr "��从仍��亠仆亳亠 �亳��亠仄�"
+
+#: src/protocols/jabber/jabber.c:1246
 msgid "Undefined Condition"
-msgstr "�亠仂仗�亠亟亠仍�仆仆仂亠 ��仍仂于亳亠"
-
-#: src/protocols/jabber/jabber.c:1243
+msgstr "�亠仂仗�亠亟亠仍�仆仆仂亠 �仂��仂�仆亳亠"
+
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Encoding"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 从仂亟亳�仂于从舒"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1252
 msgid "Unsupported Version"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 于亠��亳�"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
-msgstr "XML 仆亠从仂��亠从�仆仂 仂�仂�仄仍亠仆"
-
-#: src/protocols/jabber/jabber.c:1251
+msgstr "XML 仆亠 ��仂�仄亳�仂于舒仆 亟仂仍亢仆�仄 仂弍�舒亰仂仄"
+
+#: src/protocols/jabber/jabber.c:1256
 msgid "Stream Error"
 msgstr "��亳弍从舒 仗仂�仂从舒"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1323
+#, c-format
+msgid "Unable to ban user %s"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1375
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "�亠 �亟舒���� 于�从亳仆��� 仗仂仍�亰仂于舒�亠仍� %s"
+
+#: src/protocols/jabber/jabber.c:1400
+msgid "config:  Configure a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1403
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1410
+msgid "part [room]:  Leave the room."
+msgstr "part [从仂仄仆舒�舒]:  �仂从亳仆��� 从仂仄仆舒��."
+
+#: src/protocols/jabber/jabber.c:1413
+msgid "register:  Register with a chat room."
+msgstr "register:  �舒�亠亞亳���亳�仂于舒�� 从仂仄仆舒��."
+
+#: src/protocols/jabber/jabber.c:1418
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [仆仂于舒� �亠仄舒]:  ��仂�仄仂��亠�� 亳仍亳 亳亰仄亠仆亳�� �亠仄�."
+
+#: src/protocols/jabber/jabber.c:1422
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1426
+msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+msgstr ""
+"invite &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  ��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒��."
+
+#: src/protocols/jabber/jabber.c:1430
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1434
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1438
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1452
 msgid "Hide Operating System"
-msgstr ""
+msgstr "弌从��于舒�� 仂仗亠�舒�亳仂仆仆�� �亳��亠仄�"
 
 #. *< api_version
 #. *< type
@@ -5754,25 +6087,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1533 src/protocols/jabber/jabber.c:1535
 msgid "Jabber Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Jabber"
 
-#: src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/jabber.c:1561
 msgid "Use TLS if available"
 msgstr "�仂 于仂亰仄仂亢仆仂��亳 亳�仗仂仍�亰仂于舒�� TLS"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1566
 msgid "Force old SSL"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1399
+msgstr "��仗仂仍�亰仂于舒�� ��舒��亶 SSL"
+
+#: src/protocols/jabber/jabber.c:1571
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1408
+msgstr "�舒亰�亠�亳�� 亳亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亠 仗仂�仂从亳"
+
+#. Account options
+#: src/protocols/jabber/jabber.c:1580 src/protocols/silc/silc.c:1358
 msgid "Connect server"
-msgstr "弌亠�于亠� �仂亠亟亳仆亠仆亳�"
+msgstr "弌仂亠亟亳仆亳���� � �亠�于亠�仂仄"
 
 #: src/protocols/jabber/message.c:111
 #, c-format
@@ -5792,7 +6126,7 @@
 #: src/protocols/jabber/message.c:225
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "�仂��舒于从舒 �仂仂弍�亠仆亳� 亟仍� %s 仆亠 �亟舒仍舒��: %s"
+msgstr "�亠 �亟舒仍仂�� 亟仂��舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s: %s"
 
 #: src/protocols/jabber/message.c:228
 msgid "Jabber Message Error"
@@ -5801,560 +6135,528 @@
 #: src/protocols/jabber/message.c:291
 #, c-format
 msgid " (Code %s)"
-msgstr ""
+msgstr " (�仂亟 %s)"
 
 #: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
-msgstr "��亳弍从舒 仗�亳 �亳仆�舒从�亳�亠�从仂仄 �舒亰弍仂�亠 XML"
-
-#: src/protocols/jabber/presence.c:221
+msgstr "��亳弍从舒 �亳仆�舒从�亳�亠�从仂亞仂 �舒亰弍仂�舒 XML"
+
+#: src/protocols/jabber/presence.c:223
 msgid "Unknown Error in presence"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 ��舒���舒 仗�亳�����于亳�"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:226
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
-msgstr "�仂仍�亰仂于舒�亠仍� %s �仂�亠� 亟仂弍舒于亳�� 于舒� 于 �于仂亶 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶."
-
-#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+msgstr "�仂仍�亰仂于舒�亠仍� %s �仂�亠� 亟仂弍舒于亳�� 于舒� 于 �于仂亶 �仗亳�仂从 从仂仆�舒从�仂于."
+
+#: src/protocols/jabber/presence.c:279 src/protocols/jabber/presence.c:280
 msgid "Create New Room"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:279
+msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仄仆舒��"
+
+#: src/protocols/jabber/presence.c:281
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-
-#: src/protocols/jabber/presence.c:281
-msgid "Configure Room"
-msgstr ""
+"�� �仂亰亟舒��亠 仆仂于�� 从仂仄仆舒��. 丱仂�亳�亠 仆舒���仂亳�� 亠� 从仂仆�亳亞��舒�亳� 亳仍亳 仗�亳仆��� "
+"���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�?"
 
 #: src/protocols/jabber/presence.c:283
+msgid "Configure Room"
+msgstr "�舒���仂亳�� 从仂仆�亳亞��舒�亳� 从仂仄仆舒��"
+
+#: src/protocols/jabber/presence.c:285
 msgid "Accept Defaults"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:303
-#, fuzzy, c-format
+msgstr "��亳仆��� ���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�"
+
+#: src/protocols/jabber/presence.c:307
+#, c-format
 msgid "Error in chat %s"
-msgstr "��亳弍从舒 仗�亳 �仂��舒仆亠仆亳亳 亳亰仂弍�舒亢亠仆亳�: '%s'"
-
-#: src/protocols/jabber/presence.c:306
-#, fuzzy, c-format
+msgstr "��亳弍从舒 于 �舒�亠 %s"
+
+#: src/protocols/jabber/presence.c:310
+#, c-format
 msgid "Error joining chat %s"
-msgstr "��亳弍从舒 仗�亳 �仂��舒仆亠仆亳亳 亳亰仂弍�舒亢亠仆亳�: '%s'"
-
-#: src/protocols/jabber/si.c:579
+msgstr "��亳弍从舒 仗�亳�仂亠亟亳仆亠仆亳� 从 �舒�� %s"
+
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+"�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仗仂仍�亰仂于舒�亠仍� 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亳�仄 �舒亶仍仂于"
+
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
-msgstr "��仗�舒于从舒 �舒亶仍舒 仆亠 �亟舒仍舒��"
-
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
-msgid "Unable to request USR\n"
-msgstr "�亠 �亟舒���� 亰舒仗�仂�亳�� USR\n"
-
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
-msgid "Unable to login using MD5"
-msgstr "�亠 �亟舒���� 亰舒亶�亳, 亳�仗仂仍�亰�� MD5"
-
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
-msgid "Unable to send USR"
-msgstr "�亠 �亟舒���� 仗仂�仍舒�� USR"
-
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
-msgid "Requesting to send password"
-msgstr "�舒仗�舒�亳于舒� 仗仂��仍从� 仗舒�仂仍�"
-
-#: src/protocols/msn/dispatch.c:104
-msgid "Protocol version not supported"
-msgstr "亅�舒 于亠��亳� 仗�仂�仂从仂仍舒 仆亠 仗仂亟亟亠�亢亳于舒亠���"
-
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
-msgid "Unable to request CVR\n"
-msgstr "�亠 �亟舒���� 亰舒仗�仂�亳�� CVR\n"
-
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
-msgid "Unable to request INF\n"
-msgstr "�亠 �亟舒���� 亰舒仗�仂�亳�� INF\n"
-
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
-msgid "Got invalid XFR"
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:178
-msgid "Unable to transfer"
-msgstr "�亠 �亟舒���� 仗亠�亠亟舒��"
-
-#: src/protocols/msn/dispatch.c:192
-msgid "Unable to parse message."
-msgstr "�亠 �亟舒���� �舒亰仂弍�舒�� �仂仂弍�亠仆亳亠."
-
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
-msgid "Unable to write to server"
-msgstr "�亠 �亟舒���� 亰舒仗亳�舒�� 仆舒 �亠�于亠�"
-
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
-msgid "Syncing with server"
-msgstr "弌亳仆��仂仆亳亰亳����� � �亠�于亠�仂仄"
-
-#: src/protocols/msn/dispatch.c:250
-msgid "Error reading from server"
-msgstr "��亳弍从舒 仗�亳 ��亠仆亳亳 仂� �亠�于亠�舒"
-
-#: src/protocols/msn/error.c:33
-#, fuzzy
+msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳�� �舒亶仍"
+
+#: src/protocols/msn/cmdproc.c:336
+msgid "Miscellaneous error"
+msgstr ""
+
+#: src/protocols/msn/cmdproc.c:338
+msgid "You have signed on from another location."
+msgstr "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
+
+#: src/protocols/msn/cmdproc.c:340
+msgid "The MSN servers are going down temporarily."
+msgstr "弌亠�于亠�� MSN 于�亠仄亠仆仆仂 于�从仍��舒����."
+
+#: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
-msgstr "�亠 �亟舒���� �舒亰仂弍�舒�� �仂仂弍�亠仆亳亠."
-
-#: src/protocols/msn/error.c:36
+msgstr "�亠 �亟舒���� �亟亠仍舒�� �舒亰弍仂� �仂仂弍�亠仆亳�"
+
+#: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr ""
-
-#: src/protocols/msn/error.c:40
-#, fuzzy
+msgstr "弌亳仆�舒从�亳�亠�从舒� 仂�亳弍从舒 (于亠�仂��仆仂, 仂�亳弍从舒 Gaim)"
+
+#: src/protocols/msn/error.c:42
 msgid "Invalid email address"
-msgstr "�亠于亠�仆舒� 仂弍仍舒���"
-
-#: src/protocols/msn/error.c:43
-#, fuzzy
+msgstr "�亠于亠�仆�亶 email-舒亟�亠�"
+
+#: src/protocols/msn/error.c:45
 msgid "User does not exist"
-msgstr "亅�仂� �舒亶仍 仆亠 ���亠��于�亠�."
-
-#: src/protocols/msn/error.c:47
+msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 ���亠��于�亠�"
+
+#: src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
-msgstr "�亠 �从舒亰舒仆仂 亟仂仄亠仆仆仂亠 亳仄�"
-
-#: src/protocols/msn/error.c:50
+msgstr "��仂仗��亠仆仂 Fully Qualified Domain Name"
+
+#: src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "丕亢亠 于 �亠�亳"
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:55
 msgid "Invalid Username"
-msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�"
-
-#: src/protocols/msn/error.c:56
+msgstr "�亠亟仂仗���亳仄仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
-msgstr "�亠于亠�仆仂亠 仂�仂弍�舒亢舒亠仄仂亠 亳仄�"
-
-#: src/protocols/msn/error.c:59
+msgstr "�亠亟仂仗���亳仄仂亠 亟��亢亠�从仂亠 亳仄�"
+
+#: src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "弌仗亳�仂从 仗仂仍仂仆"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "丕亢亠 �舒仄"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "�������于�亠� 于 �仗亳�从亠"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
-msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 仗仂亟从仍��亠仆"
-
-#: src/protocols/msn/error.c:71
+msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"
+
+#: src/protocols/msn/error.c:73
 msgid "Already in the mode"
-msgstr ""
-
-#: src/protocols/msn/error.c:74
+msgstr "丕亢亠 于 ��仂仄 �亠亢亳仄亠"
+
+#: src/protocols/msn/error.c:76
 msgid "Already in opposite list"
-msgstr ""
-
-#: src/protocols/msn/error.c:77
+msgstr "丕亢亠 于 仗�仂�亳于仂仗仂仍仂亢仆仂仄 �仗亳�从亠"
+
+#: src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "弌仍亳�从仂仄 仄仆仂亞仂 亞��仗仗"
 
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:82
 msgid "Invalid group"
-msgstr "�亠于亠�仆仂亠 亳仄� 亞��仗仗�"
-
-#: src/protocols/msn/error.c:83
+msgstr "�亠亟仂仗���亳仄舒� 亞��仗仗舒"
+
+#: src/protocols/msn/error.c:85
 msgid "User not in group"
-msgstr ""
-
-#: src/protocols/msn/error.c:86
+msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 亞��仗仗亠"
+
+#: src/protocols/msn/error.c:88
 msgid "Group name too long"
-msgstr "�仄� 亞��仗仗� �仍亳�从仂仄 亟仍亳仆仆仂"
-
-#: src/protocols/msn/error.c:89
+msgstr "弌仍亳�从仂仄 亟仍亳仆仆仂亠 亳仄� 亞��仗仗�"
+
+#: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
-msgstr ""
-
-#: src/protocols/msn/error.c:93
+msgstr "�亠仍�亰� �亟舒仍亳�� 仆�仍亠于�� 亞��仗仗"
+
+#: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
-msgstr ""
-
-#: src/protocols/msn/error.c:97
+msgstr "�仂仗��从舒 亟仂弍舒于仍亠仆亳� 从仂仆�舒从�舒 于 仆亠���亠��于����� 亞��仗仗�"
+
+#: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:100
+#: src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 仗亠�亠亟舒�亠 仆亠 仗�仂�仍仂"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:106
 msgid "Required fields missing"
-msgstr "�舒仗�仂�亠仆仆�亠 仗仂仍� 仂������于���"
-
-#: src/protocols/msn/error.c:107
+msgstr "�亠仂弍�仂亟亳仄�亠 仗仂仍� 仗�仂仗��亠仆�"
+
+#: src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
-msgstr ""
-
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+msgstr "弌仍亳�从仂仄 仄仆仂亞仂 仗仂仗舒亟舒仆亳亶 于 FND"
+
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "�亠 于 �亠�亳"
 
-#: src/protocols/msn/error.c:114
-#, fuzzy
+#: src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
-msgstr "弌亠�于亳� 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆."
-
-#: src/protocols/msn/error.c:117
+msgstr "弌仍�亢弍舒 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒"
+
+#: src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "��亳弍从舒 �亠�于亠�舒 弍舒亰� 亟舒仆仆��"
 
-#: src/protocols/msn/error.c:120
-#, fuzzy
+#: src/protocols/msn/error.c:122
 msgid "Command disabled"
-msgstr "�仂仄舒仆亟舒"
-
-#: src/protocols/msn/error.c:123
+msgstr "�仂仄舒仆亟舒 仂�从仍��亠仆舒"
+
+#: src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "��亳弍从舒 仂仗亠�舒�亳亳 � �舒亶仍仂仄"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
-msgstr "��亳弍从舒 �舒�仗�亠亟亠仍亠仆亳� 仗舒仄��亳"
-
-#: src/protocols/msn/error.c:129
+msgstr "��亳弍从舒 于�亟亠仍亠仆亳� 仗舒仄��亳"
+
+#: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
-msgstr ""
-
-#: src/protocols/msn/error.c:133
+msgstr "�舒 �亠�于亠� 仂�仗�舒于仍亠仆仂 仆亠于亠�仆仂亠 亰仆舒�亠仆亳亠 CHL"
+
+#: src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "弌亠�于亠� 亰舒仆��"
 
-#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "弌亠�于亠� 仆亠亟仂���仗亠仆"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳� � 弍舒亰仂亶 亟舒仆仆��"
 
-#: src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: src/protocols/msn/error.c:153
+#: src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "��亳弍从舒 �仂亰亟舒仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
-msgstr ""
-
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+msgstr "�舒�舒仄亠��� CVR 仆亠亳亰于亠��仆� 亳仍亳 仆亠亟仂仗���亳仄�"
+
+#: src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "�亠 �亟舒���� 亰舒仗亳�舒��"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:165
 msgid "Session overload"
-msgstr "弌亠��亳� 仗亠�亠亞��亢亠仆舒"
-
-#: src/protocols/msn/error.c:166
+msgstr "�亠�亠亞��亰从舒 �亠��亳亳"
+
+#: src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "�仂仍�亰仂于舒�亠仍� �仍亳�从仂仄 舒从�亳于亠仆"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "弌仍亳�从仂仄 仄仆仂亞仂 �亠��亳亶"
 
-#: src/protocols/msn/error.c:172
-#, fuzzy
+#: src/protocols/msn/error.c:174
 msgid "Passport not verified"
-msgstr "�从舒�仆� Passport 亠�� 仆亠 仗仂亟�于亠�亢亟�仆"
-
-#: src/protocols/msn/error.c:175
+msgstr "�舒�仗仂�� 仆亠 仗�仂于亠�亠仆"
+
+#: src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/error.c:178
+#: src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr ""
 
-#: src/protocols/msn/error.c:183
+#: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: src/protocols/msn/error.c:192
+#: src/protocols/msn/error.c:194
 msgid "Server too busy"
-msgstr "弌亠�于亠� 仗亠�亠亞��亢亠仆"
-
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: src/protocols/toc/toc.c:659
+msgstr "弌亠�于亠� �仍亳�从仂仄 亰舒仆��"
+
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
-msgstr "�于�仂�亳亰舒�亳� 仗�仂于舒仍亠仆舒"
-
-#: src/protocols/msn/error.c:199
+msgstr "�亟亠仆�亳�亳从舒�亳� 仆亠 仗�仂�仍舒"
+
+#: src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
-msgstr "�亠 �舒亰�亠�亠仆仂 弍亠亰 仗仂亟从仍��亠仆亳�"
-
-#: src/protocols/msn/error.c:207
+msgstr "�亠 �舒亰�亠�亠仆仂 仆亠 于 �亠�亳"
+
+#: src/protocols/msn/error.c:209
 msgid "Not accepting new users"
-msgstr ""
-
-#: src/protocols/msn/error.c:211
+msgstr "�仂于�亠 仗仂仍�亰仂于舒�亠仍亳 仆亠 仗�亳仆亳仄舒����"
+
+#: src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
-msgstr "�从舒�仆� Passport 亠�� 仆亠 仗仂亟�于亠�亢亟�仆"
-
-#: src/protocols/msn/error.c:218
-#, fuzzy
+msgstr "�舒�仗仂��仆舒� ����仆舒� 亰舒仗亳�� 亠�� 仆亠 仗仂亟�于亠�亢亟亠仆舒"
+
+#: src/protocols/msn/error.c:220
 msgid "Bad ticket"
-msgstr "�亠仆�舒 �仂弍亠�亠亟仆亳从仂于"
-
-#: src/protocols/msn/error.c:222
+msgstr "�亠于亠�仆�亶 弍亳仍亠�"
+
+#: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "�亠亳亰于亠��仆�亶 从仂亟 仂�亳弍从亳 %d"
 
-#: src/protocols/msn/error.c:234
+#: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "��亳弍从舒 MSN: %s\n"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "丕��舒仆仂于亳�� 仂�仂弍�舒亢舒亠仄仂亠 亳仄�"
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "�舒亰�亠�亳��"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
-msgstr "��从舒亰舒��"
-
-#: src/protocols/msn/msn.c:258
+msgstr "�舒仗�亠�亳��"
+
+#: src/protocols/msn/msn.c:313
 msgid "Send a mobile message."
-msgstr "��仗�舒于亳�� SMS"
-
-#: src/protocols/msn/msn.c:260
+msgstr "��仗�舒于亳�� 仄仂弍亳仍�仆仂亠 �仂仂弍�亠仆亳亠."
+
+#: src/protocols/msn/msn.c:315
 msgid "Page"
 msgstr "弌��舒仆亳�舒"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
-#: src/protocols/msn/state.c:32
+#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:764
+#: src/protocols/msn/state.c:34
 msgid "Away From Computer"
-msgstr "��仂�亠仍 仂� 从仂仄仗���亠�舒"
-
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+msgstr "��仂��仍 仂� 从仂仄仗���亠�舒"
+
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2529
+#: src/protocols/yahoo/yahoo.c:2904 src/protocols/yahoo/yahoo.c:3018
 msgid "Be Right Back"
 msgstr "弌从仂�仂 于亠�仆���"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2531
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3019
 msgid "Busy"
 msgstr "�舒仆��"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2539
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3023
 msgid "On The Phone"
 msgstr "�舒亰亞仂于舒�亳于舒� 仗仂 �亠仍亠�仂仆�"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2543
+#: src/protocols/yahoo/yahoo.c:2918 src/protocols/yahoo/yahoo.c:3025
 msgid "Out To Lunch"
-msgstr "���亠仍 仆舒 仍舒仆�"
-
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+msgstr "�仂��仍 仗亠�亠从��亳��"
+
+#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
+#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
-msgstr "�亠于亳亟亳仄�亶"
-
-#: src/protocols/msn/msn.c:378
+msgstr "弌从����亶"
+
+#: src/protocols/msn/msn.c:482
 msgid "Set Friendly Name"
 msgstr "丕��舒仆仂于亳�� 仂�仂弍�舒亢舒亠仄仂亠 亳仄�"
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:487
 msgid "Set Home Phone Number"
-msgstr ""
-
-#: src/protocols/msn/msn.c:392
+msgstr "丕从舒亰舒�� 仆仂仄亠� 亟仂仄舒�仆亠亞仂 �亠仍亠�仂仆舒"
+
+#: src/protocols/msn/msn.c:491
 msgid "Set Work Phone Number"
-msgstr ""
-
-#: src/protocols/msn/msn.c:398
+msgstr "丕从舒亰舒�� 仆仂仄亠� �舒弍仂�亠亞仂 �亠仍亠�仂仆舒"
+
+#: src/protocols/msn/msn.c:495
 msgid "Set Mobile Phone Number"
-msgstr "丕从舒亰舒�� 仄仂弍亳仍�仆�亶 �亠仍亠�仂仆"
-
-#: src/protocols/msn/msn.c:407
+msgstr "丕从舒亰舒�� 仆仂仄亠� 仄仂弍亳仍�仆仂亞仂 �亠仍亠�仂仆舒"
+
+#: src/protocols/msn/msn.c:501
 msgid "Enable/Disable Mobile Devices"
-msgstr ""
-
-#: src/protocols/msn/msn.c:414
+msgstr "�舒亰�亠�亳��/亰舒仗�亠�亳�� 仄仂弍亳仍�仆�亠 ����仂亶��于舒"
+
+#: src/protocols/msn/msn.c:506
 msgid "Allow/Disallow Mobile Pages"
-msgstr ""
-
-#: src/protocols/msn/msn.c:440
+msgstr "�舒亰�亠�亳��/亰舒仗�亠�亳�� 仄仂弍亳仍�仆�亠 ���舒仆亳��"
+
+#: src/protocols/msn/msn.c:529
 msgid "Send to Mobile"
-msgstr "��仗�舒于亳�� SMS"
-
-#: src/protocols/msn/msn.c:449
+msgstr ""
+
+#: src/protocols/msn/msn.c:539
 msgid "Initiate Chat"
 msgstr "�舒�舒�� �舒亰亞仂于仂�"
 
-#: src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:548
+msgid "Update Buddy Icon"
+msgstr "�弍仆仂于亳�� 亰仆舒�仂从 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/msn/msn.c:585
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 msgstr ""
-
-#: src/protocols/msn/msn.c:785
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
-#, fuzzy
-msgid "Invalid MSN screen name"
-msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍� MSN揃"
-
-#: src/protocols/msn/msn.c:825
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
-msgid "<html><body><b>Error retrieving profile</b></body></html>"
-msgstr ""
+"�仂亟亟亠�亢从舒 SSL 仆亠仂弍�仂亟亳仄舒 亟仍� MSN. 丕��舒仆仂于亳�亠 仗仂亟亟亠�亢亳于舒亠仄�� 弍亳弍仍亳仂�亠从� SSL. "
+"�舒 亟仂仗仂仍仆亳�亠仍�仆仂亶 亳仆�仂�仄舒�亳亠亶 仂弍�舒�舒亶�亠�� 仆舒 http://gaim.sf.net/faq-ssl.php."
+
+#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
+#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
+#: src/protocols/yahoo/yahoo_profile.c:653
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/msn/msn.c:1137
+msgid "MSN ID"
+msgstr "MSN ID"
+
+#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
+#: src/protocols/zephyr/zephyr.c:560
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>��亠于亟仂仆亳仄:</b> %s<br>"
+
+#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
+#: src/protocols/yahoo/yahoo_profile.c:746
+#: src/protocols/yahoo/yahoo_profile.c:834
+msgid "Error retrieving profile"
+msgstr "��亳弍从舒 亰舒亞��亰从亳 仗�仂�亳仍�"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Age"
 msgstr "�仂亰�舒��"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Gender"
 msgstr "�仂仍"
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Marital Status"
 msgstr "��舒�仆�亶 ��舒���"
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Location"
 msgstr "�亠��仂仗仂仍仂亢亠仆亳亠"
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Occupation"
-msgstr "�舒仆��"
-
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+msgstr "�舒仆��仂���"
+
+#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369
 msgid "A Little About Me"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+msgstr "�亠仄仆仂亞仂 仂 �亠弍亠"
+
+#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
+#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
 msgid "Favorite Things"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+msgstr "��弍亳仄�亠 于亠�亳"
+
+#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1420
 msgid "Hobbies and Interests"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
-#: src/protocols/yahoo/yahoo.c:3056
+msgstr "丱仂弍弍亳 亳 亳仆�亠�亠��"
+
+#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
+#: src/protocols/yahoo/yahoo_profile.c:1067
 msgid "Favorite Quote"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+msgstr "��弍亳仄仄舒� �亳�舒�舒"
+
+#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Last Updated"
 msgstr "�仂�仍亠亟仆亠亠 仂弍仆仂于仍亠仆亳亠"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "�仂仄舒�仆�� ���舒仆亳�舒"
 
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 '%s' 仆亠亟仂���仗仆舒"
-
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b> "
+
+#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
+msgid "Profile URL"
+msgstr "URL 仗�仂�亳仍�"
+
+#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
 msgid "The user's profile is empty."
-msgstr "�仂仍�亰仂于舒�亠仍��从亳亶 仗�仂�亳仍� 仗���."
-
-#: src/protocols/msn/msn.c:1626
+msgstr "��仂�亳仍� 仗仂仍�亰仂于舒�亠仍� 仗���."
+
+#: src/protocols/msn/msn.c:1616
 msgid "Display conversation closed notices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1621
 msgid "Display timeout notices"
 msgstr ""
 
@@ -6369,81 +6671,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1702 src/protocols/msn/msn.c:1704
 msgid "MSN Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 MSN"
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1723 src/protocols/trepia/trepia.c:1289
 msgid "Login server"
 msgstr "弌亠�于亠�:"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1732
 msgid "Use HTTP Method"
-msgstr ""
-
-#: src/protocols/msn/nexus.c:56
+msgstr "��仗仂仍�亰仂于舒�� 仄亠�仂亟 HTTP"
+
+#: src/protocols/msn/nexus.c:79
 msgid "Unable to connect to server"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄"
 
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr "�亠 �亟舒���� 仗亳�舒�� 仆舒 �亠�于亠� MSN Nexus."
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr ""
-
-#: src/protocols/msn/nexus.c:204
+#: src/protocols/msn/nexus.c:215
 msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr ""
-
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 仗�亳 仗仂仗��从亠 舒于�仂�亳亰舒�亳亳 � �亠�于亠�仂仄 于�仂亟舒 MSN."
+
+#: src/protocols/msn/notification.c:84
+msgid "Requesting to send password"
+msgstr "�舒仗�仂� 亟仍� 仂�仗�舒于从亳 仗舒�仂仍�"
+
+#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
-msgstr "�仂仍��舒亠��� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
-
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+msgstr "�仂仍��亠仆亳亠 �仗亳�从舒 从仂仆�舒从�仂于"
+
+#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
+#: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
-msgstr "�舒�仂仍� 仗仂�仍舒仆"
-
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr "�亠 �亟舒���� 仗仂�仍舒�� 仗舒�仂仍�"
-
-#: src/protocols/msn/notification.c:397
-msgid "Protocol not supported"
-msgstr "��仂�仂从仂仍 仆亠 仗仂亟亟亠�亢亳于舒亠���"
-
-#: src/protocols/msn/notification.c:440
-msgid "You have been disconnected. You have signed on from another location."
-msgstr "弌仂亠亟亳仆亠仆亳亠 仗�亠�于舒仆仂. �� 亰舒�仍亳 � 亟��亞仂亞仂 仄亠��舒."
-
-#: src/protocols/msn/notification.c:445
-msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr "弌仂亠亟亳仆亠仆亳亠 仗�亠�于舒仆仂. 弌亠�于亠�舒 MSN 于�亠仄亠仆仆仂 仆亠 ��仆从�亳仂仆亳����."
-
-#: src/protocols/msn/notification.c:584
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "�仂仍�亰仂于舒�亠仍� %s (%s) �仂�亠� 亟仂弍舒于亳�� %s 于 �于仂亶 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶."
-
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr "�仂仍�亰仂于舒�亠仍� %s (%s) �仂�亠� 亟仂弍舒于亳�� 于舒� 于 �于仂亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
-
-#: src/protocols/msn/notification.c:1362
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr ""
-
-#: src/protocols/msn/notification.c:1607
-msgid "Unable to transfer to notification server"
-msgstr "�亠 �亟舒���� �于�亰舒���� �亠�于亠�仂仄 仆舒仗仂仄亳仆舒仆亳亶."
-
-#: src/protocols/msn/notification.c:1776
+msgstr "�舒�仂仍� 仂�仗�舒于仍亠仆"
+
+#: src/protocols/msn/notification.c:1069
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6462,47 +6723,77 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/servconn.c:389
-#, fuzzy
-msgid "IO Error."
-msgstr "��亳弍从舒"
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/notification.c:1134
+msgid "Syncing with server"
+msgstr "弌亳仆��仂仆亳亰舒�亳� � �亠�于亠�仂仄"
+
+#: src/protocols/msn/servconn.c:46
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄 %s"
+
+#: src/protocols/msn/servconn.c:50
+#, c-format
+msgid "Error writing to %s server"
+msgstr "��亳弍从舒 亰舒仗亳�亳 仆舒 �亠�于亠� %s"
+
+#: src/protocols/msn/servconn.c:54
+#, c-format
+msgid "Error reading from %s server"
+msgstr "��亳弍从舒 ��亠仆亳� � �亠�于亠�舒 %s"
+
+#: src/protocols/msn/servconn.c:58
+#, c-format
+msgid "Unknown error from %s server"
+msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 � �亠�于亠�舒 %s"
+
+#: src/protocols/msn/servconn.c:72
+#, c-format
+msgid "MSN error for account %s"
+msgstr "��亳弍从舒 MSN 亟仍� ����仆仂亶 亰舒仗亳�亳 %s"
+
+#: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:150
+msgstr "��亳仆��舒 仂�亳弍从舒 HTTP. 弌仂仂弍�亳�亠 仂弍 ��仂仄."
+
+#: src/protocols/msn/switchboard.c:201
 msgid "The conversation has become inactive and timed out."
-msgstr ""
-
-#: src/protocols/msn/switchboard.c:159
+msgstr "�亠�亠亟舒 仗仂�亠��仍舒 舒从�亳于仆仂���."
+
+#: src/protocols/msn/switchboard.c:209
 #, c-format
 msgid "%s has closed the conversation window."
-msgstr "%s 亰舒从��仍 仂从仆仂 亟亳舒仍仂亞舒 � 于舒仄亳"
-
-#: src/protocols/msn/switchboard.c:300
-msgid "An MSN message may not have been received."
-msgstr ""
-
-#: src/protocols/napster/napster.c:228
+msgstr "%s 亰舒从��仍 仂从仆仂 亟亳舒仍仂亞舒 � 于舒仄亳."
+
+#: src/protocols/msn/userlist.c:86
+#, 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:94
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "�仂仍�亰仂于舒�亠仍� %s �仂�亠� 亟仂弍舒于亳�� %s 于 �于仂亶 �仗亳�仂从 从仂仆�舒从�仂于."
+
+#: src/protocols/napster/napster.c:230
 msgid "Unable to read header from server"
-msgstr "�亠 �亟舒���� 仗�仂�亳�舒�� 亰舒亞仂仍仂于从亳 � �亠�于亠�舒"
-
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr ""
+msgstr "�亠 �亟舒���� 仗�仂�亠��� 亰舒亞仂仍仂于仂从 � �亠�于亠�舒"
+
+#: src/protocols/napster/napster.c:244
+#, 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:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
-msgstr ""
+msgstr "仗仂仍�亰仂于舒�亠仍亳: %s, �舒亶仍�: %s, �舒亰仄亠�: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
 #: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr ""
+msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� \"%s\" 于 亞仂���亳亶 �仗亳�仂从 Napster"
 
 #: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
@@ -6512,28 +6803,24 @@
 #: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
-msgstr "%s 亰舒仗�仂�亳仍 仂 于舒� 亳仆�仂�仄舒�亳�"
+msgstr "%s 亰舒仗�仂�亳仍 亳仆�仂�仄舒�亳� 仂 于舒�"
 
 #: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
-msgstr "弌仂亠亟亳仆亠仆亳亠 仗�亠�于舒仆仂, �舒从 从舒从 于� 亰舒�仍亳 � 亟��亞仂亞仂 从仂仄仗���亠�舒."
+msgstr "�� 弍�仍亳 仂��仂亠亟亳仆亠仆� 仂� �亠�于亠�舒, 仗仂�从仂仍�从� 于� 亰舒�仍亳 亳亰 亟��亞仂亞仂 仄亠��舒"
 
 #. MSG_CLIENT_PING
 #: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
-msgstr "%s �亟亠仍舒仍 PING-亰舒仗�仂�"
-
-#: src/protocols/napster/napster.c:541
-msgid "Get Info"
-msgstr "� 仗亠��仂仆亠"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
-#: src/protocols/toc/toc.c:1259
+msgstr "%s 亰舒仗�仂�亳仍 PING"
+
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
-msgstr "_���仗仗舒:"
+msgstr "���仗仗舒:"
 
 #. *< api_version
 #. *< type
@@ -6546,74 +6833,237 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
 msgid "NAPSTER Protocol Plugin"
-msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Napster"
-
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:225
-#, fuzzy, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "弌仂仂弍�亠仆亳亠 仆亠 仗亠�亠�仍舒仆仂, �舒从 从舒从 仂仆仂 �仍亳�从仂仄 于亠仍亳从仂."
-
-#: src/protocols/novell/novell.c:371
-#, fuzzy, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "�� �仂�亳�亠 亟仂弍舒于亳�� ��仂� 从仂仆�舒从� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于?"
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 NAPSTER"
+
+#: src/protocols/novell/nmuser.c:2046
+msgid "Required parameters not passed in"
+msgstr "�亠仂弍�仂亟亳仄�亠 仗舒�舒仄亠��� 仆亠 仗亠�亠亟舒仆�"
+
+#: src/protocols/novell/nmuser.c:2049
+msgid "Unable to write to network"
+msgstr "�亠 �亟舒���� 仗亳�舒�� 于 �亠��"
+
+#: src/protocols/novell/nmuser.c:2052
+msgid "Unable to read from network"
+msgstr "�亠 �亟舒���� �亳�舒�� 亳亰 �亠�亳"
+
+#: src/protocols/novell/nmuser.c:2055
+msgid "Error communicating with server"
+msgstr "��亳弍从舒 �于�亰亳 � �亠�于亠�仂仄"
+
+#: src/protocols/novell/nmuser.c:2059
+msgid "Conference not found"
+msgstr "�仂仆�亠�亠仆�亳� 仆亠 仆舒亶亟亠仆舒"
+
+#: src/protocols/novell/nmuser.c:2062
+msgid "Conference does not exist"
+msgstr "�仂仆�亠�亠仆�亳� 仆亠 ���亠��于�亠�"
+
+#: src/protocols/novell/nmuser.c:2066
+msgid "A folder with that name already exists"
+msgstr "�舒仗从舒 � �舒从亳仄 亳仄亠仆亠仄 �亢亠 ���亠��于�亠�"
+
+#: src/protocols/novell/nmuser.c:2069
+msgid "Not supported"
+msgstr "�亠 仗仂亟亟亠�亢亳于舒亠���"
+
+#: src/protocols/novell/nmuser.c:2073
+msgid "Password has expired"
+msgstr "弌�仂从 亟亠亶��于亳� 仗舒�仂仍� 亳���从"
+
+#: src/protocols/novell/nmuser.c:2076
+msgid "Invalid password"
+msgstr "�亠于亠�仆�亶 仗舒�仂仍�"
+
+#: src/protocols/novell/nmuser.c:2079
+msgid "User not found"
+msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 仆舒亶亟亠仆"
+
+#: src/protocols/novell/nmuser.c:2082
+msgid "Account has been disabled"
+msgstr "丕���仆舒� 亰舒仗亳�� 弍�仍舒 仂�从仍��亠仆舒"
+
+#: src/protocols/novell/nmuser.c:2085
+msgid "The server could not access the directory"
+msgstr "弌亠�于亠� 仆亠 �仄仂亞 仗仂仍��亳�� 亟仂���仗 从 从舒�舒仍仂亞�"
+
+#: src/protocols/novell/nmuser.c:2088
+msgid "Your system administrator has disabled this operation"
+msgstr "�舒� �亳��亠仄仆�亶 舒亟仄亳仆亳���舒�仂� 仂�从仍��亳仍 ��� 仂仗亠�舒�亳�"
+
+#: src/protocols/novell/nmuser.c:2091
+msgid "The server is unavailable; try again later"
+msgstr "弌亠�于亠� 仆亠亟仂���仗亠仆; 仗仂于�仂�亳�亠 仗仂仗��从� 仗仂亰亢亠"
+
+#: src/protocols/novell/nmuser.c:2094
+msgid "Cannot add a contact to the same folder twice"
+msgstr "�亠仍�亰� 亟仂弍舒于亳�� 从仂仆�舒从� 于 �� 亢亠 仗舒仗从� 亟于舒亢亟�"
+
+#: src/protocols/novell/nmuser.c:2097
+msgid "Cannot add yourself"
+msgstr "�亠仍�亰� 亟仂弍舒于亳�� �亠弍� �舒仄仂亞仂"
+
+#: src/protocols/novell/nmuser.c:2100
+msgid "Master archive is misconfigured"
+msgstr "�仍舒于仆�亶 舒��亳于 仆亠仆舒���仂亠仆"
+
+#: src/protocols/novell/nmuser.c:2104
+msgid "Invalid username or password"
+msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗舒�仂仍�"
+
+#: src/protocols/novell/nmuser.c:2107
+msgid "Could not recognize the host of the username you entered"
+msgstr "�亠 �亟舒仍仂�� �亰仆舒�� �亰亠仍 于于亠亟亠仆仆仂亞仂 亳仄亠仆亳 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/novell/nmuser.c:2110
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr ""
+"�舒�舒 ����仆舒� 亰舒仗亳�� 弍�仍舒 仂�从仍��亠仆舒, 仗仂�仂仄� ��仂 弍�仍仂 于于亠亟亠仆仂 �仍亳�从仂仄 仄仆仂亞仂 "
+"仆亠于亠�仆�� 仗舒�仂仍亠亶"
+
+#: src/protocols/novell/nmuser.c:2113
+msgid "You cannot add the same person twice to a conversation"
+msgstr "�� 仆亠 仄仂亢亠�亠 亟仂弍舒于亳�� 于 弍亠�亠亟� 仂亟仆� 亳 �� 亢亠 仗亠��仂仆� 亟于舒亢亟�"
+
+#: src/protocols/novell/nmuser.c:2117
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "�� 亟仂��亳亞仍亳 仗�亠亟亠仍舒 亟仂仗���亳仄仂亞仂 从仂仍亳�亠��于舒 从仂仆�舒从�仂于"
+
+#: src/protocols/novell/nmuser.c:2120
+msgid "You have entered an invalid username"
+msgstr "�� 于于亠仍亳 仆亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/novell/nmuser.c:2123
+msgid "An error occurred while updating the directory"
+msgstr "��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 仂弍仆仂于仍亠仆亳亳 从舒�舒仍仂亞舒"
+
+#: src/protocols/novell/nmuser.c:2126
+msgid "Incompatible protocol version"
+msgstr "�亠�仂于仄亠��亳仄舒� 于亠��亳� 仗�仂�仂从仂仍舒"
+
+#: src/protocols/novell/nmuser.c:2129
+msgid "The user has blocked you"
+msgstr "�仂仍�亰仂于舒�亠仍� 弍仍仂从亳��亠� 于舒�"
+
+#: src/protocols/novell/nmuser.c:2132
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+
+#: src/protocols/novell/nmuser.c:2135
+msgid "The user is either offline or you are blocked"
+msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳, 仍亳弍仂 于� 亰舒弍仍仂从亳�仂于舒仆�"
+
+#: src/protocols/novell/nmuser.c:2138
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒: 0x%X"
+
+#: src/protocols/novell/novell.c:116
+#, c-format
+msgid "Login failed (%s)."
+msgstr "�仂仗��从舒 于�仂亟舒 仆亠 �亟舒仍舒�� (%s)."
+
+#: src/protocols/novell/novell.c:229
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+"�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠. �亠 �亟舒仍仂�� 仗仂仍��亳�� 仗仂亟�仂弍仆仂��亳 亟仍� "
+"仗仂仍�亰仂于舒�亠仍� (%s)."
+
+#: src/protocols/novell/novell.c:375
+#, 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:397
-#, fuzzy, c-format
-msgid "Unable to send message (0x%X)."
-msgstr "弌仂仂弍�亠仆亳亠 仆亠 仗亠�亠�仍舒仆仂."
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:489
-#, fuzzy, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "弌仂仂弍�亠仆亳亠 仆亠 仗亠�亠�仍舒仆仂, �舒从 从舒从 仂仆仂 �仍亳�从仂仄 于亠仍亳从仂."
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:401
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 (%s)."
+
+#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "�亠 �亟舒���� 仗�亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� (%s)."
+
+#: src/protocols/novell/novell.c:511
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+"�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s. �亠 �亟舒仍仂�� �仂亰亟舒�� 舒��仂�亳舒�亳� (%s)."
+
+#: src/protocols/novell/novell.c:516
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠. �亠 �亟舒仍仂�� �仂亰亟舒�� 舒��仂�亳舒�亳� (%s)."
+
+#: src/protocols/novell/novell.c:563
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:584
+"creating folder (%s)."
+msgstr ""
+"�亠 �亟舒���� 仗亠�亠仄亠��亳�� 仗仂仍�亰仂于舒�亠仍� %s 于 仗舒仗从� %s 于 �仗亳�从亠 仆舒 ��仂�仂仆亠 "
+"�亠�于亠�舒. ��亳弍从舒 仗�亳 �仂亰亟舒仆亳亳 仗舒仗从亳 (%s)."
+
+#: src/protocols/novell/novell.c:611
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
-#, fuzzy, c-format
-msgid "GroupWise Conference %d"
-msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳�"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr ""
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
-#, fuzzy
+"list (%s)."
+msgstr ""
+"�亠 �亟舒���� 亟仂弍舒于亳�� %s 于 �仗亳�仂从 从仂仆�舒从�仂于. ��亳弍从舒 �仂亰亟舒仆亳� 仗舒仗从亳 于 �仗亳�从亠 仆舒 "
+"��仂�仂仆亠 �亠�于亠�舒 (%s)."
+
+#: src/protocols/novell/novell.c:683
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "�亠 �亟舒仍仂�� 仗仂仍��亳�� 仗仂亟�仂弍仆仂��亳 亟仍� 仗仂仍�亰仂于舒�亠仍� %s (%s)."
+
+#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 (%s)."
+
+#: src/protocols/novell/novell.c:776
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� %s 于 �仗亳�仂从 亰舒仗�亠�舒 (%s)."
+
+#: src/protocols/novell/novell.c:829
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� %s 于 �仗亳�仂从 亟仂仗��从舒 (%s)."
+
+#: src/protocols/novell/novell.c:897
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "�亠 �亟舒���� �亟舒仍亳�� %s 亳亰 �仗亳�从舒 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 (%s)."
+
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+"�亠 �亟舒���� 亳亰仄亠仆亳�� ���舒仆仂于从亳 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 仆舒 ��仂�仂仆亠 �亠�于亠�舒 (%s)."
+
+#: src/protocols/novell/novell.c:992
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "�亠 �亟舒���� �仂亰亟舒�� 舒��仂�亳舒�亳� (%s)."
+
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
 msgid "Error communicating with server. Closing connection."
-msgstr "��亳弍从舒 �于�亰亳 � �亠�于亠�仂仄 Gadu-Gadu"
-
-#: src/protocols/novell/novell.c:982
-#, fuzzy
+msgstr "��亳弍从舒 �于�亰亳 � �亠�于亠�仂仄. �舒从���亳亠 �仂亠亟亳仆亠仆亳�."
+
+#: src/protocols/novell/novell.c:1425
 msgid "Userid"
-msgstr "�仂_仍�亰仂于舒�亠仍�:"
+msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6622,105 +7072,109 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
-#, fuzzy
+#: src/protocols/novell/novell.c:1439
 msgid "Full name"
 msgstr "�仂仍仆仂亠 �仄�"
 
-#: src/protocols/novell/novell.c:1016
-#, fuzzy
+#: src/protocols/novell/novell.c:1459
 msgid "User Properties"
-msgstr "�舒�舒仄亠��� 仗�仂从�亳"
-
-#: src/protocols/novell/novell.c:1084
-#, fuzzy
+msgstr "弌于仂亶��于舒 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/novell/novell.c:1563
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "�仂仆�亠�亠仆�亳� GroupWise %d"
+
+#: src/protocols/novell/novell.c:1588
 msgid "Unable to make SSL connection to server."
-msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄."
-
-#: src/protocols/novell/novell.c:1113
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1147
-#, fuzzy
+msgstr "�亠 �亟舒���� ���舒仆仂于亳�� SSL-�仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄."
+
+#: src/protocols/novell/novell.c:1618
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "��亳弍从舒 仂弍�舒弍仂�从亳 �仂弍��亳� 亳仍亳 仂�于亠�舒 (%s)."
+
+#: src/protocols/novell/novell.c:1652
 msgid "Authenticating..."
-msgstr "���亠仆�亳�亳从舒�亳�"
-
-#: src/protocols/novell/novell.c:1162
-#, fuzzy
+msgstr "�亟亠仆�亳�亳从舒�亳�..."
+
+#: src/protocols/novell/novell.c:1667
 msgid "Waiting for response..."
-msgstr "�亢亳亟舒亠��� 仂�于亠�..."
-
-#: src/protocols/novell/novell.c:1302
-#, fuzzy
+msgstr "�亢亳亟舒仆亳亠 仂�于亠�舒..."
+
+#: src/protocols/novell/novell.c:1802
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s 弍�仍 仗�亳亞仍舒��仆 从 ��仂亶 弍亠�亠亟亠."
+
+#: src/protocols/novell/novell.c:1829
 msgid "Invitation to Conversation"
-msgstr "���仆舒仍 弍亠�亠亟�"
-
-#: src/protocols/novell/novell.c:1303
+msgstr "��亳亞仍舒�亠仆亳亠 从 弍亠�亠亟亠"
+
+#: src/protocols/novell/novell.c:1830
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
 msgstr ""
-
-#: src/protocols/novell/novell.c:1305
-#, fuzzy
+"��亳亞仍舒�亠仆亳亠 仂�: %s\n"
+"\n"
+"��仗�舒于仍亠仆仂: %s"
+
+#: src/protocols/novell/novell.c:1832
 msgid "Would you like to join the conversation?"
-msgstr "丱仂�亳�亠 仗亠�亠亰舒仗亳�舒��?"
-
-#: src/protocols/novell/novell.c:1408
-#, fuzzy
+msgstr "�� �仂�亠仍亳 弍� 仗�亳�仂亠亟亳仆亳���� 从 弍亠�亠亟亠?"
+
+#: src/protocols/novell/novell.c:1937
 msgid "You have been logged out because you logged in at another workstation."
-msgstr "弌仂亠亟亳仆亠仆亳亠 仗�亠�于舒仆仂 仗仂 仗�亳�亳仆亠 亠亞仂 ���舒仆仂于仍亠仆亳� � 亟��亞仂亞仂 从仂仄仗���亠�舒."
-
-#: src/protocols/novell/novell.c:1462
+msgstr "�� 弍�仍亳 仂�从仍��亠仆�, �舒从 从舒从 亰舒�仍亳 � 亟��亞仂亶 仄舒�亳仆�."
+
+#: src/protocols/novell/novell.c:1991
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
+"弌�亟� 仗仂 于�亠仄�, %s 仆亠 于 �亠�亳 亳 仆亠 仗仂仍��亳仍 �仂仂弍�亠仆亳亠, 从仂�仂�仂亠 于� �仂仍�从仂 ��仂 "
+"仂�仗�舒于亳仍亳."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:1560
-#, fuzzy
+#: src/protocols/novell/novell.c:2089
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
-msgstr "�仂亢舒仍�亶��舒, 于于亠亟亳�亠 亳仄� 弍仍仂从亳��亠仄仂亞仂 仗仂仍�亰仂于舒�亠仍�."
-
-#: src/protocols/novell/novell.c:1582
+msgstr ""
+"�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄. �于亠亟亳�亠 舒亟�亠� �亠�于亠�舒, � 从仂�仂��仄 于� "
+"�仂�亳�亠 �仂亠亟亳仆亳����."
+
+#: src/protocols/novell/novell.c:2111
 msgid "Error. SSL support is not installed."
-msgstr ""
-
-#: src/protocols/novell/novell.c:1846
+msgstr "��亳弍从舒. �仂亟亟亠�亢从舒 SSL 仆亠 ���舒仆仂于仍亠仆舒."
+
+#: src/protocols/novell/novell.c:2420
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
-
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+"亅�舒 从仂仆�亠�亠仆�亳� 弍�仍舒 亰舒从���舒. 弌仂仂弍�亠仆亳� 弍仂仍��亠 仆亠 仄仂亞�� 弍��� 仂�仗�舒于仍亠仆�."
+
+#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2551
 msgid "Offline"
-msgstr "��从仍���仆"
-
-#: src/protocols/novell/novell.c:2164
-#, fuzzy, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr "<b>弌�舒���:</b> %s"
-
-#: src/protocols/novell/novell.c:2168
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>弌�舒���:</b> %s"
-
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
-#, fuzzy
+msgstr "�亠 于 �亠�亳"
+
+#: src/protocols/novell/novell.c:2738
+msgid "Message"
+msgstr "弌仂仂弍�亠仆亳亠:"
+
+#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
 msgid "Appear Offline"
-msgstr "��从仍���仆"
+msgstr "�亠�仂��仆仂 仆亠 于 �亠�亳"
+
+#: src/protocols/novell/novell.c:3287
+msgid "Initiate _Chat"
+msgstr "�仆亳�亳亳�仂于舒�� �舒亰亞仂于仂�"
 
 #. *< api_version
 #. *< type
@@ -6733,258 +7187,288 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:3380 src/protocols/novell/novell.c:3382
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2428
-#, fuzzy
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Novell GroupWise Messenger"
+
+#: src/protocols/novell/novell.c:3401
 msgid "Server address"
-msgstr "�亟�亠� 亟仂仄舒"
-
-#: src/protocols/novell/novell.c:2432
-#, fuzzy
+msgstr "�亟�亠� �亠�于亠�舒"
+
+#: src/protocols/novell/novell.c:3405
 msgid "Server port"
-msgstr "弌亠�于亠�"
-
-#: src/protocols/oscar/oscar.c:182
+msgstr "�仂�� �亠�于亠�舒"
+
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
-msgstr "��亳弍从舒"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Invalid SNAC"
-msgstr "�亠仗�舒于亳仍�仆�亶 SNAC"
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Rate to host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:185
-msgid "Rate to client"
-msgstr ""
+msgstr "�亠亟仂仗���亳仄舒� 仂�亳弍从舒"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Service unavailable"
-msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
+msgid "Invalid SNAC"
+msgstr "�亠亟仂仗���亳仄�亶 SNAC"
 
 #: src/protocols/oscar/oscar.c:188
+msgid "Rate to host"
+msgstr "��亠仆亳�� �亰亠仍"
+
+#: src/protocols/oscar/oscar.c:189
+msgid "Rate to client"
+msgstr "��亠仆亳�� 从仍亳亠仆�舒"
+
+#: src/protocols/oscar/oscar.c:191
+msgid "Service unavailable"
+msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
+
+#: src/protocols/oscar/oscar.c:192
 msgid "Service not defined"
 msgstr "弌仍�亢弍舒 仆亠 仂仗�亠亟亠仍亠仆舒"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:193
 msgid "Obsolete SNAC"
 msgstr "丕��舒�亠于�亳亶 SNAC"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:194
 msgid "Not supported by host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Not supported by client"
-msgstr "�亠 仗仂亟亟亠�亢亳于舒亠��� 从仍亳亠仆�仂仄"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Refused by client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:193
-msgid "Reply too big"
-msgstr "��于亠� �仍亳�从仂仄 弍仂仍��仂亶"
-
-#: src/protocols/oscar/oscar.c:194
-msgid "Responses lost"
-msgstr ""
+msgstr "�亠 仗仂亟亟亠�亢亳于舒亠��� �亰仍仂仄"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Request denied"
-msgstr "�舒仗�仂� 亰舒仗�亠�亠仆"
+msgid "Not supported by client"
+msgstr "�亠 仗仂亟亟亠�亢亳于舒亠��� 从仍亳亠仆�仂仄"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Busted SNAC payload"
-msgstr ""
+msgid "Refused by client"
+msgstr "��于亠�亞仆��仂 从仍亳亠仆�仂仄"
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Insufficient rights"
-msgstr ""
+msgid "Reply too big"
+msgstr "��于亠� �仍亳�从仂仄 弍仂仍��仂亶"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "In local permit/deny"
-msgstr ""
+msgid "Responses lost"
+msgstr "��从仍亳从亳 仗仂�亠��仆�"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Too evil (sender)"
-msgstr ""
+msgid "Request denied"
+msgstr "�舒仗�仂� 亰舒仗�亠��仆"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "Too evil (receiver)"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:201
-msgid "User temporarily unavailable"
-msgstr "�仂仍�亰仂于舒�亠仍� 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆"
+msgid "Insufficient rights"
+msgstr "�亠亟仂��舒�仂�仆�亠 仗�舒于舒"
 
 #: src/protocols/oscar/oscar.c:202
-msgid "No match"
-msgstr "�亠� �仂于仗舒亟亠仆亳亶"
+msgid "In local permit/deny"
+msgstr ""
 
 #: src/protocols/oscar/oscar.c:203
-msgid "List overflow"
-msgstr "弌仗亳�仂从 仗亠�亠仗仂仍仆亠仆"
+msgid "Too evil (sender)"
+msgstr "弌仍亳�从仂仄 亰仍仂亶 (仂�仗�舒于亳�亠仍�)"
 
 #: src/protocols/oscar/oscar.c:204
-msgid "Request ambiguous"
-msgstr ""
+msgid "Too evil (receiver)"
+msgstr "弌仍亳�从仂仄 亰仍仂亶 (仗仂仍��舒�亠仍�)"
 
 #: src/protocols/oscar/oscar.c:205
-msgid "Queue full"
-msgstr "��亠�亠亟� 亰舒仗仂仍仆亠仆舒"
+msgid "User temporarily unavailable"
+msgstr "�仂仍�亰仂于舒�亠仍� 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆"
 
 #: src/protocols/oscar/oscar.c:206
+msgid "No match"
+msgstr "�亠� �仂于仗舒亟亠仆亳亶"
+
+#: src/protocols/oscar/oscar.c:207
+msgid "List overflow"
+msgstr "�亠�亠仗仂仍仆亠仆亳亠 �仗亳�从舒"
+
+#: src/protocols/oscar/oscar.c:208
+msgid "Request ambiguous"
+msgstr "�亠��仆�亶 亰舒仗�仂�"
+
+#: src/protocols/oscar/oscar.c:209
+msgid "Queue full"
+msgstr "��亠�亠亟� 仗仂仍仆舒"
+
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:428
+msgstr "�亠 于 AOL"
+
+#: src/protocols/oscar/oscar.c:436
 msgid "Voice"
 msgstr "�仂仍仂�"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:439
 msgid "AIM Direct IM"
-msgstr "���仄仂亠 AIM-�仂亠亟亳仆亠仆亳亠"
-
-#: src/protocols/oscar/oscar.c:434
+msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 AIM"
+
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "丼舒�"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
 msgid "Get File"
 msgstr "�仂仍��亳�� �舒亶仍"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:452
 msgid "Games"
 msgstr "�亞��"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:455
 msgid "Add-Ins"
 msgstr "�仂仗仂仍仆亠仆亳�"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:458
 msgid "Send Buddy List"
-msgstr "��仗�舒于亳�� �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/protocols/oscar/oscar.c:453
+msgstr "��仗�舒于亳�� �仗亳�仂从 从仂仆�舒从�仂于"
+
+#: src/protocols/oscar/oscar.c:461
 msgid "ICQ Direct Connect"
-msgstr "���仄仂亠 ICQ-�仂亠亟亳仆亠仆亳亠"
-
-#: src/protocols/oscar/oscar.c:456
+msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 ICQ"
+
+#: src/protocols/oscar/oscar.c:464
 msgid "AP User"
-msgstr "�仂仍�亰仂于舒�亠仍�"
-
-#: src/protocols/oscar/oscar.c:459
+msgstr "�仂仍�亰仂于舒�亠仍� AP"
+
+#: src/protocols/oscar/oscar.c:467
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:470
 msgid "Nihilist"
 msgstr "�亳亞亳仍亳��"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:473
 msgid "ICQ Server Relay"
-msgstr "丼亠�亠亰 �亠�于亠� ICQ"
-
-#: src/protocols/oscar/oscar.c:468
+msgstr "�亠仍亠亶仆�亶 �亠�于亠� ICQ"
+
+#: src/protocols/oscar/oscar.c:476
 msgid "Old ICQ UTF8"
-msgstr "弌�舒��亶 ICQ揃UTF8"
-
-#: src/protocols/oscar/oscar.c:471
+msgstr "弌�舒��亶 ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:479
 msgid "Trillian Encryption"
 msgstr "�仂亟亳�仂于舒仆亳亠 Trillian"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:482
 msgid "ICQ UTF8"
-msgstr "ICQ揃UTF8"
-
-#: src/protocols/oscar/oscar.c:477
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:485
 msgid "Hiptop"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:488
 msgid "Security Enabled"
-msgstr "�亠亰仂仗舒�仆仂��� 亰舒亟亠亶��于仂于舒仆舒"
-
-#: src/protocols/oscar/oscar.c:483
+msgstr "�亠亰仂仗舒�仆仂��� 于从仍��亠仆舒"
+
+#: src/protocols/oscar/oscar.c:491
 msgid "Video Chat"
 msgstr "�亳亟亠仂�舒�"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:495
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:498
 msgid "Live Video"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:493
-#, fuzzy
+msgstr "�亳于仂亠 于亳亟亠仂"
+
+#: src/protocols/oscar/oscar.c:501
 msgid "Camera"
-msgstr "�仄�"
-
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+msgstr "�舒仄亠�舒"
+
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:6666
 msgid "Free For Chat"
-msgstr "���� 于�亠仄� 仗仂弍仂仍�舒��"
-
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+msgstr "�仂�仂于 仗仂仂弍�舒����"
+
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:6664
 msgid "Not Available"
-msgstr "�亠 亟仂���仗亠仆"
-
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+msgstr "�亠亟仂���仗亠仆"
+
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
+#: src/protocols/oscar/oscar.c:6665
 msgid "Occupied"
 msgstr "�舒仆��"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:530
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:590
-#, fuzzy
+#: src/protocols/oscar/oscar.c:598
 msgid "Capabilities"
-msgstr "<b>�仂亰仄仂亢仆仂��亳:</b> "
-
-#: src/protocols/oscar/oscar.c:596
-#, fuzzy
+msgstr "�仂亰仄仂亢仆仂��亳"
+
+#: src/protocols/oscar/oscar.c:604
 msgid "Buddy Comment"
-msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒:"
-
-#: src/protocols/oscar/oscar.c:716
+msgstr "�仂仄仄亠仆�舒�亳亶 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s 亰舒从���仂"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:741
 #, c-format
 msgid "Direct IM with %s failed"
-msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s 亰舒从���仂"
-
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s 仂�于舒仍亳仍仂��"
+
+#: src/protocols/oscar/oscar.c:748
+msgid "Direct Connect failed"
+msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s ���舒仆仂于仍亠仆仂"
+
+#: src/protocols/oscar/oscar.c:906
+#, c-format
+msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+msgstr "�仂仗��从舒 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� � %s 于 %s:%hu."
+
+#: src/protocols/oscar/oscar.c:1322
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "�舒仗�仂� 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� %s � 仆舒仄亳 于 %s:%hu."
+
+#: src/protocols/oscar/oscar.c:1327
+msgid "Unable to open Direct IM"
+msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/oscar/oscar.c:1362
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "�� 于�弍�舒仍亳 仂�从���亳亠 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� � %s."
+
+#: src/protocols/oscar/oscar.c:1366
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
+msgid "Connect"
+msgstr "弌仂亠亟亳仆亳����"
+
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "��亠�于舒仆仂 �仂亠亟亳仆亠仆亳亠 � �舒�仂仄 %s."
-
-#: src/protocols/oscar/oscar.c:805
+msgstr "�� 弍�仍亳 仂��仂亠亟亳仆亠仆� 仂� �舒�舒 %s."
+
+#: src/protocols/oscar/oscar.c:1452
 msgid "Chat is currently unavailable"
-msgstr "丼舒� 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆"
-
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 �亰仍�"
-
-#: src/protocols/oscar/oscar.c:886
+msgstr "丼舒� �亠亶�舒� 仆亠亟仂���仗亠仆"
+
+#: src/protocols/oscar/oscar.c:1533
 msgid "Screen name sent"
-msgstr "�仄� 仗仂仍�亰仂于舒�亠仍� 仗亠�亠�仍舒仆仂"
-
-#: src/protocols/oscar/oscar.c:900
+msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仗�舒于仍亠仆"
+
+#: src/protocols/oscar/oscar.c:1547
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6992,184 +7476,175 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1575
 msgid "Unable to login to AIM"
-msgstr "�亠 �亟舒���� 亰舒亶�亳 仆舒 AIM"
-
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+msgstr "�亠 �亟舒���� 于仂亶�亳 于 �亠�� AIM"
+
+#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
 msgid "Could Not Connect"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1684
 msgid "Connection established, cookie sent"
-msgstr "弌仂亠亟亳仆亠仆亳亠 ���舒仆仂于仍亠仆仂, 亟舒仆仆�亠 于��仍舒仆�"
-
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
+msgstr "弌仂亠亟亳仆亠仆亳亠 ���舒仆仂于仍亠仆仂, 亟舒仆仆�亠 仂�仗�舒于仍亠仆�"
+
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:210
+#: src/protocols/yahoo/yahoo_filexfer.c:219
+#: src/protocols/yahoo/yahoo_filexfer.c:229
 msgid "Unable to establish file descriptor."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 亟亠�从�亳仗�仂� �舒亶仍舒."
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to create new connection."
 msgstr "�亠 �亟舒���� �仂亰亟舒�� 仆仂于仂亠 �仂亠亟亳仆亠仆亳亠."
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1873
 msgid "Unable to establish listener socket."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂从亠� 亟仍� 仗�仂�仍��亳于舒仆亳�."
+
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
-msgstr "�亠 从仂��亠从�仆�亶 仗�亠于亟仂仆亳仄 亳仍亳 仗舒�仂仍�."
-
-#: src/protocols/oscar/oscar.c:1339
+msgstr "�亠从仂��亠从�仆�亶 仗�亠于亟仂仆亳仄 亳仍亳 仗舒�仂仍�."
+
+#: src/protocols/oscar/oscar.c:1992
 msgid "Your account is currently suspended."
-msgstr "�舒�舒 ��亠�仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒."
+msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:1996
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "弌亠�于亳� AOL IM 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆."
-
-#: src/protocols/oscar/oscar.c:1348
+msgstr "弌仍�亢弍舒 AOL Instant Messenger 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."
+
+#: src/protocols/oscar/oscar.c:2001
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"�� 仗��舒仍亳�� �仂亠亟亳仆亳���� 亳 仂��仂亠亟亳仆亳���� �仍亳�从仂仄 �舒��仂. �仂亟仂亢亟亳�亠 10 仄亳仆�� 亳 "
-"仗仂仗�仂弍�亶�亠 亠�亠 �舒亰. ��仍亳 于� 弍�亟亠�亠 仗�仂亟仂仍亢舒�� 仗仂仗��从亳 于舒仄 仗�亳亟亠��� 仗仂亟仂亢亟舒�� "
-"亟仂仍��亠."
-
-#: src/protocols/oscar/oscar.c:1353
+"�� �仂亠亟亳仆�仍亳�� 亳 仂��仂亠亟亳仆�仍亳�� �仍亳�从仂仄 �舒��仂. �仂亟仂亢亟亳�亠 10 仄亳仆�� 亳 "
+"仗仂仗�仂弍�亶�亠 �仆仂于舒. ��仍亳 于� 仗�仂亟仂仍亢亳�亠 仗仂仗��从亳, 于舒仄 仗�亳亟���� 亢亟舒�� 亠�� 亟仂仍��亠."
+
+#: src/protocols/oscar/oscar.c:2006
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"�� 亳�仗仂仍�亰�亠�亠 �仍亳�从仂仄 ��舒��� 于亠��亳� 从仍亳亠仆�舒. �仂亢舒仍�亶��舒, ���舒仆仂于亳�亠 于亠��亳� %"
-"s"
-
-#: src/protocols/oscar/oscar.c:1385
+msgstr "�亠��亳� 从仍亳亠仆�舒, 从仂�仂��� 于� 亳�仗仂仍�亰�亠�亠, �仍亳�从仂仄 ��舒�舒. �弍仆仂于亳�亠 仆舒 %s"
+
+#: src/protocols/oscar/oscar.c:2038
 msgid "Internal Error"
-msgstr "�仆���亠仆�� 仂�亳弍从舒"
-
-#: src/protocols/oscar/oscar.c:1457
+msgstr "�仆���亠仆仆�� 仂�亳弍从舒"
+
+#: src/protocols/oscar/oscar.c:2110
 msgid "Received authorization"
-msgstr "�于�仂�亳亰舒�亳� 仗�亳仆��舒"
-
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+msgstr "��亳仆��舒 舒于�仂�亳亰舒�亳�"
+
+#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2264
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+"�� 仄仂亢亠�亠 弍��� �从仂�仂 仂��仂亠亟亳仆亠仆�. �仂亰仄仂亢仆仂, 于� 亰舒�仂�亳�亠 亳�仗仂仍�亰仂于舒�� TOC, "
+"仗仂从舒 ��仂 仆亠 弍�亟亠� 亳�仗�舒于仍亠仆仂. 弌仄仂��亳�亠 仂弍仆仂于仍亠仆亳� 仆舒 %s."
+
+#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
 msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "Gaim 仆亠 �仄仂亞 仗仂仍��亳�� 仗�舒于亳仍�仆�亶 �亠� AIM 仍仂亞亳仆舒."
-
-#: src/protocols/oscar/oscar.c:1614
+msgstr "Gaim 仆亠 �亟舒仍仂�� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒 AIM."
+
+#: src/protocols/oscar/oscar.c:2267
 msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim 仆亠 �仄仂亞 仗仂仍��亳�� 仗�舒于亳仍�仆�亶 �亠� 仍仂亞亳仆舒."
-
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s ���舒仆仂于仍亠仆仂"
-
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+msgstr "Gaim 仆亠 �亟舒仍仂�� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒."
+
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
 msgid "(There was an error receiving this message)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2713
+msgstr "(��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳�仄舒 ��仂亞仂 �仂仂弍�亠仆亳�)"
+
+#: src/protocols/oscar/oscar.c:3304
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2716
+msgstr "%s 亰舒仗�仂�亳仍 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 � %s"
+
+#: src/protocols/oscar/oscar.c:3307
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
-msgid "Connect"
-msgstr "弌仂亠亟亳仆亳����"
-
-#: src/protocols/oscar/oscar.c:2750
+"亅�仂 ��亠弍�亠� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 仄亠亢亟� 亟于�仄� 从仂仄仗���亠�舒仄亳 亳 仆亠仂弍�仂亟亳仄仂 亟仍� "
+"亳亰仂弍�舒亢亠仆亳亶."
+
+#: src/protocols/oscar/oscar.c:3343
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
-"�仂亢舒仍�亶��舒, 舒于�仂�亳亰�亶�亠 仄亠仆�, ��仂弍� � 仄仂亞(仍舒) 亟仂弍舒于亳�� 于舒� 于 �于仂亶 �仗亳�仂从 "
-"仗仂仍�亰仂于舒�亠仍亠亶."
-
-#: src/protocols/oscar/oscar.c:2758
+
+#: src/protocols/oscar/oscar.c:3351
 msgid "Authorization Request Message:"
 msgstr "弌仂仂弍�亠仆亳亠 亰舒仗�仂�舒 舒于�仂�亳亰舒�亳亳:"
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:3352
 msgid "Please authorize me!"
-msgstr "�于�仂�亳亰�亶�亠 仄亠仆�, 仗仂亢舒仍�亶��舒!"
-
-#: src/protocols/oscar/oscar.c:2788
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3382
 #, 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:2793 src/protocols/oscar/oscar.c:2795
+"�仂仍�亰仂于舒�亠仍� %s ��亠弍�亠� 舒于�仂�亳亰舒�亳� 仗亠�亠亟 亟仂弍舒于仍亠仆亳亠仄 亠亞仂 于 �仗亳�仂从 "
+"从仂仆�舒从�仂于. 丱仂�亳�亠 仂�仗�舒于亳�� 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳?"
+
+#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
 msgid "Request Authorization"
 msgstr "�舒仗�仂�亳�� 舒于�仂�亳亰舒�亳�"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
+#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
+#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6138
 msgid "No reason given."
 msgstr "��亳�亳仆舒 仆亠 �从舒亰舒仆舒."
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:3445
 msgid "Authorization Denied Message:"
-msgstr "弌仂仂弍�亠仆亳亠 仂�从舒亰舒 舒于�仂�亳亰舒�亳亳:"
-
-#: src/protocols/oscar/oscar.c:2922
+msgstr "弌仂仂弍�亠仆亳亠 仂�从舒亰舒 于 舒于�仂�亳亰舒�亳亳:"
+
+#: src/protocols/oscar/oscar.c:3528
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"�仂仍�亰仂于舒�亠仍� %u �仂�亠� 亟仂弍舒于亳�� 于舒� 于 �于仂亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 仗仂 �仍亠亟���亠亶 "
+"�仂仍�亰仂于舒�亠仍� %u �仂�亠� 亟仂弍舒于亳�� 于舒� 于 �于仂亶 �仗亳�仂从 从仂仆�舒从�仂于 仗仂 �仍亠亟���亠亶 "
 "仗�亳�亳仆亠:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
 msgid "Authorization Request"
 msgstr "�舒仗�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3548
 #, 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:2943
+#: src/protocols/oscar/oscar.c:3549
 msgid "ICQ authorization denied."
-msgstr "� 舒于�仂�亳亰舒�亳亳 仗仂 ICQ 仂�从舒亰舒仆仂."
+msgstr "� 舒于�仂�亳亰舒�亳亳 ICQ 仂�从舒亰舒仆仂."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "�仂仍�亰仂于舒�亠仍� '%u' �仂亞仍舒�亳仍�� 于从仍��亳�� 于舒� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
-
-#: src/protocols/oscar/oscar.c:2958
+msgstr "�仂仍�亰仂于舒�亠仍� %u 亟舒仍 �于仂� �仂亞仍舒�亳亠 于从仍��亳�� 于舒� 于 �仗亳�仂从 从仂仆�舒从�仂于."
+
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7177,12 +7652,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"�� 仗仂仍��亳仍亳 �仗亠�亳舒仍�仆仂亠 �仂仂弍�亠仆亳亠\n"
+"�� 仗�亳仆�仍亳 �仗亠�亳舒仍�仆仂亠 �仂仂弍�亠仆亳亠\n"
 "\n"
 "��: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7190,12 +7665,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"�舒仄 仗亠�亠�仍舒仆舒 ICQ-���舒仆亳�舒\n"
+"�� 仗�亳仆�仍亳 ICQ-���舒仆亳��\n"
 "\n"
-"��:揃%s揃[%s]\n"
+"��: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7203,317 +7678,349 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"�仍� 于舒� 亠��� ICQ-仗仂��舒揃仂� '%s;揃[%s]\n"
+"�� 仗�亳仆�仍亳 ICQ-仗仂��� 仂� %s [%s]\n"
 "\n"
-"弌仂仂弍�亠仆亳亠 �舒从仂于仂:\n"
+"弌仂仂弍�亠仆亳亠:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:3601
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "�仂仍�亰仂于舒�亠仍� ICQ '%u' 仗亠�亠�仍舒仍 于舒仄 从仂仆�舒从�: %s (%s)"
-
-#: src/protocols/oscar/oscar.c:3001
+msgstr "�仂仍�亰仂于舒�亠仍� ICQ %u 仂�仗�舒于亳仍 于舒仄 从仂仆�舒从�: %s (%s)"
+
+#: src/protocols/oscar/oscar.c:3607
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "�� �仂�亳�亠 亟仂弍舒于亳�� ��仂� 从仂仆�舒从� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于?"
-
-#: src/protocols/oscar/oscar.c:3005
+msgstr "丱仂�亳�亠 亟仂弍舒于亳�� ��仂亞仂 仗仂仍�亰仂于舒�亠仍� 于 �于仂亶 �仗亳�仂从 从仂仆�舒从�仂于?"
+
+#: src/protocols/oscar/oscar.c:3611
 msgid "Decline"
 msgstr "��从仍仂仆亳��"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3696
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 '%hu' 仂� '%s', �舒从 从舒从 仂仆仂 仆亠从仂��亠从�仆仂."
-msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, 仂仆仂 �仍亳�从仂仄 弍仂仍��仂亠."
-
-#: src/protocols/oscar/oscar.c:3099
+msgstr[0] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s, �舒从 从舒从 仂仆仂 弍�仍仂 仆亠从仂��亠从�仆仂."
+msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."
+
+#: src/protocols/oscar/oscar.c:3705
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆仂 �仍亳�从仂仄 弍仂仍��仂亠."
-msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, 仂仆仂 �仍亳�从仂仄 弍仂仍��仂亠."
-
-#: src/protocols/oscar/oscar.c:3108
+msgstr[0] ""
+"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s, �舒从 从舒从 仂仆仂 弍�仍仂 �仍亳�从仂仄 弍仂仍��亳仄."
+msgstr[1] ""
+"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 �仍亳�从仂仄 弍仂仍��亳仄亳."
+
+#: src/protocols/oscar/oscar.c:3714
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
-"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 �仂仂弍�亠仆亳亶 �仍亳�从仂仄 仄仆仂亞仂."
-msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, �仂仂弍�亠仆亳亶 �仍亳�从仂仄 仄仆仂亞仂."
-
-#: src/protocols/oscar/oscar.c:3117
+"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s, �舒从 从舒从 弍�仍 仗�亠于��亠仆 仗�亠亟亠仍 仂�亠仆从亳."
+msgstr[1] ""
+"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 弍�仍 仗�亠于��亠仆 仗�亠亟亠仍 仂�亠仆从亳."
+
+#: src/protocols/oscar/oscar.c:3723
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
-"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 仂仆 �仍亳�从仂仄 仆舒亟仂亠亟仍亳于."
-msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, 仂仆仂 �仍亳�从仂仄 弍仂仍��仂亠."
-
-#: src/protocols/oscar/oscar.c:3126
+"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s, 仗仂�仂仄� ��仂 亟仂��仂亶仆� �亠亞仂-�仂 仍���亠亞仂."
+msgstr[1] ""
+"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 亟仂��仂亶仆� �亠亞仂-�仂 仍���亠亞仂."
+
+#: src/protocols/oscar/oscar.c:3732
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] ""
-"�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� '%s', 仗仂�仂仄� ��仂 �仍亳�从仂仄 仆舒亟仂亠亟仍亳于�."
-msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, 仂仆仂 �仍亳�从仂仄 弍仂仍��仂亠."
-
-#: src/protocols/oscar/oscar.c:3135
+msgstr[0] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s, 仗仂�仂仄� ��仂 亟仂弍�亠亠 仆舒亟仂 弍���."
+msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 亟仂弍�亠亠 仆舒亟仂 弍���."
+
+#: src/protocols/oscar/oscar.c:3741
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] "�� 仗�仂仗���亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� '%s' 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
-msgstr[1] "弌亠舒仆� 弍�仍 亰舒于亠���仆 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
-
-#: src/protocols/oscar/oscar.c:3189
+msgstr[0] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亠 仂� %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
+msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
+
+#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#, c-format
+msgid "Info for %s"
+msgstr "�仆�仂�仄舒�亳� 亟仍� %s"
+
+#: src/protocols/oscar/oscar.c:3803
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>弌�舒���:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3248
+#: src/protocols/oscar/oscar.c:3864
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 于�亰于舒仍 仂�亳弍从�: %s\n"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3865
 msgid "Unknown error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3900
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�舒�亠 �仂仂弍�亠仆亳亠 从 %s 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂:"
 
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3959
 #, c-format
 msgid "User information for %s unavailable:"
-msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 '%s' 仆亠亟仂���仗仆舒:"
-
-#: src/protocols/oscar/oscar.c:3366
-#, fuzzy
+msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 %s 仆亠亟仂���仗仆舒:"
+
+#: src/protocols/oscar/oscar.c:3982
 msgid "Warning Level"
-msgstr "�仂从舒亰�于舒�� _��仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
-
-#: src/protocols/oscar/oscar.c:3369
-#, fuzzy
+msgstr "丕�仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
+
+#: src/protocols/oscar/oscar.c:3985
 msgid "Online Since"
-msgstr "� �亠�亳"
-
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+msgstr "� �亠�亳 �"
+
+#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Member Since"
 msgstr "丼仍亠仆 �"
 
-#: src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:4073
 msgid "Your AIM connection may be lost."
-msgstr "�亠�仂��仆仂, �仂亠亟亳仆亠仆亳亠 � AIM-�亠�于亠�仂仄 �舒亰仂�于舒仆仂."
+msgstr "�舒�亠 �仂亠亟亳仆亠仆亳亠 AIM 仄仂亢亠� 弍��� �舒亰仂�于舒仆仂."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
-#, fuzzy
+#: src/protocols/oscar/oscar.c:4259
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
-msgstr "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 '%hu' 仂� '%s', �舒从 从舒从 仂仆仂 仆亠从仂��亠从�仆仂."
-
-#: src/protocols/oscar/oscar.c:3859
+msgstr ""
+"[�亠于仂亰仄仂亢仆仂 仂�仂弍�舒亰亳�� �仂仂弍�亠仆亳亠 仂� ��仂亞仂 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 仂仆仂 �仂亟亠�亢亳� "
+"仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�.]"
+
+#: src/protocols/oscar/oscar.c:4476
 msgid "Rate limiting error."
-msgstr "��亳弍从舒 仂亞�舒仆亳�亠仆亳� �舒��仂��."
-
-#: src/protocols/oscar/oscar.c:3860
+msgstr "��亳弍从舒 仂亞�舒仆亳�亠仆亳� 仗�亠亟亠仍舒."
+
+#: src/protocols/oscar/oscar.c:4477
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"�仂�仍亠亟仆亠亠 亟亠亶��于亳亠 仆亠 弍�仍仂 于�仗仂仍仆亠仆仂, �舒从 从舒从 仗�亠于��亠仆 仍亳仄亳�. �仂亟仂亢亟亳�亠 10 "
-"�亠从�仆亟 亳 仗仂仗�仂弍�亶�亠 亠�� �舒亰."
-
-#: src/protocols/oscar/oscar.c:3923
+"�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 仗仂�仍亠亟仆亠亠 亟亠亶��于亳亠, �舒从 从舒从 于� 仗�亠于��亳仍亳 仗�亠亟亠仍. "
+"�仂亟仂亢亟亳�亠 10 �亠从�仆亟 亳 仗仂仗�仂弍�亶�亠 �仆仂于舒."
+
+#: src/protocols/oscar/oscar.c:4540
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
-msgstr "弌仂亠亟亳仆亠仆亳亠 仗�亠�于舒仆仂 仗仂 仗�亳�亳仆亠 亠亞仂 ���舒仆仂于仍亠仆亳� � 亟��亞仂亞仂 从仂仄仗���亠�舒."
-
-#: src/protocols/oscar/oscar.c:3925
+msgstr ""
+"�� 弍�仍亳 仂��仂亠亟亳仆亠仆�, �舒从 从舒从 于仂�仍亳 � ��亳仄 亳亟亠仆�亳�亳从舒�仂�仂仄 仗仂仍�亰仂于舒�亠仍� 亳亰 "
+"亟��亞仂亞仂 仄亠��舒."
+
+#: src/protocols/oscar/oscar.c:4542
 msgid "You have been signed off for an unknown reason."
-msgstr "弌亠舒仆� 弍�仍 亰舒于亠���仆 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
-
-#: src/protocols/oscar/oscar.c:3956
+msgstr "�� 弍�仍亳 仂�从仍��亠仆� 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
+
+#: src/protocols/oscar/oscar.c:4573
 msgid "Finalizing connection"
-msgstr "弌仂亠亟亳仆亠仆亳亠 亰舒于亠��舒亠���"
-
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+msgstr "�舒于亠��亠仆亳亠 ���舒仆仂于仍亠仆亳� �仂亠亟亳仆亠仆亳�"
+
+#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
 msgid "Email Address"
-msgstr "�亟�亠� e-mail"
-
-#: src/protocols/oscar/oscar.c:4238
+msgstr "�亟�亠� Email"
+
+#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
 msgid "Mobile Phone"
 msgstr "�仂弍亳仍�仆�亶 �亠仍亠�仂仆"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4856
+msgid "Not specified"
+msgstr "�亠 �从舒亰舒仆仂"
+
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "�亠仆�亳仆舒"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "��亢�亳仆舒"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4873
 msgid "Personal Web Page"
-msgstr "C��舒仆亳�舒 于 �仆�亠�仆亠�亠"
-
-#: src/protocols/oscar/oscar.c:4259
+msgstr "�亠��仂仆舒仍�仆舒� Web-���舒仆亳�舒"
+
+#: src/protocols/oscar/oscar.c:4877
 msgid "Additional Information"
 msgstr "�仂仗仂仍仆亳�亠仍�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4882
 msgid "Home Address"
 msgstr "�仂仄舒�仆亳亶 舒亟�亠�"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
 msgid "Zip Code"
 msgstr "�仆亟亠从�"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4890
 msgid "Work Address"
 msgstr "�舒弍仂�亳亶 舒亟�亠�"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4898
 msgid "Work Information"
-msgstr "�仆�仂�仄舒�亳� 仂 �舒弍仂�亠:"
-
-#: src/protocols/oscar/oscar.c:4281
+msgstr "�仆�仂�仄舒�亳� 仂 �舒弍仂�亠"
+
+#: src/protocols/oscar/oscar.c:4899
 msgid "Company"
 msgstr "�仂仄仗舒仆亳�"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4900
 msgid "Division"
 msgstr "�仂亟�舒亰亟亠仍亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4901
 msgid "Position"
 msgstr "�仂仍亢仆仂���"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4903
 msgid "Web Page"
-msgstr "弌��舒仆亳�舒 于 �仆�亠�仆亠�亠"
-
-#: src/protocols/oscar/oscar.c:4291
+msgstr "Web-���舒仆亳�舒"
+
+#: src/protocols/oscar/oscar.c:4909
 #, c-format
 msgid "ICQ Info for %s"
-msgstr "ICQ-亳仆�仂�仄舒�亳� 亟仍� '%s'"
-
-#: src/protocols/oscar/oscar.c:4341
+msgstr "ICQ-亳仆�仂�仄舒�亳� 亟仍� %s"
+
+#: src/protocols/oscar/oscar.c:4958
 msgid "Pop-Up Message"
 msgstr "��仗仍�于舒��亠亠 �仂仂弍�亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4979
 #, c-format
 msgid "The following screen names are associated with %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4366
+msgstr "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍� �仂仂�仆亠�亠仆� � %s"
+
+#: src/protocols/oscar/oscar.c:4983
 msgid "Search Results"
-msgstr "�亠亰�仍��舒� 仗仂亳�从舒"
-
-#: src/protocols/oscar/oscar.c:4383
+msgstr "�亠亰�仍��舒�� 仗仂亳�从舒"
+
+#: src/protocols/oscar/oscar.c:5000
 #, c-format
 msgid "No results found for email address %s"
-msgstr "�亳�亠亞仂 仆亠 仆舒亶亟亠仆仂 亟仍� email-舒亟�亠�舒 '%s'"
-
-#: src/protocols/oscar/oscar.c:4404
+msgstr "�亳�亠亞仂 仆亠 仆舒亶亟亠仆仂 亟仍� 舒亟�亠�舒 email %s"
+
+#: src/protocols/oscar/oscar.c:5021
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4406
+msgstr "�� 亟仂仍亢仆� 仗仂仍��亳�� email � 仗�仂��弍仂亶 仗仂亟�于亠�亢亟亳�� %s."
+
+#: src/protocols/oscar/oscar.c:5023
 msgid "Account Confirmation Requested"
 msgstr "�舒仗�仂�亠仆仂 仗仂亟�于亠�亢亟亠仆亳亠 ����仆仂亶 亰舒仗亳�亳"
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:5051
 msgid "Error Changing Account Info"
-msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 ��亠�仆仂亶 亰舒仗亳�亳"
-
-#: src/protocols/oscar/oscar.c:4437
+msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 ����仆仂亶 亰舒仗亳�亳"
+
+#: src/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4440
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
+"从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仍亳�舒亠��� 仂� 仂�亳亞亳仆舒仍�仆仂亞仂."
+
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4443
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
+"从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂从舒仆�亳于舒亠��� 仗�仂弍亠仍仂仄."
+
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4446
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
+"从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仍亳�从仂仄 于亠仍亳从."
+
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4449
+#: src/protocols/oscar/oscar.c:5066
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4452
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� email, �舒从 从舒从 � 亰舒亟舒仆仆�仄 舒亟�亠�仂仄 "
+"�仂仂�仆亠�亠仆仂 �仍亳�从仂仄 仄仆仂亞仂 亳亟亠仆�亳�亳从舒�仂�仂于 仗仂仍�亰仂于舒�亠仍�."
+
+#: src/protocols/oscar/oscar.c:5069
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4455
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� email, �舒从 从舒从 亰舒亟舒仆仆�亶 舒亟�亠� "
+"仆亠亟仂仗���亳仄."
+
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4465
+msgstr "��亳弍从舒 0x%04x: �亠亳亰于亠��仆舒� 仂�亳弍从舒."
+
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+"弌亠亶�舒� 于舒� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂��仂�仄舒�亳�仂于舒仆 �仍亠亟���亳仄 仂弍�舒亰仂仄:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
 msgid "Account Info"
-msgstr "�仆�仂�仄舒�亳� ��亠�仆仂亶 亰舒仗亳�亳"
-
-#: src/protocols/oscar/oscar.c:4471
+msgstr "�仆�仂�仄舒�亳� 仂弍 ����仆仂亶 亰舒仗亳�亳"
+
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "亅仍亠从��仂仆仆�亶 舒亟�亠� '%s': %s"
-
-#: src/protocols/oscar/oscar.c:4686
+msgstr "�亟�亠� email 亟仍� %s: %s"
+
+#: src/protocols/oscar/oscar.c:5153
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"�舒�亠 亳亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 亟仂仍亢仆� 亳仄亠�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 亟仍� "
+"仂�仗�舒于从亳 亳亰仂弍�舒亢亠仆亳亶."
+
+#: src/protocols/oscar/oscar.c:5326
 msgid "Unable to set AIM profile."
-msgstr "�亠 �亟舒���� ���舒仆仂于亳�� AIM 仗�仂�亳仍�."
-
-#: src/protocols/oscar/oscar.c:4687
+msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 仗�仂�亳仍� AIM."
+
+#: src/protocols/oscar/oscar.c:5327
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:5354
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7524,27 +8031,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:5359
 msgid "Profile too long."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
-#, fuzzy
+msgstr "��仂�亳仍� �仍亳�从仂仄 于亠仍亳从."
+
+#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
 msgid "Visible"
-msgstr "�亠于亳亟亳仄�亶"
-
-#: src/protocols/oscar/oscar.c:4753
+msgstr "�亳亟亳仄�亶"
+
+#: src/protocols/oscar/oscar.c:5393
 msgid "Unable to set AIM away message."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� AIM-�仂仂弍�亠仆亳亠 仂弍 仂������于亳亳."
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:5394
 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:4794
+#: src/protocols/oscar/oscar.c:5434
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7555,11 +8061,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:5439
 msgid "Away message too long."
-msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 �仍亳�从仂仄 亟仍亳仆仆仂亠."
-
-#: src/protocols/oscar/oscar.c:4892
+msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 �仍亳�从仂仄 于亠仍亳从仂."
+
+#: src/protocols/oscar/oscar.c:5517
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7567,40 +8073,40 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
+#: src/protocols/oscar/oscar.c:5972
 msgid "Unable To Add"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳��"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5678
 msgid "Unable To Retrieve Buddy List"
-msgstr "�亠 �亟舒���� 仗仂仍��亳�� �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶"
-
-#: src/protocols/oscar/oscar.c:5030
+msgstr "�亠 �亟舒���� 仗仂仍��亳�� �仗亳�仂从 从仂仆�舒从�仂于"
+
+#: src/protocols/oscar/oscar.c:5679
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
+#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5958
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
 msgid "(no name)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5322
+msgstr "(仆亠� 亳仄亠仆亳)"
+
+#: src/protocols/oscar/oscar.c:5971
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7608,213 +8114,198 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:6053
 #, 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' �舒亰�亠�亳仍 于舒仄 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于.\n"
-"\n"
-"�仂弍舒于亳�� 亠亞仂 于 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶?"
-
-#: src/protocols/oscar/oscar.c:5410
+"�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 于舒仄 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 从仂仆�舒从�仂于. 丱仂�亳�亠 "
+"亟仂弍舒于亳�� 亠亞仂?"
+
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorization Given"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6092
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"�仂仍�亰仂于舒�亠仍� '%s' 仗�仂�亳� �舒亰�亠�亠仆亳� 亟仂弍舒于亳�� 于舒� 于 亠亞仂 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 � "
-"仄仂�亳于舒�亳亠亶:\n"
-"'%s'"
+"�仂仍�亰仂于舒�亠仍� %s �仂�亠� 亟仂弍舒于亳�� 于舒� 于 亠亞仂 �仗亳�仂从 从仂仆�舒从�仂于 仗仂 �仍亠亟���亠亶 "
+"仗�亳�亳仆亠:\n"
+"%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:6134
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-"�仂仍�亰仂于舒�亠仍� '%s' 仂亟舒�亳仍 于舒� �舒亰�亠�亠仆亳亠仄 亟仂弍舒于亳�� 亠亞仂于 于舒� �仗亳�仂从 "
-"�仂弍亠�亠亟仆亳从仂于."
-
-#: src/protocols/oscar/oscar.c:5486
+msgstr "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 于舒仄 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 从仂仆�舒从�仂于."
+
+#: src/protocols/oscar/oscar.c:6135
 msgid "Authorization Granted"
-msgstr "�于�仂�亳亰舒�亳� �舒亰�亠�亠仆舒"
+msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6138
 #, 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'"
-
-#: src/protocols/oscar/oscar.c:5490
+"�仂仍�亰仂于舒�亠仍� %s 亰舒仗�亠�亳仍 于舒仄 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 从仂仆�舒从�仂于 仗仂 "
+"�仍亠亟���亠亶 仗�亳�亳仆亠:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:6139
 msgid "Authorization Denied"
-msgstr "�于�仂�亳亰舒�亳� 亰舒仗�亠�亠仆舒"
-
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+msgstr "� 舒于�仂�亳亰舒�亳亳 仂�从舒亰舒仆仂"
+
+#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
-msgstr "�弍_仄亠仆:"
-
-#: src/protocols/oscar/oscar.c:5549
-#, fuzzy
+msgstr "�弍仄亠仆:"
+
+#: src/protocols/oscar/oscar.c:6198
 msgid "Invalid chat name specified."
-msgstr "丕从舒亰舒仆 仆亠于亠�仆�亶 Gadu-Gadu UIN"
-
-#: src/protocols/oscar/oscar.c:5790
-#, fuzzy
+msgstr "丕从舒亰舒仆仂 仆亠于亠�仆仂亠 亳仄� �舒�舒."
+
+#: src/protocols/oscar/oscar.c:6288
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+"�舒�亠 亳亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 仆亠 仄仂亢亠�亠 仂�仗�舒于仍��� 亳亰仂弍�舒亢亠仆亳� 于 "
+"�舒�舒� AIM."
+
+#: src/protocols/oscar/oscar.c:6445
 msgid "Away Message"
-msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳(Away)"
-
-#: src/protocols/oscar/oscar.c:6284
-msgid "Unable to open Direct IM"
-msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠"
-
-#: src/protocols/oscar/oscar.c:6297
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6300
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6485
+msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
+
+#: src/protocols/oscar/oscar.c:6729
 msgid "Buddy Comment:"
-msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒:"
-
-#: src/protocols/oscar/oscar.c:6501
+msgstr "�仂仄仄亠仆�舒�亳亶 仗仂仍�亰仂于舒�亠仍�:"
+
+#: src/protocols/oscar/oscar.c:6747
 msgid "Edit Buddy Comment"
-msgstr "�亰仄亠仆亳�� 从仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
-
-#: src/protocols/oscar/oscar.c:6509
+msgstr "�亰仄亠仆亳�� 从仂仄仄亠仆�舒�亳亶 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/oscar/oscar.c:6753
 msgid "Get Status Msg"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂 ��舒���亠"
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6765
 msgid "Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6788
 msgid "Re-request Authorization"
 msgstr "�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6818
 msgid "The new formatting is invalid."
 msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 仆亠从仂��亠从�仆仂."
 
-#: src/protocols/oscar/oscar.c:6575
-#, fuzzy
+#: src/protocols/oscar/oscar.c:6819
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "� 亳亟亠仆�亳�亳从舒�仂�亠 亟仂仗���亳仄� �仂仍�从仂 亰舒亞仍舒于仆�亠 弍�从于� 亳 仗�仂弍亠仍�."
-
-#: src/protocols/oscar/oscar.c:6581
-#, fuzzy
+msgstr ""
+"个仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� 仄仂亢亠� 于仍亳��� �仂仍�从仂 仆舒 �亠亞亳��� "
+"弍�从于 亳 仗�仂弍亠仍�."
+
+#: src/protocols/oscar/oscar.c:6826
 msgid "New screen name formatting:"
-msgstr "�亠 亰舒亟舒仆 仗�亠于亟仂仆亳仄."
-
-#: src/protocols/oscar/oscar.c:6630
+msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍�:"
+
+#: src/protocols/oscar/oscar.c:6878
 msgid "Change Address To:"
-msgstr "弌仄亠仆亳�� 舒亟�亠� 仆舒:"
-
-#: src/protocols/oscar/oscar.c:6674
+msgstr "�亰仄亠仆亳�� 舒亟�亠� 仆舒:"
+
+#: src/protocols/oscar/oscar.c:6923
 msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6677
+msgstr "<i>于� 仆亠 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳�</i>"
+
+#: src/protocols/oscar/oscar.c:6926
 msgid "You are awaiting authorization from the following buddies"
-msgstr "�� 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳亳 仂� �仍亠亟���亳� �仂弍亠�亠亟仆亳从仂于"
-
-#: src/protocols/oscar/oscar.c:6678
+msgstr "�� 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳� 仂� �仍亠亟���亳� 仗仂仍�亰仂于舒�亠仍亠亶"
+
+#: src/protocols/oscar/oscar.c:6927
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:6692
+"�� 仄仂亢亠�亠 亰舒仗�仂�亳�� 舒于�仂�亳亰舒�亳� 仂� ��亳� 仗仂仍�亰仂于舒�亠仍亠亶 仗仂于�仂�仆仂, ��仍从仆�于 仆舒 "
+"仆亳� 仗�舒于仂亶 从仆仂仗从仂亶 仄��亳 亳 于�弍�舒于 \"�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳\"."
+
+#: src/protocols/oscar/oscar.c:6944
 msgid "Find Buddy by E-mail"
-msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从舒 仗仂 仗仂仍� 'E-mail'"
-
-#: src/protocols/oscar/oscar.c:6693
+msgstr "�舒亶�亳 仗仂仍�亰仂于舒�亠仍� 仗仂 E-mail"
+
+#: src/protocols/oscar/oscar.c:6945
 msgid "Search for a buddy by e-mail address"
-msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍� 仗仂 �仍亠从��仂仆仆仂仄� 舒亟�亠��"
-
-#: src/protocols/oscar/oscar.c:6694
+msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍� 仗仂 舒亟�亠�� e-mail"
+
+#: src/protocols/oscar/oscar.c:6946
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "�于亠亟亳�亠 �仍亠从��仂仆仆�亶 舒亟�亠� 亳�从仂仄仂亞仂 �仂弍亠�亠亟仆亳从舒."
-
-#: src/protocols/oscar/oscar.c:6711
+msgstr "�于亠亟亳�亠 舒亟�亠� e-mail 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� 亳�亠�亠."
+
+#: src/protocols/oscar/oscar.c:6963
 msgid "Available Message:"
 msgstr "弌�舒���仆仂亠 �仂仂弍�亠仆亳亠:"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6964
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
 msgid "Set User Info..."
 msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠..."
 
-#: src/protocols/oscar/oscar.c:6795
-#, fuzzy
+#: src/protocols/oscar/oscar.c:7050
 msgid "Set User Info (URL)..."
-msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠..."
-
-#: src/protocols/oscar/oscar.c:6803
+msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 (URL)..."
+
+#: src/protocols/oscar/oscar.c:7056
 msgid "Set Available Message..."
 msgstr "丕��舒仆仂于亳�� ��舒���仆仂亠 �仂仂弍�亠仆亳亠..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
 msgid "Change Password..."
-msgstr "弌仄亠仆亳�� 仗舒�仂仍�..."
-
-#: src/protocols/oscar/oscar.c:6817
+msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
+
+#: src/protocols/oscar/oscar.c:7066
 msgid "Change Password (URL)"
-msgstr "弌仄亠仆亳�� 仗舒�仂仍� (URL)"
-
-#: src/protocols/oscar/oscar.c:6825
+msgstr "�亰仄亠仆亳�� 仗舒�仂仍� (URL)"
+
+#: src/protocols/oscar/oscar.c:7070
 msgid "Configure IM Forwarding (URL)"
 msgstr "�舒���仂亳�� IM-仗亠�亠仆舒仗�舒于仍亠仆亳亠 (URL)"
 
-#: src/protocols/oscar/oscar.c:6836
-#, fuzzy
+#: src/protocols/oscar/oscar.c:7079
 msgid "Format Screen Name..."
-msgstr "�舒���仂亳�� 仂�仂弍�舒亢舒亠仄仂亠 亳仄�..."
-
-#: src/protocols/oscar/oscar.c:6842
+msgstr "个仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�..."
+
+#: src/protocols/oscar/oscar.c:7083
 msgid "Confirm Account"
 msgstr "�仂亟�于亠�亟亳�� ����仆�� 亰舒仗亳��"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:7087
 msgid "Display Currently Registered Address"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6854
+msgstr "�仂从舒亰舒�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠�"
+
+#: src/protocols/oscar/oscar.c:7091
 msgid "Change Currently Registered Address..."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6863
+msgstr "�亰仄亠仆亳�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠�..."
+
+#: src/protocols/oscar/oscar.c:7098
 msgid "Show Buddies Awaiting Authorization"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:6871
+msgstr "�仂从舒亰舒�� 仗仂仍�亰仂于舒�亠仍亠亶, 仂亢亳亟舒��亳� 舒于�仂�亳亰舒�亳�"
+
+#: src/protocols/oscar/oscar.c:7104
 msgid "Search for Buddy by Email..."
-msgstr "�仂亳�从 �仂弍亠�亠亟仆亳从舒 仗仂 �仍亠从�仂�仆仆仂仄� 舒亟�亠��..."
-
-#: src/protocols/oscar/oscar.c:6878
-#, fuzzy
+msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍� 仗仂 Email..."
+
+#: src/protocols/oscar/oscar.c:7109
 msgid "Search for Buddy by Information"
-msgstr "�仂亳�从 �仂弍亠�亠亟仆亳从舒 仗仂 �仍亠从�仂�仆仆仂仄� 舒亟�亠��..."
+msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍� 仗仂 亳仆�仂�仄舒�亳亳"
 
 #. *< api_version
 #. *< type
@@ -7827,161 +8318,1296 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7224 src/protocols/oscar/oscar.c:7226
 msgid "AIM/ICQ Protocol Plugin"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7021
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 AIM/ICQ"
+
+#: src/protocols/oscar/oscar.c:7245
 msgid "Auth host"
-msgstr "弌亠�于亠� 舒于�仂�亳亰舒�亳亳"
-
-#: src/protocols/oscar/oscar.c:7026
+msgstr "丕亰亠仍 舒于�仂�亳亰舒�亳亳"
+
+#: src/protocols/oscar/oscar.c:7250
 msgid "Auth port"
 msgstr "�仂�� 舒于�仂�亳亰舒�亳亳"
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "�仂仍�亰仂于舒�亠仍� %s 仆亠 仗�亳�����于�亠� 于 �亠�亳"
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+msgid "Key Agreement"
+msgstr "弌仂亞仍舒�仂于舒仆亳亠 从仍��亠亶"
+
+#: src/protocols/silc/buddy.c:53
+msgid "Cannot perform the key agreement"
+msgstr "�亠 �亟舒���� 于�仗仂仍仆亳�� �仂亞仍舒�仂于舒仆亳亠 从仍��亠亶"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Error occurred during key agreement"
+msgstr "��仂亳亰仂�仍舒 仂�亳弍从舒 于仂 于�亠仄� �仂亞仍舒�仂于舒仆亳� 从仍��亠亶"
+
+#: src/protocols/silc/buddy.c:114
+msgid "Key Agreement failed"
+msgstr "�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 �仂亞仍舒�仂于舒仆亳亠 从仍��亠亶"
+
+#: src/protocols/silc/buddy.c:119
+msgid "Timeout during key agreement"
+msgstr "����从 亳仆�亠�于舒仍 仂亢亳亟舒仆亳� 于仂 于�亠仄� �仂亞仍舒�仂于舒仆亳� 从仍��亠亶"
+
+#: src/protocols/silc/buddy.c:124
+msgid "Key agreement was aborted"
+msgstr "弌仂亞仍舒�仂于舒仆亳亠 从仍��亠亶 弍�仍仂 仗�亠�于舒仆仂"
+
+#: src/protocols/silc/buddy.c:129
+msgid "Key agreement is already started"
+msgstr "弌仂亞仍舒�仂于舒仆亳亠 从仍��亠亶 �亢亠 仆舒�舒�仂"
+
+#: src/protocols/silc/buddy.c:134
+msgid "Key agreement cannot be started with yourself"
+msgstr "弌仂亞仍舒�仂于舒仆亳亠 从仍��亠亶 仆亠 仄仂亢亠� 弍��� 仆舒�舒�仂 � �舒仄亳仄 �仂弍仂亶"
+
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
+msgid "The remote user is not present in the network any more"
+msgstr "丕亟舒仍�仆仆�亶 仗仂仍�亰仂于舒�亠仍� 弍仂仍��亠 仆亠 仗�亳�����于�亠� 于 �亠�亳"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"��亳仆�� 亰舒仗�仂� �仂亞仍舒�仂于舒仆亳� 从仍��亠亶 仂� %s. �� �仂�亠仍亳 弍� 于�仗仂仍仆亳�� �仂亞仍舒�仂于舒仆亳亠 "
+"从仍��亠亶?"
+
+#: src/protocols/silc/buddy.c:292
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"丕亟舒仍�仆仆�亶 仗仂仍�亰仂于舒�亠仍� 仂亢亳亟舒亠� �仂亞仍舒�仂于舒仆亳� 从仍��亠亶 仆舒:\n"
+"丕亟舒仍�仆仆�亶 �亰亠仍: %s\n"
+"丕亟舒仍�仆仆�亶 仗仂��: %d"
+
+#: src/protocols/silc/buddy.c:305
+msgid "Key Agreement Request"
+msgstr "�舒仗�仂� �仂亞仍舒�仂于舒仆亳� 从仍��亠亶"
+
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
+msgid "IM With Password"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:417
+msgid "Cannot set IM key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:459
+msgid "Set IM Password"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
+#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+msgid "Get Public Key"
+msgstr "�仂仍��亳�� 仗�弍仍亳�仆�亶 从仍��"
+
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1092
+msgid "Cannot fetch the public key"
+msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 仗�弍仍亳�仆�亶 从仍��"
+
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
+msgid "Show Public Key"
+msgstr "�仂从舒亰舒�� 仗�弍仍亳�仆�亶 从仍��"
+
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:219
+msgid "Could not load public key"
+msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 仗�弍仍亳�仆�亶 从仍��"
+
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
+#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
+#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
+#: src/protocols/silc/ops.c:999
+msgid "User Information"
+msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
+
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+msgid "Cannot get user information"
+msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
+
+#: src/protocols/silc/buddy.c:729
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:732
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1032
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "�仂仍�亰仂于舒�亠仍� %s 仆亠 仗�亳�����于�亠� 于 �亠�亳"
+
+#: src/protocols/silc/buddy.c:1035
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1038
+msgid "Import..."
+msgstr "�仄仗仂��亳�仂于舒��..."
+
+#: src/protocols/silc/buddy.c:1125
+msgid "Select correct user"
+msgstr "��弍亠�亳�亠 从仂��亠从�仆仂亞仂 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/silc/buddy.c:1127
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1129
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1377
+msgid "Detached"
+msgstr "�亠亰舒于亳�亳仄�亶"
+
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "�亠亟仂仄仂亞舒��亳亶"
+
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "�舒亰弍�亟亳�亠 仄亠仆�"
+
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "�亳仗亠�舒从�亳于仆�亶"
+
+#: src/protocols/silc/buddy.c:1389
+msgid "Robot"
+msgstr "�仂弍仂�"
+
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
+#: src/protocols/silc/silc.c:606
+msgid "Happy"
+msgstr "弌�舒��仍亳于�亶"
+
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
+#: src/protocols/silc/silc.c:608
+msgid "Sad"
+msgstr "�亠�舒仍�仆�亶"
+
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/silc.c:610
+msgid "Angry"
+msgstr "�舒��亠�亢亠仆仆�亶"
+
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
+#: src/protocols/silc/silc.c:612
+msgid "Jealous"
+msgstr "�亠于仆���亳亶"
+
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
+#: src/protocols/silc/silc.c:614
+msgid "Ashamed"
+msgstr "弌��亟��亳亶��"
+
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
+#: src/protocols/silc/silc.c:616
+msgid "Invincible"
+msgstr "�亠仗仂弍亠亟亳仄�亶"
+
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
+#: src/protocols/silc/silc.c:618
+msgid "In Love"
+msgstr "�仍�弍仍�仆仆�亶"
+
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
+#: src/protocols/silc/silc.c:620
+msgid "Sleepy"
+msgstr "弌仂仆仆�亶"
+
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/silc.c:622
+msgid "Bored"
+msgstr "弌从��舒��亳亶"
+
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
+#: src/protocols/silc/silc.c:624
+msgid "Excited"
+msgstr "�仂亰弍�亢亟�仆仆�亶"
+
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
+#: src/protocols/silc/silc.c:626
+msgid "Anxious"
+msgstr "�亰舒弍仂�亠仆仆�亶"
+
+#: src/protocols/silc/buddy.c:1452
+msgid "Modes"
+msgstr "�亠亢亳仄�"
+
+#: src/protocols/silc/buddy.c:1462
+msgid "Mood"
+msgstr "�舒���仂亠仆亳亠"
+
+#: src/protocols/silc/buddy.c:1490
+msgid "Status Text"
+msgstr "丐亠从�� ��舒���舒"
+
+#: src/protocols/silc/buddy.c:1495
+msgid "Preferred Contact"
+msgstr "��亠亟仗仂�亳�舒亠仄�亶 从仂仆�舒从�"
+
+#: src/protocols/silc/buddy.c:1503
+msgid "Paging"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
+msgid "Video Conferencing"
+msgstr "�亳亟亠仂从仂仆�亠�亠仆�亳�"
+
+#: src/protocols/silc/buddy.c:1515
+msgid "Preferred Language"
+msgstr "��亠亟仗仂�亳�舒亠仄�亶 �亰�从"
+
+#: src/protocols/silc/buddy.c:1520
+msgid "Device"
+msgstr "丕���仂亶��于仂"
+
+#: src/protocols/silc/buddy.c:1522
+msgid "Computer"
+msgstr "�仂仄仗���亠�"
+
+#: src/protocols/silc/buddy.c:1526
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/buddy.c:1528
+msgid "Terminal"
+msgstr "丐亠�仄亳仆舒仍"
+
+#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:676
+msgid "Timezone"
+msgstr "丼舒�仂于仂亶 仗仂��"
+
+#: src/protocols/silc/buddy.c:1545
+msgid "Geolocation"
+msgstr "�亠仂亞�舒�亳�亠�从仂亠 仗仂仍仂亢亠仆亳亠"
+
+#: src/protocols/silc/buddy.c:1604
+msgid "Reset IM Key"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1609
+msgid "IM with Key Exchange"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1613
+msgid "IM with Password"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1624
+msgid "Get Public Key..."
+msgstr "�仂仍��亳�� 仗�弍仍亳�仆�亶 从仍��..."
+
+#: src/protocols/silc/buddy.c:1629
+msgid "Send File..."
+msgstr "��仗�舒于亳�� �舒亶仍..."
+
+#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
+msgid "Kill User"
+msgstr "丕弍亳�� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "�舒�仂仍�仆舒� ��舒亰舒:"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "�舒仆舒仍 %s 仆亠 ���亠��于�亠� 于 �亠�亳"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:155
+msgid "Channel Information"
+msgstr "�仆�仂�仄舒�亳� 仂 从舒仆舒仍亠"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "�亠 �亟舒仍仂�� 仗仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 从舒仆舒仍亠"
+
+#: src/protocols/silc/chat.c:104
+#, c-format
+msgid "Channel Name:\t\t%s\n"
+msgstr "�仄� 从舒仆舒仍舒:\t\t%s\n"
+
+#: src/protocols/silc/chat.c:106
+#, c-format
+msgid "User Count:\t\t%d\n"
+msgstr "�仂仍亳�亠��于仂 仗仂仍�亰仂于舒�亠仍亠亶:\t\t%d\n"
+
+#: src/protocols/silc/chat.c:112
+#, c-format
+msgid "Channel Founder:\t%s\n"
+msgstr "��仆仂于舒�亠仍� 从舒仆舒仍舒:\t%s\n"
+
+#: src/protocols/silc/chat.c:120
+#, c-format
+msgid "Channel Cipher:\t\t%s\n"
+msgstr "丿亳�� 从舒仆舒仍舒:\t\t%s\n"
+
+#: src/protocols/silc/chat.c:123
+#, c-format
+msgid "Channel HMAC:\t\t%s\n"
+msgstr "HMAC 从舒仆舒仍舒:\t\t%s\n"
+
+#: src/protocols/silc/chat.c:127
+#, c-format
+msgid ""
+"\n"
+"Channel Topic:\n"
+"\t%s\n"
+msgstr ""
+"\n"
+"丐亠仄舒 从舒仆舒仍舒:\n"
+"\t%s\n"
+
+#: src/protocols/silc/chat.c:130
+msgid ""
+"\n"
+"Channel Modes:\n"
+msgstr ""
+"\n"
+"�亠亢亳仄� 从舒仆舒仍舒:\n"
+
+#: src/protocols/silc/chat.c:144
+#, c-format
+msgid ""
+"\n"
+"Founder Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: src/protocols/silc/chat.c:145
+#, c-format
+msgid ""
+"Founder Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/silc/chat.c:218
+msgid "Add Channel Public Key"
+msgstr "�仂弍舒于亳�� 仗�弍仍亳�仆�亶 从仍�� 从舒仆舒仍舒"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:273
+msgid "Open Public Key..."
+msgstr "��从���� 仗�弍仍亳�仆�亶 从仍��..."
+
+#: src/protocols/silc/chat.c:382
+msgid "Channel Passphrase"
+msgstr "�舒�仂仍�仆舒� ��舒亰舒 从舒仆舒仍舒"
+
+#: src/protocols/silc/chat.c:389
+msgid "Channel Public Keys List"
+msgstr "弌仗亳�仂从 仗�弍仍亳�仆�� 从仍��亠亶 从舒仆舒仍舒"
+
+#: src/protocols/silc/chat.c:394
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
+#: src/protocols/silc/chat.c:871
+msgid "Channel Authentication"
+msgstr "�亟亠仆�亳�亳从舒�亳� 从舒仆舒仍舒"
+
+#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+msgid "Add / Remove"
+msgstr "�仂弍舒于亳�� / 丕亟舒仍亳��"
+
+#: src/protocols/silc/chat.c:560
+msgid "Group Name"
+msgstr "�仄� 亞��仗仗�"
+
+#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
+msgid "Passphrase"
+msgstr "�舒�仂仍�仆舒� ��舒亰舒"
+
+#: src/protocols/silc/chat.c:575
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "�于亠亟亳�亠 亳仄� 亳 仗舒�仂仍�仆�� ��舒亰� 仍亳�仆仂亶 亞��仗仗� 从舒仆舒仍舒 %s."
+
+#: src/protocols/silc/chat.c:577
+msgid "Add Channel Private Group"
+msgstr "�仂弍舒于亳�� 仍亳�仆�� 亞��仗仗� 从舒仆舒仍舒"
+
+#: src/protocols/silc/chat.c:704
+msgid "User Limit"
+msgstr "��亠亟亠仍 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/silc/chat.c:705
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"丕��舒仆仂于亳�� 仗�亠亟亠仍 仗仂仍�亰仂于舒�亠仍� 仆舒 从舒仆舒仍亠. 丕��舒仆仂于亳�亠 于 仆仂仍� 亟仍� �弍�仂�舒 "
+"仍亳仄亳�舒 仗仂仍�亰仂于舒�亠仍�."
+
+#: src/protocols/silc/chat.c:847
+msgid "Get Info"
+msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳�"
+
+#: src/protocols/silc/chat.c:854
+msgid "Invite List"
+msgstr "弌仗亳�仂从 仗�亳亞仍舒�亠仆亳亶"
+
+#: src/protocols/silc/chat.c:858
+msgid "Ban List"
+msgstr "弌仗亳�仂从 仂�从仍��亠仆仆�� �亰仍仂于"
+
+#: src/protocols/silc/chat.c:865
+msgid "Add Private Group"
+msgstr "�仂弍舒于亳�� 仍亳�仆�� 亞��仗仗�"
+
+#: src/protocols/silc/chat.c:876
+msgid "Reset Permanent"
+msgstr "弌弍�仂�亳�� 仗亠�仄舒仆亠仆�仆仂"
+
+#: src/protocols/silc/chat.c:880
+msgid "Set Permanent"
+msgstr "丕��舒仆仂于亳�� 仗亠�仄舒仆亠仆�仆仂"
+
+#: src/protocols/silc/chat.c:887
+msgid "Set User Limit"
+msgstr "丕��舒仆仂于亳�� 仗�亠亟亠仍 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/silc/chat.c:892
+msgid "Reset Topic Restriction"
+msgstr "弌弍�仂�亳�� 仂亞�舒仆亳�亠仆亳亠 �亠仄�"
+
+#: src/protocols/silc/chat.c:896
+msgid "Set Topic Restriction"
+msgstr "丕��舒仆仂于亳�� 仂亞�舒仆亳�亠仆亳亠 �亠仄�"
+
+#: src/protocols/silc/chat.c:902
+msgid "Reset Private Channel"
+msgstr "弌弍�仂�亳�� 仍亳�仆�亶 从舒仆舒仍"
+
+#: src/protocols/silc/chat.c:906
+msgid "Set Private Channel"
+msgstr "丕��舒仆仂于亳�� 仍亳�仆�亶 从舒仆舒仍"
+
+#: src/protocols/silc/chat.c:912
+msgid "Reset Secret Channel"
+msgstr "弌弍�仂�亳�� �亠从�亠�仆�亶 从舒仆舒仍"
+
+#: src/protocols/silc/chat.c:916
+msgid "Set Secret Channel"
+msgstr "丕��舒仆仂于亳�� �亠从�亠�仆�亶 从舒仆舒仍"
+
+#: src/protocols/silc/chat.c:986
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "�� �于仍�亠�亠�� 仂�仆仂于舒�亠仍亠仄 从舒仆舒仍舒 仆舒 <I>%s</I>"
+
+#: src/protocols/silc/chat.c:990
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "��仆仂于舒�亠仍亠仄 从舒仆舒仍舒 <I>%s</I> �于仍�亠��� <I>%s</I>"
+
+#: src/protocols/silc/chat.c:1040
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"�舒仄 仆亠仂弍�仂亟亳仄仂 于仂亶�亳 仆舒 从舒仆舒仍 %s, �仂亞亟舒 于� �仄仂亢亠�亠 于仂亶�亳 于 仍亳�仆�� 亞��仗仗�"
+
+#: src/protocols/silc/chat.c:1042
+msgid "Join Private Group"
+msgstr "��亳�仂亠亟亳仆亳���� 从 仍亳�仆仂亶 亞��仗仗亠"
+
+#: src/protocols/silc/chat.c:1043
+msgid "Cannot join private group"
+msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 仍亳�仆仂亶 亞��仗仗亠"
+
+#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
+msgid "Cannot call command"
+msgstr "�亠 �亟舒���� 于�亰于舒�� 从仂仄舒仆亟�"
+
+#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
+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:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+msgid "Secure File Transfer"
+msgstr "�亠亰仂仗舒�仆舒� 仗亠�亠亟舒�舒 �舒亶仍仂于"
+
+#: 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
+msgid "Permission denied"
+msgstr "�仂���仗 亰舒仗�亠�亠仆"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� �仂亞仍舒�仂于舒仆亳亠 从仍��亠亶"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "弌亠��亳� 仗亠�亠亟舒�亳 �舒亶仍仂于 仆亠 ���亠��于�亠�"
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr "�亠� 舒从�亳于仆�� �亠��亳亶 仗亠�亠亟舒�亳 �舒亶仍仂于"
+
+#: src/protocols/silc/ft.c:212
+msgid "File transfer already started"
+msgstr "�亠�亠亟舒�舒 �舒亶仍仂于 �亢亠 仆舒�舒�舒"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� �仂亞仍舒�仂于舒仆亳亠 从仍��亠亶 亟仍� 仗亠�亠亟舒�亳 �舒亶仍仂于"
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr "�亠 �亟舒仍仂�� 仆舒�舒�� 仗亠�亠亟舒�� �舒亶仍仂于"
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍"
+
+#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
+#: src/protocols/silc/ops.c:338
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s �仄亠仆亳仍 �亠仄� <I>%s</I> 仆舒: %s"
+
+#: src/protocols/silc/ops.c:398
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> ���舒仆仂于亳仍 �亠亢亳仄 从舒仆舒仍舒 <I>%s</I> 于: %s"
+
+#: src/protocols/silc/ops.c:402
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> �弍�舒仍 于�亠 �亠亢亳仄� 从舒仆舒仍舒 <I>%s</I>"
+
+#: src/protocols/silc/ops.c:433
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> ���舒仆仂于亳仍 �亠亢亳仄� <I>%s</I> 于: %s"
+
+#: src/protocols/silc/ops.c:437
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> �弍�舒仍 于�亠 �亠亢亳仄� <I>%s</I>"
+
+#: src/protocols/silc/ops.c:464
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "�� 弍�仍亳 于�弍�仂�亠仆� 亳亰 <I>%s</I> ��亳仍亳�仄亳 <I>%s</I> (%s)"
+
+#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:504
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "�� 弍�仍亳 �弍亳�� ��亳仍亳�仄亳 %s (%s)"
+
+#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
+#: src/protocols/silc/ops.c:535
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "丕弍亳� ��亳仍亳�仄亳 %s (%s)"
+
+#: src/protocols/silc/ops.c:581
+msgid "Server signoff"
+msgstr "��从仍��亳���� 仂� �亠�于亠�舒"
+
+#: src/protocols/silc/ops.c:767
+msgid "Personal Information"
+msgstr "�亠��仂仆舒仍�仆舒� 亳仆�仂�仄舒�亳�"
+
+#: src/protocols/silc/ops.c:790
+msgid "Birth Day"
+msgstr "�舒�舒 �仂亢亟亠仆亳�"
+
+#: src/protocols/silc/ops.c:794
+msgid "Job Title"
+msgstr "�舒亰于舒仆亳亠 �舒弍仂��"
+
+#: src/protocols/silc/ops.c:798
+msgid "Job Role"
+msgstr "�仂仍亢仆仂���"
+
+#: src/protocols/silc/ops.c:802
+msgid "Organization"
+msgstr "��亞舒仆亳亰舒�亳�"
+
+#: src/protocols/silc/ops.c:806
+msgid "Unit"
+msgstr "�仂亟�舒亰亟亠仍亠仆亳亠"
+
+#: src/protocols/silc/ops.c:825
+msgid "EMail"
+msgstr "EMail"
+
+#: src/protocols/silc/ops.c:830
+msgid "Note"
+msgstr "�舒仄亠�从亳"
+
+#: src/protocols/silc/ops.c:878
+msgid "Join Chat"
+msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
+
+#: src/protocols/silc/ops.c:933
+msgid "Hostname"
+msgstr "�仄� �亰仍舒"
+
+#: src/protocols/silc/ops.c:940
+msgid "User Mode"
+msgstr "�亠亢亳仄 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/silc/ops.c:954
+msgid "Channels"
+msgstr "�舒仆舒仍�"
+
+#: src/protocols/silc/ops.c:981
+msgid "Public Key Fingerprint"
+msgstr ""
+
+#: src/protocols/silc/ops.c:982
+msgid "Public Key Babbleprint"
+msgstr ""
+
+#: src/protocols/silc/ops.c:995
+msgid "More..."
+msgstr "���..."
+
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
+msgid "Detach From Server"
+msgstr "�舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄"
+
+#: src/protocols/silc/ops.c:1006
+msgid "Cannot detach"
+msgstr "�亠 �亟舒���� �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/silc/ops.c:1017
+msgid "Cannot set topic"
+msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �亠仄�"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Roomlist"
+msgstr "弌仗亳�仂从 从仂仄仆舒�"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Cannot get room list"
+msgstr "�亠 �亟舒���� 仗仂仍��亳�� �仗亳�仂从 从仂仄仆舒�"
+
+#: src/protocols/silc/ops.c:1093
+msgid "No public key was received"
+msgstr "�亠 弍�仍仂 仗�亳仆��仂 仗�弍仍亳�仆�� 从仍��亠亶"
+
+#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
+#: src/protocols/silc/ops.c:1120
+msgid "Server Information"
+msgstr "�仆�仂�仄舒�亳� 仂 �亠�于亠�亠"
+
+#: src/protocols/silc/ops.c:1107
+msgid "Cannot get server information"
+msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 �亠�于亠�亠"
+
+#: src/protocols/silc/ops.c:1128
+msgid "Could not kill user"
+msgstr "�亠 �亟舒仍仂�� �弍亳�� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/silc/ops.c:1205
+msgid "Error during connecting to SILC Server"
+msgstr "��亳弍从舒 于仂 于�亠仄� �仂亠亟亳仆亠仆亳� � �亠�于亠�仂仄 SILC"
+
+#: src/protocols/silc/ops.c:1210
+msgid "Key Exchange failed"
+msgstr "�亠 �亟舒仍仂�� 仂���亠��于亳�� 仂弍仄亠仆 从仍��舒仄亳"
+
+#: src/protocols/silc/ops.c:1219
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"�亠 �亟舒仍仂�� 于仂亰仂弍仆仂于亳�� 仗�亠�于舒仆仆�� �亠��亳�. �舒亢仄亳�亠 \"�亠�亠�仂亠亟亳仆亠仆亳亠\" 亟仍� "
+"�仂亰亟舒仆亳� 仆仂于仂亞仂 �仂亠亟亳仆亠仆亳�."
+
+#: src/protocols/silc/ops.c:1254
+msgid "Disconnected by server"
+msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂 �亠�于亠�仂仄"
+
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "�仂亰仂弍仆仂于仍亠仆亳亠 �亠��亳亳"
+
+#: src/protocols/silc/ops.c:1316
+msgid "Authenticating connection"
+msgstr "�亟亠仆�亳�亳从舒�亳� �仂亠亟亳仆亠仆亳�"
+
+#: src/protocols/silc/ops.c:1363
+msgid "Verifying server public key"
+msgstr "��仂于亠�从舒 仗�弍仍亳�仆仂亞仂 从仍��舒 �亠�于亠�舒"
+
+#: src/protocols/silc/ops.c:1404
+msgid "Passphrase required"
+msgstr "丐�亠弍�亠��� 仗舒�仂仍�仆舒� ��舒亰舒"
+
+#: src/protocols/silc/ops.c:1433
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1436
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1439
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1442
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1445
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1448
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1451
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1453
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1455
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#: src/protocols/silc/ops.c:1466
+msgid "Failure: Authentication failed"
+msgstr ""
+
+#: src/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr "��仂于亠�亳�� 仗�弍仍亳�仆�亶 从仍��"
+
+#: src/protocols/silc/pk.c:118
+msgid "View..."
+msgstr "��仂�仄仂��亠��..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄�亶 �亳仗 仗�弍仍亳�仆仂亞仂 从仍��舒"
+
+#: src/protocols/silc/silc.c:133
+msgid "Connection failed"
+msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/silc/silc.c:159
+msgid "Cannot initialize SILC Client connection"
+msgstr "�亠 �亟舒���� 亳仆亳�亳舒仍亳亰亳�仂于舒�� �仂亠亟亳仆亠仆亳亠 从仍亳亠仆�舒 SILC"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr "��仗仂仍仆亠仆亳亠 仂弍仄亠仆舒 从仍��舒仄亳"
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr "�亠亟仂��舒�仂�仆仂 仗舒仄��亳"
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr "弌仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄 SILC"
+
+#: src/protocols/silc/silc.c:602
+msgid "Your Current Mood"
+msgstr "�舒�亠 �亠从��亠亠 仆舒���仂亠仆亳亠"
+
+#: src/protocols/silc/silc.c:604
+msgid "Normal"
+msgstr "�仂�仄舒仍�仆仂"
+
+#: src/protocols/silc/silc.c:629
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"��亠亟仗仂�亳�舒亠仄�亠 于舒仄亳 �仗仂�仂弍� 从仂仆�舒从�舒"
+
+#: src/protocols/silc/silc.c:646
+msgid "Your Current Status"
+msgstr "�舒� �亠从��亳亶 ��舒���"
+
+#: src/protocols/silc/silc.c:653
+msgid "Online Services"
+msgstr "弌亠�亠于�亠 �仍�亢弍�"
+
+#: src/protocols/silc/silc.c:656
+msgid "Let others see what services you are using"
+msgstr "�仂亰于仂仍亳�� 仂��舒仍�仆�仄 于亳亟亠��, 从舒从亳亠 于� 亳�仗仂仍�亰�亠�亠 �仍�亢弍�"
+
+#: src/protocols/silc/silc.c:662
+msgid "Let others see what computer you are using"
+msgstr "�仂亰于仂仍亳�� 仂��舒仍�仆�仄 于亳亟亠��, 从舒从仂亶 于� 亳�仗仂仍�亰�亠�亠 从仂仄仗���亠�"
+
+#: src/protocols/silc/silc.c:669
+msgid "Your VCard File"
+msgstr "�舒� �舒亶仍 VCard"
+
+#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+msgid "User Online Status Attributes"
+msgstr "���亳弍��� �亠�亠于仂亞仂 ��舒���舒 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/silc/silc.c:684
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
+#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
+msgid "Message of the Day"
+msgstr "弌仂仂弍�亠仆亳亠 亟仆�"
+
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
+msgid "No Message of the Day available"
+msgstr "�亠� 亟仂���仗仆�� �仂仂弍�亠仆亳亶 亟仆�"
+
+#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
+msgid "There is no Message of the Day associated with this connection"
+msgstr "�亠� �仂仂弍�亠仆亳� 亟仆�, �仂仂�仆亠��仆仆仂亞仂 � ��亳仄 �仂亠亟亳仆亠仆亳亠仄"
+
+#: src/protocols/silc/silc.c:765
+msgid "Online Status"
+msgstr "弌亠�亠于仂亶 ��舒���"
+
+#: src/protocols/silc/silc.c:774
+msgid "View Message of the Day"
+msgstr "��仂�仄仂�� �仂仂弍�亠仆亳� 亟仆�"
+
+#: src/protocols/silc/silc.c:846
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "�仂仍�亰仂于舒�亠仍� <I>%s</I> 仆亠 仗�亳�����于�亠� 于 �亠�亳"
+
+#: src/protocols/silc/silc.c:1159
+msgid "part:  Leave the chat"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1162
+msgid "leave:  Leave the chat"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1166
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1171
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1175
+msgid "list:  List channels on this network"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1179
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1183
+msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1187
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1191
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1195
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1199
+msgid "detach:  Detach this session"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1203
+msgid "umode &lt;usermodes&gt;:  Set your user options"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1214
+msgid "Instant Messages"
+msgstr "弌仂仂弍�亠仆亳�"
+
+#: src/protocols/silc/silc.c:1219
+msgid "Digitally sign all IM messages"
+msgstr "�亠仍舒�� �亳��仂于�� 仗仂亟仗亳�� 于�亠� �仂仂弍�亠仆亳亶"
+
+#: src/protocols/silc/silc.c:1224
+msgid "Verify all IM message signatures"
+msgstr "��仂于亠���� 仗仂亟仗亳�亳 于�亠� �仂仂弍�亠仆亳亶"
+
+#: src/protocols/silc/silc.c:1227
+msgid "Channel Messages"
+msgstr "弌仂仂弍�亠仆亳� 从舒仆舒仍舒"
+
+#: src/protocols/silc/silc.c:1232
+msgid "Digitally sign all channel messages"
+msgstr "�亠仍舒�� �亳��仂于�� 仗仂亟仗亳�� 于�亠� �仂仂弍�亠仆亳亶 从舒仆舒仍舒"
+
+#: src/protocols/silc/silc.c:1237
+msgid "Verify all channel message signatures"
+msgstr "��仂于亠���� 仗仂亟仗亳�亳 于�亠� �仂仂弍�亠仆亳亶 从舒仆舒仍舒"
+
+#: src/protocols/silc/silc.c:1240
+msgid "Default SILC Key Pair"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1245
+msgid "SILC Public Key"
+msgstr "��弍仍亳�仆�亶 从仍�� SILC"
+
+#: src/protocols/silc/silc.c:1250
+msgid "SILC Private Key"
+msgstr "�亳�仆�亶 从仍�� SILC"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1333
+msgid "SILC Protocol Plugin"
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SILC"
+
+#. *  description
+#: src/protocols/silc/silc.c:1335
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "��仂�仂从仂仍 Secure Internet Live Conferencing (SILC)"
+
+#: src/protocols/silc/silc.c:1365
+msgid "Public key authentication"
+msgstr "�亟亠仆�亳�亳从舒�亳� 仗�弍仍亳�仆仂亞仂 从仍��舒"
+
+#: src/protocols/silc/silc.c:1371
+msgid "Public Key File"
+msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"
+
+#: src/protocols/silc/silc.c:1375
+msgid "Private Key File"
+msgstr "个舒亶仍 仍亳�仆仂亞仂 从仍��舒"
+
+#: src/protocols/silc/silc.c:1380
+msgid "Reject watching by other users"
+msgstr "�舒仗�亠�亳�� 仗�仂�仄仂�� 亟��亞亳仄亳 仗仂仍�亰仂于舒�亠仍�仄亳"
+
+#: src/protocols/silc/silc.c:1383
+msgid "Block invites"
+msgstr "�仍仂从亳�仂于舒�� 仗�亳亞仍舒�亠仆亳�"
+
+#: src/protocols/silc/silc.c:1386
+msgid "Block IMs without Key Exchange"
+msgstr "�仍仂从亳�仂于舒�� �仂仂弍�亠仆亳� 弍亠亰 仂弍仄亠仆舒 从仍��舒仄亳"
+
+#: src/protocols/silc/silc.c:1389
+msgid "Reject online status attribute requests"
+msgstr "��从仍仂仆��� 亰舒仗�仂�� 舒��亳弍��仂于 �亠�亠于仂亞仂 ��舒���舒"
+
+#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
+msgid "Creating SILC key pair..."
+msgstr ""
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: src/protocols/silc/util.c:289
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "�舒��仂��亠亠 亳仄�: \t%s\n"
+
+#: src/protocols/silc/util.c:291
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�: \t%s\n"
+
+#: src/protocols/silc/util.c:293
+#, c-format
+msgid "EMail: \t\t%s\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:295
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "�仄� �亰仍舒: \t%s\n"
+
+#: src/protocols/silc/util.c:297
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "��亞舒仆亳亰舒�亳�: \t%s\n"
+
+#: src/protocols/silc/util.c:299
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "弌��舒仆舒: \t%s\n"
+
+#: src/protocols/silc/util.c:300
+#, c-format
+msgid "Algorithm: \t\t%s\n"
+msgstr "�仍亞仂�亳�仄: \t\t%s\n"
+
+#: src/protocols/silc/util.c:301
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "�仍亳仆舒 从仍��舒: \t%d 弍亳�\n"
+
+#: src/protocols/silc/util.c:303
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: src/protocols/silc/util.c:304
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
+msgid "Public Key Information"
+msgstr "�仆�仂�仄舒�亳� 仂 仗�弍仍亳�仆仂仄 从仍��亠"
+
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "�仂亳�从 %s"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
-msgstr "�亠 �亟舒���� 亰舒仗亳�舒�� �舒亶仍 %s"
-
-#: src/protocols/toc/toc.c:513
+msgstr "�亠 �亟舒���� 亰舒仗亳�舒�� �舒亶仍 %s."
+
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
-msgstr "�亠� 于仂亰仄仂亢仆仂��亳 仗�仂�亳�舒�� �舒亶仍 %s"
-
-#: src/protocols/toc/toc.c:516
+msgstr "�亠 �亟舒���� 仗�仂�亳�舒�� �舒亶仍 %s."
+
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
-msgstr "弌仂仂弍�亠仆亳亠 弍仂仂仍��仂亠, 仗仂�仍亠亟仆亳亠 %s 弍舒亶� 仂弍�亠亰舒仆�"
-
-#: src/protocols/toc/toc.c:519
+msgstr "弌仂仂弍�亠仆亳亠 �仍亳�从仂仄 亟仍亳仆仆仂亠, 仗仂�仍亠亟仆亳亠 %s 弍舒亶� 仂弍�亠亰舒仆�."
+
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
-msgstr "%s 仆亠于亠�仆舒� �亠亞亳���舒�亳�"
-
-#: src/protocols/toc/toc.c:522
+msgstr "%s �亠亶�舒� 仆亠 于 �亠�亳."
+
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "��亠亟�仗�亠亢亟亠仆亳亠 %s 仆亠 �舒亰�亠�亠仆仂."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "弌仂仂弍�亠仆亳亠 弍�仍仂 仂仗��亠仆仆仂, 于� 仗�亠于��亳仍亳 仍亳仄亳� �仂仂弍�亠仆亳亶 亟仍� �亠�于亠�舒."
-
-#: src/protocols/toc/toc.c:528
+msgstr "弌仂仂弍�亠仆亳亠 弍�仍仂 弍�仂�亠仆仂, 于� 仗�亠于��亳仍亳 仗�亠亟亠仍 �从仂�仂��亳 �亠�于亠�舒."
+
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "丼舒� 于 %s 仆亠于仂亰仄仂亢亠仆."
-
-#: src/protocols/toc/toc.c:531
+msgstr "丼舒� 于 %s 仆亠亟仂���仗亠仆."
+
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
-msgstr "�� 仗仂��仍舒亠�亠 �仂仂弍�亠仆亳� 从 %s �仍亳�从仂仄 �舒��仂."
-
-#: src/protocols/toc/toc.c:534
+msgstr "�� 仂�仗�舒于仍�亠�亠 �仂仂弍�亠仆亳� 从 %s �仍亳�从仂仄 �舒��仂."
+
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, 仂仆仂 �仍亳�从仂仄 弍仂仍��仂亠."
-
-#: src/protocols/toc/toc.c:537
+msgstr "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, �舒从 从舒从 仂仆仂 弍�仍仂 �仍亳�从仂仄 弍仂仍��仂亠."
+
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳亠 仂� %s, �仂仂弍�亠仆亳亶 �仍亳�从仂仄 仄仆仂亞仂."
-
-#: src/protocols/toc/toc.c:540
+msgstr ""
+"�� 仆亠 仗仂仍��亳仍亳 �仂仂弍�亠仆亳� 仂� %s, �舒从 从舒从 仂仆亳 仂�仗�舒于仍�仍亳�� �仍亳�从仂仄 �舒��仂."
+
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
-msgstr "�亠 �亟舒仍仂��."
-
-#: src/protocols/toc/toc.c:543
+msgstr ""
+
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "弌仍亳�从仂仄 仄仆仂亞仂 �仂于仗舒亟亠仆亳亶."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
-msgstr "丕�仂�仆亳�亠."
-
-#: src/protocols/toc/toc.c:549
+msgstr "�亠仂弍�仂亟亳仄舒 弍仂仍��舒� �仂�仆仂���."
+
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
-msgstr "弌亠�于亳� 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆."
-
-#: src/protocols/toc/toc.c:552
+msgstr "弌仍�亢弍舒 从舒�舒仍仂亞仂于 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."
+
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
-msgstr "��仂�仄仂�� email 亰舒仗�亠��仆."
-
-#: src/protocols/toc/toc.c:555
+msgstr "�仂亳�从 email 亰舒仗�亠��仆."
+
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
-msgstr "�仍��亠于仂亠 �仍仂于仂 亳亞仆仂�亳�仂于舒仆仂."
-
-#: src/protocols/toc/toc.c:558
+msgstr "�仍��亠于仂亠 �仍仂于仂 仗�仂亳亞仆仂�亳�仂于舒仆仂."
+
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
-msgstr "�亠� 从仍��亠于仂亞仂 �仍仂于舒."
-
-#: src/protocols/toc/toc.c:561
+msgstr "�亠� 从仍��亠于�� �仍仂于."
+
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
-msgstr "�亠� 亳仆�仂�仄舒�亳亳 仂 仗仂仍�亰仂于舒�亠仍亠."
-
-#: src/protocols/toc/toc.c:565
+msgstr ""
+
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
-msgstr "�亠� 仗仂亟亟亠�亢从亳 亟仍� 亟舒仆仆仂亶 ���舒仆�."
-
-#: src/protocols/toc/toc.c:568
+msgstr "弌��舒仆舒 仆亠 仗仂亟亟亠�亢亳于舒亠���."
+
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
-msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒: %s."
-
-#: src/protocols/toc/toc.c:574
+msgstr ""
+
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "亅�仂� �亠�于亳� 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆."
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
-msgstr "丕�仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳亶 �仍亳�从仂仄 于亠仍亳从 ��仂弍� 仗�亳�仂亠亟亳仆亳����."
-
-#: src/protocols/toc/toc.c:580
+msgstr "�舒� ��仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳� �仍亳�从仂仄 于亠仍亳从 亟仍� 于�仂亟舒."
+
+#: src/protocols/toc/toc.c:550
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"�� 仗��舒仍亳�� �仂亠亟亳仆亳���� 亳 仂��仂亠亟亳仆亳���� �仍亳�从仂仄 �舒��仂. �仂亟仂亢亟亳�亠 10 仄亳仆�� 亳 "
-"仗仂仗�仂弍�亶�亠 亠�亠 �舒亰. ��仍亳 于� 弍�亟亠�亠 仗�仂亟仂仍亢舒�� 仗仂仗��从亳 于舒仄 仗�亳亟亠��� 仗仂亟仂亢亟舒�� "
-"亟仂仍��亠."
-
-#: src/protocols/toc/toc.c:582
+"�� �仂亠亟亳仆�仍亳�� 亳 仂��仂亠亟亳仆�仍亳�� �仍亳�从仂仄 �舒��仂. �仂亟仂亢亟亳�亠 10 仄亳仆�� 亳 "
+"仗仂仗�仂弍�亶�亠 �仆仂于舒. ��仍亳 于� 仗�仂亟仂仍亢亳�亠 仗仂仗��从亳, 于舒仄 仗�亳亟���� 亢亟舒�� 亠�� 亟仂仍��亠."
+
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 仗�亳 �仂亠亟亳仆亠仆亳亳: %s."
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒, %d.  �仆�仂�仄舒�亳�: %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "�亢亳亟舒亠��� 仂�于亠�..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC �于�亰� 于仂���舒仆仂于仍亠仆舒. �� 仄仂亢亠�亠 仂�仗�舒于仍��� �仂仂弍�亠仆亳亠 "
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr "�舒�仂仍� 亳亰仄亠仆亠仆 ��仗亠�仆仂"
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:894
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:908
+#: src/protocols/toc/toc.c:895
 #, fuzzy
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
@@ -7993,47 +9619,48 @@
 "�仂仂弍�亠仆亳亠. Gaim 仆亠 仗仂亰于仂仍亳� 于舒仄 ��仂亞仂 �亟亠仍舒��. 亅�仂 于�亠仄亠仆仆�亠 仆亠亟仂弍��于舒 - "
 "弍�亟��亠 �亠�仗亠仍亳于�."
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
-msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳�"
-
-#: src/protocols/toc/toc.c:1539
+msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� 从舒�舒仍仂亞舒"
+
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr "丕��舒仆仂于亳�� 亳仆�仂�仄舒�亳� 从舒�舒仍仂亞舒"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
-msgstr "�亠 �亟舒仍仂�� 仂�从����揃%s揃亟仍� 亰舒仗亳�亳!"
-
-#: src/protocols/toc/toc.c:1700
+msgstr "�亠 �亟舒仍仂�� 仂�从���� %s 亟仍� 亰舒仗亳�亳!"
+
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
-
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+"�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 仗亠�亠亟舒�� �舒亶仍舒; 于亠�仂��仆仂, 仂�仄亠仆亳仍亳 仆舒 �仂亶 ��仂�仂仆亠."
+
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� 亟仍� 仗亠�亠亟舒�亳 �舒亶仍舒."
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-
-#: src/protocols/toc/toc.c:2042
+msgstr "�亠 �亟舒仍仂�� 亰舒仗亳�舒�� 亰舒亞仂仍仂于仂从 �舒亶仍舒. 个舒亶仍 仆亠 弍�亟亠� 仗亠�亠亟舒仆."
+
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr "Gaim - 弌仂��舒仆亳�� 从舒从..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr "%s 亰舒仗�仂�亳仍 仗亠�亠亟舒�� �舒亶仍舒"
+msgstr "%s 亰舒仗�仂�亳仍 仗亠�亠亟舒�� 亠仄� �舒亶仍舒 仂� 于舒�"
 
 #. *< api_version
 #. *< type
@@ -8046,17 +9673,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2166 src/protocols/toc/toc.c:2168
 msgid "TOC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 TOC"
 
 #: src/protocols/toc/toc.c:2187
 msgid "TOC host"
-msgstr "TOC-�仂��"
+msgstr "丕亰亠仍 TOC"
 
 #: src/protocols/toc/toc.c:2191
 msgid "TOC port"
-msgstr "TOC-仗仂��"
+msgstr "�仂�� TOC"
 
 #. Basic Profile group.
 #: src/protocols/trepia/trepia.c:263
@@ -8066,11 +9693,11 @@
 #. E-Mail Address
 #: src/protocols/trepia/trepia.c:294
 msgid "E-Mail Address"
-msgstr "亅仍亠从��. 仗仂��舒"
+msgstr "�亟�亠� E-Mail"
 
 #: src/protocols/trepia/trepia.c:300
 msgid "Profile Information"
-msgstr ""
+msgstr "�仆�仂�仄舒�亳� 仂 仗�仂�亳仍亠"
 
 #. Instant Messagers
 #: src/protocols/trepia/trepia.c:306
@@ -8100,7 +9727,7 @@
 #. I'm From
 #: src/protocols/trepia/trepia.c:327
 msgid "I'm From"
-msgstr ""
+msgstr "亊 亳亰"
 
 #. Call the dialog.
 #: src/protocols/trepia/trepia.c:344
@@ -8109,15 +9736,15 @@
 
 #: src/protocols/trepia/trepia.c:424
 msgid "Profile"
-msgstr "��仂�舒亶仍"
-
-#: src/protocols/trepia/trepia.c:439
+msgstr "��仂�亳仍�"
+
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
-msgstr ""
+msgstr "丕��舒仆仂于亳�� 仗�仂�亳仍�"
 
 #: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
-msgstr "弌�仂亟亳�� 仆舒 亟仂仄舒�仆�� ���舒仆亳�从�"
+msgstr "�仂�亠�亳�� 亟仂仄舒�仆�� ���舒仆亳��"
 
 #: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
@@ -8125,7 +9752,7 @@
 
 #: src/protocols/trepia/trepia.c:1027
 msgid "Logging in"
-msgstr "弌仂亠亟亳仆�亠仄��"
+msgstr "��仂亟"
 
 #. *< api_version
 #. *< type
@@ -8138,48 +9765,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1268 src/protocols/trepia/trepia.c:1270
 msgid "Trepia Protocol Plugin"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:308
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Trepia"
+
+#: src/protocols/yahoo/yahoo.c:282
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:742
 msgid "Your Yahoo! message did not get sent."
-msgstr "�舒�亠 Yahoo! �仂仂弍�亠仆亳亠 仆亠 仂�仗�舒于亳仍仂��."
-
-#: src/protocols/yahoo/yahoo.c:765
+msgstr "�舒�亠 �仂仂弍�亠仆亳亠 Yahoo! 仆亠 仂�仗�舒于亳仍仂��."
+
+#: src/protocols/yahoo/yahoo.c:761
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:804
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:866
+msgstr "弌亳��亠仄仆仂亠 �仂仂弍�亠仆亳亠 Yahoo! 亟仍� %s:"
+
+#: src/protocols/yahoo/yahoo.c:870
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s (�仆仂于舒) 仂�从仍仂仆亳仍 于舒�� 仗�仂��弍� 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从."
-
-#: src/protocols/yahoo/yahoo.c:869
+msgstr "%s (仂仗���) 仂�从仍仂仆亳仍 于舒�� 仗�仂��弍� 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从."
+
+#: src/protocols/yahoo/yahoo.c:873
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s (�仆仂于舒) 仂�从仍仂仆亳仍 于舒�� 仗�仂��弍� 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 � 仂弍���仆亠仆亳亠仄:\n"
+"%s (仂仗���) 仂�从仍仂仆亳仍 于舒�� 仗�仂��弍� 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 � 仂弍���仆亠仆亳亠仄:\n"
 "'%s'."
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:876
 msgid "Add buddy rejected"
-msgstr "� 亟仂弍舒于仍亠仆亳亳 �仂弍亠�亠亟仆亳从舒 仂�从舒亰舒仆仂"
-
-#: src/protocols/yahoo/yahoo.c:1599
+msgstr "� 亟仂弍舒于仍亠仆亳亳 仗仂仍�亰仂于舒�亠仍� 仂�从舒亰舒仆仂"
+
+#: src/protocols/yahoo/yahoo.c:1627
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8187,310 +9814,120 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1630
 msgid "Failed Yahoo! Authentication"
-msgstr "���亠仆�亳�亳从舒�亳� Yahoo! 仆亠 �亟舒仍舒��"
-
-#: src/protocols/yahoo/yahoo.c:1675
+msgstr "�亟亠仆�亳�亳从舒�亳� Yahoo! 仆亠 仗�仂�仍舒"
+
+#: src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1705
 msgid "Ignore buddy?"
-msgstr "�亞仆仂�亳�仂于舒��?"
-
-#: src/protocols/yahoo/yahoo.c:1711
+msgstr "�亞仆仂�亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�?"
+
+#: src/protocols/yahoo/yahoo.c:1738
 msgid "Invalid username."
 msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�."
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1741
 msgid "Incorrect password."
 msgstr "�亠于亠�仆�亶 仗舒�仂仍�."
 
-#: src/protocols/yahoo/yahoo.c:1717
-msgid "Your account is locked, please log in to the yahoo website."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1720
-#, c-format
-msgid "Unknown error number %d."
-msgstr "�亠亳亰于亠��仆�亶 从仂亟 仂�亳弍从亳 %d."
-
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1744
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒, 于仂亶亟亳�亠 仆舒 于亠弍-�舒亶� Yahoo!."
+
+#: src/protocols/yahoo/yahoo.c:1747
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+"�亠亳亰于亠��仆舒� 仂�亳弍从舒 仆仂仄亠� %d. ��仂亢亟亠仆亳亠 仆舒 于亠弍-�舒亶� Yahoo! 仄仂亢亠� 亳�仗�舒于亳�� "
+"��仂."
+
+#: src/protocols/yahoo/yahoo.c:1801
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1779
+"�亠 �亟舒仍仂�� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� %s 于 亞��仗仗� %s 于 �仗亳�从亠 仆舒 �亠�于亠�亠 ����仆仂亶 "
+"亰舒仗亳�亳 %s."
+
+#: src/protocols/yahoo/yahoo.c:1803
 msgid "Could not add buddy to server list"
-msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从仂于 于 �仗亳�仂从 仆舒 �亠�于亠�亠"
-
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 于 �仗亳�仂从 仆舒 �亠�于亠�亠"
+
+#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2262
 msgid "Unable to read"
-msgstr "�亠 �亟舒���� 亰舒仗亳�舒��"
-
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+msgstr "�亠 �亟舒���� 仗�仂�亠���"
+
+#: src/protocols/yahoo/yahoo.c:2284 src/protocols/yahoo/yahoo.c:2394
+#: src/protocols/yahoo/yahoo.c:2439 src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
-msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳�"
-
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+msgstr "��仂弍仍亠仄舒 � �仂亠亟亳仆亠仆亳亠仄"
+
+#: src/protocols/yahoo/yahoo.c:2533 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3020
 msgid "Not At Home"
-msgstr "�仆亠 亟仂仄舒"
-
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+msgstr "�亠 亟仂仄舒"
+
+#: src/protocols/yahoo/yahoo.c:2535 src/protocols/yahoo/yahoo.c:2910
+#: src/protocols/yahoo/yahoo.c:3021
 msgid "Not At Desk"
 msgstr "�亠 亰舒 ��仂仍仂仄"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2537 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/yahoo/yahoo.c:3022
 msgid "Not In Office"
-msgstr "�仆亠 仂�亳�舒"
-
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+msgstr "�亠 于 仂�亳�亠"
+
+#: src/protocols/yahoo/yahoo.c:2541 src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:3024
 msgid "On Vacation"
 msgstr "� 仂�仗��从亠"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2545 src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:3026
 msgid "Stepped Out"
-msgstr "��弍亠亢舒仍 仆舒 仄亳仆���"
-
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+msgstr "���亠仍"
+
+#: src/protocols/yahoo/yahoo.c:2626 src/protocols/yahoo/yahoo.c:2652
 msgid "Not on server list"
-msgstr "�������于�亠� 于 �仗亳�从亠 仆舒 �亠�于亠�亠"
-
-#: src/protocols/yahoo/yahoo.c:2407
-#, fuzzy, c-format
+msgstr "�亠 于 �仗亳�从亠 仆舒 �亠�于亠�亠"
+
+#: src/protocols/yahoo/yahoo.c:2672
+#, c-format
 msgid ""
 "\n"
 "<b>%s:</b> %s"
-msgstr "<b>弌�舒���:</b> %s"
-
-#: src/protocols/yahoo/yahoo.c:2443
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2743
 msgid "Join in Chat"
-msgstr "�仂亶�亳 于 �舒�"
-
-#: src/protocols/yahoo/yahoo.c:2449
+msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
+
+#: src/protocols/yahoo/yahoo.c:2747
 msgid "Initiate Conference"
 msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳�"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2804
 msgid "Active which ID?"
-msgstr "�舒从仂亶 ID 舒从�亳于亠仆?"
-
-#: src/protocols/yahoo/yahoo.c:2510
+msgstr "�从�亳于亳�仂于舒�� 从舒从仂亶 ID?"
+
+#: src/protocols/yahoo/yahoo.c:2813
 msgid "Join who in chat?"
 msgstr "� 从仂仄� 仗�亳�仂亠亟亳仆亳���� 于 �舒�亠?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2823
 msgid "Activate ID..."
 msgstr "�从�亳于亳�仂于舒�� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2827
 msgid "Join user in chat..."
-msgstr "�仂亟从仍��亳���� 从 �舒��..."
-
-#: src/protocols/yahoo/yahoo.c:2916
-msgid ""
-"<b>Sorry, profiles marked as containing adult content are not supported at "
-"this time.</b><br><br>\n"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2939
-msgid ""
-"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
-msgid "Yahoo! ID"
-msgstr "Yahoo!揃ID"
-
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
-msgid "Hobbies"
-msgstr "丱仂弍弍亳"
-
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
-msgid "Latest News"
-msgstr "�从��舒仍�仆�亠 仆仂于仂��亳"
-
-#: src/protocols/yahoo/yahoo.c:3064
-msgid "Home Page"
-msgstr "�仂仄舒�仆�� ���舒仆亳�舒"
-
-#: src/protocols/yahoo/yahoo.c:3076
-msgid "Cool Link 1"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3080
-msgid "Cool Link 2"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3082
-msgid "Cool Link 3"
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
-msgid "Yahoo Protocol Plugin"
-msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Yahoo!"
-
-#: src/protocols/yahoo/yahoo.c:3314
-msgid "Pager host"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3317
-msgid "Pager port"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:3320
-msgid "File transfer host"
-msgstr "丕亰亠仍 仗亠�亠亟舒�亳 �舒亶仍仂于"
-
-#: src/protocols/yahoo/yahoo.c:3323
-msgid "File transfer port"
-msgstr "�仂�� 仗亠�亠亟舒�亳 �舒亶仍仂于"
-
-#: src/protocols/yahoo/yahoo.c:3326
-msgid "Chat Room List Url"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_filexfer.c:200
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:198
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:200
-msgid "Invitation Rejected"
-msgstr "� 仗�亳亞仍舒�亠仆亳亳 仂�从舒亰舒仆仂"
-
-#: src/protocols/yahoo/yahoochat.c:350
-msgid "Failed to join chat"
-msgstr "�亠 �亟舒仍仂�� 于仂亶�亳 于 �舒�"
-
-#: src/protocols/yahoo/yahoochat.c:350
-msgid "Maybe the room is full?"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:426
-#, fuzzy, c-format
-msgid "You are now chatting in %s."
-msgstr "�舒� 于�从亳仆�仍亳 亳亰 %s."
-
-#: src/protocols/yahoo/yahoochat.c:580
-msgid "Failed to join buddy in chat"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:581
-msgid "Maybe they're not in a chat?"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1301
-#, fuzzy
-msgid "Unable to connect"
-msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
-
-#: src/protocols/yahoo/yahoochat.c:1301
-msgid "Fetching the room list failed."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1346
-#, fuzzy
-msgid "Voices"
-msgstr "�仂仍仂�"
-
-#: src/protocols/yahoo/yahoochat.c:1349
-msgid "Webcams"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
-#, fuzzy
-msgid "Unable to fetch room list."
-msgstr "�亠 �亟舒���� ���舒仆仂于亳�� AIM 仗�仂�亳仍�."
-
-#: src/protocols/yahoo/yahoochat.c:1414
-#, fuzzy
-msgid "User Rooms"
-msgstr "�舒�舒仄亠��� 仗�仂从�亳"
-
-#: src/protocols/zephyr/zephyr.c:557
-#, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>�仂仍�亰仂于舒�亠仍�:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:559
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>��亠于亟仂仆亳仄:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:561
-msgid "<br>Hidden or not logged-in"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:565
-#, c-format
-msgid "<br>At %s since %s"
-msgstr "<br>�舒�仂亟亳��� 于 '%s' �亢亠 %s"
-
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
-msgid "Anyone"
-msgstr "��弍仂亶"
-
-#: src/protocols/zephyr/zephyr.c:858
-msgid "Already logged in with Zephyr"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:858
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1164
-msgid "ZLocate"
-msgstr "ZLocate"
-
-#: src/protocols/zephyr/zephyr.c:1206
-msgid "_Class:"
-msgstr "_�仍舒��:"
-
-#: src/protocols/zephyr/zephyr.c:1212
-msgid "_Instance:"
-msgstr "_�仂仗亳�:"
-
-#: src/protocols/zephyr/zephyr.c:1218
-msgid "_Recipient:"
-msgstr "_��亳仆亳仄舒��亳亶:"
+msgstr "��亳�仂亠亟亳仆亳���� 从 仗仂仍�亰仂于舒�亠仍� 于 �舒�亠..."
 
 #. *< api_version
 #. *< type
@@ -8503,135 +9940,350 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/yahoo/yahoo.c:3356 src/protocols/yahoo/yahoo.c:3358
+msgid "Yahoo Protocol Plugin"
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Yahoo"
+
+#: src/protocols/yahoo/yahoo.c:3377
+msgid "Yahoo Japan"
+msgstr "Yahoo Japan"
+
+#: src/protocols/yahoo/yahoo.c:3380
+msgid "Pager host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3383
+msgid "Japan Pager host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3386
+msgid "Pager port"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3389
+msgid "File transfer host"
+msgstr "丕亰亠仍 仗亠�亠亟舒�亳 �舒亶仍仂于"
+
+#: src/protocols/yahoo/yahoo.c:3392
+msgid "Japan File transfer host"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3395
+msgid "File transfer port"
+msgstr "�仂�� 仗亠�亠亟舒�亳 �舒亶仍仂于"
+
+#: src/protocols/yahoo/yahoo.c:3398
+msgid "Chat Room List Url"
+msgstr "Url �仗亳�从舒 �舒�仂于"
+
+#: src/protocols/yahoo/yahoo_filexfer.c:200
+msgid ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:640
+#: src/protocols/yahoo/yahoo_profile.c:961
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>IP-舒亟�亠�:</b> %s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:779
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:781
+#: src/protocols/yahoo/yahoo_profile.c:829
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:827
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1038
+#: src/protocols/yahoo/yahoo_profile.c:1042
+#: src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Hobbies"
+msgstr "丱仂弍弍亳"
+
+#: src/protocols/yahoo/yahoo_profile.c:1056
+#: src/protocols/yahoo/yahoo_profile.c:1060
+msgid "Latest News"
+msgstr "�仂�仍亠亟仆亳亠 仆仂于仂��亳"
+
+#: src/protocols/yahoo/yahoo_profile.c:1081
+msgid "Home Page"
+msgstr "�仂仄舒�仆�� ���舒仆亳�舒"
+
+#: src/protocols/yahoo/yahoo_profile.c:1096
+msgid "Cool Link 1"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1101
+msgid "Cool Link 2"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1105
+msgid "Cool Link 3"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo_profile.c:1138
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "�仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠 %s 仆亠亟仂���仗仆舒"
+
+#: src/protocols/yahoo/yahoochat.c:198
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:200
+msgid "Invitation Rejected"
+msgstr "� 仗�亳亞仍舒�亠仆亳亳 仂�从舒亰舒仆仂"
+
+#: src/protocols/yahoo/yahoochat.c:350
+msgid "Failed to join chat"
+msgstr "�亠 �亟舒仍仂�� 仗�亳�仂亠亟亳仆亳���� 从 �舒��"
+
+#: src/protocols/yahoo/yahoochat.c:350
+msgid "Maybe the room is full?"
+msgstr "�仂亢亠� 弍���, 从仂仄仆舒�舒 仗仂仍仆舒?"
+
+#: src/protocols/yahoo/yahoochat.c:426
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "�� �舒亰亞仂于舒�亳于舒亠�亠 于 %s."
+
+#: src/protocols/yahoo/yahoochat.c:580
+msgid "Failed to join buddy in chat"
+msgstr "�亠 �亟舒仍仂�� 仗�亳�仂亠亟亳仆亳���� 从 仗仂仍�亰仂于舒�亠仍� 于 �舒�亠"
+
+#: src/protocols/yahoo/yahoochat.c:581
+msgid "Maybe they're not in a chat?"
+msgstr "�仂亢亠� 弍���, 仂仆 仆亠 于 �舒�亠?"
+
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Unable to connect"
+msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
+
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Fetching the room list failed."
+msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� �仗亳�仂从 从仂仄仆舒�."
+
+#: src/protocols/yahoo/yahoochat.c:1346
+msgid "Voices"
+msgstr "�仂仍仂�"
+
+#: src/protocols/yahoo/yahoochat.c:1349
+msgid "Webcams"
+msgstr ""
+
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+msgid "Unable to fetch room list."
+msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� �仗亳�仂从 从仂仄仆舒�."
+
+#: src/protocols/yahoo/yahoochat.c:1414
+msgid "User Rooms"
+msgstr "�仂仄仆舒�� 仗仂仍�亰仂于舒�亠仍�"
+
+#: src/protocols/zephyr/zephyr.c:558
+#, c-format
+msgid "<b>User:</b> %s<br>"
+msgstr "<b>�仂仍�亰仂于舒�亠仍�:</b> %s<br>"
+
+#: src/protocols/zephyr/zephyr.c:562
+msgid "<br>Hidden or not logged-in"
+msgstr "<br>弌�从��� 亳仍亳 仆亠 于 �亠�亳"
+
+#: src/protocols/zephyr/zephyr.c:566
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>� %s � %s"
+
+#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
+msgid "Anyone"
+msgstr "��弍仂亶"
+
+#: src/protocols/zephyr/zephyr.c:859
+msgid "Already logged in with Zephyr"
+msgstr "丕亢亠 于 �亠�亳 Zephyr"
+
+#: src/protocols/zephyr/zephyr.c:859
+msgid ""
+"Because Zephyr uses your system username, you are unable to have multiple "
+"accounts on it when logged in as the same user."
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1191
+msgid "_Class:"
+msgstr "�仍舒��:"
+
+#: src/protocols/zephyr/zephyr.c:1197
+msgid "_Instance:"
+msgstr "�仂仗亳�:"
+
+#: src/protocols/zephyr/zephyr.c:1203
+msgid "_Recipient:"
+msgstr "�仂仍��舒�亠仍�:"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
 msgid "Zephyr Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "Exposure"
 msgstr ""
 
+#. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:955
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr "�仂���仗 亰舒仗�亠��仆: 仗�仂从�亳-�亠�于亠� 亰舒仗�亠�舒亠� ��仆仆亠仍亳�仂于舒仆亳亠 80-亞仂 仗仂��舒."
-
-#: src/proxy.c:957
+#: src/proxy.c:845
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "�仂���仗 亰舒仗�亠��仆: 仗�仂从�亳-�亠�于亠� 亰舒仗�亠�舒亠� ��仆仆亠仍亳�仂于舒仆亳亠 仗仂��舒 %d."
+
+#: src/proxy.c:849
 #, c-format
 msgid "Proxy connection error %d"
-msgstr "��亳弍从舒 仗�仂从�亳-�仂亠亟亳仆亠仆亳� %d"
-
-#: src/proxy.c:1696
+msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳� � 仗�仂从�亳 %d"
+
+#: src/proxy.c:1495
 msgid "Invalid proxy settings"
-msgstr "�亠从仂��亠从�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
-
-#: src/proxy.c:1696
+msgstr "�亠于亠�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
+
+#: src/proxy.c:1495
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr ""
+msgstr "�仄� �亰仍舒 亳仍亳 仆仂仄亠� 仗仂��舒, �从舒亰舒仆仆�亠 亟仍� 亟舒仆仆仂亞仂 �亳仗舒 仗�仂从�亳, 仆亠于亠�仆�."
 
 #. * Custom away message.
-#: src/prpl.h:195
+#: src/prpl.h:177
 msgid "Custom"
 msgstr ""
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1252
 msgid "Accept"
 msgstr "��亳仆���"
 
-#: src/server.c:58
+#: src/server.c:63
 msgid "Please enter your password"
-msgstr "�仂亢舒仍�亶��舒, 于于亠亟亳�亠 仗舒�仂仍�"
-
-#: src/server.c:962
+msgstr "�于亠亟亳�亠 仗舒�仂仍�"
+
+#: src/server.c:528
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s �亠仗亠�� 亳亰于亠��亠仆 从舒从 %s.\n"
+
+#: src/server.c:938
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
-msgstr[0] "(�仂仂弍�亠仆亳亶: %d)"
-msgstr[1] "(1 �仂仂弍�亠仆亳亠)"
-
-#: src/server.c:976
+msgstr[0] "(%d �仂仂弍�亠仆亳亠)"
+msgstr[1] "(%d �仂仂弍�亠仆亳亶)"
+
+#: src/server.c:952
 msgid "(1 message)"
 msgstr "(1 �仂仂弍�亠仆亳亠)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1176 src/server.c:1186
 #, c-format
 msgid "%s logged in."
-msgstr "%s 于 �亠�亳"
-
-#: src/server.c:1184
-#, fuzzy, c-format
+msgstr "%s 于 �亠�亳."
+
+#: src/server.c:1199
+#, c-format
 msgid "%s signed on"
-msgstr "%s 于仂�亠仍"
-
-#: src/server.c:1200
+msgstr "%s 于仂��仍"
+
+#: src/server.c:1215
 #, c-format
 msgid "%s came back"
-msgstr ""
-
-#: src/server.c:1202
-#, fuzzy, c-format
-msgid "%s went away"
-msgstr "%s 仂�仂��仍."
+msgstr "%s 于亠�仆�仍��"
 
 #: src/server.c:1217
-#, fuzzy, c-format
-msgid "%s became idle"
-msgstr "%s 仗仂仍��亳仍 ��舒��� 弍亠亰亟亠亶��于���亠亞仂"
+#, c-format
+msgid "%s went away"
+msgstr "%s 仂�仂��仍"
 
 #: src/server.c:1231
-#, fuzzy, c-format
+#, c-format
+msgid "%s became idle"
+msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��"
+
+#: src/server.c:1243
+#, c-format
 msgid "%s became unidle"
-msgstr "%s 仗仂仍��亳仍 ��舒��� 弍亠亰亟亠亶��于���亠亞仂"
-
-#: src/server.c:1244 src/server.c:1252
+msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
+
+#: src/server.c:1254 src/server.c:1262
 #, c-format
 msgid "%s logged out."
-msgstr "%s 仂�从仍��亳仍��"
-
-#: src/server.c:1267
-#, fuzzy, c-format
+msgstr "%s 仆亠 于 �亠�亳."
+
+#: src/server.c:1276
+#, c-format
 msgid "%s signed off"
 msgstr "%s 于��亠仍"
 
-#: src/server.c:1317
+#: src/server.c:1338
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
 
-#: src/server.c:1320
+#: src/server.c:1341
 msgid "an anonymous person"
-msgstr "亳仆从仂亞仆亳�仂"
-
-#: src/server.c:1430
+msgstr "舒仆仂仆亳仄仆舒� 仗亠��仂仆舒"
+
+#: src/server.c:1451
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
-"�仂仍�亰仂于舒�亠仍� '%s' 仗�亳亞仍舒�舒亠� '%s' 于 从仂仄仆舒�� 仗亠�亠亞仂于仂�仂于: '%s'\n"
+"�仂仍�亰仂于舒�亠仍� '%s' 仗�亳亞仍舒�舒亠� %s 于 从仂仄仆舒�� 仗亠�亠亞仂于仂�仂于: '%s'\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1455
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "�仂仍�亰仂于舒�亠仍�揃'%s'揃仗�亳亞仍舒�亠� %s揃于 从仂仄仆舒�� 仗亠�亠亞仂于仂�仂于:揃'%s'\n"
-
-#: src/server.c:1440
+msgstr "�仂仍�亰仂于舒�亠仍� '%s' 仗�亳亞仍舒�亠� %s 于 从仂仄仆舒�� 仗亠�亠亞仂于仂�仂于: '%s'\n"
+
+#: src/server.c:1461
 msgid "Accept chat invitation?"
 msgstr "��亳仆��� 仗�亳亞仍舒�亠仆亳亠 于 �舒�?"
 
@@ -8640,287 +10292,62 @@
 #. * makes it slightly less boring ;)
 #: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
-msgstr "�亰于亳仆亳�亠, 仆仂 � 仆亠仆舒亟仂仍亞仂 �弍亠亢舒仍!"
+msgstr ""
 
 #: src/stock.c:86
-#, fuzzy
 msgid "_Alias"
-msgstr "��亠于亟仂仆亳仄:"
+msgstr "��亠于亟仂仆亳仄"
 
 #: src/stock.c:88
 msgid "_Modify"
-msgstr "_�亰仄亠仆亳��"
+msgstr "�亰仄亠仆亳��"
 
 #: src/stock.c:89
 msgid "_Open Mail"
-msgstr "_��从���� 仗仂���"
+msgstr "��从���� 仗仂���"
 
 #: src/stock.c:91
 msgid "_Warn"
-msgstr "_��亠亟�仗�亠亟亳��"
-
-#: src/util.c:2040
+msgstr "弌亟亠仍舒�� 仗�亠亟�仗�亠亢亟亠仆亳亠"
+
+#: src/util.c:2363
 msgid "Calculating..."
-msgstr "���亳�仍�亠���..."
-
-#: src/util.c:2043
+msgstr "�仂亟����..."
+
+#: src/util.c:2366
 msgid "Unknown."
 msgstr "�亠亳亰于亠��仆仂."
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2399
 msgid "day"
 msgid_plural "days"
-msgstr[0] "亟仆亠亶"
-msgstr[1] ""
-
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+msgstr[0] "亟亠仆�"
+msgstr[1] "亟仆亠亶"
+
+#: src/util.c:2407
 msgid "hour"
 msgid_plural "hours"
-msgstr[0] "�舒�仂于"
-msgstr[1] ""
-
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+msgstr[0] "�舒�"
+msgstr[1] "�舒�仂于"
+
+#: src/util.c:2415
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "仄亳仆��"
-msgstr[1] "仄亳仆��."
-
-#: src/util.c:2430
+msgstr[0] "仄亳仆��舒"
+msgstr[1] "仄亳仆��"
+
+#: src/util.c:2824
 msgid "g003: Error opening connection.\n"
-msgstr "g003: ��亳弍从舒 �仂亰亟舒仆亳� �仂亠亟亳仆亠仆亳�.\n"
-
-#: src/win32/win32dep.c:272
+msgstr "g003: ��亳弍从舒 仂�从���亳� �仂亠亟亳仆亠仆亳�.\n"
+
+#: src/win32/win32dep.c:273
 msgid "Moving Gaim Settings.."
-msgstr ""
-
-#: src/win32/win32dep.c:275
+msgstr "�亠�亠仆仂� 仆舒���仂亠从 Gaim..."
+
+#: src/win32/win32dep.c:276
 msgid "Moving Gaim user settings to: "
-msgstr ""
-
-#: src/win32/win32dep.c:277
+msgstr "�亠�亠仆仂� 仗仂仍�亰仂于舒�亠仍��从亳� 仆舒���仂亠从 Gaim 于: "
+
+#: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "丕于亠亟仂仄仍亠仆亳亠"
-
-#~ msgid "_Screenname:"
-#~ msgstr "_�仂仍�亰仂于舒�亠仍� (UIN):"
-
-#~ msgid "Could not open config file %s."
-#~ msgstr "�亠 �亟舒���� 仂�从���� �舒亶仍 从仂仆�亳亞��舒�亳亳 %s."
-
-#~ msgid "_Get Info"
-#~ msgstr "_�仂仍��亳�� 亳仆�仂�仄舒�亳�"
-
-#~ msgid "_IM"
-#~ msgstr "_��仗�舒于亳��"
-
-#~ msgid "Normal font size"
-#~ msgstr "�仂�仄舒仍�仆�亶 �舒亰仄亠� ��亳��舒 "
-
-#~ msgid "Browser Options"
-#~ msgstr "�舒�舒仄亠��� 亟仍� 弍�舒�亰亠�舒"
-
-#~ msgid "Open new _window by default"
-#~ msgstr "��从��于舒�� 于 仆仂于仂仄 _仂从仆亠 仗仂 �仄仂仍�舒仆亳�"
-
-#~ msgid "Bad Protocol"
-#~ msgstr "�亠从仂��亠从�仆�亶 仗�仂�仂从仂仍"
-
-#~ msgid "Mechanism Too Weak"
-#~ msgstr "�亠�舒仆亳亰仄 仆亠���仂亶�亳于"
-
-#~ msgid "Registration of %s@%s failed: %s"
-#~ msgstr "�亠亞亳���舒�亳� '%s@%s' 仆亠 �亟舒仍舒��: %s"
-
-#~ msgid "Unknown error occurred changing password"
-#~ msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 仗�亳 �仄亠仆亠 仗舒�仂仍�"
-
-#~ msgid "Unable to join chat"
-#~ msgstr "�亠 �亟舒���� 于仂亶�亳 于 �舒�"
-
-#~ msgid "Could not send %s to %s, protocol not supported."
-#~ msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳�� %s 亟仍� %s, 仗�仂�仂从仂仍 仆亠 仗仂亟亟亠�亢亳于舒亠���."
-
-#~ msgid "Invalid User"
-#~ msgstr "�亠于亠�仆仂亠 亳仄�"
-
-#~ msgid "Internal server error"
-#~ msgstr "�仆���亠仆�� 仂�亳弍从舒 �亠�于亠�舒"
-
-#~ msgid "Unable to read from MSN Nexus server."
-#~ msgstr "�亠 �亟舒���� �亳�舒�� � �亠�于亠�舒 MSN Nexus."
-
-#~ msgid "Unable to connect to passport server"
-#~ msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄 舒于�仂�亳亰舒�亳亳."
-
-#~ msgid "Username: <b>%s</b><br>\n"
-#~ msgstr "�仂仍�亰仂于舒�亠仍�:揃<b>%s</b><br>\n"
-
-#~ msgid "Warning Level: <b>%d%%</b><br>\n"
-#~ msgstr "丕�仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�: <b>%d%%</b><br>\n"
-
-#~ msgid "Online Since: <b>%s</b><br>\n"
-#~ msgstr "� �亠�亳 �: <b>%s</b><br>\n"
-
-#~ msgid "Member Since: <b>%s</b><br>\n"
-#~ msgstr "�舒�亠亞亳���亳�仂于舒仆(舒):揃<b>%s</b><br>\n"
-
-#~ msgid "Idle: <b>%s</b>"
-#~ msgstr "�亠亰亟亠亶��于�亠�:揃<b>%s</b>"
-
-#~ msgid "<b>Status:</b> "
-#~ msgstr "<b>弌�舒���:</b> "
-
-#~ msgid "<b>IP Address:</b> "
-#~ msgstr "<b>IP-舒亟�亠�:</b>"
-
-#~ msgid "<b>Buddy Comment:</b> "
-#~ msgstr "<b>�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒:</b>"
-
-#~ msgid "<b>Available:</b> "
-#~ msgstr "<b>�仂���仗亠仆:</b>揃"
-
-#~ msgid "<b>Away Message:</b> "
-#~ msgstr "<b>弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳:</b> "
-
-#~ msgid "<b>Status:</b> Not Authorized"
-#~ msgstr "<b>弌�舒���:</b> �亠 舒于�仂�亳亰仂于舒仆"
-
-#~ msgid "Update Frequency in min"
-#~ msgstr "丼舒��仂�舒 仂弍仆仂于仍亠仆亳� 于 仄亳仆."
-
-#~ msgid "Enter symbols delimited with \"+\" in the box below."
-#~ msgstr "�于亠亟亳�亠 �亳仄于仂仍�"
-
-#~ msgid "(No"
-#~ msgstr "(�亠�"
-
-#~ msgid "Change"
-#~ msgstr "�亰仄亠仆亳��"
-
-#~ msgid "Gaim - Away!"
-#~ msgstr "Gaim - ��仂�亠仍!"
-
-#~ msgid "Buddy Chat"
-#~ msgstr "丼舒�"
-
-#~ msgid "Join Chat As:"
-#~ msgstr "�仂亶�亳 于 �舒� 从舒从:"
-
-#~ msgid "Join"
-#~ msgstr "�仂亟从仍��亳����"
-
-#~ msgid "New Message"
-#~ msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠"
-
-#~ msgid "Changing info for %s:"
-#~ msgstr "�亰仄亠仆�亠��� 亳仆�仂�仄舒�亳� 亟仍� %s:"
-
-#~ msgid "Alias chat"
-#~ msgstr "��亠于亟仂仆亳仄 �舒�舒"
-
-#~ msgid "Alias contact"
-#~ msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"
-
-#~ msgid "Alias buddy"
-#~ msgstr "��亠于亟仂仆亳仄 �仂弍亠�亠亟仆亳从舒"
-
-#~ msgid ""
-#~ "Please enter an aliased name for the person below, or rename this contact "
-#~ "in your buddy list."
-#~ msgstr ""
-#~ "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 �仂弍亠�亠亟仆亳从舒, 仍亳弍仂 仗亠�亠亳仄亠仆�亶�亠 ��仂� 从仂仆�舒从� 于 "
-#~ "于舒�亠仄 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于."
-
-#~ msgid "Couldn't write to %s."
-#~ msgstr "�亠 �亟舒仍仂�� 亰舒仗亳�� 于 '&s'."
-
-#~ msgid "Save Log File"
-#~ msgstr "弌仂��舒仆亳�� 亢��仆舒仍舒 于 �舒亶仍"
-
-#~ msgid "Couldn't remove file %s."
-#~ msgstr "�亠 仗仂仍��亳仍仂�� �亟舒仍亳�� �舒亶仍 '%s'."
-
-#~ msgid ""
-#~ "You are about to remove the log file for %s.  Do you want to continue?"
-#~ msgstr "�亠亶��于亳�亠仍�仆仂 �亟舒仍亳�� 亢��仆舒仍 弍亠�亠亟 � '%s'?"
-
-#~ msgid "Remove Log"
-#~ msgstr "丕亟舒仍亳�� 亢��仆舒仍"
-
-#~ msgid "Couldn't open log file %s."
-#~ msgstr "�亠 仄仂亞� 仂�从���� �舒亶仍 亳��仂�亳亳 %s."
-
-#~ msgid "Log"
-#~ msgstr "���仆舒仍"
-
-#~ msgid "Clear"
-#~ msgstr "��亳��亳��"
-
-#~ msgid "Gaim - Information"
-#~ msgstr "Gaim - �仆�仂�仄舒�亳�"
-
-#~ msgid "Add a new group"
-#~ msgstr "�仂弍舒于亳�� 仆仂于�� 亞��仗仗�"
-
-#~ msgid "Gaim - Insert Image"
-#~ msgstr "Gaim - ���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
-
-#~ msgid "/Conversation/Search..."
-#~ msgstr "/�亠�亠亟舒/��从舒��..."
-
-#~ msgid "/Conversation/Insert _URL..."
-#~ msgstr "/�亠�亠亟舒/���舒于亳�� _���仍从�..."
-
-#~ msgid "Hide download details"
-#~ msgstr "弌仗���舒�� 仗仂亟�仂弍仆仂��亳 亰舒从舒�从亳"
-
-#~ msgid "_Host"
-#~ msgstr "_丱仂��"
-
-#~ msgid "Pa_ssword"
-#~ msgstr "_�舒�仂仍�"
-
-#~ msgid "Gaim - Save Icon"
-#~ msgstr "Gaim - 弌仂��舒仆亳�� 亳从仂仆从�"
-
-#~ msgid "Disconnected"
-#~ msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂"
-
-#, fuzzy
-#~ msgid "Invalid response from server"
-#~ msgstr "��亳弍仂�仆�亶 仂�于亠� �亠�于亠�舒"
-
-#~ msgid "Join what group:"
-#~ msgstr "�仂亶�亳 于 亞��仗仗�:"
-
-#~ msgid "Could not connect for transfer!"
-#~ msgstr "�亠仄仂亞� 仗�亳�仂亠亟亳仆亳���� 亟仍� 仗亠�亠亟舒�亳 �舒亶仍舒!"
-
-#~ msgid "Unknown error."
-#~ msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
-
-#~ msgid "I_ndividual log file for each buddy's signons"
-#~ msgstr "_�仆亟亳于亳亟�舒仍�仆�亠 �舒亶仍� 亢��仆舒仍仂于 亟仍� 于�仂亟仂于 �仂弍亠�亠亟仆亳从仂于"
-
-#~ msgid "%s has been disconnected"
-#~ msgstr "%s 仂��仂亠亟亳仆亳仍��"
-
-#~ msgid "---- New Conversation @ %s ----\n"
-#~ msgstr "----揃�仂于舒� 弍亠�亠亟舒 @揃%s揃----\n"
-
-#~ msgid "Strip _HTML from logs"
-#~ msgstr "丕弍亳�舒�� _HTML ��亞亳 仗�亳 亰舒仗亳�亳 于 亢��仆舒仍"
-
-#, fuzzy
-#~ msgid "Unable to find conversation log"
-#~ msgstr "�亠 仄仂亞� 于仂亶�亳 于 �舒�"
-
-#, fuzzy
-#~ msgid "Unable to make directory %s for logging"
-#~ msgstr "�亠仄仂亞� ���舒仆仂于亳�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠"
-
-#~ msgid "+++ %s (%s) signed off @ %s"
-#~ msgstr "+++揃%s揃(%s)揃仂�从仍��亳仍��揃@揃%s"
-
-#~ msgid "+++ Program exit @ %s"
-#~ msgstr "+++ ���仂亟 亳亰 仗�仂亞�舒仄仄� @ %s"
--- a/src/about.c	Sat Jun 19 20:54:13 2004 +0000
+++ b/src/about.c	Sun Jun 20 00:09:34 2004 +0000
@@ -184,7 +184,7 @@
 			"  <b>", _("Portuguese"), " (pt)</b> - Duarte Henriques &lt;<a href=\"mailto:duarte_henriques@myrealbox.com\">duarte_henriques@myrealbox.com</a>&gt;<br>"
 			"  <b>", _("Portuguese-Brazil"), " (pt_BR)</b> - Maur鱈cio de Lemos Rodrigues Collares Neto &lt;<a href=\"mailto: mauricioc@gmail.com\">mauricioc@gmail.com</a>&gt;<br>"
 			"  <b>", _("Romanian"), " (ro)</b> - Mi�u Moldovan &lt;<a href=\"mailto: dumol@go.ro\">dumol@go.ro</a>&gt;<br>"
-			"  <b>", _("Russian"), "(ru)</b> - Alexandre Prokoudine &lt;<a href=\"mailto: avp@altlinux.ru\">avp@altlinux.ru</a>&gt;<br>"
+			"  <b>", _("Russian"), "(ru)</b> - Dmitry Beloglazov &lt;<a href=\"mailto: dmaa@users.sf.net\">dmaa@users.sf.net</a>&gt;<br>"
 			"  <b>", _("Serbian"), " (sr)</b> - Danilo �egan &lt;<a href=\"mailto: dsegan@gmx.net\">dsegan@gmx.net</a>&gt;, Aleksandar Urosevic &lt;<a href=\"mailto: urke@users.sourceforge.net\">urke@users.sourceforge.net</a>&gt;<br>"
 			"  <b>", _("Slovenian"), " (sl)</b> - Matjaz Horvat &lt;&gt;<br>"
 			"  <b>", _("Swedish"), " (sv)</b> - Tore Lundqvist &lt;<a href=\"mailto: tlt@mima.x.se\">tlt@mima.x.se</a>&gt;<br>"
@@ -212,6 +212,7 @@
 			"  <b>", _("Korean"), " (ko)</b> - Sang-hyun S, A Ho-seok Lee<br>"
 			"  <b>", _("Polish"), " (pl)</b> - Przemys�aw Su�ek<br>"
 			"  <b>", _("Russian"), " (ru)</b> - Sergey Volozhanin<br>"
+			"  <b>", _("Russian"), "(ru)</b> - Alexandre Prokoudine<br>"
 			"  <b>", _("Slovak"), " (sk)</b> - Daniel Re転n箪<br>"
 			"  <b>", _("Swedish"), " (sv)</b> - Christian Rose<br>"
 			"  <b>", _("Chinese"), " (zh_CN, zh_TW)</b> - Hashao, Rocky S. Lee<br>"