diff po/zh_TW.po @ 9754:4a8bf81b82ae

[gaim-migrate @ 10621] " This will default the room/server fields to the proper values when an add chat is requested from a conversation window. It wasn't quite as trivial as the reporter suggested..." --Nathan (noif) Fredrickson committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 15 Aug 2004 19:34:20 +0000
parents 4d05b6e9e9cd
children fdf71e2f31ac
line wrap: on
line diff
--- a/po/zh_TW.po	Sun Aug 15 17:05:51 2004 +0000
+++ b/po/zh_TW.po	Sun Aug 15 19:34:20 2004 +0000
@@ -42,7 +42,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.81cvs\n"
-"POT-Creation-Date: 2004-08-05 00:00-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-14 22:11-0400\n"
 "PO-Revision-Date: 2004-04-22 11:18+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -204,69 +205,69 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
+#: plugins/docklet/docklet.c:115 src/gtkaccount.c:737 src/gtkaccount.c:2158
 msgid "Auto-login"
 msgstr "自動登入"
 
-#: plugins/docklet/docklet.c:117
+#: plugins/docklet/docklet.c:118
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: plugins/docklet/docklet.c:118
+#: plugins/docklet/docklet.c:119
 msgid "Join A Chat..."
 msgstr "加入聊天室..."
 
-#: plugins/docklet/docklet.c:149
+#: plugins/docklet/docklet.c:150
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:154 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2771
-#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2940
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5486
-#: src/protocols/oscar/oscar.c:6492 src/protocols/oscar/oscar.c:6692
+#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2770
+#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2939
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:6502 src/protocols/oscar/oscar.c:6702
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "離開"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:565
-#: src/protocols/oscar/oscar.c:5404 src/protocols/oscar/oscar.c:6700
+#: plugins/docklet/docklet.c:160 src/away.c:570
+#: src/protocols/oscar/oscar.c:5414 src/protocols/oscar/oscar.c:6710
 msgid "Back"
 msgstr "返回"
 
-#: plugins/docklet/docklet.c:167
+#: plugins/docklet/docklet.c:168
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:612
+#: plugins/docklet/docklet.c:173 src/gtkft.c:612
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
+#: plugins/docklet/docklet.c:174 src/gtkaccount.c:2339
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
+#: plugins/docklet/docklet.c:175 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: plugins/docklet/docklet.c:183
+#: plugins/docklet/docklet.c:184
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:187
+#: plugins/docklet/docklet.c:188
 msgid "Quit"
 msgstr "結束程式"
 
-#: plugins/docklet/docklet.c:478
+#: plugins/docklet/docklet.c:479
 msgid "Tray Icon Configuration"
 msgstr "工作匣圖示設定"
 
-#: plugins/docklet/docklet.c:482
+#: plugins/docklet/docklet.c:483
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "隱藏新訊息直到工作匣圖示被點擊(_H)"
 
@@ -277,20 +278,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:506
+#: plugins/docklet/docklet.c:507
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:509
+#: plugins/docklet/docklet.c:510
 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:511
+#: plugins/docklet/docklet.c:512
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -515,7 +516,7 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkblist.c:3003 src/gtkprefs.c:956 src/gtkprefs.c:1008
 #: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "無"
@@ -542,13 +543,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6976
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6986
 msgid "Search"
 msgstr "搜尋"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
-#: src/gtkblist.c:4374
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4042
+#: src/gtkblist.c:4370
 msgid "Group:"
 msgstr "群組:"
 
@@ -592,7 +593,7 @@
 msgstr "聯結好友 (_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
+#: src/blist.c:774 src/blist.c:962 src/blist.c:1898 src/gtkblist.c:3861
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -664,8 +665,8 @@
 msgstr "其他資訊:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
-#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:371
+#: src/gtkaccount.c:401 src/protocols/oscar/oscar.c:420
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
@@ -732,7 +733,7 @@
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: plugins/idle.c:67 src/gtkdialogs.c:808
+#: plugins/idle.c:67 src/away.c:905
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -1300,7 +1301,7 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3048
 #: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "好友清單"
@@ -1337,16 +1338,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 的相關選項。"
 
-#: src/about.c:60
+#: src/about.c:64
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/about.c:74
+#: src/about.c:78
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:98
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -1357,130 +1358,130 @@
 "佈。<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: src/about.c:105
+#: src/about.c:109
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
 "SIZE=\"4\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
 "\">http://gaim.myweb.hinet.net/</A><BR><BR>"
 
-#: src/about.c:110
+#: src/about.c:114
 msgid "Active Developers"
 msgstr "現任開發者"
 
-#: src/about.c:111
+#: src/about.c:115
 msgid "maintainer"
 msgstr "維護者"
 
-#: src/about.c:113
+#: src/about.c:117
 msgid "lead developer"
 msgstr "主要開發者"
 
-#: src/about.c:116
+#: src/about.c:120
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: src/about.c:117
+#: src/about.c:121
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
+#: src/about.c:124 src/about.c:125 src/about.c:126 src/about.c:127
 msgid "developer"
 msgstr "開發者"
 
-#: src/about.c:124
+#: src/about.c:128
 msgid "support"
 msgstr "支援"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: src/about.c:131
+#: src/about.c:135
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:147
+#: src/about.c:151
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:148
+#: src/about.c:152
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:149
+#: src/about.c:153
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:152
+#: src/about.c:156
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:153
+#: src/about.c:157
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:154
+#: src/about.c:158
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:157
+#: src/about.c:161
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:165
+#: src/about.c:169
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: src/about.c:166 src/about.c:205
+#: src/about.c:170 src/about.c:209
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:167 src/about.c:206
+#: src/about.c:171 src/about.c:210
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:168 src/about.c:207
+#: src/about.c:172 src/about.c:211
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:169
+#: src/about.c:173
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:170
+#: src/about.c:174
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:171
+#: src/about.c:175
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: src/about.c:172 src/about.c:208
+#: src/about.c:176 src/about.c:212
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:177 src/about.c:213
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:178 src/about.c:214
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:175 src/about.c:211
+#: src/about.c:179 src/about.c:215
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:176
+#: src/about.c:180
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:177
+#: src/about.c:181
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:178
+#: src/about.c:182
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -1488,58 +1489,58 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: src/about.c:179 src/about.c:212
+#: src/about.c:183 src/about.c:216
 msgid "Italian"
 msgstr "意大利文"
 
-#: src/about.c:180 src/about.c:213
+#: src/about.c:184 src/about.c:217
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:181
+#: src/about.c:185
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
-#: src/about.c:182 src/about.c:214
+#: src/about.c:186 src/about.c:218
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:183
+#: src/about.c:187
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: src/about.c:184
+#: src/about.c:188
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#: src/about.c:185
+#: src/about.c:189
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:186 src/about.c:215
+#: src/about.c:190 src/about.c:219
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:187
+#: src/about.c:191
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:188
+#: src/about.c:192
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:189
+#: src/about.c:193
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:190 src/about.c:216 src/about.c:217
+#: src/about.c:194 src/about.c:220 src/about.c:221
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:191
+#: src/about.c:195
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
@@ -1547,44 +1548,44 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: src/about.c:192
+#: src/about.c:196
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: src/about.c:193 src/about.c:219
+#: src/about.c:197 src/about.c:223
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:194
+#: src/about.c:198
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:194
+#: src/about.c:198
 msgid "and the Gnome-Vi Team"
 msgstr "及 Gnome 越南文翻譯小組之其他組員"
 
-#: src/about.c:195
+#: src/about.c:199
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:196
+#: src/about.c:200
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:203
+#: src/about.c:207
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:204
+#: src/about.c:208
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:218
+#: src/about.c:222
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:220
+#: src/about.c:224
 msgid "Chinese"
 msgstr "中文"
 
@@ -1621,47 +1622,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/gtkdialogs.c:473 src/gtkdialogs.c:529
-#: src/gtkdialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
-#: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
-#: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
-#: src/protocols/oscar/oscar.c:6763 src/protocols/oscar/oscar.c:6855
-#: src/protocols/oscar/oscar.c:6907 src/protocols/oscar/oscar.c:6993
-#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
-#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
-#: src/request.h:1243
+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2377
+#: src/gtkdialogs.c:123 src/gtkdialogs.c:262 src/gtkdialogs.c:315
+#: src/gtkrequest.c:241 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:6773
+#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6917
+#: src/protocols/oscar/oscar.c:7003 src/protocols/silc/buddy.c:460
+#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:447 src/protocols/silc/chat.c:710
+#: src/protocols/silc/ops.c:1072 src/protocols/silc/ops.c:1680
+#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2795
+#: src/protocols/yahoo/yahoo.c:2804 src/request.h:1243
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
-#: src/gtkdialogs.c:299 src/gtkdialogs.c:311 src/gtkdialogs.c:324 src/gtkdialogs.c:345
-#: src/gtkdialogs.c:474 src/gtkdialogs.c:530 src/gtkdialogs.c:583 src/gtkdialogs.c:830
-#: src/gtkdialogs.c:846 src/gtkdialogs.c:864 src/gtkaccount.c:2005
-#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
-#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
-#: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
-#: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
-#: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
-#: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
-#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
-#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6764
-#: src/protocols/oscar/oscar.c:6856 src/protocols/oscar/oscar.c:6908
-#: src/protocols/oscar/oscar.c:6977 src/protocols/oscar/oscar.c:6994
-#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
-#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
-#: src/request.h:1243 src/request.h:1253
+#: src/account.c:343 src/account.c:381 src/away.c:353 src/connection.c:199
+#: src/gtkaccount.c:2008 src/gtkaccount.c:2504 src/gtkblist.c:2378
+#: src/gtkblist.c:4408 src/gtkconn.c:168 src/gtkdialogs.c:124
+#: src/gtkdialogs.c:263 src/gtkdialogs.c:316 src/gtkdialogs.c:404
+#: src/gtkdialogs.c:422 src/gtkdialogs.c:440 src/gtkdialogs.c:479
+#: src/gtkdialogs.c:535 src/gtkdialogs.c:581 src/gtkdialogs.c:600
+#: src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:623 src/gtkprivacy.c:634 src/gtkrequest.c:242
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
+#: src/protocols/jabber/chat.c:702 src/protocols/jabber/jabber.c:667
+#: src/protocols/jabber/jabber.c:1049 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1361
+#: src/protocols/oscar/oscar.c:3319 src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3397 src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:6774 src/protocols/oscar/oscar.c:6866
+#: src/protocols/oscar/oscar.c:6918 src/protocols/oscar/oscar.c:6987
+#: src/protocols/oscar/oscar.c:7004 src/protocols/silc/buddy.c:461
+#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
+#: src/protocols/silc/chat.c:582 src/protocols/silc/chat.c:711
+#: src/protocols/silc/ops.c:1681 src/protocols/silc/silc.c:699
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2796
+#: src/protocols/yahoo/yahoo.c:2805 src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
 
@@ -1670,47 +1671,85 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:248 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
 
-#: src/away.c:227
+#: src/account.c:739 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2782
+msgid "Unknown"
+msgstr "未知"
+
+#: src/away.c:231
 msgid "Away!"
 msgstr "離開!"
 
-#: src/away.c:291
+#: src/away.c:295
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:345
+#: src/away.c:349
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "您確定要移除離開訊息「%s」?"
 
-#: src/away.c:347 src/away.c:438
+#: src/away.c:351 src/away.c:442
 msgid "Remove Away Message"
 msgstr "移除離開訊息"
 
 #. Remove button
-#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
-#: src/gtkrequest.c:248
+#: src/away.c:352 src/gtkconv.c:1378 src/gtkconv.c:3721 src/gtkconv.c:3825
+#: src/gtkrequest.c:247
 msgid "Remove"
 msgstr "移除"
 
-#: src/away.c:418
+#: src/away.c:422
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/away.c:633
+#: src/away.c:638
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:681
+#: src/away.c:745
+msgid "You cannot save an away message with a blank title"
+msgstr "您不能儲存一個沒有原因的離開訊息"
+
+#: src/away.c:747
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
+
+#: src/away.c:757
+msgid "You cannot create an empty away message"
+msgstr "您無法建立一個空白的離開訊息"
+
+#: src/away.c:822
+msgid "New away message"
+msgstr "新的離開訊息"
+
+#: src/away.c:837
+msgid "Away title: "
+msgstr "離開原因:"
+
+#: src/away.c:893
+msgid "_Save"
+msgstr "儲存(_S)"
+
+#: src/away.c:897
+msgid "Sa_ve & Use"
+msgstr "儲存並使用(_V)"
+
+#: src/away.c:901
+msgid "_Use"
+msgstr "使用(_U)"
+
+#: src/blist.c:680
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1318
+#: src/blist.c:1317
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1725,18 +1764,18 @@
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1327
+#: src/blist.c:1326
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:2030
+#: src/blist.c:2029
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "在解析您的好友清單時發生錯誤。好友清單沒有被讀入,舊檔已移至blist.xml~。"
 
-#: src/blist.c:2033
+#: src/blist.c:2032
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
@@ -1754,8 +1793,8 @@
 msgstr "連線錯誤"
 
 #: src/connection.c:195
-#, c-format
-msgid "Enter password for %s"
+#, fuzzy, c-format
+msgid "Enter password for %s (%s)"
 msgstr "輸入 %s 的密碼"
 
 #: src/conversation.c:229
@@ -1771,7 +1810,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1950
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1781,233 +1820,61 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1953
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2049
+#: src/conversation.c:2052
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: src/conversation.c:2052
+#: src/conversation.c:2055
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2093
+#: src/conversation.c:2096
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2098
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2164
+#: src/conversation.c:2167
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2166
+#: src/conversation.c:2169
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2571
+#: src/conversation.c:2574
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2573
+#: src/conversation.c:2576
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: src/conversation.c:2575 src/gtkprefs.c:1377
+#: src/conversation.c:2578 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2577
+#: src/conversation.c:2580
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2579
+#: src/conversation.c:2582
 msgid "By account"
 msgstr "依帳號"
 
-#: src/gtkdialogs.c:149
-msgid "Warn User"
-msgstr "警告使用者"
-
-#: src/gtkdialogs.c:168
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-"\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">警告 %s?</span>\n"
-"\n"
-"這個動作將會增加 %s 的警告等級,同時他(她)將被限制以更嚴格的速率限制。\n"
-
-#: src/gtkdialogs.c:177
-msgid "Warn _anonymously?"
-msgstr "以匿名的身份發出警告?(_A)"
-
-#: src/gtkdialogs.c:184
-msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
-
-#: src/gtkdialogs.c:295
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
-
-# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/gtkdialogs.c:297 src/gtkdialogs.c:298
-msgid "Remove Buddy"
-msgstr "移除好友"
-
-#: src/gtkdialogs.c:307
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
-
-#: src/gtkdialogs.c:309 src/gtkdialogs.c:310
-msgid "Remove Chat"
-msgstr "移除聊天室"
-
-#: src/gtkdialogs.c:319
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
-
-#: src/gtkdialogs.c:322 src/gtkdialogs.c:323
-msgid "Remove Group"
-msgstr "移除群組"
-
-#: src/gtkdialogs.c:340
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr ""
-"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動"
-"作嗎?"
-
-# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/gtkdialogs.c:343 src/gtkdialogs.c:344
-msgid "Remove Contact"
-msgstr "移除好友"
-
-#: src/gtkdialogs.c:455 src/gtkdialogs.c:511 src/gtkdialogs.c:563
-msgid "_Screen name"
-msgstr "帳號(_S)"
-
-#: src/gtkdialogs.c:461 src/gtkdialogs.c:517 src/gtkdialogs.c:569
-msgid "_Account"
-msgstr "帳號(_A)"
-
-#: src/gtkdialogs.c:468
-msgid "New Instant Message"
-msgstr "新即時訊息"
-
-#: src/gtkdialogs.c:470
-msgid "Please enter the screen name of the person you would like to IM."
-msgstr "請輸入您所想要發送即時訊息對象的帳號。"
-
-#: src/gtkdialogs.c:524
-msgid "Get User Info"
-msgstr "取得使用者資訊"
-
-#: src/gtkdialogs.c:526
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
-msgstr "請輸入您所想要查詢對象的帳號。"
-
-#  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkdialogs.c:577
-msgid "Get User Log"
-msgstr "讀取使用者日誌"
-
-#: src/gtkdialogs.c:579
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
-msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
-
-#: src/gtkdialogs.c:645
-msgid "You cannot save an away message with a blank title"
-msgstr "您不能儲存一個沒有原因的離開訊息"
-
-#: src/gtkdialogs.c:647
-msgid ""
-"Please give the message a title, or choose \"Use\" to use without saving."
-msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
-
-#: src/gtkdialogs.c:657
-msgid "You cannot create an empty away message"
-msgstr "您無法建立一個空白的離開訊息"
-
-#: src/gtkdialogs.c:719
-msgid "New away message"
-msgstr "新的離開訊息"
-
-#: src/gtkdialogs.c:740
-msgid "Away title: "
-msgstr "離開原因:"
-
-#: src/gtkdialogs.c:796
-msgid "_Save"
-msgstr "儲存(_S)"
-
-#: src/gtkdialogs.c:800
-msgid "Sa_ve & Use"
-msgstr "儲存並使用(_V)"
-
-#: src/gtkdialogs.c:804
-msgid "_Use"
-msgstr "使用(_U)"
-
-#: src/gtkdialogs.c:826
-msgid "Alias Chat"
-msgstr "給聊天室改別名"
-
-#: src/gtkdialogs.c:827
-msgid "Enter an alias for this chat."
-msgstr "請為這個聊天室輸入一個別名。"
-
-#: src/gtkdialogs.c:829 src/gtkdialogs.c:845 src/gtkdialogs.c:863 src/gtkrequest.c:250
-#: src/protocols/silc/chat.c:572
-msgid "Alias"
-msgstr "別名"
-
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/gtkdialogs.c:842
-msgid "Alias Contact"
-msgstr "給好友改別名"
-
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/gtkdialogs.c:843
-msgid "Enter an alias for this contact."
-msgstr "請為這個好友輸入一個別名。"
-
-#: src/gtkdialogs.c:859
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "請為 %s 輸入一個別名"
-
-#: src/gtkdialogs.c:861
-msgid "Alias Buddy"
-msgstr "為好友加上別名"
-
 #: src/ft.c:125
 msgid "That file does not exist."
 msgstr "檔案不存在。"
@@ -2093,12 +1960,12 @@
 "       -h, --help [指令]        顯示指令的說明\n"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
-#: src/gaim-remote.c:224
+#: src/gaim-remote.c:174 src/gaim-remote.c:190 src/gaim-remote.c:206
+#: src/gaim-remote.c:222
 msgid "Gaim not running (on session 0)\n"
 msgstr "(在工作階段 0)Gaim 未有執行\n"
 
-#: src/gaim-remote.c:238
+#: src/gaim-remote.c:236
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -2139,7 +2006,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "提示您加入「Penguin」到您的好友清單中。\n"
 
-#: src/gaim-remote.c:257
+#: src/gaim-remote.c:256
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2147,12 +2014,19 @@
 "\n"
 "關閉正在執行的 Gaim\n"
 
-#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2783
-msgid "Unknown"
-msgstr "未知"
-
-#: src/gtkaccount.c:333
+#: src/gaim-remote.c:260
+msgid ""
+"\n"
+"Mark all accounts as \"away\" with the default message.\n"
+msgstr ""
+
+#: src/gaim-remote.c:264
+msgid ""
+"\n"
+"Set all accounts as not away.\n"
+msgstr ""
+
+#: src/gtkaccount.c:324
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2164,168 +2038,168 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:621
+#: src/gtkaccount.c:624
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:638
+#: src/gtkaccount.c:641
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:643 src/gtkblist.c:4018
+#: src/gtkaccount.c:646 src/gtkblist.c:4014
 msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:716
+#: src/gtkaccount.c:719
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:721 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:724 src/gtkblist.c:4028 src/gtkblist.c:4356
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:725
+#: src/gtkaccount.c:728
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:781
+#: src/gtkaccount.c:784
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:794
+#: src/gtkaccount.c:797
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:803
+#: src/gtkaccount.c:806
 msgid "Buddy icon:"
 msgstr "好友圖示:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:892
+#: src/gtkaccount.c:895
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1031 src/gtkaccount.c:1078
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1037 src/gtkaccount.c:1085
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1043 src/gtkaccount.c:1092
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1049 src/gtkaccount.c:1099
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
+#: src/gtkaccount.c:1055 src/gtkaccount.c:1106
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
+#: src/gtkaccount.c:1061 src/gtkaccount.c:1113 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:1149
+#: src/gtkaccount.c:1152
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:1153
+#: src/gtkaccount.c:1156
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1172
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
+#: src/gtkaccount.c:1190 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
+#: src/gtkaccount.c:1199 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
+#: src/gtkaccount.c:1203 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:1208
+#: src/gtkaccount.c:1211
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1581
+#: src/gtkaccount.c:1584
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1583
+#: src/gtkaccount.c:1586
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #  NOTE 譯文更動 by Ambrose
 #. Add the disclosure
-#: src/gtkaccount.c:1607
+#: src/gtkaccount.c:1610
 msgid "Show more options"
 msgstr "顯示細節"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/gtkaccount.c:1608
+#: src/gtkaccount.c:1611
 msgid "Show fewer options"
 msgstr "隱藏細節"
 
 #. Register button
-#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1638 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:2000
+#: src/gtkaccount.c:2003
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:2004 src/gtkrequest.c:246
+#: src/gtkaccount.c:2007 src/gtkrequest.c:245
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
+#: src/gtkaccount.c:2121 src/protocols/oscar/oscar.c:4000
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6691 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
-#: src/protocols/zephyr/zephyr.c:1375
+#: src/gtkaccount.c:2145 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:6701 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1362
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:2163
+#: src/gtkaccount.c:2166
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2476
+#: src/gtkaccount.c:2479
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s%s"
 
-#: src/gtkaccount.c:2490
+#: src/gtkaccount.c:2493
 msgid ""
 "\n"
 "\n"
@@ -2335,18 +2209,18 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/gtkaccount.c:2494
+#: src/gtkaccount.c:2497
 msgid "Information"
 msgstr "資訊"
 
-#: src/gtkaccount.c:2498
+#: src/gtkaccount.c:2501
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2500 src/gtkblist.c:4411 src/gtkconv.c:1380
-#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
+#: src/gtkaccount.c:2503 src/gtkblist.c:4407 src/gtkconv.c:1380
+#: src/gtkconv.c:3714 src/gtkconv.c:3818 src/gtkrequest.c:246
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3628
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "加入"
@@ -2363,15 +2237,15 @@
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
+#: src/gtkblist.c:834 src/gtkpounce.c:410 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1122 src/gtkblist.c:3204
+#: src/gtkblist.c:1122 src/gtkblist.c:3200
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1125 src/gtkblist.c:3194
+#: src/gtkblist.c:1125 src/gtkblist.c:3190
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
@@ -2431,136 +2305,136 @@
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:313
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2322
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2323
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2324
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2325
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2326
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2328
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2329
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2330
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2331
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2332
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2334
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2335
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2338
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2339
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2340
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
+#: src/gtkblist.c:2341
+msgid "/Tools/Account Ac_tions"
+msgstr "/工具/帳號相關指令(_T)"
+
+#: src/gtkblist.c:2342
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/工具/模組相關指令(_U)"
+
 #: src/gtkblist.c:2344
-msgid "/Tools/Account Ac_tions"
-msgstr "/工具/帳號相關指令(_T)"
+msgid "/Tools/A_ccounts"
+msgstr "/工具/帳號清單(_C)"
 
 #: src/gtkblist.c:2345
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/工具/模組相關指令(_U)"
+msgid "/Tools/_File Transfers"
+msgstr "/工具/檔案傳輸(_F)"
+
+#: src/gtkblist.c:2346
+msgid "/Tools/R_oom List"
+msgstr "/工具/聊天室清單(_O)"
 
 #: src/gtkblist.c:2347
-msgid "/Tools/A_ccounts"
-msgstr "/工具/帳號清單(_C)"
+msgid "/Tools/Pr_eferences"
+msgstr "/工具/偏好設定(_E)"
 
 #: src/gtkblist.c:2348
-msgid "/Tools/_File Transfers"
-msgstr "/工具/檔案傳輸(_F)"
-
-#: src/gtkblist.c:2349
-msgid "/Tools/R_oom List"
-msgstr "/工具/聊天室清單(_O)"
+msgid "/Tools/Pr_ivacy"
+msgstr "/工具/隱私設定(_I)"
 
 #: src/gtkblist.c:2350
-msgid "/Tools/Pr_eferences"
-msgstr "/工具/偏好設定(_E)"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/Pr_ivacy"
-msgstr "/工具/隱私設定(_I)"
-
-#: src/gtkblist.c:2353
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2353
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2357
+#: src/gtkblist.c:2354
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2355
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2356
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2377
+#: src/gtkblist.c:2374
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:2377
+#: src/gtkblist.c:2374
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:2378
+#: src/gtkblist.c:2375
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:2406
+#: src/gtkblist.c:2403
 #, c-format
 msgid ""
 "\n"
@@ -2569,7 +2443,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2577,12 +2451,12 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2482
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2501
+#: src/gtkblist.c:2498
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2590,7 +2464,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:2502
+#: src/gtkblist.c:2499
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2598,7 +2472,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2503
+#: src/gtkblist.c:2500
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2606,7 +2480,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2504
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2614,7 +2488,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:2505
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2622,7 +2496,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2630,7 +2504,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:2507
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2638,7 +2512,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:2509
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2646,7 +2520,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2654,7 +2528,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2511
+#: src/gtkblist.c:2508
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2662,108 +2536,108 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2793
+#: src/gtkblist.c:2790
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %02d 分)"
 
-#: src/gtkblist.c:2795
+#: src/gtkblist.c:2792
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2800
+#: src/gtkblist.c:2797
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2803
+#: src/gtkblist.c:2800
 msgid "Offline "
 msgstr "離線"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2918
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: src/gtkblist.c:2924
+#: src/gtkblist.c:2921
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: src/gtkblist.c:2927
+#: src/gtkblist.c:2924
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: src/gtkblist.c:3008
+#: src/gtkblist.c:3005
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gtkblist.c:3009
+#: src/gtkblist.c:3006
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gtkblist.c:3010
+#: src/gtkblist.c:3007
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3073
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
+#: src/gtkblist.c:3076
+msgid "/Tools/Buddy Pounce"
+msgstr "/工具/好友狀態捕捉"
+
 #: src/gtkblist.c:3079
-msgid "/Tools/Buddy Pounce"
-msgstr "/工具/好友狀態捕捉"
+msgid "/Tools/Account Actions"
+msgstr "/工具/帳號相關指令"
 
 #: src/gtkblist.c:3082
-msgid "/Tools/Account Actions"
-msgstr "/工具/帳號相關指令"
-
-#: src/gtkblist.c:3085
 msgid "/Tools/Plugin Actions"
 msgstr "/工具/模組相關指令"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3170
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3176
+#: src/gtkblist.c:3172
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3200
+#: src/gtkblist.c:3196
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:3210
+#: src/gtkblist.c:3206
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:3214
+#: src/gtkblist.c:3210
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3219
+#: src/gtkblist.c:3215
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:3224
+#: src/gtkblist.c:3220
 msgid "_Away"
 msgstr "離開(_A)"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3225
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3968 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
 #: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3996
+#: src/gtkblist.c:3992
 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. "
@@ -2773,37 +2647,37 @@
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4056 src/gtkblist.c:4340
+#: src/gtkblist.c:4052 src/gtkblist.c:4336
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4299
+#: src/gtkblist.c:4295
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: src/gtkblist.c:4306
+#: src/gtkblist.c:4302
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4330
+#: src/gtkblist.c:4326
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:4408
+#: src/gtkblist.c:4404
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4409
+#: src/gtkblist.c:4405
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: src/gtkblist.c:4976 src/gtkblist.c:5073
+#: src/gtkblist.c:4972 src/gtkblist.c:5069
 msgid "No actions available"
 msgstr "沒有相關指令"
 
@@ -2927,7 +2801,7 @@
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
+#: src/gtkconv.c:791 src/gtkconv.c:2475 src/gtkdebug.c:181
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
@@ -2940,11 +2814,11 @@
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: src/gtkconv.c:887 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:130
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:913 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:158
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
@@ -2953,7 +2827,7 @@
 msgstr "即時訊息"
 
 #. Send File button
-#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
+#: src/gtkconv.c:1337 src/gtkconv.c:3707 src/protocols/oscar/oscar.c:435
 msgid "Send File"
 msgstr "傳送檔案"
 
@@ -2970,7 +2844,7 @@
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1357 src/gtkconv.c:3725
+#: src/gtkconv.c:1357 src/gtkconv.c:3728
 msgid "Info"
 msgstr "取得資訊"
 
@@ -2978,269 +2852,269 @@
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:2484
+#: src/gtkconv.c:2483
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: src/gtkconv.c:2501
+#: src/gtkconv.c:2504
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: src/gtkconv.c:2531
+#: src/gtkconv.c:2534
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2539
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2545
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:2926
+#: src/gtkconv.c:2929
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2934
+#: src/gtkconv.c:2937
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3037
+#: src/gtkconv.c:3040
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3488
+#: src/gtkconv.c:3491
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3493
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3495
-msgid "/Conversation/_Find..."
-msgstr "/交談/搜尋(_F)..."
-
-#: src/gtkconv.c:3497
-msgid "/Conversation/View _Log"
-msgstr "/交談/觀看歷史記錄(_L)"
-
 #: src/gtkconv.c:3498
+msgid "/Conversation/_Find..."
+msgstr "/交談/搜尋(_F)..."
+
+#: src/gtkconv.c:3500
+msgid "/Conversation/View _Log"
+msgstr "/交談/觀看歷史記錄(_L)"
+
+#: src/gtkconv.c:3501
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3503
 msgid "/Conversation/Clear"
 msgstr "/交談/清空"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3507
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: src/gtkconv.c:3505
+#: src/gtkconv.c:3508
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3510
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3512
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3511
+#: src/gtkconv.c:3514
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3516
+#: src/gtkconv.c:3519
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3518
+#: src/gtkconv.c:3521
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3520
+#: src/gtkconv.c:3523
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3522
+#: src/gtkconv.c:3525
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3527
+#: src/gtkconv.c:3530
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3529
+#: src/gtkconv.c:3532
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3534
+#: src/gtkconv.c:3537
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3538
+#: src/gtkconv.c:3541
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3539
+#: src/gtkconv.c:3542
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3540
+#: src/gtkconv.c:3543
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3544
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3545
 msgid "/Options/Show T_imestamps"
 msgstr "/選項/顯示時間戳記(_I)"
 
-#: src/gtkconv.c:3584
+#: src/gtkconv.c:3587
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3589
+#: src/gtkconv.c:3592
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3596
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3599
+#: src/gtkconv.c:3602
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3606
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3607
+#: src/gtkconv.c:3610
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3613
+#: src/gtkconv.c:3616
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3620
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3621
+#: src/gtkconv.c:3624
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3625
+#: src/gtkconv.c:3628
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3631
+#: src/gtkconv.c:3634
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3635
+#: src/gtkconv.c:3638
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3641
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3647
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3650
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
-#: src/gtkconv.c:3650
+#: src/gtkconv.c:3653
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
+#: src/gtkconv.c:3677 src/gtkconv.c:3679 src/gtkconv.c:3797 src/gtkconv.c:3799
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3690
+#: src/gtkconv.c:3693
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3696
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
+#: src/gtkconv.c:3700 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3700
+#: src/gtkconv.c:3703
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3707
+#: src/gtkconv.c:3710
 msgid "Send a file to the user"
 msgstr "傳送檔案至使用者"
 
-#: src/gtkconv.c:3714
+#: src/gtkconv.c:3717
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3721
+#: src/gtkconv.c:3724
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3728 src/gtkconv.c:4108
+#: src/gtkconv.c:3731 src/gtkconv.c:4110
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3808
+#: src/gtkconv.c:3811
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3811
+#: src/gtkconv.c:3814
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3818
+#: src/gtkconv.c:3821
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3825
+#: src/gtkconv.c:3828
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3961
+#: src/gtkconv.c:3963
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4024
+#: src/gtkconv.c:4026
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:4085
+#: src/gtkconv.c:4087
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:4097
+#: src/gtkconv.c:4099
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
@@ -3248,48 +3122,187 @@
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
+#: src/gtkconv.c:5228 src/gtkconv.c:5257 src/gtkconv.c:5353 src/gtkconv.c:5411
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5958 src/gtkconv.c:5961
+#: src/gtkconv.c:5969 src/gtkconv.c:5972
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
-#: src/gtkconv.c:6333
+#: src/gtkconv.c:6344
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: src/gtkconv.c:6336
+#: src/gtkconv.c:6347
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
-#: src/gtkconv.c:6340
+#: src/gtkconv.c:6351
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: src/gtkdebug.c:197
+#: src/gtkdebug.c:196
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
-#: src/gtkdebug.c:250
+#: src/gtkdebug.c:249
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:288
+#: src/gtkdebug.c:287
 msgid "Pause"
 msgstr "暫停"
 
-#: src/gtkdebug.c:294
+#: src/gtkdebug.c:293
 msgid "Timestamps"
 msgstr "時間戳記"
 
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:244 src/gtkdialogs.c:296
+msgid "_Screen name"
+msgstr "帳號(_S)"
+
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:250 src/gtkdialogs.c:302
+msgid "_Account"
+msgstr "帳號(_A)"
+
+#: src/gtkdialogs.c:118
+msgid "New Instant Message"
+msgstr "新即時訊息"
+
+#: src/gtkdialogs.c:120
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr "請輸入您所想要發送即時訊息對象的帳號。"
+
+#: src/gtkdialogs.c:257
+msgid "Get User Info"
+msgstr "取得使用者資訊"
+
+#: src/gtkdialogs.c:259
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr "請輸入您所想要查詢對象的帳號。"
+
+#  NOTE 此處譯「讀取」似乎較「取得」好一點
+#: src/gtkdialogs.c:310
+msgid "Get User Log"
+msgstr "讀取使用者日誌"
+
+#: src/gtkdialogs.c:312
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
+
+#: src/gtkdialogs.c:346
+msgid "Warn User"
+msgstr "警告使用者"
+
+#: src/gtkdialogs.c:365
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">警告 %s?</span>\n"
+"\n"
+"這個動作將會增加 %s 的警告等級,同時他(她)將被限制以更嚴格的速率限制。\n"
+
+#: src/gtkdialogs.c:374
+msgid "Warn _anonymously?"
+msgstr "以匿名的身份發出警告?(_A)"
+
+#: src/gtkdialogs.c:381
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
+
+# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
+#: src/gtkdialogs.c:400
+msgid "Alias Contact"
+msgstr "給好友改別名"
+
+# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
+#: src/gtkdialogs.c:401
+msgid "Enter an alias for this contact."
+msgstr "請為這個好友輸入一個別名。"
+
+#: src/gtkdialogs.c:403 src/gtkdialogs.c:421 src/gtkdialogs.c:439
+#: src/gtkrequest.c:249 src/protocols/silc/chat.c:572
+msgid "Alias"
+msgstr "別名"
+
+#: src/gtkdialogs.c:417
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "請為 %s 輸入一個別名"
+
+#: src/gtkdialogs.c:419
+msgid "Alias Buddy"
+msgstr "為好友加上別名"
+
+#: src/gtkdialogs.c:436
+msgid "Alias Chat"
+msgstr "給聊天室改別名"
+
+#: src/gtkdialogs.c:437
+msgid "Enter an alias for this chat."
+msgstr "請為這個聊天室輸入一個別名。"
+
+#: src/gtkdialogs.c:474
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr ""
+"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動"
+"作嗎?"
+
+# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
+#: src/gtkdialogs.c:477 src/gtkdialogs.c:478
+msgid "Remove Contact"
+msgstr "移除好友"
+
+#: src/gtkdialogs.c:530
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
+
+#: src/gtkdialogs.c:533 src/gtkdialogs.c:534
+msgid "Remove Group"
+msgstr "移除群組"
+
+#: src/gtkdialogs.c:577
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
+
+# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
+#: src/gtkdialogs.c:579 src/gtkdialogs.c:580
+msgid "Remove Buddy"
+msgstr "移除好友"
+
+#: src/gtkdialogs.c:596
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
+
+#: src/gtkdialogs.c:598 src/gtkdialogs.c:599
+msgid "Remove Chat"
+msgstr "移除聊天室"
+
 #: src/gtkft.c:136
 #, c-format
 msgid "%.2f KB/s"
@@ -3380,7 +3393,7 @@
 msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:698 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:91
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -3419,22 +3432,22 @@
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:2803
+#: src/gtkimhtml.c:2819
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:2811
+#: src/gtkimhtml.c:2827
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
+#: src/gtkimhtml.c:2904 src/gtkimhtml.c:2916
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:2921
+#: src/gtkimhtml.c:2937
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -3550,24 +3563,24 @@
 msgstr "系統日誌"
 
 #. Descriptive label
-#: src/gtknotify.c:217
+#: src/gtknotify.c:215
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: src/gtknotify.c:231
+#: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自:</span> %s\n"
 
-#: src/gtknotify.c:240
+#: src/gtknotify.c:238
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題:</span> %s\n"
 
-#: src/gtknotify.c:245
+#: src/gtknotify.c:243
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3578,7 +3591,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:261
+#: src/gtknotify.c:259
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3589,176 +3602,176 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:421
+#: src/gtknotify.c:419
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
-#: src/gtknotify.c:571
+#: src/gtknotify.c:422 src/gtknotify.c:436 src/gtknotify.c:451
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:435 src/gtknotify.c:450
+#: src/gtknotify.c:433 src/gtknotify.c:448
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "執行「%s」時發生了錯誤:%s"
 
-#: src/gtknotify.c:572
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#: src/gtkpounce.c:130
+#: src/gtkpounce.c:129
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: src/gtkpounce.c:161
+#: src/gtkpounce.c:160
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:889
+#: src/gtkpounce.c:386 src/gtkpounce.c:888
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/gtkpounce.c:387
+#: src/gtkpounce.c:386
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:403
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/gtkpounce.c:431
+#: src/gtkpounce.c:430
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:454
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:462
 msgid "Si_gn on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:464
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:467
+#: src/gtkpounce.c:466
 msgid "A_way"
 msgstr "離開(_W)"
 
-#: src/gtkpounce.c:469
+#: src/gtkpounce.c:468
 msgid "_Return from away"
 msgstr "由離開返回(_R)"
 
-#: src/gtkpounce.c:471
+#: src/gtkpounce.c:470
 msgid "_Idle"
 msgstr "閒置(_I)"
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:472
 msgid "Retur_n from idle"
 msgstr "由閒置返回(_N)"
 
-#: src/gtkpounce.c:475
+#: src/gtkpounce.c:474
 msgid "Buddy starts _typing"
 msgstr "好友開始輸入(_T)"
 
-#: src/gtkpounce.c:477
+#: src/gtkpounce.c:476
 msgid "Buddy stops t_yping"
 msgstr "好友停止輸入(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:506
+#: src/gtkpounce.c:505
 msgid "Pounce Action"
 msgstr "捕捉動作"
 
-#: src/gtkpounce.c:514
+#: src/gtkpounce.c:513
 msgid "Op_en an IM window"
 msgstr "開啟即時訊息視窗(_E)"
 
-#: src/gtkpounce.c:516
+#: src/gtkpounce.c:515
 msgid "_Popup notification"
 msgstr "彈出通知(_P)"
 
-#: src/gtkpounce.c:518
+#: src/gtkpounce.c:517
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: src/gtkpounce.c:520
+#: src/gtkpounce.c:519
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: src/gtkpounce.c:522
+#: src/gtkpounce.c:521
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:525
 msgid "B_rowse..."
 msgstr "瀏覽(_R)..."
 
+#: src/gtkpounce.c:527
+msgid "Bro_wse..."
+msgstr "瀏覽(_W)..."
+
 #: src/gtkpounce.c:528
-msgid "Bro_wse..."
-msgstr "瀏覽(_W)..."
-
-#: src/gtkpounce.c:529
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:611
 msgid "Sav_e this pounce after activation"
 msgstr "儲存設定並啟動(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:896
+#: src/gtkpounce.c:895
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/gtkpounce.c:960
+#: src/gtkpounce.c:953
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:962
+#: src/gtkpounce.c:955
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:957
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:959
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:968
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
@@ -3985,8 +3998,8 @@
 msgid "New conversation _placement:"
 msgstr "新交談開啟於(_P):"
 
-#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
-#: src/protocols/oscar/oscar.c:4850
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:578
+#: src/protocols/oscar/oscar.c:4860
 msgid "IP Address"
 msgstr "IP 位址"
 
@@ -4224,16 +4237,18 @@
 #  NOTE 原始碼 (src/server.c) 表示「只要是離開期間」就送出自動回應
 #  NOTE 直譯「只在離開期間」會是個錯誤
 #: src/gtkprefs.c:1809
-msgid "Only when away"
+#, fuzzy
+msgid "When away"
 msgstr "離開期間"
 
 #: src/gtkprefs.c:1810
-msgid "Only when away and idle"
+#, fuzzy
+msgid "When away and idle"
 msgstr "只在同時離開及閒置期間"
 
 #: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2777
-#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2776
+#: src/protocols/oscar/oscar.c:4013 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "閒置"
@@ -4447,40 +4462,40 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:307
+#: src/gtkrequest.c:239 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1864 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1866 src/protocols/silc/buddy.c:308
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:244
+#: src/gtkrequest.c:243
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:244 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "關閉"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1391
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkrequest.c:1393
+#: src/gtkrequest.c:1392
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Open File..."
 msgstr "開啟檔案..."
 
@@ -4556,11 +4571,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: src/log.c:489
+#: src/log.c:491
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:575
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4569,7 +4584,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:577
+#: src/log.c:579
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4579,59 +4594,59 @@
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:628 src/log.c:815
+#: src/log.c:630 src/log.c:817
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: src/log.c:638 src/log.c:827
+#: src/log.c:640 src/log.c:829
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案:%s</b></font>"
 
-#: src/log.c:675
+#: src/log.c:677
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:760
+#: src/log.c:762
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/log.c:860
+#: src/log.c:862
 msgid "Plain text"
 msgstr "純文字"
 
-#: src/main.c:150
+#: src/main.c:149
 msgid "Please create an account."
 msgstr "請建立一個帳號。"
 
-#: src/main.c:232
+#: src/main.c:231
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:248
+#: src/main.c:247
 msgid "<b>_Account:</b>"
 msgstr "<b>帳號(_A):</b>"
 
-#: src/main.c:262
+#: src/main.c:261
 msgid "<b>_Password:</b>"
 msgstr "<b>密碼(_P):</b>"
 
 #. And now for the buttons
-#: src/main.c:279
+#: src/main.c:278
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: src/main.c:285
+#: src/main.c:284
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: src/main.c:291
+#: src/main.c:290
 msgid "_Sign on"
 msgstr "登入(_S)"
 
 #. full help text
-#: src/main.c:517
+#: src/main.c:516
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4665,16 +4680,16 @@
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/main.c:532
+#: src/main.c:531
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: src/main.c:845
+#: src/main.c:844
 msgid "Unable to load preferences"
 msgstr "無法載入偏好設定"
 
-#: src/main.c:845
+#: src/main.c:844
 msgid ""
 "Gaim was not able to load your preferences because they are stored in an old "
 "format that is no longer used.  Please reconfigure your settings using the "
@@ -4707,9 +4722,9 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2768
-#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2938
-#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2767
+#: src/protocols/novell/novell.c:2886 src/protocols/novell/novell.c:2937
+#: src/protocols/oscar/oscar.c:600 src/protocols/yahoo/yahoo.c:2894
 #: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "上線"
@@ -4723,10 +4738,10 @@
 msgstr "離開(只有好友可以看到我)"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
-#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:5477
-#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:6697
-#: src/protocols/oscar/oscar.c:6702 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:518
+#: src/protocols/oscar/oscar.c:5409 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:5511 src/protocols/oscar/oscar.c:6707
+#: src/protocols/oscar/oscar.c:6712 src/protocols/yahoo/yahoo.c:2552
 #: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "隱身"
@@ -4744,7 +4759,7 @@
 msgid "Unable to resolve hostname."
 msgstr "無法解析主機名稱。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1685
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1684
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
@@ -4771,17 +4786,17 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3817
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
-#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
-#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:644
+#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3821
+#: src/protocols/oscar/oscar.c:4042 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:467
+#: src/protocols/zephyr/zephyr.c:643
 msgid "Buddy Information"
 msgstr "好友資訊"
 
@@ -4799,9 +4814,9 @@
 msgstr "無法讀取 Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505
+#: src/protocols/toc/toc.c:169 src/protocols/yahoo/yahoo.c:2199
 #: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
@@ -4829,7 +4844,7 @@
 msgstr "在 GG Library 中的重大錯誤\n"
 
 #: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
-#: src/protocols/toc/toc.c:146
+#: src/protocols/toc/toc.c:145
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
@@ -4868,25 +4883,25 @@
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4842
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4852
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4853 src/protocols/silc/ops.c:799
+#: src/protocols/oscar/oscar.c:4863 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4854 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4864 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4843
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4853
 #: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "暱稱"
@@ -4902,7 +4917,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
+#: src/protocols/oscar/oscar.c:4907 src/protocols/oscar/oscar.c:4915
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
@@ -5004,7 +5019,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1551
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -5047,56 +5062,56 @@
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
-#: src/protocols/icq/gaim_icq.c:224
+#: src/protocols/icq/gaim_icq.c:223
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 在連結 ICQ 伺服器時發生錯誤。"
 
-#: src/protocols/icq/gaim_icq.c:294
+#: src/protocols/icq/gaim_icq.c:293
 #, c-format
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
-#: src/protocols/oscar/oscar.c:6131
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:240
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:6141
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
-#: src/protocols/oscar/oscar.c:6132
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:6142
 msgid "Deny"
 msgstr "拒絕"
 
-#: src/protocols/icq/gaim_icq.c:310
+#: src/protocols/icq/gaim_icq.c:309
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
-#: src/protocols/icq/gaim_icq.c:352
+#: src/protocols/icq/gaim_icq.c:351
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:497
 msgid "Nick:"
 msgstr "暱稱:"
 
-#: src/protocols/icq/gaim_icq.c:499
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1286
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1292
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
 #: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
-#: src/protocols/silc/silc.c:995
+#: src/protocols/silc/silc.c:1001
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
 #: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
-#: src/protocols/silc/silc.c:998
+#: src/protocols/silc/silc.c:1004
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -5111,69 +5126,69 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 無法開啟監聽埠。"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:74
 msgid "Error displaying MOTD"
 msgstr "顯示是日訊息時發生了錯誤"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:74
 msgid "No MOTD available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:75
 msgid "There is no MOTD associated with this connection."
 msgstr "這個連結沒有相關的是日訊息。"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:78
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
+#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:387
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
-#: src/protocols/irc/irc.c:158
+#: src/protocols/irc/irc.c:157
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:179 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: src/protocols/irc/irc.c:205
+#: src/protocols/irc/irc.c:204
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:223 src/protocols/toc/toc.c:197
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:233
+#: src/protocols/irc/irc.c:232
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
+#: src/protocols/irc/irc.c:247 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1517 src/protocols/oscar/oscar.c:1581
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:384 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
-#: src/protocols/yahoo/yahoochat.c:1380
+#: src/protocols/irc/irc.c:535 src/protocols/silc/chat.c:1356
+#: src/protocols/yahoo/yahoochat.c:1379
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
-#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1388
 msgid "Topic"
 msgstr "主題"
 
@@ -5186,32 +5201,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:642
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:644
+#: src/protocols/irc/irc.c:643
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/irc/irc.c:662 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:643
 #: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
-#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:665 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:648
+#: src/protocols/silc/silc.c:1583 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
+#: src/protocols/irc/irc.c:668 src/protocols/zephyr/zephyr.c:1918
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:671 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
 #: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
 #: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
@@ -5573,7 +5588,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;暱稱&gt;:取得使用者資訊。"
 
-#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:264
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5592,9 +5607,9 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
-#: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
-#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1414
+#: src/protocols/toc/toc.c:187 src/protocols/toc/toc.c:595
+#: src/protocols/toc/toc.c:611 src/protocols/toc/toc.c:688
 msgid "Disconnected."
 msgstr "停止連線。"
 
@@ -5685,7 +5700,7 @@
 msgstr "電話"
 
 #: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:637
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "電子郵件"
@@ -5707,7 +5722,7 @@
 msgstr "職責"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4878
+#: src/protocols/oscar/oscar.c:4888
 msgid "Birthday"
 msgstr "生日"
 
@@ -5727,9 +5742,9 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2790
-#: src/protocols/novell/novell.c:2794 src/protocols/oscar/oscar.c:562
-#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2789
+#: src/protocols/novell/novell.c:2793 src/protocols/oscar/oscar.c:560
+#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:568
 #: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "狀態"
@@ -5750,7 +5765,7 @@
 msgstr "英文別名"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4896 src/protocols/oscar/oscar.c:4904
+#: src/protocols/oscar/oscar.c:4906 src/protocols/oscar/oscar.c:4914
 #: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "地址"
@@ -5798,7 +5813,7 @@
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1002
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1001
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
@@ -5964,14 +5979,14 @@
 msgstr "電子郵件"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4898
-#: src/protocols/oscar/oscar.c:4906 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4916 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "省/州"
 
 #: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
-#: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
+#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "電話"
 
@@ -5993,9 +6008,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2123
-#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
+#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2122
+#: src/protocols/oscar/oscar.c:1585 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1017
 msgid "Connecting"
 msgstr "連線中"
 
@@ -6013,7 +6028,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6510
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -6056,19 +6071,19 @@
 msgstr "錯誤"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:124
 msgid "Chatty"
 msgstr "想聊天"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:129
 msgid "Extended Away"
 msgstr "長時間離開"
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
-#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5489
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5499
+#: src/protocols/oscar/oscar.c:6703
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -6096,7 +6111,7 @@
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -6443,7 +6458,7 @@
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1579
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6480,39 +6495,39 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:232
 msgid "Unknown Error in presence"
 msgstr "在確定好友的連線狀態時,發生了未知的錯誤"
 
-#: src/protocols/jabber/presence.c:230
+#: src/protocols/jabber/presence.c:235
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他(她)的好友清單中。"
 
-#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:285 src/protocols/jabber/presence.c:286
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: src/protocols/jabber/presence.c:285
+#: src/protocols/jabber/presence.c:287
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: src/protocols/jabber/presence.c:287
+#: src/protocols/jabber/presence.c:289
 msgid "Configure Room"
 msgstr "設定聊天室"
 
-#: src/protocols/jabber/presence.c:289
+#: src/protocols/jabber/presence.c:291
 msgid "Accept Defaults"
 msgstr "使用預設值"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:319
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: src/protocols/jabber/presence.c:314
+#: src/protocols/jabber/presence.c:322
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -6584,7 +6599,7 @@
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:601
 msgid "User is offline"
 msgstr "使用者是離線的"
 
@@ -6636,7 +6651,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:188
 msgid "Not logged in"
 msgstr "尚未登入"
 
@@ -6733,8 +6748,8 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
-#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2014
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:629
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6847,8 +6862,8 @@
 msgstr "馬上回來"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2774
-#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2943
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2773
+#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2942
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
 #: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
 #: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
@@ -6868,7 +6883,7 @@
 msgstr "外出用餐"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
+#: src/protocols/zephyr/zephyr.c:1357 src/protocols/zephyr/zephyr.c:1376
 msgid "Hidden"
 msgstr "隱藏"
 
@@ -6918,23 +6933,18 @@
 "gaim.sf.net/faq-ssl.php。"
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/zephyr/zephyr.c:634
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>別名:</b>%s<br>"
 
 #. put a link to the actual profile URL
 #: src/protocols/msn/msn.c:1172 src/protocols/msn/msn.c:1512
-#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:792
+#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1173
-#, c-format
-msgid "<font sml=\"msn\">%s</font><br>"
-msgstr "<font sml=\"msn\">%s</font><br>"
-
 #: src/protocols/msn/msn.c:1242
 msgid "MSN Profile"
 msgstr "MSN 個人資料"
@@ -6945,14 +6955,14 @@
 msgstr "取得個人資訊時發生錯誤"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4883
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4893
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4869
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4879
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -7075,7 +7085,7 @@
 msgstr "讀取好友清單中"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2306
+#: src/protocols/oscar/oscar.c:2304
 msgid "Password sent"
 msgstr "密碼送出"
 
@@ -7160,50 +7170,50 @@
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單。"
 
-#: src/protocols/napster/napster.c:230
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "無法由伺服器讀取標頭資訊"
 
-#: src/protocols/napster/napster.c:244
+#: src/protocols/napster/napster.c:243
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "無法由伺服器讀取資訊:%s。指令為 %hd,長度為 %hd。"
 
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:306
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "使用者:%s,檔案:%s,大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:317
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 查詢您的使用者資訊"
 
-#: src/protocols/napster/napster.c:422
+#: src/protocols/napster/napster.c:421
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6202
-#: src/protocols/toc/toc.c:1267
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6212
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -7218,7 +7228,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
+#: src/protocols/napster/napster.c:623 src/protocols/napster/napster.c:625
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
@@ -7350,98 +7360,98 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: src/protocols/novell/novell.c:116
 #, c-format
 msgid "Login failed (%s)."
 msgstr "登入失敗 (%s)。"
 
 #  XXX 暫譯
-#: src/protocols/novell/novell.c:230
+#: src/protocols/novell/novell.c:229
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
 
-#: src/protocols/novell/novell.c:379
+#: src/protocols/novell/novell.c:378
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "無法把 %s 加至您的好友清單 (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:405
+#: src/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "無法送出訊息 (%s)。"
 
-#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:969
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "無法邀請使用者 (%s)。"
 
-#: src/protocols/novell/novell.c:515
+#: src/protocols/novell/novell.c:514
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:520
+#: src/protocols/novell/novell.c:519
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "無法送出訊息。無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:567
+#: src/protocols/novell/novell.c:566
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:615
+#: src/protocols/novell/novell.c:614
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:687
+#: src/protocols/novell/novell.c:686
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "無法取得使用者 %s 的細節 (%s)。"
 
 #  FIXME 譯文有待改進
-#: src/protocols/novell/novell.c:733 src/protocols/novell/novell.c:879
+#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "無法把使用者加至您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:780
+#: src/protocols/novell/novell.c:779
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "無法把 %s 加至您的拒絕清單 (%s)。"
 
-#: src/protocols/novell/novell.c:833
+#: src/protocols/novell/novell.c:832
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "無法把 %s 加至您的允許清單 (%s)。"
 
-#: src/protocols/novell/novell.c:901
+#: src/protocols/novell/novell.c:900
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:924 src/protocols/novell/novell.c:1594
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1593
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
 
-#: src/protocols/novell/novell.c:996
+#: src/protocols/novell/novell.c:995
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1633
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1632
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: src/protocols/novell/novell.c:1446
+#: src/protocols/novell/novell.c:1445
 msgid "Userid"
 msgstr "使用者 ID"
 
@@ -7452,49 +7462,49 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1459
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「User Properties」係指「使用者資訊」,感謝KingAnt及LSchiere解釋
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1479
 msgid "User Properties"
 msgstr "使用者資訊"
 
 #  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: src/protocols/novell/novell.c:1584
+#: src/protocols/novell/novell.c:1583
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: src/protocols/novell/novell.c:1609
+#: src/protocols/novell/novell.c:1608
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: src/protocols/novell/novell.c:1639
+#: src/protocols/novell/novell.c:1638
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "處理事件或回覆時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:1673
+#: src/protocols/novell/novell.c:1672
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/protocols/novell/novell.c:1688
+#: src/protocols/novell/novell.c:1687
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: src/protocols/novell/novell.c:1823
+#: src/protocols/novell/novell.c:1822
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: src/protocols/novell/novell.c:1850
+#: src/protocols/novell/novell.c:1849
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: src/protocols/novell/novell.c:1851
+#: src/protocols/novell/novell.c:1850
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7505,16 +7515,16 @@
 "\n"
 "時間:%s"
 
-#: src/protocols/novell/novell.c:1853
+#: src/protocols/novell/novell.c:1852
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
-#: src/protocols/novell/novell.c:1956
+#: src/protocols/novell/novell.c:1955
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: src/protocols/novell/novell.c:2010
+#: src/protocols/novell/novell.c:2009
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7524,35 +7534,35 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2108
+#: src/protocols/novell/novell.c:2107
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: src/protocols/novell/novell.c:2130
+#: src/protocols/novell/novell.c:2129
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: src/protocols/novell/novell.c:2434
+#: src/protocols/novell/novell.c:2433
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#: src/protocols/novell/novell.c:2780 src/protocols/oscar/oscar.c:570
-#: src/protocols/oscar/oscar.c:6502 src/protocols/yahoo/yahoo.c:2556
+#: src/protocols/novell/novell.c:2779 src/protocols/oscar/oscar.c:568
+#: src/protocols/oscar/oscar.c:6512 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:2791
+#: src/protocols/novell/novell.c:2790
 msgid "Message"
 msgstr "訊息"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/novell/novell.c:2890 src/protocols/novell/novell.c:2946
+#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2945
 msgid "Appear Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:3340
+#: src/protocols/novell/novell.c:3339
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
@@ -7567,120 +7577,120 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3436 src/protocols/novell/novell.c:3438
+#: src/protocols/novell/novell.c:3435 src/protocols/novell/novell.c:3437
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: src/protocols/novell/novell.c:3457
+#: src/protocols/novell/novell.c:3456
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:3461
+#: src/protocols/novell/novell.c:3460
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:184
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:185
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:186
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:187
 msgid "Rate to client"
 msgstr "到客戶端速率"
 
 #  XXX 可能是誤譯
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:189
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:190
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:191
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:192
 msgid "Not supported by host"
 msgstr "伺服器不支援"
 
+#: src/protocols/oscar/oscar.c:193
+msgid "Not supported by client"
+msgstr "客戶端不支援"
+
+#: src/protocols/oscar/oscar.c:194
+msgid "Refused by client"
+msgstr "被客戶端拒絕"
+
 #: src/protocols/oscar/oscar.c:195
-msgid "Not supported by client"
-msgstr "客戶端不支援"
+msgid "Reply too big"
+msgstr "回覆太大了"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Refused by client"
-msgstr "被客戶端拒絕"
+msgid "Responses lost"
+msgstr "遺失回應"
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Reply too big"
-msgstr "回覆太大了"
-
-#: src/protocols/oscar/oscar.c:198
-msgid "Responses lost"
-msgstr "遺失回應"
-
-#: src/protocols/oscar/oscar.c:199
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:198
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:199
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:200
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:201
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
+#: src/protocols/oscar/oscar.c:202
+msgid "Too evil (receiver)"
+msgstr "太邪惡了(收件人)"
+
+#: src/protocols/oscar/oscar.c:203
+msgid "User temporarily unavailable"
+msgstr "使用者暫時不在"
+
 #: src/protocols/oscar/oscar.c:204
-msgid "Too evil (receiver)"
-msgstr "太邪惡了(收件人)"
-
-#: src/protocols/oscar/oscar.c:205
-msgid "User temporarily unavailable"
-msgstr "使用者暫時不在"
-
-#: src/protocols/oscar/oscar.c:206
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:205
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:206
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:207
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:208
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:400
+#: src/protocols/oscar/oscar.c:398
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7688,45 +7698,45 @@
 "(為這個訊息轉換編碼時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的客"
 "戶端程式。)"
 
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:423
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:426
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:429 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6804
+#: src/protocols/oscar/oscar.c:432 src/protocols/oscar/oscar.c:6814
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:439
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:442
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:445
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:448
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:451
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:454
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -7737,144 +7747,144 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:457
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:460
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:463
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:466
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:469
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:472
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:475
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:478
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:482
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:485
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:488
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5498
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:506 src/protocols/oscar/oscar.c:5508
+#: src/protocols/oscar/oscar.c:6706
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5492
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5502
+#: src/protocols/oscar/oscar.c:6704
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5495
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5505
+#: src/protocols/oscar/oscar.c:6705
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:518
+#: src/protocols/oscar/oscar.c:516
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:586
+#: src/protocols/oscar/oscar.c:584
 msgid "Capabilities"
 msgstr "相容性"
 
-#: src/protocols/oscar/oscar.c:595
+#: src/protocols/oscar/oscar.c:593
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:728
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:732
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:737
 msgid "Direct Connect failed"
 msgstr "直接連線失敗"
 
-#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
+#: src/protocols/oscar/oscar.c:814 src/protocols/oscar/oscar.c:945
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:897
+#: src/protocols/oscar/oscar.c:895
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "正在嘗試連線至 %2$s:%3$hu,以便和 %1$s 建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1314
+#: src/protocols/oscar/oscar.c:1312
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1319
+#: src/protocols/oscar/oscar.c:1317
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:1354
+#: src/protocols/oscar/oscar.c:1352
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1358
+#: src/protocols/oscar/oscar.c:1356
 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:1362 src/protocols/oscar/oscar.c:3320
+#: src/protocols/oscar/oscar.c:1360 src/protocols/oscar/oscar.c:3318
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
+#: src/protocols/oscar/oscar.c:1427 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:1448
+#: src/protocols/oscar/oscar.c:1446
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:1529
+#: src/protocols/oscar/oscar.c:1527
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:1543
+#: src/protocols/oscar/oscar.c:1541
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7884,48 +7894,48 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: src/protocols/oscar/oscar.c:1571
+#: src/protocols/oscar/oscar.c:1569
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
+#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:2107
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:1680
+#: src/protocols/oscar/oscar.c:1678
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:1793 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1791 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:1798
+#: src/protocols/oscar/oscar.c:1796
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
-#: src/protocols/oscar/oscar.c:1869
+#: src/protocols/oscar/oscar.c:1867
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1991 src/protocols/toc/toc.c:540
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1998
+#: src/protocols/oscar/oscar.c:1996
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2002
+#: src/protocols/oscar/oscar.c:2000
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: src/protocols/oscar/oscar.c:2007
+#: src/protocols/oscar/oscar.c:2005
 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."
@@ -7933,21 +7943,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2010
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:2044
+#: src/protocols/oscar/oscar.c:2042
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:2116
+#: src/protocols/oscar/oscar.c:2114
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
-#: src/protocols/oscar/oscar.c:2271
+#: src/protocols/oscar/oscar.c:2150 src/protocols/oscar/oscar.c:2180
+#: src/protocols/oscar/oscar.c:2269
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7956,24 +7966,24 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
+#: src/protocols/oscar/oscar.c:2153 src/protocols/oscar/oscar.c:2183
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:2274
+#: src/protocols/oscar/oscar.c:2272
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3102 src/protocols/oscar/oscar.c:3124
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:3310
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:3315
+#: src/protocols/oscar/oscar.c:3313
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7982,42 +7992,42 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3349
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3357
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3358
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:3390
+#: src/protocols/oscar/oscar.c:3388
 #, 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:3395 src/protocols/oscar/oscar.c:3397
+#: src/protocols/oscar/oscar.c:3393 src/protocols/oscar/oscar.c:3395
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
-#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
-#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
-#: src/protocols/oscar/oscar.c:6123 src/protocols/oscar/oscar.c:6169
+#: src/protocols/oscar/oscar.c:3443 src/protocols/oscar/oscar.c:3445
+#: src/protocols/oscar/oscar.c:3452 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:6133 src/protocols/oscar/oscar.c:6179
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:3453
+#: src/protocols/oscar/oscar.c:3451
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3546
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -8026,11 +8036,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6129
+#: src/protocols/oscar/oscar.c:3554 src/protocols/oscar/oscar.c:6139
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:3556
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8040,17 +8050,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3557
+#: src/protocols/oscar/oscar.c:3567
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3574
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:3572
+#: src/protocols/oscar/oscar.c:3582
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8063,7 +8073,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3580
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8076,7 +8086,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3588
+#: src/protocols/oscar/oscar.c:3598
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8089,34 +8099,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3609
+#: src/protocols/oscar/oscar.c:3619
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3615
+#: src/protocols/oscar/oscar.c:3625
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3629
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:3703
+#: src/protocols/oscar/oscar.c:3713
 #, 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:3712
+#: src/protocols/oscar/oscar.c:3722
 #, 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:3721
+#: src/protocols/oscar/oscar.c:3731
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8126,92 +8136,92 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:3730
+#: src/protocols/oscar/oscar.c:3740
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3739
+#: src/protocols/oscar/oscar.c:3749
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3748
+#: src/protocols/oscar/oscar.c:3758
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4031
+#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:4041
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: src/protocols/oscar/oscar.c:3868
+#: src/protocols/oscar/oscar.c:3878
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:3869
+#: src/protocols/oscar/oscar.c:3879
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3905
+#: src/protocols/oscar/oscar.c:3915
 msgid "Your message did not get sent."
 msgstr "無法送出您的訊息。"
 
-#: src/protocols/oscar/oscar.c:3906
+#: src/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
-#: src/protocols/oscar/oscar.c:3965
+#: src/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3967
+#: src/protocols/oscar/oscar.c:3977
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:4001
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:4004
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4008 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:4082
+#: src/protocols/oscar/oscar.c:4092
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4268
+#: src/protocols/oscar/oscar.c:4278
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:4488
+#: src/protocols/oscar/oscar.c:4498
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:4489
+#: src/protocols/oscar/oscar.c:4499
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8219,142 +8229,142 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:4552
+#: src/protocols/oscar/oscar.c:4562
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:4564
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:4585
+#: src/protocols/oscar/oscar.c:4595
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:4856 src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4873
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:4868 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4878 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:4869
+#: src/protocols/oscar/oscar.c:4879
 msgid "Not specified"
 msgstr "沒有填寫"
 
-#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4886
+#: src/protocols/oscar/oscar.c:4896
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4900
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4905
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
+#: src/protocols/oscar/oscar.c:4909 src/protocols/oscar/oscar.c:4917
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4913
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4911
+#: src/protocols/oscar/oscar.c:4921
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4922
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4913
+#: src/protocols/oscar/oscar.c:4923
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4914
+#: src/protocols/oscar/oscar.c:4924
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4926
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4926
+#: src/protocols/oscar/oscar.c:4936
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4975
+#: src/protocols/oscar/oscar.c:4985
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4996
+#: src/protocols/oscar/oscar.c:5006
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:5000
+#: src/protocols/oscar/oscar.c:5010
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:5017
+#: src/protocols/oscar/oscar.c:5027
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:5038
+#: src/protocols/oscar/oscar.c:5048
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:5040
+#: src/protocols/oscar/oscar.c:5050
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:5081
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:5074
+#: src/protocols/oscar/oscar.c:5084
 #, 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:5077
+#: src/protocols/oscar/oscar.c:5087
 #, 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:5080
+#: src/protocols/oscar/oscar.c:5090
 #, 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:5083
+#: src/protocols/oscar/oscar.c:5093
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8362,7 +8372,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:5086
+#: src/protocols/oscar/oscar.c:5096
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8370,19 +8380,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5099
 #, 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:5092
+#: src/protocols/oscar/oscar.c:5102
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5112
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8391,25 +8401,25 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5103 src/protocols/oscar/oscar.c:5110
+#: src/protocols/oscar/oscar.c:5113 src/protocols/oscar/oscar.c:5120
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5118
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:5173
+#: src/protocols/oscar/oscar.c:5183
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: src/protocols/oscar/oscar.c:5347
+#: src/protocols/oscar/oscar.c:5357
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:5348
+#: src/protocols/oscar/oscar.c:5358
 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 "
@@ -8418,7 +8428,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/oscar/oscar.c:5385
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8429,19 +8439,19 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5380
+#: src/protocols/oscar/oscar.c:5390
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:5396 src/protocols/oscar/oscar.c:6701
+#: src/protocols/oscar/oscar.c:5406 src/protocols/oscar/oscar.c:6711
 msgid "Visible"
 msgstr "現身"
 
-#: src/protocols/oscar/oscar.c:5414
+#: src/protocols/oscar/oscar.c:5424
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:5415
+#: src/protocols/oscar/oscar.c:5425
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8450,7 +8460,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:5455
+#: src/protocols/oscar/oscar.c:5465
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8461,11 +8471,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5460
+#: src/protocols/oscar/oscar.c:5470
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:5538
+#: src/protocols/oscar/oscar.c:5548
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8476,16 +8486,16 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: src/protocols/oscar/oscar.c:5540 src/protocols/oscar/oscar.c:5989
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:5550 src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6013
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5701
+#: src/protocols/oscar/oscar.c:5711
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:5702
+#: src/protocols/oscar/oscar.c:5712
 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 "
@@ -8494,13 +8504,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:5884 src/protocols/oscar/oscar.c:5885
-#: src/protocols/oscar/oscar.c:5890 src/protocols/oscar/oscar.c:6047
-#: src/protocols/oscar/oscar.c:6048 src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:5894 src/protocols/oscar/oscar.c:5895
+#: src/protocols/oscar/oscar.c:5900 src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:6058 src/protocols/oscar/oscar.c:6063
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:5997
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8509,11 +8519,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5987 src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6011
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:6011
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8523,7 +8533,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:6084
+#: src/protocols/oscar/oscar.c:6094
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8533,11 +8543,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:6090
+#: src/protocols/oscar/oscar.c:6100
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:6123
+#: src/protocols/oscar/oscar.c:6133
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8547,18 +8557,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6175
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: src/protocols/oscar/oscar.c:6166
+#: src/protocols/oscar/oscar.c:6176
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6169
+#: src/protocols/oscar/oscar.c:6179
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8568,79 +8578,79 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6170
+#: src/protocols/oscar/oscar.c:6180
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:6207 src/protocols/toc/toc.c:1272
+#: src/protocols/oscar/oscar.c:6217 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:6229
+#: src/protocols/oscar/oscar.c:6239
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:6319
+#: src/protocols/oscar/oscar.c:6329
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: src/protocols/oscar/oscar.c:6474
+#: src/protocols/oscar/oscar.c:6484
 msgid "Away Message"
 msgstr "離開訊息"
 
-#: src/protocols/oscar/oscar.c:6760
+#: src/protocols/oscar/oscar.c:6770
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: src/protocols/oscar/oscar.c:6761
+#: src/protocols/oscar/oscar.c:6771
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6790
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6786
+#: src/protocols/oscar/oscar.c:6796
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6808
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6815
+#: src/protocols/oscar/oscar.c:6825
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6845
+#: src/protocols/oscar/oscar.c:6855
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6846
+#: src/protocols/oscar/oscar.c:6856
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6853
+#: src/protocols/oscar/oscar.c:6863
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6905
+#: src/protocols/oscar/oscar.c:6915
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6950
+#: src/protocols/oscar/oscar.c:6960
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6953
+#: src/protocols/oscar/oscar.c:6963
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6954
+#: src/protocols/oscar/oscar.c:6964
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8648,76 +8658,76 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:6981
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6972
+#: src/protocols/oscar/oscar.c:6982
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:6983
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:7000
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6991
+#: src/protocols/oscar/oscar.c:7001
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:7073 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7083 src/protocols/silc/silc.c:795
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:7078
+#: src/protocols/oscar/oscar.c:7088
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:7084
+#: src/protocols/oscar/oscar.c:7094
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:7089 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7099 src/protocols/silc/silc.c:791
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:7094
+#: src/protocols/oscar/oscar.c:7104
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7098
+#: src/protocols/oscar/oscar.c:7108
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7107
+#: src/protocols/oscar/oscar.c:7117
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:7111
+#: src/protocols/oscar/oscar.c:7121
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:7115
+#: src/protocols/oscar/oscar.c:7125
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:7119
+#: src/protocols/oscar/oscar.c:7129
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:7126
+#: src/protocols/oscar/oscar.c:7136
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:7132
+#: src/protocols/oscar/oscar.c:7142
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:7137
+#: src/protocols/oscar/oscar.c:7147
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
@@ -8732,15 +8742,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7255 src/protocols/oscar/oscar.c:7257
+#: src/protocols/oscar/oscar.c:7265 src/protocols/oscar/oscar.c:7267
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:7276
+#: src/protocols/oscar/oscar.c:7286
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:7281
+#: src/protocols/oscar/oscar.c:7291
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -8935,57 +8945,57 @@
 msgid "Robot"
 msgstr "機械人"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:616
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "開心"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:618
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "憂愁"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:620
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "憤怒"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:622
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:624
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:626
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "無敵"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:628
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "戀愛中"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:630
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "想睡"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:632
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "發悶"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "興奮"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "憂慮"
@@ -9015,7 +9025,7 @@
 msgstr "所用裝置"
 
 #: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
-#: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
+#: src/protocols/silc/silc.c:684 src/protocols/silc/silc.c:686
 msgid "Timezone"
 msgstr "時區"
 
@@ -9250,11 +9260,11 @@
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:894
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:895
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -9401,7 +9411,7 @@
 msgid "More..."
 msgstr "顯示細節..."
 
-#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:783
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
@@ -9522,7 +9532,7 @@
 msgstr "伺服器中斷了連線"
 
 #: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
-#: src/protocols/silc/silc.c:167
+#: src/protocols/silc/silc.c:173
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
@@ -9621,32 +9631,32 @@
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: src/protocols/silc/silc.c:159
+#: src/protocols/silc/silc.c:165
 msgid "Cannot initialize SILC Client connection"
 msgstr "無法初始化 SILC 的客戶端連線"
 
-#: src/protocols/silc/silc.c:170
+#: src/protocols/silc/silc.c:176
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-#: src/protocols/silc/silc.c:242
+#: src/protocols/silc/silc.c:248
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
 #. Progress
-#: src/protocols/silc/silc.c:276
+#: src/protocols/silc/silc.c:282
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/silc.c:612
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/silc.c:614
 msgid "Normal"
 msgstr "正常"
 
-#: src/protocols/silc/silc.c:633
+#: src/protocols/silc/silc.c:639
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9654,46 +9664,46 @@
 "\n"
 "聯絡方法"
 
-#: src/protocols/silc/silc.c:641 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:647 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:643 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:649 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:651 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: src/protocols/silc/silc.c:650
+#: src/protocols/silc/silc.c:656
 msgid "Your Current Status"
 msgstr "目前狀態"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:657
+#: src/protocols/silc/silc.c:663
 msgid "Online Services"
 msgstr "所用之線上服務"
 
-#: src/protocols/silc/silc.c:660
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what services you are using"
 msgstr "讓他人可以得知您使用那些線上服務"
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:672
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
-#: src/protocols/silc/silc.c:673
+#: src/protocols/silc/silc.c:679
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
 #  XXX 好像很怪
-#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
+#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:693
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: src/protocols/silc/silc.c:688
+#: src/protocols/silc/silc.c:694
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9702,136 +9712,136 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
 "人看得見的各項。"
 
-#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:734
-#: src/protocols/silc/silc.c:1135
+#: src/protocols/silc/silc.c:734 src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:1141
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: src/protocols/silc/silc.c:728
+#: src/protocols/silc/silc.c:734
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/silc/silc.c:729 src/protocols/silc/silc.c:1130
+#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1136
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: src/protocols/silc/silc.c:772
+#: src/protocols/silc/silc.c:778
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: src/protocols/silc/silc.c:781
+#: src/protocols/silc/silc.c:787
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:853
+#: src/protocols/silc/silc.c:859
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: src/protocols/silc/silc.c:962
+#: src/protocols/silc/silc.c:968
 msgid "Failed to leave channel"
 msgstr "無法離開聊天室"
 
-#: src/protocols/silc/silc.c:1006
+#: src/protocols/silc/silc.c:1012
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: src/protocols/silc/silc.c:1087
+#: src/protocols/silc/silc.c:1093
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: src/protocols/silc/silc.c:1189
+#: src/protocols/silc/silc.c:1195
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: src/protocols/silc/silc.c:1194
+#: src/protocols/silc/silc.c:1200
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: src/protocols/silc/silc.c:1196
+#: src/protocols/silc/silc.c:1202
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: src/protocols/silc/silc.c:1209
+#: src/protocols/silc/silc.c:1215
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: src/protocols/silc/silc.c:1239
+#: src/protocols/silc/silc.c:1245
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知的指令:%s(可能是 Gaim 的錯誤)"
 
-#: src/protocols/silc/silc.c:1302
+#: src/protocols/silc/silc.c:1308
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: src/protocols/silc/silc.c:1306
+#: src/protocols/silc/silc.c:1312
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: src/protocols/silc/silc.c:1310
+#: src/protocols/silc/silc.c:1316
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: src/protocols/silc/silc.c:1315
+#: src/protocols/silc/silc.c:1321
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]:加入一個在網路上的聊天室"
 
-#: src/protocols/silc/silc.c:1319
+#: src/protocols/silc/silc.c:1325
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: src/protocols/silc/silc.c:1323
+#: src/protocols/silc/silc.c:1329
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
+#: src/protocols/silc/silc.c:1333 src/protocols/zephyr/zephyr.c:1675
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
-#: src/protocols/silc/silc.c:1331
+#: src/protocols/silc/silc.c:1337
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]:送出一個私人訊息給指定的使用者"
 
-#: src/protocols/silc/silc.c:1335
+#: src/protocols/silc/silc.c:1341
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:1339
+#: src/protocols/silc/silc.c:1345
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: src/protocols/silc/silc.c:1343
+#: src/protocols/silc/silc.c:1349
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: src/protocols/silc/silc.c:1347
+#: src/protocols/silc/silc.c:1353
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的客戶端指令"
 
-#: src/protocols/silc/silc.c:1353
+#: src/protocols/silc/silc.c:1359
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: src/protocols/silc/silc.c:1357
+#: src/protocols/silc/silc.c:1363
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: src/protocols/silc/silc.c:1361
+#: src/protocols/silc/silc.c:1367
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1365
+#: src/protocols/silc/silc.c:1371
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
 
-#: src/protocols/silc/silc.c:1369
+#: src/protocols/silc/silc.c:1375
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9839,15 +9849,15 @@
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
 "模式"
 
-#: src/protocols/silc/silc.c:1373
+#: src/protocols/silc/silc.c:1379
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1383
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1387
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9855,37 +9865,37 @@
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: src/protocols/silc/silc.c:1385
+#: src/protocols/silc/silc.c:1391
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1389
+#: src/protocols/silc/silc.c:1395
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1399
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的客戶端"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1403
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;:取得客戶端或伺服器的公鑰"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1407
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1411
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: src/protocols/silc/silc.c:1410
+#: src/protocols/silc/silc.c:1416
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: src/protocols/silc/silc.c:1414
+#: src/protocols/silc/silc.c:1420
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9893,39 +9903,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或"
 "多個頻道的使用者或某一類使用者"
 
-#: src/protocols/silc/silc.c:1426
+#: src/protocols/silc/silc.c:1432
 msgid "Instant Messages"
 msgstr "即時訊息"
 
-#: src/protocols/silc/silc.c:1431
+#: src/protocols/silc/silc.c:1437
 msgid "Digitally sign all IM messages"
 msgstr "數位簽署所有即時訊息"
 
-#: src/protocols/silc/silc.c:1436
+#: src/protocols/silc/silc.c:1442
 msgid "Verify all IM message signatures"
 msgstr "核實所有即時訊息的簽章"
 
-#: src/protocols/silc/silc.c:1439
+#: src/protocols/silc/silc.c:1445
 msgid "Channel Messages"
 msgstr "頻道訊息"
 
-#: src/protocols/silc/silc.c:1444
+#: src/protocols/silc/silc.c:1450
 msgid "Digitally sign all channel messages"
 msgstr "數位簽署所有頻道訊息"
 
-#: src/protocols/silc/silc.c:1449
+#: src/protocols/silc/silc.c:1455
 msgid "Verify all channel message signatures"
 msgstr "核實所有頻道訊息的簽章"
 
-#: src/protocols/silc/silc.c:1452
+#: src/protocols/silc/silc.c:1458
 msgid "Default SILC Key Pair"
 msgstr "預設的 SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1457
+#: src/protocols/silc/silc.c:1463
 msgid "SILC Public Key"
 msgstr "SILC 公鑰"
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1468
 msgid "SILC Private Key"
 msgstr "SILC 私鑰"
 
@@ -9939,43 +9949,43 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1548
+#: src/protocols/silc/silc.c:1554
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: src/protocols/silc/silc.c:1550
+#: src/protocols/silc/silc.c:1556
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #  XXX
-#: src/protocols/silc/silc.c:1580
+#: src/protocols/silc/silc.c:1586
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#: src/protocols/silc/silc.c:1586
+#: src/protocols/silc/silc.c:1592
 msgid "Public Key File"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:1590
+#: src/protocols/silc/silc.c:1596
 msgid "Private Key File"
 msgstr "私鑰檔案"
 
 #  TODO 譯文有待改進,這是意譯
-#: src/protocols/silc/silc.c:1595
+#: src/protocols/silc/silc.c:1601
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: src/protocols/silc/silc.c:1598
+#: src/protocols/silc/silc.c:1604
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: src/protocols/silc/silc.c:1601
+#: src/protocols/silc/silc.c:1607
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1610
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
@@ -10066,115 +10076,115 @@
 msgid "Terminal"
 msgstr "終端機"
 
-#: src/protocols/toc/toc.c:137
+#: src/protocols/toc/toc.c:136
 #, c-format
 msgid "Looking up %s"
 msgstr "找尋 %s 中"
 
-#: src/protocols/toc/toc.c:480
+#: src/protocols/toc/toc.c:479
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: src/protocols/toc/toc.c:483
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/toc/toc.c:486
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s 位元組被截去。"
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/toc/toc.c:492
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
-#: src/protocols/toc/toc.c:495
+#: src/protocols/toc/toc.c:494
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
-#: src/protocols/toc/toc.c:498
+#: src/protocols/toc/toc.c:497
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:501
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:504
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
-#: src/protocols/toc/toc.c:507
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:509
 msgid "Failure."
 msgstr "失敗。"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:512
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:515
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:518
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:521
 msgid "Email lookup restricted."
 msgstr "禁止 eMail 檢查。"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:524
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:530
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:534
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/toc/toc.c:544
+#: src/protocols/toc/toc.c:543
 msgid "The service is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
-#: src/protocols/toc/toc.c:547
+#: src/protocols/toc/toc.c:546
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
-#: src/protocols/toc/toc.c:550
+#: src/protocols/toc/toc.c:549
 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."
@@ -10182,37 +10192,37 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:551
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:575
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: src/protocols/toc/toc.c:616
+#: src/protocols/toc/toc.c:615
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: src/protocols/toc/toc.c:695
+#: src/protocols/toc/toc.c:694
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:891
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
+#: src/protocols/toc/toc.c:894
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
+
 #: src/protocols/toc/toc.c:895
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
-
-#: src/protocols/toc/toc.c:896
 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 "
@@ -10221,44 +10231,44 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1410
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1668
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1704
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
-#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1946
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2046
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2080
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -10274,15 +10284,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
+#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2190
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2195
+#: src/protocols/toc/toc.c:2194
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -10489,7 +10499,7 @@
 
 #: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
 #: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
-#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "連線錯誤"
@@ -10706,62 +10716,62 @@
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: src/protocols/yahoo/yahoochat.c:193
+#: src/protocols/yahoo/yahoochat.c:192
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
 
-#: src/protocols/yahoo/yahoochat.c:195
+#: src/protocols/yahoo/yahoochat.c:194
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:347
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限?"
 
-#: src/protocols/yahoo/yahoochat.c:425
+#: src/protocols/yahoo/yahoochat.c:424
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:578
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: src/protocols/yahoo/yahoochat.c:1338
+#: src/protocols/yahoo/yahoochat.c:1337
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/yahoo/yahoochat.c:1338
+#: src/protocols/yahoo/yahoochat.c:1337
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
 # NOTE 解「可語音聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1383
+#: src/protocols/yahoo/yahoochat.c:1382
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1386
+#: src/protocols/yahoo/yahoochat.c:1385
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
 # NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
 # NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
 # NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: src/protocols/yahoo/yahoochat.c:1451
+#: src/protocols/yahoo/yahoochat.c:1450
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
@@ -10769,26 +10779,26 @@
 msgid "Connection problem with the YCHT server."
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#: src/protocols/zephyr/zephyr.c:598
+#: src/protocols/zephyr/zephyr.c:597
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:632
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:637
+#: src/protocols/zephyr/zephyr.c:636
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:642
+#: src/protocols/zephyr/zephyr.c:641
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
+#: src/protocols/zephyr/zephyr.c:986 src/protocols/zephyr/zephyr.c:987
 msgid "Anyone"
 msgstr "任何人"
 
@@ -10799,61 +10809,61 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: src/protocols/zephyr/zephyr.c:1389
+#: src/protocols/zephyr/zephyr.c:1388
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1394
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/zephyr/zephyr.c:1400
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
 #  FIXME 暫譯
-#: src/protocols/zephyr/zephyr.c:1412
+#: src/protocols/zephyr/zephyr.c:1411
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室(交談) %s,%s,%s 失敗"
 
-#: src/protocols/zephyr/zephyr.c:1681
+#: src/protocols/zephyr/zephyr.c:1680
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:1686
+#: src/protocols/zephyr/zephyr.c:1685
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:1691
+#: src/protocols/zephyr/zephyr.c:1690
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:1696
+#: src/protocols/zephyr/zephyr.c:1695
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:1702
+#: src/protocols/zephyr/zephyr.c:1701
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: src/protocols/zephyr/zephyr.c:1707
+#: src/protocols/zephyr/zephyr.c:1706
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;:送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1713
+#: src/protocols/zephyr/zephyr.c:1712
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1719
+#: src/protocols/zephyr/zephyr.c:1718
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10861,7 +10871,7 @@
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1725
+#: src/protocols/zephyr/zephyr.c:1724
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10869,18 +10879,18 @@
 "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1730
+#: src/protocols/zephyr/zephyr.c:1729
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: src/protocols/zephyr/zephyr.c:1806
+#: src/protocols/zephyr/zephyr.c:1805
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: src/protocols/zephyr/zephyr.c:1809
+#: src/protocols/zephyr/zephyr.c:1808
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -10895,7 +10905,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
+#: src/protocols/zephyr/zephyr.c:1888 src/protocols/zephyr/zephyr.c:1890
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -10905,18 +10915,18 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: src/protocols/zephyr/zephyr.c:1910
+#: src/protocols/zephyr/zephyr.c:1909
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:1913
+#: src/protocols/zephyr/zephyr.c:1912
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
 # FIXME 暫譯;譯得很差,有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: src/protocols/zephyr/zephyr.c:1916
+#: src/protocols/zephyr/zephyr.c:1915
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -10944,7 +10954,7 @@
 "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
 
 #. * Custom away message.
-#: src/prpl.h:171
+#: src/prpl.h:181
 msgid "Custom"
 msgstr "使用者自定"
 
@@ -10955,67 +10965,67 @@
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:63
+#: src/server.c:64
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:534
+#: src/server.c:535
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: src/server.c:945
+#: src/server.c:946
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 個訊息)"
 msgstr[1] "(%d 個訊息)"
 
-#: src/server.c:959
+#: src/server.c:960
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1188 src/server.c:1197
+#: src/server.c:1189 src/server.c:1198
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1209
+#: src/server.c:1210
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已經登入"
 
-#: src/server.c:1224
+#: src/server.c:1225
 #, c-format
 msgid "%s came back"
 msgstr "%s 回來了"
 
-#: src/server.c:1226
+#: src/server.c:1227
 #, c-format
 msgid "%s went away"
 msgstr "%s 已經離開"
 
-#: src/server.c:1240
+#: src/server.c:1241
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/server.c:1251
+#: src/server.c:1252
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: src/server.c:1261 src/server.c:1268
+#: src/server.c:1262 src/server.c:1269
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1281
+#: src/server.c:1282
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已經登出"
 
-#: src/server.c:1343
+#: src/server.c:1344
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -11024,11 +11034,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1346
+#: src/server.c:1347
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1456
+#: src/server.c:1457
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -11037,12 +11047,12 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1460
+#: src/server.c:1461
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1466
+#: src/server.c:1467
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -11058,50 +11068,55 @@
 msgstr "別名(_A)"
 
 #: src/stock.c:88
-msgid "_Modify"
-msgstr "修改(_M)"
+#, fuzzy
+msgid "_Invite"
+msgstr "邀請"
 
 #: src/stock.c:89
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: src/stock.c:90
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: src/stock.c:91
+#: src/stock.c:92
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2363
+#: src/util.c:2353
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:2366
+#: src/util.c:2356
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2392
+#: src/util.c:2382
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 msgstr[1] "秒"
 
-#: src/util.c:2406
+#: src/util.c:2396
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:2414
+#: src/util.c:2404
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/util.c:2422
+#: src/util.c:2412
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2832
+#: src/util.c:2822
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -11117,6 +11132,9 @@
 msgid "Notification"
 msgstr "通知"
 
+#~ msgid "<font sml=\"msn\">%s</font><br>"
+#~ msgstr "<font sml=\"msn\">%s</font><br>"
+
 #~ msgid "Already logged in with Zephyr"
 #~ msgstr "已經登入 Zephyr"