diff po/zh_CN.po @ 11412:4be6232ffcd3

[gaim-migrate @ 13649] sync the oldstatus translations to head because I have not been updating head, and while head _is_ significantly different, there now exist translations in oldstatus that don't in head, and even where they exist in both, the oldstatus one is often more updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 01 Sep 2005 19:24:17 +0000
parents 67a929d50cfe
children 81e26b7f262e
line wrap: on
line diff
--- a/po/zh_CN.po	Thu Sep 01 18:47:49 2005 +0000
+++ b/po/zh_CN.po	Thu Sep 01 19:24:17 2005 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim HEAD\n"
+"Project-Id-Version: gaim oldstatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-15 12:01-0400\n"
-"PO-Revision-Date: 2005-06-09 03:19+0800\n"
+"POT-Creation-Date: 2005-08-08 13:04+0800\n"
+"PO-Revision-Date: 2005-08-08 13:08+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -16,21 +16,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/autorecon.c:291
+#: ../plugins/autorecon.c:240
 msgid "Error Message Suppression"
 msgstr "错误消息屏蔽"
 
-#: plugins/autorecon.c:295
+#: ../plugins/autorecon.c:244
 msgid "Hide Disconnect Errors"
 msgstr "隐藏断开连接错误"
 
-#: plugins/autorecon.c:299
+#: ../plugins/autorecon.c:248
 msgid "Hide Login Errors"
 msgstr "隐藏登录错误"
 
-#: plugins/autorecon.c:303
-msgid "Hide Reconnecting Dialog"
-msgstr "隐藏重新连接错误"
+#: ../plugins/autorecon.c:252
+msgid "Restore Away State On Reconnect"
+msgstr "重新连接时恢复离开状态"
 
 #. *< type
 #. *< ui_requirement
@@ -38,7 +38,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:327
+#: ../plugins/autorecon.c:276
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
@@ -46,45 +46,62 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:330 plugins/autorecon.c:332
+#: ../plugins/autorecon.c:279 ../plugins/autorecon.c:281
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
-#: plugins/contact_priority.c:84
+#: ../plugins/chkmail.c:94 ../plugins/chkmail.c:117 ../plugins/chkmail.c:126
+msgid "Mail Server"
+msgstr "邮件服务器"
+
+#: ../plugins/chkmail.c:136
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d 封新邮件/共 %d 封)"
+
+#: ../plugins/chkmail.c:199
+msgid "Check Mail"
+msgstr "检查邮件"
+
+#: ../plugins/chkmail.c:203
+msgid "Check email every X seconds.\n"
+msgstr "每隔 X 秒检查邮件。\n"
+
+#: ../plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "程序内部所用的权值,当..."
 
-#: plugins/contact_priority.c:93
+#: ../plugins/contact_priority.c:93
 msgid "Buddy is offline:"
 msgstr "好友离线:"
 
-#: plugins/contact_priority.c:107
+#: ../plugins/contact_priority.c:107
 msgid "Buddy is away:"
 msgstr "好友离开:"
 
-#: plugins/contact_priority.c:121
+#: ../plugins/contact_priority.c:121
 msgid "Buddy is idle:"
 msgstr "好友瞌睡:"
 
-#: plugins/contact_priority.c:135
+#: ../plugins/contact_priority.c:135
 msgid "Use last matching buddy"
 msgstr "使用最后一个匹配的好友"
 
 #. Explanation
-#: plugins/contact_priority.c:141
+#: ../plugins/contact_priority.c:141
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
 msgstr ""
 "分值最低的好友是联系人中有优先权的好友。\n"
 "使用默认值(离线=4,离开=2,瞌睡=1)时,内置顺序将为: 在线->瞌睡->离开+瞌睡->离"
 "线。"
 
-#: plugins/contact_priority.c:144
-msgid "Point values to use for account..."
+#: ../plugins/contact_priority.c:144
+msgid "Point values to use for Account..."
 msgstr "账户的权值..."
 
 #. *< type
@@ -93,94 +110,90 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
+#: ../plugins/contact_priority.c:195
 msgid "Contact Priority"
 msgstr "联系人优先级"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
+#: ../plugins/contact_priority.c:198
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "允许控制好友不同状态所对应的值。"
 
 #. *< description
-#: plugins/contact_priority.c:200
+#: ../plugins/contact_priority.c:200
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr "允许在进行好友优先级比较时为瞌睡/离开/离线状态所用的权值。"
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - 已登出"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - 离开"
-
-#: plugins/docklet/docklet.c:136
+#: ../plugins/docklet/docklet.c:137 ../src/gtkaccount.c:751
+#: ../src/gtkaccount.c:2179
+msgid "Auto-login"
+msgstr "自动登录"
+
+#: ../plugins/docklet/docklet.c:140
 msgid "New Message..."
 msgstr "新消息..."
 
-#: plugins/docklet/docklet.c:137
+#: ../plugins/docklet/docklet.c:141
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:172
+#: ../plugins/docklet/docklet.c:173
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
-#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
-#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
-#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
-#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
-#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
-#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
-#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
+#: ../plugins/docklet/docklet.c:177 ../src/gtkprefs.c:1813
+#: ../src/protocols/gg/gg.c:52 ../src/protocols/irc/msgs.c:227
+#: ../src/protocols/jabber/jabber.c:998 ../src/protocols/jabber/jutil.c:32
+#: ../src/protocols/jabber/presence.c:69
+#: ../src/protocols/jabber/presence.c:132
+#: ../src/protocols/novell/novell.c:2800 ../src/protocols/novell/novell.c:2917
+#: ../src/protocols/novell/novell.c:2969 ../src/protocols/oscar/oscar.c:685
+#: ../src/protocols/oscar/oscar.c:5802 ../src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:6999 ../src/protocols/silc/buddy.c:1388
+#: ../src/protocols/silc/silc.c:47 ../src/protocols/silc/silc.c:81
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:184
+#. else...
+#: ../plugins/docklet/docklet.c:183 ../src/away.c:595
+#: ../src/protocols/oscar/oscar.c:5720 ../src/protocols/oscar/oscar.c:7007
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:191
+#: ../plugins/docklet/docklet.c:191
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:198 src/gtkft.c:694
+#: ../plugins/docklet/docklet.c:196 ../src/gtkft.c:659
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
+#: ../plugins/docklet/docklet.c:197 ../src/gtkaccount.c:2391
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
+#: ../plugins/docklet/docklet.c:198 ../src/gtkprefs.c:2514
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:204
+#: ../plugins/docklet/docklet.c:207
+msgid "Signoff"
+msgstr "登出"
+
+#: ../plugins/docklet/docklet.c:211
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:529
+#: ../plugins/docklet/docklet.c:527
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:533
+#: ../plugins/docklet/docklet.c:531
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -190,19 +203,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:557
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:562
+#: ../plugins/docklet/docklet.c:560
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:564
+#: ../plugins/docklet/docklet.c:562
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -213,19 +226,42 @@
 "并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
 "似,还可以将消息存入队列。"
 
-#: plugins/extplacement.c:77
+#.
+#. *  DEFINES, MACROS & DATA TYPES
+#.
+#: ../plugins/docklet/docklet-win32.c:44
+msgid "Gaim"
+msgstr "Gaim"
+
+#: ../plugins/docklet/docklet-win32.c:45
+msgid "Gaim - Signed off"
+msgstr "Gaim - 已登出"
+
+#: ../plugins/docklet/docklet-win32.c:46
+msgid "Gaim - Away"
+msgstr "Gaim - 离开"
+
+#: ../plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr "方向"
+
+#: ../plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr "托盘的方向。"
+
+#: ../plugins/extplacement.c:77
 msgid "By conversation count"
 msgstr "按对话计数"
 
-#: plugins/extplacement.c:98
+#: ../plugins/extplacement.c:98
 msgid "Conversation Placement"
 msgstr "交谈放置"
 
-#: plugins/extplacement.c:103
+#: ../plugins/extplacement.c:103
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
 
-#: plugins/extplacement.c:109
+#: ../plugins/extplacement.c:109
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "按数字放置时分离即时消息和聊天窗口"
 
@@ -235,19 +271,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:130
+#: ../plugins/extplacement.c:130
 msgid "ExtPlacement"
 msgstr "扩展放置"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:132
 msgid "Extra conversation placement options."
 msgstr "额外的对话放置选项。"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:134
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -259,7 +295,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr "Gaim 文件控制"
 
@@ -267,82 +303,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: ../plugins/filectl.c:227 ../plugins/filectl.c:229
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制 Gaim。"
 
-#: plugins/gaim-remote/remote.c:91
-msgid "Not connected to AIM"
-msgstr "未连接到 AIM"
-
-#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
-msgid "No screenname given."
-msgstr "没有给出用户名。"
-
-#: plugins/gaim-remote/remote.c:176
-msgid "No roomname given."
-msgstr "没有给出聊天室名。"
-
-#: plugins/gaim-remote/remote.c:195
-msgid "Invalid AIM URI"
-msgstr "无效的 AIM URI"
-
-#: plugins/gaim-remote/remote.c:750
-#, c-format
-msgid ""
-"Failed to assign %s to a socket:\n"
-"%s"
-msgstr ""
-"将 %s 指派给套接字失败:\n"
-"%s"
-
-#: plugins/gaim-remote/remote.c:774
-msgid "Unable to open socket"
-msgstr "无法打开套接字"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:824
-msgid "Remote Control"
-msgstr "远程控制"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaim-remote/remote.c:827
-msgid "Provides remote control for gaim applications."
-msgstr "提供 gaim 程序的远程控制。"
-
-#. *  description
-#: plugins/gaim-remote/remote.c:829
-msgid ""
-"Gives Gaim the ability to be remote-controlled through third-party "
-"applications or through the gaim-remote tool."
-msgstr "为 Gaim 添加可通过第三方应用程序或 gaim-remote 工具远程控制的能力。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:90
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim 演示插件"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:93
 msgid "An example plugin that does stuff - see the description."
 msgstr "一个范例插件 - 参看描述。"
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:95
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -354,91 +337,74 @@
 "- 颠倒所有收到的文本\n"
 "- 当您的好友登入后立即给他们发送信息"
 
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr "光标颜色"
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr "次要光标颜色"
-
-#: plugins/gaimrc.c:42
-msgid "Hyperlink Color"
-msgstr "超级链接颜色"
-
-#: plugins/gaimrc.c:53
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 扩展柄大小"
-
-#: plugins/gaimrc.c:72
-msgid "Conversation Entry"
-msgstr "对话项"
-
-#: plugins/gaimrc.c:73
-msgid "Conversation History"
-msgstr "对话历史"
-
-#: plugins/gaimrc.c:74
-msgid "Log Viewer"
-msgstr "日志查看器"
-
-#: plugins/gaimrc.c:75
-msgid "Request Dialog"
-msgstr "请求对话框"
-
-#: plugins/gaimrc.c:76
-msgid "Notify Dialog"
-msgstr "提醒对话框"
-
-#: plugins/gaimrc.c:209
-#, c-format
-msgid "Select Color for %s"
-msgstr "选择 %s 的颜色"
-
-#: plugins/gaimrc.c:211
-msgid "Select Color"
-msgstr "选择颜色"
-
-#: plugins/gaimrc.c:246
-#, c-format
-msgid "Select Font for %s"
-msgstr "选择 %s 的字体"
-
-#: plugins/gaimrc.c:284
-msgid "Select Interface Font"
-msgstr "选择界面字体"
-
-#: plugins/gaimrc.c:343
-msgid "GTK+ Interface Font"
-msgstr "GTK+ 界面字体"
-
-#: plugins/gaimrc.c:362
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ 文字快捷方式主题"
-
-#: plugins/gaimrc.c:460
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ 主题控制"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "提供对常用 gtkrc 设置的访问。"
+#: ../plugins/gaim-remote/remote.c:91
+msgid "Not connected to AIM"
+msgstr "未连接到 AIM"
+
+#: ../plugins/gaim-remote/remote.c:100 ../plugins/gaim-remote/remote.c:139
+msgid "No screenname given."
+msgstr "没有给出用户名。"
+
+#: ../plugins/gaim-remote/remote.c:176
+msgid "No roomname given."
+msgstr "没有给出聊天室名。"
+
+#: ../plugins/gaim-remote/remote.c:195
+msgid "Invalid AIM URI"
+msgstr "无效的 AIM URI"
+
+#: ../plugins/gaim-remote/remote.c:673
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+"将 %s 指派给套接字失败:\n"
+"%s"
+
+#: ../plugins/gaim-remote/remote.c:697
+msgid "Unable to open socket"
+msgstr "无法打开套接字"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/gaim-remote/remote.c:747
+msgid "Remote Control"
+msgstr "远程控制"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/gaim-remote/remote.c:750
+msgid "Provides remote control for gaim applications."
+msgstr "提供 gaim 程序的远程控制。"
+
+#. *  description
+#: ../plugins/gaim-remote/remote.c:752
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr "为 Gaim 添加可通过第三方应用程序或 gaim-remote 工具远程控制的能力。"
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:241
+#: ../plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr "鼠标手势配置"
 
-#: plugins/gestures/gestures.c:248
+#: ../plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "鼠标中键"
 
-#: plugins/gestures/gestures.c:253
+#: ../plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "鼠标右键"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:265
+#: ../plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr "可视手势显示(_V)"
 
@@ -448,19 +414,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:294
+#: ../plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:297
+#: ../plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:279
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -476,105 +442,94 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
+#: ../plugins/gevolution/add_buddy_dialog.c:132
+#: ../plugins/gevolution/assoc-buddy.c:120 ../src/gtkprefs.c:2168
+#: ../src/gtkroomlist.c:553 ../src/protocols/jabber/jabber.c:609
+#: ../src/protocols/msn/msn.c:1474 ../src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "名称"
 
-#: plugins/gevolution/add_buddy_dialog.c:143
+#: ../plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "即时通讯"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:459
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:472
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
+#: ../plugins/gevolution/add_buddy_dialog.c:468
+#: ../plugins/gevolution/assoc-buddy.c:354 ../src/protocols/oscar/oscar.c:7283
 msgid "Search"
 msgstr "搜索"
 
-#: plugins/gevolution/add_buddy_dialog.c:553
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
-#: src/gtkblist.c:4777
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:304 ../src/gtkblist.c:4186
+#: ../src/gtkblist.c:4534
 msgid "Group:"
 msgstr "组:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:579
-#: plugins/gevolution/assoc-buddy.c:466
+#: ../plugins/gevolution/add_buddy_dialog.c:575
+#: ../plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:596
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "选择好友"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:341
+#: ../plugins/gevolution/assoc-buddy.c:341
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:429
+#: ../plugins/gevolution/assoc-buddy.c:429
 msgid "Show user details"
 msgstr "显示用户细节"
 
-#: plugins/gevolution/assoc-buddy.c:430
+#: ../plugins/gevolution/assoc-buddy.c:430
 msgid "Hide user details"
 msgstr "隐藏用户细节"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:483
+#: ../plugins/gevolution/assoc-buddy.c:483
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
-#: src/protocols/jabber/roster.c:66
+#: ../plugins/gevolution/eds-utils.c:74 ../plugins/gevolution/eds-utils.c:87
+#: ../src/gtkblist.c:3122 ../src/gtkprefs.c:962 ../src/gtkprefs.c:1014
+#: ../src/gtkprefs.c:1827 ../src/protocols/jabber/jabber.c:949
+msgid "None"
+msgstr "无"
+
+#: ../plugins/gevolution/gevolution.c:93 ../plugins/gevolution/gevo-util.c:64
+#: ../src/blist.c:776 ../src/blist.c:983 ../src/blist.c:1936
+#: ../src/gtkblist.c:4001 ../src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
-msgid "Unable to send e-mail"
-msgstr "无法发送消息。"
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+#: ../plugins/gevolution/gevolution.c:225
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
-msgid "Send E-Mail"
-msgstr "电子邮件"
-
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:348
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:351
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:52 src/gtkconn.c:431
+#: ../plugins/gevolution/gevolution.c:381 ../plugins/idle.c:52
+#: ../src/gtkconn.c:627
 msgid "Account"
 msgstr "账户"
 
@@ -584,7 +539,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:464
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -592,87 +547,89 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
-msgid "Provides integration with Evolution."
+#: ../plugins/gevolution/gevolution.c:467
+#: ../plugins/gevolution/gevolution.c:469
+msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:264
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:288
 msgid "Account type:"
 msgstr "账户类型:"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: ../plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr "用户名:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
-#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
+#: ../plugins/gevolution/new_person_dialog.c:335 ../src/gtkaccount.c:379
+#: ../src/gtkaccount.c:409 ../src/protocols/oscar/oscar.c:591
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "电子邮件:"
 
-#: plugins/history.c:137
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:138
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:177
-msgid "History"
-msgstr "历史"
-
-#: plugins/history.c:179
-msgid "Shows recently logged conversations in new conversations."
-msgstr "在新对话中显示显示最近记录的对话。"
-
-#: plugins/history.c:180
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:106
+#: ../plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr "GTK 信号测试"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:105 ../plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr "测试看看所有的 UI 信号是否都工作正确。"
+
+#: ../plugins/history.c:92
+msgid "History"
+msgstr "历史"
+
+#: ../plugins/history.c:94
+msgid "Shows recently logged conversations in new conversations."
+msgstr "在新对话中显示显示最近记录的对话。"
+
+#: ../plugins/history.c:95
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/iconaway.c:104
 msgid "Iconify on Away"
 msgstr "离开后变为图标"
 
@@ -680,31 +637,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:109 plugins/iconaway.c:111
+#: ../plugins/iconaway.c:107 ../plugins/iconaway.c:109
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
-#: plugins/idle.c:56
+#: ../plugins/idle.c:56
 msgid "Minutes"
 msgstr "分钟"
 
-#: plugins/idle.c:63 plugins/idle.c:97
+#: ../plugins/idle.c:63 ../plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "瞌睡虫"
 
-#: plugins/idle.c:64 plugins/idle.c:79
+#: ../plugins/idle.c:64 ../plugins/idle.c:79
 msgid "Set Account Idle Time"
 msgstr "设定账户瞌睡时间"
 
-#: plugins/idle.c:67
+#: ../plugins/idle.c:67
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:68
+#: ../plugins/idle.c:68 ../src/away.c:922
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: plugins/idle.c:99 plugins/idle.c:100
+#: ../plugins/idle.c:100 ../plugins/idle.c:101
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允许您手动配置您睡了多长时间"
 
@@ -714,19 +671,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC 测试客户"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "测试插件 IPC 支持,作为客户。"
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -738,102 +695,97 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC 测试服务器"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "测试插件 IPC 支持,作为服务器。"
 
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "测试插件 IPC 支持,作为服务器。这将注册 IPC 命令。"
 
-#: plugins/mailchk.c:160
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "邮件检查器"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "检查新的本地邮件。"
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:642
+#: ../plugins/notify.c:614
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:646
+#: ../plugins/notify.c:618
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:653
+#: ../plugins/notify.c:625
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:660
+#: ../plugins/notify.c:632
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:668
+#: ../plugins/notify.c:640
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:675
+#: ../plugins/notify.c:647
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:694
+#: ../plugins/notify.c:666
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:702
+#: ../plugins/notify.c:674
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
-#. Raise window method button
-#: plugins/notify.c:710
-msgid "R_aise conversation window"
-msgstr "升起对话窗口(_A)"
-
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:718
+#: ../plugins/notify.c:682
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:723
+#: ../plugins/notify.c:687
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:730
+#: ../plugins/notify.c:694
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:738
+#: ../plugins/notify.c:702
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:746
+#: ../plugins/notify.c:710
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:755
+#: ../plugins/notify.c:719
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -843,7 +795,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:845
+#: ../plugins/notify.c:809
 msgid "Message Notification"
 msgstr "消息通知"
 
@@ -851,9 +803,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:848 plugins/notify.c:850
+#: ../plugins/notify.c:812 ../plugins/notify.c:814
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "提供各种方法通知您有未读消息。"
+msgstr "提供各种方法通知您有消息邮件。"
 
 #. *< type
 #. *< ui_requirement
@@ -861,26 +813,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:567
+#: ../plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
+#: ../plugins/perl/perl.c:537 ../plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
-#: plugins/raw.c:151
+#: ../plugins/raw.c:151
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:153
+#: ../plugins/raw.c:153
 msgid "Lets you send raw input to text-based protocols."
 msgstr "允许您发送原样输入基于文本的协议。"
 
-#: plugins/raw.c:154
+#: ../plugins/raw.c:154
 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."
@@ -888,12 +840,12 @@
 "允许您将输入原样发送给基于文本的协议(Jabber,MSN,IRC,TOC)。在输入框中按回车"
 "键可以发送。看看调试窗口。"
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "您正在使用 Gaim 版本 %s。而当前版本为 %s。<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -902,7 +854,7 @@
 "<b>更新记录:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -911,7 +863,7 @@
 "您可以从下面的地址获得版本 %s:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78 plugins/relnot.c:79
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "新版本可用"
 
@@ -921,19 +873,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "版本通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "定期检查新版本。"
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -945,7 +897,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:626
+#: ../plugins/signals-test.c:601
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -953,7 +905,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:629 plugins/signals-test.c:631
+#: ../plugins/signals-test.c:604 ../plugins/signals-test.c:606
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -963,7 +915,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "简单插件"
 
@@ -971,47 +923,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: ../plugins/simple.c:37 ../plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:1680
-msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1681
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1826
+#: ../plugins/spellchk.c:416
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:1850
+#: ../plugins/spellchk.c:440
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:1862
+#: ../plugins/spellchk.c:452
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:1888
+#: ../plugins/spellchk.c:478
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:1895
+#: ../plugins/spellchk.c:485
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:1909
+#: ../plugins/spellchk.c:499
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:1951
+#: ../plugins/spellchk.c:541
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
+#: ../plugins/spellchk.c:543 ../plugins/spellchk.c:544
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -1021,7 +965,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "提供 SSL 支持库。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/ssl/ssl-gnutls.c:226
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1029,7 +991,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:229 ../plugins/ssl/ssl-gnutls.c:231
 msgid "Provides SSL support through GNUTLS."
 msgstr "提供通过 GNUTLS 的 SSL 支持。"
 
@@ -1039,7 +1001,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:318
 msgid "NSS"
 msgstr "NSS"
 
@@ -1047,57 +1009,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:321 ../plugins/ssl/ssl-nss.c:323
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "提供 SSL 支持库。"
-
-#: plugins/statenotify.c:42
+#: ../plugins/statenotify.c:41
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 走了。"
 
-#: plugins/statenotify.c:49
+#: ../plugins/statenotify.c:48
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 回来了。"
 
-#: plugins/statenotify.c:56
+#: ../plugins/statenotify.c:55
 #, c-format
 msgid "%s has become idle."
 msgstr "%s 打起瞌睡。"
 
-#: plugins/statenotify.c:63
+#: ../plugins/statenotify.c:62
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s 睡醒了。"
 
-#: plugins/statenotify.c:74
+#: ../plugins/statenotify.c:73
 msgid "Notify When"
 msgstr "通知情况"
 
-#: plugins/statenotify.c:77
+#: ../plugins/statenotify.c:76
 msgid "Buddy Goes _Away"
 msgstr "好友离开(_A)"
 
-#: plugins/statenotify.c:80
+#: ../plugins/statenotify.c:79
 msgid "Buddy Goes _Idle"
 msgstr "好友瞌睡(_I)"
 
@@ -1107,7 +1051,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:119
 msgid "Buddy State Notification"
 msgstr "好友状态通知"
 
@@ -1115,17 +1059,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:122 ../plugins/statenotify.c:125
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:365 ../plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
@@ -1135,7 +1079,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:75 ../plugins/ticker/ticker.c:331
 msgid "Buddy Ticker"
 msgstr "好友点点通"
 
@@ -1143,23 +1087,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
+#: ../plugins/ticker/ticker.c:334 ../plugins/ticker/ticker.c:336
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "iChat 时间戳"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "延迟"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "分钟。"
 
-#: plugins/timestamp.c:222
+#: ../plugins/timestamp.c:206
 msgid "_Apply"
 msgstr "应用(_A)"
 
@@ -1169,7 +1113,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:287
+#: ../plugins/timestamp.c:271
 msgid "Timestamp"
 msgstr "时间戳"
 
@@ -1177,35 +1121,35 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:290 plugins/timestamp.c:292
+#: ../plugins/timestamp.c:274 ../plugins/timestamp.c:276
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
-#: plugins/win32/transparency/win2ktrans.c:134
-#: plugins/win32/transparency/win2ktrans.c:413
-#: plugins/win32/transparency/win2ktrans.c:444
+#: ../plugins/win32/transparency/win2ktrans.c:134
+#: ../plugins/win32/transparency/win2ktrans.c:413
+#: ../plugins/win32/transparency/win2ktrans.c:444
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:394
+#: ../plugins/win32/transparency/win2ktrans.c:394
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:395
+#: ../plugins/win32/transparency/win2ktrans.c:395
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:405
+#: ../plugins/win32/transparency/win2ktrans.c:405
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:430
+#: ../plugins/win32/transparency/win2ktrans.c:430 ../src/gtkprefs.c:956
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:431
+#: ../plugins/win32/transparency/win2ktrans.c:431
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
@@ -1215,19 +1159,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:489
+#: ../plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:492
+#: ../plugins/win32/transparency/win2ktrans.c:492
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:494
+#: ../plugins/win32/transparency/win2ktrans.c:494
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1238,206 +1182,226 @@
 "\n"
 "* 注意: 此插件需要 Win2000 或 WinXP。"
 
-#: plugins/win32/winprefs/winprefs.c:401
+#: ../plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ 运行时刻版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:409
+#: ../plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/win32/winprefs/winprefs.c:410
+#: ../plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:421 src/gtkblist.c:3514
-#: src/gtkprefs.c:2099
+#: ../plugins/win32/winprefs/winprefs.c:362 ../src/gtkblist.c:3167
+#: ../src/gtkprefs.c:2421
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
 
+#. Docked Blist On Top
+#: ../plugins/win32/winprefs/winprefs.c:367
+msgid "Docked _Buddy List is always on top"
+msgstr "停靠的好友列表常居顶端(_B)"
+
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:426
-#, fuzzy
-msgid "_Keep Buddy List window on top:"
+#: ../plugins/win32/winprefs/winprefs.c:377
+msgid "_Keep Buddy List window on top"
 msgstr "好友列表窗口常居顶端(_K)"
 
-#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
-msgid "Never"
-msgstr "从不"
-
-#: plugins/win32/winprefs/winprefs.c:429
-#, fuzzy
-msgid "Always"
-msgstr "离开"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:431
-msgid "Only when docked"
-msgstr ""
-
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
-#: src/gtkprefs.c:2100
+#: ../plugins/win32/winprefs/winprefs.c:382 ../src/gtkprefs.c:1007
+#: ../src/gtkprefs.c:2422 ../src/protocols/msn/msn.c:1811
 msgid "Conversations"
 msgstr "对话"
 
-#: plugins/win32/winprefs/winprefs.c:436
-#, fuzzy
-msgid "_Flash window when messages are received"
+#: ../plugins/win32/winprefs/winprefs.c:383
+msgid "_Flash Window when messages are received"
 msgstr "收到信息时闪烁窗口(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:461
+#: ../plugins/win32/winprefs/winprefs.c:409
+#: ../plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: plugins/win32/winprefs/winprefs.c:462
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-msgid "accounts"
-msgstr "账户"
-
-#: src/account.c:913
-msgid "Password is required to sign on."
-msgstr "需要密码才能登入。"
-
-#: src/account.c:939
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "输入 %s(%s) 的密码"
-
-#: src/account.c:946
-msgid "Enter Password"
-msgstr "输入密码"
-
-#: src/account.c:951
-#, fuzzy
-msgid "Save password"
+#: ../src/account.c:298 ../src/protocols/jabber/jabber.c:1039
+msgid "New passwords do not match."
+msgstr "新密码不相同。"
+
+#: ../src/account.c:307
+msgid "Fill out all fields completely."
+msgstr "完全填入所有字段。"
+
+#: ../src/account.c:332
+msgid "Original password"
+msgstr "旧密码"
+
+#: ../src/account.c:339
+msgid "New password"
 msgstr "新密码"
 
+#: ../src/account.c:346
+msgid "New password (again)"
+msgstr "再次输入新密码"
+
+#: ../src/account.c:352
+#, c-format
+msgid "Change password for %s"
+msgstr "更改 %s 的密码"
+
+#: ../src/account.c:360
+msgid "Please enter your current password and your new password."
+msgstr "请输入您目前的密码和新密码。"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:959 src/account.c:1111 src/gtkdialogs.c:504
-#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
-#: src/protocols/jabber/jabber.c:1103 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:2476 src/protocols/oscar/oscar.c:3774
-#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
-#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
-#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
-#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1700
-#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
+#: ../src/account.c:363 ../src/connection.c:198 ../src/gtkblist.c:2492
+#: ../src/gtkdialogs.c:506 ../src/gtkdialogs.c:648 ../src/gtkdialogs.c:702
+#: ../src/gtkrequest.c:243 ../src/protocols/jabber/jabber.c:1086
+#: ../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:2414
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3781
+#: ../src/protocols/oscar/oscar.c:7070 ../src/protocols/oscar/oscar.c:7162
+#: ../src/protocols/oscar/oscar.c:7214 ../src/protocols/oscar/oscar.c:7300
+#: ../src/protocols/silc/buddy.c:460 ../src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:722 ../src/protocols/silc/ops.c:1081
+#: ../src/protocols/silc/ops.c:1699 ../src/protocols/silc/silc.c:711
+#: ../src/protocols/yahoo/yahoo.c:3021 ../src/protocols/yahoo/yahoo.c:3030
+#: ../src/request.h:1245
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:960 src/account.c:1112 src/account.c:1150
-#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
-#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
-#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
-#: 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:1594 src/protocols/oscar/oscar.c:2477
-#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
-#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
-#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
-#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
-#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
-#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
-#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
+#: ../src/account.c:364 ../src/account.c:402 ../src/away.c:367
+#: ../src/connection.c:199 ../src/gtkaccount.c:2029 ../src/gtkaccount.c:2568
+#: ../src/gtkaccount.c:2599 ../src/gtkblist.c:2493 ../src/gtkblist.c:4572
+#: ../src/gtkconn.c:169 ../src/gtkdialogs.c:507 ../src/gtkdialogs.c:649
+#: ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:801 ../src/gtkdialogs.c:823
+#: ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:880 ../src/gtkdialogs.c:940
+#: ../src/gtkdialogs.c:983 ../src/gtkdialogs.c:1024
+#: ../src/gtkimhtmltoolbar.c:437 ../src/gtkprivacy.c:597
+#: ../src/gtkprivacy.c:610 ../src/gtkprivacy.c:635 ../src/gtkprivacy.c:646
+#: ../src/gtkrequest.c:244 ../src/protocols/icq/gaim_icq.c:276
+#: ../src/protocols/jabber/buddy.c:515 ../src/protocols/jabber/chat.c:754
+#: ../src/protocols/jabber/jabber.c:678 ../src/protocols/jabber/jabber.c:1087
+#: ../src/protocols/jabber/presence.c:213 ../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:1535
+#: ../src/protocols/oscar/oscar.c:2415 ../src/protocols/oscar/oscar.c:3645
+#: ../src/protocols/oscar/oscar.c:3688 ../src/protocols/oscar/oscar.c:3725
+#: ../src/protocols/oscar/oscar.c:3782 ../src/protocols/oscar/oscar.c:7071
+#: ../src/protocols/oscar/oscar.c:7163 ../src/protocols/oscar/oscar.c:7215
+#: ../src/protocols/oscar/oscar.c:7284 ../src/protocols/oscar/oscar.c:7301
+#: ../src/protocols/silc/buddy.c:461 ../src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1133 ../src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:723 ../src/protocols/silc/ops.c:1700
+#: ../src/protocols/silc/silc.c:712 ../src/protocols/trepia/trepia.c:348
+#: ../src/protocols/yahoo/yahoo.c:3022 ../src/protocols/yahoo/yahoo.c:3031
+#: ../src/request.h:1245 ../src/request.h:1255
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:982 src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "缺少 %s 的协议插件"
-
-#: src/account.c:984 src/connection.c:99
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
-msgid "New passwords do not match."
-msgstr "新密码不相同。"
-
-#: src/account.c:1055
-msgid "Fill out all fields completely."
-msgstr "完全填入所有字段。"
-
-#: src/account.c:1080
-msgid "Original password"
-msgstr "旧密码"
-
-#: src/account.c:1087
-msgid "New password"
-msgstr "新密码"
-
-#: src/account.c:1094
-msgid "New password (again)"
-msgstr "再次输入新密码"
-
-#: src/account.c:1100
-#, c-format
-msgid "Change password for %s"
-msgstr "更改 %s 的密码"
-
-#: src/account.c:1108
-msgid "Please enter your current password and your new password."
-msgstr "请输入您目前的密码和新密码。"
-
-#: src/account.c:1141
+#: ../src/account.c:393
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
-#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
+#: ../src/account.c:401 ../src/gtkrequest.c:250
+#: ../src/protocols/jabber/buddy.c:514 ../src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
-#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
-#: src/protocols/novell/novell.c:2825
+#: ../src/account.c:760 ../src/gtkft.c:159 ../src/protocols/jabber/buddy.c:573
+#: ../src/protocols/novell/novell.c:2812
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:545
-msgid "buddy list"
-msgstr "好友列表"
-
-#: src/blist.c:1145
+#: ../src/away.c:233
+msgid "Away!"
+msgstr "离开!"
+
+#: ../src/away.c:303
+msgid "Edit This Message"
+msgstr "编辑此消息"
+
+#: ../src/away.c:308
+msgid "I'm Back!"
+msgstr "我回来了!"
+
+#: ../src/away.c:362
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "您真的想要删除离开消息“%s”吗?"
+
+#: ../src/away.c:364 ../src/away.c:442
+msgid "Remove Away Message"
+msgstr "删除离开消息"
+
+#. Remove button
+#: ../src/away.c:366 ../src/gtkconv.c:1535 ../src/gtkconv.c:3917
+#: ../src/gtkconv.c:3988 ../src/gtkrequest.c:249
+msgid "Remove"
+msgstr "删除"
+
+#: ../src/away.c:436
+msgid "New Away Message"
+msgstr "新建离开消息"
+
+#: ../src/away.c:663
+msgid "Set All Away"
+msgstr "全部设为离开"
+
+#: ../src/away.c:770
+msgid "You cannot save an away message with a blank title"
+msgstr "您不能保存空标题的离开消息"
+
+#: ../src/away.c:772
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr "请给消息指定标题,或者不保存直接“使用”。"
+
+#: ../src/away.c:782
+msgid "You cannot create an empty away message"
+msgstr "您不能创建空的离开消息"
+
+#: ../src/away.c:847
+msgid "New away message"
+msgstr "新建离开消息"
+
+#: ../src/away.c:862
+msgid "Away title: "
+msgstr "离开标题:"
+
+#: ../src/away.c:910
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: ../src/away.c:914
+msgid "Sa_ve & Use"
+msgstr "保存并使用(_V)"
+
+#: ../src/away.c:918
+msgid "_Use"
+msgstr "使用(_U)"
+
+#: ../src/blist.c:682
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1835
+#: ../src/blist.c:1357
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1449,92 +1413,118 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1844
+#: ../src/blist.c:1366
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/connection.c:98
+#: ../src/blist.c:2069
+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:2072
+msgid "Buddy List Error"
+msgstr "好友列表出错"
+
+#: ../src/connection.c:118 ../src/connection.c:169
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "缺少 %s 的协议插件"
+
+#: ../src/connection.c:123
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: src/conversation.c:237
-msgid "Unable to send message: The message is too large."
-msgstr "无法发送消息: 消息太大。"
-
-#: src/conversation.c:240 src/conversation.c:253
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "无法给 %s 发送消息。"
-
-#: src/conversation.c:241
+#: ../src/connection.c:174
+msgid "Connection Error"
+msgstr "连接错误"
+
+#: ../src/connection.c:195
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "输入 %s(%s) 的密码"
+
+#: ../src/conversation.c:233
+msgid "Unable to send message. The message is too large."
+msgstr "无法发送消息。消息太大。"
+
+#: ../src/conversation.c:237 ../src/conversation.c:251
+#: ../src/protocols/oscar/oscar.c:4248
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "无法给 %s 发送消息:"
+
+#: ../src/conversation.c:239
 msgid "The message is too large."
 msgstr "消息太长。"
 
-#: src/conversation.c:250
+#: ../src/conversation.c:248
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1962
+#: ../src/conversation.c:2070
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1965
+#: ../src/conversation.c:2073
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2062
+#: ../src/conversation.c:2171
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2065
+#: ../src/conversation.c:2174
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2107
+#: ../src/conversation.c:2216
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2109
+#: ../src/conversation.c:2218
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2186
+#: ../src/conversation.c:2291
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2188
+#: ../src/conversation.c:2293
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2596
+#: ../src/conversation.c:2698
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2598
+#: ../src/conversation.c:2700
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2600 src/gtkprefs.c:1279
+#: ../src/conversation.c:2702 ../src/gtkprefs.c:1387
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2602
+#: ../src/conversation.c:2704
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2604
+#: ../src/conversation.c:2706
 msgid "By account"
 msgstr "按账户"
 
-#: src/ft.c:150 src/protocols/msn/msn.c:369
+#: ../src/ft.c:148 ../src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1543,7 +1533,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:154
+#: ../src/ft.c:152
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1552,7 +1542,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:158
+#: ../src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1561,35 +1551,35 @@
 "访问 %s出错:\n"
 "%s。\n"
 
-#: src/ft.c:191
+#: ../src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:201
+#: ../src/ft.c:199
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: src/ft.c:210
+#: ../src/ft.c:208
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:268
+#: ../src/ft.c:265
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:275
+#: ../src/ft.c:273
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: src/ft.c:316
+#: ../src/ft.c:311
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:320
+#: ../src/ft.c:315
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1600,121 +1590,102 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:344
-#, fuzzy, c-format
+#: ../src/ft.c:338
+#, c-format
 msgid "%s is offering to send file %s"
-msgstr "%2$s 发送 %1$s"
-
-#: src/ft.c:384
+msgstr "%s 正在发送文件 %s"
+
+#: ../src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:405
+#: ../src/ft.c:395
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:416
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "开始来自 %2$s 的 %1$s 传送"
-
-#: src/ft.c:570
+#: ../src/ft.c:890
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: src/ft.c:573
+#: ../src/ft.c:893
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: src/ft.c:957
+#: ../src/ft.c:942
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:962
+#: ../src/ft.c:948
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: src/ft.c:1019
+#: ../src/ft.c:1001
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:1024
+#: ../src/ft.c:1007
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: src/ft.c:1081
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
-msgstr "给 %s 传送文件失败。\n"
-
-#: src/ft.c:1083
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
-msgstr "来自 %s 的文件传送失败。\n"
-
-#: src/gaim-remote.c:104
+#: ../src/ft.c:1056
+#, c-format
+msgid "File transfer to %s aborted.\n"
+msgstr "您中止了给 %s 的文件传送。\n"
+
+#: ../src/ft.c:1058
+#, c-format
+msgid "File transfer from %s aborted.\n"
+msgstr "%s 中止了给您的文件传送。\n"
+
+#: ../src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr "扩展柄大小"
+
+#: ../src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr "扩展箭头的大小"
+
+#: ../src/gaim-remote.c:108
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
-"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       logout                   Log out all accounts\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -m, --message=MESG       Message to send or show in conversation "
-"window\n"
-"       -t, --to=SCREENNAME      Select a target for command\n"
-"       -p, --protocol=PROTO     Specify protocol to use\n"
-"       -f, --from=SCREENNAME    Specify screen name to use\n"
-"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 "用法: %s 命令 [选项] [URI]\n"
 "\n"
 "    命令:\n"
-"       send                     发送信息\n"
 "       uri                      处理 AIM: URI\n"
 "       away                     弹出带默认信息的离开对话框\n"
 "       back                     删除离开对话框\n"
-"       logout                   登出全部账户\n"
 "       quit                     关闭 Gaim 的运行副本\n"
 "\n"
 "    选项:\n"
-"       -m, --message=信息       要在对话窗口中发送或显示的信息\n"
-"       -t, --to=用户名          选择命令的目标\n"
-"       -p, --protocol=协议      指定要使用的协议\n"
-"       -f, --from=用户名        指定要使用的用户名\n"
-"       -s, --session=会话       指定要使用的 Gaim 会话\n"
 "       -h, --help [命令]        显示命令帮助\n"
 
-#: src/gaim-remote.c:195
-#, c-format
-msgid ""
-"Gaim not running (on session %d)\n"
+#: ../src/gaim-remote.c:185 ../src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
-"Gaim 未运行(会话 %d)\n"
+"Gaim 未运行(会话 0)\n"
 "是否装入了“远程控制”插件?\n"
 
-#: src/gaim-remote.c:282
-msgid ""
-"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-"greater than 9999 chars\n"
-msgstr "参数不够(-t、-f、-p 和 -m 都需要),或者参数超过了 9999 个字符\n"
-
-#: src/gaim-remote.c:293
+#: ../src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1754,15 +1725,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...提示您将“Penguin”加为好友。\n"
 
-#: src/gaim-remote.c:313
-msgid ""
-"\n"
-"Log out all accounts\n"
-msgstr ""
-"\n"
-"登出全部账户\n"
-
-#: src/gaim-remote.c:317
+#: ../src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1770,7 +1733,7 @@
 "\n"
 "关闭 Gaim 的运行副本\n"
 
-#: src/gaim-remote.c:321
+#: ../src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1778,7 +1741,7 @@
 "\n"
 "将全部账户都设为“离开”默认消息。\n"
 
-#: src/gaim-remote.c:325
+#: ../src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1786,15 +1749,7 @@
 "\n"
 "将全部账户设为未离开。\n"
 
-#: src/gaim-remote.c:329
-msgid ""
-"\n"
-"Send instant message\n"
-msgstr ""
-"\n"
-"发送即时消息\n"
-
-#: src/gtkaccount.c:345
+#: ../src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1806,152 +1761,165 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:665
+#: ../src/gtkaccount.c:638
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:682 src/gtkft.c:626
+#: ../src/gtkaccount.c:655 ../src/gtkft.c:585
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:687 src/gtkblist.c:4369
+#: ../src/gtkaccount.c:660 ../src/gtkblist.c:4158
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:760
+#: ../src/gtkaccount.c:733
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
+#: ../src/gtkaccount.c:738 ../src/gtkblist.c:4172 ../src/gtkblist.c:4519
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:769
+#: ../src/gtkaccount.c:742
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:814
+#: ../src/gtkaccount.c:798
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:827
+#: ../src/gtkaccount.c:811
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:836
+#: ../src/gtkaccount.c:820
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:925
+#: ../src/gtkaccount.c:909
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
+#: ../src/gtkaccount.c:1048 ../src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
+#: ../src/gtkaccount.c:1054 ../src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
+#: ../src/gtkaccount.c:1060 ../src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
+#: ../src/gtkaccount.c:1066 ../src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
+#: ../src/gtkaccount.c:1072 ../src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
+#: ../src/gtkaccount.c:1078 ../src/gtkaccount.c:1130 ../src/gtkprefs.c:1190
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1184
+#: ../src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1188
+#: ../src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1204
+#: ../src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
+#: ../src/gtkaccount.c:1207 ../src/gtkprefs.c:1184
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
+#: ../src/gtkaccount.c:1216 ../src/gtkprefs.c:1211
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
+#: ../src/gtkaccount.c:1220 ../src/gtkprefs.c:1229
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1243
+#: ../src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
+#: ../src/gtkaccount.c:1233 ../src/gtkprefs.c:1266
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1625
+#: ../src/gtkaccount.c:1604
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1627
+#: ../src/gtkaccount.c:1606
 msgid "Modify Account"
 msgstr "修改账户"
 
+#. Add the disclosure
+#: ../src/gtkaccount.c:1630
+msgid "Show more options"
+msgstr "显示全部选项"
+
+#: ../src/gtkaccount.c:1631
+msgid "Show fewer options"
+msgstr "显示主要选项"
+
 #. Register button
-#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
+#: ../src/gtkaccount.c:1658 ../src/protocols/jabber/jabber.c:677
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
+#: ../src/gtkaccount.c:2023
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
+#: ../src/gtkaccount.c:2028 ../src/gtkrequest.c:247
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4420
+#: ../src/gtkaccount.c:2142 ../src/protocols/oscar/oscar.c:4332
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2115
-msgid "Enabled"
-msgstr "已启用"
-
-#: src/gtkaccount.c:2123
+#: ../src/gtkaccount.c:2166 ../src/protocols/jabber/jabber.c:996
+#: ../src/protocols/oscar/oscar.c:691 ../src/protocols/oscar/oscar.c:5800
+#: ../src/protocols/oscar/oscar.c:6998 ../src/protocols/silc/silc.c:45
+#: ../src/protocols/yahoo/yahoo.c:2784 ../src/protocols/zephyr/zephyr.c:2110
+#: ../src/protocols/zephyr/zephyr.c:2129
+msgid "Online"
+msgstr "在线"
+
+#: ../src/gtkaccount.c:2187
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2466
+#. XXX: Tidy this up when not in string freeze
+#: ../src/gtkaccount.c:2521 ../src/protocols/jabber/presence.c:202
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s%s"
 
-#: src/gtkaccount.c:2480
+#: ../src/gtkaccount.c:2535 ../src/protocols/jabber/presence.c:208
 msgid ""
 "\n"
 "\n"
@@ -1961,232 +1929,246 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2488
+#: ../src/gtkaccount.c:2561
+msgid "Information"
+msgstr "信息"
+
+#: ../src/gtkaccount.c:2565 ../src/gtkaccount.c:2596
+#: ../src/protocols/jabber/presence.c:210
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
-#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
-#: src/protocols/silc/chat.c:594
+#. Add button
+#: ../src/gtkaccount.c:2567 ../src/gtkaccount.c:2598 ../src/gtkblist.c:4571
+#: ../src/gtkconv.c:1537 ../src/gtkconv.c:3910 ../src/gtkconv.c:3981
+#: ../src/gtkrequest.c:248 ../src/protocols/icq/gaim_icq.c:276
+#: ../src/protocols/jabber/presence.c:212 ../src/protocols/oscar/oscar.c:3959
+#: ../src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:888
+#: ../src/gtkblist.c:846
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:909
+#: ../src/gtkblist.c:867
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:878 ../src/gtkpounce.c:415 ../src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1225
+#: ../src/gtkblist.c:1173 ../src/gtkblist.c:3323
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1228
+#: ../src/gtkblist.c:1176 ../src/gtkblist.c:3313
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1234
+#: ../src/gtkblist.c:1182
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
-#: src/gtkblist.c:1240
+#: ../src/gtkblist.c:1188
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
-#: src/gtkblist.c:1369
+#: ../src/gtkblist.c:1190 ../src/gtkblist.c:1287
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1259
+#: ../src/gtkblist.c:1200
 msgid "_Alias Buddy..."
 msgstr "好友别名(_A)..."
 
-#: src/gtkblist.c:1261
+#: ../src/gtkblist.c:1202
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: src/gtkblist.c:1263
+#: ../src/gtkblist.c:1204
 msgid "Alias Contact..."
 msgstr "给联系人起别名..."
 
-#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
+#: ../src/gtkblist.c:1207 ../src/gtkdialogs.c:877 ../src/gtkdialogs.c:879
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
+#: ../src/gtkblist.c:1211 ../src/gtkblist.c:1295 ../src/gtkblist.c:1309
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
-#: src/gtkconn.c:171
+#: ../src/gtkblist.c:1213 ../src/gtkblist.c:1297 ../src/gtkblist.c:1314
+#: ../src/gtkconn.c:367
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1318
+#: ../src/gtkblist.c:1259
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1320
+#: ../src/gtkblist.c:1261
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1322
+#: ../src/gtkblist.c:1263
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1324
+#: ../src/gtkblist.c:1265
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:102
+#: ../src/gtkblist.c:1283 ../src/gtkroomlist.c:264 ../src/gtkroomlist.c:409
+#: ../src/stock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1344
+#: ../src/gtkblist.c:1285
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1382 src/gtkblist.c:1405
+#: ../src/gtkblist.c:1311 ../src/gtkblist.c:1336
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1410
+#: ../src/gtkblist.c:1341
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
-#: src/gtkblist.c:3649
-msgid "/Tools/Mute Sounds"
-msgstr "/工具(T)/静音(S)"
-
-#: src/gtkblist.c:2106 src/gtkconv.c:4255 src/gtkpounce.c:314
+#: ../src/gtkblist.c:2016 ../src/gtkconv.c:4553 ../src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: src/gtkblist.c:2675
+#: ../src/gtkblist.c:2437
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2676
+#: ../src/gtkblist.c:2438
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2677
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2678
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2679
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2681
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2682
+#: ../src/gtkblist.c:2444
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2683
+#: ../src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2684
+#: ../src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2685
+#: ../src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2687
+#: ../src/gtkblist.c:2449
+msgid "/Buddies/_Signoff"
+msgstr "/好友(B)/登出(_S)"
+
+#: ../src/gtkblist.c:2450
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2690
+#: ../src/gtkblist.c:2453
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2691
+#: ../src/gtkblist.c:2454
+msgid "/Tools/_Away"
+msgstr "/工具(T)/离开(_A)"
+
+#: ../src/gtkblist.c:2455
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2692
+#: ../src/gtkblist.c:2456
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2693
+#: ../src/gtkblist.c:2457
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2695
-msgid "/Tools/_Statuses"
-msgstr "/工具(T)/状态(_S)"
-
-#: src/gtkblist.c:2696
+#: ../src/gtkblist.c:2459
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2697
-msgid "/Tools/Pr_eferences"
-msgstr "/工具(T)/首选项(_E)"
-
-#: src/gtkblist.c:2698
-msgid "/Tools/Pr_ivacy"
-msgstr "/工具(T)/隐私(_I)"
-
-#: src/gtkblist.c:2699
+#: ../src/gtkblist.c:2460
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2700
+#: ../src/gtkblist.c:2461
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2702
-msgid "/Tools/Mute _Sounds"
-msgstr "/工具(T)/静音(_S)"
-
-#: src/gtkblist.c:2703
+#: ../src/gtkblist.c:2462
+msgid "/Tools/Pr_eferences"
+msgstr "/工具(T)/首选项(_E)"
+
+#: ../src/gtkblist.c:2463
+msgid "/Tools/Pr_ivacy"
+msgstr "/工具(T)/隐私(_I)"
+
+#: ../src/gtkblist.c:2465
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2706
+#: ../src/gtkblist.c:2468
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2707
+#: ../src/gtkblist.c:2469
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2708
+#: ../src/gtkblist.c:2470
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2709
+#: ../src/gtkblist.c:2471
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2741 src/gtkblist.c:2808
+#: ../src/gtkblist.c:2489
+msgid "Rename Group"
+msgstr "重命名组"
+
+#: ../src/gtkblist.c:2489
+msgid "New group name"
+msgstr "新组名称"
+
+#: ../src/gtkblist.c:2490
+msgid "Please enter a new name for the selected group."
+msgstr "请输入选中组的新名字。"
+
+#: ../src/gtkblist.c:2519
 #, c-format
 msgid ""
 "\n"
@@ -2195,61 +2177,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2817
-#, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>联系人别名:</b> %s"
-
-#: src/gtkblist.c:2825
-#, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>别名:</b> %s"
-
-#: src/gtkblist.c:2833
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>昵称:</b> %s"
-
-#: src/gtkblist.c:2842
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>登入:</b> %s"
-
-#: src/gtkblist.c:2854
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>瞌睡:</b> %s"
-
-#: src/gtkblist.c:2889
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>上次看见:</b> %s 以前"
-
-#: src/gtkblist.c:2897
+#: ../src/gtkblist.c:2585
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2257,7 +2185,68 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2919
+#: ../src/gtkblist.c:2600
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../src/gtkblist.c:2616
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>账户:</b>"
+
+#: ../src/gtkblist.c:2617
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>联系人别名:</b>"
+
+#: ../src/gtkblist.c:2618
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>别名:</b>"
+
+#: ../src/gtkblist.c:2619
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>昵称:</b>"
+
+#: ../src/gtkblist.c:2620
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>登入:</b>"
+
+#: ../src/gtkblist.c:2621
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>瞌睡:</b>"
+
+#: ../src/gtkblist.c:2622
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>警告:</b>"
+
+#: ../src/gtkblist.c:2624
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2265,119 +2254,124 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2921
+#: ../src/gtkblist.c:2625
 msgid ""
 "\n"
-"<b>Status:</b> Awesome"
+"<b>Status</b>: Awesome"
 msgstr ""
 "\n"
-"<b>状态:</b> 可怕"
-
-#: src/gtkblist.c:2923
+"<b>状态</b>: 可怕"
+
+#: ../src/gtkblist.c:2626
 msgid ""
 "\n"
-"<b>Status:</b> Rockin'"
+"<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
-"<b>状态:</b> 混乱"
-
-#: src/gtkblist.c:3185
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
+"<b>状态</b>: 混乱"
+
+#: ../src/gtkblist.c:2908
+#, c-format
+msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:3187
+#: ../src/gtkblist.c:2910
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:3190
-msgid "Idle "
-msgstr "瞌睡 "
-
-#: src/gtkblist.c:3194
+#: ../src/gtkblist.c:2915
+#, c-format
+msgid "Warned (%d%%) "
+msgstr "警告 (%d%%) "
+
+#: ../src/gtkblist.c:2918
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3310
-msgid "/Buddies/New Instant Message..."
-msgstr "/好友(B)/新即时消息..."
-
-#: src/gtkblist.c:3311 src/gtkblist.c:3345
+#. Make menu items sensitive/insensitive where appropriate
+#: ../src/gtkblist.c:3036
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:3312
-msgid "/Buddies/Get User Info..."
-msgstr "/好友(B)/获取用户信息..."
-
-#: src/gtkblist.c:3313
-msgid "/Buddies/Add Buddy..."
-msgstr "/好友(B)/添加好友..."
-
-#: src/gtkblist.c:3314
-msgid "/Buddies/Add Chat..."
-msgstr "/好友(B)/添加聊天..."
-
-#: src/gtkblist.c:3315
-msgid "/Buddies/Add Group..."
-msgstr "/好友(B)/添加组..."
-
-#: src/gtkblist.c:3348
+#: ../src/gtkblist.c:3039
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:3351
+#: ../src/gtkblist.c:3042
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
-#: src/protocols/yahoo/yahoo.c:2749
-msgid "None"
-msgstr "无"
-
-#: src/gtkblist.c:3429
+#: ../src/gtkblist.c:3124
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3430
+#: ../src/gtkblist.c:3125
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3431
+#: ../src/gtkblist.c:3126
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3542
+#: ../src/gtkblist.c:3192
+msgid "/Tools/Away"
+msgstr "/工具(T)/离开(A)"
+
+#: ../src/gtkblist.c:3195
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3543
+#: ../src/gtkblist.c:3198
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3544
+#: ../src/gtkblist.c:3201
 msgid "/Tools/Plugin Actions"
 msgstr "/工具(T)/插件操作(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3642
+#: ../src/gtkblist.c:3292
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3644
+#: ../src/gtkblist.c:3294
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:4323 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:2847
+#: ../src/gtkblist.c:3319
+msgid "Send a message to the selected buddy"
+msgstr "向选中好友发送消息"
+
+#: ../src/gtkblist.c:3329
+msgid "Get information on the selected buddy"
+msgstr "获取选中好友的信息"
+
+#: ../src/gtkblist.c:3333
+msgid "_Chat"
+msgstr "聊天(_C)"
+
+#: ../src/gtkblist.c:3338
+msgid "Join a chat room"
+msgstr "加入聊天室"
+
+#: ../src/gtkblist.c:3343
+msgid "_Away"
+msgstr "离开(_A)"
+
+#: ../src/gtkblist.c:3348
+msgid "Set an away message"
+msgstr "设置离开消息"
+
+#: ../src/gtkblist.c:4112 ../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:2951
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:4347
+#: ../src/gtkblist.c:4136
 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. "
@@ -2387,48 +2381,63 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4410 src/gtkblist.c:4742
+#: ../src/gtkblist.c:4196 ../src/gtkblist.c:4499
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4675
+#: ../src/gtkblist.c:4432
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4691
+#: ../src/gtkblist.c:4448
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4708
+#: ../src/gtkblist.c:4465
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4732
+#: ../src/gtkblist.c:4489
 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:4811
+#: ../src/gtkblist.c:4568
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4812
+#: ../src/gtkblist.c:4569
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:5362 src/gtkblist.c:5458
+#: ../src/gtkblist.c:5138 ../src/gtkblist.c:5235
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:171
-#, fuzzy
-msgid "Reconnect"
+#: ../src/gtkconn.c:79 ../src/gtkconn.c:250 ../src/gtkconn.c:261
+msgid "Done."
+msgstr "完成。"
+
+#: ../src/gtkconn.c:158
+msgid "Signon: "
+msgstr "登入:"
+
+#: ../src/gtkconn.c:204
+msgid "Signon"
+msgstr "登入"
+
+#: ../src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "全部取消"
+
+#: ../src/gtkconn.c:367 ../src/gtkconn.c:600
+msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:368
+#: ../src/gtkconn.c:564
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2441,50 +2450,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:370
+#: ../src/gtkconn.c:566
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:378
-msgid "Disconnected"
-msgstr "已断开连接"
-
-#: src/gtkconn.c:404
-msgid "_Reconnect"
-msgstr "重新连接(_R)"
-
-#: src/gtkconn.c:409
+#: ../src/gtkconn.c:605
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:439
+#: ../src/gtkconn.c:635
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:148
-#, fuzzy
-msgid "Confirm close"
-msgstr "确认账户"
-
-#: src/gtkconv.c:180
-#, fuzzy
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "您真的想要删除 %s 吗?"
-
-#: src/gtkconv.c:410
+#: ../src/gtkconv.c:342
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:419
+#: ../src/gtkconv.c:351
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:456
+#: ../src/gtkconv.c:390
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:459
+#: ../src/gtkconv.c:393
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2492,1152 +2483,1150 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:531
+#: ../src/gtkconv.c:465
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: src/gtkconv.c:538
+#: ../src/gtkconv.c:472
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: src/gtkconv.c:543
+#: ../src/gtkconv.c:477
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:550
-msgid "That command only works in chats, not IMs."
-msgstr "该命令只在聊天中可用,对话中无效。"
-
-#: src/gtkconv.c:553
-msgid "That command only works in IMs, not chats."
-msgstr "该命令只在对话中可用,聊天中无效。"
-
-#: src/gtkconv.c:557
+#: ../src/gtkconv.c:484
+msgid "That command only works in Chats, not IMs."
+msgstr "命令只在聊天中可用,对话中无效。"
+
+#: ../src/gtkconv.c:487
+msgid "That command only works in IMs, not Chats."
+msgstr "命令只在对话中可用,聊天中无效。"
+
+#: ../src/gtkconv.c:491
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:783 src/gtkconv.c:809
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "该好友不在此聊天的协议中。"
-
-#: src/gtkconv.c:803
+#: ../src/gtkconv.c:734 ../src/gtkconv.c:760
+msgid "That buddy is not on the same protocol as this chat"
+msgstr "该好友不在此聊天的协议中"
+
+#: ../src/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: src/gtkconv.c:858
+#: ../src/gtkconv.c:808
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:888
+#: ../src/gtkconv.c:838
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:909
+#: ../src/gtkconv.c:859
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
+#: ../src/gtkconv.c:879
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
+#: ../src/gtkconv.c:935 ../src/gtkconv.c:2660 ../src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:992
+#: ../src/gtkconv.c:940
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:1016
+#: ../src/gtkconv.c:954
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
+#: ../src/gtkconv.c:1039 ../src/gtkdebug.c:131
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:1143 src/gtkdebug.c:191
+#: ../src/gtkconv.c:1065 ../src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1541
+#: ../src/gtkconv.c:1481
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
+#. Send File button
+#: ../src/gtkconv.c:1490 ../src/gtkconv.c:3903
+#: ../src/protocols/oscar/oscar.c:606
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1554
+#: ../src/gtkconv.c:1499
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1557
+#: ../src/gtkconv.c:1501 ../src/gtkprefs.c:831
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gtkconv.c:1562
+#. Info button
+#: ../src/gtkconv.c:1510 ../src/gtkconv.c:3924
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1568
-msgid "Get Away Message"
+#: ../src/gtkconv.c:1519
+msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1577 src/gtkrequest.c:266
-msgid "Remove"
-msgstr "删除"
-
-#: src/gtkconv.c:2644
+#: ../src/gtkconv.c:2668
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2667
+#: ../src/gtkconv.c:2690
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2695
+#: ../src/gtkconv.c:2720
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2700
+#: ../src/gtkconv.c:2725
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2706
+#: ../src/gtkconv.c:2731
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:3067
+#: ../src/gtkconv.c:3108
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:3072
+#: ../src/gtkconv.c:3116
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3173
+#: ../src/gtkconv.c:3219
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3628
+#: ../src/gtkconv.c:3673
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3630
+#: ../src/gtkconv.c:3675
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3635
+#: ../src/gtkconv.c:3680
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3637
+#: ../src/gtkconv.c:3682
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3638
+#: ../src/gtkconv.c:3683
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3640
+#: ../src/gtkconv.c:3685
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3644
+#: ../src/gtkconv.c:3689
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:3645
+#: ../src/gtkconv.c:3690
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3647
+#: ../src/gtkconv.c:3692
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3649
+#: ../src/gtkconv.c:3694
+msgid "/Conversation/_Warn..."
+msgstr "/对话(C)/警告(_W)..."
+
+#: ../src/gtkconv.c:3696
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3654
+#: ../src/gtkconv.c:3701
 msgid "/Conversation/Al_ias..."
-msgstr "/对话(C)/别名(_L)..."
-
-#: src/gtkconv.c:3656
+msgstr "/对话(C)/别名(I)..."
+
+#: ../src/gtkconv.c:3703
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3658
+#: ../src/gtkconv.c:3705
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3660
+#: ../src/gtkconv.c:3707
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3665
+#: ../src/gtkconv.c:3712
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3667
+#: ../src/gtkconv.c:3714
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3672
+#: ../src/gtkconv.c:3719
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3676
+#: ../src/gtkconv.c:3723
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3677
+#: ../src/gtkconv.c:3724
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3678
+#: ../src/gtkconv.c:3725
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3679
-msgid "/Options/Show Formatting _Toolbars"
+#: ../src/gtkconv.c:3726
+msgid "/Options/Show Formatting _Toolbar"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3680
+#: ../src/gtkconv.c:3727
 msgid "/Options/Show Ti_mestamps"
-msgstr "/选项(O)/显示时间戳(_I)"
-
-#: src/gtkconv.c:3681
-msgid "/Options/Show Buddy _Icon"
-msgstr "/选项(O)/显示好友图标(_I)"
-
-#: src/gtkconv.c:3725
+msgstr "/选项(O)/显示时间戳(_M)"
+
+#: ../src/gtkconv.c:3769
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3731
+#: ../src/gtkconv.c:3774
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3735
+#: ../src/gtkconv.c:3778
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3741
+#: ../src/gtkconv.c:3784
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3745
+#: ../src/gtkconv.c:3788
+msgid "/Conversation/Warn..."
+msgstr "/对话(C)/警告(W)..."
+
+#: ../src/gtkconv.c:3792
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3751
+#: ../src/gtkconv.c:3798
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3755
+#: ../src/gtkconv.c:3802
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3759
+#: ../src/gtkconv.c:3806
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3763
+#: ../src/gtkconv.c:3810
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3769
+#: ../src/gtkconv.c:3816
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3773
+#: ../src/gtkconv.c:3820
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3779
+#: ../src/gtkconv.c:3826
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3782
+#: ../src/gtkconv.c:3829
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3785
-msgid "/Options/Show Formatting Toolbars"
+#: ../src/gtkconv.c:3832
+msgid "/Options/Show Formatting Toolbar"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3788
+#: ../src/gtkconv.c:3835
 msgid "/Options/Show Timestamps"
-msgstr "/选项(O)/显示时间戳(I)"
-
-#: src/gtkconv.c:3791
-msgid "/Options/Show Buddy Icon"
-msgstr "/选项(O)/显示好友图标(I)"
-
-#: src/gtkconv.c:3911
+msgstr "/选项/显示时间戳(I)"
+
+#. The buttons, from left to right
+#. Warn button
+#: ../src/gtkconv.c:3889
+msgid "Warn"
+msgstr "警告"
+
+#: ../src/gtkconv.c:3890
+msgid "Warn the user"
+msgstr "警告用户"
+
+#. Block button
+#: ../src/gtkconv.c:3896 ../src/gtkprivacy.c:634 ../src/gtkprivacy.c:645
+msgid "Block"
+msgstr "屏蔽"
+
+#: ../src/gtkconv.c:3897
+msgid "Block the user"
+msgstr "屏蔽用户"
+
+#: ../src/gtkconv.c:3904
+msgid "Send a file to the user"
+msgstr "给用户发送文件"
+
+#: ../src/gtkconv.c:3911
+msgid "Add the user to your buddy list"
+msgstr "将用户加为好友"
+
+#: ../src/gtkconv.c:3918
+msgid "Remove the user from your buddy list"
+msgstr "从您的好友列表中删除该用户"
+
+#: ../src/gtkconv.c:3925 ../src/gtkconv.c:4260
+msgid "Get the user's information"
+msgstr "获取用户信息"
+
+#. Send button
+#: ../src/gtkconv.c:3931 ../src/gtkconv.c:3995
+msgid "Send"
+msgstr "发送"
+
+#: ../src/gtkconv.c:3932 ../src/gtkconv.c:3996
+msgid "Send message"
+msgstr "发送消息"
+
+#. The buttons, from left to right
+#. Invite
+#: ../src/gtkconv.c:3974
+msgid "Invite"
+msgstr "邀请"
+
+#: ../src/gtkconv.c:3975
+msgid "Invite a user"
+msgstr "邀请用户"
+
+#: ../src/gtkconv.c:3982
+msgid "Add the chat to your buddy list"
+msgstr "将聊天添加到您的好友列表"
+
+#: ../src/gtkconv.c:3989
+msgid "Remove the chat from your buddy list"
+msgstr "从您的好友列表中删除聊天"
+
+#: ../src/gtkconv.c:4113
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3959
+#: ../src/gtkconv.c:4176
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:4021
+#: ../src/gtkconv.c:4237
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:4034
+#: ../src/gtkconv.c:4249
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:4046
-msgid "Get the user's information"
-msgstr "获取用户信息"
-
-#: src/gtkconv.c:4569
+#: ../src/gtkconv.c:4848
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
+#: ../src/gtkconv.c:5385 ../src/gtkconv.c:5414 ../src/gtkconv.c:5510
+#: ../src/gtkconv.c:5568
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:6279
+#: ../src/gtkconv.c:6145 ../src/gtkconv.c:6148
+msgid "<main>/Conversation/Close"
+msgstr "<main>/对话(C)/关闭(C)"
+
+#: ../src/gtkconv.c:6520
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:6282
+#: ../src/gtkconv.c:6523
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6285
+#: ../src/gtkconv.c:6526
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6288
-#, fuzzy
+#: ../src/gtkconv.c:6529
 msgid "clear: Clears the conversation scrollback."
-msgstr "%s 已经关闭了对话窗口。"
-
-#: src/gtkconv.c:6291
+msgstr "clear: 清除对话回滚。"
+
+#: ../src/gtkconv.c:6532
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: src/gtkdebug.c:230
+#: ../src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: src/gtkdebug.c:571
-#, fuzzy
-msgid "Invert"
-msgstr "插入(_I)"
-
-#: src/gtkdebug.c:574
-msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:621
+#: ../src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:674
-#, fuzzy
-msgid "Clear"
-msgstr "关闭"
-
-#: src/gtkdebug.c:683
+#: ../src/gtkdebug.c:288
 msgid "Pause"
 msgstr "暂停"
 
-#: src/gtkdebug.c:690 src/gtkdebug.c:691
+#: ../src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkdebug.c:709
-#, fuzzy
-msgid "Filter"
-msgstr "已失败"
-
-#: src/gtkdebug.c:722
-#, fuzzy
-msgid "Right click for more options."
-msgstr "显示全部选项"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
+#: ../src/gtkdialogs.c:63
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:64 ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:69 ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:74 ../src/gtkdialogs.c:75
 msgid "developer"
 msgstr "开发者"
 
-#: src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:65
 msgid "developer & webmaster"
 msgstr "开发者和网管"
 
-#: src/gtkdialogs.c:62
+#: ../src/gtkdialogs.c:66
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:72
 msgid "support"
 msgstr "支持"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
+#: ../src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "维护者"
 
-#: src/gtkdialogs.c:88
-msgid "libfaim maintainer"
-msgstr "libfaim 维护者"
-
-#: src/gtkdialogs.c:91
-msgid "Jabber developer"
-msgstr "Jabber 开发者"
-
-#: src/gtkdialogs.c:92
+#: ../src/gtkdialogs.c:92
+msgid "former libfaim maintainer"
+msgstr "先前 libfaim 维护者"
+
+#: ../src/gtkdialogs.c:93
+msgid "former lead developer"
+msgstr "先前领导开发者"
+
+#: ../src/gtkdialogs.c:94
+msgid "former maintainer"
+msgstr "先前维护者"
+
+#: ../src/gtkdialogs.c:95
+msgid "former Jabber developer"
+msgstr "先前 Jabber 开发者"
+
+#: ../src/gtkdialogs.c:96
 msgid "original author"
 msgstr "原作者"
 
-#: src/gtkdialogs.c:93
+#: ../src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:102
+msgid "Azerbaijani"
+msgstr "阿塞拜疆语"
+
+#: ../src/gtkdialogs.c:103 ../src/gtkdialogs.c:150
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:103
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr "Vladimira Girginova 和 Vladimir (Kaladan) Petkov"
+
+#: ../src/gtkdialogs.c:104 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:152
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:105 ../src/gtkdialogs.c:153
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/gtkdialogs.c:102
+#: ../src/gtkdialogs.c:106
 msgid "Danish"
 msgstr "丹麦语"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:154
 msgid "German"
 msgstr "德语"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:108
 msgid "Australian English"
 msgstr "澳大利亚英语"
 
-#: src/gtkdialogs.c:105
+#: ../src/gtkdialogs.c:109
+msgid "Canadian English"
+msgstr "加拿大英语"
+
+#: ../src/gtkdialogs.c:110
 msgid "British English"
 msgstr "英国英语"
 
-#: src/gtkdialogs.c:106
-msgid "Canadian English"
-msgstr "加拿大英语"
-
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:155
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:112
+msgid "Estonian"
+msgstr "爱沙尼亚语"
+
+#: ../src/gtkdialogs.c:113 ../src/gtkdialogs.c:156
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:157
 msgid "French"
 msgstr "法语"
 
-#: src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:115
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/gtkdialogs.c:111
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:158
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:159
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:160
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:161
 msgid "Japanese"
 msgstr "日语"
 
-#: src/gtkdialogs.c:115
+#: ../src/gtkdialogs.c:120
+msgid "Georgian"
+msgstr "格鲁吉亚语"
+
+#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:162
+msgid "Korean"
+msgstr "朝鲜语"
+
+#: ../src/gtkdialogs.c:122
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/gtkdialogs.c:116
-#, fuzzy
-msgid "Georgian"
-msgstr "德语"
-
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
-msgid "Korean"
-msgstr "朝鲜语"
-
-#: src/gtkdialogs.c:118
-#, fuzzy
-msgid "Dutch, Flemish"
-msgstr "荷兰语"
-
-#: src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:123
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:124
+msgid "Burmese"
+msgstr "缅甸语"
+
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:163
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:126
+msgid "Dutch; Flemish"
+msgstr "荷兰语"
+
+#: ../src/gtkdialogs.c:127
+msgid "Norwegian (Nynorsk)"
+msgstr "挪威语(Nynorsk)"
+
+#: ../src/gtkdialogs.c:128
+msgid "Punjabi"
+msgstr "旁遮普语"
+
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:164
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:130
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:131
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:132
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Russian"
 msgstr "俄语"
 
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:134
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: ../src/gtkdialogs.c:135
+msgid "Albanian"
+msgstr "阿尔巴尼亚语"
+
+#: ../src/gtkdialogs.c:136
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/gtkdialogs.c:129
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
-
-#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:168 ../src/gtkdialogs.c:169
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:138
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: ../src/gtkdialogs.c:139
+msgid "Ukrainian"
+msgstr "乌克兰语"
+
+#: ../src/gtkdialogs.c:140
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:140
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:141
+msgid "Xhosa"
+msgstr "Xhosa"
+
+#: ../src/gtkdialogs.c:142
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:143
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:149
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:167
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/gtkdialogs.c:199
+#: ../src/gtkdialogs.c:170
+msgid "Chinese"
+msgstr "中文"
+
+#: ../src/gtkdialogs.c:212
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:223
+#: ../src/gtkdialogs.c:227
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: ../src/gtkdialogs.c:249
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim 是模块化的即时通讯客户程序,同时支持 AIM、MSN、Yahoo!、Jabber、ICQ、"
-"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 GTK+ 写"
-"成,并以 GNU GPL 许可协议发行。<BR><BR>"
-
-#: src/gtkdialogs.c:232
+"IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写"
+"成,并以 GPL 许可协议发行。<BR><BR>"
+
+#: ../src/gtkdialogs.c:259
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim<BR><BR>"
 
-#: src/gtkdialogs.c:235
+#: ../src/gtkdialogs.c:262
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
-#: src/gtkdialogs.c:241
+#: ../src/gtkdialogs.c:268
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:256
+#: ../src/gtkdialogs.c:283
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:271
+#: ../src/gtkdialogs.c:298
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:286
+#: ../src/gtkdialogs.c:313
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:306
+#: ../src/gtkdialogs.c:333
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:324
-msgid "Debugging Information"
-msgstr "调试信息"
-
-#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
-msgid "_Name"
-msgstr "名称(_N)"
-
-#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
+#: ../src/gtkdialogs.c:488 ../src/gtkdialogs.c:630 ../src/gtkdialogs.c:683
+msgid "_Screen name"
+msgstr "用户名(_S)"
+
+#: ../src/gtkdialogs.c:494 ../src/gtkdialogs.c:636 ../src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/gtkdialogs.c:499
+#: ../src/gtkdialogs.c:501
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/gtkdialogs.c:501
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
-
-#: src/gtkdialogs.c:642
+#: ../src/gtkdialogs.c:503
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr "您想要跟谁聊?请输入他/她的用户名。"
+
+#: ../src/gtkdialogs.c:643
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:644
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
-
-#: src/gtkdialogs.c:698
-#, fuzzy
-msgid "View User Log"
+#: ../src/gtkdialogs.c:645
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr "您想要查看谁的信息?请输入他/她的用户名。"
+
+#: ../src/gtkdialogs.c:697
+msgid "Get User Log"
 msgstr "获取用户日志"
 
-#: src/gtkdialogs.c:700
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
-
-#: src/gtkdialogs.c:719
+#: ../src/gtkdialogs.c:699
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr "您想要查看谁的日志?请输入他/她的用户名。"
+
+#: ../src/gtkdialogs.c:739
+msgid "Warn User"
+msgstr "警告用户"
+
+#: ../src/gtkdialogs.c:760
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">警告 %s 吗?</span>\n"
+"\n"
+"这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
+
+#: ../src/gtkdialogs.c:769
+msgid "Warn _anonymously?"
+msgstr "匿名警告吗(_A)?"
+
+#: ../src/gtkdialogs.c:776
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>匿名警告较不容易引起注意。</b>"
+
+#: ../src/gtkdialogs.c:797
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:798
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
-#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:800 ../src/gtkdialogs.c:822 ../src/gtkdialogs.c:842
+#: ../src/gtkrequest.c:251 ../src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:740
+#: ../src/gtkdialogs.c:818
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:742
+#: ../src/gtkdialogs.c:820
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:761
+#: ../src/gtkdialogs.c:839
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:840
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:799
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
+#: ../src/gtkdialogs.c:874
+#, 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[0] ""
+msgstr ""
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:866
+#: ../src/gtkdialogs.c:935
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
+#: ../src/gtkdialogs.c:938 ../src/gtkdialogs.c:939
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:908
+#: ../src/gtkdialogs.c:977
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
+#: ../src/gtkdialogs.c:980 ../src/gtkdialogs.c:982
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:950
+#: ../src/gtkdialogs.c:1019
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
+#: ../src/gtkdialogs.c:1022 ../src/gtkdialogs.c:1023
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/gtkft.c:141
+#: ../src/gtkft.c:141
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:162 src/gtkft.c:1046
+#: ../src/gtkft.c:162 ../src/gtkft.c:1012
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:165 src/gtkft.c:997
+#: ../src/gtkft.c:165 ../src/gtkft.c:963
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:168 src/gtkft.c:916
+#: ../src/gtkft.c:168 ../src/gtkft.c:882
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
-#: src/gtkft.c:221
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>接收为:</b>"
 
-#: src/gtkft.c:223
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:227
+#: ../src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:229
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>发送为:</b>"
 
-#: src/gtkft.c:445
+#: ../src/gtkft.c:436
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:450
+#: ../src/gtkft.c:441
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
-#: src/gtkft.c:470
-#, fuzzy, c-format
-msgid "Error launching %s: %s"
-msgstr "调用 <b>%s</b> 出错: %s"
-
-#: src/gtkft.c:479
-#, fuzzy, c-format
-msgid "Error running %s"
-msgstr "读取 %s 出错"
-
-#: src/gtkft.c:480
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:575
+#: ../src/gtkft.c:533
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:582
+#: ../src/gtkft.c:540
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:589
+#: ../src/gtkft.c:547
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:596
+#: ../src/gtkft.c:554
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:627
+#: ../src/gtkft.c:586
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:628
+#: ../src/gtkft.c:587
 msgid "Local File:"
 msgstr "本地文件:"
 
-#: src/gtkft.c:629
+#: ../src/gtkft.c:588
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:630
+#: ../src/gtkft.c:589
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:631
+#: ../src/gtkft.c:590
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:632
+#: ../src/gtkft.c:591
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:718
+#: ../src/gtkft.c:683
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:728
+#: ../src/gtkft.c:693
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:737
+#: ../src/gtkft.c:702
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:738
+#: ../src/gtkft.c:703
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:775 src/gtkstock.c:106
+#: ../src/gtkft.c:745 ../src/stock.c:92
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:785
+#: ../src/gtkft.c:755
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:999
+#: ../src/gtkft.c:965
 msgid "Failed"
 msgstr "已失败"
 
-#: src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr "扩展柄大小"
-
-#: src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr "扩展箭头的大小"
-
-#: src/gtkimhtml.c:816
+#: ../src/gtkimhtml.c:693
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1263
+#: ../src/gtkimhtml.c:1087
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1264
+#: ../src/gtkimhtml.c:1088
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1267
-msgid "Hyperlink prelight color"
-msgstr "超级链接悬停颜色"
-
-#: src/gtkimhtml.c:1268
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "绘制超级链接悬停时的颜色。"
-
-#: src/gtkimhtml.c:1486
+#: ../src/gtkimhtml.c:1296
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1498
+#: ../src/gtkimhtml.c:1308
+msgid "_Copy Link Location"
+msgstr "复制链接地址(_C)"
+
+#: ../src/gtkimhtml.c:1318
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1508
-msgid "_Copy Link Location"
-msgstr "复制链接地址(_C)"
-
-#: src/gtkimhtml.c:3182
+#: ../src/gtkimhtml.c:2915
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
-msgstr ""
-
-#: src/gtkimhtml.c:3185
+msgstr "<span size='larger' weight='bold'>无法识别文件类型</span>\n\n默认为 PNG。"
+
+#: ../src/gtkimhtml.c:2918
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
-msgstr ""
-
-#: src/gtkimhtml.c:3198
-#, fuzzy, c-format
+msgstr "无法识别文件类型\n\n默认为 PNG。"
+
+#: ../src/gtkimhtml.c:2931
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>\n"
+"<span size='larger' weight='bold'>保存图像出错</span>\n"
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3201
-#, fuzzy, c-format
+#: ../src/gtkimhtml.c:2934
+#, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "保存图像出错: %s"
-
-#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
+msgstr "保存图像出错\n\n%s"
+
+#: ../src/gtkimhtml.c:3014 ../src/gtkimhtml.c:3026
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:3321
+#: ../src/gtkimhtml.c:3054
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:141
+#: ../src/gtkimhtmltoolbar.c:176
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/gtkimhtmltoolbar.c:220
+#: ../src/gtkimhtmltoolbar.c:254
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/gtkimhtmltoolbar.c:299
+#: ../src/gtkimhtmltoolbar.c:328
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/gtkimhtmltoolbar.c:388
+#: ../src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:396
+#: ../src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:399
+#: ../src/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:403
+#: ../src/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: src/gtkimhtmltoolbar.c:408
+#: ../src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:412
+#: ../src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:481
+#: ../src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: ../src/gtkimhtmltoolbar.c:531 ../src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:715
+#: ../src/gtkimhtmltoolbar.c:679
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:729
+#: ../src/gtkimhtmltoolbar.c:694
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:917
+#: ../src/gtkimhtmltoolbar.c:912
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:928
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:939
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:955
+#: ../src/gtkimhtmltoolbar.c:950
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:967
+#: ../src/gtkimhtmltoolbar.c:962
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:984
+#: ../src/gtkimhtmltoolbar.c:979
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:996
+#: ../src/gtkimhtmltoolbar.c:991
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:1008
+#: ../src/gtkimhtmltoolbar.c:1003
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkimhtmltoolbar.c:1024
-#, fuzzy
-msgid "Clear formatting"
-msgstr "清除格式(_C)"
-
-#: src/gtkimhtmltoolbar.c:1039
+#: ../src/gtkimhtmltoolbar.c:1018
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:1049
+#: ../src/gtkimhtmltoolbar.c:1028
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:1060
+#: ../src/gtkimhtmltoolbar.c:1039
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtklog.c:200
-#, c-format
-msgid "Conversation in %s on %s"
-msgstr "在 %2$s 的 %1$s 中的对话"
-
-#: src/gtklog.c:202
-#, c-format
-msgid "Conversation with %s on %s"
-msgstr "与 %s 在 %s 的对话"
-
-#: src/gtklog.c:397
-msgid ""
-"System events will only be logged if the <span style=\"italic\">Enable "
-"system log preference</span> is set."
-msgstr ""
-"仅当选择了<span style=\"italic\">启用系统日志</span>首选项时才会记录系统日"
-"志。"
-
-#: src/gtklog.c:401
-msgid ""
-"Instant messages will only be logged if the <span style=\"italic\">Log all "
-"instant messages</span> preference is enabled."
-msgstr ""
-"仅当选择了<span style=\"italic\">记录所有即时消息</span>时才会记录即时消息。"
-
-#: src/gtklog.c:404
-msgid ""
-"Chats will only be logged if the <span style=\"italic\">Log all chats "
-"preference</span> is enabled."
-msgstr ""
-"仅当选择了<span style=\"italic\">记录所有聊天</span>首选项时才会记录聊天。"
-
-#: src/gtklog.c:409
-msgid "No logs were found."
-msgstr "未找到日志。"
-
-#: src/gtklog.c:455
-#, c-format
-msgid "Conversations in %s"
-msgstr "与 %s 的对话"
-
-#: src/gtklog.c:463 src/gtklog.c:513
+#: ../src/gtklog.c:316
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/gtklog.c:538
+#. Window **********
+#: ../src/gtklog.c:412 ../src/gtklog.c:429
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/gtkmain.c:323
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
-
-#: src/gtkmain.c:325
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"用法: %s [选项]...\n"
-"\n"
-"  -a, --acct          显示账户编辑窗口\n"
-"  -c, --config=目录   使用“目录”存储配置文件\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
-"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
-"  -v, --version       显示当前版本并退出\n"
-
 #. Descriptive label
-#: src/gtknotify.c:267
+#: ../src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:281
+#: ../src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:290
+#: ../src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:295
+#: ../src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3648,7 +3637,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:311
+#: ../src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3659,390 +3648,508 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:456
-msgid "Search Results"
-msgstr "搜索结果"
-
-#: src/gtknotify.c:617
+#: ../src/gtknotify.c:430
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "浏览器命令 <b>%s</b> 无效。"
 
-#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
-#: src/gtknotify.c:768
+#: ../src/gtknotify.c:432 ../src/gtknotify.c:444 ../src/gtknotify.c:457
+#: ../src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:629 src/gtknotify.c:642
+#: ../src/gtknotify.c:442 ../src/gtknotify.c:455
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "调用 <b>%s</b> 出错: %s"
 
-#: src/gtknotify.c:769
+#: ../src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/gtkpounce.c:130
+#: ../src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:391 ../src/gtkpounce.c:895
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
+#: ../src/gtkpounce.c:408
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:435
+#: ../src/gtkpounce.c:435
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
+#: ../src/gtkpounce.c:459
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:467
+#: ../src/gtkpounce.c:467
 msgid "Si_gn on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:469
+#: ../src/gtkpounce.c:469
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:471
+#: ../src/gtkpounce.c:471
 msgid "A_way"
 msgstr "离开(_W)"
 
-#: src/gtkpounce.c:473
+#: ../src/gtkpounce.c:473
 msgid "_Return from away"
 msgstr "回来(_R)"
 
-#: src/gtkpounce.c:475
+#: ../src/gtkpounce.c:475
 msgid "_Idle"
 msgstr "瞌睡(_I)"
 
-#: src/gtkpounce.c:477
+#: ../src/gtkpounce.c:477
 msgid "Retur_n from idle"
 msgstr "睡醒了(_N)"
 
-#: src/gtkpounce.c:479
+#: ../src/gtkpounce.c:479
 msgid "Buddy starts _typing"
 msgstr "好友开始打字(_T)"
 
-#: src/gtkpounce.c:481
+#: ../src/gtkpounce.c:481
 msgid "Buddy stops t_yping"
 msgstr "好友停止打字(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
+#: ../src/gtkpounce.c:510
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:518
+#: ../src/gtkpounce.c:518
 msgid "Op_en an IM window"
 msgstr "打开即时消息窗口(_E)"
 
-#: src/gtkpounce.c:520
+#: ../src/gtkpounce.c:520
 msgid "_Popup notification"
 msgstr "弹出通知(_P)"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:522
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:524
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:526
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: src/gtkpounce.c:530
+#: ../src/gtkpounce.c:530
 msgid "B_rowse..."
 msgstr "浏览(_R)..."
 
-#: src/gtkpounce.c:532
+#: ../src/gtkpounce.c:532
 msgid "Bro_wse..."
 msgstr "浏览(_W)..."
 
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:533
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: src/gtkpounce.c:616
+#: ../src/gtkpounce.c:616
 msgid "Sav_e this pounce after activation"
 msgstr "激活后保存此千里眼(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
+#: ../src/gtkpounce.c:902
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:964
+#: ../src/gtkpounce.c:963
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:965
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:970
+#: ../src/gtkpounce.c:969
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:971
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:973
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:975
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:978
+#: ../src/gtkpounce.c:977
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:978
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:685
+#: ../src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr "界面选项"
+
+#: ../src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "如果未设置别名则显示远程昵称(_I)"
+
+#: ../src/gtkprefs.c:681
 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:725
+#: ../src/gtkprefs.c:721
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:728 ../src/gtkprefs.c:2205
+#: ../src/protocols/jabber/buddy.c:264 ../src/protocols/jabber/buddy.c:757
+#: ../src/protocols/jabber/chat.c:743
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:832
-msgid "Buddy List Sorting"
-msgstr "好友列表排序"
-
-#: src/gtkprefs.c:841
-msgid "_Sorting:"
-msgstr "排序(_S):"
-
-#: src/gtkprefs.c:846
-msgid "Buddy Display"
-msgstr "好友显示"
-
-#: src/gtkprefs.c:847
-msgid "Show more buddy details"
-msgstr "显示好友的更多细节"
-
-#: src/gtkprefs.c:885
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "将未知的斜线命令发送为消息(_S)"
-
-#: src/gtkprefs.c:887
-#, fuzzy
-msgid "Show _formatting on incoming messages"
-msgstr "显示格式工具栏(_F)"
-
-#: src/gtkprefs.c:889
-msgid "Show buddy _icons"
-msgstr "显示好友图标(_I)"
-
-#: src/gtkprefs.c:891
-msgid "Enable buddy ic_on animation"
-msgstr "启用好友图标动画(_O)"
-
-#: src/gtkprefs.c:893
-msgid "_Notify buddies that you are typing to them"
-msgstr "提醒好友您正在打字给他们(_N)"
-
-#: src/gtkprefs.c:896
+#: ../src/gtkprefs.c:824
+msgid "Display"
+msgstr "显示"
+
+#: ../src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr "消息显示时间戳(_T)"
+
+#: ../src/gtkprefs.c:828
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:914
+#: ../src/gtkprefs.c:832
+msgid "Ignore c_olors"
+msgstr "忽略颜色(_O)"
+
+#: ../src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "忽略字体(_F)"
+
+#: ../src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "较大字体(_Z)"
+
+#: ../src/gtkprefs.c:839
+msgid "Default Formatting"
+msgstr "默认格式"
+
+#: ../src/gtkprefs.c:841
+msgid "_Send default formatting with outgoing messages"
+msgstr "送出信息使用默认格式(_S)"
+
+#: ../src/gtkprefs.c:873
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
+#: ../src/gtkprefs.c:876
+msgid "_Clear Formatting"
+msgstr "清除格式(_C)"
+
+#: ../src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "发送消息"
+
+#: ../src/gtkprefs.c:914
+msgid "Enter _sends message"
+msgstr "回车键发送消息(_S)"
+
+#: ../src/gtkprefs.c:916
+msgid "C_ontrol-Enter sends message"
+msgstr "Ctrl+回车键发送消息(_O)"
+
+#: ../src/gtkprefs.c:919
+msgid "Window Closing"
+msgstr "窗口关闭"
+
+#: ../src/gtkprefs.c:920
+msgid "_Escape closes window"
+msgstr "Esc 键关闭窗口(_E)"
+
+#: ../src/gtkprefs.c:923
+msgid "Insertions"
+msgstr "插入"
+
+#: ../src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Ctrl+{B/I/U} 更改格式(_F)"
+
+#: ../src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr "Ctrl+数字键插入笑脸(_I)"
+
+#: ../src/gtkprefs.c:942
+msgid "Buddy List Sorting"
+msgstr "好友列表排序"
+
+#: ../src/gtkprefs.c:951
+msgid "_Sorting:"
+msgstr "排序(_S):"
+
+#: ../src/gtkprefs.c:957 ../src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "将按钮显示为(_B):"
+
+#: ../src/gtkprefs.c:959 ../src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "图片"
+
+#: ../src/gtkprefs.c:960 ../src/gtkprefs.c:1012
+msgid "Text"
+msgstr "文字"
+
+#: ../src/gtkprefs.c:961 ../src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "图片和文字"
+
+#: ../src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr "发生事件时激活窗口(_R)"
+
+#: ../src/gtkprefs.c:967
+msgid "Buddy Display"
+msgstr "好友显示"
+
+#: ../src/gtkprefs.c:968 ../src/gtkprefs.c:1030
+msgid "Show buddy _icons"
+msgstr "显示好友图标(_I)"
+
+#: ../src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr "显示警告级别(_W)"
+
+#: ../src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr "显示瞌睡时间(_T)"
+
+#: ../src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr "显示睡着的好友(_D)"
+
+#: ../src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr "自动展开联系人(_A)"
+
+#: ../src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr "允许斜线开头的命令(_S)"
+
+#: ../src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "将未知的斜线命令发送为消息(_S)"
+
+#: ../src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr "显示格式工具栏(_F)"
+
+#: ../src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr "在标签/标题中显示别名(_A)"
+
+#: ../src/gtkprefs.c:1032
+msgid "Enable buddy ic_on animation"
+msgstr "启用好友图标动画(_O)"
+
+#: ../src/gtkprefs.c:1034
+msgid "_Notify buddies that you are typing to them"
+msgstr "提醒好友您正在打字给他们(_N)"
+
+#: ../src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr "发生事件时激活对话窗口(_R)"
+
+#: ../src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr "发生事件时激活聊天窗口(_W)"
+
+#: ../src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr "在聊天中使用多种颜色来区分用户名(_M)"
+
 #. All the tab options!
-#: src/gtkprefs.c:935
+#: ../src/gtkprefs.c:1045
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:937
+#: ../src/gtkprefs.c:1047
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:951
+#: ../src/gtkprefs.c:1062
 msgid "Show close b_utton on tabs"
 msgstr "在标签上显示关闭按钮(_U)"
 
-#: src/gtkprefs.c:957
-#, fuzzy
-msgid "_Placement:"
-msgstr "扩展放置"
-
-#: src/gtkprefs.c:959
+#: ../src/gtkprefs.c:1065
+msgid "Tab p_lacement:"
+msgstr "标签位置(_L):"
+
+#: ../src/gtkprefs.c:1067
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:960
+#: ../src/gtkprefs.c:1068
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:961
+#: ../src/gtkprefs.c:1069
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:962
+#: ../src/gtkprefs.c:1070
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:966
-#, fuzzy
-msgid "N_ew conversations:"
-msgstr "关闭对话"
-
-#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
-#: src/protocols/oscar/oscar.c:5310
+#: ../src/gtkprefs.c:1076
+msgid "New conversation _placement:"
+msgstr "新对话放置(_P):"
+
+#: ../src/gtkprefs.c:1127 ../src/protocols/oscar/oscar.c:749
+#: ../src/protocols/oscar/oscar.c:5199
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:1019
+#: ../src/gtkprefs.c:1129
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:1028
+#: ../src/gtkprefs.c:1138
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:1052
+#: ../src/gtkprefs.c:1162
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:1055
+#: ../src/gtkprefs.c:1165
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1058
+#: ../src/gtkprefs.c:1168
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1065
+#: ../src/gtkprefs.c:1175
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1072
+#: ../src/gtkprefs.c:1182
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1076
+#: ../src/gtkprefs.c:1186
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1138
+#: ../src/gtkprefs.c:1248
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1194
+#: ../src/gtkprefs.c:1304
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1195
+#: ../src/gtkprefs.c:1305
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1196
+#: ../src/gtkprefs.c:1306
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1197
+#: ../src/gtkprefs.c:1307
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1198
+#: ../src/gtkprefs.c:1308
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1199
+#: ../src/gtkprefs.c:1309
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1200
+#: ../src/gtkprefs.c:1310
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1201
+#: ../src/gtkprefs.c:1311
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1202
+#: ../src/gtkprefs.c:1312
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1211
+#: ../src/gtkprefs.c:1321
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1264
+#: ../src/gtkprefs.c:1372
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1376
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1275
+#: ../src/gtkprefs.c:1383
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1277
+#: ../src/gtkprefs.c:1385
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1278
+#: ../src/gtkprefs.c:1386
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1280
+#: ../src/gtkprefs.c:1388
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1294
+#: ../src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4051,75 +4158,83 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1333
+#: ../src/gtkprefs.c:1439
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1336
+#: ../src/gtkprefs.c:1442
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1339
+#: ../src/gtkprefs.c:1445
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1341
+#: ../src/gtkprefs.c:1447
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1344
+#: ../src/gtkprefs.c:1450
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1346
+#: ../src/gtkprefs.c:1452
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1349
-msgid "Log when buddies log in/log _out"
-msgstr "记录好友的登入/登出(_O)"
-
-#: src/gtkprefs.c:1355
+#: ../src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
+msgstr "记录好友的登入/登出(_S)"
+
+#: ../src/gtkprefs.c:1461
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1361
+#: ../src/gtkprefs.c:1467
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1367
-msgid "Log your own _signons/idleness/awayness"
-msgstr "记录您自己的登入/瞌睡/离开(_S)"
-
-#: src/gtkprefs.c:1504
+#: ../src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
+msgstr "记录您自己的登入/瞌睡/离开(_O)"
+
+#: ../src/gtkprefs.c:1600
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1558
+#: ../src/gtkprefs.c:1651
+msgid "Sound Options"
+msgstr "声音选项"
+
+#: ../src/gtkprefs.c:1652
+msgid "Sounds when conversation has _focus"
+msgstr "对话获得焦点后发声(_F)"
+
+#: ../src/gtkprefs.c:1654
+msgid "_Sounds while away"
+msgstr "离开时发声(_S)"
+
+#: ../src/gtkprefs.c:1658
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1559
+#: ../src/gtkprefs.c:1659
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1561
+#: ../src/gtkprefs.c:1661
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1663
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1568
+#: ../src/gtkprefs.c:1670
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1569
-msgid "No sounds"
-msgstr "无声音"
-
-#: src/gtkprefs.c:1577
+#: ../src/gtkprefs.c:1678
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4128,98 +4243,90 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1604
-msgid "Sound Options"
-msgstr "声音选项"
-
-#: src/gtkprefs.c:1605
-msgid "Sounds when conversation has _focus"
-msgstr "对话获得焦点后发声(_F)"
-
-#: src/gtkprefs.c:1607
-msgid "_Sounds while away"
-msgstr "离开时发声(_S)"
-
-#: src/gtkprefs.c:1617
+#: ../src/gtkprefs.c:1705
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1668
+#: ../src/gtkprefs.c:1756
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1675
+#: ../src/gtkprefs.c:1763
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1694
+#: ../src/gtkprefs.c:1782
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1698
+#: ../src/gtkprefs.c:1786
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1702
+#: ../src/gtkprefs.c:1790
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1758
+#: ../src/gtkprefs.c:1814
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1761
+#: ../src/gtkprefs.c:1817
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
-#: src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:1819
+msgid "Never"
+msgstr "从不"
+
+#: ../src/gtkprefs.c:1820
 msgid "When away"
 msgstr "离开时"
 
-#: src/gtkprefs.c:1765
-msgid "When both away and idle"
+#: ../src/gtkprefs.c:1821
+msgid "When away and idle"
 msgstr "离开和瞌睡时"
 
-#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
-#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: ../src/gtkprefs.c:1824 ../src/protocols/msn/msn.c:1327
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2806
+#: ../src/protocols/oscar/oscar.c:4347 ../src/protocols/yahoo/yahoo.c:2780
+#: ../src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1769
+#: ../src/gtkprefs.c:1825
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1772
+#: ../src/gtkprefs.c:1828
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1775
+#: ../src/gtkprefs.c:1831
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1777
+#: ../src/gtkprefs.c:1833
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1785
+#: ../src/gtkprefs.c:1841
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1786
+#: ../src/gtkprefs.c:1842
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1790
+#: ../src/gtkprefs.c:1846
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1798
+#: ../src/gtkprefs.c:1854
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1856
+#: ../src/gtkprefs.c:1923
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4234,7 +4341,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1861
+#: ../src/gtkprefs.c:1928
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4249,127 +4356,143 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1996
+#: ../src/gtkprefs.c:2161
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2010
+#: ../src/gtkprefs.c:2175
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2058
+#: ../src/gtkprefs.c:2223
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2101
+#: ../src/gtkprefs.c:2384
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../src/gtkprefs.c:2420
+msgid "Interface"
+msgstr "界面"
+
+#: ../src/gtkprefs.c:2423
+msgid "Message Text"
+msgstr "消息文本"
+
+#: ../src/gtkprefs.c:2424
+msgid "Shortcuts"
+msgstr "快捷键"
+
+#: ../src/gtkprefs.c:2425
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2102
+#: ../src/gtkprefs.c:2426
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
+#: ../src/gtkprefs.c:2427 ../src/protocols/silc/silc.c:1588
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2108
+#: ../src/gtkprefs.c:2432
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2111
+#: ../src/gtkprefs.c:2435
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2112
+#: ../src/gtkprefs.c:2436
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2115
+#: ../src/gtkprefs.c:2437
+msgid "Away Messages"
+msgstr "离开消息"
+
+#: ../src/gtkprefs.c:2440
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "只允许我的好友"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "屏蔽全部用户"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:397 ../src/protocols/jabber/jabber.c:1504
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:410
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:422
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:591 ../src/gtkprivacy.c:607
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:592
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:593
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: ../src/gtkprivacy.c:596 ../src/gtkprivacy.c:609
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:601
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:603
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:630 ../src/gtkprivacy.c:643
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:631
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:632
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
-msgid "Block"
-msgstr "屏蔽"
-
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:639
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:641
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -4377,329 +4500,123 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
-#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1257
+#: ../src/gtkrequest.c:241 ../src/protocols/gg/gg.c:951
+#: ../src/protocols/msn/dialog.c:113 ../src/protocols/msn/msn.c:499
+#: ../src/protocols/msn/msn.c:502 ../src/protocols/novell/novell.c:1892
+#: ../src/protocols/silc/buddy.c:307 ../src/protocols/silc/pk.c:117
+#: ../src/request.h:1236
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
-#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1257
+#: ../src/gtkrequest.c:242 ../src/protocols/gg/gg.c:951
+#: ../src/protocols/msn/dialog.c:114 ../src/protocols/msn/msn.c:499
+#: ../src/protocols/msn/msn.c:502 ../src/protocols/novell/novell.c:1893
+#: ../src/protocols/silc/buddy.c:308 ../src/protocols/silc/pk.c:118
+#: ../src/request.h:1236
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:262
+#: ../src/gtkrequest.c:245
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:246 ../src/protocols/msn/msn.c:314
+#: ../src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1764
+#: ../src/gtkrequest.c:1421
 msgid "That file already exists"
 msgstr "该文件已存在"
 
-#: src/gtkrequest.c:1765
+#: ../src/gtkrequest.c:1422
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
+#: ../src/gtkrequest.c:1460 ../src/gtkrequest.c:1481
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
+#: ../src/gtkrequest.c:1461 ../src/gtkrequest.c:1482
 msgid "Open File..."
 msgstr "打开文件..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkroomlist.c:331
 msgid "Room List"
 msgstr "房间列表"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "标题"
-
-#: src/gtksavedstatuses.c:325
-msgid "Type"
-msgstr "类型"
-
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
-#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
-#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
-#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
-#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
-#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
-#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
-#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
-#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
-msgid "Message"
-msgstr "消息"
-
-#: src/gtksavedstatuses.c:399
-msgid "Saved Statuses"
-msgstr "已存状态"
-
-#: src/gtksavedstatuses.c:520
-msgid "Title already in use.  You must choose a unique title."
-msgstr "标题已在使用中。您必须选择唯一的标题。"
-
-#: src/gtksavedstatuses.c:611
-msgid "Custom status"
-msgstr "自定义状态"
-
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
-#: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
-#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
-#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
-#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
-#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
-msgid "Status"
-msgstr "状态"
-
-#: src/gtksavedstatuses.c:733
-msgid "_Title:"
-msgstr "标题(_T):"
-
-#: src/gtksavedstatuses.c:744
-msgid "Out of the office"
-msgstr "离开办公室"
-
-#: src/gtksavedstatuses.c:755
-msgid "_Status:"
-msgstr "状态(_S):"
-
-#. Custom status message disclosure
-#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
-msgid "Use a different status for some accounts"
-msgstr "为某些账户使用不同的状态"
-
-#: src/gtksound.c:60
+#: ../src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:61
+#: ../src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:65
 msgid "Message received"
 msgstr "消息已收到"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "收到的消息开始对话"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:67
 msgid "Message sent"
 msgstr "消息已送出"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "有人进入聊天"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "有人离开聊天"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "您在聊天中发言"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#: src/gtksound.c:71
+#: ../src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:257
+#: ../src/gtksound.c:173
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:273
+#: ../src/gtksound.c:189
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:285
+#: ../src/gtksound.c:201
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
-#: src/gtkstatusbox.c:132
-msgid "Typing"
-msgstr "正打字"
-
-#. connect to the server
-#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
-#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
-#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
-#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
-msgid "Connecting"
-msgstr "正连接"
-
-#. hacks
-#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
-#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
-#: 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:2810 src/protocols/novell/novell.c:2948
-#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
-#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
-#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
-msgid "Available"
-msgstr "可用"
-
-#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
-#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
-#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
-msgid "Invisible"
-msgstr "隐身"
-
-#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
-#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
-#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
-#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
-#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
-msgid "Offline"
-msgstr "离线"
-
-#. TODO: Add saved statuses here?
-#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
-msgid "New Status"
-msgstr "新建状态"
-
-#: src/gtkstock.c:101
-msgid "_Alias"
-msgstr "别名(_A)"
-
-#: src/gtkstock.c:103
-msgid "_Invite"
-msgstr "邀请(_I)"
-
-#: src/gtkstock.c:104
-msgid "_Modify"
-msgstr "修改(_M)"
-
-#: src/gtkstock.c:105
-msgid "_Open Mail"
-msgstr "打开邮件(_O)"
-
-#: src/gtkstock.c:107
-msgid "_Warn"
-msgstr "警告(_W)"
-
-#: src/gtkutils.c:1386 src/gtkutils.c:1411
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "装入 %s 时发生了下列错误: %s。"
-
-#: src/gtkutils.c:1388 src/gtkutils.c:1413
-msgid "Failed to load image"
-msgstr "装入图像失败"
-
-#: src/gtkutils.c:1488
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "无法发送文件夹 %s。"
-
-#: src/gtkutils.c:1490
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "Gaim 无法传送文件夹。您需要选择需要传送的单个文件"
-
-#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
-msgid "You have dragged an image"
-msgstr "您拖曳了图像"
-
-#: src/gtkutils.c:1519
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
-
-#: src/gtkutils.c:1523 src/gtkutils.c:1538
-msgid "Set as buddy icon"
-msgstr "设置为好友头像"
-
-#: src/gtkutils.c:1524 src/gtkutils.c:1539
-msgid "Send image file"
-msgstr "发送图像文件"
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1539
-msgid "Insert in message"
-msgstr "在消息中插入"
-
-#: src/gtkutils.c:1528
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "您是否想要将其设置为此用户的头像?"
-
-#: src/gtkutils.c:1533
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友图"
-"标。"
-
-#: src/gtkutils.c:1535
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr "您可以通过文件传送发送此图像,或者将其用作此用户的头像。"
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1589
-msgid "Cannot send launcher"
-msgstr "无法发送启动器"
-
-#: src/gtkutils.c:1589
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而"
-"非启动器自身。"
-
-#: src/log.c:105
+#: ../src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:746
+#: ../src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:811
+#: ../src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4708,7 +4625,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:813
+#: ../src/log.c:612
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4717,289 +4634,369 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:864 src/log.c:995
+#: ../src/log.c:663 ../src/log.c:793
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:874 src/log.c:1007
+#: ../src/log.c:673 ../src/log.c:805
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: src/log.c:878
+#: ../src/log.c:677
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:940
+#: ../src/log.c:738
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:1011
+#: ../src/log.c:809
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/plugin.c:324
+#: ../src/main.c:150
+msgid "Please create an account."
+msgstr "请创建一个账户。"
+
+#: ../src/main.c:232
+msgid "Login"
+msgstr "登入"
+
+#: ../src/main.c:248
+msgid "<b>_Account:</b>"
+msgstr "<b>账户(_A):</b>"
+
+#: ../src/main.c:262
+msgid "<b>_Password:</b>"
+msgstr "<b>密码(_P):</b>"
+
+#. And now for the buttons
+#: ../src/main.c:279
+msgid "A_ccounts"
+msgstr "账户(_C)"
+
+#: ../src/main.c:285
+msgid "P_references"
+msgstr "首选项(_R)"
+
+#: ../src/main.c:291
+msgid "_Sign on"
+msgstr "登入(_S)"
+
+#. full help text
+#: ../src/main.c:513
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"用法: %s [选项]...\n"
+"\n"
+"  -a, --acct          显示账户编辑窗口\n"
+"  -w, --away[=消息]   登入后设为离开(可选“消息”指定要使用的离开消息名称)\n"
+"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
+"  -n, --loginwin      不自动登入;显示登录窗口\n"
+"  -u, --user=名称     使用指定账户\n"
+"  -f, --file=文件     使用指定文件的配置\n"
+"  -c, --config=目录   使用“目录”存储配置文件\n"
+"  -d, --debug         将调试信息打印到标准输出\n"
+"  -v, --version       显示当前版本并退出\n"
+"  -h, --help          显示帮助并退出\n"
+
+#. short message
+#: ../src/main.c:528
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
+
+#: ../src/main.c:895
+msgid "Unable to load preferences"
+msgstr "无法装入首选项"
+
+#: ../src/main.c:895
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim 无法装入您的首选项,原因是存储首选项所用的的格式太老,目前已不支持。请使"
+"用首选项窗口重新配置您的设置。"
+
+#: ../src/plugin.c:295
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:329 src/plugin.c:357
+#: ../src/plugin.c:300 ../src/plugin.c:328
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:353
+#: ../src/plugin.c:324
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
 
-#: src/prefs.c:1094
+#: ../src/prefs.c:113 ../src/status.c:273
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:51
+#: ../src/protocols/gg/gg.c:50 ../src/protocols/jabber/jutil.c:44
+#: ../src/protocols/msn/msn.c:513 ../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:2797
+#: ../src/protocols/novell/novell.c:2916 ../src/protocols/novell/novell.c:2967
+#: ../src/protocols/oscar/oscar.c:771 ../src/protocols/yahoo/yahoo.c:3125
+#: ../src/protocols/yahoo/yahoo.c:3241
+msgid "Available"
+msgstr "可用"
+
+#: ../src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "只对好友可用"
 
-#: src/protocols/gg/gg.c:53
+#: ../src/protocols/gg/gg.c:53
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:55
+#: ../src/protocols/gg/gg.c:54 ../src/protocols/jabber/jabber.c:1002
+#: ../src/protocols/jabber/presence.c:139 ../src/protocols/oscar/oscar.c:689
+#: ../src/protocols/oscar/oscar.c:5715 ../src/protocols/oscar/oscar.c:5793
+#: ../src/protocols/oscar/oscar.c:5817 ../src/protocols/oscar/oscar.c:7004
+#: ../src/protocols/oscar/oscar.c:7009 ../src/protocols/yahoo/yahoo.c:2778
+#: ../src/protocols/yahoo/yahoo.c:3145 ../src/protocols/yahoo/yahoo.c:3253
+msgid "Invisible"
+msgstr "隐身"
+
+#: ../src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
 
-#: src/protocols/gg/gg.c:56 src/status.c:157
+#: ../src/protocols/gg/gg.c:56
 msgid "Unavailable"
 msgstr "不可用"
 
-#: src/protocols/gg/gg.c:151
+#: ../src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
+#: ../src/protocols/gg/gg.c:140 ../src/protocols/novell/novell.c:1711
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
-#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
-#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
-#: src/protocols/jabber/jabber.c:109
+#: ../src/protocols/gg/gg.c:143 ../src/protocols/jabber/auth.c:134
+#: ../src/protocols/jabber/auth.c:208 ../src/protocols/jabber/auth.c:369
+#: ../src/protocols/jabber/auth.c:467 ../src/protocols/jabber/auth.c:479
+#: ../src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
-#: src/protocols/gg/gg.c:160
+#: ../src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr "从套接字读取时出错。"
 
-#: src/protocols/gg/gg.c:163
+#: ../src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr "向套接字写入时出错。"
 
-#: src/protocols/gg/gg.c:166
+#: ../src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: src/protocols/gg/gg.c:169
+#: ../src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
+#: ../src/protocols/gg/gg.c:243 ../src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
-#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
-#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
-#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: ../src/protocols/gg/gg.c:244 ../src/protocols/gg/gg.c:1013
+#: ../src/protocols/napster/napster.c:404 ../src/protocols/oscar/oscar.c:4152
+#: ../src/protocols/oscar/oscar.c:4376 ../src/protocols/silc/ops.c:1086
+#: ../src/protocols/silc/ops.c:1148 ../src/protocols/toc/toc.c:468
+#: ../src/protocols/zephyr/zephyr.c:726 ../src/protocols/zephyr/zephyr.c:1136
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#. TODO: Do we need both an "online" and an "available" state?
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:310 src/protocols/irc/irc.c:172
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
-#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
-#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
-#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
-msgid "Online"
-msgstr "在线"
-
-#: src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:294
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:519
+#: ../src/protocols/gg/gg.c:447
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:526
+#: ../src/protocols/gg/gg.c:454
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:818 src/protocols/napster/napster.c:502
-#: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
+#: ../src/protocols/gg/gg.c:674 ../src/protocols/icq/gaim_icq.c:343
+#: ../src/protocols/napster/napster.c:486
+#: ../src/protocols/napster/napster.c:517 ../src/protocols/toc/toc.c:170
+#: ../src/protocols/yahoo/yahoo.c:2407 ../src/protocols/yahoo/yahoo.c:2436
+#: ../src/protocols/yahoo/yahoo.c:2499
+#: ../src/protocols/yahoo/yahoo_filexfer.c:68
+#: ../src/protocols/yahoo/yahoo_filexfer.c:111
+#: ../src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:834
+#: ../src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "读取数据"
 
-#: src/protocols/gg/gg.c:837
+#: ../src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:840
+#: ../src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "读取服务器密钥"
 
-#: src/protocols/gg/gg.c:843
+#: ../src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "交换密钥"
 
-#: src/protocols/gg/gg.c:853
+#: ../src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/gg/gg.c:727 ../src/protocols/gg/gg.c:818
+#: ../src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:921
+#: ../src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:933
+#: ../src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:938
+#: ../src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:941
+#: ../src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:987
+#: ../src/protocols/gg/gg.c:841
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:1040
+#: ../src/protocols/gg/gg.c:919
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:1045
+#: ../src/protocols/gg/gg.c:924
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:1071
+#: ../src/protocols/gg/gg.c:950
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
+#: ../src/protocols/gg/gg.c:955 ../src/protocols/oscar/oscar.c:5191
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
-#: src/protocols/trepia/trepia.c:268
+#: ../src/protocols/gg/gg.c:959 ../src/protocols/jabber/jabber.c:624
+#: ../src/protocols/oscar/oscar.c:5202 ../src/protocols/silc/ops.c:808
+#: ../src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1085 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
+#: ../src/protocols/gg/gg.c:964 ../src/protocols/jabber/jabber.c:629
+#: ../src/protocols/oscar/oscar.c:5203 ../src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
-#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
-#: src/protocols/silc/ops.c:1202
+#: ../src/protocols/gg/gg.c:968 ../src/protocols/gg/gg.c:1712
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/oscar/oscar.c:5192
+#: ../src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
+#: ../src/protocols/gg/gg.c:975 ../src/protocols/gg/gg.c:978
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
-#: src/protocols/gg/gg.c:1109
+#: ../src/protocols/gg/gg.c:984 ../src/protocols/gg/gg.c:986
+#: ../src/protocols/gg/gg.c:988
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
-#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
+#: ../src/protocols/gg/gg.c:992 ../src/protocols/jabber/jabber.c:639
+#: ../src/protocols/oscar/oscar.c:5246 ../src/protocols/oscar/oscar.c:5254
+#: ../src/protocols/trepia/trepia.c:332 ../src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:1156
+#: ../src/protocols/gg/gg.c:1035
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:1164
+#: ../src/protocols/gg/gg.c:1043
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1226
+#: ../src/protocols/gg/gg.c:1105
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1234
+#: ../src/protocols/gg/gg.c:1113
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1242
+#: ../src/protocols/gg/gg.c:1121
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1250
+#: ../src/protocols/gg/gg.c:1129
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1259
+#: ../src/protocols/gg/gg.c:1138
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1266
+#: ../src/protocols/gg/gg.c:1145
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:1385
+#: ../src/protocols/gg/gg.c:1264
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:1386
+#: ../src/protocols/gg/gg.c:1265
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -5007,77 +5004,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1415
+#: ../src/protocols/gg/gg.c:1294
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1416
+#: ../src/protocols/gg/gg.c:1295
 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:1489
+#: ../src/protocols/gg/gg.c:1368
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
+#: ../src/protocols/gg/gg.c:1369 ../src/protocols/gg/gg.c:1392
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1512
+#: ../src/protocols/gg/gg.c:1391
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1563
+#: ../src/protocols/gg/gg.c:1442
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1564
+#: ../src/protocols/gg/gg.c:1443
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1598
+#: ../src/protocols/gg/gg.c:1477
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1599
+#: ../src/protocols/gg/gg.c:1478
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1615
+#: ../src/protocols/gg/gg.c:1494
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
-#: src/protocols/toc/toc.c:1694
+#: ../src/protocols/gg/gg.c:1499 ../src/protocols/jabber/jabber.c:1100
+#: ../src/protocols/toc/toc.c:1591
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1624
+#: ../src/protocols/gg/gg.c:1503
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1628
+#: ../src/protocols/gg/gg.c:1507
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1632
+#: ../src/protocols/gg/gg.c:1511
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1665
+#: ../src/protocols/gg/gg.c:1544
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1666
+#: ../src/protocols/gg/gg.c:1545
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5094,119 +5091,150 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
+#: ../src/protocols/gg/gg.c:1691 ../src/protocols/gg/gg.c:1693
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
+#: ../src/protocols/icq/gaim_icq.c:223
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr "Gaim 与 ICQ 服务器通讯错误。"
+
+#: ../src/protocols/icq/gaim_icq.c:293
+#, 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:296 ../src/protocols/jabber/presence.c:300
+#: ../src/protocols/msn/userlist.c:103 ../src/protocols/oscar/oscar.c:3887
+#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/yahoo/yahoo.c:1080
+msgid "Authorize"
+msgstr "同意"
+
+#: ../src/protocols/icq/gaim_icq.c:296 ../src/protocols/jabber/presence.c:301
+#: ../src/protocols/msn/userlist.c:104 ../src/protocols/oscar/oscar.c:3889
+#: ../src/protocols/oscar/oscar.c:6453 ../src/protocols/yahoo/yahoo.c:1082
+msgid "Deny"
+msgstr "拒绝"
+
+#: ../src/protocols/icq/gaim_icq.c:309
+msgid "Send message through server"
+msgstr "通过服务器中转消息"
+
+#: ../src/protocols/icq/gaim_icq.c:351
+msgid "Connecting..."
+msgstr "正在连接..."
+
+#: ../src/protocols/icq/gaim_icq.c:497
+msgid "Nick:"
+msgstr "昵称:"
+
+#: ../src/protocols/icq/gaim_icq.c:498
+msgid "Gaim User"
+msgstr "Gaim 用户"
+
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1311
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1030
+#: ../src/protocols/irc/cmds.c:464 ../src/protocols/jabber/chat.c:576
+#: ../src/protocols/silc/silc.c:1019
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1034
+#: ../src/protocols/irc/cmds.c:468 ../src/protocols/jabber/chat.c:580
+#: ../src/protocols/silc/silc.c:1023
 msgid "No topic is set"
 msgstr "未设定话题"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
-#: src/protocols/yahoo/yahoo_filexfer.c:185
-#: src/protocols/yahoo/yahoo_filexfer.c:194
-msgid "File Transfer Failed"
-msgstr "文件传送失败"
-
-#: src/protocols/irc/dcc_send.c:273
+#: ../src/protocols/irc/dcc_send.c:272
+#: ../src/protocols/yahoo/yahoo_filexfer.c:176
+#: ../src/protocols/yahoo/yahoo_filexfer.c:185
+#: ../src/protocols/yahoo/yahoo_filexfer.c:194
+msgid "File Transfer Aborted"
+msgstr "文件传送中止"
+
+#: ../src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 无法打开监听端口。"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:76
 msgid "Error displaying MOTD"
 msgstr "显示 MOTD 出错"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:76
 msgid "No MOTD available"
 msgstr "没有可用的 MOTD"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:77
 msgid "There is no MOTD associated with this connection."
 msgstr "没有与此连接关联的 MOTD"
 
-#: src/protocols/irc/irc.c:83
+#: ../src/protocols/irc/irc.c:80
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
-#: src/protocols/irc/irc.c:552
+#: ../src/protocols/irc/irc.c:94 ../src/protocols/irc/irc.c:406
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
-#: src/protocols/irc/irc.c:192
+#: ../src/protocols/irc/irc.c:159
 msgid "View MOTD"
 msgstr "查看 MOTD"
 
-#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:181 ../src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:186 ../src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:242
+#: ../src/protocols/irc/irc.c:218
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
-#: src/protocols/jabber/jabber.c:745
-msgid "SSL support unavailable"
-msgstr "SSL 支持不可用"
-
-#: src/protocols/irc/irc.c:281
+#. connect to the server
+#: ../src/protocols/irc/irc.c:238 ../src/protocols/jabber/jabber.c:798
+#: ../src/protocols/msn/session.c:364 ../src/protocols/napster/napster.c:510
+#: ../src/protocols/novell/novell.c:2152 ../src/protocols/oscar/oscar.c:1760
+#: ../src/protocols/trepia/trepia.c:1065 ../src/protocols/yahoo/yahoo.c:2641
+#: ../src/protocols/zephyr/zephyr.c:1458
+msgid "Connecting"
+msgstr "正在连接"
+
+#: ../src/protocols/irc/irc.c:245
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
-#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/jabber.c:304
+#: ../src/protocols/oscar/oscar.c:1691 ../src/protocols/oscar/oscar.c:1756
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
-msgid "Connection Failed"
-msgstr "连接失败"
-
-#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
-msgid "SSL Handshake Failed"
-msgstr "SSL 握手失败"
-
-#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
-#: src/protocols/trepia/trepia.c:929
+#: ../src/protocols/irc/irc.c:403 ../src/protocols/trepia/trepia.c:927
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1400
+#: ../src/protocols/irc/irc.c:568 ../src/protocols/silc/chat.c:1373
+#: ../src/protocols/yahoo/yahoochat.c:1444
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
+#: ../src/protocols/irc/irc.c:571 ../src/protocols/silc/chat.c:1376
+#: ../src/protocols/silc/ops.c:1166 ../src/protocols/yahoo/yahoochat.c:1453
 msgid "Topic"
 msgstr "话题"
 
-#: src/protocols/irc/irc.c:738
+#: ../src/protocols/irc/irc.c:608
 msgid "IRC"
-msgstr ""
-
-#: src/protocols/irc/irc.c:742
-#, fuzzy
+msgstr "IRC"
+
+#: ../src/protocols/irc/irc.c:612
 msgid "Quit message"
-msgstr "(1 条消息)"
+msgstr "退出消息"
 
 #. *< type
 #. *< ui_requirement
@@ -5216,257 +5244,260 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:828
+#: ../src/protocols/irc/irc.c:699
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:829
+#: ../src/protocols/irc/irc.c:700
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
-#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
+#: ../src/protocols/irc/irc.c:719 ../src/protocols/irc/msgs.c:239
+#: ../src/protocols/jabber/jabber.c:1617
+#: ../src/protocols/napster/napster.c:672 ../src/protocols/silc/ops.c:1026
+#: ../src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
-#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
-#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
+#: ../src/protocols/irc/irc.c:722 ../src/protocols/jabber/jabber.c:1638
+#: ../src/protocols/msn/msn.c:1934 ../src/protocols/napster/napster.c:677
+#: ../src/protocols/silc/silc.c:1596 ../src/protocols/trepia/trepia.c:1301
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:854
+#: ../src/protocols/irc/irc.c:725
 msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
-#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/irc.c:728 ../src/protocols/irc/msgs.c:233
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/silc/buddy.c:1454
+#: ../src/protocols/silc/ops.c:973 ../src/protocols/silc/ops.c:975
+#: ../src/protocols/silc/ops.c:1123 ../src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "用户名"
 
-#: src/protocols/irc/irc.c:860
+#: ../src/protocols/irc/irc.c:731
 msgid "Real name"
 msgstr "真名"
 
-#: src/protocols/irc/irc.c:863
-msgid "Use SSL"
-msgstr "使用 SSL"
-
-#: src/protocols/irc/msgs.c:105
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "无效模式"
 
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:120
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被 %s 屏蔽了。"
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:121
 msgid "Banned"
 msgstr "屏蔽"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:139
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "无法屏蔽 %s:屏蔽列表已满"
-
-#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
-#: src/protocols/irc/msgs.c:247
+msgstr "无法屏蔽 %s: 屏蔽列表已满"
+
+#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:239
+#: ../src/protocols/irc/msgs.c:252
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:222
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:218
+#: ../src/protocols/irc/msgs.c:223
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: ../src/protocols/irc/msgs.c:227 ../src/protocols/irc/msgs.c:233
+#: ../src/protocols/irc/msgs.c:234 ../src/protocols/irc/msgs.c:245
+#: ../src/protocols/msn/msn.c:1327 ../src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
+#: ../src/protocols/irc/msgs.c:234 ../src/protocols/silc/ops.c:967
+#: ../src/protocols/silc/ops.c:1117
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:245 ../src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "目前位于"
 
-#: src/protocols/irc/msgs.c:245
+#: ../src/protocols/irc/msgs.c:250
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>瞌睡了:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:247
+#: ../src/protocols/irc/msgs.c:252
 msgid "Online since"
 msgstr "上线时间"
 
-#: src/protocols/irc/msgs.c:250
+#: ../src/protocols/irc/msgs.c:255
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>定义形容词:</b>显赫<br>"
 
-#: src/protocols/irc/msgs.c:257
+#: ../src/protocols/irc/msgs.c:262
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:320
+#: ../src/protocols/irc/msgs.c:325
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:325
+#: ../src/protocols/irc/msgs.c:330
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:342
+#: ../src/protocols/irc/msgs.c:348
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:349
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:349
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:366
+#: ../src/protocols/irc/msgs.c:373
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:463
+#: ../src/protocols/irc/msgs.c:473
 msgid "Time Response"
 msgstr "时间响应"
 
-#: src/protocols/irc/msgs.c:464
+#: ../src/protocols/irc/msgs.c:474
 msgid "The IRC server's local time is:"
 msgstr "IRC 服务器的本地时间为:"
 
-#: src/protocols/irc/msgs.c:475
+#: ../src/protocols/irc/msgs.c:488
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:486
+#: ../src/protocols/irc/msgs.c:501
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:489
+#: ../src/protocols/irc/msgs.c:504
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:510
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:514
+#: ../src/protocols/irc/msgs.c:531
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:570
+#: ../src/protocols/irc/msgs.c:587
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:571
+#: ../src/protocols/irc/msgs.c:588
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:673
+#: ../src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:678
+#: ../src/protocols/irc/msgs.c:697
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:702
+#: ../src/protocols/irc/msgs.c:721
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:786
+#: ../src/protocols/irc/msgs.c:808
+#, c-format
+msgid "Invalid nickname '%s'"
+msgstr "无效的昵称“%s”"
+
+#: ../src/protocols/irc/msgs.c:809
+msgid "Invalid nickname"
+msgstr "无效的昵称"
+
+#: ../src/protocols/irc/msgs.c:811 ../src/protocols/irc/msgs.c:816
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
 
-#: src/protocols/irc/msgs.c:825
+#: ../src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:825
+#: ../src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:846
+#: ../src/protocols/irc/msgs.c:880
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:888
+#: ../src/protocols/irc/msgs.c:922
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:890
+#: ../src/protocols/irc/msgs.c:924
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:965
+#: ../src/protocols/irc/msgs.c:999
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
+#: ../src/protocols/irc/msgs.c:1001 ../src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:1000
-msgid "Nick or channel is temporarily unavailable."
-msgstr "昵称或频道暂时不可用。"
-
-#: src/protocols/irc/msgs.c:1012
+#: ../src/protocols/irc/msgs.c:1038
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: src/protocols/irc/parse.c:116
+#: ../src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 "deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5475,13 +5506,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5489,7 +5520,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:119
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5497,826 +5528,857 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:120
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:121
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:122
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:123
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:125
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1465
+#: ../src/protocols/irc/parse.c:126 ../src/protocols/jabber/jabber.c:1448
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:127
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:129
+#: ../src/protocols/irc/parse.c:128
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:132
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:133
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:134
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:135
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:136
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:137
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:138
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:139
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:140
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
 
-#: src/protocols/irc/parse.c:422
+#: ../src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1648 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:525 ../src/protocols/irc/parse.c:529
+#: ../src/protocols/oscar/oscar.c:1588 ../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
+#: ../src/protocols/jabber/auth.c:52
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
-msgstr "服务器需要 TLS/SSL 登录。请在账户属性中选择“若可用则使用 TLS”"
-
-#: src/protocols/jabber/auth.c:53
+msgstr ""
+"服务器需要 TLS/SSL 才能登录。请在账户属性中选择“如果可用的话请使用 TLS”"
+
+#: ../src/protocols/jabber/auth.c:54
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:164 ../src/protocols/jabber/auth.c:165
+#: ../src/protocols/jabber/auth.c:242 ../src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:166 ../src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:174 ../src/protocols/jabber/auth.c:252
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
-#: src/protocols/jabber/auth.c:396
+#: ../src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
-#: src/protocols/silc/ops.c:806
+#: ../src/protocols/jabber/buddy.c:246 ../src/protocols/jabber/buddy.c:613
+#: ../src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:247 ../src/protocols/jabber/buddy.c:626
+#: ../src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
+#: ../src/protocols/jabber/buddy.c:248 ../src/protocols/jabber/buddy.c:630
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1009
+#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:644
+#: ../src/protocols/jabber/jabber.c:619 ../src/protocols/msn/msn.c:1317
+#: ../src/protocols/silc/buddy.c:1451 ../src/protocols/silc/ops.c:820
+#: ../src/protocols/silc/ops.c:963 ../src/protocols/silc/ops.c:1113
+#: ../src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
+#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/jabber.c:659
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
+#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:672
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:668
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
+#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/buddy.c:676
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
+#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:680
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
-#: src/protocols/jabber/jabber.c:653
+#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/jabber.c:649
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
-#: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
+#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:689
+#: ../src/protocols/trepia/trepia.c:340 ../src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
-#: src/protocols/jabber/buddy.c:755
+#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:700
+#: ../src/protocols/jabber/buddy.c:707
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
-#: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
+#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:726 ../src/protocols/silc/silc.c:656
+#: ../src/protocols/silc/util.c:511
+#: ../src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
+#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:741
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
+#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:745
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:751
+#: ../src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr "标题"
+
+#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:754
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
-#: src/protocols/oscar/oscar.c:5338
+#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:647
+#: ../src/protocols/oscar/oscar.c:5227
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
+#: ../src/protocols/jabber/buddy.c:509 ../src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:565
+#: ../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:610
+#: ../src/protocols/jabber/buddy.c:556
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
-msgid "Resource"
-msgstr "资源"
-
-#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:566 ../src/protocols/jabber/buddy.c:573
+#: ../src/protocols/jabber/buddy.c:586 ../src/protocols/jabber/jabber.c:971
+#: ../src/protocols/msn/msn.c:489 ../src/protocols/novell/novell.c:2819
+#: ../src/protocols/novell/novell.c:2823 ../src/protocols/oscar/oscar.c:731
+#: ../src/protocols/oscar/oscar.c:737 ../src/protocols/oscar/oscar.c:739
+#: ../src/protocols/yahoo/yahoo.c:2903
+msgid "Status"
+msgstr "状态"
+
+#: ../src/protocols/jabber/buddy.c:634 ../src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:652 ../src/protocols/jabber/jabber.c:634
+#: ../src/protocols/oscar/oscar.c:5245 ../src/protocols/oscar/oscar.c:5253
+#: ../src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:712
+#: ../src/protocols/jabber/buddy.c:664
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:824
+#: ../src/protocols/jabber/buddy.c:770
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:824
+#: ../src/protocols/jabber/buddy.c:770
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:849
+#: ../src/protocols/jabber/buddy.c:786
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:1031
+#: ../src/protocols/jabber/buddy.c:941
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:1034
+#: ../src/protocols/jabber/buddy.c:944
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1041
+#: ../src/protocols/jabber/buddy.c:951
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:1047
+#: ../src/protocols/jabber/buddy.c:957
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1055
+#: ../src/protocols/jabber/buddy.c:965
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
-#: src/protocols/silc/ops.c:1239
-msgid "Error"
-msgstr "出错"
-
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
-msgid "Chatty"
-msgstr "唠叨"
-
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
-#: src/status.c:160
-msgid "Extended Away"
-msgstr "远远离开"
-
-#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
-#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
-msgid "Do Not Disturb"
-msgstr "请勿打扰"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
-#: src/protocols/yahoo/yahoochat.c:995
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:6523
+#: ../src/protocols/yahoo/yahoochat.c:1040
 msgid "_Room:"
 msgstr "房间(_R):"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "服务器(_S):"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:213
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:218
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:219 ../src/protocols/jabber/chat.c:220
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:224
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:225 ../src/protocols/jabber/chat.c:226
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:379
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:388 ../src/protocols/jabber/chat.c:533
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:404
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:405
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:455 ../src/protocols/jabber/chat.c:524
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:607
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1239
-msgid "Error retrieving room list"
+#: ../src/protocols/jabber/chat.c:651 ../src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr "房间列表错误"
+
+#: ../src/protocols/jabber/chat.c:652 ../src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:711
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:749
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:750
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:753
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: src/protocols/jabber/jabber.c:78
+#: ../src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
-#: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
-#: src/protocols/trepia/trepia.c:1181
+#: ../src/protocols/jabber/jabber.c:213 ../src/protocols/trepia/trepia.c:248
+#: ../src/protocols/trepia/trepia.c:699 ../src/protocols/trepia/trepia.c:988
+#: ../src/protocols/trepia/trepia.c:1032 ../src/protocols/trepia/trepia.c:1131
+#: ../src/protocols/trepia/trepia.c:1177
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
+#: ../src/protocols/jabber/jabber.c:251 ../src/protocols/jabber/jabber.c:271
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
+#: ../src/protocols/jabber/jabber.c:331
+msgid "Connection Failed"
+msgstr "连接失败"
+
+#: ../src/protocols/jabber/jabber.c:334
+msgid "SSL Handshake Failed"
+msgstr "SSL 握手失败"
+
+#: ../src/protocols/jabber/jabber.c:378 ../src/protocols/jabber/jabber.c:711
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
-#: src/protocols/trepia/trepia.c:1075
+#: ../src/protocols/jabber/jabber.c:409 ../src/protocols/jabber/jabber.c:741
+msgid "SSL support unavailable"
+msgstr "SSL 支持不可用"
+
+#: ../src/protocols/jabber/jabber.c:419 ../src/protocols/jabber/jabber.c:751
+#: ../src/protocols/trepia/trepia.c:1071
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:448
+#: ../src/protocols/jabber/jabber.c:444
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
+#: ../src/protocols/jabber/jabber.c:446 ../src/protocols/jabber/jabber.c:447
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
+#: ../src/protocols/jabber/jabber.c:453 ../src/protocols/jabber/jabber.c:1219
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
+#: ../src/protocols/jabber/jabber.c:455 ../src/protocols/jabber/jabber.c:456
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
+#: ../src/protocols/jabber/jabber.c:567 ../src/protocols/jabber/jabber.c:568
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
+#: ../src/protocols/jabber/jabber.c:603 ../src/protocols/jabber/jabber.c:1074
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:618
+#: ../src/protocols/jabber/jabber.c:614
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
-#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
-#: src/protocols/trepia/trepia.c:414
+#: ../src/protocols/jabber/jabber.c:644 ../src/protocols/oscar/oscar.c:5247
+#: ../src/protocols/oscar/oscar.c:5255 ../src/protocols/trepia/trepia.c:336
+#: ../src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:654 ../src/protocols/silc/ops.c:853
+#: ../src/protocols/silc/silc.c:658 ../src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "电话"
 
-#: src/protocols/jabber/jabber.c:668
+#: ../src/protocols/jabber/jabber.c:664
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:676
+#: ../src/protocols/jabber/jabber.c:672
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:679 src/protocols/jabber/jabber.c:680
+#: ../src/protocols/jabber/jabber.c:675 ../src/protocols/jabber/jabber.c:676
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:811
+#: ../src/protocols/jabber/jabber.c:759
+msgid "Logged out"
+msgstr "已登出"
+
+#: ../src/protocols/jabber/jabber.c:802
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:808 ../src/protocols/msn/session.c:370
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:826
+#: ../src/protocols/jabber/jabber.c:817
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
-#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
-#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
+#: ../src/protocols/jabber/jabber.c:897 ../src/protocols/jabber/jabber.c:1197
+#: ../src/protocols/jabber/jabber.c:1238 ../src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/oscar/oscar.c:737 ../src/protocols/oscar/oscar.c:6807
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:930
+#: ../src/protocols/jabber/jabber.c:938
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:932
+#: ../src/protocols/jabber/jabber.c:940
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:934
+#: ../src/protocols/jabber/jabber.c:942
 msgid "From"
 msgstr "来自"
 
-#: src/protocols/jabber/jabber.c:937
+#: ../src/protocols/jabber/jabber.c:945
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:939
+#: ../src/protocols/jabber/jabber.c:947
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:943
+#: ../src/protocols/jabber/jabber.c:951
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
-msgid "Priority"
-msgstr "优先级"
-
-#: src/protocols/jabber/jabber.c:1034
+#: ../src/protocols/jabber/jabber.c:984
+msgid "Error"
+msgstr "出错"
+
+#: ../src/protocols/jabber/jabber.c:997 ../src/protocols/jabber/jutil.c:35
+#: ../src/protocols/jabber/presence.c:72
+#: ../src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr "唠叨"
+
+#: ../src/protocols/jabber/jabber.c:999 ../src/protocols/jabber/jutil.c:38
+#: ../src/protocols/jabber/presence.c:74
+#: ../src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr "远远离开"
+
+#: ../src/protocols/jabber/jabber.c:1000 ../src/protocols/jabber/jutil.c:41
+#: ../src/protocols/jabber/presence.c:76
+#: ../src/protocols/jabber/presence.c:137 ../src/protocols/oscar/oscar.c:679
+#: ../src/protocols/oscar/oscar.c:5805 ../src/protocols/oscar/oscar.c:7000
+msgid "Do Not Disturb"
+msgstr "请勿打扰"
+
+#: ../src/protocols/jabber/jabber.c:1017
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:1035
+#: ../src/protocols/jabber/jabber.c:1018
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
+#: ../src/protocols/jabber/jabber.c:1022 ../src/protocols/jabber/jabber.c:1023
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1096
+#: ../src/protocols/jabber/jabber.c:1079
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
+#: ../src/protocols/jabber/jabber.c:1084 ../src/protocols/jabber/jabber.c:1085
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1102
+#: ../src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
+#: ../src/protocols/jabber/jabber.c:1095 ../src/protocols/toc/toc.c:1581
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1194
+#: ../src/protocols/jabber/jabber.c:1177
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1196
+#: ../src/protocols/jabber/jabber.c:1179
 msgid "Conflict"
 msgstr "冲突"
 
-#: src/protocols/jabber/jabber.c:1198
+#: ../src/protocols/jabber/jabber.c:1181
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: src/protocols/jabber/jabber.c:1200
+#: ../src/protocols/jabber/jabber.c:1183
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1185
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
+#: ../src/protocols/jabber/jabber.c:1187 ../src/protocols/jabber/jabber.c:1261
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1206
+#: ../src/protocols/jabber/jabber.c:1189
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1208
+#: ../src/protocols/jabber/jabber.c:1191
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1210
+#: ../src/protocols/jabber/jabber.c:1193
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1212
+#: ../src/protocols/jabber/jabber.c:1195
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: src/protocols/jabber/jabber.c:1216
+#: ../src/protocols/jabber/jabber.c:1199
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1218
+#: ../src/protocols/jabber/jabber.c:1201
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1205
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1224
+#: ../src/protocols/jabber/jabber.c:1207
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1226
+#: ../src/protocols/jabber/jabber.c:1209
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1228
+#: ../src/protocols/jabber/jabber.c:1211
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: src/protocols/jabber/jabber.c:1230
+#: ../src/protocols/jabber/jabber.c:1213
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/jabber/jabber.c:1232
+#: ../src/protocols/jabber/jabber.c:1215
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1234
+#: ../src/protocols/jabber/jabber.c:1217
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1241
+#: ../src/protocols/jabber/jabber.c:1224
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1243
+#: ../src/protocols/jabber/jabber.c:1226
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1246
+#: ../src/protocols/jabber/jabber.c:1229
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1249
+#: ../src/protocols/jabber/jabber.c:1232
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1252
+#: ../src/protocols/jabber/jabber.c:1235
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1240
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1242
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1246
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1248
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1268
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
+#: ../src/protocols/jabber/jabber.c:1253 ../src/protocols/silc/ops.c:1519
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1272
+#: ../src/protocols/jabber/jabber.c:1255
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1274
+#: ../src/protocols/jabber/jabber.c:1257
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1276
+#: ../src/protocols/jabber/jabber.c:1259
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1280
+#: ../src/protocols/jabber/jabber.c:1263
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: src/protocols/jabber/jabber.c:1282
+#: ../src/protocols/jabber/jabber.c:1265
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: src/protocols/jabber/jabber.c:1284
+#: ../src/protocols/jabber/jabber.c:1267
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1286
+#: ../src/protocols/jabber/jabber.c:1269
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: src/protocols/jabber/jabber.c:1290
+#: ../src/protocols/jabber/jabber.c:1273
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1292
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: src/protocols/jabber/jabber.c:1294
+#: ../src/protocols/jabber/jabber.c:1277
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: src/protocols/jabber/jabber.c:1296
+#: ../src/protocols/jabber/jabber.c:1279
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: src/protocols/jabber/jabber.c:1298
+#: ../src/protocols/jabber/jabber.c:1281
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: src/protocols/jabber/jabber.c:1300
+#: ../src/protocols/jabber/jabber.c:1283
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: src/protocols/jabber/jabber.c:1302
+#: ../src/protocols/jabber/jabber.c:1285
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1287
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/jabber/jabber.c:1289
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1308
+#: ../src/protocols/jabber/jabber.c:1291
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1310
+#: ../src/protocols/jabber/jabber.c:1293
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1295
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1379
+#: ../src/protocols/jabber/jabber.c:1362
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1431
+#: ../src/protocols/jabber/jabber.c:1414
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1457
+#: ../src/protocols/jabber/jabber.c:1440
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1470
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1475
+#: ../src/protocols/jabber/jabber.c:1458
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1481
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1487
+#: ../src/protocols/jabber/jabber.c:1470
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1493
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1476
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;用户&gt; [房间]: 邀请用户加入房间。"
-
-#: src/protocols/jabber/jabber.c:1499
+msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
+
+#: ../src/protocols/jabber/jabber.c:1482
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1488
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1510
+#: ../src/protocols/jabber/jabber.c:1493
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
 
+#: ../src/protocols/jabber/jabber.c:1508
+msgid "Hide Operating System"
+msgstr "隐藏操作系统"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6327,395 +6389,384 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
+#: ../src/protocols/jabber/jabber.c:1595 ../src/protocols/jabber/jabber.c:1597
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1618
+#: ../src/protocols/jabber/jabber.c:1620
+msgid "Resource"
+msgstr "资源"
+
+#: ../src/protocols/jabber/jabber.c:1623
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1623
-msgid "Require TLS"
-msgstr "需要 TLS"
-
-#: src/protocols/jabber/jabber.c:1626
-msgid "Force old (port 5223) SSL"
-msgstr "强制旧 SSL(5223 端口)"
-
-#: src/protocols/jabber/jabber.c:1631
+#: ../src/protocols/jabber/jabber.c:1628
+msgid "Force old SSL"
+msgstr "强制旧 SSL"
+
+#: ../src/protocols/jabber/jabber.c:1633
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
+#: ../src/protocols/jabber/jabber.c:1642 ../src/protocols/silc/silc.c:1592
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "来自 %s 的消息"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "话题为: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Jabber 消息错误"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (代码 %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "用户 %s 想要将 %s 添加为好友。"
-
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
-#: src/protocols/yahoo/yahoo.c:861
-msgid "Authorize"
-msgstr "同意"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
-#: src/protocols/yahoo/yahoo.c:863
-msgid "Deny"
-msgstr "拒绝"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:293
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "用户 %s 想要将您添加为好友。"
+
+#: ../src/protocols/jabber/presence.c:348
+#: ../src/protocols/jabber/presence.c:349
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:347
+#: ../src/protocols/jabber/presence.c:350
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:349
+#: ../src/protocols/jabber/presence.c:352
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:351
+#: ../src/protocols/jabber/presence.c:354
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:384
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:387
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:594
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:595 ../src/protocols/jabber/si.c:596
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:91
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "%s (%s) 的好友列表同步问题"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:97
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"本地列表中的 %s 位于组“%s”中,但未出现在服务器列表中。您是否想要添加此好友?"
-
-#: src/protocols/msn/dialog.c:105
+"%s 出现于组“%s”的本地列表中,但并未出现于服务器列表。您想要添加此好友吗?"
+
+#: ../src/protocols/msn/dialog.c:105
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr "本地列表中的 %s 未出现在服务器列表中。您是否想要添加此好友?"
-
-#: src/protocols/msn/error.c:35
+msgstr "%s 位于本地列表但并未出现于服务器列表。您想要添加此好友吗?"
+
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "无法处理消息"
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "错误(可能是 Gaim 的 bug)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "无效的电子邮件地址"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "用户不存在"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "缺少全称域名"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "已登入"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "用户名无效"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "友好的名称无效"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "列表满"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "已列出"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:686
 msgid "User is offline"
 msgstr "用户离线"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "已在模式中"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "已在相对列表"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "组太多"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "无效的组"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "用户未在组中"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "组名太长"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "无法删除零组"
 
-#: src/protocols/msn/error.c:95
+#: ../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:99
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "通知传送失败"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "缺少必需域"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:193
 msgid "Not logged in"
 msgstr "未登入"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "服务暂时不可用"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "数据库服务器错误"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "命令已禁用"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "文件操作错误"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "内存分配错误"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "给服务器发送的 CHL 值错误"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "服务器忙"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "点通知服务器维护中"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "数据库连接错误"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "服务器即将维护"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "会话过载"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "用户太活跃"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "会话太多"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Passport 未验证"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "未期待"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "友好的名称更改太频繁"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
-#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2273
+#: ../src/protocols/silc/ops.c:1508 ../src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "没有父母在的儿童 Passport"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "无效的票证"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的错误代码 %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#: src/protocols/msn/msn.c:114
+#: ../src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:222
+#: ../src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:223
+#: ../src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:239
+#: ../src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:254
+#: ../src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:269
+#: ../src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:282
+#: ../src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:283
+#: ../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?"
@@ -6723,25 +6774,24 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:287
+#: ../src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:288
+#: ../src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:313
+#: ../src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
-#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
-#: src/protocols/yahoo/yahoo.c:2762
+#: ../src/protocols/msn/msn.c:489 ../src/protocols/msn/msn.c:497
+#: ../src/protocols/msn/msn.c:500 ../src/protocols/yahoo/yahoo.c:2903
 #, c-format
 msgid ""
 "\n"
@@ -6750,75 +6800,84 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:508
+#: ../src/protocols/msn/msn.c:497
 msgid "Has you"
 msgstr "有你"
 
-#: src/protocols/msn/msn.c:511
+#: ../src/protocols/msn/msn.c:500
 msgid "Blocked"
 msgstr "被屏蔽"
 
-#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
+#: ../src/protocols/msn/msn.c:514 ../src/protocols/msn/msn.c:801
+#: ../src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "远离电脑"
+
+#: ../src/protocols/msn/msn.c:515 ../src/protocols/msn/msn.c:803
+#: ../src/protocols/msn/state.c:33 ../src/protocols/yahoo/yahoo.c:2760
+#: ../src/protocols/yahoo/yahoo.c:3127 ../src/protocols/yahoo/yahoo.c:3243
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
-#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
-#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
-#: src/protocols/yahoo/yahoo.c:3189
+#: ../src/protocols/msn/msn.c:516 ../src/protocols/msn/msn.c:805
+#: ../src/protocols/msn/state.c:31 ../src/protocols/novell/novell.c:2803
+#: ../src/protocols/novell/novell.c:2918 ../src/protocols/novell/novell.c:2972
+#: ../src/protocols/silc/buddy.c:1392 ../src/protocols/silc/silc.c:48
+#: ../src/protocols/silc/silc.c:83 ../src/protocols/yahoo/yahoo.c:2762
+#: ../src/protocols/yahoo/yahoo.c:3129 ../src/protocols/yahoo/yahoo.c:3244
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
+#: ../src/protocols/msn/msn.c:517 ../src/protocols/msn/msn.c:807
+#: ../src/protocols/msn/state.c:35 ../src/protocols/yahoo/yahoo.c:2770
+#: ../src/protocols/yahoo/yahoo.c:3137 ../src/protocols/yahoo/yahoo.c:3248
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
+#: ../src/protocols/msn/msn.c:518 ../src/protocols/msn/msn.c:809
+#: ../src/protocols/msn/state.c:36 ../src/protocols/yahoo/yahoo.c:2774
+#: ../src/protocols/yahoo/yahoo.c:3141 ../src/protocols/yahoo/yahoo.c:3250
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:158
+#: ../src/protocols/msn/msn.c:519 ../src/protocols/msn/msn.c:811
+#: ../src/protocols/zephyr/zephyr.c:2099 ../src/protocols/zephyr/zephyr.c:2131
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:570
+#: ../src/protocols/msn/msn.c:530
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:575
+#: ../src/protocols/msn/msn.c:535
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:579
+#: ../src/protocols/msn/msn.c:539
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:583
+#: ../src/protocols/msn/msn.c:543
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:589
+#: ../src/protocols/msn/msn.c:549
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:594
+#: ../src/protocols/msn/msn.c:554
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:617
+#: ../src/protocols/msn/msn.c:577
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
+#: ../src/protocols/msn/msn.c:586 ../src/protocols/novell/novell.c:3369
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
-#: src/protocols/msn/msn.c:663
+#: ../src/protocols/msn/msn.c:623
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6826,95 +6885,95 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:691
+#: ../src/protocols/msn/msn.c:651
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1309 ../src/protocols/yahoo/yahoo_profile.c:659
+#: ../src/protocols/zephyr/zephyr.c:717 ../src/protocols/zephyr/zephyr.c:1126
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1695
-#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
+#: ../src/protocols/msn/msn.c:1317 ../src/protocols/msn/msn.c:1675
+#: ../src/protocols/yahoo/yahoo_profile.c:1174 ../src/util.c:796
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1425
+#: ../src/protocols/msn/msn.c:1405
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
-#: src/protocols/yahoo/yahoo_profile.c:765
+#: ../src/protocols/msn/msn.c:1410 ../src/protocols/msn/msn.c:1662
+#: ../src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
-#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1024
+#: ../src/protocols/msn/msn.c:1481 ../src/protocols/oscar/oscar.c:5232
+#: ../src/protocols/trepia/trepia.c:286 ../src/protocols/trepia/trepia.c:405
+#: ../src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
-#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1034
+#: ../src/protocols/msn/msn.c:1488 ../src/protocols/oscar/oscar.c:5218
+#: ../src/protocols/trepia/trepia.c:280 ../src/protocols/trepia/trepia.c:407
+#: ../src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
+#: ../src/protocols/msn/msn.c:1497 ../src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1019
+#: ../src/protocols/msn/msn.c:1504 ../src/protocols/novell/novell.c:1445
+#: ../src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
+#: ../src/protocols/msn/msn.c:1512 ../src/protocols/yahoo/yahoo_profile.c:1037
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
-#: src/protocols/msn/msn.c:1577
+#: ../src/protocols/msn/msn.c:1529 ../src/protocols/msn/msn.c:1535
+#: ../src/protocols/msn/msn.c:1542 ../src/protocols/msn/msn.c:1550
+#: ../src/protocols/msn/msn.c:1557
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
+#: ../src/protocols/msn/msn.c:1566 ../src/protocols/msn/msn.c:1572
+#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1586
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
-#: src/protocols/msn/msn.c:1628
+#: ../src/protocols/msn/msn.c:1595 ../src/protocols/msn/msn.c:1601
+#: ../src/protocols/msn/msn.c:1608
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
-#: src/protocols/yahoo/yahoo_profile.c:1081
+#: ../src/protocols/msn/msn.c:1617 ../src/protocols/msn/msn.c:1623
+#: ../src/protocols/yahoo/yahoo_profile.c:1079
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1651
+#: ../src/protocols/msn/msn.c:1631
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
-#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
+#: ../src/protocols/msn/msn.c:1642 ../src/protocols/silc/ops.c:844
+#: ../src/protocols/trepia/trepia.c:290 ../src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "主页"
 
-#: src/protocols/msn/msn.c:1684
+#: ../src/protocols/msn/msn.c:1664
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1685
+#: ../src/protocols/msn/msn.c:1665
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6923,16 +6982,24 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1689
+#: ../src/protocols/msn/msn.c:1669
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
+#: ../src/protocols/msn/msn.c:1675 ../src/protocols/yahoo/yahoo_profile.c:1174
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
+#: ../src/protocols/msn/msn.c:1816
+msgid "Display conversation closed notices"
+msgstr "显示对话关闭通知"
+
+#: ../src/protocols/msn/msn.c:1821
+msgid "Display timeout notices"
+msgstr "显示超时通知"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6943,72 +7010,72 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
+#: ../src/protocols/msn/msn.c:1908 ../src/protocols/msn/msn.c:1910
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
+#: ../src/protocols/msn/msn.c:1929 ../src/protocols/trepia/trepia.c:1296
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1929
+#: ../src/protocols/msn/msn.c:1938
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1350
+#: ../src/protocols/msn/nexus.c:103 ../src/protocols/msn/servconn.c:127
+#: ../src/protocols/yahoo/yahoochat.c:1394
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是有效的组名。"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:523 ../src/protocols/msn/session.c:349
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s(%3$s) 上的 %1$s"
 
-#: src/protocols/msn/notification.c:496
+#: ../src/protocols/msn/notification.c:493
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "无法在 %s(%s) 上添加用户"
-
-#: src/protocols/msn/notification.c:500
+msgstr "无法添加 %s (%s) 上的用户"
+
+#: ../src/protocols/msn/notification.c:497
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "无法在 %s(%s) 上屏蔽用户"
-
-#: src/protocols/msn/notification.c:504
+msgstr "无法屏蔽 %s (%s) 上的用户"
+
+#: ../src/protocols/msn/notification.c:501
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "无法允许 %s(%s) 上的拥护"
-
-#: src/protocols/msn/notification.c:512
+msgstr "无法允许 %s (%s) 上的用户"
+
+#: ../src/protocols/msn/notification.c:509
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "无法添加 %s,原因是您的好友列表已满。"
-
-#: src/protocols/msn/notification.c:521
+msgstr "无法添加 %s,因为您的好友列表已满。"
+
+#: ../src/protocols/msn/notification.c:518
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s 不是有效的通行证账户。"
-
-#: src/protocols/msn/notification.c:809
+msgstr "%s 不是有效的 Passport 账户。"
+
+#: ../src/protocols/msn/notification.c:805
 msgid "Unable to rename group"
 msgstr "无法重命名组"
 
-#: src/protocols/msn/notification.c:864
+#: ../src/protocols/msn/notification.c:860
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: src/protocols/msn/notification.c:1297
+#: ../src/protocols/msn/notification.c:1287
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7030,187 +7097,178 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:129
 msgid "Writing error"
 msgstr "写入错误"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:131
 msgid "Reading error"
 msgstr "读取错误"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4296
+#: ../src/protocols/msn/servconn.c:133 ../src/protocols/msn/session.c:341
+#: ../src/protocols/oscar/oscar.c:4210
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/protocols/msn/servconn.c:136
+#: ../src/protocols/msn/servconn.c:136
 #, c-format
 msgid ""
 "Connection error from %s server (%s):\n"
 "%s"
 msgstr ""
-"%s 服务器(%s)的连接错误:\n"
+"%s 服务器的连接错误(%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:319
 msgid "Our protocol is not supported by the server."
 msgstr "服务器不支持此协议。"
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:323
 msgid "Error parsing HTTP."
 msgstr "分析 HTTP 出错。"
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
-#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
+#: ../src/protocols/msn/session.c:327
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/session.c:328
+#: ../src/protocols/msn/session.c:330
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:335
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:339
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "无法通过身份验证: %s"
-
-#: src/protocols/msn/session.c:342
+msgstr "无法进行身份验证: %s"
+
+#: ../src/protocols/msn/session.c:344
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:365 ../src/protocols/msn/session.c:367
 msgid "Handshaking"
 msgstr "握手"
 
-#: src/protocols/msn/session.c:364
+#: ../src/protocols/msn/session.c:366
 msgid "Transferring"
 msgstr "文件传送"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:368
 msgid "Starting authentication"
-msgstr "开始身份验证"
-
-#: src/protocols/msn/session.c:367
+msgstr "开始验证身份"
+
+#: ../src/protocols/msn/session.c:369
 msgid "Getting cookie"
 msgstr "获得 cookie"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:371
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
+#: ../src/protocols/msn/session.c:372 ../src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
-msgstr "正在获取好友列表"
-
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "远离电脑"
-
-#: src/protocols/msn/switchboard.c:405
+msgstr "获取好友列表"
+
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "消息未发出,因为发生了超时:"
 
-#: src/protocols/msn/switchboard.c:413
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "消息未发出,隐身时不允许:"
 
-#: src/protocols/msn/switchboard.c:417
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "消息未发出,因为用户离线:"
 
-#: src/protocols/msn/switchboard.c:421
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "消息未发出,因为发生了连接错误:"
 
-#: src/protocols/msn/switchboard.c:425
+#: ../src/protocols/msn/switchboard.c:421
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "消息未发出,因为切换板发生了错误:"
 
-#: src/protocols/msn/switchboard.c:433
+#: ../src/protocols/msn/switchboard.c:429
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出,因为发生了未知错误:"
 
-#: src/protocols/msn/switchboard.c:689
+#: ../src/protocols/msn/switchboard.c:678
+msgid "The conversation has become inactive and timed out."
+msgstr "对话已停止并超时。"
+
+#: ../src/protocols/msn/switchboard.c:697
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/userlist.c:85
+#: ../src/protocols/msn/userlist.c:87
 #, 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:276
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+#: ../src/protocols/msn/userlist.c:96
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "用户 %s 想要将 %s 添加为好友。"
 
-#: src/protocols/msn/userlist.c:340
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:655
-#, fuzzy, c-format
+#: ../src/protocols/msn/userlist.c:627
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "无法读取文件 %s。"
-
-#: src/protocols/msn/userlist.c:657
-#, fuzzy
+msgstr "无法添加“%s”。"
+
+#: ../src/protocols/msn/userlist.c:629
 msgid "The screen name specified is invalid."
-msgstr "输入的 SecurID 密钥无效。"
-
-#: src/protocols/napster/napster.c:260
+msgstr "指定的用户名无效。"
+
+#: ../src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:255
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "无法从服务器 %s 读取信息。命令为 %hd,长度为 %hd。"
 
-#: src/protocols/napster/napster.c:290
-msgid "Unknown server error."
-msgstr "未知服务器错误。"
-
-#: src/protocols/napster/napster.c:339
+#: ../src/protocols/napster/napster.c:318
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数: %s,文件数: %s,大小: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: ../src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
+#: ../src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
+#: ../src/protocols/napster/napster.c:433
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
+
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:455
+#: ../src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:554 ../src/protocols/toc/toc.c:1268
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -7224,246 +7282,247 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
+#: ../src/protocols/napster/napster.c:652
+#: ../src/protocols/napster/napster.c:654
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "请求的参数未传入"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "无法写入网络"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "无法从网络读取套接字"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "与服务器通讯出错"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "会议未找到"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "会议不存在"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "已存在同名文件夹"
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "支持"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "密码已过期"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "无效的密码"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "用户未找到"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "账户已经被禁用"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "服务器无法访问目录"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系统管理员已经禁用此操作"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "服务器不可用;请稍候再试"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "无法为同一个文件夹添加两次联系人"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "无法添加您自己"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "无效的用户名或密码"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"
 
-#: src/protocols/novell/nmuser.c:1932
+#: ../src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr "您的账户已经被禁用,原因是输错密码的次数太多"
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您无法将同一个人两次添加到对话"
 
-#: src/protocols/novell/nmuser.c:1939
+#: ../src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您达到了所允许联系人的最大数目"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "您输入了无效的用户名"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "更新目录时发生了错误"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "不兼容的协议版本"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "用户已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "试用版本不允许超过十个用户同时在线"
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "用户或者离线,或者已经屏蔽了您"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "登录失败(%s)。"
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "无法发送消息。无法获得用户的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:381
+#: ../src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "无法将 %s 添加到您的好友列表中(%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "无法发送消息(%s)。"
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:476 ../src/protocols/novell/novell.c:970
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "无法邀请用户(%s)。"
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "无法给 %s 发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "无法发送消息。无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:617
+#: ../src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(%s)。"
 
-#: src/protocols/novell/novell.c:690
+#: ../src/protocols/novell/novell.c:688
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "无法获得用户 %s 的详细信息(%s)。"
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:734 ../src/protocols/novell/novell.c:880
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "无法将用户添加到您的隐私列表中(%s)。"
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:781
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "无法将“%s”添加到您的好友列表中(%s)。"
 
-#: src/protocols/novell/novell.c:836
+#: ../src/protocols/novell/novell.c:834
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "无法将 %s 添加到您的许可列表中(%s)。"
 
-#: src/protocols/novell/novell.c:904
+#: ../src/protocols/novell/novell.c:902
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
+#: ../src/protocols/novell/novell.c:925 ../src/protocols/novell/novell.c:1620
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:997
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "无法创建会议(%s)。"
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
+#: ../src/protocols/novell/novell.c:1108 ../src/protocols/novell/novell.c:1659
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1443
 msgid "Telephone Number"
 msgstr "电话号码"
 
-#: src/protocols/novell/novell.c:1456
+#: ../src/protocols/novell/novell.c:1447
 msgid "Department"
 msgstr "部门"
 
-#: src/protocols/novell/novell.c:1458
+#: ../src/protocols/novell/novell.c:1449
 msgid "Personal Title"
 msgstr "个人称谓"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1453
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
-#: src/protocols/oscar/oscar.c:5323
+#: ../src/protocols/novell/novell.c:1455 ../src/protocols/oscar/oscar.c:5205
+#: ../src/protocols/oscar/oscar.c:5212
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1471
 msgid "User ID"
 msgstr "用户 ID"
 
@@ -7474,46 +7533,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1485
 msgid "Full name"
 msgstr "全名"
 
-#: src/protocols/novell/novell.c:1515
+#: ../src/protocols/novell/novell.c:1506
 msgid "User Properties"
 msgstr "用户属性"
 
-#: src/protocols/novell/novell.c:1619
+#: ../src/protocols/novell/novell.c:1610
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1635
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: src/protocols/novell/novell.c:1674
+#: ../src/protocols/novell/novell.c:1665
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "处理事件或响应出错(%s)。"
 
-#: src/protocols/novell/novell.c:1708
+#: ../src/protocols/novell/novell.c:1699
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: src/protocols/novell/novell.c:1723
+#: ../src/protocols/novell/novell.c:1714
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: src/protocols/novell/novell.c:1858
+#: ../src/protocols/novell/novell.c:1849
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1876
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: src/protocols/novell/novell.c:1887
+#: ../src/protocols/novell/novell.c:1877
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7524,15 +7583,15 @@
 "\n"
 "发出时间: %s"
 
-#: src/protocols/novell/novell.c:1889
+#: ../src/protocols/novell/novell.c:1879
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-#: src/protocols/novell/novell.c:1996
+#: ../src/protocols/novell/novell.c:1985
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: src/protocols/novell/novell.c:2052
+#: ../src/protocols/novell/novell.c:2039
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7542,22 +7601,30 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2150
+#: ../src/protocols/novell/novell.c:2137
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: src/protocols/novell/novell.c:2172
+#: ../src/protocols/novell/novell.c:2159
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: src/protocols/novell/novell.c:2476
+#: ../src/protocols/novell/novell.c:2463
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2957 src/protocols/novell/novell.c:3045
-#: src/protocols/yahoo/yahoo.c:2808
+#: ../src/protocols/novell/novell.c:2809 ../src/protocols/oscar/oscar.c:739
+#: ../src/protocols/oscar/oscar.c:6809 ../src/protocols/yahoo/yahoo.c:2782
+msgid "Offline"
+msgstr "离线"
+
+#: ../src/protocols/novell/novell.c:2820
+msgid "Message"
+msgstr "消息"
+
+#: ../src/protocols/novell/novell.c:2919 ../src/protocols/novell/novell.c:2975
 msgid "Appear Offline"
 msgstr "显示为离线"
 
@@ -7571,296 +7638,295 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
+#: ../src/protocols/novell/novell.c:3468 ../src/protocols/novell/novell.c:3470
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3559
+#: ../src/protocols/novell/novell.c:3489
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3563
+#: ../src/protocols/novell/novell.c:3493
 msgid "Server port"
 msgstr "服务器端口"
 
-#: src/protocols/oscar/oscar.c:196
+#: ../src/protocols/oscar/oscar.c:189
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:197
+#: ../src/protocols/oscar/oscar.c:190
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:198
+#: ../src/protocols/oscar/oscar.c:191
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:199
+#: ../src/protocols/oscar/oscar.c:192
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:201
+#: ../src/protocols/oscar/oscar.c:194
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:195
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:196
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:197
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:198
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:199
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:200
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:201
 msgid "Responses lost"
 msgstr "响应丢失"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:202
 msgid "Request denied"
 msgstr "请求被禁止"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:203
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:204
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:205
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:206
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:207
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:208
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:209
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:210
 msgid "List overflow"
 msgstr "列表溢出"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:211
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:212
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:213
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
+#: ../src/protocols/oscar/oscar.c:409 ../src/protocols/oscar/oscar.c:492
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
-#: src/protocols/oscar/oscar.c:607
+#: ../src/protocols/oscar/oscar.c:594
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:610
+#: ../src/protocols/oscar/oscar.c:597
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:600 ../src/protocols/silc/silc.c:654
+#: ../src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
+#: ../src/protocols/oscar/oscar.c:603 ../src/protocols/oscar/oscar.c:7111
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:623
+#: ../src/protocols/oscar/oscar.c:610
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:626
+#: ../src/protocols/oscar/oscar.c:613
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:629
+#: ../src/protocols/oscar/oscar.c:616
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:619
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:622
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:625
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:631
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:634
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:637
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:640
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:643
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:646
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:649
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:666
+#: ../src/protocols/oscar/oscar.c:653
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:669
+#: ../src/protocols/oscar/oscar.c:656
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:672
+#: ../src/protocols/oscar/oscar.c:659
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
+#: ../src/protocols/oscar/oscar.c:677 ../src/protocols/oscar/oscar.c:5814
+#: ../src/protocols/oscar/oscar.c:7003
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
+#: ../src/protocols/oscar/oscar.c:681 ../src/protocols/oscar/oscar.c:5808
+#: ../src/protocols/oscar/oscar.c:7001
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
+#: ../src/protocols/oscar/oscar.c:683 ../src/protocols/oscar/oscar.c:5811
+#: ../src/protocols/oscar/oscar.c:7002
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:700
+#: ../src/protocols/oscar/oscar.c:687
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
-msgid "Warning Level"
-msgstr "警告级别"
-
-#: src/protocols/oscar/oscar.c:785
+#: ../src/protocols/oscar/oscar.c:755
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:794
+#: ../src/protocols/oscar/oscar.c:764
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:951
+#: ../src/protocols/oscar/oscar.c:899
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:953
+#: ../src/protocols/oscar/oscar.c:901
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:961
+#: ../src/protocols/oscar/oscar.c:908
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
+#: ../src/protocols/oscar/oscar.c:985 ../src/protocols/oscar/oscar.c:1116
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:1119
+#: ../src/protocols/oscar/oscar.c:1066
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
 
-#: src/protocols/oscar/oscar.c:1545
+#: ../src/protocols/oscar/oscar.c:1486
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1550
+#: ../src/protocols/oscar/oscar.c:1491
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1585
+#: ../src/protocols/oscar/oscar.c:1526
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1589
+#: ../src/protocols/oscar/oscar.c:1530
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
+#: ../src/protocols/oscar/oscar.c:1534 ../src/protocols/oscar/oscar.c:3644
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1657
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "您已经丢失与聊天室 %s 的连接。"
-
-#: src/protocols/oscar/oscar.c:1680
+#: ../src/protocols/oscar/oscar.c:1601 ../src/protocols/toc/toc.c:874
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "您已经断开与聊天室 %s 的连接。"
+
+#: ../src/protocols/oscar/oscar.c:1620
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1749
+#: ../src/protocols/oscar/oscar.c:1701
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1773
+#: ../src/protocols/oscar/oscar.c:1715
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7870,51 +7936,52 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1802
+#: ../src/protocols/oscar/oscar.c:1743
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
+#: ../src/protocols/oscar/oscar.c:1845 ../src/protocols/oscar/oscar.c:2366
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1914
+#: ../src/protocols/oscar/oscar.c:1853
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:2027
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:1964
+#, c-format
 msgid "Transfer of file %s timed out."
-msgstr "文件 %s 传送完成"
-
-#: src/protocols/oscar/oscar.c:2106 src/protocols/yahoo/yahoo_filexfer.c:177
-#: src/protocols/yahoo/yahoo_filexfer.c:186
-#: src/protocols/yahoo/yahoo_filexfer.c:195
+msgstr "文件 %s 传送超时。"
+
+#: ../src/protocols/oscar/oscar.c:2048
+#: ../src/protocols/yahoo/yahoo_filexfer.c:177
+#: ../src/protocols/yahoo/yahoo_filexfer.c:186
+#: ../src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:2111
+#: ../src/protocols/oscar/oscar.c:2053
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:2190
+#: ../src/protocols/oscar/oscar.c:2125
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2250 ../src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:2320
+#: ../src/protocols/oscar/oscar.c:2255
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2324
+#: ../src/protocols/oscar/oscar.c:2259
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2329
+#: ../src/protocols/oscar/oscar.c:2264
 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."
@@ -7922,33 +7989,33 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2334
+#: ../src/protocols/oscar/oscar.c:2269
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2365
+#: ../src/protocols/oscar/oscar.c:2301
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2435
+#: ../src/protocols/oscar/oscar.c:2373
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2459
+#: ../src/protocols/oscar/oscar.c:2397
 msgid "The SecurID key entered is invalid."
 msgstr "输入的 SecurID 密钥无效。"
 
-#: src/protocols/oscar/oscar.c:2473
+#: ../src/protocols/oscar/oscar.c:2411
 msgid "Enter SecurID"
 msgstr "输入 SecurID"
 
-#: src/protocols/oscar/oscar.c:2474
+#: ../src/protocols/oscar/oscar.c:2412
 msgid "Enter the 6 digit number from the digital display."
-msgstr "输入所显示的六位数字。"
-
-#: src/protocols/oscar/oscar.c:2514 src/protocols/oscar/oscar.c:2544
-#: src/protocols/oscar/oscar.c:2633
+msgstr "输入显示的六位数字。"
+
+#: ../src/protocols/oscar/oscar.c:2452 ../src/protocols/oscar/oscar.c:2482
+#: ../src/protocols/oscar/oscar.c:2571
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7956,24 +8023,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2547
+#: ../src/protocols/oscar/oscar.c:2455 ../src/protocols/oscar/oscar.c:2485
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2636
+#: ../src/protocols/oscar/oscar.c:2574
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:2667
+#: ../src/protocols/oscar/oscar.c:2606
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/oscar/oscar.c:3722
+#: ../src/protocols/oscar/oscar.c:3636
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3725
+#: ../src/protocols/oscar/oscar.c:3639
 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 "
@@ -7982,53 +8049,54 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3764
+#: ../src/protocols/oscar/oscar.c:3677
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3772
+#: ../src/protocols/oscar/oscar.c:3685
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3773
+#: ../src/protocols/oscar/oscar.c:3686
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3803
+#: ../src/protocols/oscar/oscar.c:3716
 #, 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:3808 src/protocols/oscar/oscar.c:3810
+#: ../src/protocols/oscar/oscar.c:3721 ../src/protocols/oscar/oscar.c:3723
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
-#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
-#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
+#: ../src/protocols/oscar/oscar.c:3771 ../src/protocols/oscar/oscar.c:3773
+#: ../src/protocols/oscar/oscar.c:3780 ../src/protocols/oscar/oscar.c:3877
+#: ../src/protocols/oscar/oscar.c:3897 ../src/protocols/oscar/oscar.c:6444
+#: ../src/protocols/oscar/oscar.c:6490
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3853
+#: ../src/protocols/oscar/oscar.c:3779
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3961
-#, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
+#: ../src/protocols/oscar/oscar.c:3877
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %u 想要将 %s 加为他/她的好友,理由如下:\n"
+"用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
+#: ../src/protocols/oscar/oscar.c:3885 ../src/protocols/oscar/oscar.c:6450
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3983
+#: ../src/protocols/oscar/oscar.c:3897
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8038,17 +8106,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3984
+#: ../src/protocols/oscar/oscar.c:3898
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3991
+#: ../src/protocols/oscar/oscar.c:3905
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3999
+#: ../src/protocols/oscar/oscar.c:3913
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8061,7 +8129,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4007
+#: ../src/protocols/oscar/oscar.c:3921
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8074,7 +8142,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4015
+#: ../src/protocols/oscar/oscar.c:3929
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8087,32 +8155,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4036
+#: ../src/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4042
+#: ../src/protocols/oscar/oscar.c:3956
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:4046
+#: ../src/protocols/oscar/oscar.c:3960
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:4130
+#: ../src/protocols/oscar/oscar.c:4044
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
 
-#: src/protocols/oscar/oscar.c:4139
+#: ../src/protocols/oscar/oscar.c:4053
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
 
-#: src/protocols/oscar/oscar.c:4148
+#: ../src/protocols/oscar/oscar.c:4062
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8120,85 +8188,84 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:4157
+#: ../src/protocols/oscar/oscar.c:4071
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
 
-#: src/protocols/oscar/oscar.c:4166
+#: ../src/protocols/oscar/oscar.c:4080
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
 
-#: src/protocols/oscar/oscar.c:4175
+#: ../src/protocols/oscar/oscar.c:4089
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4229 src/protocols/oscar/oscar.c:4463
-#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
+#: ../src/protocols/oscar/oscar.c:4143 ../src/protocols/oscar/oscar.c:4375
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: src/protocols/oscar/oscar.c:4295
+#: ../src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4332
+#: ../src/protocols/oscar/oscar.c:4245
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
-#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
+#: ../src/protocols/oscar/oscar.c:4245 ../src/protocols/oscar/oscar.c:4250
+#: ../src/protocols/oscar/oscar.c:4308 ../src/protocols/oscar/oscar.c:4312
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4335
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "无法给 %s 发送消息:"
-
-#: src/protocols/oscar/oscar.c:4395
+#: ../src/protocols/oscar/oscar.c:4308
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:4398
+#: ../src/protocols/oscar/oscar.c:4311
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4425
+#: ../src/protocols/oscar/oscar.c:4333
+msgid "Warning Level"
+msgstr "警告级别"
+
+#: ../src/protocols/oscar/oscar.c:4337
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
+#: ../src/protocols/oscar/oscar.c:4342
+#: ../src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4514
+#: ../src/protocols/oscar/oscar.c:4426
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4700
+#: ../src/protocols/oscar/oscar.c:4612
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4925
+#: ../src/protocols/oscar/oscar.c:4837
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4926
+#: ../src/protocols/oscar/oscar.c:4838
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8206,155 +8273,162 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4997
+#: ../src/protocols/oscar/oscar.c:4901
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
+
+#: ../src/protocols/oscar/oscar.c:4903
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:5010 src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "您已经断开与聊天室 %s 的连接。"
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5035
+#: ../src/protocols/oscar/oscar.c:4934
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:5217 ../src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
-#: src/protocols/trepia/trepia.c:408
+#: ../src/protocols/oscar/oscar.c:5218
+msgid "Not specified"
+msgstr "未指定"
+
+#: ../src/protocols/oscar/oscar.c:5219 ../src/protocols/trepia/trepia.c:282
+#: ../src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:408
+#: ../src/protocols/oscar/oscar.c:5219 ../src/protocols/trepia/trepia.c:281
+#: ../src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:5346
+#: ../src/protocols/oscar/oscar.c:5235
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5350
+#: ../src/protocols/oscar/oscar.c:5239
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:5355
+#: ../src/protocols/oscar/oscar.c:5244
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
+#: ../src/protocols/oscar/oscar.c:5248 ../src/protocols/oscar/oscar.c:5256
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:5363
+#: ../src/protocols/oscar/oscar.c:5252
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:5371
+#: ../src/protocols/oscar/oscar.c:5260
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:5372
+#: ../src/protocols/oscar/oscar.c:5261
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:5373
+#: ../src/protocols/oscar/oscar.c:5262
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:5374
+#: ../src/protocols/oscar/oscar.c:5263
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:5376
+#: ../src/protocols/oscar/oscar.c:5265
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5275
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:5435
+#: ../src/protocols/oscar/oscar.c:5324
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5457
+#: ../src/protocols/oscar/oscar.c:5345
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5482
+#: ../src/protocols/oscar/oscar.c:5349
+msgid "Search Results"
+msgstr "搜索结果"
+
+#: ../src/protocols/oscar/oscar.c:5366
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5503
+#: ../src/protocols/oscar/oscar.c:5387
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5505
+#: ../src/protocols/oscar/oscar.c:5389
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5536
+#: ../src/protocols/oscar/oscar.c:5420
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5539
+#: ../src/protocols/oscar/oscar.c:5423
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#: src/protocols/oscar/oscar.c:5542
+#: ../src/protocols/oscar/oscar.c:5426
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名以空格结尾。"
 
-#: src/protocols/oscar/oscar.c:5545
+#: ../src/protocols/oscar/oscar.c:5429
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "错误 0x%04x: 无法格式化用户名,原因是请求的用户名太长。"
 
-#: src/protocols/oscar/oscar.c:5548
+#: ../src/protocols/oscar/oscar.c:5432
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: src/protocols/oscar/oscar.c:5551
+#: ../src/protocols/oscar/oscar.c:5435
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:5438
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "错误 0x%04x: 无法更改电子邮件地址,原因是给定的地址无效。"
 
-#: src/protocols/oscar/oscar.c:5557
+#: ../src/protocols/oscar/oscar.c:5441
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5567
+#: ../src/protocols/oscar/oscar.c:5451
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8363,25 +8437,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
+#: ../src/protocols/oscar/oscar.c:5452 ../src/protocols/oscar/oscar.c:5459
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5573
+#: ../src/protocols/oscar/oscar.c:5457
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5640
+#: ../src/protocols/oscar/oscar.c:5522
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5780
+#: ../src/protocols/oscar/oscar.c:5663
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5781
+#: ../src/protocols/oscar/oscar.c:5664
 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 "
@@ -8390,7 +8464,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5808
+#: ../src/protocols/oscar/oscar.c:5691
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8400,15 +8474,19 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5813
+#: ../src/protocols/oscar/oscar.c:5696
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5843
+#: ../src/protocols/oscar/oscar.c:5712 ../src/protocols/oscar/oscar.c:7008
+msgid "Visible"
+msgstr "显身"
+
+#: ../src/protocols/oscar/oscar.c:5730
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5844
+#: ../src/protocols/oscar/oscar.c:5731
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8417,7 +8495,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5891
+#: ../src/protocols/oscar/oscar.c:5771
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8429,11 +8507,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:5776
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5994
+#: ../src/protocols/oscar/oscar.c:5853
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8443,16 +8521,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
-#: src/protocols/oscar/oscar.c:6408
+#: ../src/protocols/oscar/oscar.c:5855 ../src/protocols/oscar/oscar.c:6310
+#: ../src/protocols/oscar/oscar.c:6324
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/oscar/oscar.c:6022
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:6101
+#: ../src/protocols/oscar/oscar.c:6023
 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 "
@@ -8461,13 +8539,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6286
-#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
-#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
+#: ../src/protocols/oscar/oscar.c:6205 ../src/protocols/oscar/oscar.c:6206
+#: ../src/protocols/oscar/oscar.c:6211 ../src/protocols/oscar/oscar.c:6368
+#: ../src/protocols/oscar/oscar.c:6369 ../src/protocols/oscar/oscar.c:6374
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:6392
+#: ../src/protocols/oscar/oscar.c:6308
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8475,11 +8553,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:6392 src/protocols/oscar/oscar.c:6406
+#: ../src/protocols/oscar/oscar.c:6308 ../src/protocols/oscar/oscar.c:6322
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6406
+#: ../src/protocols/oscar/oscar.c:6322
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8489,38 +8567,38 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6489
+#: ../src/protocols/oscar/oscar.c:6405
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
 
-#: src/protocols/oscar/oscar.c:6495
+#: ../src/protocols/oscar/oscar.c:6411
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6538
-#, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
+#: ../src/protocols/oscar/oscar.c:6444
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %s 想要将 %s 加为好友,原因如下:\n"
+"用户 %s 想要将您加为好友,原因如下:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6583
+#: ../src/protocols/oscar/oscar.c:6486
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6584
+#: ../src/protocols/oscar/oscar.c:6487
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6587
+#: ../src/protocols/oscar/oscar.c:6490
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8530,92 +8608,76 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6588
+#: ../src/protocols/oscar/oscar.c:6491
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:6528 ../src/protocols/toc/toc.c:1273
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6664
+#: ../src/protocols/oscar/oscar.c:6566
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6731
+#: ../src/protocols/oscar/oscar.c:6655
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6866
+#: ../src/protocols/oscar/oscar.c:6781
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:7153
+#: ../src/protocols/oscar/oscar.c:7067
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:7154
+#: ../src/protocols/oscar/oscar.c:7068
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:7173
+#: ../src/protocols/oscar/oscar.c:7087
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:7179
+#: ../src/protocols/oscar/oscar.c:7093
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:7191
+#: ../src/protocols/oscar/oscar.c:7105
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7208
+#: ../src/protocols/oscar/oscar.c:7122
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7268
-msgid "Require authorization"
-msgstr "请求认证"
-
-#: src/protocols/oscar/oscar.c:7271
-msgid "Hide IP address"
-msgstr "隐藏 IP 地址"
-
-#: src/protocols/oscar/oscar.c:7274
-msgid "Web aware"
-msgstr "Web 状态"
-
-#: src/protocols/oscar/oscar.c:7279
-msgid "ICQ Privacy Options"
-msgstr "ICQ 隐私选项"
-
-#: src/protocols/oscar/oscar.c:7296
+#: ../src/protocols/oscar/oscar.c:7152
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7297
+#: ../src/protocols/oscar/oscar.c:7153
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:7304
+#: ../src/protocols/oscar/oscar.c:7160
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:7356
+#: ../src/protocols/oscar/oscar.c:7212
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:7401
+#: ../src/protocols/oscar/oscar.c:7257
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:7404
+#: ../src/protocols/oscar/oscar.c:7260
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:7405
+#: ../src/protocols/oscar/oscar.c:7261
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8623,80 +8685,78 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:7422
+#: ../src/protocols/oscar/oscar.c:7278
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:7423
+#: ../src/protocols/oscar/oscar.c:7279
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:7424
+#: ../src/protocols/oscar/oscar.c:7280
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7505 src/protocols/silc/silc.c:826
+#: ../src/protocols/oscar/oscar.c:7297
+msgid "Available Message:"
+msgstr "可用消息:"
+
+#: ../src/protocols/oscar/oscar.c:7298
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr "我正在工作,渴望被打扰 - 呼我!"
+
+#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/silc/silc.c:812
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7511
+#: ../src/protocols/oscar/oscar.c:7384
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
+#: ../src/protocols/oscar/oscar.c:7390
+msgid "Set Available Message..."
+msgstr "设置可用消息..."
+
+#: ../src/protocols/oscar/oscar.c:7395 ../src/protocols/silc/silc.c:808
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7522
+#: ../src/protocols/oscar/oscar.c:7400
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7526
+#: ../src/protocols/oscar/oscar.c:7404
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:7536
-msgid "Show privacy options..."
-msgstr "显示隐藏选项..."
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:7543
+#: ../src/protocols/oscar/oscar.c:7413
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7547
+#: ../src/protocols/oscar/oscar.c:7417
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7551
+#: ../src/protocols/oscar/oscar.c:7421
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7555
+#: ../src/protocols/oscar/oscar.c:7425
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7562
+#: ../src/protocols/oscar/oscar.c:7432
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7568
+#: ../src/protocols/oscar/oscar.c:7438
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7573
+#: ../src/protocols/oscar/oscar.c:7443
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:7643
-msgid "Use recent buddies group"
-msgstr "使用最近的好友组"
-
-#: src/protocols/oscar/oscar.c:7646
-msgid "Show how long you have been idle"
-msgstr "显示您睡了多长时间"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8707,77 +8767,77 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
+#: ../src/protocols/oscar/oscar.c:7591 ../src/protocols/oscar/oscar.c:7593
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7788
+#: ../src/protocols/oscar/oscar.c:7612
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7791
+#: ../src/protocols/oscar/oscar.c:7615
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:7618 ../src/protocols/zephyr/zephyr.c:2748
 msgid "Encoding"
 msgstr "编码"
 
-#: 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:338
+#: ../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:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "用户 %s 未出现于网络中"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c: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
+#: ../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
+#: ../src/protocols/silc/buddy.c:53
 msgid "Cannot perform the key agreement"
 msgstr "无法执行密钥协议"
 
-#: src/protocols/silc/buddy.c:110
+#: ../src/protocols/silc/buddy.c:110
 msgid "Error occurred during key agreement"
 msgstr "密钥协议中发生了错误"
 
-#: src/protocols/silc/buddy.c:114
+#: ../src/protocols/silc/buddy.c:114
 msgid "Key Agreement failed"
 msgstr "密钥协议失败"
 
-#: src/protocols/silc/buddy.c:119
+#: ../src/protocols/silc/buddy.c:119
 msgid "Timeout during key agreement"
 msgstr "密钥协议时超时"
 
-#: src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:124
 msgid "Key agreement was aborted"
 msgstr "密钥协议已中止"
 
-#: src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:129
 msgid "Key agreement is already started"
 msgstr "密钥协议已经开始"
 
-#: src/protocols/silc/buddy.c:134
+#: ../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
+#: ../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
+#: ../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
+#: ../src/protocols/silc/buddy.c:292
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8788,59 +8848,59 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/protocols/silc/buddy.c:305
+#: ../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
+#: ../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
+#: ../src/protocols/silc/buddy.c:417
 msgid "Cannot set IM key"
 msgstr "无法设定聊天密钥"
 
-#: src/protocols/silc/buddy.c:459
+#: ../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:1282 src/protocols/silc/ops.c:1293
+#: ../src/protocols/silc/buddy.c:506 ../src/protocols/silc/buddy.c:541
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1295
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
-#: src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/buddy.c:542 ../src/protocols/silc/ops.c:1285
+#: ../src/protocols/silc/ops.c:1296
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
+#: ../src/protocols/silc/buddy.c:629 ../src/protocols/silc/buddy.c:1553
 msgid "Show Public Key"
 msgstr "显示公钥"
 
-#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/buddy.c:630 ../src/protocols/silc/buddy.c:989
+#: ../src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1101
+#: ../src/protocols/silc/buddy.c:707 ../src/protocols/silc/ops.c:871
+#: ../src/protocols/silc/ops.c:943 ../src/protocols/silc/ops.c:1078
+#: ../src/protocols/silc/ops.c:1079 ../src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr "用户信息"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1102
+#: ../src/protocols/silc/buddy.c:708 ../src/protocols/silc/ops.c:944
+#: ../src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
-#: src/protocols/silc/buddy.c:729
+#: ../src/protocols/silc/buddy.c:729
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s 好友不可信"
 
-#: src/protocols/silc/buddy.c:732
+#: ../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."
@@ -8849,250 +8909,253 @@
 "钥。"
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1023
+#: ../src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr "打开..."
 
-#: src/protocols/silc/buddy.c:1032
+#: ../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
+#: ../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
+#: ../src/protocols/silc/buddy.c:1038
 msgid "Import..."
 msgstr "导入..."
 
-#: src/protocols/silc/buddy.c:1125
+#: ../src/protocols/silc/buddy.c:1125
 msgid "Select correct user"
 msgstr "选择正确用户"
 
-#: src/protocols/silc/buddy.c:1127
+#: ../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
+#: ../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:1410
+#: ../src/protocols/silc/buddy.c:1386
 msgid "Detached"
 msgstr "已脱离"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1390 ../src/protocols/silc/silc.c:49
+#: ../src/protocols/silc/silc.c:85
 msgid "Indisposed"
 msgstr "不舒服"
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
+#: ../src/protocols/silc/buddy.c:1394 ../src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/silc.c:87
 msgid "Wake Me Up"
 msgstr "叫醒我"
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
+#: ../src/protocols/silc/buddy.c:1396 ../src/protocols/silc/silc.c:46
+#: ../src/protocols/silc/silc.c:79
 msgid "Hyper Active"
 msgstr "多动"
 
-#: src/protocols/silc/buddy.c:1422
+#: ../src/protocols/silc/buddy.c:1398
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1405 ../src/protocols/silc/silc.c:629
+#: ../src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1407 ../src/protocols/silc/silc.c:631
+#: ../src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1409 ../src/protocols/silc/silc.c:633
+#: ../src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1411 ../src/protocols/silc/silc.c:635
+#: ../src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1413 ../src/protocols/silc/silc.c:637
+#: ../src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1415 ../src/protocols/silc/silc.c:639
+#: ../src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1417 ../src/protocols/silc/silc.c:641
+#: ../src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1419 ../src/protocols/silc/silc.c:643
+#: ../src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1421 ../src/protocols/silc/silc.c:645
+#: ../src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1423 ../src/protocols/silc/silc.c:647
+#: ../src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1425 ../src/protocols/silc/silc.c:649
+#: ../src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1457 ../src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "用户模式"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1466 ../src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
+#: ../src/protocols/silc/buddy.c:1470 ../src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "状态文本"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1480 ../src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1485 ../src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/ops.c:1016
+#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/silc.c:699
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1495 ../src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "地理位置"
 
-#: src/protocols/silc/buddy.c:1562
+#: ../src/protocols/silc/buddy.c:1538
 msgid "Reset IM Key"
 msgstr "重置聊天密钥"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1543
 msgid "IM with Key Exchange"
 msgstr "带密钥交换开聊"
 
-#: src/protocols/silc/buddy.c:1571
+#: ../src/protocols/silc/buddy.c:1547
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1583
+#: ../src/protocols/silc/buddy.c:1558
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
+#: ../src/protocols/silc/buddy.c:1564 ../src/protocols/silc/ops.c:1417
 msgid "Kill User"
 msgstr "杀死用户"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/chat.c:37
 msgid "_Passphrase:"
 msgstr "密码句(_P):"
 
-#: src/protocols/silc/chat.c:79
+#: ../src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:79 ../src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "频道信息"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>频道名称:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>用户数:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>频道创建人:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>频道密码句:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: ../src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>频道 HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: ../src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>频道话题:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: ../src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>频道模式:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>创建者密钥指纹:</b><br%s"
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>创建者密钥漏印:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: ../src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: src/protocols/silc/chat.c:398
+#: ../src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: src/protocols/silc/chat.c:405
+#: ../src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: src/protocols/silc/chat.c:410
+#: ../src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9104,317 +9167,315 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: ../src/protocols/silc/chat.c:418 ../src/protocols/silc/chat.c:419
+#: ../src/protocols/silc/chat.c:456 ../src/protocols/silc/chat.c:457
+#: ../src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "添加/删除"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
+#: ../src/protocols/silc/chat.c:579 ../src/protocols/silc/ops.c:1697
 msgid "Passphrase"
 msgstr "密码句"
 
-#: src/protocols/silc/chat.c:591
+#: ../src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: src/protocols/silc/chat.c:593
+#: ../src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:719
 msgid "User Limit"
 msgstr "允许限制"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: src/protocols/silc/chat.c:863
+#: ../src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/silc/chat.c:871
+#: ../src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:895
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:902
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: src/protocols/silc/chat.c:933
+#: ../src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的频道建立者"
 
-#: src/protocols/silc/chat.c:1012
+#: ../src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: ../src/protocols/silc/chat.c:1056
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "在您加入私有组之前,必须先加入 %s 频道"
 
-#: src/protocols/silc/chat.c:1073
+#: ../src/protocols/silc/chat.c:1058
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
+#: ../src/protocols/silc/chat.c:1252 ../src/protocols/silc/silc.c:911
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
+#: ../src/protocols/silc/chat.c:1253 ../src/protocols/silc/silc.c:912
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
+#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
+#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
+#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全文件传送"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
+#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
+#: ../src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "文件传送时出错"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "权限被禁止"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "密钥协议失败"
 
-#: src/protocols/silc/ft.c:102
-msgid "File transfer session does not exist"
+#: ../src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
 msgstr "文件传送会话不存在"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "没有激活的文件传送会话"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "文件传送已开始"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "无法执行文件传送的密钥协议"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "无法开始传送文件"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "无法发送文件"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:339 ../src/protocols/silc/ops.c:348
+#: ../src/protocols/silc/ops.c:357
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 已经将 <I>%s</I> 的话题改为: %s"
 
-#: src/protocols/silc/ops.c:425
+#: ../src/protocols/silc/ops.c:423
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 已经将频道 <I>%s</I> 的模式设定为: %s"
 
-#: src/protocols/silc/ops.c:429
+#: ../src/protocols/silc/ops.c:427
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 删除了频道 <I>%s</I> 的全部模式"
 
-#: src/protocols/silc/ops.c:462
+#: ../src/protocols/silc/ops.c:460
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 将 <I>%s</I> 的模式设定为: %s"
 
-#: src/protocols/silc/ops.c:470
+#: ../src/protocols/silc/ops.c:468
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 删除了 <I>%s</I> 的全部模式"
 
-#: src/protocols/silc/ops.c:499
+#: ../src/protocols/silc/ops.c:497
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> (%3$s) 从 <I>%1$s</I> 踢出了"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:527 ../src/protocols/silc/ops.c:532
+#: ../src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s (%s) 杀死了"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:558 ../src/protocols/silc/ops.c:563
+#: ../src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s (%s) 杀死"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "服务器登出"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "职称"
 
-#: src/protocols/silc/ops.c:834
+#: ../src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "职位"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "组织"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "单元"
 
-#: src/protocols/silc/ops.c:861
+#: ../src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "电子邮件"
 
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "备注"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
+#: ../src/protocols/silc/ops.c:1068 ../src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
+#: ../src/protocols/silc/ops.c:1069 ../src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
-#: src/protocols/silc/ops.c:1084
+#: ../src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
+#: ../src/protocols/silc/ops.c:1155 ../src/protocols/silc/silc.c:800
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: src/protocols/silc/ops.c:1159
+#: ../src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: src/protocols/silc/ops.c:1170
+#: ../src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: src/protocols/silc/ops.c:1202
+#: ../src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "更改昵称失败"
 
-#: src/protocols/silc/ops.c:1250
-#, fuzzy
+#: ../src/protocols/silc/ops.c:1241 ../src/protocols/silc/ops.c:1252
 msgid "Roomlist"
 msgstr "房间列表"
 
-#: src/protocols/silc/ops.c:1250
-#, fuzzy
+#: ../src/protocols/silc/ops.c:1241 ../src/protocols/silc/ops.c:1252
 msgid "Cannot get room list"
-msgstr "无法获取服务器统计"
-
-#: src/protocols/silc/ops.c:1295
+msgstr "无法获取房间列表"
+
+#: ../src/protocols/silc/ops.c:1297
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
+#: ../src/protocols/silc/ops.c:1310 ../src/protocols/silc/ops.c:1324
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1309
+#: ../src/protocols/silc/ops.c:1311
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
+#: ../src/protocols/silc/ops.c:1342 ../src/protocols/silc/ops.c:1351
 msgid "Server Statistics"
 msgstr "服务器统计"
 
-#: src/protocols/silc/ops.c:1339
+#: ../src/protocols/silc/ops.c:1343
 msgid "Cannot get server statistics"
 msgstr "无法获取服务器统计"
 
-#: src/protocols/silc/ops.c:1348
+#: ../src/protocols/silc/ops.c:1352
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
-#: src/protocols/silc/ops.c:1370
+#: ../src/protocols/silc/ops.c:1374
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9449,113 +9510,113 @@
 "总计服务器管理员数: %d\n"
 "总计路由器管理员数: %d\n"
 
-#: src/protocols/silc/ops.c:1393
+#: ../src/protocols/silc/ops.c:1397
 msgid "Network Statistics"
 msgstr "网络统计"
 
-#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
+#: ../src/protocols/silc/ops.c:1405 ../src/protocols/silc/ops.c:1410
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1401
+#: ../src/protocols/silc/ops.c:1405
 msgid "Ping failed"
 msgstr "Ping 失败"
 
-#: src/protocols/silc/ops.c:1406
+#: ../src/protocols/silc/ops.c:1410
 msgid "Ping reply received from server"
 msgstr "服务器对 ping 的响应"
 
-#: src/protocols/silc/ops.c:1414
+#: ../src/protocols/silc/ops.c:1418
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1498
+#: ../src/protocols/silc/ops.c:1499
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1503
+#: ../src/protocols/silc/ops.c:1504
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1512
+#: ../src/protocols/silc/ops.c:1513
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1547
+#: ../src/protocols/silc/ops.c:1548
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
-#: src/protocols/silc/silc.c:203
+#: ../src/protocols/silc/ops.c:1608 ../src/protocols/silc/ops.c:1655
+#: ../src/protocols/silc/silc.c:178
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1611
+#: ../src/protocols/silc/ops.c:1610
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1658
+#: ../src/protocols/silc/ops.c:1657
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1699
+#: ../src/protocols/silc/ops.c:1698
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1728
+#: ../src/protocols/silc/ops.c:1727
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1731
+#: ../src/protocols/silc/ops.c:1730
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1734
+#: ../src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1737
+#: ../src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1740
+#: ../src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1743
+#: ../src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1745
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1748
+#: ../src/protocols/silc/ops.c:1747
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1750
+#: ../src/protocols/silc/ops.c:1749
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1761
+#: ../src/protocols/silc/ops.c:1760
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
-#: src/protocols/silc/pk.c:103
+#: ../src/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr "收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
 
-#: src/protocols/silc/pk.c:108
+#: ../src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "收到了 %s 的公钥。您想要接受此公钥吗?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9568,48 +9629,48 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "校验公钥"
 
-#: src/protocols/silc/pk.c:119
+#: ../src/protocols/silc/pk.c:119
 msgid "View..."
 msgstr "查看..."
 
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "不支持的公钥类型"
 
-#: src/protocols/silc/silc.c:163
+#: ../src/protocols/silc/silc.c:138
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/silc.c:170
 msgid "Cannot initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
-#: src/protocols/silc/silc.c:206
+#: ../src/protocols/silc/silc.c:181
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-#: src/protocols/silc/silc.c:279
+#: ../src/protocols/silc/silc.c:254
 msgid "Out of memory"
 msgstr "内存溢出"
 
 #. Progress
-#: src/protocols/silc/silc.c:318
+#: ../src/protocols/silc/silc.c:293
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:639
+#: ../src/protocols/silc/silc.c:625
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:641
+#: ../src/protocols/silc/silc.c:627
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:666
+#: ../src/protocols/silc/silc.c:652
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9617,43 +9678,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:660 ../src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "短信"
 
-#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:662 ../src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "彩信"
 
-#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
+#: ../src/protocols/silc/silc.c:664 ../src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: src/protocols/silc/silc.c:683
+#: ../src/protocols/silc/silc.c:669
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/silc.c:676
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:693
+#: ../src/protocols/silc/silc.c:679
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:685
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:706
+#: ../src/protocols/silc/silc.c:692
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/silc.c:706
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:721
+#: ../src/protocols/silc/silc.c:707
 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 "
@@ -9662,182 +9723,186 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
-#: src/protocols/silc/silc.c:1171
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:753
+#: ../src/protocols/silc/silc.c:1160
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:761
+#: ../src/protocols/silc/silc.c:747
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
+#: ../src/protocols/silc/silc.c:748 ../src/protocols/silc/silc.c:1155
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:809
+#: ../src/protocols/silc/silc.c:795
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:818
+#: ../src/protocols/silc/silc.c:804
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:891
+#: ../src/protocols/silc/silc.c:876
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:1042
+#: ../src/protocols/silc/silc.c:985
+msgid "Failed to leave channel"
+msgstr "离开频道失败"
+
+#: ../src/protocols/silc/silc.c:1031
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: src/protocols/silc/silc.c:1123
+#: ../src/protocols/silc/silc.c:1112
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: src/protocols/silc/silc.c:1225
+#: ../src/protocols/silc/silc.c:1214
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: src/protocols/silc/silc.c:1230
+#: ../src/protocols/silc/silc.c:1219
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: src/protocols/silc/silc.c:1232
+#: ../src/protocols/silc/silc.c:1221
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: src/protocols/silc/silc.c:1245
+#: ../src/protocols/silc/silc.c:1234
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: src/protocols/silc/silc.c:1275
+#: ../src/protocols/silc/silc.c:1264
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知命令: %s,(可能是 Gaim bug)"
 
-#: src/protocols/silc/silc.c:1338
+#: ../src/protocols/silc/silc.c:1327
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1342
+#: ../src/protocols/silc/silc.c:1331
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1346
+#: ../src/protocols/silc/silc.c:1335
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1351
+#: ../src/protocols/silc/silc.c:1340
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: src/protocols/silc/silc.c:1355
+#: ../src/protocols/silc/silc.c:1344
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1359
+#: ../src/protocols/silc/silc.c:1348
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1352 ../src/protocols/zephyr/zephyr.c:2466
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: src/protocols/silc/silc.c:1367
+#: ../src/protocols/silc/silc.c:1356
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: src/protocols/silc/silc.c:1371
+#: ../src/protocols/silc/silc.c:1360
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1375
+#: ../src/protocols/silc/silc.c:1364
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1379
+#: ../src/protocols/silc/silc.c:1368
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1372
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: src/protocols/silc/silc.c:1389
+#: ../src/protocols/silc/silc.c:1378
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: src/protocols/silc/silc.c:1393
+#: ../src/protocols/silc/silc.c:1382
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: src/protocols/silc/silc.c:1397
+#: ../src/protocols/silc/silc.c:1386
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1401
+#: ../src/protocols/silc/silc.c:1390
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
 
-#: src/protocols/silc/silc.c:1405
+#: ../src/protocols/silc/silc.c:1394
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
-#: src/protocols/silc/silc.c:1409
+#: ../src/protocols/silc/silc.c:1398
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: src/protocols/silc/silc.c:1413
+#: ../src/protocols/silc/silc.c:1402
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: src/protocols/silc/silc.c:1417
+#: ../src/protocols/silc/silc.c:1406
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
 
-#: src/protocols/silc/silc.c:1421
+#: ../src/protocols/silc/silc.c:1410
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: src/protocols/silc/silc.c:1425
+#: ../src/protocols/silc/silc.c:1414
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: src/protocols/silc/silc.c:1429
+#: ../src/protocols/silc/silc.c:1418
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: src/protocols/silc/silc.c:1433
+#: ../src/protocols/silc/silc.c:1422
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1426
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: src/protocols/silc/silc.c:1441
+#: ../src/protocols/silc/silc.c:1430
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: src/protocols/silc/silc.c:1446
+#: ../src/protocols/silc/silc.c:1435
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: src/protocols/silc/silc.c:1450
+#: ../src/protocols/silc/silc.c:1439
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9845,27 +9910,27 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
 "户"
 
-#: src/protocols/silc/silc.c:1462
+#: ../src/protocols/silc/silc.c:1451
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1467
+#: ../src/protocols/silc/silc.c:1456
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1472
+#: ../src/protocols/silc/silc.c:1461
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1475
+#: ../src/protocols/silc/silc.c:1464
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1480
+#: ../src/protocols/silc/silc.c:1469
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1474
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
@@ -9878,93 +9943,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1573
+#: ../src/protocols/silc/silc.c:1563
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1575
+#: ../src/protocols/silc/silc.c:1565
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1609
-#, fuzzy
+#: ../src/protocols/silc/silc.c:1599
 msgid "Public Key file"
 msgstr "公钥文件"
 
-#: src/protocols/silc/silc.c:1613
-#, fuzzy
+#: ../src/protocols/silc/silc.c:1603
 msgid "Private Key file"
 msgstr "私钥文件"
 
-#: src/protocols/silc/silc.c:1616
+#: ../src/protocols/silc/silc.c:1606
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1620
+#: ../src/protocols/silc/silc.c:1610
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1623
+#: ../src/protocols/silc/silc.c:1613
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1626
+#: ../src/protocols/silc/silc.c:1616
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1629
+#: ../src/protocols/silc/silc.c:1619
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/util.c:205 ../src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: ../src/protocols/silc/util.c:313
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "真名:\t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:315
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "用户名:\t%s\n"
 
-#: src/protocols/silc/util.c:317
+#: ../src/protocols/silc/util.c:317
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "电子邮件:\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:319
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主机名:\t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:321
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "组织:\t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: ../src/protocols/silc/util.c:323
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国家:\t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:324
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "算法:\t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:325
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
-#: src/protocols/silc/util.c:327
+#: ../src/protocols/silc/util.c:327
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9975,7 +10038,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9984,135 +10047,135 @@
 "公钥漏印:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:332 ../src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "公钥信息"
 
-#: src/protocols/silc/util.c:515
+#: ../src/protocols/silc/util.c:515
 msgid "Paging"
 msgstr "寻呼"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:539
 msgid "Computer"
 msgstr "计算机"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:543
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:545
 msgid "Terminal"
 msgstr "终端"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:497
+#: ../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:500
+#: ../src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:506
+#: ../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:509
+#: ../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:512
+#: ../src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败: %s。"
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:552
+#: ../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."
@@ -10120,42 +10183,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误: %s。"
 
-#: src/protocols/toc/toc.c:557
+#: ../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:584
-#, fuzzy
-msgid "Invalid Groupname"
-msgstr "无效的组"
-
-#: src/protocols/toc/toc.c:668
+#: ../src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:786
+#: ../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:989
+#: ../src/protocols/toc/toc.c:892
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:896
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:897
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10165,43 +10223,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1450
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1586
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1708
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1744
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: ../src/protocols/toc/toc.c:1789 ../src/protocols/toc/toc.c:1829
+#: ../src/protocols/toc/toc.c:1953 ../src/protocols/toc/toc.c:2041
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:1986
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2086
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2120
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2127
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -10216,84 +10274,84 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2214 ../src/protocols/toc/toc.c:2216
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2337
+#: ../src/protocols/toc/toc.c:2235
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2341
+#: ../src/protocols/toc/toc.c:2239
 msgid "TOC port"
 msgstr "TOC 端口"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:264
+#: ../src/protocols/trepia/trepia.c:264
 msgid "Basic Profile"
 msgstr "基本信息"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:295
+#: ../src/protocols/trepia/trepia.c:295
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: src/protocols/trepia/trepia.c:301
+#: ../src/protocols/trepia/trepia.c:301
 msgid "Profile Information"
 msgstr "个人信息"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:307
+#: ../src/protocols/trepia/trepia.c:307
 msgid "Instant Messagers"
 msgstr "即时通讯程序"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:311
+#: ../src/protocols/trepia/trepia.c:311
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:315
+#: ../src/protocols/trepia/trepia.c:315
 msgid "ICQ UIN"
 msgstr "ICQ UIN"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:319
+#: ../src/protocols/trepia/trepia.c:319
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:323
+#: ../src/protocols/trepia/trepia.c:323
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:328
+#: ../src/protocols/trepia/trepia.c:328
 msgid "I'm From"
 msgstr "来自"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:345
+#: ../src/protocols/trepia/trepia.c:345
 msgid "Set your Trepia profile data."
 msgstr "设置您的 Trepia 资料。"
 
-#: src/protocols/trepia/trepia.c:425
+#: ../src/protocols/trepia/trepia.c:425
 msgid "Profile"
 msgstr "资料"
 
-#: src/protocols/trepia/trepia.c:439
+#: ../src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "设置资料"
 
-#: src/protocols/trepia/trepia.c:476
+#: ../src/protocols/trepia/trepia.c:476
 msgid "Visit Homepage"
 msgstr "浏览主页"
 
-#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
+#: ../src/protocols/trepia/trepia.c:822 ../src/protocols/trepia/trepia.c:825
 msgid "Local Users"
 msgstr "本地用户"
 
-#: src/protocols/trepia/trepia.c:1032
+#: ../src/protocols/trepia/trepia.c:1028
 msgid "Logging in"
 msgstr "登入"
 
@@ -10307,19 +10365,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: ../src/protocols/trepia/trepia.c:1275 ../src/protocols/trepia/trepia.c:1277
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: ../src/protocols/yahoo/yahoo.c:419
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
+
+#: ../src/protocols/yahoo/yahoo.c:912
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
+#: ../src/protocols/yahoo/yahoo.c:936 ../src/protocols/yahoo/yahoo.c:3520
 msgid "Buzz!!"
-msgstr "呼叫"
-
-#: src/protocols/yahoo/yahoo.c:763
+msgstr "呼叫朋友"
+
+#: ../src/protocols/yahoo/yahoo.c:981
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
@@ -10327,33 +10391,32 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #. *
-#: src/protocols/yahoo/yahoo.c:853
-#, fuzzy, c-format
+#: ../src/protocols/yahoo/yahoo.c:1072
+#, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "用户 %s 想要将 %s 添加为好友。"
-
-#: src/protocols/yahoo/yahoo.c:859
-#, fuzzy
+msgstr "用户 %s 想要将 %s 添加为好友%s%s。"
+
+#: ../src/protocols/yahoo/yahoo.c:1078
 msgid "Message (optional) :"
-msgstr "消息通知"
-
-#: src/protocols/yahoo/yahoo.c:901
+msgstr "消息(可选):"
+
+#: ../src/protocols/yahoo/yahoo.c:1120
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:904
+#: ../src/protocols/yahoo/yahoo.c:1123
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: src/protocols/yahoo/yahoo.c:907
+#: ../src/protocols/yahoo/yahoo.c:1126
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1659
+#: ../src/protocols/yahoo/yahoo.c:1887
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10363,11 +10426,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1662
+#: ../src/protocols/yahoo/yahoo.c:1890
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1735
+#: ../src/protocols/yahoo/yahoo.c:1962
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10375,19 +10438,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1738
+#: ../src/protocols/yahoo/yahoo.c:1965
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1999
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1783
+#: ../src/protocols/yahoo/yahoo.c:2010
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1784
+#: ../src/protocols/yahoo/yahoo.c:2011
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10398,119 +10461,100 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1792
+#: ../src/protocols/yahoo/yahoo.c:2019
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1795
+#: ../src/protocols/yahoo/yahoo.c:2022
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1798
+#: ../src/protocols/yahoo/yahoo.c:2025
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1852
+#: ../src/protocols/yahoo/yahoo.c:2079
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: src/protocols/yahoo/yahoo.c:1855
+#: ../src/protocols/yahoo/yahoo.c:2082
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
-#: src/protocols/yahoo/ycht.c:415
+#: ../src/protocols/yahoo/yahoo.c:2319 ../src/protocols/yahoo/yahoo.c:2467
+#: ../src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
-#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-#: src/protocols/yahoo/ycht.c:519
+#: ../src/protocols/yahoo/yahoo.c:2489 ../src/protocols/yahoo/yahoo.c:2610
+#: ../src/protocols/yahoo/yahoo.c:2660 ../src/protocols/yahoo/yahoo.c:2670
+#: ../src/protocols/yahoo/yahoochat.c:1461
+#: ../src/protocols/yahoo/yahoochat.c:1528 ../src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
+#: ../src/protocols/yahoo/yahoo.c:2764 ../src/protocols/yahoo/yahoo.c:3131
+#: ../src/protocols/yahoo/yahoo.c:3245
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
+#: ../src/protocols/yahoo/yahoo.c:2766 ../src/protocols/yahoo/yahoo.c:3133
+#: ../src/protocols/yahoo/yahoo.c:3246
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
+#: ../src/protocols/yahoo/yahoo.c:2768 ../src/protocols/yahoo/yahoo.c:3135
+#: ../src/protocols/yahoo/yahoo.c:3247
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
+#: ../src/protocols/yahoo/yahoo.c:2772 ../src/protocols/yahoo/yahoo.c:3139
+#: ../src/protocols/yahoo/yahoo.c:3249
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
+#: ../src/protocols/yahoo/yahoo.c:2776 ../src/protocols/yahoo/yahoo.c:3143
+#: ../src/protocols/yahoo/yahoo.c:3251
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:2857 ../src/protocols/yahoo/yahoo.c:2883
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
-#, fuzzy
-msgid "Appear Online"
-msgstr "显示为离线"
-
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
-#, fuzzy
-msgid "Appear Permanently Offline"
-msgstr "显示为离线"
-
-#: src/protocols/yahoo/yahoo.c:2763
-#, fuzzy
-msgid "Stealth"
-msgstr "州/省"
-
-#: src/protocols/yahoo/yahoo.c:2818
-#, fuzzy
-msgid "Don't Appear Permanently Offline"
-msgstr "显示为离线"
-
-#: src/protocols/yahoo/yahoo.c:2857
+#: ../src/protocols/yahoo/yahoo.c:2962
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2862
+#: ../src/protocols/yahoo/yahoo.c:2967
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2887
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2920
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2929
+#: ../src/protocols/yahoo/yahoo.c:3028
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: ../src/protocols/yahoo/yahoo.c:3038
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2943
+#: ../src/protocols/yahoo/yahoo.c:3042
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:3505
+#: ../src/protocols/yahoo/yahoo.c:3562
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
-
-#: src/protocols/yahoo/yahoo.c:3509
+msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天聊天室"
+
+#: ../src/protocols/yahoo/yahoo.c:3566
 msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: 呼叫联系人,以便引起他的注意"
+msgstr "buzz: 呼叫联系人,以吸引其注意"
 
 #. *< type
 #. *< ui_requirement
@@ -10522,134 +10566,183 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
+#: ../src/protocols/yahoo/yahoo.c:3645 ../src/protocols/yahoo/yahoo.c:3647
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3609
+#: ../src/protocols/yahoo/yahoo.c:3666
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3612
+#: ../src/protocols/yahoo/yahoo.c:3669
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3615
+#: ../src/protocols/yahoo/yahoo.c:3672
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3618
+#: ../src/protocols/yahoo/yahoo.c:3675
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3621
+#: ../src/protocols/yahoo/yahoo.c:3678
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3624
+#: ../src/protocols/yahoo/yahoo.c:3681
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3627
+#: ../src/protocols/yahoo/yahoo.c:3684
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3630
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:3687
 msgid "Chat Room Locale"
-msgstr "聊天房间列表 URL"
-
-#: src/protocols/yahoo/yahoo.c:3633
+msgstr "聊天房间语系"
+
+#: ../src/protocols/yahoo/yahoo.c:3690
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3636
+#: ../src/protocols/yahoo/yahoo.c:3693
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3639
+#: ../src/protocols/yahoo/yahoo.c:3696
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
-#: src/protocols/yahoo/yahoo_profile.c:677
+#: ../src/protocols/yahoo/yahoochat.c:206
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
+
+#: ../src/protocols/yahoo/yahoochat.c:208
+msgid "Invitation Rejected"
+msgstr "邀请已拒绝"
+
+#: ../src/protocols/yahoo/yahoochat.c:363
+msgid "Failed to join chat"
+msgstr "加入聊天失败"
+
+#: ../src/protocols/yahoo/yahoochat.c:363
+msgid "Maybe the room is full?"
+msgstr "可能房间已满?"
+
+#: ../src/protocols/yahoo/yahoochat.c:441
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "您现在正在 %s 中聊天。"
+
+#: ../src/protocols/yahoo/yahoochat.c:616
+msgid "Failed to join buddy in chat"
+msgstr "在聊天中加入好友失败"
+
+#: ../src/protocols/yahoo/yahoochat.c:617
+msgid "Maybe they're not in a chat?"
+msgstr "可能他们未在聊天中?"
+
+#: ../src/protocols/yahoo/yahoochat.c:1394
+msgid "Fetching the room list failed."
+msgstr "获取房间列表失败。"
+
+#: ../src/protocols/yahoo/yahoochat.c:1447
+msgid "Voices"
+msgstr "语音"
+
+#: ../src/protocols/yahoo/yahoochat.c:1450
+msgid "Webcams"
+msgstr "摄像头"
+
+#: ../src/protocols/yahoo/yahoochat.c:1461
+#: ../src/protocols/yahoo/yahoochat.c:1528
+msgid "Unable to fetch room list."
+msgstr "无法获取房间列表。"
+
+#: ../src/protocols/yahoo/yahoochat.c:1521
+msgid "User Rooms"
+msgstr "用户房间"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 地址:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: ../src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo 日本资料"
 
-#: src/protocols/yahoo/yahoo_profile.c:754
+#: ../src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 资料"
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: ../src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
 
-#: src/protocols/yahoo/yahoo_profile.c:800
+#: ../src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接"
 
-#: src/protocols/yahoo/yahoo_profile.c:978
+#: ../src/protocols/yahoo/yahoo_profile.c:976
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1052
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../src/protocols/yahoo/yahoo_profile.c:1054
+#: ../src/protocols/yahoo/yahoo_profile.c:1058
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo_profile.c:1070
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: ../src/protocols/yahoo/yahoo_profile.c:1068
+#: ../src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: src/protocols/yahoo/yahoo_profile.c:1095
+#: ../src/protocols/yahoo/yahoo_profile.c:1093
 msgid "Home Page"
 msgstr "主页"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1115
+#: ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1119
+#: ../src/protocols/yahoo/yahoo_profile.c:1117
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1132
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo_profile.c:1130
 msgid "Last Update"
 msgstr "上次更新"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: ../src/protocols/yahoo/yahoo_profile.c:1136
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: src/protocols/yahoo/yahoo_profile.c:1144
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "抱歉,此配置文件似乎是目前并不支持的语言。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1160
+#: ../src/protocols/yahoo/yahoo_profile.c:1158
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr "无法获取用户的个人资料。可能临时出现了服务器端问题。请稍后再试。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1163
+#: ../src/protocols/yahoo/yahoo_profile.c:1161
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10658,147 +10751,93 @@
 "无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个"
 "人资料。如果您确定用户存在的话,请稍候再试。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1171
+#: ../src/protocols/yahoo/yahoo_profile.c:1169
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
-
-#: src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "邀请已拒绝"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Failed to join chat"
-msgstr "加入聊天失败"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Maybe the room is full?"
-msgstr "可能房间已满?"
-
-#: src/protocols/yahoo/yahoochat.c:438
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "您现在正在 %s 中聊天。"
-
-#: src/protocols/yahoo/yahoochat.c:613
-msgid "Failed to join buddy in chat"
-msgstr "在聊天中加入好友失败"
-
-#: src/protocols/yahoo/yahoochat.c:614
-msgid "Maybe they're not in a chat?"
-msgstr "可能他们未在聊天中?"
-
-#: src/protocols/yahoo/yahoochat.c:1350
-msgid "Fetching the room list failed."
-msgstr "获取房间列表失败。"
-
-#: src/protocols/yahoo/yahoochat.c:1403
-msgid "Voices"
-msgstr "语音"
-
-#: src/protocols/yahoo/yahoochat.c:1406
-msgid "Webcams"
-msgstr "摄像头"
-
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-msgid "Unable to fetch room list."
-msgstr "无法获取房间列表。"
-
-#: src/protocols/yahoo/yahoochat.c:1477
-msgid "User Rooms"
-msgstr "用户房间"
-
-#: src/protocols/yahoo/ycht.c:402
+#: ../src/protocols/yahoo/ycht.c:401
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT 服务器连接出现问题。"
 
-#: src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:327
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "(转换此信息出错。\t请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, c-format
-msgid "Unable to send to chat %s,%s,%s"
+#: ../src/protocols/zephyr/zephyr.c:682
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:715 ../src/protocols/zephyr/zephyr.c:1124
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1129
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:724 ../src/protocols/zephyr/zephyr.c:1131
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1414 ../src/protocols/zephyr/zephyr.c:1415
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2143
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2149
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2155
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2166
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2471
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2476
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2481
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2486
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2622
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
-
-#: src/protocols/zephyr/zephyr.c:2628
+#: ../src/protocols/zephyr/zephyr.c:2492
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2497
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: ../src/protocols/zephyr/zephyr.c:2503
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: ../src/protocols/zephyr/zephyr.c:2509
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10806,7 +10845,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: ../src/protocols/zephyr/zephyr.c:2515
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10814,15 +10853,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2520
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: ../src/protocols/zephyr/zephyr.c:2626
 msgid "Resubscribe"
 msgstr "重订"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2629
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10836,690 +10875,202 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2712 ../src/protocols/zephyr/zephyr.c:2714
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2739
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2742
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-msgid "Import from .anyone"
-msgstr "从 .anyone 导入"
-
-#: src/protocols/zephyr/zephyr.c:2883
-msgid "Import from .zephyr.subs"
-msgstr "从 .zephyr.subs 导入"
-
-#: src/protocols/zephyr/zephyr.c:2886
-msgid "Realm"
-msgstr "域"
-
-#: src/protocols/zephyr/zephyr.c:2889
+#: ../src/protocols/zephyr/zephyr.c:2745
 msgid "Exposure"
 msgstr "暴露"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1038
+#: ../src/proxy.c:958
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:1042
+#: ../src/proxy.c:962
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1876
+#: ../src/proxy.c:1790
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1876
+#: ../src/proxy.c:1790
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "您为给定代理类型所指定的主机名或端口号无效。"
 
+#. * Custom away message.
+#: ../src/prpl.h:187
+msgid "Custom"
+msgstr "自定义"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1276
+#: ../src/request.h:1255
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:351
+#: ../src/server.c:64
+msgid "Please enter your password"
+msgstr "请输入您的密码"
+
+#: ../src/server.c:533
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 现在叫做 %s。\n"
 
-#: src/server.c:733
+#: ../src/server.c:978
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:747
+#: ../src/server.c:992
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1008
-#, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr ""
-"%s 邀请了 %s 加入聊天室 %s:\n"
-"%s"
-
-#: src/server.c:1013
-#, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s 邀请了 %s 加入聊天室 %s\n"
-
-#: src/server.c:1017
-msgid "Accept chat invitation?"
-msgstr "接受聊天邀请吗?"
-
-#: src/status.c:153
-msgid "Unset"
-msgstr "取消设置"
-
-#: src/status.c:626
+#: ../src/server.c:1215 ../src/server.c:1224
+#, c-format
+msgid "%s logged in."
+msgstr "%s 登入了。"
+
+#: ../src/server.c:1236
+#, c-format
+msgid "%s signed on"
+msgstr "%s 已登入"
+
+#: ../src/server.c:1251
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/status.c:631
+#: ../src/server.c:1253
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/status.c:1314
+#: ../src/server.c:1267
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/status.c:1330
+#: ../src/server.c:1278
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/util.c:2120
-#, c-format
-msgid "Error Reading %s"
-msgstr "读取 %s 出错"
-
-#: src/util.c:2121
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file been renamed to %s~."
-msgstr "阅读您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
-
-#: src/util.c:2558
+#: ../src/server.c:1288 ../src/server.c:1295
+#, c-format
+msgid "%s logged out."
+msgstr "%s 登出了。"
+
+#: ../src/server.c:1308
+#, c-format
+msgid "%s signed off"
+msgstr "%s 已登出"
+
+#: ../src/server.c:1370
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+"%s 刚刚被 %s 警告。\n"
+"您新的警告级别是 %d%%"
+
+#: ../src/server.c:1373
+msgid "an anonymous person"
+msgstr "无名氏"
+
+#: ../src/server.c:1487
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+"%s 邀请了 %s 加入聊天室 %s:\n"
+"<b>%s</b>"
+
+#: ../src/server.c:1493
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s 邀请了 %s 加入聊天室 %s\n"
+
+#: ../src/server.c:1502
+msgid "Accept chat invitation?"
+msgstr "接受聊天邀请吗?"
+
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: ../src/status.c:36
+msgid "Sorry, I ran out for a bit!"
+msgstr "抱歉,我现在不在。请稍候再与我联系。"
+
+#: ../src/stock.c:87
+msgid "_Alias"
+msgstr "别名(_A)"
+
+#: ../src/stock.c:89
+msgid "_Invite"
+msgstr "邀请(_I)"
+
+#: ../src/stock.c:90
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: ../src/stock.c:91
+msgid "_Open Mail"
+msgstr "打开邮件(_O)"
+
+#: ../src/stock.c:93
+msgid "_Warn"
+msgstr "警告(_W)"
+
+#: ../src/util.c:2408
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2561
+#: ../src/util.c:2411
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2591
+#: ../src/util.c:2441
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2605
+#: ../src/util.c:2455
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2613
+#: ../src/util.c:2463
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2621
+#: ../src/util.c:2471
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:3041
+#: ../src/util.c:2891
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
-#~ msgid "Orientation"
-#~ msgstr "方向"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "托盘的方向。"
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "GTK 信号测试"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "测试看看所有的信号是否都工作正确。"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "停靠的好友列表常居顶端(_B)"
-
-#~ msgid "No name"
-#~ msgstr "无名称"
-
-#~ msgid "Show fewer options"
-#~ msgstr "显示主要选项"
-
-#~ msgid "Information"
-#~ msgstr "信息"
-
-#~ msgid "Rename Group"
-#~ msgstr "重命名组"
-
-#~ msgid "New group name"
-#~ msgstr "新组名称"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "请输入选中组的新名字。"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>警告:</b> %s"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "警告 (%d%%) "
-
-#~ msgid "Background color name"
-#~ msgstr "背景颜色名称"
-
-#~ msgid "Background color as a string"
-#~ msgstr "背景颜色的字符串"
-
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "背景颜色的 GdkColor"
-
-#~ msgid "Background set"
-#~ msgstr "背景设定"
-
-#~ msgid "Whether this tag affects the background color"
-#~ msgstr "此标记是否影响背景颜色"
-
-#, fuzzy
-#~ msgid "Active item"
-#~ msgstr "活跃"
-
-#, fuzzy
-#~ msgid "The item which is currently active"
-#~ msgstr "聊天目前不可用"
-
-#, fuzzy
-#~ msgid "Appears as list"
-#~ msgstr "显示为离线"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/对话(C)/警告(_W)..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/对话(C)/警告(W)..."
-
-#~ msgid "Warn User"
-#~ msgstr "警告用户"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">警告 %s 吗?</span>\n"
-#~ "\n"
-#~ "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "匿名警告吗(_A)?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>匿名警告较不容易引起注意。</b>"
-
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
-
-#~ msgid "Display"
-#~ msgstr "显示"
-
-#~ msgid "Ignore _formatting"
-#~ msgstr "忽略格式(_F)"
-
-#~ msgid "Default Formatting"
-#~ msgstr "默认格式"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "送出信息使用默认格式(_S)"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "标签位置(_L):"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "新对话放置(_P):"
-
-#~ msgid "Message Text"
-#~ msgstr "消息文本"
-
-#~ msgid "User"
-#~ msgstr "用户"
-
-#~ msgid "AIM Screen name"
-#~ msgstr "AIM 用户名"
-
-#~ msgid "Preparing Buddy List"
-#~ msgstr "正准备好友列表"
-
-#~ msgid "Unable to establish listening port."
-#~ msgstr "无法建立监听端口。"
-
-#~ msgid "Unable to establish mDNS socket."
-#~ msgstr "无法建立 mDNS 套接字。"
-
-#~ msgid "Rendezvous Protocol Plugin"
-#~ msgstr "Rendezvous 协议插件"
-
-#~ msgid "Host name"
-#~ msgstr "主机名"
-
-#~ msgid "First name"
-#~ msgstr "名"
-
-#~ msgid "Last name"
-#~ msgstr "姓"
-
-#~ msgid "Share AIM screen name"
-#~ msgstr "共享 AIM 用户名"
-
-#~ msgid "Sending Handshake"
-#~ msgstr "正发送握手"
-
-#, fuzzy
-#~ msgid "Waiting for Handshake Acknowledgement"
-#~ msgstr "正在传送开始"
-
-#, fuzzy
-#~ msgid "Login Redirected"
-#~ msgstr "登录服务器"
-
-#~ msgid "Login Acknowledged"
-#~ msgstr "登录已被确认"
-
-#~ msgid "Connected to Sametime Community Server"
-#~ msgstr "已连接到 Sametime 社区服务器"
-
-#~ msgid "Admin Alert"
-#~ msgstr "管理提醒"
-
-#~ msgid "saved statuses"
-#~ msgstr "已存状态"
-
-#~ msgid "Mail Server"
-#~ msgstr "邮件服务器"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d 封新邮件/共 %d 封)"
-
-#~ msgid "Check Mail"
-#~ msgstr "检查邮件"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "每隔 X 秒检查邮件。\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "自动登录"
-
-#~ msgid "Unable to send messge to %s."
-#~ msgstr "无法给 %s 发送消息。"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>瞌睡</b>"
-
-#~ msgid "former lead developer"
-#~ msgstr "先前领导开发者"
-
-#~ msgid "former maintainer"
-#~ msgstr "先前维护者"
-
-#~ msgid "Chinese"
-#~ msgstr "中文"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "无法装入首选项"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim 无法装入您的首选项,原因是存储首选项所用的的格式太老,目前已不支持。"
-#~ "请使用首选项窗口重新配置您的设置。"
-
-#~ msgid "if (away && idle)"
-#~ msgstr "如果离开且瞌睡"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "用户 %s 想要将您添加为好友。"
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "默认 SILC 密钥对"
-
-#~ msgid "SILC Public Key"
-#~ msgstr "SILC 公钥"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "SILC 私钥"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
-
-#~ msgid ""
-#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-#~ "(1,048,576 bytes)."
-#~ msgstr "Gaim 无法通过雅虎发送超过 1 兆(1 048 576 字节)的文件。"
-
-#~ msgid "Please enter your password"
-#~ msgstr "请输入您的密码"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s 邀请了 %s 加入聊天室 %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Log Out"
-#~ msgstr "登出"
-
-#~ msgid "/Buddies/_Log Out"
-#~ msgstr "/好友(B)/登出(_L)"
-
-#~ msgid "/Buddies/Log Out"
-#~ msgstr "/好友(B)/登出"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "文件传送中止"
-
-#~ msgid ""
-#~ "An error was encountered parsing the file containing your buddy list (%"
-#~ "s).  It has not been loaded, and the old file has been renamed to blist."
-#~ "xml~."
-#~ msgstr ""
-#~ "分析包含您好友列表的文件时出错。好友列表未装入,旧文件被移动到 blist.xml~ "
-#~ "中了。"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "好友列表出错"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>账户:</b>"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/对话(C)/关闭(C)"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "忽略颜色(_O)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "忽略字体(_F)"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "较大字体(_Z)"
-
-#~ msgid "Window Closing"
-#~ msgstr "窗口关闭"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "Esc 键关闭窗口(_E)"
-
-#~ msgid "Shortcuts"
-#~ msgstr "快捷键"
-
-#~ msgid "Logging in: %s"
-#~ msgstr "登入: %s"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "隐藏操作系统"
-
-#~ msgid "Miscellaneous error"
-#~ msgstr "杂项错误"
-
-#~ msgid "Initiate Chat"
-#~ msgstr "进入聊天室"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "显示对话关闭通知"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "显示超时通知"
-
-#~ msgid "Unable to connect to server"
-#~ msgstr "无法连接到服务器"
-
-#~ msgid "Unknown error when attempting to authorize with MSN login server."
-#~ msgstr "试图认证 MSN 登录服务器时发生了未知错误。"
-
-#~ msgid "Requesting to send password"
-#~ msgstr "正在请求发送密码"
-
-#~ msgid "Unable to connect to %s server"
-#~ msgstr "无法连接到 %s 服务器"
-
-#~ msgid "Error writing to %s server"
-#~ msgstr "从 %s 服务器读取时出错"
-
-#~ msgid "Error reading from %s server"
-#~ msgstr "从 %s 服务器读取时出错"
-
-#~ msgid "Received HTTP error. Please report this."
-#~ msgstr "收到了 HTTP 错误。请进行报告。"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "对话已停止并超时。"
-
-#~ msgid "Saved Statuses Error"
-#~ msgstr "已存状态错误"
-
-#~ msgid "Auto log in"
-#~ msgstr "自动登录"
-
-#~ msgid "Auto Log In"
-#~ msgstr "自动登录"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/工具(T)/离开(_A)"
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/工具(T)/离开(A)"
-
-#~ msgid "Done."
-#~ msgstr "完成。"
-
-#~ msgid "Logging in: "
-#~ msgstr "登入:"
-
-#~ msgid "Logging In"
-#~ msgstr "登入"
-
-#~ msgid "Cancel All"
-#~ msgstr "全部取消"
-
-#~ msgid "Block the user"
-#~ msgstr "屏蔽用户"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "给用户发送文件"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "将用户加为好友"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "从您的好友列表中删除该用户"
-
-#~ msgid "Send"
-#~ msgstr "发送"
-
-#~ msgid "Send message"
-#~ msgstr "发送消息"
-
-#~ msgid "Invite"
-#~ msgstr "邀请"
-
-#~ msgid "Invite a user"
-#~ msgstr "邀请用户"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "将聊天添加到您的好友列表"
-
-#~ msgid "Remove the chat from your buddy list"
-#~ msgstr "从您的好友列表中删除聊天"
-
-#~ msgid "Please create an account."
-#~ msgstr "请创建一个账户。"
-
-#~ msgid "Login"
-#~ msgstr "登入"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>账户(_A):</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>密码(_P):</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "账户(_C)"
-
-#~ msgid "P_references"
-#~ msgstr "首选项(_R)"
-
-#~ msgid "_Log in"
-#~ msgstr "登入(_L)"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "用法: %s [选项]...\n"
-#~ "\n"
-#~ "  -a, --acct          显示账户编辑窗口\n"
-#~ "  -w, --away[=消息]   登入后设为离开(可选“消息”指定要使用的离开消息名称)\n"
-#~ "  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
-#~ "  -n, --loginwin      不自动登入;显示登录窗口\n"
-#~ "  -u, --user=名称     使用指定账户\n"
-#~ "  -f, --file=文件     使用指定文件的配置\n"
-#~ "  -c, --config=目录   使用“目录”存储配置文件\n"
-#~ "  -d, --debug         将调试信息打印到标准输出\n"
-#~ "  -v, --version       显示当前版本并退出\n"
-#~ "  -h, --help          显示帮助并退出\n"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "如果未设置别名则显示远程昵称(_I)"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "消息显示时间戳(_T)"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "显示警告级别(_W)"
-
-#~ msgid "Show idle _times"
-#~ msgstr "显示瞌睡时间(_T)"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "自动展开联系人(_A)"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "将按钮显示为(_B):"
-
-#~ msgid "Pictures"
-#~ msgstr "图片"
-
-#~ msgid "Text"
-#~ msgstr "文字"
-
-#~ msgid "Pictures and text"
-#~ msgstr "图片和文字"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "允许斜线开头的命令(_S)"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "在标签/标题中显示别名(_A)"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "发生事件时激活对话窗口(_R)"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "发生事件时激活聊天窗口(_W)"
-
-#~ msgid "Interface"
-#~ msgstr "界面"
-
-#~ msgid "Message could not be sent for an unknown reason"
-#~ msgstr "消息未发出,原因未知"
-
-#~ msgid ""
-#~ "%s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s:\n"
-#~ "%s"
-
-#~ msgid "Syncing with server"
-#~ msgstr "正在与服务器同步"