changeset 6345:f637c4271a53

[gaim-migrate @ 6844] updated .po files committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 31 Jul 2003 14:35:01 +0000
parents f63da9023c99
children bcd205870559
files po/zh_CN.po po/zh_TW.po
diffstat 2 files changed, 2497 insertions(+), 2424 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Thu Jul 31 01:57:19 2003 +0000
+++ b/po/zh_CN.po	Thu Jul 31 14:35:01 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-07-17 18:51-0400\n"
-"PO-Revision-Date: 2003-07-04 14:37+0800\n"
+"POT-Creation-Date: 2003-07-31 12:18+0800\n"
+"PO-Revision-Date: 2003-07-31 12:24+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"
@@ -15,65 +15,65 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:111 src/gtkaccount.c:440 src/gtkaccount.c:1588
+#: plugins/docklet/docklet.c:112 src/gtkaccount.c:441 src/gtkaccount.c:1589
 msgid "Auto-login"
 msgstr "自动登录"
 
-#: plugins/docklet/docklet.c:114
+#: plugins/docklet/docklet.c:115
 msgid "New Message.."
 msgstr "新消息..."
 
-#: plugins/docklet/docklet.c:115
+#: plugins/docklet/docklet.c:116
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:146
+#: plugins/docklet/docklet.c:147
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:150 src/gtkblist.c:1590 src/gtkpounce.c:460
-#: src/gtkprefs.c:1504 src/protocols/gg/gg.c:54 src/protocols/irc/irc.c:1021
+#: plugins/docklet/docklet.c:151 src/protocols/gg/gg.c:54
 #: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3437
-#: src/protocols/jabber/jabber.c:3491 src/protocols/oscar/oscar.c:2825
-#: src/protocols/oscar/oscar.c:4548 src/protocols/oscar/oscar.c:5449
-#: src/protocols/oscar/oscar.c:5843
+#: src/protocols/jabber/jabber.c:3491 src/protocols/oscar/oscar.c:2836
+#: src/protocols/oscar/oscar.c:4578 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:5875 src/gtkblist.c:1591 src/gtkpounce.c:460
+#: src/gtkprefs.c:1504
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:156 src/away.c:531
+#: plugins/docklet/docklet.c:157 src/away.c:524
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:164
+#: plugins/docklet/docklet.c:165
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:169 src/gtkft.c:557
+#: plugins/docklet/docklet.c:170 src/gtkft.c:559
 msgid "File Transfers"
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:170 src/gtkaccount.c:1739 src/main.c:325
+#: plugins/docklet/docklet.c:171 src/gtkaccount.c:1740 src/main.c:320
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:171 src/gtkprefs.c:2356 src/main.c:335
+#: plugins/docklet/docklet.c:172 src/gtkprefs.c:2356 src/main.c:330
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:180
+#: plugins/docklet/docklet.c:181
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:184
+#: plugins/docklet/docklet.c:185
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:413
+#: plugins/docklet/docklet.c:466
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:417
+#: plugins/docklet/docklet.c:470
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -84,30 +84,43 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:441
+#: plugins/docklet/docklet.c:494
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:444
+#: plugins/docklet/docklet.c:497
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:446
-#, fuzzy
+#: plugins/docklet/docklet.c:499
 msgid ""
-"Interacts with a Notification Area applet (in GNOME, KDE or Windows for "
-"example) to display the current status of Gaim, allow fast access to "
-"commonly used functions, and to toggle display of the buddy list or login "
-"window. Also allows messages to be queued until the icon is clicked, similar "
-"to ICQ."
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
 msgstr ""
-"与通知区程序(例如 GNOME 或 KDE)交互可以显示 Gaim 的当前状态,快速访问常用的功"
-"能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类似,还可以将消息存入队"
-"列。"
+"在系统的托盘区(如 GNOME,KDE 或 Windows)显示一个图标,表示 Gaim 的当前状态,"
+"并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
+"似,还可以将消息存入队列。"
+
+#.
+#. *  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 - 离开"
 
 #. *< api_version
 #. *< type
@@ -127,20 +140,20 @@
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
-#: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
+#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
 msgid "Mail Server"
 msgstr "邮件服务器"
 
-#: plugins/chkmail.c:131
+#: plugins/chkmail.c:132
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s (%d 封新邮件/共 %d 封)"
 
-#: plugins/chkmail.c:203
+#: plugins/chkmail.c:195
 msgid "Check Mail"
 msgstr "检查邮件"
 
-#: plugins/chkmail.c:207
+#: plugins/chkmail.c:199
 msgid "Check email every X seconds.\n"
 msgstr "每隔 X 秒检查邮件。\n"
 
@@ -272,7 +285,7 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
-#: plugins/idle.c:70 src/protocols/irc/irc.c:936
+#: plugins/idle.c:70
 msgid "Idle Time"
 msgstr "瞌睡时间"
 
@@ -300,90 +313,69 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允许您手动配置您睡了多长时间"
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/mailchk.c:149
+#: plugins/mailchk.c:152
 msgid "Mail Checker"
 msgstr "邮件检查器"
 
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/mailchk.c:152 plugins/mailchk.c:154
+#: plugins/mailchk.c:154 plugins/mailchk.c:155
 msgid "Checks for new local mail."
 msgstr "检查新的本地邮件。"
 
-#: plugins/notify.c:442
-msgid "Unable to write to config file"
-msgstr "无法写入配置文件"
-
-#: plugins/notify.c:443
-msgid "Notify plugin"
-msgstr "通知插件"
-
-#: plugins/notify.c:573
+#. ---------- "Notify For" ----------
+#: plugins/notify.c:701
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:574
+#: plugins/notify.c:705
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:579
+#: plugins/notify.c:710
 msgid "_Chat windows"
 msgstr "聊天窗口(_C)"
 
-#. --------------
-#: plugins/notify.c:585
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:716
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:588
-msgid "Prepend _string into window title (hit enter to save):"
-msgstr "在窗口标题前追加字符串(按回车保存)(_S):"
-
-#: plugins/notify.c:599
+#: plugins/notify.c:722
+msgid "Prepend _string into window title:"
+msgstr "在窗口标题前追加字符串(_S):"
+
+#: plugins/notify.c:733
 msgid "_Quote window title"
 msgstr "引用窗口标题(_Q)"
 
-#: plugins/notify.c:604
+#: plugins/notify.c:738
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
-#: plugins/notify.c:609
+#: plugins/notify.c:743
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
-#: plugins/notify.c:614
+#: plugins/notify.c:748
 msgid "_Notify even if conversation is in focus"
 msgstr "即使正处于对话中也通知(_N)"
 
-#. --------------
-#: plugins/notify.c:620
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:754
 msgid "Notification Removal"
 msgstr "通知删除"
 
-#: plugins/notify.c:621
+#: plugins/notify.c:758
 msgid "Remove when conversation window gains _focus"
 msgstr "对话窗口获得焦点后即删除(_F)"
 
-#: plugins/notify.c:626
+#: plugins/notify.c:763
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
-#: plugins/notify.c:631
+#: plugins/notify.c:768
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
-#: plugins/notify.c:636
-msgid "Appl_y"
-msgstr "应用(_Y)"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -391,14 +383,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:699
+#: plugins/notify.c:845
 msgid "Message Notification"
 msgstr "邮件通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:702 plugins/notify.c:704
+#: plugins/notify.c:848 plugins/notify.c:850
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读邮件。"
 
@@ -684,7 +676,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: plugins/perl/perl.c:405
+#: plugins/perl/perl.c:410
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register 调用参数不对。请参考 PERL-HOWTO。"
 
@@ -695,13 +687,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1392
+#: plugins/perl/perl.c:1397
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
+#: plugins/perl/perl.c:1399 plugins/perl/perl.c:1400
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -726,7 +718,7 @@
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
 #: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1184
-#: src/protocols/msn/msn.c:336 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
 #: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1257
 #: src/protocols/yahoo/yahoo.c:1336
@@ -742,9 +734,9 @@
 msgstr "只对好友离开"
 
 #: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3440
-#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2829
-#: src/protocols/oscar/oscar.c:4536 src/protocols/oscar/oscar.c:4563
-#: src/protocols/oscar/oscar.c:5848 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2840
+#: src/protocols/oscar/oscar.c:4566 src/protocols/oscar/oscar.c:4593
+#: src/protocols/oscar/oscar.c:5880 src/protocols/yahoo/yahoo.c:1071
 #: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1346
 msgid "Invisible"
 msgstr "隐身"
@@ -798,7 +790,8 @@
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
-#: src/protocols/gg/gg.c:402
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/gg/gg.c:402 src/protocols/toc/toc.c:207
 msgid "Unable to connect."
 msgstr "无法连接。"
 
@@ -823,6 +816,7 @@
 msgstr "GG 库的关键错误\n"
 
 #: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/toc/toc.c:183
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
@@ -862,11 +856,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:168 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:186 src/request.h:804
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:169 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:187 src/request.h:804
 msgid "No"
 msgstr "否"
 
@@ -896,8 +890,8 @@
 msgstr "性别"
 
 #. City
-#: src/dialogs.c:2035 src/dialogs.c:2684 src/protocols/gg/gg.c:705
-#: src/protocols/trepia/trepia.c:364
+#: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
+#: src/dialogs.c:1976 src/dialogs.c:2602
 msgid "City"
 msgstr "城市"
 
@@ -993,9 +987,9 @@
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/dialogs.c:2146 src/dialogs.c:2155 src/protocols/gg/gg.c:1195
-#: src/protocols/jabber/jabber.c:4322 src/protocols/oscar/oscar.c:6112
-#: src/protocols/toc/toc.c:1474
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4344
+#: src/protocols/oscar/oscar.c:6144 src/protocols/toc/toc.c:1488
+#: src/dialogs.c:2087 src/dialogs.c:2096
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -1040,28 +1034,28 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 与 ICQ 服务器通讯错误。"
 
-#: src/dialogs.c:2452 src/gtkconv.c:1112 src/gtkconv.c:2963 src/gtkconv.c:4123
-#: src/gtkrequest.c:175 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2673 src/prpl.c:312
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2684
+#: src/dialogs.c:866 src/gtkconv.c:1114 src/gtkconv.c:2965 src/gtkconv.c:4126
+#: src/gtkrequest.c:193 src/prpl.c:312
 msgid "Add"
 msgstr "添加"
 
 #. Cancel button.
-#: src/buddy_chat.c:375 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:2092 src/dialogs.c:2207 src/dialogs.c:2273 src/dialogs.c:2441
-#: src/dialogs.c:2626 src/dialogs.c:2775 src/dialogs.c:3447 src/dialogs.c:3941
-#: src/dialogs.c:4883 src/gtkaccount.c:1477 src/gtkconn.c:146
-#: src/gtkrequest.c:171 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/irc/irc.c:1105 src/protocols/irc/irc.c:1434
-#: src/protocols/msn/msn.c:171 src/protocols/msn/msn.c:182
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
-#: src/protocols/msn/msn.c:217 src/protocols/oscar/oscar.c:2404
-#: src/protocols/oscar/oscar.c:2441 src/protocols/oscar/oscar.c:2476
-#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:5721
-#: src/protocols/oscar/oscar.c:5936 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:6045 src/protocols/trepia/trepia.c:380
-#: src/protocols/yahoo/yahoo.c:1188 src/prpl.c:313 src/request.h:813
-#: src/request.h:823
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4126
+#: src/protocols/msn/msn.c:172 src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:194 src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:218 src/protocols/oscar/oscar.c:2415
+#: src/protocols/oscar/oscar.c:2452 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:5753
+#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:6017
+#: src/protocols/oscar/oscar.c:6077 src/protocols/trepia/trepia.c:380
+#: src/protocols/yahoo/yahoo.c:1188 src/buddy_chat.c:375 src/connection.c:141
+#: src/dialogs.c:453 src/dialogs.c:465 src/dialogs.c:478 src/dialogs.c:867
+#: src/dialogs.c:2033 src/dialogs.c:2148 src/dialogs.c:2214 src/dialogs.c:2378
+#: src/dialogs.c:2391 src/dialogs.c:2544 src/dialogs.c:2693 src/dialogs.c:3365
+#: src/dialogs.c:3532 src/dialogs.c:3574 src/dialogs.c:3711 src/dialogs.c:4048
+#: src/gtkaccount.c:1478 src/gtkconn.c:147 src/gtkrequest.c:189 src/prpl.c:313
+#: src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "取消"
 
@@ -1072,14 +1066,13 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1716
 #: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
-#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5097
+#: src/protocols/oscar/oscar.c:2612 src/protocols/oscar/oscar.c:5127
 msgid "Authorize"
 msgstr "同意"
 
-#: src/dialogs.c:2440 src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1717 src/protocols/msn/notification.c:467
-#: src/protocols/msn/notification.c:749 src/protocols/oscar/oscar.c:2603
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1717
+#: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
+#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5128
 msgid "Deny"
 msgstr "拒绝"
 
@@ -1088,10 +1081,11 @@
 msgstr "通过服务器中转消息"
 
 #: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2335
-#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4238
-#: src/protocols/jabber/jabber.c:4287 src/protocols/msn/dispatch.c:160
-#: src/protocols/msn/msn.c:459 src/protocols/msn/notification.c:1376
-#: src/protocols/napster/napster.c:496
+#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4260
+#: src/protocols/jabber/jabber.c:4309 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:460 src/protocols/msn/notification.c:1383
+#: src/protocols/napster/napster.c:465 src/protocols/napster/napster.c:496
+#: src/protocols/yahoo/yahoo.c:965
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -1099,7 +1093,7 @@
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3950
 msgid "Nick:"
 msgstr "昵称:"
 
@@ -1107,243 +1101,24 @@
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/irc.c:187
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-msgstr "(转换此消息出错。请检查账户编辑器中的“编码”选项)"
-
-#: src/protocols/irc/irc.c:488 src/protocols/irc/irc.c:2608
-#, c-format
-msgid "DCC Chat with %s closed"
-msgstr "与 %s 的二人世界已关闭"
-
-#: src/protocols/irc/irc.c:541 src/protocols/irc/irc.c:2617
-#, c-format
-msgid "DCC Chat with %s established"
-msgstr "与 %s 的二人世界已建立"
-
-#: src/protocols/irc/irc.c:676
-msgid "No topic is set"
-msgstr "没有设置话题"
-
-#: src/protocols/irc/irc.c:697 src/protocols/irc/irc.c:1755
-#, c-format
-msgid "<B>%s has changed the topic to: %s</B>"
-msgstr "<B>%s 已经将话题改为:%s</B>"
-
-#: src/protocols/irc/irc.c:742
-#, c-format
-msgid "-:- mode/%s [%c%c %s] by %s"
-msgstr "-:- 模式/%s [%c%c %s] 由 %s"
-
-#: src/protocols/irc/irc.c:919 src/protocols/irc/irc.c:932
-msgid "User"
-msgstr "用户名"
-
-#. Splits
-#: src/protocols/irc/irc.c:923 src/protocols/irc/irc.c:3031
-#: src/protocols/jabber/jabber.c:4418 src/protocols/napster/napster.c:639
-msgid "Server"
-msgstr "服务器"
-
-#: src/protocols/irc/irc.c:927 src/protocols/irc/irc.c:1082
-#: src/protocols/irc/irc.c:1647
-msgid "IRC Operator"
-msgstr "IRC 管理者"
-
-#: src/protocols/irc/irc.c:940
-msgid "Channels"
-msgstr "频道"
-
-#: src/protocols/irc/irc.c:946
-#, c-format
-msgid "%s is an Identified User"
-msgstr "%s 是标识的用户"
-
-#: src/protocols/irc/irc.c:961
-#, c-format
-msgid "%ld seconds [signon: %s]"
-msgstr "%ld 秒 [登入:%s]"
-
-#. RPL_REHASHING
-#: src/protocols/irc/irc.c:1082
-msgid "Rehashing server"
-msgstr "正在重连服务器"
-
-#. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1085
-msgid "No such nick/channel"
-msgstr "没有这样的昵称/频道"
-
-#: src/protocols/irc/irc.c:1085 src/protocols/irc/irc.c:1088
-#: src/protocols/irc/irc.c:1093 src/protocols/irc/irc.c:1097
-#: src/protocols/irc/irc.c:1463 src/protocols/irc/irc.c:1605
-msgid "IRC Error"
-msgstr "IRC 出错"
-
-#. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1088
-msgid "No such server"
-msgstr "没有该服务器"
-
-#. ERR_NOMOTD
-#. drop it - bringing up dialog for NOMOTD is annoying
-#. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1093
-msgid "No nickname given"
-msgstr "没有给出昵称"
-
-#. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1096
-msgid "You're not an IRC operator!"
-msgstr "您不是 IRC 管理员!"
-
-#: src/protocols/irc/irc.c:1100
-msgid "That nick is already in use.  Please enter a new nick"
-msgstr "该昵称已经被其他人使用了。请输入新昵称"
-
-#. Build OK Button
-#: src/dialogs.c:2203 src/dialogs.c:2341 src/dialogs.c:2625 src/dialogs.c:2771
-#: src/dialogs.c:3934 src/gtkrequest.c:170 src/protocols/irc/irc.c:1104
-#: src/protocols/msn/msn.c:170 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/oscar/oscar.c:2440 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:5935 src/protocols/oscar/oscar.c:5984
-#: src/protocols/oscar/oscar.c:6044 src/protocols/yahoo/yahoo.c:1187
-#: src/request.h:813
-msgid "OK"
-msgstr "确定"
-
-#: src/protocols/irc/irc.c:1390 src/protocols/irc/irc.c:1396
-#: src/protocols/irc/irc.c:1402 src/protocols/irc/irc.c:1416
-msgid "IRC CTCP info"
-msgstr "IRC CTCP 信息"
-
-#: src/protocols/irc/irc.c:1426
-#, c-format
-msgid "%s would like to establish a DCC chat"
-msgstr "%s 想要建立二人世界"
-
-#: src/protocols/irc/irc.c:1429
-msgid ""
-"This requires a direct connection to be established between the two "
-"computers.  Messages sent will not pass through the IRC server"
-msgstr "这需要在两台计算机之间建立直接连接。发送的消息不通过 IRC 服务器"
-
-#: src/protocols/irc/irc.c:1433 src/protocols/oscar/oscar.c:2403
-#: src/protocols/oscar/oscar.c:5720
-msgid "Connect"
-msgstr "连接"
-
-#: src/protocols/irc/irc.c:1460
-#, c-format
-msgid "Received an invalid file send request from %s."
-msgstr "收到了 %s 发出的无效文件发送请求。"
-
-#: src/protocols/irc/irc.c:1541 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
-msgid "Unable to write"
-msgstr "无法写入"
-
-#: src/protocols/irc/irc.c:1603
-#, c-format
-msgid "You have been kicked from %s: %s"
-msgstr "您已经被踢出了 %s: %s"
-
-#: src/protocols/irc/irc.c:1608
-#, c-format
-msgid "Kicked by %s: %s"
-msgstr "被 %s 踢出:%s"
-
-#: src/protocols/irc/irc.c:1664 src/protocols/irc/irc.c:2918
-msgid "CTCP ClientInfo"
-msgstr "CTCP 客户信息"
-
-#: src/protocols/irc/irc.c:1670 src/protocols/irc/irc.c:2924
-msgid "CTCP UserInfo"
-msgstr "CTCP 用户信息"
-
-#: src/protocols/irc/irc.c:1676 src/protocols/irc/irc.c:2930
-msgid "CTCP Version"
-msgstr "CTCP 版本"
-
-#: src/protocols/irc/irc.c:1704 src/protocols/irc/irc.c:2936
-msgid "CTCP Ping"
-msgstr "CTCP Ping"
-
-#: src/protocols/irc/irc.c:1949 src/protocols/oscar/oscar.c:678
+#: src/protocols/irc/irc.c:123
+msgid "Channel:"
+msgstr "频道:"
+
+#: src/protocols/irc/irc.c:128 src/gtkaccount.c:423 src/main.c:304
+msgid "Password:"
+msgstr "密码:"
+
+#: src/protocols/irc/irc.c:162 src/protocols/oscar/oscar.c:683
 #: src/protocols/toc/toc.c:234
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:1963 src/protocols/trepia/trepia.c:1148
-msgid "Unable to create socket"
+#: src/protocols/irc/irc.c:171
+msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:2204
-#, c-format
-msgid "Topic for %s is %s"
-msgstr "%s 的话题是 %s"
-
-#: src/protocols/irc/irc.c:2300
-#, c-format
-msgid "You have left %s"
-msgstr "您已经离开了 %s"
-
-#: src/protocols/irc/irc.c:2301
-msgid "IRC Part"
-msgstr "IRC 部分"
-
-#: src/protocols/irc/irc.c:2356
-msgid "<I>Requesting DCC CHAT</I>"
-msgstr "<I>正在请求二人世界</I>"
-
-#: src/protocols/irc/irc.c:2373
-msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
-msgstr "<B>管理员命令:<BR>REHASH RESTART</B>"
-
-#: src/protocols/irc/irc.c:2378
-msgid ""
-"<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
-"<nick><BR>PING <nick></B><BR>"
-msgstr ""
-"<B>CTCP 命令:<BR>CLIENTINFO <昵称><BR>USERINFO <昵称><BR>VERSION <昵称"
-"><BR>PING <昵称></B><BR>"
-
-#: src/protocols/irc/irc.c:2386
-msgid "<B>DCC commands:<BR>CHAT <nick></B>"
-msgstr "<B>二人世界命令:<BR>CHAT <昵称></B>"
-
-#: src/protocols/irc/irc.c:2391
-msgid ""
-"<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
-"TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
-"W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
-"CTCP commands<BR>Type /HELP DCC for DCC commands"
-msgstr ""
-"<B>目前支持的命令:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC KICK<BR>OP "
-"DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W WHOWAS<BR>输"
-"入 /HELP OPER 可查看管理员命令<BR>输入 /HELP CTCP 可查看 CTCP 命令<BR>输入 /"
-"HELP DCC 可查看二人世界的命令"
-
-#: src/protocols/irc/irc.c:2414
-msgid "<B>Unknown command</B>"
-msgstr "<B>未知命令</B>"
-
-#: src/protocols/irc/irc.c:2474
-msgid "Channel:"
-msgstr "频道:"
-
-#: src/gtkaccount.c:422 src/main.c:309 src/protocols/irc/irc.c:2479
-msgid "Password:"
-msgstr "密码:"
-
-#: src/protocols/irc/irc.c:2905
-msgid "DCC Chat"
-msgstr "二人世界"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1353,19 +1128,26 @@
 #. *< id
 #. *< name
 #. *< version
-#. *  summary
-#: src/protocols/irc/irc.c:3011 src/protocols/irc/irc.c:3013
+#: src/protocols/irc/irc.c:486
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
-#. Account Options
-#: src/gtkprefs.c:1145 src/protocols/irc/irc.c:3035
-#: src/protocols/jabber/jabber.c:4425 src/protocols/msn/msn.c:1259
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
-msgid "Port"
-msgstr "端口"
-
-#: src/protocols/irc/irc.c:3039
+#. *  summary
+#: src/protocols/irc/irc.c:487
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "错误更少的 IRC 协议插件"
+
+#. Splits
+#: src/protocols/irc/irc.c:504 src/protocols/jabber/jabber.c:4440
+#: src/protocols/napster/napster.c:639
+msgid "Server"
+msgstr "服务器"
+
+#: src/protocols/irc/irc.c:507
+msgid "Port:"
+msgstr "端口:"
+
+#: src/protocols/irc/irc.c:510
 msgid "Encoding"
 msgstr "编码"
 
@@ -1373,19 +1155,19 @@
 #: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
 #: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
 #: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
-#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
-#: src/protocols/msn/msn.c:249 src/protocols/msn/msn.c:505
-#: src/protocols/msn/msn.c:616 src/protocols/msn/msn.c:632
-#: src/protocols/msn/msn.c:667 src/protocols/msn/msn.c:683
-#: src/protocols/msn/msn.c:715 src/protocols/msn/msn.c:723
-#: src/protocols/msn/msn.c:756 src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:778 src/protocols/msn/msn.c:787
-#: src/protocols/msn/msn.c:801 src/protocols/msn/msn.c:810
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:882
-#: src/protocols/msn/msn.c:920 src/protocols/msn/msn.c:1017
-#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1061
-#: src/protocols/msn/msn.c:1072 src/protocols/msn/msn.c:1083
-#: src/protocols/msn/msn.c:1107 src/protocols/msn/msn.c:1119
+#: src/protocols/msn/msn.c:92 src/protocols/msn/msn.c:150
+#: src/protocols/msn/msn.c:250 src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:617 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:668 src/protocols/msn/msn.c:684
+#: src/protocols/msn/msn.c:716 src/protocols/msn/msn.c:724
+#: src/protocols/msn/msn.c:757 src/protocols/msn/msn.c:765
+#: src/protocols/msn/msn.c:779 src/protocols/msn/msn.c:788
+#: src/protocols/msn/msn.c:802 src/protocols/msn/msn.c:811
+#: src/protocols/msn/msn.c:833 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:921 src/protocols/msn/msn.c:1018
+#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1062
+#: src/protocols/msn/msn.c:1073 src/protocols/msn/msn.c:1084
+#: src/protocols/msn/msn.c:1108 src/protocols/msn/msn.c:1120
 #: src/protocols/msn/notification.c:127 src/protocols/msn/notification.c:156
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:969
 #: src/protocols/trepia/trepia.c:281 src/protocols/trepia/trepia.c:782
@@ -1414,8 +1196,8 @@
 "password remains the same."
 msgstr "您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
 
-#: src/blist.c:794 src/gtkaccount.c:139 src/gtkpounce.c:307
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1169 src/blist.c:798 src/gtkaccount.c:140
+#: src/gtkpounce.c:307 src/gtkutils.c:781
 msgid "Unknown"
 msgstr "未知"
 
@@ -1431,8 +1213,8 @@
 msgstr "远远离开"
 
 #: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3439
-#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2819
-#: src/protocols/oscar/oscar.c:4551 src/protocols/oscar/oscar.c:5844
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2830
+#: src/protocols/oscar/oscar.c:4581 src/protocols/oscar/oscar.c:5876
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
@@ -1466,9 +1248,9 @@
 msgstr "没有这样的用户。"
 
 #. Should never happen.
-#: src/blist.c:502 src/dialogs.c:855 src/protocols/jabber/jabber.c:1831
-#: src/protocols/msn/notification.c:87 src/protocols/msn/notification.c:88
-#: src/protocols/msn/notification.c:644
+#: src/protocols/jabber/jabber.c:1831 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:502 src/dialogs.c:829
 msgid "Buddies"
 msgstr "好友"
 
@@ -1484,7 +1266,7 @@
 msgid "Password successfully changed."
 msgstr "密码更改成功。"
 
-#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4258
 msgid "Connection lost"
 msgstr "连接已丢失"
 
@@ -1498,7 +1280,7 @@
 
 #. we have no chats yet
 #: src/protocols/jabber/jabber.c:2363 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:450 src/protocols/napster/napster.c:489
+#: src/protocols/msn/msn.c:451 src/protocols/napster/napster.c:489
 #: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:986
 msgid "Connecting"
 msgstr "正在连接"
@@ -1533,7 +1315,7 @@
 msgstr "无法加入聊天"
 
 #: src/protocols/jabber/jabber.c:3228 src/protocols/jabber/jabber.c:3279
-#: src/protocols/jabber/jabber.c:3704
+#: src/protocols/jabber/jabber.c:3697
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
@@ -1542,12 +1324,12 @@
 msgstr "出错"
 
 #: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
-#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3723
 msgid "Status"
 msgstr "状态"
 
 #: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3372
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5489
 msgid "Not Authorized"
 msgstr "未认证"
 
@@ -1555,7 +1337,7 @@
 msgid "View Error Msg"
 msgstr "查看错误消息"
 
-#: src/gtkconv.c:1099 src/protocols/jabber/jabber.c:3397
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1101
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
@@ -1576,11 +1358,11 @@
 msgstr "重新请求认证"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1577 src/protocols/jabber/jabber.c:3435
-#: src/protocols/jabber/jabber.c:3485 src/protocols/oscar/oscar.c:2831
-#: src/protocols/oscar/oscar.c:4546 src/protocols/oscar/oscar.c:5842
-#: src/protocols/yahoo/yahoo.c:1075 src/protocols/zephyr/zephyr.c:866
-#: src/protocols/zephyr/zephyr.c:876
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3485
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4576
+#: src/protocols/oscar/oscar.c:5874 src/protocols/yahoo/yahoo.c:1075
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1578
 msgid "Online"
 msgstr "在线"
 
@@ -1600,7 +1382,7 @@
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/dialogs.c:2896 src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2814
 msgid "URL"
 msgstr "URL"
 
@@ -1625,8 +1407,8 @@
 msgstr "邮政编码"
 
 #. Country
-#: src/dialogs.c:2057 src/dialogs.c:2702 src/protocols/jabber/jabber.c:3635
-#: src/protocols/trepia/trepia.c:372
+#: src/protocols/jabber/jabber.c:3635 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:1998 src/dialogs.c:2620
 msgid "Country"
 msgstr "国家"
 
@@ -1634,7 +1416,7 @@
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/dialogs.c:2760 src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2678
 msgid "Email"
 msgstr "电子邮件"
 
@@ -1658,35 +1440,42 @@
 msgid "Birthday"
 msgstr "生日"
 
-#: src/dialogs.c:2906 src/gtkprefs.c:604 src/gtkprefs.c:1840
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2824 src/gtkprefs.c:604
+#: src/gtkprefs.c:1840
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3668
+#: src/protocols/jabber/jabber.c:4120 src/protocols/jabber/jabber.c:4121
+msgid "Edit Jabber vCard"
+msgstr "编辑 Jabber vCard"
+
+#: src/protocols/jabber/jabber.c:4122
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
-"comfortable"
-msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息"
-
-#: src/protocols/jabber/jabber.c:3669
-msgid "User Identity"
-msgstr "用户标识"
-
-#: src/protocols/jabber/jabber.c:4098
-msgid "Gaim - Edit Jabber vCard"
-msgstr "Gaim - 编辑 Jabber vCard"
-
-#: src/protocols/jabber/jabber.c:4173
+"comfortable."
+msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
+
+#: src/protocols/jabber/jabber.c:4125 src/protocols/trepia/trepia.c:379
+#: src/dialogs.c:2029 src/dialogs.c:2210 src/dialogs.c:3353 src/dialogs.c:4010
+#: src/gtkrequest.c:195
+msgid "Save"
+msgstr "保存"
+
+#: src/protocols/jabber/jabber.c:4195
 msgid "Server Registration successful!"
 msgstr "服务器注册成功!"
 
-#: src/protocols/jabber/jabber.c:4194
+#: src/protocols/jabber/jabber.c:4211
+#, c-format
+msgid "Error %d: %s"
+msgstr "错误 %d:%s"
+
+#: src/protocols/jabber/jabber.c:4216
 msgid "Unknown registration error"
 msgstr "未知的注册错误"
 
-#: src/dialogs.c:2232 src/protocols/jabber/jabber.c:4308
-#: src/protocols/oscar/oscar.c:6098 src/protocols/toc/toc.c:1462
+#: src/protocols/jabber/jabber.c:4330 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1476 src/dialogs.c:2173
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -1700,15 +1489,22 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
+#: src/protocols/jabber/jabber.c:4419 src/protocols/jabber/jabber.c:4421
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:4421
+#: src/protocols/jabber/jabber.c:4443
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/jabber.c:4429
+#. Account Options
+#: src/protocols/jabber/jabber.c:4447 src/protocols/msn/msn.c:1260
+#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
+#: src/gtkprefs.c:1145
+msgid "Port"
+msgstr "端口"
+
+#: src/protocols/jabber/jabber.c:4451
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -1745,15 +1541,15 @@
 msgstr "无法处理消息。"
 
 #: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:407
-#: src/protocols/msn/notification.c:1385
+#: src/protocols/msn/notification.c:1392
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1392
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1399
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1413
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
@@ -1825,7 +1621,7 @@
 msgid "Required fields missing"
 msgstr "缺少必须域"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -1877,6 +1673,11 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
+#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:292
+#: src/protocols/msn/notification.c:760
+msgid "Unable to write"
+msgstr "无法写入"
+
 #: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "会话过载"
@@ -1922,31 +1723,44 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:166
+#: src/protocols/msn/msn.c:167
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: src/protocols/msn/msn.c:167
+#: src/protocols/msn/msn.c:168
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: src/protocols/msn/msn.c:179
+#. Build OK Button
+#: src/protocols/msn/msn.c:171 src/protocols/msn/msn.c:182
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
+#: src/protocols/oscar/oscar.c:2451 src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:5967 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6076 src/protocols/yahoo/yahoo.c:1187
+#: src/connection.c:140 src/dialogs.c:2144 src/dialogs.c:2282
+#: src/dialogs.c:2543 src/dialogs.c:2689 src/dialogs.c:3531 src/dialogs.c:3573
+#: src/dialogs.c:3704 src/dialogs.c:4047 src/gtkrequest.c:188
+#: src/request.h:813
+msgid "OK"
+msgstr "确定"
+
+#: src/protocols/msn/msn.c:180
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:202
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: src/protocols/msn/msn.c:210
+#: src/protocols/msn/msn.c:211
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: src/protocols/msn/msn.c:211
+#: src/protocols/msn/msn.c:212
 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?"
@@ -1954,100 +1768,99 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:216
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:217
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:234
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:236
 msgid "Page"
 msgstr "寻呼"
 
-#: src/about.c:151 src/dialogs.c:4231 src/gtkrequest.c:173
-#: src/protocols/msn/msn.c:236 src/server.c:1458
+#: src/protocols/msn/msn.c:237 src/about.c:151 src/dialogs.c:4001
+#: src/gtkrequest.c:191 src/server.c:1459
 msgid "Close"
 msgstr "关闭"
 
-#: src/protocols/msn/msn.c:324 src/protocols/yahoo/yahoo.c:1126
+#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
 
-#: src/protocols/msn/msn.c:337 src/protocols/msn/msn.c:592
+#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:593
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:595
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1053
 #: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1337
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:597
 #: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1055
 #: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1338
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:599
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1063
 #: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1342
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:600
+#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:601
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1067
 #: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1344
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:602
+#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:603
 #: src/protocols/zephyr/zephyr.c:863 src/protocols/zephyr/zephyr.c:878
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:354
+#: src/protocols/msn/msn.c:355
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:363
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:368
+#: src/protocols/msn/msn.c:369
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:374
+#: src/protocols/msn/msn.c:375
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:384
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:390
+#: src/protocols/msn/msn.c:391
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:414
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:422
-#, fuzzy
+#: src/protocols/msn/msn.c:423
 msgid "Initiate Chat"
-msgstr "给聊天起名"
-
-#: src/protocols/msn/msn.c:696
+msgstr "进入聊天室"
+
+#: src/protocols/msn/msn.c:697
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2056,11 +1869,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:700 src/protocols/msn/msn.c:740
+#: src/protocols/msn/msn.c:701 src/protocols/msn/msn.c:741
 msgid "Invalid MSN screenname"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:736
+#: src/protocols/msn/msn.c:737
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2079,14 +1892,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1235 src/protocols/msn/msn.c:1237
+#: src/protocols/msn/msn.c:1236 src/protocols/msn/msn.c:1238
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1254 src/protocols/trepia/trepia.c:1372
+#: src/protocols/msn/msn.c:1255 src/protocols/trepia/trepia.c:1372
 msgid "Login server"
 msgstr "登录服务器"
 
+#: src/protocols/msn/notification.c:197
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN 错误:%s\n"
+
 #: src/protocols/msn/notification.c:235
 msgid "Unable to request INF"
 msgstr "无法请求 INF"
@@ -2133,23 +1951,30 @@
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:1346
+#: src/protocols/msn/notification.c:1348
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute(s). You will "
-"automatically be signed out at that time. Please finish any conversations in "
-"progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr ""
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
 "MSN 服务器即将于 %d 分钟后关闭进行维护。到那时,您将会被自动登出。请尽快关闭"
 "现在进行中的对话。\n"
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/gtkpounce.c:464 src/gtkprefs.c:1532 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1073
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1073
+#: src/gtkpounce.c:464 src/gtkprefs.c:1532
 msgid "Idle"
 msgstr "瞌睡"
 
@@ -2170,6 +1995,11 @@
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
+#: src/protocols/napster/napster.c:246
+#, c-format
+msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+msgstr "无法从服务器读取信息。命令为 %hd,长度为 %hd。"
+
 #: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
@@ -2203,12 +2033,12 @@
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/gtkblist.c:1573 src/protocols/napster/napster.c:531
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1574
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
-#: src/protocols/toc/toc.c:1201
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5198
+#: src/protocols/toc/toc.c:1215
 msgid "Join what group:"
 msgstr "加入组:"
 
@@ -2226,176 +2056,177 @@
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/oscar/oscar.c:174
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:175
+#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:176
+#: src/protocols/oscar/oscar.c:181
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:177
+#: src/protocols/oscar/oscar.c:182
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:184
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:185
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:186
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: src/protocols/oscar/oscar.c:182
-msgid "Not supported by host"
-msgstr "主机不支持"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Not supported by client"
-msgstr "客户不支持"
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Refused by client"
-msgstr "客户拒绝"
-
-#: src/protocols/oscar/oscar.c:185
-msgid "Reply too big"
-msgstr "回复太大"
-
-#: src/protocols/oscar/oscar.c:186
-msgid "Responses lost"
-msgstr "响应丢失"
-
 #: src/protocols/oscar/oscar.c:187
-msgid "Request denied"
-msgstr "请求被禁止"
+msgid "Not supported by host"
+msgstr "主机不支持"
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Busted SNAC payload"
-msgstr "SNAC 有效负载激增"
+msgid "Not supported by client"
+msgstr "客户不支持"
 
 #: src/protocols/oscar/oscar.c:189
-msgid "Insufficient rights"
-msgstr "权限不够"
+msgid "Refused by client"
+msgstr "客户拒绝"
 
 #: src/protocols/oscar/oscar.c:190
-msgid "In local permit/deny"
-msgstr "本地许可/禁止"
+msgid "Reply too big"
+msgstr "回复太大"
 
 #: src/protocols/oscar/oscar.c:191
-msgid "Too evil (sender)"
-msgstr "太邪恶(发送者)"
+msgid "Responses lost"
+msgstr "响应丢失"
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Too evil (receiver)"
-msgstr "太邪恶(接收者)"
+msgid "Request denied"
+msgstr "请求被禁止"
 
 #: src/protocols/oscar/oscar.c:193
-msgid "User temporarily unavailable"
-msgstr "用户临时不可用"
+msgid "Busted SNAC payload"
+msgstr "SNAC 有效负载激增"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "No match"
-msgstr "无匹配"
+msgid "Insufficient rights"
+msgstr "权限不够"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "List overflow"
-msgstr "列表溢出"
+msgid "In local permit/deny"
+msgstr "本地许可/禁止"
 
 #: src/protocols/oscar/oscar.c:196
+msgid "Too evil (sender)"
+msgstr "太邪恶(发送者)"
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Too evil (receiver)"
+msgstr "太邪恶(接收者)"
+
+#: src/protocols/oscar/oscar.c:198
+msgid "User temporarily unavailable"
+msgstr "用户临时不可用"
+
+#: src/protocols/oscar/oscar.c:199
+msgid "No match"
+msgstr "无匹配"
+
+#: src/protocols/oscar/oscar.c:200
+msgid "List overflow"
+msgstr "列表溢出"
+
+#: src/protocols/oscar/oscar.c:201
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:202
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:608
-#: src/protocols/toc/toc.c:623 src/protocols/toc/toc.c:686
+#: src/protocols/oscar/oscar.c:535 src/protocols/toc/toc.c:224
+#: src/protocols/toc/toc.c:622 src/protocols/toc/toc.c:637
+#: src/protocols/toc/toc.c:700
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:862
+#: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:876
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:563
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:637 src/protocols/oscar/oscar.c:694
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:674
+#: src/protocols/oscar/oscar.c:679
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
+#: src/protocols/oscar/oscar.c:788 src/protocols/oscar/oscar.c:1171
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:790
+#: src/protocols/oscar/oscar.c:795
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
-#: src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:862 src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:880
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:858
+#: src/protocols/oscar/oscar.c:863
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:881
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1058 src/protocols/toc/toc.c:555
+#: src/protocols/oscar/oscar.c:1060 src/protocols/toc/toc.c:569
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1064
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1068
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1072
 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."
@@ -2404,21 +2235,21 @@
 "能会更长。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1074
+#: src/protocols/oscar/oscar.c:1076
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1078 src/protocols/toc/toc.c:640
+#: src/protocols/oscar/oscar.c:1080 src/protocols/toc/toc.c:654
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: src/protocols/oscar/oscar.c:1106
+#: src/protocols/oscar/oscar.c:1108
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1210 src/protocols/oscar/oscar.c:1240
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2426,29 +2257,29 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1213 src/protocols/oscar/oscar.c:1243
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1331
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1898 src/protocols/oscar/oscar.c:5558
+#: src/protocols/oscar/oscar.c:1909 src/protocols/oscar/oscar.c:5590
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2227 src/protocols/oscar/oscar.c:2249
+#: src/protocols/oscar/oscar.c:2238 src/protocols/oscar/oscar.c:2260
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2406
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2398
+#: src/protocols/oscar/oscar.c:2409
 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 "
@@ -2457,42 +2288,46 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2430
+#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:5752
+msgid "Connect"
+msgstr "连接"
+
+#: src/protocols/oscar/oscar.c:2441
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2449
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2439
+#: src/protocols/oscar/oscar.c:2450
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2467
+#: src/protocols/oscar/oscar.c:2478
 #, 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:2472 src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2483 src/protocols/oscar/oscar.c:2485
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
-#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2591
-#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5089
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:2523
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2602
+#: src/protocols/oscar/oscar.c:2622 src/protocols/oscar/oscar.c:2997
+#: src/protocols/oscar/oscar.c:3049 src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5165
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2518
+#: src/protocols/oscar/oscar.c:2529
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2602
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2501,11 +2336,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:2610 src/protocols/oscar/oscar.c:5125
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2622
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2515,17 +2350,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2623
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:2630
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2638
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2538,7 +2373,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2551,7 +2386,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2564,32 +2399,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2664
+#: src/protocols/oscar/oscar.c:2675
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个联系人:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2670
+#: src/protocols/oscar/oscar.c:2681
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您是否想要将此联系人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2674
+#: src/protocols/oscar/oscar.c:2685
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2756
+#: src/protocols/oscar/oscar.c:2767
 #, 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:2765
+#: src/protocols/oscar/oscar.c:2776
 #, 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:2774
+#: src/protocols/oscar/oscar.c:2785
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2597,167 +2432,171 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2783
+#: src/protocols/oscar/oscar.c:2794
 #, 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:2792
+#: src/protocols/oscar/oscar.c:2803
 #, 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:2801
+#: src/protocols/oscar/oscar.c:2812
 #, 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:2817 src/protocols/oscar/oscar.c:4560
-#: src/protocols/oscar/oscar.c:5847
+#: src/protocols/oscar/oscar.c:2828 src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:5879
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
-#: src/protocols/oscar/oscar.c:5845
+#: src/protocols/oscar/oscar.c:2832 src/protocols/oscar/oscar.c:4584
+#: src/protocols/oscar/oscar.c:5877
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4557
-#: src/protocols/oscar/oscar.c:5846
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4587
+#: src/protocols/oscar/oscar.c:5878
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:2838
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2887
+#: src/protocols/oscar/oscar.c:2898
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2900
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2959
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2960
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3036
+#: src/protocols/oscar/oscar.c:3047
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息可用:"
 
-#: src/gtkaccount.c:277 src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:3081 src/gtkaccount.c:278
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: src/protocols/oscar/oscar.c:3073
+#: src/protocols/oscar/oscar.c:3084
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5876
+#: src/protocols/oscar/oscar.c:3087 src/protocols/oscar/oscar.c:5908
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/gtkblist.c:1582 src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:3090 src/gtkblist.c:1583
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5892
+#: src/protocols/oscar/oscar.c:3093 src/protocols/oscar/oscar.c:5924
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5884
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:5916
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3100
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3103
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3095
+#: src/protocols/oscar/oscar.c:3106
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3109
 msgid "EveryBuddy Bug"
 msgstr "每个好友的 Bug"
 
-#: src/protocols/oscar/oscar.c:3101
+#: src/protocols/oscar/oscar.c:3112
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3115
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3107
+#: src/protocols/oscar/oscar.c:3118
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3121
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:3113
+#: src/protocols/oscar/oscar.c:3124
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3127
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3130
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3159
+#: src/protocols/oscar/oscar.c:3133
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:3173
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>无法显示信息,原因是其发送编码未知。</i>"
 
-#: src/protocols/oscar/oscar.c:3166
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上线时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3185
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成员时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3191
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "瞌睡:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3194
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3182
+#: src/protocols/oscar/oscar.c:3196
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2770,207 +2609,207 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3228
 msgid "<i>User has no away message</i>"
 msgstr "<i>用户无离开消息</i>"
 
-#: src/protocols/oscar/oscar.c:3225
+#: src/protocols/oscar/oscar.c:3239
 msgid "Client Capabilities: "
 msgstr "客户能力:"
 
-#: src/protocols/oscar/oscar.c:3231
+#: src/protocols/oscar/oscar.c:3245
 msgid "<i>No Information Provided</i>"
 msgstr "<i>没有提供信息</i>"
 
-#: src/protocols/oscar/oscar.c:3255
+#: src/protocols/oscar/oscar.c:3269
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3642
+#: src/protocols/oscar/oscar.c:3656
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3643
-#, fuzzy
+#: src/protocols/oscar/oscar.c:3657
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"最后一条消息未送出,原因是您已经得到了速度极限。请等 10 秒,然后再试一次。"
-
-#: src/protocols/oscar/oscar.c:3704
+"您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
+"一次。"
+
+#: src/protocols/oscar/oscar.c:3718
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3706
+#: src/protocols/oscar/oscar.c:3720
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3948
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3939
+#: src/protocols/oscar/oscar.c:3953
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3956
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3959 src/protocols/oscar/oscar.c:3965
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3970
 msgid "Mobile Phone:"
 msgstr "移动电话:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3973
 msgid "Gender:"
 msgstr "性别:"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:3982
 msgid "Birthday:"
 msgstr "生日:"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:3987
 msgid "Age:"
 msgstr "年龄:"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3990
 msgid "Personal Web Page:"
 msgstr "个人主页:"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3993
 msgid "Additional Information:"
 msgstr "额外信息:"
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:3997
 msgid "Home Address:"
 msgstr "家庭住址:"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:3999 src/protocols/oscar/oscar.c:4015
 msgid "Address:"
 msgstr "地址:"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4002 src/protocols/oscar/oscar.c:4018
 msgid "City:"
 msgstr "城市:"
 
-#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4005 src/protocols/oscar/oscar.c:4021
 msgid "State:"
 msgstr "州/省:"
 
-#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
+#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
 msgid "Zip Code:"
 msgstr "邮政编码:"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4013
 msgid "Work Address:"
 msgstr "办公地址:"
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:4029
 msgid "Work Information:"
 msgstr "工作信息:"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4031
 msgid "Company:"
 msgstr "公司:"
 
-#: src/protocols/oscar/oscar.c:4020
+#: src/protocols/oscar/oscar.c:4034
 msgid "Division:"
 msgstr "部门:"
 
-#: src/protocols/oscar/oscar.c:4023
+#: src/protocols/oscar/oscar.c:4037
 msgid "Position:"
 msgstr "职务:"
 
-#: src/protocols/oscar/oscar.c:4026
+#: src/protocols/oscar/oscar.c:4040
 msgid "Web Page:"
 msgstr "网页:"
 
-#: src/protocols/oscar/oscar.c:4094
+#: src/protocols/oscar/oscar.c:4108
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 拥有下列用户名:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4112
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4149
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4177
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4166
+#: src/protocols/oscar/oscar.c:4180
 #, 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:4169
+#: src/protocols/oscar/oscar.c:4183
 #, 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:4172
+#: src/protocols/oscar/oscar.c:4186
 #, 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:4175
+#: src/protocols/oscar/oscar.c:4189
 #, 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:4178
+#: src/protocols/oscar/oscar.c:4192
 #, 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:4181
+#: src/protocols/oscar/oscar.c:4195
 #, 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:4184
+#: src/protocols/oscar/oscar.c:4198
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4194
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2979,20 +2818,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4216
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4200
+#: src/protocols/oscar/oscar.c:4214
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4425
+#: src/protocols/oscar/oscar.c:4449
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4426
+#: src/protocols/oscar/oscar.c:4450
 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 "
@@ -3001,22 +2840,25 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4480
 #, c-format
 msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
-
-#: src/protocols/oscar/oscar.c:4458
+msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
+
+#: src/protocols/oscar/oscar.c:4485
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:4505
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -3025,24 +2867,27 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it and set you away."
-msgstr ""
+"truncated it for you."
+msgstr[0] ""
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:4550
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4740
+#: src/protocols/oscar/oscar.c:4770
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4741
+#: src/protocols/oscar/oscar.c:4771
 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 "
@@ -3051,12 +2896,12 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4832 src/protocols/oscar/oscar.c:4833
-#: src/protocols/oscar/oscar.c:4838
+#: src/protocols/oscar/oscar.c:4862 src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4868
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:5002
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3064,15 +2909,15 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:5002 src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5032 src/protocols/oscar/oscar.c:5045
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
+#: src/protocols/oscar/oscar.c:5033 src/protocols/oscar/oscar.c:5046
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5045
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3082,18 +2927,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5080
 #, 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:5056
+#: src/protocols/oscar/oscar.c:5086
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5119
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3103,17 +2948,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5131
+#: src/protocols/oscar/oscar.c:5161
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5162
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3123,91 +2968,91 @@
 "用户 %s 拒绝了您将其加入联系人列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5136
+#: src/protocols/oscar/oscar.c:5166
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
+#: src/protocols/oscar/oscar.c:5203 src/protocols/toc/toc.c:1220
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5425
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5402
+#: src/protocols/oscar/oscar.c:5434
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5441
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5416
+#: src/protocols/oscar/oscar.c:5448
 msgid "<b>Available:</b> "
 msgstr "<b>可用:</b>"
 
-#: src/protocols/oscar/oscar.c:5425
+#: src/protocols/oscar/oscar.c:5457
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/gtkblist.c:896 src/protocols/oscar/oscar.c:5429
+#: src/protocols/oscar/oscar.c:5461 src/gtkblist.c:896
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5491
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5732
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:5713
+#: src/protocols/oscar/oscar.c:5745
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:5716
+#: src/protocols/oscar/oscar.c:5748
 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:5861
+#: src/protocols/oscar/oscar.c:5893
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:5905
+#: src/protocols/oscar/oscar.c:5937
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:5926
+#: src/protocols/oscar/oscar.c:5958
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:5927
+#: src/protocols/oscar/oscar.c:5959
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:5965
 msgid "New screenname formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:5982
+#: src/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6028
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您正在等待下列好友的认证:<BR>"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6053
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/oscar/oscar.c:6058
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3216,43 +3061,43 @@
 "%s<BR><BR>如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后"
 "单击“重新请求认证”。"
 
-#: src/protocols/oscar/oscar.c:6042
+#: src/protocols/oscar/oscar.c:6074
 msgid "Available Message:"
 msgstr "可用消息:"
 
-#: src/protocols/oscar/oscar.c:6043
+#: src/protocols/oscar/oscar.c:6075
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "孤独的人是可耻的,跟我聊聊吧!"
 
-#: src/protocols/oscar/oscar.c:6105
+#: src/protocols/oscar/oscar.c:6137
 msgid "Set Available Message"
 msgstr "设置可用消息"
 
-#: src/protocols/oscar/oscar.c:6119
+#: src/protocols/oscar/oscar.c:6151
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:6130
+#: src/protocols/oscar/oscar.c:6162
 msgid "Format Screenname"
 msgstr "格式化用户名"
 
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:6168
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/oscar/oscar.c:6174
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:6180
 msgid "Change Current Registered Address"
 msgstr "更改当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:6189
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6197
 msgid "Search for Buddy by Email"
 msgstr "按电子邮件搜索好友"
 
@@ -3266,15 +3111,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6286 src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6318 src/protocols/oscar/oscar.c:6320
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6337
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6310
+#: src/protocols/oscar/oscar.c:6342
 msgid "Auth port"
 msgstr "认证端口"
 
@@ -3283,105 +3128,105 @@
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:508
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:511
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:514
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:517
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:520
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:523
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:526
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:529
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:532
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:535
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:538
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:541
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:544
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:547
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:550
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:553
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:556
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:559
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:563
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:566
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败:%s。"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:572
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:575
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:578
 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."
@@ -3389,37 +3234,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:566
+#: src/protocols/toc/toc.c:580
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误:%s。"
 
-#: src/protocols/toc/toc.c:569
+#: src/protocols/toc/toc.c:583
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息:%s"
 
-#: src/protocols/toc/toc.c:589
+#: src/protocols/toc/toc.c:603
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:627
+#: src/protocols/toc/toc.c:641
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:692
+#: src/protocols/toc/toc.c:706
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:880
+#: src/protocols/toc/toc.c:894
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:884
+#: src/protocols/toc/toc.c:898
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:885
+#: src/protocols/toc/toc.c:899
 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 "
@@ -3429,47 +3274,47 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1344
+#: src/protocols/toc/toc.c:1358
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1468
+#: src/protocols/toc/toc.c:1482
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1591
+#: src/protocols/toc/toc.c:1605
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1627
+#: src/protocols/toc/toc.c:1641
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1712
-#: src/protocols/toc/toc.c:1924
+#: src/protocols/toc/toc.c:1686 src/protocols/toc/toc.c:1726
+#: src/protocols/toc/toc.c:1938
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1836
+#: src/protocols/toc/toc.c:1850
 msgid "Could not connect for transfer!"
 msgstr "无法连接进行传送!"
 
-#: src/protocols/toc/toc.c:1869
+#: src/protocols/toc/toc.c:1883
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:1969
+#: src/protocols/toc/toc.c:1983 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2003
+#: src/protocols/toc/toc.c:2017
 #, 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:2010
+#: src/protocols/toc/toc.c:2024
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -3484,15 +3329,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2099 src/protocols/toc/toc.c:2101
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2104
+#: src/protocols/toc/toc.c:2118
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2108
+#: src/protocols/toc/toc.c:2122
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -3502,12 +3347,12 @@
 msgstr "基本信息"
 
 #. First Name
-#: src/dialogs.c:1990 src/dialogs.c:2644 src/protocols/trepia/trepia.c:300
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1931 src/dialogs.c:2562
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/dialogs.c:2013 src/dialogs.c:2664 src/protocols/trepia/trepia.c:307
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:1954 src/dialogs.c:2582
 msgid "Last Name"
 msgstr "姓"
 
@@ -3566,7 +3411,7 @@
 msgstr "来自"
 
 #. State
-#: src/dialogs.c:2046 src/dialogs.c:2693 src/protocols/trepia/trepia.c:368
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:1987 src/dialogs.c:2611
 msgid "State"
 msgstr "州/省"
 
@@ -3575,11 +3420,6 @@
 msgid "Set your Trepia profile data."
 msgstr "设置您的 Trepia 资料。"
 
-#: src/dialogs.c:2088 src/dialogs.c:2269 src/dialogs.c:3435 src/dialogs.c:4240
-#: src/dialogs.c:4878 src/gtkrequest.c:177 src/protocols/trepia/trepia.c:379
-msgid "Save"
-msgstr "保存"
-
 #: src/protocols/trepia/trepia.c:523
 msgid "Set Profile"
 msgstr "设置资料"
@@ -3600,6 +3440,10 @@
 msgid "Logging in"
 msgstr "登入"
 
+#: src/protocols/trepia/trepia.c:1148
+msgid "Unable to create socket"
+msgstr "无法创建套接字"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -3618,6 +3462,14 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
+#: src/protocols/yahoo/yahoo.c:897
+msgid "Unable to read"
+msgstr "无法读取"
+
+#: src/protocols/yahoo/yahoo.c:995
+msgid "Connection problem"
+msgstr "连接问题"
+
 #: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1265
 #: src/protocols/yahoo/yahoo.c:1339
 msgid "Not At Home"
@@ -3802,23 +3654,23 @@
 "Spencer (原始作者) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
 "net</A>&gt;<BR>  Syd Logan (骇客和专属驱动程序[lazy bum])<BR><BR>"
 
-#: src/away.c:222
+#: src/away.c:211
 msgid "Gaim - Away!"
 msgstr "Gaim - 离开!"
 
-#: src/away.c:282
+#: src/away.c:272
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:384
+#: src/away.c:377
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:404
+#: src/away.c:397
 msgid "Remove Away Message"
 msgstr "删除离开消息"
 
-#: src/away.c:599
+#: src/away.c:592
 msgid "Set All Away"
 msgstr "全部设为离开"
 
@@ -3829,39 +3681,42 @@
 #: src/blist.c:751
 #, c-format
 msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
-msgstr ""
-"%2$s 组中的 %1$d 个好友未删除,原因是他们的账户未登入。这些好友和该组不会被删"
+msgstr[0] ""
+"%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:756
+#: src/blist.c:760
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:947
+#: src/blist.c:973
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:1703
+#: src/blist.c:1729
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:1705
+#: src/blist.c:1731
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1713
+#: src/blist.c:1739
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
 msgstr "Gaim 正在将您旧的好友列表转换为新格式,并存放在 %s"
 
-#: src/blist.c:1716
+#: src/blist.c:1742
 msgid "Converting Buddy List"
 msgstr "正在转换好友列表"
 
@@ -3882,7 +3737,7 @@
 msgid "There was an error launching your chosen browser: %s"
 msgstr "调用您选择的浏览器 %s 出错"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1333
+#: src/buddy_chat.c:316 src/dialogs.c:1274
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3905,6 +3760,29 @@
 msgid "Join"
 msgstr "加入"
 
+#: src/connection.c:113
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "缺少 %s 的协议插件"
+
+#: src/connection.c:118 src/connection.c:408
+msgid "Connection Error"
+msgstr "连接错误"
+
+#: src/connection.c:138
+#, c-format
+msgid "Enter password for %s"
+msgstr "输入 %s 的密码"
+
+#: src/connection.c:404
+#, c-format
+msgid "%s has been disconnected"
+msgstr "%s 已经断开连接"
+
+#: src/connection.c:407
+msgid "Reason Unknown."
+msgstr "原因未知。"
+
 #: src/conversation.c:405
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
@@ -3913,56 +3791,56 @@
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1926
+#: src/conversation.c:1924
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1929
+#: src/conversation.c:1927
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:1979
+#: src/conversation.c:1977
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2021
+#: src/conversation.c:2019
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2023
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2224
+#: src/conversation.c:2222
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
+#: src/conversation.c:2224
+msgid "New window"
+msgstr "新建窗口"
+
 #: src/conversation.c:2226
-msgid "New window"
-msgstr "新建窗口"
-
-#: src/conversation.c:2228
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2230
+#: src/conversation.c:2228
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:345
+#: src/dialogs.c:337
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:348
+#: src/dialogs.c:340
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:356
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3974,89 +3852,89 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:373
+#: src/dialogs.c:365
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:380
+#: src/dialogs.c:372
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:449
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:457 src/dialogs.c:458
+#: src/dialogs.c:451 src/dialogs.c:452
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:461
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:469 src/dialogs.c:470
+#: src/dialogs.c:463 src/dialogs.c:464
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:473
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
 
-#: src/dialogs.c:482 src/dialogs.c:483
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:626
 msgid "New Message"
 msgstr "新消息"
 
-#: src/dialogs.c:650
+#: src/dialogs.c:644
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
+#: src/dialogs.c:660 src/dialogs.c:737
 msgid "_Screenname:"
 msgstr "用户名(_S):"
 
-#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
+#: src/dialogs.c:675 src/dialogs.c:753 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:706
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:731
+#: src/dialogs.c:725
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:863
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/dialogs.c:906
-msgid "Please enter the name of the group to be added.\n"
-msgstr "请输入要添加的组名称。\n"
-
-#: src/dialogs.c:915 src/dialogs.c:4319
-msgid "_Group:"
-msgstr "组(_G):"
-
-#: src/dialogs.c:951
+#: src/dialogs.c:863
+msgid "Add a new group"
+msgstr "添加新组"
+
+#: src/dialogs.c:864
+msgid "Please enter the name of the group to be added."
+msgstr "请输入要添加的组名称。"
+
+#: src/dialogs.c:892
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/dialogs.c:970
+#: src/dialogs.c:911
 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. "
@@ -4065,327 +3943,366 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: src/dialogs.c:989
+#: src/dialogs.c:930
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/dialogs.c:1002
+#: src/dialogs.c:943
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:1012
+#: src/dialogs.c:953
 msgid "Group"
 msgstr "组"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1021
+#: src/dialogs.c:962
 msgid "Add To"
 msgstr "添加到"
 
-#: src/dialogs.c:1340
+#: src/dialogs.c:1281
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/dialogs.c:1363
+#: src/dialogs.c:1304
 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/dialogs.c:1372
+#: src/dialogs.c:1313
 msgid "Account:"
 msgstr "账户:"
 
-#: src/dialogs.c:1391 src/gtkaccount.c:427
+#: src/dialogs.c:1332 src/gtkaccount.c:428
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/dialogs.c:1402
+#: src/dialogs.c:1343
 msgid "Group:"
 msgstr "组:"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1689
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/dialogs.c:1764
+#: src/dialogs.c:1705
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
-#: src/dialogs.c:1773
+#: src/dialogs.c:1714
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/dialogs.c:1790
+#: src/dialogs.c:1731
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/dialogs.c:1794
+#: src/dialogs.c:1735
 msgid "Allow only users on my buddy list"
 msgstr "只允许我的好友联系我"
 
-#: src/dialogs.c:1798
+#: src/dialogs.c:1739
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/dialogs.c:1836
+#: src/dialogs.c:1777
 msgid "Deny all users"
 msgstr "拒绝所有用户"
 
-#: src/dialogs.c:1840
+#: src/dialogs.c:1781
 msgid "Block the users below"
 msgstr "屏蔽以下用户"
 
-#: src/dialogs.c:1956
+#: src/dialogs.c:1897
 msgid "Set Directory Info"
 msgstr "设置目录信息"
 
-#: src/dialogs.c:1964
+#: src/dialogs.c:1905
 msgid "Directory Info"
 msgstr "目录信息"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:1915
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "设置 %s 的目录信息:"
 
-#: src/dialogs.c:1987
+#: src/dialogs.c:1928
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许搜索引擎查找您的信息"
 
 #. Line 2
-#: src/dialogs.c:2001 src/dialogs.c:2654
+#: src/dialogs.c:1942 src/dialogs.c:2572
 msgid "Middle Name"
 msgstr "中名"
 
 #. Line 4
-#: src/dialogs.c:2024 src/dialogs.c:2674
+#: src/dialogs.c:1965 src/dialogs.c:2592
 msgid "Maiden Name"
 msgstr "娘家名"
 
-#: src/dialogs.c:2111
+#: src/dialogs.c:2052
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/dialogs.c:2117
+#: src/dialogs.c:2058
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2103
 #, c-format
 msgid "Changing password for %s:"
 msgstr "更改 %s 的密码:"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2111
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:2181
+#: src/dialogs.c:2122
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2133
 msgid "New Password (again)"
 msgstr "再次输入新密码"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2182
 #, c-format
 msgid "Changing info for %s:"
 msgstr "更改 %s 的信息:"
 
-#: src/dialogs.c:2327
+#: src/dialogs.c:2268
 msgid "Below are the results of your search: "
 msgstr "下面是您搜索的结果:"
 
-#: src/dialogs.c:2438
-msgid "Permit"
-msgstr "许可"
-
-#: src/dialogs.c:2470
-msgid "Add Permit"
-msgstr "添加许可"
-
-#: src/dialogs.c:2472
-msgid "Add Deny"
-msgstr "添加拒绝"
-
-#: src/dialogs.c:2539
+#: src/dialogs.c:2369
+#, c-format
+msgid "Unblock %s?"
+msgstr "取消对 %s 的屏蔽吗?"
+
+#: src/dialogs.c:2371
+#, c-format
+msgid ""
+"You are about to unblock %s. This will allow %s to speak to you again. Do "
+"you want to continue?"
+msgstr "您即将取消对 %s 的屏蔽。这将允许 %s 重新与您交谈。您想要继续吗?"
+
+#: src/dialogs.c:2375 src/dialogs.c:2388
+msgid "Unblock User"
+msgstr "取消对用户的屏蔽"
+
+#: src/dialogs.c:2377 src/gtkrequest.c:197
+msgid "Unblock"
+msgstr "取消屏蔽"
+
+#: src/dialogs.c:2382
+#, c-format
+msgid "Block %s?"
+msgstr "屏蔽 %s 吗?"
+
+#: src/dialogs.c:2384
+#, c-format
+msgid ""
+"You are about to block %s. This will prevent %s from speaking to you again. "
+"Do you want to continue?"
+msgstr "您即将屏蔽 %s。这将禁止 %s 与您交谈。您想要继续吗?"
+
+#. Block button
+#: src/dialogs.c:2390 src/gtkconv.c:2995 src/gtkrequest.c:196
+msgid "Block"
+msgstr "屏蔽"
+
+#: src/dialogs.c:2457
 msgid "Log Conversation"
 msgstr "对话记录"
 
-#: src/dialogs.c:2620 src/dialogs.c:2753
+#: src/dialogs.c:2538 src/dialogs.c:2671
 msgid "Search for Buddy"
 msgstr "搜索好友"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2638
 msgid "Find Buddy By Info"
 msgstr "按信息查找好友"
 
-#: src/dialogs.c:2747
+#: src/dialogs.c:2665
 msgid "Find Buddy By Email"
 msgstr "按电子邮件查找好友"
 
-#: src/dialogs.c:2851
+#: src/dialogs.c:2769
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:2853
+#: src/dialogs.c:2771
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2872
+#: src/dialogs.c:2790
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。\n"
 
-#: src/dialogs.c:3041 src/dialogs.c:3058
+#: src/dialogs.c:2959 src/dialogs.c:2976
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:3093 src/dialogs.c:3110
+#: src/dialogs.c:3011 src/dialogs.c:3028
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:3207 src/dialogs.c:3233
+#: src/dialogs.c:3125 src/dialogs.c:3151
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/dialogs.c:3299
+#: src/dialogs.c:3217
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:3301
+#: src/dialogs.c:3219
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:3311
+#: src/dialogs.c:3229
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:3376 src/dialogs.c:3384
+#: src/dialogs.c:3294 src/dialogs.c:3302
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:3394
+#: src/dialogs.c:3312
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:3439
+#: src/dialogs.c:3357
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:3443
+#: src/dialogs.c:3361
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3592
+#: src/dialogs.c:3510
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:3638
+#: src/dialogs.c:3528
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#. Setup the label containing the description.
-#: src/dialogs.c:3667
-msgid "Please enter an aliased name for this chat.\n"
-msgstr "请输入此聊天的别名。\n"
-
-#: src/dialogs.c:3679 src/dialogs.c:3782
-msgid "_Alias:"
-msgstr "别名(_A):"
-
-#: src/dialogs.c:3716
+#: src/dialogs.c:3528
+msgid "Alias chat"
+msgstr "给聊天起名"
+
+#: src/dialogs.c:3529
+msgid "Please enter an aliased name for this chat."
+msgstr "请输入此聊天的别名。"
+
+#: src/dialogs.c:3560
+msgid "_Screenname"
+msgstr "用户名(_S)"
+
+#: src/dialogs.c:3564 src/gtkblist.c:429 src/gtkblist.c:475
+msgid "_Alias"
+msgstr "别名(_A)"
+
+#: src/dialogs.c:3568
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#. Setup the label containing the description.
-#: src/dialogs.c:3746
+#: src/dialogs.c:3569
+msgid "Alias buddy"
+msgstr "好友别名"
+
+#: src/dialogs.c:3570
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list.\n"
-msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。\n"
-
-#: src/dialogs.c:3836 src/dialogs.c:3843
+"your buddy list."
+msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。"
+
+#: src/dialogs.c:3606 src/dialogs.c:3613
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "无法写入 %s。"
 
-#: src/dialogs.c:3867
+#: src/dialogs.c:3637
 msgid "Save Log File"
 msgstr "保存日志文件"
 
-#: src/dialogs.c:3897
+#: src/dialogs.c:3667
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "无法删除文件 %s。"
 
-#: src/dialogs.c:3916
+#: src/dialogs.c:3686
 msgid "Clear Log"
 msgstr "清除日志"
 
-#: src/dialogs.c:3925
+#: src/dialogs.c:3695
 msgid "Really clear log?"
 msgstr "真的要清除日志吗?"
 
-#: src/dialogs.c:3970
+#: src/dialogs.c:3740
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "无法打开日志文件 %s。"
 
-#: src/dialogs.c:4112
+#: src/dialogs.c:3882
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/dialogs.c:4114
+#: src/dialogs.c:3884
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/dialogs.c:4135
+#: src/dialogs.c:3905
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "无法打开日志文件 %s"
 
-#: src/dialogs.c:4156
+#: src/dialogs.c:3926
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4213
+#: src/dialogs.c:3983
 msgid "Log"
 msgstr "日志"
 
-#: src/dialogs.c:4235
+#: src/dialogs.c:4005
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4293
+#: src/dialogs.c:4044
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:4310
-msgid "Please enter a new name for the selected group.\n"
-msgstr "请输入选中组的新名字。\n"
-
-#: src/ft.c:121
+#: src/dialogs.c:4044
+msgid "New group name"
+msgstr "新组名称"
+
+#: src/dialogs.c:4045
+msgid "Please enter a new name for the selected group."
+msgstr "请输入选中组的新名字。"
+
+#: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:135
+#: src/ft.c:137
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:727
+#: src/ft.c:693
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:729
+#: src/ft.c:695
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -4476,28 +4393,28 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:364 src/gaimrc.c:1596
+#: src/gaimrc.c:368 src/gaimrc.c:1600
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:1393
+#: src/gaimrc.c:1264 src/gtkblist.c:1394
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:1394
+#: src/gaimrc.c:1266 src/gtkblist.c:1395
 msgid "By status"
 msgstr "按状态"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:1395
+#: src/gaimrc.c:1268 src/gtkblist.c:1396
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gaimrc.c:1694
+#: src/gaimrc.c:1698
 #, c-format
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gtkaccount.c:252
+#: src/gtkaccount.c:253
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4509,142 +4426,142 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:327
+#: src/gtkaccount.c:328
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:344
+#: src/gtkaccount.c:345
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:349
+#: src/gtkaccount.c:350
 msgid "Screenname:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:431
+#: src/gtkaccount.c:432
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:485
+#: src/gtkaccount.c:486
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:498
+#: src/gtkaccount.c:499
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:507
+#: src/gtkaccount.c:508
 msgid "Buddy icon file:"
 msgstr "好友图标文件:"
 
-#: src/gtkaccount.c:516
+#: src/gtkaccount.c:517
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: src/gtkaccount.c:522
+#: src/gtkaccount.c:523
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:583
+#: src/gtkaccount.c:584
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:704
+#: src/gtkaccount.c:705
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:711
+#: src/gtkaccount.c:712
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:719
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:725
+#: src/gtkaccount.c:726
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:732
+#: src/gtkaccount.c:733
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/gtkaccount.c:764
+#: src/gtkaccount.c:765
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:769
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:784
+#: src/gtkaccount.c:785
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:800 src/gtkprefs.c:1100
+#: src/gtkaccount.c:801 src/gtkprefs.c:1100
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:809
+#: src/gtkaccount.c:810
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:813
+#: src/gtkaccount.c:814
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:821
+#: src/gtkaccount.c:822
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:826
+#: src/gtkaccount.c:827
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1139
+#: src/gtkaccount.c:1140
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1141
+#: src/gtkaccount.c:1142
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1165
+#: src/gtkaccount.c:1166
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1166
+#: src/gtkaccount.c:1167
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1193
+#: src/gtkaccount.c:1194
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1472
+#: src/gtkaccount.c:1473
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:1476 src/gtkrequest.c:174
+#: src/gtkaccount.c:1477 src/gtkrequest.c:192
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:1554
+#: src/gtkaccount.c:1555
 msgid "Screenname"
 msgstr "用户名"
 
-#: src/gtkaccount.c:1595
+#: src/gtkaccount.c:1596
 msgid "Protocol"
 msgstr "协议"
 
@@ -4672,10 +4589,6 @@
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:429 src/gtkblist.c:475
-msgid "_Alias"
-msgstr "别名(_A)"
-
 #: src/gtkblist.c:431 src/gtkblist.c:477
 msgid "_Remove"
 msgstr "删除(_R)"
@@ -4873,73 +4786,73 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:1227
+#: src/gtkblist.c:1228
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:1229
+#: src/gtkblist.c:1230
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1234
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:1237
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:1392 src/gtkprefs.c:845 src/gtkprefs.c:1535
+#: src/gtkblist.c:1393 src/gtkprefs.c:845 src/gtkprefs.c:1535
 msgid "None"
 msgstr "无"
 
-#: src/gtkblist.c:1431 src/gtkprefs.c:2289
+#: src/gtkblist.c:1432 src/gtkprefs.c:2289
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: src/gtkblist.c:1455
+#: src/gtkblist.c:1456
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:1458
+#: src/gtkblist.c:1459
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:1461
+#: src/gtkblist.c:1462
 msgid "/Tools/Protocol Actions"
 msgstr "/工具(T)/协议操作(R)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1544
+#: src/gtkblist.c:1545
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:1546
+#: src/gtkblist.c:1547
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:1564 src/gtkconv.c:1071
+#: src/gtkblist.c:1565 src/gtkconv.c:1073
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkblist.c:1570
+#: src/gtkblist.c:1571
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:1579
+#: src/gtkblist.c:1580
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:1587
+#: src/gtkblist.c:1588
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:1595
+#: src/gtkblist.c:1596
 msgid "Set an away message"
 msgstr "设置离开消息"
 
@@ -4947,355 +4860,349 @@
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:56 src/gtkconn.c:241 src/gtkconn.c:254
+#: src/gtkconn.c:57 src/gtkconn.c:242 src/gtkconn.c:255
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:135
+#: src/gtkconn.c:136
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:193
+#: src/gtkconn.c:194
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:206
+#: src/gtkconn.c:207
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconv.c:180
-#, fuzzy
+#: src/gtkconv.c:182
 msgid "That file already exists"
-msgstr "该文件不存在。"
-
-#: src/gtkconv.c:181 src/gtkft.c:1034
+msgstr "该文件不存在"
+
+#: src/gtkconv.c:183 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkconv.c:276
+#: src/gtkconv.c:278
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入图像"
 
-#: src/gtkconv.c:580
+#: src/gtkconv.c:582
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:608
+#: src/gtkconv.c:610
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:629
+#: src/gtkconv.c:631
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:649
+#: src/gtkconv.c:651
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1081
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:777
+#: src/gtkconv.c:1083 src/gtkprefs.c:777
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:2986
+#: src/gtkconv.c:1092 src/gtkconv.c:2988
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1110 src/gtkconv.c:2969 src/gtkconv.c:4108
-#: src/gtkrequest.c:176
+#: src/gtkconv.c:1112 src/gtkconv.c:2971 src/gtkconv.c:4111
+#: src/gtkrequest.c:194
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2199
+#: src/gtkconv.c:2201
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2207
+#: src/gtkconv.c:2209
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2309
+#: src/gtkconv.c:2311
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
-#: src/gtkconv.c:2765
+#: src/gtkconv.c:2767
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 保存对话"
 
 #. Conversation menu
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2786
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2788
 msgid "/Conversation/View _Log..."
 msgstr "/对话(C)/查看日志(_L)..."
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2792
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:2792
+#: src/gtkconv.c:2794
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:2794
+#: src/gtkconv.c:2796
 msgid "/Conversation/_Get Info..."
 msgstr "/对话(C)/获取信息(_G)..."
 
-#: src/gtkconv.c:2796
+#: src/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:2803
 msgid "/Conversation/Insert _URL..."
 msgstr "/对话(C)/插入 URL(_U)..."
 
-#: src/gtkconv.c:2803
+#: src/gtkconv.c:2805
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2808
-msgid "/Conversation/_Warn..."
-msgstr "/对话(C)/警告(_W)..."
-
 #: src/gtkconv.c:2810
+msgid "/Conversation/_Warn..."
+msgstr "/对话(C)/警告(_W)..."
+
+#: src/gtkconv.c:2812
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:2814
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:2814
+#: src/gtkconv.c:2816
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:2819
+#: src/gtkconv.c:2821
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2823
+#: src/gtkconv.c:2825
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2824
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:2827
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2865
+#: src/gtkconv.c:2867
 msgid "/Conversation/View Log..."
 msgstr "/对话(C)/查看日志(L)..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2872
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2876
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:2880
 msgid "/Conversation/Get Info..."
 msgstr "/对话(C)/获取信息(G)..."
 
-#: src/gtkconv.c:2882
+#: src/gtkconv.c:2884
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:2888
+#: src/gtkconv.c:2890
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:2892
+#: src/gtkconv.c:2894
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2900
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2904
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:2906
+#: src/gtkconv.c:2908
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:2910
+#: src/gtkconv.c:2912
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:2916
+#: src/gtkconv.c:2918
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2921
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2943 src/gtkconv.c:2945 src/gtkconv.c:3043 src/gtkconv.c:3045
-#: src/gtkconv.c:5684
+#: src/gtkconv.c:2945 src/gtkconv.c:2947 src/gtkconv.c:3045 src/gtkconv.c:3047
+#: src/gtkconv.c:5687
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:2966 src/gtkconv.c:4126
+#: src/gtkconv.c:2968 src/gtkconv.c:4129
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:2972 src/gtkconv.c:4111
+#: src/gtkconv.c:2974 src/gtkconv.c:4114
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:2979
+#: src/gtkconv.c:2981
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2983
+#: src/gtkconv.c:2985
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:2990 src/gtkconv.c:3425
+#: src/gtkconv.c:2992 src/gtkconv.c:3427
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
-#. Block button
-#: src/gtkconv.c:2993
-msgid "Block"
-msgstr "屏蔽"
-
-#: src/gtkconv.c:2997
+#: src/gtkconv.c:2999
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:3055 src/gtkconv.c:5687
+#: src/gtkconv.c:3057 src/gtkconv.c:5690
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3060
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:3097
+#: src/gtkconv.c:3099
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:3108
+#: src/gtkconv.c:3110
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:3119
+#: src/gtkconv.c:3121
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3137
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3149
 msgid "Normal font size"
 msgstr "标准字体"
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3161
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3178
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3190
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:3200
+#: src/gtkconv.c:3202
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:3215
+#: src/gtkconv.c:3217
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:3226
+#: src/gtkconv.c:3228
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:3237
+#: src/gtkconv.c:3239
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:3294
+#: src/gtkconv.c:3296
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3347
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3404
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3414
+#: src/gtkconv.c:3416
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3910 src/server.c:1298
+#: src/gtkconv.c:3913 src/server.c:1299
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
-msgstr ""
-
-#: src/gtkconv.c:3914 src/server.c:1301
-#, fuzzy, c-format
+msgstr "<HR><BR><H3 Align=Center> ---- 新对话 @ %s ----</H3><BR>\n"
+
+#: src/gtkconv.c:3917 src/server.c:1302
+#, c-format
 msgid "---- New Conversation @ %s ----\n"
-msgstr "与 %s 的对话"
-
-#: src/gtkconv.c:3946
+msgstr "---- 新对话 @ %s ----\n"
+
+#: src/gtkconv.c:3949
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4604 src/gtkconv.c:4726
+#: src/gtkconv.c:4607 src/gtkconv.c:4729
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:5000
+#: src/gtkconv.c:5003
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:5009
+#: src/gtkconv.c:5012
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:5016
+#: src/gtkconv.c:5019
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:5022
+#: src/gtkconv.c:5025
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
@@ -5304,11 +5211,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:201
+#: src/gtkft.c:200
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:204
+#: src/gtkft.c:203
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
@@ -5348,34 +5255,34 @@
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:588
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:598
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:605
+#: src/gtkft.c:607
 msgid "Show download details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:606
+#: src/gtkft.c:608
 msgid "Hide download details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:648 src/stock.c:86
+#: src/gtkft.c:650 src/stock.c:86
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:658
+#: src/gtkft.c:660
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:1013
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "文件不存在。"
 
@@ -5721,9 +5628,8 @@
 msgstr "插入"
 
 #: src/gtkprefs.c:806
-#, fuzzy
 msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "Ctrl+{B/I/U/S} 插入 HTML 标签(_H)"
+msgstr "Ctrl+{B/I/U} 插入 HTML 标签(_H)"
 
 #: src/gtkprefs.c:808
 msgid "Control-(number) _inserts smileys"
@@ -5973,6 +5879,8 @@
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
+"手动(_M):\n"
+"(%s 代表 URL)"
 
 #: src/gtkprefs.c:1345
 msgid "Browser Options"
@@ -6039,9 +5947,8 @@
 msgstr "声音方式"
 
 #: src/gtkprefs.c:1429
-#, fuzzy
 msgid "_Method:"
-msgstr "方式(_M)"
+msgstr "方式(_M):"
 
 #: src/gtkprefs.c:1431
 msgid "Console beep"
@@ -6056,12 +5963,12 @@
 msgstr "命令"
 
 #: src/gtkprefs.c:1450
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"声音命令(_O)\n"
+"声音命令(_O):\n"
 "(%s 代表文件名)"
 
 #: src/gtkprefs.c:1505
@@ -6247,62 +6154,62 @@
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtkrequest.c:172
+#: src/gtkrequest.c:190
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtksound.c:60
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "消息已收到"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "收到的消息开始对话"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message sent"
 msgstr "消息已送出"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "有人进入聊天"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "有人离开聊天"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "您在聊天中发言"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/gtksound.c:150
+#: src/gtksound.c:154
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/gtksound.c:166
+#: src/gtksound.c:170
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/gtksound.c:175
+#: src/gtksound.c:179
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -6318,7 +6225,7 @@
 msgstr "Gaim - 保存图标"
 
 #. full help text
-#: src/gtkutils.c:908
+#: src/gtkutils.c:909
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6350,7 +6257,7 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/gtkutils.c:923
+#: src/gtkutils.c:924
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
@@ -6481,22 +6388,26 @@
 msgid "Please enter your login."
 msgstr "请输入您的登录名。"
 
-#: src/main.c:233
+#: src/main.c:228
 msgid "<New User>"
 msgstr "<新用户>"
 
-#: src/main.c:275
+#: src/main.c:270
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:291
+#: src/main.c:286
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/main.c:341
+#: src/main.c:336
 msgid "Sign On"
 msgstr "登入"
 
+#: src/prefs.c:113 src/status.c:266
+msgid "Slightly less boring default"
+msgstr "烦死我了"
+
 #: src/prpl.c:292
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
@@ -6533,24 +6444,25 @@
 
 #: src/server.c:874
 #, c-format
-msgid "(%d messages)"
-msgstr "(%d 条消息)"
-
-#: src/server.c:886
+msgid "(%d message)"
+msgid_plural "(%d messages)"
+msgstr[0] "(%d 条消息)"
+
+#: src/server.c:887
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1084 src/server.c:1094
+#: src/server.c:1085 src/server.c:1095
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1112 src/server.c:1120
+#: src/server.c:1113 src/server.c:1121
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1161
+#: src/server.c:1162
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6559,11 +6471,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1164
+#: src/server.c:1165
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1254
+#: src/server.c:1255
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6572,23 +6484,30 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1258
+#: src/server.c:1259
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1264
+#: src/server.c:1265
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
-#: src/server.c:1436
+#: src/server.c:1437
 msgid "Gaim - Popup"
 msgstr "Gaim - 弹出窗口"
 
-#: src/server.c:1463
+#: src/server.c:1464
 msgid "More Info"
 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:31
+msgid "Sorry, I ran out for a bit!"
+msgstr "烦着呢,别理我"
+
 #: src/stock.c:84
 msgid "_Modify"
 msgstr "修改(_M)"
@@ -6634,76 +6553,15 @@
 msgid "Custom"
 msgstr "自定义"
 
-#: src/gtkdebug.c:142
+#: src/gtkdebug.c:133
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:182
-#, fuzzy
+#: src/gtkdebug.c:173
 msgid "Pause"
-msgstr "暂停(_P)"
-
-#: src/gtkdebug.c:188
+msgstr "暂停"
+
+#: src/gtkdebug.c:179
 msgid "Timestamps"
 msgstr "时间戳"
 
-#~ msgid "Pager Host:"
-#~ msgstr "寻呼主机:"
-
-#~ msgid "Pager Port:"
-#~ msgstr "寻呼端口:"
-
-#~ msgid "Rename Buddy"
-#~ msgstr "重命名好友"
-
-#~ msgid "New name:"
-#~ msgstr "新名字:"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s:%s"
-
-#~ msgid "%s was unable to sign on"
-#~ msgstr "%s 无法登入"
-
-#~ msgid "Signon Error"
-#~ msgstr "登入出错"
-
-#~ msgid "Notice"
-#~ msgstr "注意"
-
-#~ msgid "%s has been signed off"
-#~ msgstr "%s 已经登出"
-
-#~ msgid "Connection Error"
-#~ msgstr "连接错误"
-
-#~ msgid "Control-_W closes window"
-#~ msgstr "Ctrl+W 键关闭窗口(_W)"
-
-#~ msgid "_Manual: "
-#~ msgstr "手动(_M):"
-
-#~ msgid "Gaim Instant Messenger"
-#~ msgstr "Gaim 即时通讯程序"
-
-#~ msgid "Gaim Instant Messenger - Signed off"
-#~ msgstr "Gaim 即时通讯程序 - 已登出"
-
-#~ msgid "Gaim Instant Messenger - Away"
-#~ msgstr "Gaim 即时通讯程序 - 离开"
-
-#~ msgid "New"
-#~ msgstr "新建"
-
-#~ msgid "Set Away Message"
-#~ msgstr "设置离开消息"
-
-#~ msgid "I'm Back"
-#~ msgstr "我回来了"
-
-#~ msgid "Exit"
-#~ msgstr "退出"
--- a/po/zh_TW.po	Thu Jul 31 01:57:19 2003 +0000
+++ b/po/zh_TW.po	Thu Jul 31 14:35:01 2003 +0000
@@ -1,8 +1,8 @@
 # Traditional Chinese translation for Gaim.
 # Copyright (C) 2001-2003 Free Software Foundation, Inc.
 #
-# Ambrose C. Li <acli@ada.dhs.org>, May 2003
-# Paladin R. Liu <paladin@ms1.hinet.net>, May 2003
+# Ambrose C. Li <acli@ada.dhs.org>, May-July 2003
+# Paladin R. Liu <paladin@ms1.hinet.net>, 2002-2003
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -22,10 +22,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.64cvs\n"
-"POT-Creation-Date: 2003-07-17 10:46+0800\n"
+"Project-Id-Version: Gaim 0.67\n"
+"POT-Creation-Date: 2003-07-31 00:17-0400\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
-"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -33,65 +33,65 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
 
-#: plugins/docklet/docklet.c:110 src/gtkaccount.c:443 src/gtkaccount.c:1591
+#: plugins/docklet/docklet.c:112 src/gtkaccount.c:441 src/gtkaccount.c:1589
 msgid "Auto-login"
 msgstr "自動登入"
 
-#: plugins/docklet/docklet.c:113
+#: plugins/docklet/docklet.c:115
 msgid "New Message.."
 msgstr "新訊息"
 
-#: plugins/docklet/docklet.c:114
+#: plugins/docklet/docklet.c:116
 msgid "Join A Chat..."
 msgstr "加入聊天室"
 
-#: plugins/docklet/docklet.c:145
+#: plugins/docklet/docklet.c:147
 msgid "New..."
-msgstr "新增"
-
-#: plugins/docklet/docklet.c:149 src/gtkblist.c:1589 src/gtkpounce.c:460
-#: src/gtkprefs.c:1504 src/protocols/gg/gg.c:54 src/protocols/irc/irc.c:1020
-#: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3437
-#: src/protocols/jabber/jabber.c:3491 src/protocols/oscar/oscar.c:2825
-#: src/protocols/oscar/oscar.c:4548 src/protocols/oscar/oscar.c:5447
-#: src/protocols/oscar/oscar.c:5841
+msgstr "新增..."
+
+#: plugins/docklet/docklet.c:151 src/protocols/gg/gg.c:54
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3491
+#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4578
+#: src/protocols/oscar/oscar.c:5481 src/protocols/oscar/oscar.c:5875
+#: src/gtkblist.c:1591 src/gtkpounce.c:460 src/gtkprefs.c:1504
 msgid "Away"
 msgstr "離開"
 
-#: plugins/docklet/docklet.c:155 src/away.c:531
+#: plugins/docklet/docklet.c:157 src/away.c:524
 msgid "Back"
 msgstr "返回"
 
-#: plugins/docklet/docklet.c:163
+#: plugins/docklet/docklet.c:165
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:168 src/gtkft.c:557
+#: plugins/docklet/docklet.c:170 src/gtkft.c:559
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:169 src/gtkaccount.c:1742 src/main.c:415
+#: plugins/docklet/docklet.c:171 src/gtkaccount.c:1740 src/main.c:320
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:170 src/gtkprefs.c:2356 src/main.c:425
+#: plugins/docklet/docklet.c:172 src/gtkprefs.c:2356 src/main.c:330
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: plugins/docklet/docklet.c:179
+#: plugins/docklet/docklet.c:181
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:183
+#: plugins/docklet/docklet.c:185
 msgid "Quit"
 msgstr "結束程式"
 
-#: plugins/docklet/docklet.c:412
+#: plugins/docklet/docklet.c:466
 msgid "Tray Icon Configuration"
 msgstr "工作匣圖示設定"
 
-#: plugins/docklet/docklet.c:416
+#: plugins/docklet/docklet.c:470
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "隱藏新訊息直到工作匣圖示被點擊(_H)"
 
@@ -102,30 +102,44 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:440
+#: plugins/docklet/docklet.c:494
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:443
+#: plugins/docklet/docklet.c:497
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
+# NOTE queuing semantics clarified by marv on #gaim
 #. *  description
-#: plugins/docklet/docklet.c:445
+#: plugins/docklet/docklet.c:499
 msgid ""
-"Interacts with a Notification Area applet (in GNOME, KDE or Windows for "
-"example) to display the current status of Gaim, allow fast access to "
-"commonly used functions, and to toggle display of the buddy list or login "
-"window. Also allows messages to be queued until the icon is clicked, similar "
-"to ICQ."
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
 msgstr ""
-"在工作匣上(例如 GNOME 或 KDE 等的工作匣)顯示 Gaim 目前的狀態,"
-"同時可以快速的操作 Gaim 所提供的功能(例如開啟或關閉 Gaim 的登入"
-"視窗和好友清單)。同時可以將訊息存到佇列中,直到工作匣圖示被點"
-"擊,就如同使用 ICQ 一樣。"
+"在工作匣上(例如 GNOME、KDE 或微軟視窗等的工作匣)顯示 Gaim 目前的狀態;讓您"
+"快速的操作 Gaim 的幾項常用功能(包括開啟或關閉好友清單或登入視窗);並讓您可"
+"以選擇將收到的訊息存到佇列中,直到工作匣圖示被點擊,如同使用 ICQ 一樣。"
+
+#.
+#. *  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 - 離開"
 
 #. *< api_version
 #. *< type
@@ -145,20 +159,20 @@
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
 
-#: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
+#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
 msgid "Mail Server"
 msgstr "郵件伺服器"
 
-#: plugins/chkmail.c:131
+#: plugins/chkmail.c:132
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s(%d 封新郵件 / 共 %d 封郵件)"
 
-#: plugins/chkmail.c:203
+#: plugins/chkmail.c:195
 msgid "Check Mail"
 msgstr "檢查信箱"
 
-#: plugins/chkmail.c:207
+#: plugins/chkmail.c:199
 msgid "Check email every X seconds.\n"
 msgstr "每隔 X 秒檢查一次信箱。\n"
 
@@ -187,14 +201,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:203
+#: plugins/filectl.c:201
 msgid "Gaim File Control"
 msgstr "Gaim 檔案控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:206 plugins/filectl.c:208
+#: plugins/filectl.c:204 plugins/filectl.c:206
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允許您在檔案中輸入指令以控制 Gaim。"
 
@@ -291,7 +305,7 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
 
-#: plugins/idle.c:70 src/protocols/irc/irc.c:935
+#: plugins/idle.c:70
 msgid "Idle Time"
 msgstr "閒置時間"
 
@@ -319,90 +333,69 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允許您手動進入閒置狀態,並設定閒置多久時間"
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/mailchk.c:149
+#: plugins/mailchk.c:152
 msgid "Mail Checker"
 msgstr "郵件檢查"
 
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/mailchk.c:152 plugins/mailchk.c:154
+#: plugins/mailchk.c:154 plugins/mailchk.c:155
 msgid "Checks for new local mail."
 msgstr "檢查本地端的新郵件。"
 
-#: plugins/notify.c:442
-msgid "Unable to write to config file"
-msgstr "無法寫入設定檔"
-
-#: plugins/notify.c:443
-msgid "Notify plugin"
-msgstr "通知模組"
-
-#: plugins/notify.c:573
+#. ---------- "Notify For" ----------
+#: plugins/notify.c:701
 msgid "Notify For"
 msgstr "通知種類"
 
-#: plugins/notify.c:574
+#: plugins/notify.c:705
 msgid "_IM windows"
 msgstr "即時訊息視窗(_I)"
 
-#: plugins/notify.c:579
+#: plugins/notify.c:710
 msgid "_Chat windows"
 msgstr "聊天視窗(_C)"
 
-#. --------------
-#: plugins/notify.c:585
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:716
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:588
-msgid "Prepend _string into window title (hit enter to save):"
-msgstr "加入字串到視窗標題之前(按 Enter 儲存):"
-
-#: plugins/notify.c:599
+#: plugins/notify.c:722
+msgid "Prepend _string into window title:"
+msgstr "加入字串到視窗標題之前(_S):"
+
+#: plugins/notify.c:733
 msgid "_Quote window title"
 msgstr "視窗標題前後加上引號(_Q)"
 
-#: plugins/notify.c:604
+#: plugins/notify.c:738
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "強迫視窗管理員顯示提示(_U)"
 
-#: plugins/notify.c:609
+#: plugins/notify.c:743
 msgid "Insert c_ount of new messages into window title"
 msgstr "加入新訊息數目到視窗標題中(_O)"
 
-#: plugins/notify.c:614
+#: plugins/notify.c:748
 msgid "_Notify even if conversation is in focus"
 msgstr "當這個交談取得輸入焦點時,依然執行通知的動作(_N)"
 
-#. --------------
-#: plugins/notify.c:620
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:754
 msgid "Notification Removal"
 msgstr "通知移除"
 
-#: plugins/notify.c:621
+#: plugins/notify.c:758
 msgid "Remove when conversation window gains _focus"
 msgstr "當交談取得輸入焦點時移除通知(_F)"
 
-#: plugins/notify.c:626
+#: plugins/notify.c:763
 msgid "Remove when conversation window _receives click"
 msgstr "當交談視窗被點選時移除通知(_R)"
 
-#: plugins/notify.c:631
+#: plugins/notify.c:768
 msgid "Remove when _typing in conversation window"
 msgstr "當在交談視窗中輸入時移除通知(_T)"
 
-#: plugins/notify.c:636
-msgid "Appl_y"
-msgstr "套用(_Y)"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -410,22 +403,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:699
+#: plugins/notify.c:845
 msgid "Message Notification"
 msgstr "訊息通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:702 plugins/notify.c:704
+#: plugins/notify.c:848 plugins/notify.c:850
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
+# TODO: Untranslated
 #: plugins/raw.c:152
 msgid "Raw"
 msgstr ""
 
-#NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
+# NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
 #: plugins/raw.c:154
 msgid "Lets you send raw input to text-based protocols."
 msgstr "讓您直接輸入指令對各種文字模式的通訊協定進行操作。"
@@ -435,9 +429,8 @@
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"讓您直接輸入指令對各種文字模式的通訊協定(例如 Jabber、MSN、IRC 及"
-" TOC)進行操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會"
-"在除錯視窗顯示。"
+"讓您直接輸入指令對各種文字模式的通訊協定(例如 Jabber、MSN、IRC 及 TOC)進行"
+"操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
 
 #. *< api_version
 #. *< type
@@ -519,19 +512,19 @@
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
 
-#: plugins/gaim-remote/remote.c:86
+#: plugins/gaim-remote/remote.c:87
 msgid "Not connected to AIM"
 msgstr "沒有連到 AIM"
 
-#: plugins/gaim-remote/remote.c:95 plugins/gaim-remote/remote.c:134
+#: plugins/gaim-remote/remote.c:96 plugins/gaim-remote/remote.c:135
 msgid "No screenname given."
 msgstr "沒有給予帳號。"
 
-#: plugins/gaim-remote/remote.c:171
+#: plugins/gaim-remote/remote.c:172
 msgid "No roomname given."
 msgstr "沒有給予聊天室名稱。"
 
-#: plugins/gaim-remote/remote.c:190
+#: plugins/gaim-remote/remote.c:191
 msgid "Invalid AIM URI"
 msgstr "無效的 AIM URI"
 
@@ -542,19 +535,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:735
+#: plugins/gaim-remote/remote.c:713
 msgid "Remote Control"
 msgstr "遠端控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:738
+#: plugins/gaim-remote/remote.c:716
 msgid "Provides remote control for gaim applications."
 msgstr "提供對 Gaim 應用程式進行遠端控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:740
+#: plugins/gaim-remote/remote.c:718
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -706,7 +699,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 的相關選項。"
 
-#: plugins/perl/perl.c:405
+#: plugins/perl/perl.c:410
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register 呼叫時並沒有提供適當的參數。請參考 PERL-HOWTO。"
 
@@ -717,13 +710,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1392
+#: plugins/perl/perl.c:1397
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
+#: plugins/perl/perl.c:1399 plugins/perl/perl.c:1400
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
@@ -748,7 +741,7 @@
 msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
 
 #: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1184
-#: src/protocols/msn/msn.c:336 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
 #: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1257
 #: src/protocols/yahoo/yahoo.c:1336
@@ -764,9 +757,9 @@
 msgstr "離開(只有好友可以看到我)"
 
 #: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3440
-#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2829
-#: src/protocols/oscar/oscar.c:4536 src/protocols/oscar/oscar.c:4563
-#: src/protocols/oscar/oscar.c:5846 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2840
+#: src/protocols/oscar/oscar.c:4566 src/protocols/oscar/oscar.c:4593
+#: src/protocols/oscar/oscar.c:5880 src/protocols/yahoo/yahoo.c:1071
 #: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1346
 msgid "Invisible"
 msgstr "隱身"
@@ -821,7 +814,8 @@
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: src/protocols/gg/gg.c:402
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/gg/gg.c:402 src/protocols/toc/toc.c:207
 msgid "Unable to connect."
 msgstr "無法連結。"
 
@@ -846,6 +840,7 @@
 msgstr "在 GG Library 中的重大錯誤\n"
 
 #: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/toc/toc.c:183
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
@@ -886,11 +881,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:168 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:186 src/request.h:804
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:169 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:187 src/request.h:804
 msgid "No"
 msgstr "否"
 
@@ -902,11 +897,13 @@
 msgid "First name"
 msgstr "名"
 
+# TODO: Untranslated
 #: src/protocols/gg/gg.c:677
 msgid "Second Name"
 msgstr ""
 
 #: src/protocols/gg/gg.c:681 src/protocols/gg/gg.c:1380
+#: src/protocols/irc/msgs.c:185
 msgid "Nick"
 msgstr "暱稱"
 
@@ -920,8 +917,8 @@
 msgstr "性別"
 
 #. City
-#: src/dialogs.c:2035 src/dialogs.c:2684 src/protocols/gg/gg.c:705
-#: src/protocols/trepia/trepia.c:364
+#: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
+#: src/dialogs.c:1976 src/dialogs.c:2602
 msgid "City"
 msgstr "城市"
 
@@ -1020,9 +1017,9 @@
 msgid "Directory Search"
 msgstr "名錄搜尋"
 
-#: src/dialogs.c:2146 src/dialogs.c:2155 src/protocols/gg/gg.c:1195
-#: src/protocols/jabber/jabber.c:4322 src/protocols/oscar/oscar.c:6110
-#: src/protocols/toc/toc.c:1474
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4344
+#: src/protocols/oscar/oscar.c:6144 src/protocols/toc/toc.c:1488
+#: src/dialogs.c:2087 src/dialogs.c:2096
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -1068,28 +1065,28 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 在連結 ICQ 伺服器時發生錯誤。"
 
-#: src/dialogs.c:2452 src/gtkconv.c:1112 src/gtkconv.c:2963 src/gtkconv.c:4123
-#: src/gtkrequest.c:175 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2673 src/prpl.c:312
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2684
+#: src/dialogs.c:866 src/gtkconv.c:1114 src/gtkconv.c:2965 src/gtkconv.c:4126
+#: src/gtkrequest.c:193 src/prpl.c:312
 msgid "Add"
 msgstr "加入"
 
 #. Cancel button.
-#: src/buddy_chat.c:375 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:2092 src/dialogs.c:2207 src/dialogs.c:2273 src/dialogs.c:2441
-#: src/dialogs.c:2626 src/dialogs.c:2775 src/dialogs.c:3447 src/dialogs.c:3941
-#: src/dialogs.c:4883 src/gtkaccount.c:1480 src/gtkconn.c:146
-#: src/gtkrequest.c:171 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/irc/irc.c:1104 src/protocols/irc/irc.c:1433
-#: src/protocols/msn/msn.c:171 src/protocols/msn/msn.c:182
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
-#: src/protocols/msn/msn.c:217 src/protocols/oscar/oscar.c:2404
-#: src/protocols/oscar/oscar.c:2441 src/protocols/oscar/oscar.c:2476
-#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:5719
-#: src/protocols/oscar/oscar.c:5934 src/protocols/oscar/oscar.c:5983
-#: src/protocols/oscar/oscar.c:6043 src/protocols/trepia/trepia.c:380
-#: src/protocols/yahoo/yahoo.c:1188 src/prpl.c:313 src/request.h:813
-#: src/request.h:823
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4126
+#: src/protocols/msn/msn.c:172 src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:194 src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:218 src/protocols/oscar/oscar.c:2415
+#: src/protocols/oscar/oscar.c:2452 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:5753
+#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:6017
+#: src/protocols/oscar/oscar.c:6077 src/protocols/trepia/trepia.c:380
+#: src/protocols/yahoo/yahoo.c:1188 src/buddy_chat.c:375 src/connection.c:141
+#: src/dialogs.c:453 src/dialogs.c:465 src/dialogs.c:478 src/dialogs.c:867
+#: src/dialogs.c:2033 src/dialogs.c:2148 src/dialogs.c:2214 src/dialogs.c:2378
+#: src/dialogs.c:2391 src/dialogs.c:2544 src/dialogs.c:2693 src/dialogs.c:3365
+#: src/dialogs.c:3532 src/dialogs.c:3574 src/dialogs.c:3711 src/dialogs.c:4048
+#: src/gtkaccount.c:1478 src/gtkconn.c:147 src/gtkrequest.c:189 src/prpl.c:313
+#: src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "取消"
 
@@ -1100,14 +1097,13 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1716
 #: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
-#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5097
+#: src/protocols/oscar/oscar.c:2612 src/protocols/oscar/oscar.c:5127
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/dialogs.c:2440 src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1717 src/protocols/msn/notification.c:467
-#: src/protocols/msn/notification.c:749 src/protocols/oscar/oscar.c:2603
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1717
+#: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
+#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5128
 msgid "Deny"
 msgstr "拒絕"
 
@@ -1116,10 +1112,11 @@
 msgstr "透過伺服器傳送訊息"
 
 #: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2335
-#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4238
-#: src/protocols/jabber/jabber.c:4287 src/protocols/msn/dispatch.c:160
-#: src/protocols/msn/msn.c:459 src/protocols/msn/notification.c:1376
-#: src/protocols/napster/napster.c:496
+#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4260
+#: src/protocols/jabber/jabber.c:4309 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:460 src/protocols/msn/notification.c:1383
+#: src/protocols/napster/napster.c:465 src/protocols/napster/napster.c:496
+#: src/protocols/yahoo/yahoo.c:965
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -1127,7 +1124,7 @@
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3950
 msgid "Nick:"
 msgstr "暱稱:"
 
@@ -1135,245 +1132,33 @@
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
-#: src/protocols/irc/irc.c:186
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
-
-#: src/protocols/irc/irc.c:487 src/protocols/irc/irc.c:2607
-#, c-format
-msgid "DCC Chat with %s closed"
-msgstr "和 %s 的 DCC 聊天已關閉"
-
-#: src/protocols/irc/irc.c:540 src/protocols/irc/irc.c:2616
-#, c-format
-msgid "DCC Chat with %s established"
-msgstr "和 %s 的 DCC 聊天已經被建立"
-
-#: src/protocols/irc/irc.c:675
+#: src/protocols/irc/cmds.c:41
+#, c-format
+msgid "Unknown command: %s"
+msgstr "未知的指令:%s"
+
+#: src/protocols/irc/cmds.c:430
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
-# NOTE 剛進入聊天室時會顯示這個;如果「changed」直譯「修改」會很奇怪
-#: src/protocols/irc/irc.c:696 src/protocols/irc/irc.c:1754
-#, c-format
-msgid "<B>%s has changed the topic to: %s</B>"
-msgstr "<B>%s 把聊天主題設定為:%s</B>"
-
-#: src/protocols/irc/irc.c:741
-#, c-format
-msgid "-:- mode/%s [%c%c %s] by %s"
-msgstr "-:- 模式/%s [%c%c %s] 被 %s 設定"
-
-#: src/protocols/irc/irc.c:918 src/protocols/irc/irc.c:931
-msgid "User"
-msgstr "使用者"
-
-#. Splits
-#: src/protocols/irc/irc.c:922 src/protocols/irc/irc.c:3030
-#: src/protocols/jabber/jabber.c:4418 src/protocols/napster/napster.c:639
-msgid "Server"
-msgstr "伺服器"
-
-#: src/protocols/irc/irc.c:926 src/protocols/irc/irc.c:1081
-#: src/protocols/irc/irc.c:1646
-msgid "IRC Operator"
-msgstr "IRC 操作者"
-
-#: src/protocols/irc/irc.c:939
-msgid "Channels"
-msgstr "頻道"
-
-#: src/protocols/irc/irc.c:945
-#, c-format
-msgid "%s is an Identified User"
-msgstr "%s 是一個已驗證的使用者"
-
-#: src/protocols/irc/irc.c:960
-#, c-format
-msgid "%ld seconds [signon: %s]"
-msgstr "%ld 秒 [登入:%s]"
-
-#. RPL_REHASHING
-#: src/protocols/irc/irc.c:1081
-msgid "Rehashing server"
-msgstr "重新設定伺服器中"
-
-#. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1084
-msgid "No such nick/channel"
-msgstr "沒有那個暱稱或頻道"
-
-#: src/protocols/irc/irc.c:1084 src/protocols/irc/irc.c:1087
-#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1096
-#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:1604
-msgid "IRC Error"
-msgstr "IRC 錯誤"
-
-#. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1087
-msgid "No such server"
-msgstr "沒有那部伺服器"
-
-#. ERR_NOMOTD
-#. drop it - bringing up dialog for NOMOTD is annoying
-#. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1092
-msgid "No nickname given"
-msgstr "沒有給予暱稱"
-
-#. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1095
-msgid "You're not an IRC operator!"
-msgstr "您不是一個 IRC 操作者!"
-
-#: src/protocols/irc/irc.c:1099
-msgid "That nick is already in use.  Please enter a new nick"
-msgstr "這個暱稱已經在使用中。請輸入一個新的暱稱"
-
-#. Build OK Button
-#: src/dialogs.c:2203 src/dialogs.c:2341 src/dialogs.c:2625 src/dialogs.c:2771
-#: src/dialogs.c:3934 src/gtkrequest.c:170 src/protocols/irc/irc.c:1103
-#: src/protocols/msn/msn.c:170 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/oscar/oscar.c:2440 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:5933 src/protocols/oscar/oscar.c:5982
-#: src/protocols/oscar/oscar.c:6042 src/protocols/yahoo/yahoo.c:1187
-#: src/request.h:813
-msgid "OK"
-msgstr "確定"
-
-#: src/protocols/irc/irc.c:1389 src/protocols/irc/irc.c:1395
-#: src/protocols/irc/irc.c:1401 src/protocols/irc/irc.c:1415
-msgid "IRC CTCP info"
-msgstr "IRC CTCP 資訊"
-
-#: src/protocols/irc/irc.c:1425
-#, c-format
-msgid "%s would like to establish a DCC chat"
-msgstr "%s 想要建立一個 DCC 聊天"
-
-#: src/protocols/irc/irc.c:1428
-msgid ""
-"This requires a direct connection to be established between the two "
-"computers.  Messages sent will not pass through the IRC server"
-msgstr ""
-"這個要求將會建立起兩部電腦間的連線,而訊息將不會透過 IRC 伺服器來進行傳送"
-
-#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2403
-#: src/protocols/oscar/oscar.c:5718
-msgid "Connect"
-msgstr "連線"
-
-#: src/protocols/irc/irc.c:1459
-#, c-format
-msgid "Received an invalid file send request from %s."
-msgstr "收到一個來自於 %s 無效的檔案送出需求。"
-
-#: src/protocols/irc/irc.c:1540 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
-msgid "Unable to write"
-msgstr "無法寫入"
-
-#: src/protocols/irc/irc.c:1602
-#, c-format
-msgid "You have been kicked from %s: %s"
-msgstr "您被踢出 %s: %s"
-
-#: src/protocols/irc/irc.c:1607
-#, c-format
-msgid "Kicked by %s: %s"
-msgstr "被 %s 踢出:%s"
-
-#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2917
-msgid "CTCP ClientInfo"
-msgstr "CTCP 客戶端資訊"
-
-#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2923
-msgid "CTCP UserInfo"
-msgstr "CTCP 使用者資訊"
-
-#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2929
-msgid "CTCP Version"
-msgstr "CTCP 版本"
-
-#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2935
-msgid "CTCP Ping"
-msgstr "CTCP Ping"
-
-#: src/protocols/irc/irc.c:1948 src/protocols/oscar/oscar.c:678
+#: src/protocols/irc/irc.c:123
+msgid "Channel:"
+msgstr "頻道:"
+
+#: src/protocols/irc/irc.c:128 src/gtkaccount.c:423 src/main.c:304
+msgid "Password:"
+msgstr "密碼:"
+
+#: src/protocols/irc/irc.c:162 src/protocols/oscar/oscar.c:683
 #: src/protocols/toc/toc.c:234
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:1962 src/protocols/trepia/trepia.c:1148
-msgid "Unable to create socket"
+#: src/protocols/irc/irc.c:171
+msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:2203
-#, c-format
-msgid "Topic for %s is %s"
-msgstr "%s 的主題為 %s"
-
-#: src/protocols/irc/irc.c:2299
-#, c-format
-msgid "You have left %s"
-msgstr "您離開了 %s"
-
-#: src/protocols/irc/irc.c:2300
-msgid "IRC Part"
-msgstr "IRC 離開"
-
-#: src/protocols/irc/irc.c:2355
-msgid "<I>Requesting DCC CHAT</I>"
-msgstr "<I>要求 DCC 聊天中</I>"
-
-#: src/protocols/irc/irc.c:2372
-msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
-msgstr "<B>IRC 操作者指令:<BR>REHASH RESTART</B>"
-
-#: src/protocols/irc/irc.c:2377
-msgid ""
-"<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
-"<nick><BR>PING <nick></B><BR>"
-msgstr ""
-"<B>CTCP 指令:<BR>CLIENTINFO <暱稱><BR>USERINFO <暱稱><BR>VERSION <暱稱"
-"><BR>PING <暱稱></B><BR>"
-
-#: src/protocols/irc/irc.c:2385
-msgid "<B>DCC commands:<BR>CHAT <nick></B>"
-msgstr "<B>DCC 指令:<BR>CHAT <暱稱></B>"
-
-#: src/protocols/irc/irc.c:2390
-msgid ""
-"<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
-"TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
-"W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
-"CTCP commands<BR>Type /HELP DCC for DCC commands"
-msgstr ""
-"<B>目前支援的指令:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC KICK<BR>OP "
-"DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W WHOWAS<BR>輸"
-"入 /HELP OPER 顯示操作者指令<BR>輸入 /HELP CTCP 顯示 CTCP 指令<BR>輸入 /HELP "
-"DCC 顯示 DCC 指令"
-
-#: src/protocols/irc/irc.c:2413
-msgid "<B>Unknown command</B>"
-msgstr "<B>未知的指令</B>"
-
-#: src/protocols/irc/irc.c:2473
-msgid "Channel:"
-msgstr "頻道:"
-
-#: src/gtkaccount.c:425 src/main.c:399 src/protocols/irc/irc.c:2478
-msgid "Password:"
-msgstr "密碼:"
-
-#: src/protocols/irc/irc.c:2904
-msgid "DCC Chat"
-msgstr "DCC 聊天"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1383,39 +1168,200 @@
 #. *< id
 #. *< name
 #. *< version
-#. *  summary
-#: src/protocols/irc/irc.c:3010 src/protocols/irc/irc.c:3012
+#: src/protocols/irc/irc.c:486
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
-#. Account Options
-#: src/gtkprefs.c:1145 src/protocols/irc/irc.c:3034
-#: src/protocols/jabber/jabber.c:4425 src/protocols/msn/msn.c:1259
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
-msgid "Port"
-msgstr "通訊埠"
-
-#: src/protocols/irc/irc.c:3038
+#. *  summary
+#: src/protocols/irc/irc.c:487
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "較好的 IRC 協定模組"
+
+#. Splits
+#: src/protocols/irc/irc.c:504 src/protocols/irc/msgs.c:199
+#: src/protocols/jabber/jabber.c:4440 src/protocols/napster/napster.c:639
+msgid "Server"
+msgstr "伺服器"
+
+#: src/protocols/irc/irc.c:507
+msgid "Port:"
+msgstr "通訊埠:"
+
+#: src/protocols/irc/irc.c:510
 msgid "Encoding"
 msgstr "編碼"
 
+#: src/protocols/irc/msgs.c:101
+msgid "Bad mode"
+msgstr "模式無效"
+
+# FIXME 這是暫譯
+#: src/protocols/irc/msgs.c:112
+#, c-format
+msgid "You are banned from %s."
+msgstr "您被禁於 %s 了。"
+
+# FIXME 這是暫譯
+#: src/protocols/irc/msgs.c:113
+msgid "Banned"
+msgstr "被禁"
+
+#: src/protocols/irc/msgs.c:186
+msgid " <i>(ircop)</i>"
+msgstr " <i>(IRC 操作者)</i>"
+
+#: src/protocols/irc/msgs.c:187
+msgid " <i>(identified)</i>"
+msgstr " <i>(已驗證)</i>"
+
+#: src/protocols/irc/msgs.c:193
+msgid "Username"
+msgstr "使用者"
+
+#: src/protocols/irc/msgs.c:194
+msgid "Realname"
+msgstr "姓名"
+
+#: src/protocols/irc/msgs.c:204
+msgid "Currently on"
+msgstr "所在頻道"
+
+#: src/protocols/irc/msgs.c:208
+#, c-format
+msgid "<b>Idle for:</b> %d days, %02d:%02d:%02d<br>"
+msgstr "<b>閒置了:</b>%d日 %d小時 %d分 %d秒<br>"
+
+#: src/protocols/irc/msgs.c:211
+msgid "Online since"
+msgstr "上線自"
+
+#: src/protocols/irc/msgs.c:214
+msgid "<br><b>Defining adjective:</b> Glorious<br>"
+msgstr "<br><b>描述:</b>光宗耀祖<br>"
+
+# NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
+#: src/protocols/irc/msgs.c:245
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s 把聊天主題修改為:%s"
+
+#: src/protocols/irc/msgs.c:250
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s 的主題為:%s"
+
+#: src/protocols/irc/msgs.c:264
+msgid "Unknown message '%s'"
+msgstr "不明的訊息「%s」"
+
+#: src/protocols/irc/msgs.c:265
+msgid "Unknown message"
+msgstr "不明的訊息"
+
+#: src/protocols/irc/msgs.c:265
+msgid "Gaim has sent a message the IRC server did not understand."
+msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
+
+#. does this happen?
+#: src/protocols/irc/msgs.c:357
+msgid "no such channel"
+msgstr "沒有那個頻道"
+
+#: src/protocols/irc/msgs.c:360
+msgid "User is not logged in"
+msgstr "使用者沒有登入"
+
+#: src/protocols/irc/msgs.c:365
+msgid "No such nick or channel"
+msgstr "沒有那個暱稱或頻道"
+
+#: src/protocols/irc/msgs.c:385
+msgid "Could not send"
+msgstr "無法送出"
+
+#: src/protocols/irc/msgs.c:441
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr "只有被邀請者才可加入 %s。"
+
+#: src/protocols/irc/msgs.c:442
+msgid "Invitation only"
+msgstr "只限被邀請者"
+
+#: src/protocols/irc/msgs.c:536
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "您被 %s 踢出:(%s)"
+
+#: src/protocols/irc/msgs.c:544
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "被 %s 踢出 (%s)"
+
+#: src/protocols/irc/msgs.c:565
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "模式 (%s %s) 被 %s 設定"
+
+#: src/protocols/irc/msgs.c:653
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr "您離開了頻道%s%s"
+
+#: src/protocols/irc/msgs.c:691
+msgid "Error: invalid PONG from server"
+msgstr "錯誤:來自伺服器的 PONG 無效"
+
+#: src/protocols/irc/msgs.c:693
+#, c-format
+msgid "PING reply -- Lag: %d seconds"
+msgstr "PING 回答──延遲:%d秒"
+
+#: src/protocols/irc/msgs.c:781
+#, c-format
+msgid "Wallops from %s"
+msgstr "來自 %s 的 Wallops"
+
+#: src/protocols/irc/parse.c:157
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
+
+#: src/protocols/irc/parse.c:272
+#, c-format
+msgid "Reply time from %s: %d seconds"
+msgstr "%s 回答需時:%d 秒"
+
+#: src/protocols/irc/parse.c:273
+msgid "PONG"
+msgstr "PONG"
+
+#: src/protocols/irc/parse.c:273
+msgid "CTCP PING reply"
+msgstr "CTCP PING 回答"
+
+#: src/protocols/irc/parse.c:372
+msgid "Disconnected"
+msgstr "已停止連線"
+
 #: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:580
 #: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
 #: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
 #: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
-#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
-#: src/protocols/msn/msn.c:249 src/protocols/msn/msn.c:505
-#: src/protocols/msn/msn.c:616 src/protocols/msn/msn.c:632
-#: src/protocols/msn/msn.c:667 src/protocols/msn/msn.c:683
-#: src/protocols/msn/msn.c:715 src/protocols/msn/msn.c:723
-#: src/protocols/msn/msn.c:756 src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:778 src/protocols/msn/msn.c:787
-#: src/protocols/msn/msn.c:801 src/protocols/msn/msn.c:810
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:882
-#: src/protocols/msn/msn.c:920 src/protocols/msn/msn.c:1017
-#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1061
-#: src/protocols/msn/msn.c:1072 src/protocols/msn/msn.c:1083
-#: src/protocols/msn/msn.c:1107 src/protocols/msn/msn.c:1119
+#: src/protocols/msn/msn.c:92 src/protocols/msn/msn.c:150
+#: src/protocols/msn/msn.c:250 src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:617 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:668 src/protocols/msn/msn.c:684
+#: src/protocols/msn/msn.c:716 src/protocols/msn/msn.c:724
+#: src/protocols/msn/msn.c:757 src/protocols/msn/msn.c:765
+#: src/protocols/msn/msn.c:779 src/protocols/msn/msn.c:788
+#: src/protocols/msn/msn.c:802 src/protocols/msn/msn.c:811
+#: src/protocols/msn/msn.c:833 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:921 src/protocols/msn/msn.c:1018
+#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1062
+#: src/protocols/msn/msn.c:1073 src/protocols/msn/msn.c:1084
+#: src/protocols/msn/msn.c:1108 src/protocols/msn/msn.c:1120
 #: src/protocols/msn/notification.c:127 src/protocols/msn/notification.c:156
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:969
 #: src/protocols/trepia/trepia.c:281 src/protocols/trepia/trepia.c:782
@@ -1444,8 +1390,8 @@
 "password remains the same."
 msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
 
-#: src/blist.c:794 src/gtkaccount.c:142 src/gtkpounce.c:307
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1169 src/blist.c:798 src/gtkaccount.c:140
+#: src/gtkpounce.c:307 src/gtkutils.c:781
 msgid "Unknown"
 msgstr "未知"
 
@@ -1461,8 +1407,8 @@
 msgstr "長時間離開"
 
 #: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3439
-#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2819
-#: src/protocols/oscar/oscar.c:4551 src/protocols/oscar/oscar.c:5842
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2830
+#: src/protocols/oscar/oscar.c:4581 src/protocols/oscar/oscar.c:5876
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -1497,9 +1443,9 @@
 msgstr "沒有這個使用者。"
 
 #. Should never happen.
-#: src/blist.c:502 src/dialogs.c:855 src/protocols/jabber/jabber.c:1831
-#: src/protocols/msn/notification.c:87 src/protocols/msn/notification.c:88
-#: src/protocols/msn/notification.c:644
+#: src/protocols/jabber/jabber.c:1831 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:502 src/dialogs.c:829
 msgid "Buddies"
 msgstr "好友"
 
@@ -1515,7 +1461,7 @@
 msgid "Password successfully changed."
 msgstr "密碼修改成功。"
 
-#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4258
 msgid "Connection lost"
 msgstr "失去連線"
 
@@ -1529,7 +1475,7 @@
 
 #. we have no chats yet
 #: src/protocols/jabber/jabber.c:2363 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:450 src/protocols/napster/napster.c:489
+#: src/protocols/msn/msn.c:451 src/protocols/napster/napster.c:489
 #: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:986
 msgid "Connecting"
 msgstr "連線中"
@@ -1564,7 +1510,7 @@
 msgstr "無法加入聊天室"
 
 #: src/protocols/jabber/jabber.c:3228 src/protocols/jabber/jabber.c:3279
-#: src/protocols/jabber/jabber.c:3704
+#: src/protocols/jabber/jabber.c:3697
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
@@ -1573,12 +1519,12 @@
 msgstr "錯誤"
 
 #: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
-#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3723
 msgid "Status"
 msgstr "狀態"
 
 #: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3372
-#: src/protocols/oscar/oscar.c:5455
+#: src/protocols/oscar/oscar.c:5489
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -1586,7 +1532,7 @@
 msgid "View Error Msg"
 msgstr "觀看錯誤訊息"
 
-#: src/gtkconv.c:1099 src/protocols/jabber/jabber.c:3397
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1101
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
@@ -1607,11 +1553,11 @@
 msgstr "重新要求認證"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1580 src/protocols/jabber/jabber.c:3435
-#: src/protocols/jabber/jabber.c:3485 src/protocols/oscar/oscar.c:2831
-#: src/protocols/oscar/oscar.c:4546 src/protocols/oscar/oscar.c:5840
-#: src/protocols/yahoo/yahoo.c:1075 src/protocols/zephyr/zephyr.c:866
-#: src/protocols/zephyr/zephyr.c:876
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3485
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4576
+#: src/protocols/oscar/oscar.c:5874 src/protocols/yahoo/yahoo.c:1075
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1578
 msgid "Online"
 msgstr "上線"
 
@@ -1631,7 +1577,7 @@
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/dialogs.c:2896 src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2814
 msgid "URL"
 msgstr "URL"
 
@@ -1656,8 +1602,8 @@
 msgstr "郵遞區號"
 
 #. Country
-#: src/dialogs.c:2057 src/dialogs.c:2702 src/protocols/jabber/jabber.c:3635
-#: src/protocols/trepia/trepia.c:372
+#: src/protocols/jabber/jabber.c:3635 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:1998 src/dialogs.c:2620
 msgid "Country"
 msgstr "國家"
 
@@ -1665,7 +1611,7 @@
 msgid "Telephone"
 msgstr "電話"
 
-#: src/dialogs.c:2760 src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2678
 msgid "Email"
 msgstr "電子郵件"
 
@@ -1689,35 +1635,42 @@
 msgid "Birthday"
 msgstr "生日"
 
-#: src/dialogs.c:2906 src/gtkprefs.c:604 src/gtkprefs.c:1840
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2824 src/gtkprefs.c:604
+#: src/gtkprefs.c:1840
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3668
+#: src/protocols/jabber/jabber.c:4120 src/protocols/jabber/jabber.c:4121
+msgid "Edit Jabber vCard"
+msgstr "編輯 Jabber vCard"
+
+#: src/protocols/jabber/jabber.c:4122
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
-"comfortable"
-msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
-
-#: src/protocols/jabber/jabber.c:3669
-msgid "User Identity"
-msgstr "使用者識別"
-
-#: src/protocols/jabber/jabber.c:4098
-msgid "Gaim - Edit Jabber vCard"
-msgstr "Gaim - 編輯 Jabber vCard"
-
-#: src/protocols/jabber/jabber.c:4173
+"comfortable."
+msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
+
+#: src/protocols/jabber/jabber.c:4125 src/protocols/trepia/trepia.c:379
+#: src/dialogs.c:2029 src/dialogs.c:2210 src/dialogs.c:3353 src/dialogs.c:4010
+#: src/gtkrequest.c:195
+msgid "Save"
+msgstr "儲存"
+
+#: src/protocols/jabber/jabber.c:4195
 msgid "Server Registration successful!"
 msgstr "伺服器註冊成功!"
 
-#: src/protocols/jabber/jabber.c:4194
+#: src/protocols/jabber/jabber.c:4211
+#, c-format
+msgid "Error %d: %s"
+msgstr "錯誤 %d:%s"
+
+#: src/protocols/jabber/jabber.c:4216
 msgid "Unknown registration error"
 msgstr "未知的註冊錯誤"
 
-#: src/dialogs.c:2232 src/protocols/jabber/jabber.c:4308
-#: src/protocols/oscar/oscar.c:6096 src/protocols/toc/toc.c:1462
+#: src/protocols/jabber/jabber.c:4330 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1476 src/dialogs.c:2173
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1731,16 +1684,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
+#: src/protocols/jabber/jabber.c:4419 src/protocols/jabber/jabber.c:4421
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX
-#: src/protocols/jabber/jabber.c:4421
+#: src/protocols/jabber/jabber.c:4443
 msgid "Resource"
 msgstr "資源"
 
-#: src/protocols/jabber/jabber.c:4429
+#. Account Options
+#: src/protocols/jabber/jabber.c:4447 src/protocols/msn/msn.c:1260
+#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
+#: src/gtkprefs.c:1145
+msgid "Port"
+msgstr "通訊埠"
+
+#: src/protocols/jabber/jabber.c:4451
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -1777,15 +1737,15 @@
 msgstr "無法解析訊息。"
 
 #: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:407
-#: src/protocols/msn/notification.c:1385
+#: src/protocols/msn/notification.c:1392
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1392
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1399
 msgid "Syncing with server"
-msgstr "正在與伺服器同步中"
-
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
+msgstr "與伺服器同步中"
+
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1413
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
@@ -1860,7 +1820,7 @@
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
 msgid "Not logged in"
 msgstr "尚未登入"
 
@@ -1915,6 +1875,11 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
+#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:292
+#: src/protocols/msn/notification.c:760
+msgid "Unable to write"
+msgstr "無法寫入"
+
 #: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "工作階段超載"
@@ -1961,34 +1926,47 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:166
+#: src/protocols/msn/msn.c:167
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求╱問題
-#: src/protocols/msn/msn.c:167
+#: src/protocols/msn/msn.c:168
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: src/protocols/msn/msn.c:179
+#. Build OK Button
+#: src/protocols/msn/msn.c:171 src/protocols/msn/msn.c:182
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
+#: src/protocols/oscar/oscar.c:2451 src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:5967 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6076 src/protocols/yahoo/yahoo.c:1187
+#: src/connection.c:140 src/dialogs.c:2144 src/dialogs.c:2282
+#: src/dialogs.c:2543 src/dialogs.c:2689 src/dialogs.c:3531 src/dialogs.c:3573
+#: src/dialogs.c:3704 src/dialogs.c:4047 src/gtkrequest.c:188
+#: src/request.h:813
+msgid "OK"
+msgstr "確定"
+
+#: src/protocols/msn/msn.c:180
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:202
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:210
+#: src/protocols/msn/msn.c:211
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: src/protocols/msn/msn.c:211
+#: src/protocols/msn/msn.c:212
 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?"
@@ -1996,100 +1974,100 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
 "裝置上呢?"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:216
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:217
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:234
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:236
 msgid "Page"
 msgstr "傳呼"
 
-#: src/about.c:151 src/dialogs.c:4231 src/gtkrequest.c:173
-#: src/protocols/msn/msn.c:236 src/server.c:1458
+#: src/protocols/msn/msn.c:237 src/about.c:151 src/dialogs.c:4001
+#: src/gtkrequest.c:191 src/server.c:1459
 msgid "Close"
 msgstr "關閉"
 
-#: src/protocols/msn/msn.c:324 src/protocols/yahoo/yahoo.c:1126
+#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態:</b>%s"
 
-#: src/protocols/msn/msn.c:337 src/protocols/msn/msn.c:592
+#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:593
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:595
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1053
 #: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1337
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:597
 #: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1055
 #: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1338
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:599
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1063
 #: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1342
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:600
+#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:601
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1067
 #: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1344
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:602
+#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:603
 #: src/protocols/zephyr/zephyr.c:863 src/protocols/zephyr/zephyr.c:878
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:354
+#: src/protocols/msn/msn.c:355
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:363
 msgid "Set Home Phone Number"
 msgstr "設定住家電話號碼"
 
-#: src/protocols/msn/msn.c:368
+#: src/protocols/msn/msn.c:369
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:374
+#: src/protocols/msn/msn.c:375
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:384
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:390
+#: src/protocols/msn/msn.c:391
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:414
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#NOTE: 原譯文有誤
-#: src/protocols/msn/msn.c:422
+# NOTE: 原譯文有誤
+#: src/protocols/msn/msn.c:423
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
-#: src/protocols/msn/msn.c:696
+#: src/protocols/msn/msn.c:697
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2098,11 +2076,11 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的允許清單。"
 
-#: src/protocols/msn/msn.c:700 src/protocols/msn/msn.c:740
+#: src/protocols/msn/msn.c:701 src/protocols/msn/msn.c:741
 msgid "Invalid MSN screenname"
 msgstr "無效的 MSN 使用者帳號"
 
-#: src/protocols/msn/msn.c:736
+#: src/protocols/msn/msn.c:737
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2121,14 +2099,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1235 src/protocols/msn/msn.c:1237
+#: src/protocols/msn/msn.c:1236 src/protocols/msn/msn.c:1238
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1254 src/protocols/trepia/trepia.c:1372
+#: src/protocols/msn/msn.c:1255 src/protocols/trepia/trepia.c:1372
 msgid "Login server"
 msgstr "登入伺服器"
 
+#: src/protocols/msn/notification.c:197
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN 錯誤:%s\n"
+
 #: src/protocols/msn/notification.c:235
 msgid "Unable to request INF"
 msgstr "無法取得 INF"
@@ -2175,23 +2158,30 @@
 msgid "Unable to transfer to notification server"
 msgstr "無法傳送至通知伺服器"
 
-#: src/protocols/msn/notification.c:1346
+#: src/protocols/msn/notification.c:1348
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute(s). You will "
-"automatically be signed out at that time. Please finish any conversations in "
-"progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr ""
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
 "MSN 伺服器將要關閉 %d 分鐘以進行維護,屆時您將會由伺服器上自動登出。請儘快結"
 "束您目前的交談。\n"
 "\n"
-"當維護工作結束,您將可以再度登入伺服器。"
-
-#: src/gtkpounce.c:464 src/gtkprefs.c:1532 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1073
+"當維護工作結束,您將可以再度登入。"
+
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1073
+#: src/gtkpounce.c:464 src/gtkprefs.c:1532
 msgid "Idle"
 msgstr "閒置"
 
@@ -2212,6 +2202,11 @@
 msgid "Unable to read header from server"
 msgstr "無法由伺服器讀取標頭資訊"
 
+#: src/protocols/napster/napster.c:246
+#, c-format
+msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+msgstr "無法由伺服器讀取資訊(指令為 %hd,長度為 %hd)。"
+
 #: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
@@ -2245,12 +2240,12 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/gtkblist.c:1572 src/protocols/napster/napster.c:531
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1574
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
-#: src/protocols/toc/toc.c:1201
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5198
+#: src/protocols/toc/toc.c:1215
 msgid "Join what group:"
 msgstr "加入哪個群組:"
 
@@ -2269,181 +2264,180 @@
 msgstr "NAPSTER 協定模組"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:174
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:175
+#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:176
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-#: src/protocols/oscar/oscar.c:177
-msgid "Rate to client"
-msgstr "到客戶端速率"
-
-#: src/protocols/oscar/oscar.c:179
-msgid "Service unavailable"
-msgstr "伺服器不存在"
-
-#: src/protocols/oscar/oscar.c:180
-msgid "Service not defined"
-msgstr "沒有指定服務"
-
 #: src/protocols/oscar/oscar.c:181
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
+msgid "Rate to host"
+msgstr "到伺服器速率"
 
 #: src/protocols/oscar/oscar.c:182
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Not supported by client"
-msgstr "客戶端不支援"
+msgid "Rate to client"
+msgstr "到客戶端速率"
 
 #: src/protocols/oscar/oscar.c:184
+msgid "Service unavailable"
+msgstr "伺服器不存在"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Service not defined"
+msgstr "沒有指定服務"
+
+#: src/protocols/oscar/oscar.c:186
+msgid "Obsolete SNAC"
+msgstr "過時的 SNAC"
+
+#: src/protocols/oscar/oscar.c:187
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+#: src/protocols/oscar/oscar.c:188
+msgid "Not supported by client"
+msgstr "客戶端不支援"
+
+#: src/protocols/oscar/oscar.c:189
 msgid "Refused by client"
 msgstr "被客戶端拒絕"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:190
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:191
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:192
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:193
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:194
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:195
 msgid "In local permit/deny"
 msgstr "本地端的允許╱拒絕清單"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:196
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:197
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:198
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:199
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:200
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:201
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:202
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:608
-#: src/protocols/toc/toc.c:623 src/protocols/toc/toc.c:686
+#: src/protocols/oscar/oscar.c:535 src/protocols/toc/toc.c:224
+#: src/protocols/toc/toc.c:622 src/protocols/toc/toc.c:637
+#: src/protocols/toc/toc.c:700
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:862
+#: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:876
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-# XXX TODO 照字面看新譯法比較有可能,但Paladin兄的原譯法亦非沒可能的,最好能查證一下
-# ANS 這段譯文可能比較正確,我試過使用 ICQ 加入聊天室,會出現這段訊息。
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:563
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:637 src/protocols/oscar/oscar.c:694
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:674
+#: src/protocols/oscar/oscar.c:679
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
+#: src/protocols/oscar/oscar.c:788 src/protocols/oscar/oscar.c:1171
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:790
+#: src/protocols/oscar/oscar.c:795
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
-#: src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:862 src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:880
 msgid "File Transfer Aborted"
 msgstr "取消檔案傳輸"
 
-#: src/protocols/oscar/oscar.c:858
+#: src/protocols/oscar/oscar.c:863
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:881
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1058 src/protocols/toc/toc.c:555
+#: src/protocols/oscar/oscar.c:1060 src/protocols/toc/toc.c:569
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1064
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1068
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時訊息服務暫時不存在。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1072
 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."
@@ -2452,21 +2446,21 @@
 "線,那麼您的等待時間將會更加的延長。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1074
+#: src/protocols/oscar/oscar.c:1076
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:1078 src/protocols/toc/toc.c:640
+#: src/protocols/oscar/oscar.c:1080 src/protocols/toc/toc.c:654
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
-#: src/protocols/oscar/oscar.c:1106
+#: src/protocols/oscar/oscar.c:1108
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1210 src/protocols/oscar/oscar.c:1240
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2475,29 +2469,29 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1213 src/protocols/oscar/oscar.c:1243
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1331
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入授權碼。"
 
-#: src/protocols/oscar/oscar.c:1898 src/protocols/oscar/oscar.c:5556
+#: src/protocols/oscar/oscar.c:1909 src/protocols/oscar/oscar.c:5590
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:2227 src/protocols/oscar/oscar.c:2249
+#: src/protocols/oscar/oscar.c:2238 src/protocols/oscar/oscar.c:2260
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2406
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2398
+#: src/protocols/oscar/oscar.c:2409
 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 "
@@ -2506,42 +2500,46 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2430
+#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:5752
+msgid "Connect"
+msgstr "連線"
+
+#: src/protocols/oscar/oscar.c:2441
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2449
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:2439
+#: src/protocols/oscar/oscar.c:2450
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:2467
+#: src/protocols/oscar/oscar.c:2478
 #, 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:2472 src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2483 src/protocols/oscar/oscar.c:2485
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
-#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2591
-#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5089
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:2523
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2602
+#: src/protocols/oscar/oscar.c:2622 src/protocols/oscar/oscar.c:2997
+#: src/protocols/oscar/oscar.c:3049 src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5165
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2518
+#: src/protocols/oscar/oscar.c:2529
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2602
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2550,11 +2548,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:2610 src/protocols/oscar/oscar.c:5125
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2622
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2564,17 +2562,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2623
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:2630
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2638
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2587,7 +2585,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2600,7 +2598,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2614,34 +2612,34 @@
 "%s"
 
 # XXX 應該把 contact 也統一譯為「好友」嗎?
-#: src/protocols/oscar/oscar.c:2664
+#: src/protocols/oscar/oscar.c:2675
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個聯絡人:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2670
+#: src/protocols/oscar/oscar.c:2681
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:2674
+#: src/protocols/oscar/oscar.c:2685
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:2756
+#: src/protocols/oscar/oscar.c:2767
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們都是無效的。"
 
-#: src/protocols/oscar/oscar.c:2765
+#: src/protocols/oscar/oscar.c:2776
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們都太大了。"
 
-#: src/protocols/oscar/oscar.c:2774
+#: src/protocols/oscar/oscar.c:2785
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2649,172 +2647,183 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/oscar/oscar.c:2783
+#: src/protocols/oscar/oscar.c:2794
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他 / 她太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:2803
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2801
+#: src/protocols/oscar/oscar.c:2812
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
 
-#: src/protocols/oscar/oscar.c:2817 src/protocols/oscar/oscar.c:4560
-#: src/protocols/oscar/oscar.c:5845
+#: src/protocols/oscar/oscar.c:2828 src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:5879
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
-#: src/protocols/oscar/oscar.c:5843
+#: src/protocols/oscar/oscar.c:2832 src/protocols/oscar/oscar.c:4584
+#: src/protocols/oscar/oscar.c:5877
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4557
-#: src/protocols/oscar/oscar.c:5844
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4587
+#: src/protocols/oscar/oscar.c:5878
 msgid "Occupied"
 msgstr "忙碌"
 
-# TODO 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2827
-#, fuzzy
+# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#: src/protocols/oscar/oscar.c:2838
 msgid "Web Aware"
-msgstr "容許他人在網上查看您的狀態"
-
-#: src/protocols/oscar/oscar.c:2887
+msgstr "允許其他使用者在網路上查看您目前的狀態"
+
+#: src/protocols/oscar/oscar.c:2898
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2900
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2959
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2960
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
-#: src/protocols/oscar/oscar.c:3036
+#: src/protocols/oscar/oscar.c:3047
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "使用者 %s 的個人資訊並不存在:"
 
-#: src/gtkaccount.c:280 src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:3081 src/gtkaccount.c:278
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/protocols/oscar/oscar.c:3073
+#: src/protocols/oscar/oscar.c:3084
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5874
+#: src/protocols/oscar/oscar.c:3087 src/protocols/oscar/oscar.c:5908
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:1581 src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:3090 src/gtkblist.c:1583
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5890
+#: src/protocols/oscar/oscar.c:3093 src/protocols/oscar/oscar.c:5924
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:5916
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3100
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3103
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:3095
+#: src/protocols/oscar/oscar.c:3106
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3109
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy 錯誤"
 
 # XXX 很多PO都沒有譯AP一詞,有翻的都是看不明的語文,不知有沒有譯錯
 # ANS 我記得在 ICQ 中,有分三種使用者,「AP User」為其中一種。
-#: src/protocols/oscar/oscar.c:3101
+#: src/protocols/oscar/oscar.c:3112
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3115
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3107
+# NOTE「Nihilist」是什麼呢?連開發者都不知道
+# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
+# NOTE (18:07:23) KingAnt: Yeah, what he said
+# NOTE (18:17:08) wing: capability of all 0s?
+# NOTE (18:17:29) KingAnt: Right...
+# NOTE (18:17:36) wing: what does that mean though?
+# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
+#: src/protocols/oscar/oscar.c:3118
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3121
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3113
+#: src/protocols/oscar/oscar.c:3124
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3127
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3130
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3159
+# FIXME 這是什麼
+#: src/protocols/oscar/oscar.c:3133
+msgid "Hiptop"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3173
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<I>因為使用了未知的編碼,所以無法顯示訊息。</i>"
 
-#: src/protocols/oscar/oscar.c:3166
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上線時間:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3185
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成為成員的時間:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3191
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "閒置:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3194
 msgid "Idle: <b>Active</b>"
 msgstr "閒置:<b>沒閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3182
+#: src/protocols/oscar/oscar.c:3196
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2827,27 +2836,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3228
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:3225
+#: src/protocols/oscar/oscar.c:3239
 msgid "Client Capabilities: "
 msgstr "客戶端相容性:"
 
-#: src/protocols/oscar/oscar.c:3231
+#: src/protocols/oscar/oscar.c:3245
 msgid "<i>No Information Provided</i>"
 msgstr "<i>未提供任何信息</i>"
 
-#: src/protocols/oscar/oscar.c:3255
+#: src/protocols/oscar/oscar.c:3269
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:3642
+#: src/protocols/oscar/oscar.c:3656
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3643
+#: src/protocols/oscar/oscar.c:3657
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -2855,154 +2864,154 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3704
+#: src/protocols/oscar/oscar.c:3718
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3706
+#: src/protocols/oscar/oscar.c:3720
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3948
 msgid "UIN:"
 msgstr "使用者帳號:"
 
-#: src/protocols/oscar/oscar.c:3939
+#: src/protocols/oscar/oscar.c:3953
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3956
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3959 src/protocols/oscar/oscar.c:3965
 msgid "Email Address:"
 msgstr "電子郵件:"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3970
 msgid "Mobile Phone:"
 msgstr "行動電話:"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3973
 msgid "Gender:"
 msgstr "性別:"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:3982
 msgid "Birthday:"
 msgstr "生日:"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:3987
 msgid "Age:"
 msgstr "年齡:"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3990
 msgid "Personal Web Page:"
 msgstr "個人網頁:"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3993
 msgid "Additional Information:"
 msgstr "其他資訊:"
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:3997
 msgid "Home Address:"
 msgstr "住家地址:"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:3999 src/protocols/oscar/oscar.c:4015
 msgid "Address:"
 msgstr "地址:"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4002 src/protocols/oscar/oscar.c:4018
 msgid "City:"
 msgstr "城市:"
 
 # NOTE 不能翻成「州份」,蠻怪的。而且與其他的不同
-#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4005 src/protocols/oscar/oscar.c:4021
 msgid "State:"
 msgstr "省╱州:"
 
-#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
+#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
 msgid "Zip Code:"
 msgstr "郵遞區號:"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4013
 msgid "Work Address:"
 msgstr "工作地址:"
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:4029
 msgid "Work Information:"
 msgstr "工作資訊:"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4031
 msgid "Company:"
 msgstr "公司名稱:"
 
-#: src/protocols/oscar/oscar.c:4020
+#: src/protocols/oscar/oscar.c:4034
 msgid "Division:"
 msgstr "部門:"
 
-#: src/protocols/oscar/oscar.c:4023
+#: src/protocols/oscar/oscar.c:4037
 msgid "Position:"
 msgstr "職位:"
 
-#: src/protocols/oscar/oscar.c:4026
+#: src/protocols/oscar/oscar.c:4040
 msgid "Web Page:"
 msgstr "網頁:"
 
-#: src/protocols/oscar/oscar.c:4094
+#: src/protocols/oscar/oscar.c:4108
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 擁有下列的帳號:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4112
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4149
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4177
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4166
+#: src/protocols/oscar/oscar.c:4180
 #, 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:4169
+#: src/protocols/oscar/oscar.c:4183
 #, 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:4172
+#: src/protocols/oscar/oscar.c:4186
 #, 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:4175
+#: src/protocols/oscar/oscar.c:4189
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -3010,7 +3019,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4178
+#: src/protocols/oscar/oscar.c:4192
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -3018,19 +3027,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4195
 #, 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:4184
+#: src/protocols/oscar/oscar.c:4198
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4194
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -3039,20 +3048,20 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4216
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4200
+#: src/protocols/oscar/oscar.c:4214
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件為 %s"
 
-#: src/protocols/oscar/oscar.c:4425
+#: src/protocols/oscar/oscar.c:4449
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4426
+#: src/protocols/oscar/oscar.c:4450
 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 "
@@ -3061,22 +3070,25 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4480
 #, c-format
 msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
-
-#: src/protocols/oscar/oscar.c:4458
+msgstr[0] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
+
+#: src/protocols/oscar/oscar.c:4485
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:4505
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -3085,22 +3097,25 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it and set you away."
-msgstr "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
-
-#: src/protocols/oscar/oscar.c:4520
+"truncated it for you."
+msgstr[0] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
+
+#: src/protocols/oscar/oscar.c:4550
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4740
+#: src/protocols/oscar/oscar.c:4770
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4741
+#: src/protocols/oscar/oscar.c:4771
 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 "
@@ -3109,12 +3124,12 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:4832 src/protocols/oscar/oscar.c:4833
-#: src/protocols/oscar/oscar.c:4838
+#: src/protocols/oscar/oscar.c:4862 src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4868
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5002
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3123,15 +3138,15 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5002 src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5032 src/protocols/oscar/oscar.c:5045
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
+#: src/protocols/oscar/oscar.c:5033 src/protocols/oscar/oscar.c:5046
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5045
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3141,18 +3156,20 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5080
 #, 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:5056
+msgstr ""
+"使用者 %s 已經允許您加入到他(她)的好友清單中。您是不是也要將他(她)加入"
+"呢?"
+
+#: src/protocols/oscar/oscar.c:5086
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5119
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3162,17 +3179,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5131
+#: src/protocols/oscar/oscar.c:5161
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5162
 msgid "Authorization Granted"
 msgstr "給予認證"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3182,91 +3199,91 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5136
+#: src/protocols/oscar/oscar.c:5166
 msgid "Authorization Denied"
 msgstr "認證拒絕"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
+#: src/protocols/oscar/oscar.c:5203 src/protocols/toc/toc.c:1220
 msgid "Exchange:"
 msgstr "聊天室號碼:"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5425
 msgid "<b>Status:</b> "
 msgstr "<b>狀態:</b>"
 
-#: src/protocols/oscar/oscar.c:5402
+#: src/protocols/oscar/oscar.c:5434
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入時間:</b>"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5441
 msgid "<b>Capabilities:</b> "
 msgstr "<b>相容性:</b>"
 
-#: src/protocols/oscar/oscar.c:5415
+#: src/protocols/oscar/oscar.c:5448
 msgid "<b>Available:</b> "
 msgstr "<b>上線:</b>"
 
-#: src/protocols/oscar/oscar.c:5423
+#: src/protocols/oscar/oscar.c:5457
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態:</b>未認證"
 
-#: src/gtkblist.c:895 src/protocols/oscar/oscar.c:5427
+#: src/protocols/oscar/oscar.c:5461 src/gtkblist.c:896
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態:</b>離線"
 
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5491
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5732
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:5711
+#: src/protocols/oscar/oscar.c:5745
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:5714
+#: src/protocols/oscar/oscar.c:5748
 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:5859
+#: src/protocols/oscar/oscar.c:5893
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:5903
+#: src/protocols/oscar/oscar.c:5937
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:5924
+#: src/protocols/oscar/oscar.c:5958
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:5925
+#: src/protocols/oscar/oscar.c:5959
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:5931
+#: src/protocols/oscar/oscar.c:5965
 msgid "New screenname formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:5980
+#: src/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:5994
+#: src/protocols/oscar/oscar.c:6028
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您目前正在等待下列好友的認證:<BR>"
 
-#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/oscar/oscar.c:6053
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6024
+#: src/protocols/oscar/oscar.c:6058
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3275,43 +3292,43 @@
 "%s<BR><BR>您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,"
 "然後選擇「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6040
+#: src/protocols/oscar/oscar.c:6074
 msgid "Available Message:"
 msgstr "上線訊息:"
 
-#: src/protocols/oscar/oscar.c:6041
+#: src/protocols/oscar/oscar.c:6075
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "請和我聊聊吧!我覺得好寂寞!"
 
-#: src/protocols/oscar/oscar.c:6103
+#: src/protocols/oscar/oscar.c:6137
 msgid "Set Available Message"
 msgstr "設定上線訊息"
 
-#: src/protocols/oscar/oscar.c:6117
+#: src/protocols/oscar/oscar.c:6151
 msgid "Change Password (URL)"
 msgstr "修改密碼(URL)"
 
-#: src/protocols/oscar/oscar.c:6128
+#: src/protocols/oscar/oscar.c:6162
 msgid "Format Screenname"
 msgstr "格式化帳號"
 
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6168
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6174
 msgid "Display Current Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6146
+#: src/protocols/oscar/oscar.c:6180
 msgid "Change Current Registered Address"
 msgstr "修改目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:6189
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6197
 msgid "Search for Buddy by Email"
 msgstr "使用電子郵件搜尋好友"
 
@@ -3325,15 +3342,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6284 src/protocols/oscar/oscar.c:6286
+#: src/protocols/oscar/oscar.c:6318 src/protocols/oscar/oscar.c:6320
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6303
+#: src/protocols/oscar/oscar.c:6337
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6308
+#: src/protocols/oscar/oscar.c:6342
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -3342,105 +3359,105 @@
 msgid "Looking up %s"
 msgstr "找尋 %s 中"
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:508
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:511
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:514
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s 位元組被截去。"
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:517
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:520
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "警告:%s 是不被允許的。"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:523
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:526
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:529
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:532
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:535
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:538
 msgid "Failure."
 msgstr "失敗。"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:541
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:544
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:547
 msgid "Dir service temporarily unavailable."
 msgstr "目錄服務暫時不存在。"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:550
 msgid "Email lookup restricted."
 msgstr "禁止 eMail 檢查。"
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:553
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:556
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:559
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:563
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:566
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:572
 msgid "The service is temporarily unavailable."
 msgstr "服務暫時不存在。"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:575
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:578
 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."
@@ -3448,37 +3465,37 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/toc/toc.c:566
+#: src/protocols/toc/toc.c:580
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
-#: src/protocols/toc/toc.c:569
+#: src/protocols/toc/toc.c:583
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
-#: src/protocols/toc/toc.c:589
+#: src/protocols/toc/toc.c:603
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: src/protocols/toc/toc.c:627
+#: src/protocols/toc/toc.c:641
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: src/protocols/toc/toc.c:692
+#: src/protocols/toc/toc.c:706
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:880
+#: src/protocols/toc/toc.c:894
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:884
+#: src/protocols/toc/toc.c:898
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
-#: src/protocols/toc/toc.c:885
+#: src/protocols/toc/toc.c:899
 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 "
@@ -3487,47 +3504,47 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1344
+#: src/protocols/toc/toc.c:1358
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1468
+#: src/protocols/toc/toc.c:1482
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1591
+#: src/protocols/toc/toc.c:1605
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1627
+#: src/protocols/toc/toc.c:1641
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1712
-#: src/protocols/toc/toc.c:1924
+#: src/protocols/toc/toc.c:1686 src/protocols/toc/toc.c:1726
+#: src/protocols/toc/toc.c:1938
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1836
+#: src/protocols/toc/toc.c:1850
 msgid "Could not connect for transfer!"
 msgstr "無法開啟傳輸的連線!"
 
-#: src/protocols/toc/toc.c:1869
+#: src/protocols/toc/toc.c:1883
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:1969
+#: src/protocols/toc/toc.c:1983 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2003
+#: src/protocols/toc/toc.c:2017
 #, 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:2010
+#: src/protocols/toc/toc.c:2024
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -3542,15 +3559,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2099 src/protocols/toc/toc.c:2101
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2104
+#: src/protocols/toc/toc.c:2118
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2108
+#: src/protocols/toc/toc.c:2122
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -3560,12 +3577,12 @@
 msgstr "基本資料"
 
 #. First Name
-#: src/dialogs.c:1990 src/dialogs.c:2644 src/protocols/trepia/trepia.c:300
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1931 src/dialogs.c:2562
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/dialogs.c:2013 src/dialogs.c:2664 src/protocols/trepia/trepia.c:307
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:1954 src/dialogs.c:2582
 msgid "Last Name"
 msgstr "姓"
 
@@ -3626,7 +3643,7 @@
 msgstr "我來自"
 
 #. State
-#: src/dialogs.c:2046 src/dialogs.c:2693 src/protocols/trepia/trepia.c:368
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:1987 src/dialogs.c:2611
 msgid "State"
 msgstr "省╱州"
 
@@ -3635,11 +3652,6 @@
 msgid "Set your Trepia profile data."
 msgstr "設定您的 Trepia 個人資料。"
 
-#: src/dialogs.c:2088 src/dialogs.c:2269 src/dialogs.c:3435 src/dialogs.c:4240
-#: src/dialogs.c:4878 src/gtkrequest.c:177 src/protocols/trepia/trepia.c:379
-msgid "Save"
-msgstr "儲存"
-
 #: src/protocols/trepia/trepia.c:523
 msgid "Set Profile"
 msgstr "設定個人資料"
@@ -3663,6 +3675,10 @@
 msgid "Logging in"
 msgstr "登入中"
 
+#: src/protocols/trepia/trepia.c:1148
+msgid "Unable to create socket"
+msgstr "無法建立 Socket"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -3681,6 +3697,14 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
+#: src/protocols/yahoo/yahoo.c:897
+msgid "Unable to read"
+msgstr "無法讀取"
+
+#: src/protocols/yahoo/yahoo.c:995
+msgid "Connection problem"
+msgstr "連線錯誤"
+
 #: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1265
 #: src/protocols/yahoo/yahoo.c:1339
 msgid "Not At Home"
@@ -3873,23 +3897,23 @@
 "paladin@ms1.hinet.net\">paladin@ms1.hinet.net</A>&gt;<BR>  URL: <A HREF="
 "\"http://gaim.dnsq.org/\">http://gaim.dnsq.org</A><BR><BR>"
 
-#: src/away.c:222
+#: src/away.c:211
 msgid "Gaim - Away!"
 msgstr "Gaim - 離開!"
 
-#: src/away.c:282
+#: src/away.c:272
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:384
+#: src/away.c:377
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/away.c:404
+#: src/away.c:397
 msgid "Remove Away Message"
 msgstr "移除離開訊息"
 
-#: src/away.c:599
+#: src/away.c:592
 msgid "Set All Away"
 msgstr "全部設為離開"
 
@@ -3900,39 +3924,42 @@
 #: src/blist.c:751
 #, c-format
 msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
-msgstr ""
+msgstr[0] ""
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:756
+#: src/blist.c:760
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:947
+#: src/blist.c:973
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:1703
+#: src/blist.c:1729
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:1705
+#: src/blist.c:1731
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1713
+#: src/blist.c:1739
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
 msgstr "Gaim 正在轉換您的舊好友清單為新格式,同時將它存放於 %s"
 
-#: src/blist.c:1716
+#: src/blist.c:1742
 msgid "Converting Buddy List"
 msgstr "轉換好友清單中"
 
@@ -3947,15 +3974,15 @@
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
 msgstr ""
-"因為您使用了「使用者自定瀏覽器」的選項,而瀏覽器並沒有被設定,"
-"因此瀏覽器沒有辦法被啟動。"
+"因為您使用了「使用者自定瀏覽器」的選項,而瀏覽器並沒有被設定,因此瀏覽器沒有"
+"辦法被啟動。"
 
 #: src/browser.c:586
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr "啟動您所選擇的瀏覽器時發生錯誤:%s"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1333
+#: src/buddy_chat.c:316 src/dialogs.c:1274
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3978,6 +4005,29 @@
 msgid "Join"
 msgstr "加入"
 
+#: src/connection.c:113
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "找不到 %s 的協定模組"
+
+#: src/connection.c:118 src/connection.c:408
+msgid "Connection Error"
+msgstr "連線錯誤"
+
+#: src/connection.c:138
+#, c-format
+msgid "Enter password for %s"
+msgstr "輸入 %s 的密碼"
+
+#: src/connection.c:404
+#, c-format
+msgid "%s has been disconnected"
+msgstr "%s 已經中斷連線"
+
+#: src/connection.c:407
+msgid "Reason Unknown."
+msgstr "理由不明。"
+
 #: src/conversation.c:405
 msgid "Unable to send message. The message is too large."
 msgstr "無法送出訊息。這個訊息太大了。"
@@ -3991,7 +4041,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1926
+#: src/conversation.c:1924
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -4001,51 +4051,51 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1929
+#: src/conversation.c:1927
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:1979
+#: src/conversation.c:1977
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2021
+#: src/conversation.c:2019
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2023
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2224
+#: src/conversation.c:2222
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
+#: src/conversation.c:2224
+msgid "New window"
+msgstr "新視窗"
+
 #: src/conversation.c:2226
-msgid "New window"
-msgstr "新視窗"
-
-#: src/conversation.c:2228
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2230
+#: src/conversation.c:2228
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:345
+#: src/dialogs.c:337
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:348
+#: src/dialogs.c:340
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:356
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -4057,431 +4107,474 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:373
+#: src/dialogs.c:365
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:380
+#: src/dialogs.c:372
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:449
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:457 src/dialogs.c:458
+#: src/dialogs.c:451 src/dialogs.c:452
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:461
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:469 src/dialogs.c:470
+#: src/dialogs.c:463 src/dialogs.c:464
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:473
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續"
-"這個動作嗎?"
-
-#: src/dialogs.c:482 src/dialogs.c:483
+"您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
+
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:626
 msgid "New Message"
 msgstr "新訊息"
 
-#: src/dialogs.c:650
+#: src/dialogs.c:644
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
 
-#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
+#: src/dialogs.c:660 src/dialogs.c:737
 msgid "_Screenname:"
 msgstr "帳號(_S):"
 
-#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
+#: src/dialogs.c:675 src/dialogs.c:753 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/dialogs.c:712
+# XXX 「取得使用者資訊」是正確譯法,但它實在太長了,令畫面很奇怪 (GTK Layout Bug?)
+#: src/dialogs.c:706
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:731
+#: src/dialogs.c:725
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "請輸入您所想要查詢對象的帳號。\n"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:863
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/dialogs.c:906
-msgid "Please enter the name of the group to be added.\n"
-msgstr "請輸入群組名稱以進行新增。\n"
-
-#: src/dialogs.c:915 src/dialogs.c:4319
-msgid "_Group:"
-msgstr "群組(_G):"
-
-#: src/dialogs.c:951
+#: src/dialogs.c:863
+msgid "Add a new group"
+msgstr "新增群組"
+
+# FIXME 不太通順
+#: src/dialogs.c:864
+msgid "Please enter the name of the group to be added."
+msgstr "請輸入群組名稱以進行新增。"
+
+#: src/dialogs.c:892
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/dialogs.c:970
+#: src/dialogs.c:911
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,"
-"而這個設定將會在好友清單中顯示。\n"
-
-#: src/dialogs.c:989
+"請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
+"在好友清單中顯示。\n"
+
+#: src/dialogs.c:930
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/dialogs.c:1002
+#: src/dialogs.c:943
 msgid "Alias"
 msgstr "別名"
 
-#: src/dialogs.c:1012
+#: src/dialogs.c:953
 msgid "Group"
 msgstr "群組"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1021
+#: src/dialogs.c:962
 msgid "Add To"
 msgstr "增加到"
 
-#: src/dialogs.c:1340
+#: src/dialogs.c:1281
 msgid "Add Chat"
 msgstr "加入聊天室"
 
-#: src/dialogs.c:1363
+#: src/dialogs.c:1304
 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/dialogs.c:1372
+#: src/dialogs.c:1313
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/dialogs.c:1391 src/gtkaccount.c:430
+#: src/dialogs.c:1332 src/gtkaccount.c:428
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/dialogs.c:1402
+#: src/dialogs.c:1343
 msgid "Group:"
 msgstr "群組:"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1689
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/dialogs.c:1764
+#: src/dialogs.c:1705
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
-#: src/dialogs.c:1773
+#: src/dialogs.c:1714
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/dialogs.c:1790
+#: src/dialogs.c:1731
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/dialogs.c:1794
+#: src/dialogs.c:1735
 msgid "Allow only users on my buddy list"
 msgstr "只允許好友清單中的使用者"
 
-#: src/dialogs.c:1798
+#: src/dialogs.c:1739
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/dialogs.c:1836
+#: src/dialogs.c:1777
 msgid "Deny all users"
 msgstr "拒絕所有使用者"
 
-#: src/dialogs.c:1840
+#: src/dialogs.c:1781
 msgid "Block the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/dialogs.c:1956
+#: src/dialogs.c:1897
 msgid "Set Directory Info"
 msgstr "設定使用者資訊"
 
-#: src/dialogs.c:1964
+#: src/dialogs.c:1905
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:1915
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "設定 %s 的使用者資訊:"
 
-#: src/dialogs.c:1987
+#: src/dialogs.c:1928
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
+# TODO: Untranslated
 #. Line 2
-#: src/dialogs.c:2001 src/dialogs.c:2654
+#: src/dialogs.c:1942 src/dialogs.c:2572
 msgid "Middle Name"
 msgstr ""
 
 # NOTE「小名」大概也可以,但「Maiden Name」通常係指未嫁時的「本姓」
 #. Line 4
-#: src/dialogs.c:2024 src/dialogs.c:2674
+#: src/dialogs.c:1965 src/dialogs.c:2592
 msgid "Maiden Name"
 msgstr "本姓"
 
-#: src/dialogs.c:2111
+#: src/dialogs.c:2052
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: src/dialogs.c:2117
+#: src/dialogs.c:2058
 msgid "Fill out all fields completely."
 msgstr "請完成所有表格的填寫。"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2103
 #, c-format
 msgid "Changing password for %s:"
 msgstr "修改 %s 的密碼:"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2111
 msgid "Original Password"
 msgstr "舊密碼"
 
-#: src/dialogs.c:2181
+#: src/dialogs.c:2122
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2133
 msgid "New Password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2182
 #, c-format
 msgid "Changing info for %s:"
 msgstr "修改 %s 的資訊:"
 
-#: src/dialogs.c:2327
+#: src/dialogs.c:2268
 msgid "Below are the results of your search: "
 msgstr "以下是您所做查詢的結果:"
 
-#: src/dialogs.c:2438
-msgid "Permit"
-msgstr "許可"
-
-#: src/dialogs.c:2470
-msgid "Add Permit"
-msgstr "加入許可"
-
-#: src/dialogs.c:2472
-msgid "Add Deny"
-msgstr "加入拒絕"
-
-#: src/dialogs.c:2539
+#: src/dialogs.c:2369
+#, c-format
+msgid "Unblock %s?"
+msgstr "解封 %s?"
+
+#: src/dialogs.c:2371
+#, c-format
+msgid ""
+"You are about to unblock %s. This will allow %s to speak to you again. Do "
+"you want to continue?"
+msgstr "您將要解封 %s;%s 將可再次對您說話。您要繼續這個動作嗎?"
+
+#: src/dialogs.c:2375 src/dialogs.c:2388
+msgid "Unblock User"
+msgstr "解封使用者"
+
+#: src/dialogs.c:2377 src/gtkrequest.c:197
+msgid "Unblock"
+msgstr "解封"
+
+#: src/dialogs.c:2382
+#, c-format
+msgid "Block %s?"
+msgstr "解封 %s?"
+
+#: src/dialogs.c:2384
+#, c-format
+msgid ""
+"You are about to block %s. This will prevent %s from speaking to you again. "
+"Do you want to continue?"
+msgstr "您將要封鎖 %s;%s 將不再能對您說話。您要繼續這個動作嗎?"
+
+#. Block button
+#: src/dialogs.c:2390 src/gtkconv.c:2995 src/gtkrequest.c:196
+msgid "Block"
+msgstr "封鎖"
+
+#: src/dialogs.c:2457
 msgid "Log Conversation"
 msgstr "記錄交談"
 
-#: src/dialogs.c:2620 src/dialogs.c:2753
+#: src/dialogs.c:2538 src/dialogs.c:2671
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2638
 msgid "Find Buddy By Info"
 msgstr "以資訊找尋好友"
 
-#: src/dialogs.c:2747
+#: src/dialogs.c:2665
 msgid "Find Buddy By Email"
 msgstr "以電子郵件來找尋好友"
 
-#: src/dialogs.c:2851
+#: src/dialogs.c:2769
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/dialogs.c:2853
+#: src/dialogs.c:2771
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2872
+#: src/dialogs.c:2790
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。\n"
 
-#: src/dialogs.c:3041 src/dialogs.c:3058
+#: src/dialogs.c:2959 src/dialogs.c:2976
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:3093 src/dialogs.c:3110
+#: src/dialogs.c:3011 src/dialogs.c:3028
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:3207 src/dialogs.c:3233
+#: src/dialogs.c:3125 src/dialogs.c:3151
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:3299
+#: src/dialogs.c:3217
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:3301
+#: src/dialogs.c:3219
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:3311
+#: src/dialogs.c:3229
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:3376 src/dialogs.c:3384
+#: src/dialogs.c:3294 src/dialogs.c:3302
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3394
+#: src/dialogs.c:3312
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:3439
+#: src/dialogs.c:3357
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:3443
+#: src/dialogs.c:3361
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3592
+#: src/dialogs.c:3510
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/dialogs.c:3638
+#: src/dialogs.c:3528
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#. Setup the label containing the description.
-#: src/dialogs.c:3667
-msgid "Please enter an aliased name for this chat.\n"
-msgstr "請為這個聊天室輸入一個別名。\n"
-
-#: src/dialogs.c:3679 src/dialogs.c:3782
-msgid "_Alias:"
-msgstr "別名(_A):"
-
-#: src/dialogs.c:3716
+#: src/dialogs.c:3528
+msgid "Alias chat"
+msgstr "給聊天室改別名"
+
+#: src/dialogs.c:3529
+msgid "Please enter an aliased name for this chat."
+msgstr "請為這個聊天室輸入一個別名。"
+
+#: src/dialogs.c:3560
+msgid "_Screenname"
+msgstr "帳號(_S)"
+
+#: src/dialogs.c:3564 src/gtkblist.c:429 src/gtkblist.c:475
+msgid "_Alias"
+msgstr "別名(_A)"
+
+#: src/dialogs.c:3568
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
+#: src/dialogs.c:3569
+msgid "Alias buddy"
+msgstr "為好友加上別名"
+
 # NOTE 這個譯句應該沒有問題。(執行「別名」來看實際使用情況)
 # NOTE 但我把「下列人員...」改為新的譯句...。
-#. Setup the label containing the description.
-#: src/dialogs.c:3746
+#: src/dialogs.c:3570
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list.\n"
-msgstr "請為這個好友設定別名,或者更改他在好友清單中所記錄的帳號。\n"
-
-#: src/dialogs.c:3836 src/dialogs.c:3843
+"your buddy list."
+msgstr "請為這個好友設定別名,或者更改他(她)在好友清單中所記錄的帳號。"
+
+#: src/dialogs.c:3606 src/dialogs.c:3613
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "無法寫入到 %s。"
 
-#: src/dialogs.c:3867
+#: src/dialogs.c:3637
 msgid "Save Log File"
 msgstr "儲存日誌檔"
 
-#: src/dialogs.c:3897
+#: src/dialogs.c:3667
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "無法刪除檔案 %s。"
 
-#: src/dialogs.c:3916
+#: src/dialogs.c:3686
 msgid "Clear Log"
 msgstr "清除日誌"
 
-#: src/dialogs.c:3925
+#: src/dialogs.c:3695
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎?"
 
-#: src/dialogs.c:3970
+#: src/dialogs.c:3740
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "無法開啟日誌檔 %s。"
 
-#: src/dialogs.c:4112
+#: src/dialogs.c:3882
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: src/dialogs.c:4114
+#: src/dialogs.c:3884
 msgid "System Log"
 msgstr "系統日誌"
 
-#: src/dialogs.c:4135
+#: src/dialogs.c:3905
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "無法開啟日誌檔 %s"
 
-#: src/dialogs.c:4156
+#: src/dialogs.c:3926
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4213
+#: src/dialogs.c:3983
 msgid "Log"
 msgstr "日誌"
 
-#: src/dialogs.c:4235
+#: src/dialogs.c:4005
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4293
+#: src/dialogs.c:4044
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:4310
-msgid "Please enter a new name for the selected group.\n"
-msgstr "請為選取的群組輸入一個新的名稱。\n"
-
-#: src/ft.c:121
+#: src/dialogs.c:4044
+msgid "New group name"
+msgstr "新名字"
+
+#: src/dialogs.c:4045
+msgid "Please enter a new name for the selected group."
+msgstr "請為選取的群組輸入一個新的名稱。"
+
+#: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是一個有效的檔案名稱。\n"
 
-#: src/ft.c:135
+#: src/ft.c:137
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 找不到。\n"
 
-#: src/ft.c:727
+#: src/ft.c:693
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "傳送檔案到 %s 被取消。\n"
 
-#: src/ft.c:729
+#: src/ft.c:695
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "由 %s 傳送檔案被取消。\n"
 
+# TODO: Untranslated
 #: src/gaim-disclosure.c:253
 msgid "Expander Size"
 msgstr ""
 
+# TODO: Untranslated
 #: src/gaim-disclosure.c:254
 msgid "Size of the expander arrow"
 msgstr ""
@@ -4565,29 +4658,28 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "不好意思,我離開一下下。"
 
-#: src/gaimrc.c:364 src/gaimrc.c:1515
+#: src/gaimrc.c:368 src/gaimrc.c:1600
 msgid "boring default"
 msgstr "無聊(預設)"
 
-#: src/gaimrc.c:1179 src/gtkblist.c:1392
+#: src/gaimrc.c:1264 src/gtkblist.c:1394
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1181 src/gtkblist.c:1393
+#: src/gaimrc.c:1266 src/gtkblist.c:1395
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1183 src/gtkblist.c:1394
+#: src/gaimrc.c:1268 src/gtkblist.c:1396
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gaimrc.c:1613
+#: src/gaimrc.c:1698
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-# XXX 要複查譯文
-#: src/gtkaccount.c:255
+#: src/gtkaccount.c:253
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4599,294 +4691,290 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:330
+#: src/gtkaccount.c:328
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:347
+#: src/gtkaccount.c:345
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:352
+#: src/gtkaccount.c:350
 msgid "Screenname:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:434
+#: src/gtkaccount.c:432
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:488
+#: src/gtkaccount.c:486
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:501
+#: src/gtkaccount.c:499
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:510
+#: src/gtkaccount.c:508
 msgid "Buddy icon file:"
 msgstr "好友圖示檔案:"
 
-#: src/gtkaccount.c:519
+#: src/gtkaccount.c:517
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: src/gtkaccount.c:525
+#: src/gtkaccount.c:523
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:586
+#: src/gtkaccount.c:584
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:707
+#: src/gtkaccount.c:705
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
 #. No Proxy
-#: src/gtkaccount.c:714
+#: src/gtkaccount.c:712
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:721
+#: src/gtkaccount.c:719
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:728
+#: src/gtkaccount.c:726
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:735
+#: src/gtkaccount.c:733
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:765
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:771
+#: src/gtkaccount.c:769
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:785
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:803 src/gtkprefs.c:1100
+#: src/gtkaccount.c:801 src/gtkprefs.c:1100
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:812
+#: src/gtkaccount.c:810
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:816
+#: src/gtkaccount.c:814
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:824
+#: src/gtkaccount.c:822
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:829
+#: src/gtkaccount.c:827
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
+#: src/gtkaccount.c:1140
+msgid "Add Account"
+msgstr "新增帳號"
+
 #: src/gtkaccount.c:1142
-msgid "Add Account"
-msgstr "新增帳號"
-
-#: src/gtkaccount.c:1144
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1168
+#: src/gtkaccount.c:1166
 msgid "Show more options"
 msgstr "顯示較多的選項"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1167
 msgid "Show fewer options"
 msgstr "顯示較少的選項"
 
 #. Register button
-#: src/gtkaccount.c:1196
+#: src/gtkaccount.c:1194
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1475
+#: src/gtkaccount.c:1473
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:1479 src/gtkrequest.c:174
+#: src/gtkaccount.c:1477 src/gtkrequest.c:192
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1557
+#: src/gtkaccount.c:1555
 msgid "Screenname"
 msgstr "帳號"
 
-#: src/gtkaccount.c:1598
+#: src/gtkaccount.c:1596
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkblist.c:409
+#: src/gtkblist.c:410
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:411
+#: src/gtkblist.c:412
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:413
+#: src/gtkblist.c:414
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:415
+#: src/gtkblist.c:416
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:423
+#: src/gtkblist.c:424
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:425
+#: src/gtkblist.c:426
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:428 src/gtkblist.c:474
-msgid "_Alias"
-msgstr "別名(_A)"
-
-#: src/gtkblist.c:430 src/gtkblist.c:476
+#: src/gtkblist.c:431 src/gtkblist.c:477
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:448
+#: src/gtkblist.c:449
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: src/gtkblist.c:451
+#: src/gtkblist.c:452
 msgid "_IM"
 msgstr "即時訊息(_I)"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:454
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:456
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:780
+#: src/gtkblist.c:781
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:781
-msgid "/Buddies/New _Instant Message..."
-msgstr "/好友/新即時訊息(_I)"
-
 #: src/gtkblist.c:782
-msgid "/Buddies/Join a _Chat..."
-msgstr "/好友/加入聊天室(_C)"
+msgid "/Buddies/New _Instant Message..."
+msgstr "/好友/新即時訊息(_I)"
 
 #: src/gtkblist.c:783
+msgid "/Buddies/Join a _Chat..."
+msgstr "/好友/加入聊天室(_C)"
+
+#: src/gtkblist.c:784
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友/取得使用者資訊(_U)"
 
-#: src/gtkblist.c:785
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/好友/顯示離線好友(_O)"
-
 #: src/gtkblist.c:786
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/好友/顯示空白的群組(_E)"
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/好友/顯示離線好友(_O)"
 
 #: src/gtkblist.c:787
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/好友/顯示空白的群組(_E)"
+
+#: src/gtkblist.c:788
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友/新增一個好友(_A)"
 
-#: src/gtkblist.c:788
+#: src/gtkblist.c:789
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友/新增一個聊天室(_H)"
 
-#: src/gtkblist.c:789
+#: src/gtkblist.c:790
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友/新增一個群組(_G)"
 
-#: src/gtkblist.c:791
+#: src/gtkblist.c:792
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:792
+#: src/gtkblist.c:793
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:795
+#: src/gtkblist.c:796
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:796
+#: src/gtkblist.c:797
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:797
+#: src/gtkblist.c:798
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:798
+#: src/gtkblist.c:799
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具/通訊協定相關設定(_R)"
 
-#: src/gtkblist.c:800
+#: src/gtkblist.c:801
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:801
-msgid "/Tools/_File Transfers..."
-msgstr "/工具/檔案傳輸(_F)"
-
 #: src/gtkblist.c:802
-msgid "/Tools/Preferences"
-msgstr "/工具/偏好設定"
+msgid "/Tools/_File Transfers..."
+msgstr "/工具/檔案傳輸(_F)"
 
 #: src/gtkblist.c:803
+msgid "/Tools/Preferences"
+msgstr "/工具/偏好設定"
+
+#: src/gtkblist.c:804
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:805
+#: src/gtkblist.c:806
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:808
+#: src/gtkblist.c:809
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:809
-msgid "/Help/Online _Help"
-msgstr "線上說明(_H)"
-
 #: src/gtkblist.c:810
-msgid "/Help/_Debug Window"
-msgstr "/說明/除錯視窗(_D)"
+msgid "/Help/Online _Help"
+msgstr "線上說明(_H)"
 
 #: src/gtkblist.c:811
+msgid "/Help/_Debug Window"
+msgstr "/說明/除錯視窗(_D)"
+
+#: src/gtkblist.c:812
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:845
+#: src/gtkblist.c:846
 #, c-format
 msgid ""
 "\n"
@@ -4895,12 +4983,12 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:908
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:921
+#: src/gtkblist.c:922
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4908,7 +4996,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:922
+#: src/gtkblist.c:923
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4916,7 +5004,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:923
+#: src/gtkblist.c:924
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4924,7 +5012,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:924
+#: src/gtkblist.c:925
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4932,7 +5020,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:925
+#: src/gtkblist.c:926
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4940,7 +5028,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:927
+#: src/gtkblist.c:928
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -4948,7 +5036,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:928
+#: src/gtkblist.c:929
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -4957,7 +5045,7 @@
 "<b>狀態:</b>很好"
 
 # XXX 口語字,大概應該譯成口語?!
-#: src/gtkblist.c:929
+#: src/gtkblist.c:930
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -4965,430 +5053,425 @@
 "\n"
 "<b>狀態:</b>很好"
 
-#: src/gtkblist.c:1226
+#: src/gtkblist.c:1228
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %d 分)"
 
-#: src/gtkblist.c:1228
+#: src/gtkblist.c:1230
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:1234
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:1235
+#: src/gtkblist.c:1237
 msgid "Offline "
 msgstr "離線"
 
-#: src/gtkblist.c:1391 src/gtkprefs.c:845 src/gtkprefs.c:1535
+#: src/gtkblist.c:1393 src/gtkprefs.c:845 src/gtkprefs.c:1535
 msgid "None"
 msgstr "無"
 
-#: src/gtkblist.c:1430 src/gtkprefs.c:2289
+#: src/gtkblist.c:1432 src/gtkprefs.c:2289
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: src/gtkblist.c:1454
+#: src/gtkblist.c:1456
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:1457
+#: src/gtkblist.c:1459
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:1460
+#: src/gtkblist.c:1462
 msgid "/Tools/Protocol Actions"
 msgstr "/工具/通訊協定相關設定"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1543
+#: src/gtkblist.c:1545
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:1545
+#: src/gtkblist.c:1547
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:1563 src/gtkconv.c:1071
+#: src/gtkblist.c:1565 src/gtkconv.c:1073
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:1569
+#: src/gtkblist.c:1571
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:1578
+#: src/gtkblist.c:1580
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:1586
+#: src/gtkblist.c:1588
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:1594
+#: src/gtkblist.c:1596
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:2584
+#: src/gtkblist.c:2585
 msgid "No actions available"
 msgstr "不允許任何動作"
 
-#: src/gtkconn.c:56 src/gtkconn.c:241 src/gtkconn.c:254
+#: src/gtkconn.c:57 src/gtkconn.c:242 src/gtkconn.c:255
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:135
+#: src/gtkconn.c:136
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:193
+#: src/gtkconn.c:194
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:206
+#: src/gtkconn.c:207
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconv.c:180
+#: src/gtkconv.c:182
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:181 src/gtkft.c:1034
+#: src/gtkconv.c:183 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkconv.c:276
+#: src/gtkconv.c:278
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入影像"
 
-#: src/gtkconv.c:580
+#: src/gtkconv.c:582
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:608
+#: src/gtkconv.c:610
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:629
+#: src/gtkconv.c:631
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:649
+#: src/gtkconv.c:651
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1081
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:777
+#: src/gtkconv.c:1083 src/gtkprefs.c:777
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:2986
+#: src/gtkconv.c:1092 src/gtkconv.c:2988
 msgid "Info"
 msgstr "取得使用者資訊"
 
-#: src/gtkconv.c:1110 src/gtkconv.c:2969 src/gtkconv.c:4108
-#: src/gtkrequest.c:176
+#: src/gtkconv.c:1112 src/gtkconv.c:2971 src/gtkconv.c:4111
+#: src/gtkrequest.c:194
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:2199
+#: src/gtkconv.c:2201
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2207
+#: src/gtkconv.c:2209
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2309
+#: src/gtkconv.c:2311
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:2765
+#: src/gtkconv.c:2767
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2786
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2788
 msgid "/Conversation/View _Log..."
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2792
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:2792
+#: src/gtkconv.c:2794
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:2794
+#: src/gtkconv.c:2796
 msgid "/Conversation/_Get Info..."
 msgstr "/交談/取得資訊(_G)..."
 
-#: src/gtkconv.c:2796
+#: src/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:2803
 msgid "/Conversation/Insert _URL..."
 msgstr "/交談/插入 URL(_U)"
 
-#: src/gtkconv.c:2803
+#: src/gtkconv.c:2805
 msgid "/Conversation/Insert _Image..."
 msgstr "/交談/插入影像(_I)"
 
-#: src/gtkconv.c:2808
-msgid "/Conversation/_Warn..."
-msgstr "/交談/警告(_W)..."
-
 #: src/gtkconv.c:2810
+msgid "/Conversation/_Warn..."
+msgstr "/交談/警告(_W)..."
+
+#: src/gtkconv.c:2812
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:2814
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:2814
+#: src/gtkconv.c:2816
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:2819
+#: src/gtkconv.c:2821
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:2823
+#: src/gtkconv.c:2825
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:2824
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:2827
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:2865
+#: src/gtkconv.c:2867
 msgid "/Conversation/View Log..."
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2872
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2876
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:2880
 msgid "/Conversation/Get Info..."
 msgstr "/交談/取得資訊..."
 
-#: src/gtkconv.c:2882
+#: src/gtkconv.c:2884
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:2888
+#: src/gtkconv.c:2890
 msgid "/Conversation/Insert URL..."
 msgstr "/交談/插入 URL..."
 
-#: src/gtkconv.c:2892
+#: src/gtkconv.c:2894
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2900
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2904
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:2906
+#: src/gtkconv.c:2908
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:2910
+#: src/gtkconv.c:2912
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:2916
+#: src/gtkconv.c:2918
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2921
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2943 src/gtkconv.c:2945 src/gtkconv.c:3043 src/gtkconv.c:3045
-#: src/gtkconv.c:5684
+#: src/gtkconv.c:2945 src/gtkconv.c:2947 src/gtkconv.c:3045 src/gtkconv.c:3047
+#: src/gtkconv.c:5687
 msgid "Send"
 msgstr "送出"
 
-#: src/gtkconv.c:2966 src/gtkconv.c:4126
+#: src/gtkconv.c:2968 src/gtkconv.c:4129
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:2972 src/gtkconv.c:4111
+#: src/gtkconv.c:2974 src/gtkconv.c:4114
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
 #. Warn button
-#: src/gtkconv.c:2979
+#: src/gtkconv.c:2981
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2983
+#: src/gtkconv.c:2985
 msgid "Warn the user"
 msgstr "警告使用者"
 
-#: src/gtkconv.c:2990 src/gtkconv.c:3425
+#: src/gtkconv.c:2992 src/gtkconv.c:3427
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
-#. Block button
-#: src/gtkconv.c:2993
-msgid "Block"
-msgstr "封鎖"
-
-#: src/gtkconv.c:2997
+#: src/gtkconv.c:2999
 msgid "Block the user"
 msgstr "封鎖使用者"
 
 #. Invite
-#: src/gtkconv.c:3055 src/gtkconv.c:5687
+#: src/gtkconv.c:3057 src/gtkconv.c:5690
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3060
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3097
+#: src/gtkconv.c:3099
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkconv.c:3108
+#: src/gtkconv.c:3110
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkconv.c:3119
+#: src/gtkconv.c:3121
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3137
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3149
 msgid "Normal font size"
 msgstr "正常字體"
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3161
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3178
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3190
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkconv.c:3200
+#: src/gtkconv.c:3202
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkconv.c:3215
+#: src/gtkconv.c:3217
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkconv.c:3226
+#: src/gtkconv.c:3228
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkconv.c:3237
+#: src/gtkconv.c:3239
 msgid "Insert smiley"
 msgstr "插入表情"
 
-#: src/gtkconv.c:3294
+#: src/gtkconv.c:3296
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3347
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3404
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3414
+#: src/gtkconv.c:3416
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:3910 src/server.c:1298
+#: src/gtkconv.c:3913 src/server.c:1299
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- 於 %s 的新交談 ----</H3><BR>\n"
 
-#: src/gtkconv.c:3914 src/server.c:1301
+#: src/gtkconv.c:3917 src/server.c:1302
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- 於 %s 的新交談 ----\n"
 
-#: src/gtkconv.c:3946
+#: src/gtkconv.c:3949
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4604 src/gtkconv.c:4726
+#: src/gtkconv.c:4607 src/gtkconv.c:4729
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5000
+#: src/gtkconv.c:5003
 msgid "Disable Animation"
 msgstr "關閉動畫"
 
-#: src/gtkconv.c:5009
+#: src/gtkconv.c:5012
 msgid "Enable Animation"
 msgstr "開啟動畫"
 
-#: src/gtkconv.c:5016
+#: src/gtkconv.c:5019
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:5022
+#: src/gtkconv.c:5025
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
@@ -5397,11 +5480,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:201
+#: src/gtkft.c:200
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: src/gtkft.c:204
+#: src/gtkft.c:203
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
@@ -5441,34 +5524,34 @@
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:588
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:598
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:605
+#: src/gtkft.c:607
 msgid "Show download details"
 msgstr "顯示下載細節"
 
-#: src/gtkft.c:606
+#: src/gtkft.c:608
 msgid "Hide download details"
 msgstr "隱藏下載細節"
 
 #. Pause button
-#: src/gtkft.c:648 src/stock.c:86
+#: src/gtkft.c:650 src/stock.c:86
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:658
+#: src/gtkft.c:660
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:1013
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "檔案不存在。"
 
@@ -5498,22 +5581,22 @@
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1632
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1640
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1649
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1671
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -6349,62 +6432,62 @@
 msgid "Plugins"
 msgstr "模組清單"
 
-#: src/gtkrequest.c:172
+#: src/gtkrequest.c:190
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtksound.c:60
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "收到訊息"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "訊息收到,開始進行交談"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "您已進入聊天室"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: src/gtksound.c:150
+#: src/gtksound.c:154
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
 
-#: src/gtksound.c:166
+#: src/gtksound.c:170
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
 
-#: src/gtksound.c:175
+#: src/gtksound.c:179
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -6420,7 +6503,7 @@
 msgstr "Gaim - 儲存圖示"
 
 #. full help text
-#: src/gtkutils.c:908
+#: src/gtkutils.c:909
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6454,7 +6537,7 @@
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/gtkutils.c:923
+#: src/gtkutils.c:924
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行 `%s -h' 以獲得更進一步的資訊。\n"
@@ -6581,26 +6664,30 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) 報告 %s 由閒置返回 @ %s"
 
-#: src/main.c:235
+#: src/main.c:145
 msgid "Please enter your login."
 msgstr "請您登入。"
 
-#: src/main.c:323
+#: src/main.c:228
 msgid "<New User>"
 msgstr "<新使用者>"
 
-#: src/main.c:365
+#: src/main.c:270
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:381
+#: src/main.c:286
 msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/main.c:431
+#: src/main.c:336
 msgid "Sign On"
 msgstr "登入"
 
+#: src/prefs.c:113 src/status.c:266
+msgid "Slightly less boring default"
+msgstr "較為沒那麼無聊的預設"
+
 #: src/prpl.c:292
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
@@ -6637,24 +6724,25 @@
 
 #: src/server.c:874
 #, c-format
-msgid "(%d messages)"
-msgstr "(%d 個訊息)"
-
-#: src/server.c:886
+msgid "(%d message)"
+msgid_plural "(%d messages)"
+msgstr[0] "(%d 個訊息)"
+
+#: src/server.c:887
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1084 src/server.c:1094
+#: src/server.c:1085 src/server.c:1095
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1112 src/server.c:1120
+#: src/server.c:1113 src/server.c:1121
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1161
+#: src/server.c:1162
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6663,11 +6751,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1164
+#: src/server.c:1165
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1254
+#: src/server.c:1255
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6676,23 +6764,30 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1258
+#: src/server.c:1259
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1264
+#: src/server.c:1265
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
-#: src/server.c:1436
+#: src/server.c:1437
 msgid "Gaim - Popup"
 msgstr "Gaim - 訊息"
 
-#: src/server.c:1463
+#: src/server.c:1464
 msgid "More Info"
 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:31
+msgid "Sorry, I ran out for a bit!"
+msgstr "不好意思,我離開一下下!"
+
 #: src/stock.c:84
 msgid "_Modify"
 msgstr "修改(_M)"
@@ -6738,18 +6833,156 @@
 msgid "Custom"
 msgstr "使用者自定"
 
-#: src/gtkdebug.c:142
+#: src/gtkdebug.c:133
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:182
+#: src/gtkdebug.c:173
 msgid "Pause"
 msgstr "暫停"
 
-#: src/gtkdebug.c:188
+#: src/gtkdebug.c:179
 msgid "Timestamps"
 msgstr "時間戳記"
 
+#~ msgid "DCC Chat with %s closed"
+#~ msgstr "和 %s 的 DCC 聊天已關閉"
+
+#~ msgid "DCC Chat with %s established"
+#~ msgstr "和 %s 的 DCC 聊天已經被建立"
+
+#~ msgid "User"
+#~ msgstr "使用者"
+
+#~ msgid "IRC Operator"
+#~ msgstr "IRC 操作者"
+
+#~ msgid "Channels"
+#~ msgstr "頻道"
+
+#~ msgid "%s is an Identified User"
+#~ msgstr "%s 是一個已驗證的使用者"
+
+#~ msgid "%ld seconds [signon: %s]"
+#~ msgstr "%ld 秒 [登入:%s]"
+
+#~ msgid "Rehashing server"
+#~ msgstr "重新設定伺服器中"
+
+#~ msgid "IRC Error"
+#~ msgstr "IRC 錯誤"
+
+#~ msgid "No such server"
+#~ msgstr "沒有那部伺服器"
+
+#~ msgid "No nickname given"
+#~ msgstr "沒有給予暱稱"
+
+#~ msgid "You're not an IRC operator!"
+#~ msgstr "您不是一個 IRC 操作者!"
+
+#~ msgid "That nick is already in use.  Please enter a new nick"
+#~ msgstr "這個暱稱已經在使用中。請輸入一個新的暱稱"
+
+#~ msgid "IRC CTCP info"
+#~ msgstr "IRC CTCP 資訊"
+
+#~ msgid "%s would like to establish a DCC chat"
+#~ msgstr "%s 想要建立一個 DCC 聊天"
+
+#~ msgid ""
+#~ "This requires a direct connection to be established between the two "
+#~ "computers.  Messages sent will not pass through the IRC server"
+#~ msgstr ""
+#~ "這個要求將會建立起兩部電腦間的連線,而訊息將不會透過 IRC 伺服器來進行傳送"
+
+#~ msgid "Received an invalid file send request from %s."
+#~ msgstr "收到一個來自於 %s 無效的檔案送出需求。"
+
+#~ msgid "CTCP ClientInfo"
+#~ msgstr "CTCP 客戶端資訊"
+
+#~ msgid "CTCP UserInfo"
+#~ msgstr "CTCP 使用者資訊"
+
+#~ msgid "CTCP Version"
+#~ msgstr "CTCP 版本"
+
+#~ msgid "CTCP Ping"
+#~ msgstr "CTCP Ping"
+
+#~ msgid "You have left %s"
+#~ msgstr "您離開了 %s"
+
+#~ msgid "IRC Part"
+#~ msgstr "IRC 離開"
+
+#~ msgid "<I>Requesting DCC CHAT</I>"
+#~ msgstr "<I>要求 DCC 聊天中</I>"
+
+#~ msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
+#~ msgstr "<B>IRC 操作者指令:<BR>REHASH RESTART</B>"
+
+#~ msgid ""
+#~ "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
+#~ "<nick><BR>PING <nick></B><BR>"
+#~ msgstr ""
+#~ "<B>CTCP 指令:<BR>CLIENTINFO <暱稱><BR>USERINFO <暱稱><BR>VERSION <暱稱"
+#~ "><BR>PING <暱稱></B><BR>"
+
+#~ msgid "<B>DCC commands:<BR>CHAT <nick></B>"
+#~ msgstr "<B>DCC 指令:<BR>CHAT <暱稱></B>"
+
+#~ msgid ""
+#~ "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
+#~ "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE "
+#~ "VERSION W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP "
+#~ "CTCP for CTCP commands<BR>Type /HELP DCC for DCC commands"
+#~ msgstr ""
+#~ "<B>目前支援的指令:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC "
+#~ "KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W "
+#~ "WHOWAS<BR>輸入 /HELP OPER 顯示操作者指令<BR>輸入 /HELP CTCP 顯示 CTCP 指令"
+#~ "<BR>輸入 /HELP DCC 顯示 DCC 指令"
+
+#~ msgid "DCC Chat"
+#~ msgstr "DCC 聊天"
+
+#~ msgid "User Identity"
+#~ msgstr "使用者識別"
+
+#~ msgid "Permit"
+#~ msgstr "許可"
+
+#~ msgid "Add Permit"
+#~ msgstr "加入許可"
+
+#~ msgid "Add Deny"
+#~ msgstr "加入拒絕"
+
+#~ msgid "_Group:"
+#~ msgstr "群組(_G):"
+
+#~ msgid "_Alias:"
+#~ msgstr "別名(_A):"
+
+#~ msgid "Gaim Instant Messenger"
+#~ msgstr "Gaim"
+
+#~ msgid "Gaim Instant Messenger - Signed off"
+#~ msgstr "Gaim - 已登出"
+
+#~ msgid "Gaim Instant Messenger - Away"
+#~ msgstr "Gaim - 離開"
+
+#~ msgid "Unable to write to config file"
+#~ msgstr "無法寫入設定檔"
+
+#~ msgid "Notify plugin"
+#~ msgstr "通知模組"
+
+#~ msgid "Appl_y"
+#~ msgstr "套用(_Y)"
+
 #~ msgid "Enter your password."
 #~ msgstr "請輸入您的密碼。"
 
@@ -6769,21 +7002,6 @@
 #~ msgid "Notice"
 #~ msgstr "通知"
 
-#~ msgid "%s has been signed off"
-#~ msgstr "%s 已經登出"
-
-#~ msgid "Connection Error"
-#~ msgstr "連線錯誤"
-
-#~ msgid "Gaim Instant Messenger"
-#~ msgstr "Gaim"
-
-#~ msgid "Gaim Instant Messenger - Signed off"
-#~ msgstr "Gaim - 已登出"
-
-#~ msgid "Gaim Instant Messenger - Away"
-#~ msgstr "Gaim - 離開"
-
 #~ msgid "New"
 #~ msgstr "新訊息"
 
@@ -6805,9 +7023,6 @@
 #~ msgid "Rename Buddy"
 #~ msgstr "修改好友名稱"
 
-#~ msgid "New name:"
-#~ msgstr "新名字:"
-
 #~ msgid "Control-_W closes window"
 #~ msgstr "按下 Ctrl-W 關閉視窗(_W)"
 
@@ -6908,4 +7123,4 @@
 #~ "並沒有提供登入的功能。"
 
 #~ msgid "Account Editor"
-#~ msgstr "帳號清單"
\ No newline at end of file
+#~ msgstr "帳號清單"