diff po/zh_TW.po @ 6118:ed983e8a1851

[gaim-migrate @ 6582] Updated POTFILES.in and I guess a few billion po files due to a couple .c files being removed. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 14 Jul 2003 06:11:31 +0000
parents 9b09fec41257
children 084f6c031783
line wrap: on
line diff
--- a/po/zh_TW.po	Mon Jul 14 06:08:18 2003 +0000
+++ b/po/zh_TW.po	Mon Jul 14 06:11:31 2003 +0000
@@ -23,7 +23,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.64cvs\n"
-"POT-Creation-Date: 2003-07-09 01:13-0400\n"
+"POT-Creation-Date: 2003-07-13 22:05-0700\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -33,67 +33,65 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
 
-#: plugins/docklet/docklet.c:105 src/gtkaccount.c:468 src/gtkaccount.c:1623
-#: src/win32/systray.c:365
+#: plugins/docklet/docklet.c:110 src/gtkaccount.c:444 src/gtkaccount.c:1599
 msgid "Auto-login"
 msgstr "自動登入"
 
-#: plugins/docklet/docklet.c:108
+#: plugins/docklet/docklet.c:113
 msgid "New Message.."
 msgstr "新訊息"
 
-#: plugins/docklet/docklet.c:109
+#: plugins/docklet/docklet.c:114
 msgid "Join A Chat..."
 msgstr "加入聊天室"
 
-#: plugins/docklet/docklet.c:140
+#: plugins/docklet/docklet.c:145
 msgid "New..."
 msgstr "新增"
 
-#: plugins/docklet/docklet.c:144 src/protocols/gg/gg.c:54
-#: src/protocols/irc/irc.c:1033 src/protocols/jabber/jabber.c:1172
-#: src/protocols/jabber/jabber.c:3433 src/protocols/jabber/jabber.c:3487
-#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4545
-#: src/protocols/oscar/oscar.c:5444 src/protocols/oscar/oscar.c:5838
+#: plugins/docklet/docklet.c:149 src/protocols/gg/gg.c:54
+#: src/protocols/irc/irc.c:1020 src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3491
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4548
+#: src/protocols/oscar/oscar.c:5447 src/protocols/oscar/oscar.c:5841
 #: src/gtkblist.c:1589 src/gtkpounce.c:460 src/gtkprefs.c:1491
 msgid "Away"
 msgstr "離開"
 
-#: plugins/docklet/docklet.c:150 src/away.c:531
+#: plugins/docklet/docklet.c:155 src/away.c:531
 msgid "Back"
 msgstr "返回"
 
-#: plugins/docklet/docklet.c:158
+#: plugins/docklet/docklet.c:163
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:163 src/gtkft.c:557
+#: plugins/docklet/docklet.c:168 src/gtkft.c:557
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:164 src/gtkaccount.c:1774 src/main.c:418
+#: plugins/docklet/docklet.c:169 src/gtkaccount.c:1750 src/main.c:415
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:165 src/gtkprefs.c:2337 src/main.c:428
-#: src/win32/systray.c:361
+#: plugins/docklet/docklet.c:170 src/gtkprefs.c:2337 src/main.c:425
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: plugins/docklet/docklet.c:174 src/win32/systray.c:165
+#: plugins/docklet/docklet.c:179
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:178
+#: plugins/docklet/docklet.c:183
 msgid "Quit"
 msgstr "結束程式"
 
-#: plugins/docklet/docklet.c:477
+#: plugins/docklet/docklet.c:412
 msgid "Tray Icon Configuration"
 msgstr "工作匣圖示設定"
 
-#: plugins/docklet/docklet.c:481
+#: plugins/docklet/docklet.c:416
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "隱藏新訊息直到工作匣圖示被點擊(_H)"
 
@@ -104,24 +102,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:505
+#: plugins/docklet/docklet.c:440
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:508
+#: plugins/docklet/docklet.c:443
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
 #. *  description
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:445
+#, fuzzy
 msgid ""
-"Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
-"display the current status of Gaim, allow fast access to commonly used "
-"functions, and to toggle display of the buddy list or login window. Also "
-"allows messages to be queued until the icon is clicked, similar to ICQ."
+"Interacts with a Notification Area applet (in GNOME, KDE or Windows for "
+"example) to display the current status of Gaim, allow fast access to "
+"commonly used functions, and to toggle display of the buddy list or login "
+"window. Also allows messages to be queued until the icon is clicked, similar "
+"to ICQ."
 msgstr ""
 "在工作匣上(例如 GNOME 或 KDE 等的工作匣)顯示 Gaim 目前的狀態,同時可以快速"
 "的操作 Gaim 所提供的功能(例如開關 Gaim 的登入視窗或好友清單),以及將訊息存"
@@ -134,14 +134,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:80
+#: plugins/autorecon.c:103
 msgid "Auto-Reconnect"
 msgstr "自動重新連線"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:83 plugins/autorecon.c:85
+#: plugins/autorecon.c:106 plugins/autorecon.c:108
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
 
@@ -291,7 +291,7 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
 
-#: plugins/idle.c:70 src/protocols/irc/irc.c:936
+#: plugins/idle.c:70 src/protocols/irc/irc.c:935
 msgid "Idle Time"
 msgstr "閒置時間"
 
@@ -455,35 +455,35 @@
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
-#: plugins/spellchk.c:403
+#: plugins/spellchk.c:394
 msgid "Text Replacements"
 msgstr "文字取代"
 
-#: plugins/spellchk.c:427
+#: plugins/spellchk.c:418
 msgid "You type"
 msgstr "當您輸入"
 
-#: plugins/spellchk.c:439
+#: plugins/spellchk.c:430
 msgid "You send"
 msgstr "將會送出"
 
-#: plugins/spellchk.c:465
+#: plugins/spellchk.c:456
 msgid "Add a new text replacement"
 msgstr "加入一個新的文字取代規則"
 
-#: plugins/spellchk.c:472
+#: plugins/spellchk.c:463
 msgid "You _type:"
 msgstr "當您輸入(_T):"
 
-#: plugins/spellchk.c:486
+#: plugins/spellchk.c:477
 msgid "You _send:"
 msgstr "將會送出(_S):"
 
-#: plugins/spellchk.c:526
+#: plugins/spellchk.c:517
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: plugins/spellchk.c:528 plugins/spellchk.c:529
+#: plugins/spellchk.c:519 plugins/spellchk.c:520
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -517,19 +517,19 @@
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
 
-#: plugins/gaim-remote/remote.c:85
+#: plugins/gaim-remote/remote.c:86
 msgid "Not connected to AIM"
 msgstr "沒有連到 AIM"
 
-#: plugins/gaim-remote/remote.c:94 plugins/gaim-remote/remote.c:133
+#: plugins/gaim-remote/remote.c:95 plugins/gaim-remote/remote.c:134
 msgid "No screenname given."
 msgstr "沒有給予帳號。"
 
-#: plugins/gaim-remote/remote.c:170
+#: plugins/gaim-remote/remote.c:171
 msgid "No roomname given."
 msgstr "沒有給予聊天室名稱。"
 
-#: plugins/gaim-remote/remote.c:189
+#: plugins/gaim-remote/remote.c:190
 msgid "Invalid AIM URI"
 msgstr "無效的 AIM URI"
 
@@ -540,19 +540,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:733
+#: plugins/gaim-remote/remote.c:735
 msgid "Remote Control"
 msgstr "遠端控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:736
+#: plugins/gaim-remote/remote.c:738
 msgid "Provides remote control for gaim applications."
 msgstr "提供對 Gaim 應用程式進行遠端控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:738
+#: plugins/gaim-remote/remote.c:740
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -715,13 +715,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1391
+#: plugins/perl/perl.c:1392
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1393 plugins/perl/perl.c:1394
+#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
@@ -745,11 +745,11 @@
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1180
+#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1184
 #: src/protocols/msn/msn.c:311 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1252
-#: src/protocols/yahoo/yahoo.c:1331
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1257
+#: src/protocols/yahoo/yahoo.c:1336
 msgid "Available"
 msgstr "上線"
 
@@ -761,11 +761,11 @@
 msgid "Away for friends only"
 msgstr "離開(只有好友可以看到我)"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3436
-#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2827
-#: src/protocols/oscar/oscar.c:4533 src/protocols/oscar/oscar.c:4560
-#: src/protocols/oscar/oscar.c:5843 src/protocols/yahoo/yahoo.c:1066
-#: src/protocols/yahoo/yahoo.c:1274 src/protocols/yahoo/yahoo.c:1341
+#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3440
+#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2829
+#: src/protocols/oscar/oscar.c:4536 src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:5846 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1346
 msgid "Invisible"
 msgstr "隱身"
 
@@ -884,11 +884,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/protocols/gg/gg.c:664 src/gtkrequest.c:166 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:168 src/request.h:804
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:664 src/gtkrequest.c:167 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:169 src/request.h:804
 msgid "No"
 msgstr "否"
 
@@ -919,7 +919,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
-#: src/dialogs.c:2027 src/dialogs.c:2676
+#: src/dialogs.c:2035 src/dialogs.c:2684
 msgid "City"
 msgstr "城市"
 
@@ -1018,9 +1018,9 @@
 msgid "Directory Search"
 msgstr "名錄搜尋"
 
-#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4315
-#: src/protocols/oscar/oscar.c:6107 src/protocols/toc/toc.c:1473
-#: src/dialogs.c:2138 src/dialogs.c:2147
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4322
+#: src/protocols/oscar/oscar.c:6110 src/protocols/toc/toc.c:1474
+#: src/dialogs.c:2146 src/dialogs.c:2155
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -1066,28 +1066,27 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 在連結 ICQ 伺服器時發生錯誤。"
 
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2671
-#: src/dialogs.c:2444 src/gtkconv.c:1112 src/gtkconv.c:2994 src/gtkconv.c:4159
-#: src/gtkrequest.c:173 src/prpl.c:312
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2673
+#: src/dialogs.c:2452 src/gtkconv.c:1113 src/gtkconv.c:2964 src/gtkconv.c:4124
+#: src/gtkrequest.c:175 src/prpl.c:312
 msgid "Add"
 msgstr "加入"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1117
-#: src/protocols/irc/irc.c:1446 src/protocols/msn/msn.c:171
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1104
+#: src/protocols/irc/irc.c:1433 src/protocols/msn/msn.c:171
 #: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
 #: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:217
-#: src/protocols/oscar/oscar.c:2402 src/protocols/oscar/oscar.c:2439
-#: src/protocols/oscar/oscar.c:2474 src/protocols/oscar/oscar.c:2519
-#: src/protocols/oscar/oscar.c:5716 src/protocols/oscar/oscar.c:5931
-#: src/protocols/oscar/oscar.c:5980 src/protocols/oscar/oscar.c:6040
-#: src/protocols/trepia/trepia.c:380 src/protocols/yahoo/yahoo.c:1183
-#: src/buddy_chat.c:375 src/dialogs.c:451 src/dialogs.c:463 src/dialogs.c:476
-#: src/dialogs.c:2084 src/dialogs.c:2199 src/dialogs.c:2265 src/dialogs.c:2433
-#: src/dialogs.c:2618 src/dialogs.c:2767 src/dialogs.c:3439 src/dialogs.c:3933
-#: src/dialogs.c:4875 src/gtkaccount.c:1512 src/gtkconn.c:144
-#: src/gtkconn.c:261 src/gtkrequest.c:169 src/multi.c:177 src/prpl.c:313
-#: src/request.h:813 src/request.h:823
+#: src/protocols/oscar/oscar.c:2404 src/protocols/oscar/oscar.c:2441
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2521
+#: src/protocols/oscar/oscar.c:5719 src/protocols/oscar/oscar.c:5934
+#: src/protocols/oscar/oscar.c:5983 src/protocols/oscar/oscar.c:6043
+#: src/protocols/trepia/trepia.c:380 src/protocols/yahoo/yahoo.c:1188
+#: src/buddy_chat.c:375 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
+#: src/dialogs.c:2092 src/dialogs.c:2207 src/dialogs.c:2273 src/dialogs.c:2441
+#: src/dialogs.c:2626 src/dialogs.c:2775 src/dialogs.c:3447 src/dialogs.c:3941
+#: src/dialogs.c:4883 src/gtkaccount.c:1488 src/gtkconn.c:146
+#: src/gtkrequest.c:171 src/prpl.c:313 src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "取消"
 
@@ -1096,16 +1095,16 @@
 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/jabber.c:1712
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1716
 #: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
-#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5094
+#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5097
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1713
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1717
 #: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
-#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5095
-#: src/dialogs.c:2432
+#: src/protocols/oscar/oscar.c:2603 src/protocols/oscar/oscar.c:5098
+#: src/dialogs.c:2440
 msgid "Deny"
 msgstr "拒絕"
 
@@ -1113,9 +1112,9 @@
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2331
-#: src/protocols/jabber/jabber.c:2365 src/protocols/jabber/jabber.c:4234
-#: src/protocols/jabber/jabber.c:4280 src/protocols/msn/dispatch.c:160
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2335
+#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4238
+#: src/protocols/jabber/jabber.c:4287 src/protocols/msn/dispatch.c:160
 #: src/protocols/msn/msn.c:425 src/protocols/msn/notification.c:1376
 #: src/protocols/napster/napster.c:496
 msgid "Unable to connect"
@@ -1125,7 +1124,7 @@
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3933
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
 msgid "Nick:"
 msgstr "暱稱:"
 
@@ -1139,12 +1138,12 @@
 "the Account Editor)"
 msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
 
-#: src/protocols/irc/irc.c:487 src/protocols/irc/irc.c:2620
+#: src/protocols/irc/irc.c:487 src/protocols/irc/irc.c:2607
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "和 %s 的 DCC 聊天已關閉"
 
-#: src/protocols/irc/irc.c:540 src/protocols/irc/irc.c:2629
+#: src/protocols/irc/irc.c:540 src/protocols/irc/irc.c:2616
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "和 %s 的 DCC 聊天已經被建立"
@@ -1154,7 +1153,7 @@
 msgstr "沒有設定主題"
 
 # NOTE 剛進入聊天室時會顯示這個;如果「changed」直譯「修改」會很奇怪
-#: src/protocols/irc/irc.c:696 src/protocols/irc/irc.c:1767
+#: src/protocols/irc/irc.c:696 src/protocols/irc/irc.c:1754
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 把聊天主題設定為:%s</B>"
@@ -1164,175 +1163,175 @@
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- 模式/%s [%c%c %s] 被 %s 設定"
 
-#: src/protocols/irc/irc.c:919 src/protocols/irc/irc.c:932
+#: src/protocols/irc/irc.c:918 src/protocols/irc/irc.c:931
 msgid "User"
 msgstr "使用者"
 
 #. Splits
-#: src/protocols/irc/irc.c:923 src/protocols/irc/irc.c:3043
-#: src/protocols/jabber/jabber.c:4411 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:922 src/protocols/irc/irc.c:3030
+#: src/protocols/jabber/jabber.c:4418 src/protocols/napster/napster.c:639
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:927 src/protocols/irc/irc.c:1094
-#: src/protocols/irc/irc.c:1659
+#: src/protocols/irc/irc.c:926 src/protocols/irc/irc.c:1081
+#: src/protocols/irc/irc.c:1646
 msgid "IRC Operator"
 msgstr "IRC 操作者"
 
-#: src/protocols/irc/irc.c:940
+#: src/protocols/irc/irc.c:939
 msgid "Channels"
 msgstr "頻道"
 
-#: src/protocols/irc/irc.c:946
+#: src/protocols/irc/irc.c:945
 #, c-format
 msgid "%s is an Identified User"
 msgstr "%s 是一個已驗證的使用者"
 
-#: src/protocols/irc/irc.c:973
+#: src/protocols/irc/irc.c:960
 #, c-format
 msgid "%ld seconds [signon: %s]"
 msgstr "%ld 秒 [登入:%s]"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1094
+#: src/protocols/irc/irc.c:1081
 msgid "Rehashing server"
 msgstr "重新設定伺服器中"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1097
+#: src/protocols/irc/irc.c:1084
 msgid "No such nick/channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
-#: src/protocols/irc/irc.c:1105 src/protocols/irc/irc.c:1109
-#: src/protocols/irc/irc.c:1475 src/protocols/irc/irc.c:1617
+#: src/protocols/irc/irc.c:1084 src/protocols/irc/irc.c:1087
+#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:1604
 msgid "IRC Error"
 msgstr "IRC 錯誤"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1087
 msgid "No such server"
 msgstr "沒有那部伺服器"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1105
+#: src/protocols/irc/irc.c:1092
 msgid "No nickname given"
 msgstr "沒有給予暱稱"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1108
+#: src/protocols/irc/irc.c:1095
 msgid "You're not an IRC operator!"
 msgstr "您不是一個 IRC 操作者!"
 
-#: src/protocols/irc/irc.c:1112
+#: src/protocols/irc/irc.c:1099
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "這個暱稱已經在使用中。請輸入一個新的暱稱"
 
 #. Build OK Button
-#: src/protocols/irc/irc.c:1116 src/protocols/msn/msn.c:170
+#: src/protocols/irc/irc.c:1103 src/protocols/msn/msn.c:170
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2438
-#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:5930
-#: src/protocols/oscar/oscar.c:5979 src/protocols/oscar/oscar.c:6039
-#: src/protocols/yahoo/yahoo.c:1182 src/dialogs.c:2195 src/dialogs.c:2333
-#: src/dialogs.c:2617 src/dialogs.c:2763 src/dialogs.c:3926 src/gtkconn.c:260
-#: src/gtkrequest.c:168 src/request.h:813
+#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2440
+#: src/protocols/oscar/oscar.c:2520 src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:5982 src/protocols/oscar/oscar.c:6042
+#: src/protocols/yahoo/yahoo.c:1187 src/dialogs.c:2203 src/dialogs.c:2341
+#: src/dialogs.c:2625 src/dialogs.c:2771 src/dialogs.c:3934
+#: src/gtkrequest.c:170 src/request.h:813
 msgid "OK"
 msgstr "確定"
 
-#: src/protocols/irc/irc.c:1402 src/protocols/irc/irc.c:1408
-#: src/protocols/irc/irc.c:1414 src/protocols/irc/irc.c:1428
+#: src/protocols/irc/irc.c:1389 src/protocols/irc/irc.c:1395
+#: src/protocols/irc/irc.c:1401 src/protocols/irc/irc.c:1415
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 資訊"
 
-#: src/protocols/irc/irc.c:1438
+#: src/protocols/irc/irc.c:1425
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s 想要建立一個 DCC 聊天"
 
-#: src/protocols/irc/irc.c:1441
+#: src/protocols/irc/irc.c:1428
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
 msgstr ""
 "這個要求將會建立起兩部電腦間的連線,而訊息將不會透過 IRC 伺服器來進行傳送"
 
-#: src/protocols/irc/irc.c:1445 src/protocols/oscar/oscar.c:2401
-#: src/protocols/oscar/oscar.c:5715
+#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:5718
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/irc/irc.c:1472
+#: src/protocols/irc/irc.c:1459
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "收到一個來自於 %s 無效的檔案送出需求。"
 
-#: src/protocols/irc/irc.c:1553 src/protocols/msn/error.c:133
+#: src/protocols/irc/irc.c:1540 src/protocols/msn/error.c:133
 #: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: src/protocols/irc/irc.c:1615
+#: src/protocols/irc/irc.c:1602
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "您被踢出 %s: %s"
 
-#: src/protocols/irc/irc.c:1620
+#: src/protocols/irc/irc.c:1607
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 踢出:%s"
 
-#: src/protocols/irc/irc.c:1676 src/protocols/irc/irc.c:2930
+#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2917
 msgid "CTCP ClientInfo"
 msgstr "CTCP 客戶端資訊"
 
-#: src/protocols/irc/irc.c:1682 src/protocols/irc/irc.c:2936
+#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2923
 msgid "CTCP UserInfo"
 msgstr "CTCP 使用者資訊"
 
-#: src/protocols/irc/irc.c:1688 src/protocols/irc/irc.c:2942
+#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2929
 msgid "CTCP Version"
 msgstr "CTCP 版本"
 
-#: src/protocols/irc/irc.c:1716 src/protocols/irc/irc.c:2948
+#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2935
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1961 src/protocols/oscar/oscar.c:676
-#: src/protocols/toc/toc.c:233
+#: src/protocols/irc/irc.c:1948 src/protocols/oscar/oscar.c:678
+#: src/protocols/toc/toc.c:234
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:1975 src/protocols/trepia/trepia.c:1148
+#: src/protocols/irc/irc.c:1962 src/protocols/trepia/trepia.c:1148
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:2216
+#: src/protocols/irc/irc.c:2203
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s 的主題為 %s"
 
-#: src/protocols/irc/irc.c:2312
+#: src/protocols/irc/irc.c:2299
 #, c-format
 msgid "You have left %s"
 msgstr "您離開了 %s"
 
-#: src/protocols/irc/irc.c:2313
+#: src/protocols/irc/irc.c:2300
 msgid "IRC Part"
 msgstr "IRC 離開"
 
-#: src/protocols/irc/irc.c:2368
+#: src/protocols/irc/irc.c:2355
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>要求 DCC 聊天中</I>"
 
-#: src/protocols/irc/irc.c:2385
+#: src/protocols/irc/irc.c:2372
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>IRC 操作者指令:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2390
+#: src/protocols/irc/irc.c:2377
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1340,11 +1339,11 @@
 "<B>CTCP 指令:<BR>CLIENTINFO <暱稱><BR>USERINFO <暱稱><BR>VERSION <暱稱"
 "><BR>PING <暱稱></B><BR>"
 
-#: src/protocols/irc/irc.c:2398
+#: src/protocols/irc/irc.c:2385
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>DCC 指令:<BR>CHAT <暱稱></B>"
 
-#: src/protocols/irc/irc.c:2403
+#: src/protocols/irc/irc.c:2390
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -1356,19 +1355,19 @@
 "入 /HELP OPER 顯示操作者指令<BR>輸入 /HELP CTCP 顯示 CTCP 指令<BR>輸入 /HELP "
 "DCC 顯示 DCC 指令"
 
-#: src/protocols/irc/irc.c:2426
+#: src/protocols/irc/irc.c:2413
 msgid "<B>Unknown command</B>"
 msgstr "<B>未知的指令</B>"
 
-#: src/protocols/irc/irc.c:2486
+#: src/protocols/irc/irc.c:2473
 msgid "Channel:"
 msgstr "頻道:"
 
-#: src/protocols/irc/irc.c:2491 src/gtkaccount.c:450 src/main.c:402
+#: src/protocols/irc/irc.c:2478 src/gtkaccount.c:426 src/main.c:399
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/protocols/irc/irc.c:2917
+#: src/protocols/irc/irc.c:2904
 msgid "DCC Chat"
 msgstr "DCC 聊天"
 
@@ -1382,341 +1381,22 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3023 src/protocols/irc/irc.c:3025
+#: src/protocols/irc/irc.c:3010 src/protocols/irc/irc.c:3012
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. Account Options
-#: src/protocols/irc/irc.c:3047 src/protocols/jabber/jabber.c:4418
+#: src/protocols/irc/irc.c:3034 src/protocols/jabber/jabber.c:4425
 #: src/protocols/msn/msn.c:1223 src/protocols/napster/napster.c:644
 #: src/protocols/trepia/trepia.c:1377 src/gtkprefs.c:1142
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:3051
+#: src/protocols/irc/irc.c:3038
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/jabber/jabber.c:977
-msgid "Unable to change password."
-msgstr "無法更改密碼。"
-
-#: src/protocols/jabber/jabber.c:978
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr "您所輸入的舊密碼是錯的。您的密碼沒有更改。"
-
-#: src/protocols/jabber/jabber.c:984
-msgid "Unable to change password"
-msgstr "無法更改密碼"
-
-#: src/protocols/jabber/jabber.c:985
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
-
-#: src/protocols/jabber/jabber.c:1165 src/blist.c:795 src/gtkaccount.c:148
-#: src/gtkpounce.c:307
-msgid "Unknown"
-msgstr "未知"
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1174 src/protocols/jabber/jabber.c:3432
-#: src/protocols/jabber/jabber.c:3483
-msgid "Chatty"
-msgstr "想聊天"
-
-#: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3434
-#: src/protocols/jabber/jabber.c:3491
-msgid "Extended Away"
-msgstr "長時間離開"
-
-#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3435
-#: src/protocols/jabber/jabber.c:3495 src/protocols/oscar/oscar.c:2817
-#: src/protocols/oscar/oscar.c:4548 src/protocols/oscar/oscar.c:5839
-msgid "Do Not Disturb"
-msgstr "請勿打擾"
-
-#: src/protocols/jabber/jabber.c:1417
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Jabber 錯誤 %s"
-
-#: src/protocols/jabber/jabber.c:1524
-#, c-format
-msgid "Error %s: %s"
-msgstr "錯誤 %s:%s"
-
-# XXX check with Paladin
-#: src/protocols/jabber/jabber.c:1527
-msgid "Unknown Error in presence"
-msgstr "未知的出現錯誤。"
-
-#: src/protocols/jabber/jabber.c:1705
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "使用者 %s 想要將您加入他(她)的好友清單中。"
-
-#: src/protocols/jabber/jabber.c:1733
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr "Jabber 使用者 %s 並不存在,所以將不會加入到您的名單中。"
-
-#: src/protocols/jabber/jabber.c:1736
-msgid "No such user."
-msgstr "沒有這個使用者。"
-
-#. Should never happen.
-#: src/protocols/jabber/jabber.c:1827 src/protocols/msn/notification.c:87
-#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
-#: src/blist.c:503 src/dialogs.c:847
-msgid "Buddies"
-msgstr "好友"
-
-#: src/protocols/jabber/jabber.c:1900
-msgid "Authenticating"
-msgstr "認證中"
-
-#: src/protocols/jabber/jabber.c:1934
-msgid "Unknown login error"
-msgstr "未知的登入錯誤"
-
-#: src/protocols/jabber/jabber.c:2284
-msgid "Password successfully changed."
-msgstr "密碼修改成功。"
-
-#: src/protocols/jabber/jabber.c:2329 src/protocols/jabber/jabber.c:4232
-msgid "Connection lost"
-msgstr "失去連線"
-
-#: src/protocols/jabber/jabber.c:2336
-msgid "Connected"
-msgstr "連線成功"
-
-#: src/protocols/jabber/jabber.c:2339
-msgid "Requesting Authentication Method"
-msgstr "要求認證的方式中"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2359 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:416 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:981
-msgid "Connecting"
-msgstr "連線中"
-
-#: src/protocols/jabber/jabber.c:2685
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "使用者 %s 是一個無效的 Jabber 帳號,所以不會被加入到名單中。"
-
-#: src/protocols/jabber/jabber.c:2687
-msgid "Unable to add buddy."
-msgstr "無法加入好友。"
-
-#: src/protocols/jabber/jabber.c:2688
-msgid "Jabber Error"
-msgstr "Jabber 錯誤"
-
-#: src/protocols/jabber/jabber.c:2947
-msgid "Room:"
-msgstr "聊天室:"
-
-#: src/protocols/jabber/jabber.c:2952
-msgid "Server:"
-msgstr "伺服器:"
-
-#: src/protocols/jabber/jabber.c:2958
-msgid "Handle:"
-msgstr "暱稱:"
-
-#: src/protocols/jabber/jabber.c:2988
-msgid "Unable to join chat"
-msgstr "無法加入聊天室"
-
-#: src/protocols/jabber/jabber.c:3224 src/protocols/jabber/jabber.c:3275
-#: src/protocols/jabber/jabber.c:3700
-msgid "Jabber ID"
-msgstr "Jabber 帳號"
-
-#: src/protocols/jabber/jabber.c:3225
-msgid "Error"
-msgstr "錯誤"
-
-#: src/protocols/jabber/jabber.c:3276 src/protocols/jabber/jabber.c:3335
-#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3726
-msgid "Status"
-msgstr "狀態"
-
-#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3368
-#: src/protocols/oscar/oscar.c:5452
-msgid "Not Authorized"
-msgstr "未認證"
-
-#: src/protocols/jabber/jabber.c:3381
-msgid "View Error Msg"
-msgstr "觀看錯誤訊息"
-
-#: src/protocols/jabber/jabber.c:3393 src/gtkconv.c:1099
-msgid "Get Away Msg"
-msgstr "取得離線訊息"
-
-#: src/protocols/jabber/jabber.c:3400
-msgid "Un-hide From"
-msgstr "現身給"
-
-#: src/protocols/jabber/jabber.c:3403
-msgid "Temporarily Hide From"
-msgstr "暫時隱身於"
-
-#: src/protocols/jabber/jabber.c:3410
-msgid "Cancel Presence Notification"
-msgstr "取消出現通知"
-
-#: src/protocols/jabber/jabber.c:3418
-msgid "Re-request authorization"
-msgstr "重新要求認證"
-
-#. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3431 src/protocols/jabber/jabber.c:3481
-#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4543
-#: src/protocols/oscar/oscar.c:5837 src/protocols/yahoo/yahoo.c:1070
-#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
-#: src/gtkaccount.c:1612
-msgid "Online"
-msgstr "上線"
-
-#: src/protocols/jabber/jabber.c:3621
-msgid "Full Name"
-msgstr "全名"
-
-#: src/protocols/jabber/jabber.c:3622
-msgid "Family Name"
-msgstr "姓"
-
-#: src/protocols/jabber/jabber.c:3623
-msgid "Given Name"
-msgstr "名"
-
-#: src/protocols/jabber/jabber.c:3624
-msgid "Nickname"
-msgstr "暱稱"
-
-#: src/protocols/jabber/jabber.c:3625 src/dialogs.c:2888
-msgid "URL"
-msgstr "URL"
-
-#: src/protocols/jabber/jabber.c:3626
-msgid "Street Address"
-msgstr "街道地址"
-
-#: src/protocols/jabber/jabber.c:3627
-msgid "Extended Address"
-msgstr "地址(續)"
-
-#: src/protocols/jabber/jabber.c:3628
-msgid "Locality"
-msgstr "市╱村"
-
-#: src/protocols/jabber/jabber.c:3629
-msgid "Region"
-msgstr "省╱州"
-
-#: src/protocols/jabber/jabber.c:3630
-msgid "Postal Code"
-msgstr "郵遞區號"
-
-#. Country
-#: src/protocols/jabber/jabber.c:3631 src/protocols/trepia/trepia.c:372
-#: src/dialogs.c:2049 src/dialogs.c:2694
-msgid "Country"
-msgstr "國家"
-
-#: src/protocols/jabber/jabber.c:3632
-msgid "Telephone"
-msgstr "電話"
-
-#: src/protocols/jabber/jabber.c:3633 src/dialogs.c:2752
-msgid "Email"
-msgstr "電子郵件"
-
-#: src/protocols/jabber/jabber.c:3634
-msgid "Organization Name"
-msgstr "所屬機構"
-
-#: src/protocols/jabber/jabber.c:3635
-msgid "Organization Unit"
-msgstr "所屬部門"
-
-#: src/protocols/jabber/jabber.c:3636
-msgid "Title"
-msgstr "職銜"
-
-#: src/protocols/jabber/jabber.c:3637
-msgid "Role"
-msgstr "職責"
-
-#: src/protocols/jabber/jabber.c:3638
-msgid "Birthday"
-msgstr "生日"
-
-#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2898 src/gtkprefs.c:601
-#: src/gtkprefs.c:1821
-msgid "Description"
-msgstr "描述"
-
-#: src/protocols/jabber/jabber.c:3664
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable"
-msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
-
-#: src/protocols/jabber/jabber.c:3665
-msgid "User Identity"
-msgstr "使用者識別"
-
-#: src/protocols/jabber/jabber.c:4094
-msgid "Gaim - Edit Jabber vCard"
-msgstr "Gaim - 編輯 Jabber vCard"
-
-#: src/protocols/jabber/jabber.c:4169
-msgid "Server Registration successful!"
-msgstr "伺服器註冊成功!"
-
-#: src/protocols/jabber/jabber.c:4190
-msgid "Unknown registration error"
-msgstr "未知的註冊錯誤"
-
-#: src/protocols/jabber/jabber.c:4301 src/protocols/oscar/oscar.c:6093
-#: src/protocols/toc/toc.c:1461 src/dialogs.c:2224
-msgid "Set User Info"
-msgstr "設定使用者資訊"
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#: src/protocols/jabber/jabber.c:4390 src/protocols/jabber/jabber.c:4392
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 協定模組"
-
-# XXX
-#: src/protocols/jabber/jabber.c:4414
-msgid "Resource"
-msgstr "資源"
-
-#: src/protocols/jabber/jabber.c:4422
-msgid "Connect server"
-msgstr "連結伺服器"
-
+#: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:580
 #: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
 #: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
 #: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
@@ -1741,6 +1421,326 @@
 msgid "Write error"
 msgstr "寫入錯誤"
 
+#: src/protocols/jabber/jabber.c:981
+msgid "Unable to change password."
+msgstr "無法更改密碼。"
+
+#: src/protocols/jabber/jabber.c:982
+msgid ""
+"The current password you entered is incorrect.  Your password has not been "
+"changed."
+msgstr "您所輸入的舊密碼是錯的。您的密碼沒有更改。"
+
+#: src/protocols/jabber/jabber.c:988
+msgid "Unable to change password"
+msgstr "無法更改密碼"
+
+#: src/protocols/jabber/jabber.c:989
+msgid ""
+"The new password you entered is the same as your current password.  Your "
+"password remains the same."
+msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
+
+#: src/protocols/jabber/jabber.c:1169 src/blist.c:794 src/gtkaccount.c:148
+#: src/gtkpounce.c:307
+msgid "Unknown"
+msgstr "未知"
+
+#. once again, we don't have to put anything here
+#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3436
+#: src/protocols/jabber/jabber.c:3487
+msgid "Chatty"
+msgstr "想聊天"
+
+#: src/protocols/jabber/jabber.c:1180 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3495
+msgid "Extended Away"
+msgstr "長時間離開"
+
+#: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3439
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:4551 src/protocols/oscar/oscar.c:5842
+msgid "Do Not Disturb"
+msgstr "請勿打擾"
+
+#: src/protocols/jabber/jabber.c:1421
+#, c-format
+msgid "Jabber Error %s"
+msgstr "Jabber 錯誤 %s"
+
+#: src/protocols/jabber/jabber.c:1528
+#, c-format
+msgid "Error %s: %s"
+msgstr "錯誤 %s:%s"
+
+# XXX check with Paladin
+#: src/protocols/jabber/jabber.c:1531
+msgid "Unknown Error in presence"
+msgstr "未知的出現錯誤。"
+
+#: src/protocols/jabber/jabber.c:1709
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "使用者 %s 想要將您加入他(她)的好友清單中。"
+
+#: src/protocols/jabber/jabber.c:1737
+#, c-format
+msgid ""
+"The Jabber user %s does not exist and was therefore not added to your roster."
+msgstr "Jabber 使用者 %s 並不存在,所以將不會加入到您的名單中。"
+
+#: src/protocols/jabber/jabber.c:1740
+msgid "No such user."
+msgstr "沒有這個使用者。"
+
+#. Should never happen.
+#: src/protocols/jabber/jabber.c:1831 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:502 src/dialogs.c:855
+msgid "Buddies"
+msgstr "好友"
+
+#: src/protocols/jabber/jabber.c:1904
+msgid "Authenticating"
+msgstr "認證中"
+
+#: src/protocols/jabber/jabber.c:1938
+msgid "Unknown login error"
+msgstr "未知的登入錯誤"
+
+#: src/protocols/jabber/jabber.c:2288
+msgid "Password successfully changed."
+msgstr "密碼修改成功。"
+
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
+msgid "Connection lost"
+msgstr "失去連線"
+
+#: src/protocols/jabber/jabber.c:2340
+msgid "Connected"
+msgstr "連線成功"
+
+#: src/protocols/jabber/jabber.c:2343
+msgid "Requesting Authentication Method"
+msgstr "要求認證的方式中"
+
+#. we have no chats yet
+#: src/protocols/jabber/jabber.c:2363 src/protocols/msn/dispatch.c:164
+#: src/protocols/msn/msn.c:416 src/protocols/napster/napster.c:489
+#: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:986
+msgid "Connecting"
+msgstr "連線中"
+
+#: src/protocols/jabber/jabber.c:2689
+#, c-format
+msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+msgstr "使用者 %s 是一個無效的 Jabber 帳號,所以不會被加入到名單中。"
+
+#: src/protocols/jabber/jabber.c:2691
+msgid "Unable to add buddy."
+msgstr "無法加入好友。"
+
+#: src/protocols/jabber/jabber.c:2692
+msgid "Jabber Error"
+msgstr "Jabber 錯誤"
+
+#: src/protocols/jabber/jabber.c:2951
+msgid "Room:"
+msgstr "聊天室:"
+
+#: src/protocols/jabber/jabber.c:2956
+msgid "Server:"
+msgstr "伺服器:"
+
+#: src/protocols/jabber/jabber.c:2962
+msgid "Handle:"
+msgstr "暱稱:"
+
+#: src/protocols/jabber/jabber.c:2992
+msgid "Unable to join chat"
+msgstr "無法加入聊天室"
+
+#: src/protocols/jabber/jabber.c:3228 src/protocols/jabber/jabber.c:3279
+#: src/protocols/jabber/jabber.c:3704
+msgid "Jabber ID"
+msgstr "Jabber 帳號"
+
+#: src/protocols/jabber/jabber.c:3229
+msgid "Error"
+msgstr "錯誤"
+
+#: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
+msgid "Status"
+msgstr "狀態"
+
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3372
+#: src/protocols/oscar/oscar.c:5455
+msgid "Not Authorized"
+msgstr "未認證"
+
+#: src/protocols/jabber/jabber.c:3385
+msgid "View Error Msg"
+msgstr "觀看錯誤訊息"
+
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1100
+msgid "Get Away Msg"
+msgstr "取得離線訊息"
+
+#: src/protocols/jabber/jabber.c:3404
+msgid "Un-hide From"
+msgstr "現身給"
+
+#: src/protocols/jabber/jabber.c:3407
+msgid "Temporarily Hide From"
+msgstr "暫時隱身於"
+
+#: src/protocols/jabber/jabber.c:3414
+msgid "Cancel Presence Notification"
+msgstr "取消出現通知"
+
+#: src/protocols/jabber/jabber.c:3422
+msgid "Re-request authorization"
+msgstr "重新要求認證"
+
+#. state is one of our own strings. it won't be NULL.
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3485
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4546
+#: src/protocols/oscar/oscar.c:5840 src/protocols/yahoo/yahoo.c:1075
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1588
+msgid "Online"
+msgstr "上線"
+
+#: src/protocols/jabber/jabber.c:3625
+msgid "Full Name"
+msgstr "全名"
+
+#: src/protocols/jabber/jabber.c:3626
+msgid "Family Name"
+msgstr "姓"
+
+#: src/protocols/jabber/jabber.c:3627
+msgid "Given Name"
+msgstr "名"
+
+#: src/protocols/jabber/jabber.c:3628
+msgid "Nickname"
+msgstr "暱稱"
+
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2896
+msgid "URL"
+msgstr "URL"
+
+#: src/protocols/jabber/jabber.c:3630
+msgid "Street Address"
+msgstr "街道地址"
+
+#: src/protocols/jabber/jabber.c:3631
+msgid "Extended Address"
+msgstr "地址(續)"
+
+#: src/protocols/jabber/jabber.c:3632
+msgid "Locality"
+msgstr "市╱村"
+
+#: src/protocols/jabber/jabber.c:3633
+msgid "Region"
+msgstr "省╱州"
+
+#: src/protocols/jabber/jabber.c:3634
+msgid "Postal Code"
+msgstr "郵遞區號"
+
+#. Country
+#: src/protocols/jabber/jabber.c:3635 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:2057 src/dialogs.c:2702
+msgid "Country"
+msgstr "國家"
+
+#: src/protocols/jabber/jabber.c:3636
+msgid "Telephone"
+msgstr "電話"
+
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2760
+msgid "Email"
+msgstr "電子郵件"
+
+#: src/protocols/jabber/jabber.c:3638
+msgid "Organization Name"
+msgstr "所屬機構"
+
+#: src/protocols/jabber/jabber.c:3639
+msgid "Organization Unit"
+msgstr "所屬部門"
+
+#: src/protocols/jabber/jabber.c:3640
+msgid "Title"
+msgstr "職銜"
+
+#: src/protocols/jabber/jabber.c:3641
+msgid "Role"
+msgstr "職責"
+
+#: src/protocols/jabber/jabber.c:3642
+msgid "Birthday"
+msgstr "生日"
+
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2906 src/gtkprefs.c:601
+#: src/gtkprefs.c:1821
+msgid "Description"
+msgstr "描述"
+
+#: src/protocols/jabber/jabber.c:3668
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable"
+msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
+
+#: src/protocols/jabber/jabber.c:3669
+msgid "User Identity"
+msgstr "使用者識別"
+
+#: src/protocols/jabber/jabber.c:4098
+msgid "Gaim - Edit Jabber vCard"
+msgstr "Gaim - 編輯 Jabber vCard"
+
+#: src/protocols/jabber/jabber.c:4173
+msgid "Server Registration successful!"
+msgstr "伺服器註冊成功!"
+
+#: src/protocols/jabber/jabber.c:4194
+msgid "Unknown registration error"
+msgstr "未知的註冊錯誤"
+
+#: src/protocols/jabber/jabber.c:4308 src/protocols/oscar/oscar.c:6096
+#: src/protocols/toc/toc.c:1462 src/dialogs.c:2232
+msgid "Set User Info"
+msgstr "設定使用者資訊"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 協定模組"
+
+# XXX
+#: src/protocols/jabber/jabber.c:4421
+msgid "Resource"
+msgstr "資源"
+
+#: src/protocols/jabber/jabber.c:4429
+msgid "Connect server"
+msgstr "連結伺服器"
+
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:229
 msgid "Protocol not supported"
 msgstr "不支援這個通訊協定"
@@ -1857,7 +1857,7 @@
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:176
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
 msgid "Not logged in"
 msgstr "尚未登入"
 
@@ -2009,12 +2009,12 @@
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:236 src/about.c:151 src/dialogs.c:4223
-#: src/gtkrequest.c:171 src/server.c:1463
+#: src/protocols/msn/msn.c:236 src/about.c:151 src/dialogs.c:4231
+#: src/gtkrequest.c:173 src/server.c:1458
 msgid "Close"
 msgstr "關閉"
 
-#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1121
+#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態:</b>%s"
@@ -2025,26 +2025,26 @@
 msgstr "不在電腦前"
 
 #: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:560
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1048
-#: src/protocols/yahoo/yahoo.c:1256 src/protocols/yahoo/yahoo.c:1332
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1053
+#: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1337
 msgid "Be Right Back"
 msgstr "馬上回來"
 
 #: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:562
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1050
-#: src/protocols/yahoo/yahoo.c:1258 src/protocols/yahoo/yahoo.c:1333
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1055
+#: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1338
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:564
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1058
-#: src/protocols/yahoo/yahoo.c:1266 src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1063
+#: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1342
 msgid "On The Phone"
 msgstr "電話中"
 
 #: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:566
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1062
-#: src/protocols/yahoo/yahoo.c:1270 src/protocols/yahoo/yahoo.c:1339
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1067
+#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1344
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
@@ -2182,7 +2182,7 @@
 "\n"
 "當維護工作結束,您將可以再度登入伺服器。"
 
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1068
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1073
 #: src/gtkpounce.c:464 src/gtkprefs.c:1513
 msgid "Idle"
 msgstr "閒置"
@@ -2241,8 +2241,8 @@
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5165
-#: src/protocols/toc/toc.c:1200
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
+#: src/protocols/toc/toc.c:1201
 msgid "Join what group:"
 msgstr "加入哪個群組:"
 
@@ -2261,180 +2261,180 @@
 msgstr "NAPSTER 協定模組"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:172
+#: src/protocols/oscar/oscar.c:174
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:173
-msgid "Invalid SNAC"
-msgstr "無效的 SNAC"
-
-#: src/protocols/oscar/oscar.c:174
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
 #: src/protocols/oscar/oscar.c:175
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+#: src/protocols/oscar/oscar.c:176
+msgid "Rate to host"
+msgstr "到伺服器速率"
+
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to client"
 msgstr "到客戶端速率"
 
-#: src/protocols/oscar/oscar.c:177
+#: src/protocols/oscar/oscar.c:179
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:180
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:181
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:182
 msgid "Not supported by host"
 msgstr "伺服器不支援"
 
-#: src/protocols/oscar/oscar.c:181
-msgid "Not supported by client"
-msgstr "客戶端不支援"
-
-#: src/protocols/oscar/oscar.c:182
-msgid "Refused by client"
-msgstr "被客戶端拒絕"
-
 #: src/protocols/oscar/oscar.c:183
+msgid "Not supported by client"
+msgstr "客戶端不支援"
+
+#: src/protocols/oscar/oscar.c:184
+msgid "Refused by client"
+msgstr "被客戶端拒絕"
+
+#: src/protocols/oscar/oscar.c:185
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:186
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:187
 msgid "Request denied"
 msgstr "要求被拒"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:188
 #, fuzzy
 msgid "Busted SNAC payload"
 msgstr "損壞了的 SNAC 負載"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:189
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:190
 msgid "In local permit/deny"
 msgstr "本地端的允許╱拒絕清單"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:191
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:193
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:194
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:195
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:196
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:197
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:198
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:528 src/protocols/toc/toc.c:607
-#: src/protocols/toc/toc.c:622 src/protocols/toc/toc.c:685
+#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:623 src/protocols/toc/toc.c:686
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: src/protocols/oscar/oscar.c:540 src/protocols/toc/toc.c:861
+#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:862
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
 # XXX TODO 照字面看新譯法比較有可能,但Paladin兄的原譯法亦非沒可能的,最好能查證一下
 # ANS 這段譯文可能比較正確,我試過使用 ICQ 加入聊天室,會出現這段訊息。
-#: src/protocols/oscar/oscar.c:556
+#: src/protocols/oscar/oscar.c:558
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:630 src/protocols/oscar/oscar.c:687
+#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:672
+#: src/protocols/oscar/oscar.c:674
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:781 src/protocols/oscar/oscar.c:1167
+#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:788
+#: src/protocols/oscar/oscar.c:790
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:855 src/protocols/oscar/oscar.c:868
-#: src/protocols/oscar/oscar.c:873
+#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
+#: src/protocols/oscar/oscar.c:875
 msgid "File Transfer Aborted"
 msgstr "取消檔案傳輸"
 
-#: src/protocols/oscar/oscar.c:856
+#: src/protocols/oscar/oscar.c:858
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:869
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1056 src/protocols/toc/toc.c:554
+#: src/protocols/oscar/oscar.c:1058 src/protocols/toc/toc.c:555
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1060
+#: src/protocols/oscar/oscar.c:1062
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1064
+#: src/protocols/oscar/oscar.c:1066
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時訊息服務暫時不存在。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1068
+#: src/protocols/oscar/oscar.c:1070
 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."
@@ -2443,21 +2443,21 @@
 "線,那麼您的等待時間將會更加的延長。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1072
+#: src/protocols/oscar/oscar.c:1074
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:1076 src/protocols/toc/toc.c:639
+#: src/protocols/oscar/oscar.c:1078 src/protocols/toc/toc.c:640
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
-#: src/protocols/oscar/oscar.c:1104
+#: src/protocols/oscar/oscar.c:1106
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1206 src/protocols/oscar/oscar.c:1236
-#: src/protocols/oscar/oscar.c:1324
+#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
+#: src/protocols/oscar/oscar.c:1326
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2466,29 +2466,29 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
+#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1329
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入授權碼。"
 
-#: src/protocols/oscar/oscar.c:1896 src/protocols/oscar/oscar.c:5553
+#: src/protocols/oscar/oscar.c:1898 src/protocols/oscar/oscar.c:5556
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:2225 src/protocols/oscar/oscar.c:2247
+#: src/protocols/oscar/oscar.c:2227 src/protocols/oscar/oscar.c:2249
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:2393
+#: src/protocols/oscar/oscar.c:2395
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:2398
 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 "
@@ -2497,42 +2497,42 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2428
+#: src/protocols/oscar/oscar.c:2430
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:2436
+#: src/protocols/oscar/oscar.c:2438
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:2437
+#: src/protocols/oscar/oscar.c:2439
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:2465
+#: src/protocols/oscar/oscar.c:2467
 #, 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:2470 src/protocols/oscar/oscar.c:2472
+#: src/protocols/oscar/oscar.c:2472 src/protocols/oscar/oscar.c:2474
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2508 src/protocols/oscar/oscar.c:2510
-#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:2609 src/protocols/oscar/oscar.c:2984
-#: src/protocols/oscar/oscar.c:3036 src/protocols/oscar/oscar.c:5086
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
+#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5135
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2516
+#: src/protocols/oscar/oscar.c:2518
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:2591
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2541,11 +2541,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2597 src/protocols/oscar/oscar.c:5092
+#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2555,17 +2555,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2612
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2617
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:2625
+#: src/protocols/oscar/oscar.c:2627
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2578,7 +2578,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2633
+#: src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2591,7 +2591,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2641
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2605,34 +2605,34 @@
 "%s"
 
 # XXX 應該把 contact 也統一譯為「好友」嗎?
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2664
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個聯絡人:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2668
+#: src/protocols/oscar/oscar.c:2670
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:2672
+#: src/protocols/oscar/oscar.c:2674
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:2754
+#: src/protocols/oscar/oscar.c:2756
 #, 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:2763
+#: src/protocols/oscar/oscar.c:2765
 #, 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:2772
+#: src/protocols/oscar/oscar.c:2774
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2640,172 +2640,172 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/oscar/oscar.c:2781
+#: src/protocols/oscar/oscar.c:2783
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他 / 她太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2790
+#: src/protocols/oscar/oscar.c:2792
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2799
+#: src/protocols/oscar/oscar.c:2801
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
 
-#: src/protocols/oscar/oscar.c:2815 src/protocols/oscar/oscar.c:4557
-#: src/protocols/oscar/oscar.c:5842
+#: src/protocols/oscar/oscar.c:2817 src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:5845
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:2819 src/protocols/oscar/oscar.c:4551
-#: src/protocols/oscar/oscar.c:5840
+#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:5843
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
-#: src/protocols/oscar/oscar.c:5841
+#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4557
+#: src/protocols/oscar/oscar.c:5844
 msgid "Occupied"
 msgstr "忙碌"
 
 # TODO 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2825
+#: src/protocols/oscar/oscar.c:2827
 #, fuzzy
 msgid "Web Aware"
 msgstr "容許他人在網上查看您的狀態"
 
-#: src/protocols/oscar/oscar.c:2885
+#: src/protocols/oscar/oscar.c:2887
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2887
+#: src/protocols/oscar/oscar.c:2889
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2946
+#: src/protocols/oscar/oscar.c:2948
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:2947
+#: src/protocols/oscar/oscar.c:2949
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2982
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
-#: src/protocols/oscar/oscar.c:3034
+#: src/protocols/oscar/oscar.c:3036
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "使用者 %s 的個人資訊並不存在:"
 
-#: src/protocols/oscar/oscar.c:3068 src/gtkaccount.c:305
+#: src/protocols/oscar/oscar.c:3070 src/gtkaccount.c:281
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/protocols/oscar/oscar.c:3071
+#: src/protocols/oscar/oscar.c:3073
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:3074 src/protocols/oscar/oscar.c:5871
+#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5874
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:3077 src/gtkblist.c:1581
+#: src/protocols/oscar/oscar.c:3079 src/gtkblist.c:1581
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3080 src/protocols/oscar/oscar.c:5887
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5890
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:5879
+#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5882
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/protocols/oscar/oscar.c:3087
+#: src/protocols/oscar/oscar.c:3089
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3092
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:3093
+#: src/protocols/oscar/oscar.c:3095
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3098
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy 錯誤"
 
 # XXX 很多PO都沒有譯AP一詞,有翻的都是看不明的語文,不知有沒有譯錯
 # ANS 我記得在 ICQ 中,有分三種使用者,「AP User」為其中一種。
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3101
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3104
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3107
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3110
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3113
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3116
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3119
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3157
+#: src/protocols/oscar/oscar.c:3159
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<I>因為使用了未知的編碼,所以無法顯示訊息。</i>"
 
-#: src/protocols/oscar/oscar.c:3164
+#: src/protocols/oscar/oscar.c:3166
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上線時間:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3169
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成為成員的時間:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3175
+#: src/protocols/oscar/oscar.c:3177
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "閒置:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3178
+#: src/protocols/oscar/oscar.c:3180
 msgid "Idle: <b>Active</b>"
 msgstr "閒置:<b>沒閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3182
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2818,27 +2818,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:3212
+#: src/protocols/oscar/oscar.c:3214
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:3223
+#: src/protocols/oscar/oscar.c:3225
 msgid "Client Capabilities: "
 msgstr "客戶端相容性:"
 
-#: src/protocols/oscar/oscar.c:3229
+#: src/protocols/oscar/oscar.c:3231
 msgid "<i>No Information Provided</i>"
 msgstr "<i>未提供任何信息</i>"
 
-#: src/protocols/oscar/oscar.c:3253
+#: src/protocols/oscar/oscar.c:3255
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:3642
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:3643
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -2846,154 +2846,154 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3701
+#: src/protocols/oscar/oscar.c:3704
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3703
+#: src/protocols/oscar/oscar.c:3706
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3931
+#: src/protocols/oscar/oscar.c:3934
 msgid "UIN:"
 msgstr "使用者帳號:"
 
-#: src/protocols/oscar/oscar.c:3936
+#: src/protocols/oscar/oscar.c:3939
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3939
+#: src/protocols/oscar/oscar.c:3942
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3942 src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
 msgid "Email Address:"
 msgstr "電子郵件:"
 
-#: src/protocols/oscar/oscar.c:3953
+#: src/protocols/oscar/oscar.c:3956
 msgid "Mobile Phone:"
 msgstr "行動電話:"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3959
 msgid "Gender:"
 msgstr "性別:"
 
-#: src/protocols/oscar/oscar.c:3956 src/protocols/trepia/trepia.c:314
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3956 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3965
+#: src/protocols/oscar/oscar.c:3968
 msgid "Birthday:"
 msgstr "生日:"
 
-#: src/protocols/oscar/oscar.c:3970
+#: src/protocols/oscar/oscar.c:3973
 msgid "Age:"
 msgstr "年齡:"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:3976
 msgid "Personal Web Page:"
 msgstr "個人網頁:"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3979
 msgid "Additional Information:"
 msgstr "其他資訊:"
 
-#: src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3983
 msgid "Home Address:"
 msgstr "住家地址:"
 
-#: src/protocols/oscar/oscar.c:3982 src/protocols/oscar/oscar.c:3998
+#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
 msgid "Address:"
 msgstr "地址:"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
 msgid "City:"
 msgstr "城市:"
 
 # NOTE 不能翻成「州份」,蠻怪的。而且與其他的不同
-#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
 msgid "State:"
 msgstr "省╱州:"
 
-#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
 msgid "Zip Code:"
 msgstr "郵遞區號:"
 
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/oscar/oscar.c:3999
 msgid "Work Address:"
 msgstr "工作地址:"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:4015
 msgid "Work Information:"
 msgstr "工作資訊:"
 
-#: src/protocols/oscar/oscar.c:4014
+#: src/protocols/oscar/oscar.c:4017
 msgid "Company:"
 msgstr "公司名稱:"
 
-#: src/protocols/oscar/oscar.c:4017
-msgid "Division:"
-msgstr "部門:"
-
 #: src/protocols/oscar/oscar.c:4020
-msgid "Position:"
-msgstr "職位:"
+msgid "Division:"
+msgstr "部門:"
 
 #: src/protocols/oscar/oscar.c:4023
+msgid "Position:"
+msgstr "職位:"
+
+#: src/protocols/oscar/oscar.c:4026
 msgid "Web Page:"
 msgstr "網頁:"
 
-#: src/protocols/oscar/oscar.c:4091
+#: src/protocols/oscar/oscar.c:4094
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 擁有下列的帳號:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4109
+#: src/protocols/oscar/oscar.c:4112
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4133
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4132
+#: src/protocols/oscar/oscar.c:4135
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4160
+#: src/protocols/oscar/oscar.c:4163
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4166
 #, 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:4166
+#: src/protocols/oscar/oscar.c:4169
 #, 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:4169
+#: src/protocols/oscar/oscar.c:4172
 #, 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:4172
+#: src/protocols/oscar/oscar.c:4175
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -3001,7 +3001,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4175
+#: src/protocols/oscar/oscar.c:4178
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -3009,19 +3009,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4178
+#: src/protocols/oscar/oscar.c:4181
 #, 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:4181
+#: src/protocols/oscar/oscar.c:4184
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4191
+#: src/protocols/oscar/oscar.c:4194
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -3030,20 +3030,20 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4192 src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4197
+#: src/protocols/oscar/oscar.c:4200
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件為 %s"
 
-#: src/protocols/oscar/oscar.c:4422
+#: src/protocols/oscar/oscar.c:4425
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4423
+#: src/protocols/oscar/oscar.c:4426
 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 "
@@ -3052,22 +3052,22 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4453
+#: src/protocols/oscar/oscar.c:4456
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4474
+#: src/protocols/oscar/oscar.c:4477
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4475
+#: src/protocols/oscar/oscar.c:4478
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -3076,22 +3076,22 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4515
+#: src/protocols/oscar/oscar.c:4518
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it and set you away."
 msgstr "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4517
+#: src/protocols/oscar/oscar.c:4520
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4737
+#: src/protocols/oscar/oscar.c:4740
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4738
+#: src/protocols/oscar/oscar.c:4741
 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 "
@@ -3100,12 +3100,12 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:4829 src/protocols/oscar/oscar.c:4830
-#: src/protocols/oscar/oscar.c:4835
+#: src/protocols/oscar/oscar.c:4832 src/protocols/oscar/oscar.c:4833
+#: src/protocols/oscar/oscar.c:4838
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:4999
+#: src/protocols/oscar/oscar.c:5002
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3114,15 +3114,15 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:4999 src/protocols/oscar/oscar.c:5012
+#: src/protocols/oscar/oscar.c:5002 src/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5000 src/protocols/oscar/oscar.c:5013
+#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5012
+#: src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3132,18 +3132,18 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5050
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "使用者 %s 已經允許您加入到他們的好友清單中。您是不是也要將他們加入呢?"
 
-#: src/protocols/oscar/oscar.c:5053
+#: src/protocols/oscar/oscar.c:5056
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5086
+#: src/protocols/oscar/oscar.c:5089
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3153,17 +3153,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5128
+#: src/protocols/oscar/oscar.c:5131
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "使用者 %s 允許了您將他們加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:5129
+#: src/protocols/oscar/oscar.c:5132
 msgid "Authorization Granted"
 msgstr "給予認證"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5135
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3173,91 +3173,91 @@
 "使用者 %s 因為下列原因,拒絕了您將他們加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5133
+#: src/protocols/oscar/oscar.c:5136
 msgid "Authorization Denied"
 msgstr "認證拒絕"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-#: src/protocols/oscar/oscar.c:5170 src/protocols/toc/toc.c:1205
+#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
 msgid "Exchange:"
 msgstr "聊天室號碼:"
 
-#: src/protocols/oscar/oscar.c:5390
+#: src/protocols/oscar/oscar.c:5393
 msgid "<b>Status:</b> "
 msgstr "<b>狀態:</b>"
 
-#: src/protocols/oscar/oscar.c:5399
+#: src/protocols/oscar/oscar.c:5402
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入時間:</b>"
 
-#: src/protocols/oscar/oscar.c:5406
+#: src/protocols/oscar/oscar.c:5409
 msgid "<b>Capabilities:</b> "
 msgstr "<b>相容性:</b>"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5415
 msgid "<b>Available:</b> "
 msgstr "<b>上線:</b>"
 
-#: src/protocols/oscar/oscar.c:5420
+#: src/protocols/oscar/oscar.c:5423
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態:</b>未認證"
 
-#: src/protocols/oscar/oscar.c:5424 src/gtkblist.c:895
+#: src/protocols/oscar/oscar.c:5427 src/gtkblist.c:895
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態:</b>離線"
 
-#: src/protocols/oscar/oscar.c:5454
+#: src/protocols/oscar/oscar.c:5457
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5695
+#: src/protocols/oscar/oscar.c:5698
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:5708
+#: src/protocols/oscar/oscar.c:5711
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:5711
+#: src/protocols/oscar/oscar.c:5714
 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:5856
+#: src/protocols/oscar/oscar.c:5859
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:5900
+#: src/protocols/oscar/oscar.c:5903
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:5924
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:5922
+#: src/protocols/oscar/oscar.c:5925
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:5928
+#: src/protocols/oscar/oscar.c:5931
 msgid "New screenname formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:5977
+#: src/protocols/oscar/oscar.c:5980
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:5991
+#: src/protocols/oscar/oscar.c:5994
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您目前正在等待下列好友的認證:<BR>"
 
-#: src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6019
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6024
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3266,43 +3266,43 @@
 "%s<BR><BR>您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,"
 "然後選擇「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6037
+#: src/protocols/oscar/oscar.c:6040
 msgid "Available Message:"
 msgstr "上線訊息:"
 
-#: src/protocols/oscar/oscar.c:6038
+#: src/protocols/oscar/oscar.c:6041
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "請和我聊聊吧!我覺得好寂寞!"
 
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/oscar/oscar.c:6103
 msgid "Set Available Message"
 msgstr "設定上線訊息"
 
-#: src/protocols/oscar/oscar.c:6114
+#: src/protocols/oscar/oscar.c:6117
 msgid "Change Password (URL)"
 msgstr "修改密碼(URL)"
 
-#: src/protocols/oscar/oscar.c:6125
+#: src/protocols/oscar/oscar.c:6128
 msgid "Format Screenname"
 msgstr "格式化帳號"
 
-#: src/protocols/oscar/oscar.c:6131
+#: src/protocols/oscar/oscar.c:6134
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6137
+#: src/protocols/oscar/oscar.c:6140
 msgid "Display Current Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6143
+#: src/protocols/oscar/oscar.c:6146
 msgid "Change Current Registered Address"
 msgstr "修改目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6152
+#: src/protocols/oscar/oscar.c:6155
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6163
 msgid "Search for Buddy by Email"
 msgstr "使用電子郵件搜尋好友"
 
@@ -3316,122 +3316,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6281 src/protocols/oscar/oscar.c:6283
+#: src/protocols/oscar/oscar.c:6284 src/protocols/oscar/oscar.c:6286
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6300
+#: src/protocols/oscar/oscar.c:6303
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6308
 msgid "Auth port"
 msgstr "認證通訊埠"
 
-#: src/protocols/toc/toc.c:173
+#: src/protocols/toc/toc.c:174
 #, c-format
 msgid "Looking up %s"
 msgstr "找尋 %s 中"
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:497
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s 位元組被截去。"
 
-#: src/protocols/toc/toc.c:502
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "警告:%s 是不被允許的。"
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:509
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:524
 msgid "Failure."
 msgstr "失敗。"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:527
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:530
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:533
 msgid "Dir service temporarily unavailable."
 msgstr "目錄服務暫時不存在。"
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:536
 msgid "Email lookup restricted."
 msgstr "禁止 eMail 檢查。"
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:539
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: src/protocols/toc/toc.c:541
+#: src/protocols/toc/toc.c:542
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: src/protocols/toc/toc.c:544
+#: src/protocols/toc/toc.c:545
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:549
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:558
 msgid "The service is temporarily unavailable."
 msgstr "服務暫時不存在。"
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:561
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
-#: src/protocols/toc/toc.c:563
+#: src/protocols/toc/toc.c:564
 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."
@@ -3439,37 +3439,37 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:566
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:569
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
-#: src/protocols/toc/toc.c:588
+#: src/protocols/toc/toc.c:589
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: src/protocols/toc/toc.c:626
+#: src/protocols/toc/toc.c:627
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: src/protocols/toc/toc.c:691
+#: src/protocols/toc/toc.c:692
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:879
+#: src/protocols/toc/toc.c:880
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:883
+#: src/protocols/toc/toc.c:884
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
-#: src/protocols/toc/toc.c:884
+#: src/protocols/toc/toc.c:885
 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 "
@@ -3478,47 +3478,47 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1343
+#: src/protocols/toc/toc.c:1344
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1467
+#: src/protocols/toc/toc.c:1468
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1590
+#: src/protocols/toc/toc.c:1591
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1626
+#: src/protocols/toc/toc.c:1627
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1671 src/protocols/toc/toc.c:1711
-#: src/protocols/toc/toc.c:1923
+#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1712
+#: src/protocols/toc/toc.c:1924
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1835
+#: src/protocols/toc/toc.c:1836
 msgid "Could not connect for transfer!"
 msgstr "無法開啟傳輸的連線!"
 
-#: src/protocols/toc/toc.c:1868
+#: src/protocols/toc/toc.c:1869
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:1968 src/gtkft.c:1060
+#: src/protocols/toc/toc.c:1969 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2002
+#: src/protocols/toc/toc.c:2003
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2009
+#: src/protocols/toc/toc.c:2010
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -3533,15 +3533,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2084 src/protocols/toc/toc.c:2086
+#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2103
+#: src/protocols/toc/toc.c:2104
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2107
+#: src/protocols/toc/toc.c:2108
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -3551,12 +3551,12 @@
 msgstr "基本資料"
 
 #. First Name
-#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1982 src/dialogs.c:2636
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1990 src/dialogs.c:2644
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/trepia/trepia.c:307 src/dialogs.c:2005 src/dialogs.c:2656
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:2013 src/dialogs.c:2664
 msgid "Last Name"
 msgstr "姓"
 
@@ -3617,7 +3617,7 @@
 msgstr "我來自"
 
 #. State
-#: src/protocols/trepia/trepia.c:368 src/dialogs.c:2038 src/dialogs.c:2685
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:2046 src/dialogs.c:2693
 msgid "State"
 msgstr "省╱州"
 
@@ -3626,9 +3626,9 @@
 msgid "Set your Trepia profile data."
 msgstr "設定您的 Trepia 個人資料。"
 
-#: src/protocols/trepia/trepia.c:379 src/dialogs.c:2080 src/dialogs.c:2261
-#: src/dialogs.c:3427 src/dialogs.c:4232 src/dialogs.c:4870
-#: src/gtkrequest.c:175
+#: src/protocols/trepia/trepia.c:379 src/dialogs.c:2088 src/dialogs.c:2269
+#: src/dialogs.c:3435 src/dialogs.c:4240 src/dialogs.c:4878
+#: src/gtkrequest.c:177
 msgid "Save"
 msgstr "儲存"
 
@@ -3669,40 +3669,40 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:587
+#: src/protocols/yahoo/yahoo.c:592
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
-#: src/protocols/yahoo/yahoo.c:1052 src/protocols/yahoo/yahoo.c:1260
-#: src/protocols/yahoo/yahoo.c:1334
+#: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1265
+#: src/protocols/yahoo/yahoo.c:1339
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1054 src/protocols/yahoo/yahoo.c:1262
-#: src/protocols/yahoo/yahoo.c:1335
+#: src/protocols/yahoo/yahoo.c:1059 src/protocols/yahoo/yahoo.c:1267
+#: src/protocols/yahoo/yahoo.c:1340
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:1056 src/protocols/yahoo/yahoo.c:1264
-#: src/protocols/yahoo/yahoo.c:1336
+#: src/protocols/yahoo/yahoo.c:1061 src/protocols/yahoo/yahoo.c:1269
+#: src/protocols/yahoo/yahoo.c:1341
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:1060 src/protocols/yahoo/yahoo.c:1268
-#: src/protocols/yahoo/yahoo.c:1338
+#: src/protocols/yahoo/yahoo.c:1065 src/protocols/yahoo/yahoo.c:1273
+#: src/protocols/yahoo/yahoo.c:1343
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:1064 src/protocols/yahoo/yahoo.c:1272
-#: src/protocols/yahoo/yahoo.c:1340
+#: src/protocols/yahoo/yahoo.c:1069 src/protocols/yahoo/yahoo.c:1277
+#: src/protocols/yahoo/yahoo.c:1345
 msgid "Stepped Out"
 msgstr "走出去了"
 
-#: src/protocols/yahoo/yahoo.c:1180
+#: src/protocols/yahoo/yahoo.c:1185
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
-#: src/protocols/yahoo/yahoo.c:1191
+#: src/protocols/yahoo/yahoo.c:1196
 msgid "Activate ID"
 msgstr "啟動 ID"
 
@@ -3716,15 +3716,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1460 src/protocols/yahoo/yahoo.c:1462
+#: src/protocols/yahoo/yahoo.c:1465 src/protocols/yahoo/yahoo.c:1467
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:1479
+#: src/protocols/yahoo/yahoo.c:1484
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:1484
+#: src/protocols/yahoo/yahoo.c:1489
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
@@ -3885,11 +3885,11 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:428 src/gtkprefs.c:2273
+#: src/blist.c:427 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:752
+#: src/blist.c:751
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
@@ -3898,33 +3898,33 @@
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:757
+#: src/blist.c:756
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:948
+#: src/blist.c:947
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:1704
+#: src/blist.c:1703
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:1706
+#: src/blist.c:1705
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1714
+#: src/blist.c:1713
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
 msgstr "Gaim 正在轉換您的舊好友清單為新格式,同時將它存放於 %s"
 
-#: src/blist.c:1717
+#: src/blist.c:1716
 msgid "Converting Buddy List"
 msgstr "轉換好友清單中"
 
@@ -3947,7 +3947,7 @@
 msgid "There was an error launching your chosen browser: %s"
 msgstr "啟動您所選擇的瀏覽器時發生錯誤:%s"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1325
+#: src/buddy_chat.c:316 src/dialogs.c:1333
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -4033,11 +4033,11 @@
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:345
+#: src/dialogs.c:348
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:364
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -4049,36 +4049,36 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:373
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:377
+#: src/dialogs.c:380
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:447
+#: src/dialogs.c:455
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:449 src/dialogs.c:450
+#: src/dialogs.c:457 src/dialogs.c:458
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:459
+#: src/dialogs.c:467
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:461 src/dialogs.c:462
+#: src/dialogs.c:469 src/dialogs.c:470
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:471
+#: src/dialogs.c:479
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -4086,53 +4086,53 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:474 src/dialogs.c:475
+#: src/dialogs.c:482 src/dialogs.c:483
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:624
+#: src/dialogs.c:632
 msgid "New Message"
 msgstr "新訊息"
 
-#: src/dialogs.c:642
+#: src/dialogs.c:650
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
 
-#: src/dialogs.c:658 src/dialogs.c:735 src/dialogs.c:3759
+#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
 msgid "_Screenname:"
 msgstr "帳號(_S):"
 
-#: src/dialogs.c:673 src/dialogs.c:751 src/gtkpounce.c:408
+#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:712
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:723
+#: src/dialogs.c:731
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "請輸入您所想要查詢對象的帳號。\n"
 
-#: src/dialogs.c:881
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:906
 msgid "Please enter the name of the group to be added.\n"
 msgstr "請輸入群組名稱以進行新增。\n"
 
-#: src/dialogs.c:907 src/dialogs.c:4311
+#: src/dialogs.c:915 src/dialogs.c:4319
 msgid "_Group:"
 msgstr "群組(_G):"
 
-#: src/dialogs.c:943
+#: src/dialogs.c:951
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/dialogs.c:962
+#: src/dialogs.c:970
 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. "
@@ -4141,311 +4141,311 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: src/dialogs.c:981
+#: src/dialogs.c:989
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/dialogs.c:994
+#: src/dialogs.c:1002
 msgid "Alias"
 msgstr "別名"
 
-#: src/dialogs.c:1004
+#: src/dialogs.c:1012
 msgid "Group"
 msgstr "群組"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1013
+#: src/dialogs.c:1021
 msgid "Add To"
 msgstr "增加到"
 
-#: src/dialogs.c:1332
+#: src/dialogs.c:1340
 msgid "Add Chat"
 msgstr "加入聊天室"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1363
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/dialogs.c:1364
+#: src/dialogs.c:1372
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/dialogs.c:1383 src/gtkaccount.c:455
+#: src/dialogs.c:1391 src/gtkaccount.c:431
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1402
 msgid "Group:"
 msgstr "群組:"
 
-#: src/dialogs.c:1740
+#: src/dialogs.c:1748
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/dialogs.c:1756
+#: src/dialogs.c:1764
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
-#: src/dialogs.c:1765
+#: src/dialogs.c:1773
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/dialogs.c:1782
+#: src/dialogs.c:1790
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1794
 msgid "Allow only users on my buddy list"
 msgstr "只允許好友清單中的使用者"
 
-#: src/dialogs.c:1790
+#: src/dialogs.c:1798
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/dialogs.c:1828
+#: src/dialogs.c:1836
 msgid "Deny all users"
 msgstr "拒絕所有使用者"
 
-#: src/dialogs.c:1832
+#: src/dialogs.c:1840
 msgid "Block the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/dialogs.c:1948
+#: src/dialogs.c:1956
 msgid "Set Directory Info"
 msgstr "設定使用者資訊"
 
-#: src/dialogs.c:1956
+#: src/dialogs.c:1964
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:1966
+#: src/dialogs.c:1974
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "設定 %s 的使用者資訊:"
 
-#: src/dialogs.c:1979
+#: src/dialogs.c:1987
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
 #. Line 2
-#: src/dialogs.c:1993 src/dialogs.c:2646
+#: src/dialogs.c:2001 src/dialogs.c:2654
 msgid "Middle Name"
 msgstr ""
 
 # NOTE「小名」大概也可以,但「Maiden Name」通常係指未嫁時的「本姓」
 #. Line 4
-#: src/dialogs.c:2016 src/dialogs.c:2666
+#: src/dialogs.c:2024 src/dialogs.c:2674
 msgid "Maiden Name"
 msgstr "本姓"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2111
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: src/dialogs.c:2109
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely."
 msgstr "請完成所有表格的填寫。"
 
-#: src/dialogs.c:2154
+#: src/dialogs.c:2162
 #, c-format
 msgid "Changing password for %s:"
 msgstr "修改 %s 的密碼:"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2170
 msgid "Original Password"
 msgstr "舊密碼"
 
-#: src/dialogs.c:2173
+#: src/dialogs.c:2181
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2192
 msgid "New Password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/dialogs.c:2233
+#: src/dialogs.c:2241
 #, c-format
 msgid "Changing info for %s:"
 msgstr "修改 %s 的資訊:"
 
-#: src/dialogs.c:2319
+#: src/dialogs.c:2327
 msgid "Below are the results of your search: "
 msgstr "以下是您所做查詢的結果:"
 
-#: src/dialogs.c:2430
+#: src/dialogs.c:2438
 msgid "Permit"
 msgstr "許可"
 
-#: src/dialogs.c:2462
+#: src/dialogs.c:2470
 msgid "Add Permit"
 msgstr "加入許可"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2472
 msgid "Add Deny"
 msgstr "加入拒絕"
 
-#: src/dialogs.c:2531
+#: src/dialogs.c:2539
 msgid "Log Conversation"
 msgstr "記錄交談"
 
-#: src/dialogs.c:2612 src/dialogs.c:2745
+#: src/dialogs.c:2620 src/dialogs.c:2753
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2712
+#: src/dialogs.c:2720
 msgid "Find Buddy By Info"
 msgstr "以資訊找尋好友"
 
-#: src/dialogs.c:2739
+#: src/dialogs.c:2747
 msgid "Find Buddy By Email"
 msgstr "以電子郵件來找尋好友"
 
-#: src/dialogs.c:2843
+#: src/dialogs.c:2851
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/dialogs.c:2845
+#: src/dialogs.c:2853
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2864
+#: src/dialogs.c:2872
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。\n"
 
-#: src/dialogs.c:3033 src/dialogs.c:3050
+#: src/dialogs.c:3041 src/dialogs.c:3058
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:3085 src/dialogs.c:3102
+#: src/dialogs.c:3093 src/dialogs.c:3110
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:3199 src/dialogs.c:3225
+#: src/dialogs.c:3207 src/dialogs.c:3233
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:3291
+#: src/dialogs.c:3299
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:3293
+#: src/dialogs.c:3301
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:3303
+#: src/dialogs.c:3311
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:3368 src/dialogs.c:3376
+#: src/dialogs.c:3376 src/dialogs.c:3384
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3386
+#: src/dialogs.c:3394
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:3431
+#: src/dialogs.c:3439
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:3435
+#: src/dialogs.c:3443
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3584
+#: src/dialogs.c:3592
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/dialogs.c:3630
+#: src/dialogs.c:3638
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3659
+#: src/dialogs.c:3667
 msgid "Please enter an aliased name for this chat.\n"
 msgstr "請為這個聊天室輸入一個別名。\n"
 
-#: src/dialogs.c:3671 src/dialogs.c:3774
+#: src/dialogs.c:3679 src/dialogs.c:3782
 msgid "_Alias:"
 msgstr "別名(_A):"
 
-#: src/dialogs.c:3708
+#: src/dialogs.c:3716
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
 # NOTE 這個譯句應該沒有問題。(執行「別名」來看實際使用情況)
 # NOTE 但我把「下列人員...」改為新的譯句...。
 #. Setup the label containing the description.
-#: src/dialogs.c:3738
+#: src/dialogs.c:3746
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
 msgstr "請為這個好友設定別名,或者更改他在好友清單中所記錄的帳號。\n"
 
-#: src/dialogs.c:3828 src/dialogs.c:3835
+#: src/dialogs.c:3836 src/dialogs.c:3843
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "無法寫入到 %s。"
 
-#: src/dialogs.c:3859
+#: src/dialogs.c:3867
 msgid "Save Log File"
 msgstr "儲存日誌檔"
 
-#: src/dialogs.c:3889
+#: src/dialogs.c:3897
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "無法刪除檔案 %s。"
 
-#: src/dialogs.c:3908
+#: src/dialogs.c:3916
 msgid "Clear Log"
 msgstr "清除日誌"
 
-#: src/dialogs.c:3917
+#: src/dialogs.c:3925
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎?"
 
-#: src/dialogs.c:3962
+#: src/dialogs.c:3970
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "無法開啟日誌檔 %s。"
 
-#: src/dialogs.c:4104
+#: src/dialogs.c:4112
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: src/dialogs.c:4106
+#: src/dialogs.c:4114
 msgid "System Log"
 msgstr "系統日誌"
 
-#: src/dialogs.c:4127
+#: src/dialogs.c:4135
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "無法開啟日誌檔 %s"
 
-#: src/dialogs.c:4148
+#: src/dialogs.c:4156
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4205
+#: src/dialogs.c:4213
 msgid "Log"
 msgstr "日誌"
 
-#: src/dialogs.c:4227
+#: src/dialogs.c:4235
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4285
+#: src/dialogs.c:4293
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:4302
+#: src/dialogs.c:4310
 msgid "Please enter a new name for the selected group.\n"
 msgstr "請為選取的群組輸入一個新的名稱。\n"
 
@@ -4552,21 +4552,21 @@
 "關閉正在執行的 Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:41
+#: src/gaimrc.c:42
 msgid "sorry, i ran out for a while. bbl"
 msgstr "不好意思,我離開一下下。"
 
-#: src/gaimrc.c:362 src/gaimrc.c:1505
+#: src/gaimrc.c:363 src/gaimrc.c:1506
 msgid "boring default"
 msgstr "無聊(預設)"
 
-#: src/gaimrc.c:1603
+#: src/gaimrc.c:1604
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
 # XXX 要複查譯文
-#: src/gtkaccount.c:280
+#: src/gtkaccount.c:256
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4578,143 +4578,143 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:355
+#: src/gtkaccount.c:331
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:348
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:377
+#: src/gtkaccount.c:353
 msgid "Screenname:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:459
+#: src/gtkaccount.c:435
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:513
+#: src/gtkaccount.c:489
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:526
+#: src/gtkaccount.c:502
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:535
+#: src/gtkaccount.c:511
 msgid "Buddy icon file:"
 msgstr "好友圖示檔案:"
 
-#: src/gtkaccount.c:544
+#: src/gtkaccount.c:520
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: src/gtkaccount.c:550
+#: src/gtkaccount.c:526
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:611
+#: src/gtkaccount.c:587
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:732
+#: src/gtkaccount.c:708
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
 #. No Proxy
-#: src/gtkaccount.c:739
+#: src/gtkaccount.c:715
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. SOCKS 4
-#: src/gtkaccount.c:746
+#: src/gtkaccount.c:722
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:753
+#: src/gtkaccount.c:729
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. HTTP
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:736
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/gtkaccount.c:792
+#: src/gtkaccount.c:768
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:772
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:812
+#: src/gtkaccount.c:788
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:828 src/gtkprefs.c:1097
+#: src/gtkaccount.c:804 src/gtkprefs.c:1097
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:837
+#: src/gtkaccount.c:813
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:841
+#: src/gtkaccount.c:817
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:849
+#: src/gtkaccount.c:825
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:854
+#: src/gtkaccount.c:830
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1165
+#: src/gtkaccount.c:1141
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1167
+#: src/gtkaccount.c:1143
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1191
+#: src/gtkaccount.c:1167
 msgid "Show more options"
 msgstr "顯示較多的選項"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1168
 msgid "Show fewer options"
 msgstr "顯示較少的選項"
 
 #. Register button
-#: src/gtkaccount.c:1220
+#: src/gtkaccount.c:1196
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1507
+#: src/gtkaccount.c:1483
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:1511 src/gtkrequest.c:172
+#: src/gtkaccount.c:1487 src/gtkrequest.c:174
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1589
+#: src/gtkaccount.c:1565
 msgid "Screenname"
 msgstr "帳號"
 
-#: src/gtkaccount.c:1630
+#: src/gtkaccount.c:1606
 msgid "Protocol"
 msgstr "通訊協定"
 
@@ -5006,7 +5006,7 @@
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:1563 src/gtkconv.c:1071
+#: src/gtkblist.c:1563 src/gtkconv.c:1072
 msgid "IM"
 msgstr "即時訊息"
 
@@ -5030,382 +5030,356 @@
 msgid "No actions available"
 msgstr "不允許任何動作"
 
-#: src/gtkconn.c:58 src/gtkconn.c:239 src/gtkconn.c:274 src/gtkconn.c:383
-#: src/multi.c:91
+#: src/gtkconn.c:56 src/gtkconn.c:241 src/gtkconn.c:254
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:133 src/multi.c:167
+#: src/gtkconn.c:135
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:191 src/multi.c:225
+#: src/gtkconn.c:193
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:204 src/multi.c:237
+#: src/gtkconn.c:206
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:258
-msgid "Enter your password."
-msgstr "請輸入您的密碼。"
-
-#: src/gtkconn.c:374 src/multi.c:292
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-"%s\n"
-"%s: %s"
-
-#: src/gtkconn.c:396 src/multi.c:314
-#, c-format
-msgid "%s was unable to sign on"
-msgstr "%s 無法登入"
-
-#: src/gtkconn.c:398 src/multi.c:316
-msgid "Signon Error"
-msgstr "登入錯誤"
-
-#: src/gtkconn.c:411 src/multi.c:329
-msgid "Notice"
-msgstr "通知"
-
-#: src/gtkconn.c:425 src/multi.c:343
-#, c-format
-msgid "%s has been signed off"
-msgstr "%s 已經登出"
-
-#: src/gtkconn.c:427 src/multi.c:345
-msgid "Connection Error"
-msgstr "連線錯誤"
-
-#: src/gtkconv.c:182
+#: src/gtkconv.c:183
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:183 src/gtkft.c:1034
+#: src/gtkconv.c:184 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkconv.c:278
+#: src/gtkconv.c:279
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入影像"
 
-#: src/gtkconv.c:580
+#: src/gtkconv.c:581
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:608
+#: src/gtkconv.c:609
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:629
+#: src/gtkconv.c:630
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:649
+#: src/gtkconv.c:650
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1080
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:774
+#: src/gtkconv.c:1082 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3017
+#: src/gtkconv.c:1091 src/gtkconv.c:2987
 msgid "Info"
 msgstr "取得使用者資訊"
 
-#: src/gtkconv.c:1110 src/gtkconv.c:3000 src/gtkconv.c:4144
-#: src/gtkrequest.c:174
+#: src/gtkconv.c:1111 src/gtkconv.c:2970 src/gtkconv.c:4109
+#: src/gtkrequest.c:176
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:2228
+#: src/gtkconv.c:2200
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2236
+#: src/gtkconv.c:2208
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2340
+#: src/gtkconv.c:2310
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:2796
+#: src/gtkconv.c:2766
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:2813
+#: src/gtkconv.c:2783
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2785
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2787
 msgid "/Conversation/View _Log..."
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:2821
+#: src/gtkconv.c:2791
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:2823
+#: src/gtkconv.c:2793
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:2795
 msgid "/Conversation/_Get Info..."
 msgstr "/交談/取得資訊(_G)..."
 
-#: src/gtkconv.c:2827
+#: src/gtkconv.c:2797
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:2832
+#: src/gtkconv.c:2802
 msgid "/Conversation/Insert _URL..."
 msgstr "/交談/插入 URL(_U)"
 
-#: src/gtkconv.c:2834
+#: src/gtkconv.c:2804
 msgid "/Conversation/Insert _Image..."
 msgstr "/交談/插入影像(_I)"
 
-#: src/gtkconv.c:2839
+#: src/gtkconv.c:2809
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:2841
+#: src/gtkconv.c:2811
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:2843
+#: src/gtkconv.c:2813
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:2845
+#: src/gtkconv.c:2815
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:2850
+#: src/gtkconv.c:2820
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:2854
+#: src/gtkconv.c:2824
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:2855
+#: src/gtkconv.c:2825
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:2856
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:2896
+#: src/gtkconv.c:2866
 msgid "/Conversation/View Log..."
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:2901
+#: src/gtkconv.c:2871
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:2905
+#: src/gtkconv.c:2875
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:2909
+#: src/gtkconv.c:2879
 msgid "/Conversation/Get Info..."
 msgstr "/交談/取得資訊..."
 
-#: src/gtkconv.c:2913
+#: src/gtkconv.c:2883
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2889
 msgid "/Conversation/Insert URL..."
 msgstr "/交談/插入 URL..."
 
-#: src/gtkconv.c:2923
+#: src/gtkconv.c:2893
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:2929
+#: src/gtkconv.c:2899
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:2933
+#: src/gtkconv.c:2903
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:2937
+#: src/gtkconv.c:2907
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:2941
+#: src/gtkconv.c:2911
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:2947
+#: src/gtkconv.c:2917
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:2950
+#: src/gtkconv.c:2920
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2974 src/gtkconv.c:2976 src/gtkconv.c:3074 src/gtkconv.c:3076
-#: src/gtkconv.c:5718
+#: src/gtkconv.c:2944 src/gtkconv.c:2946 src/gtkconv.c:3044 src/gtkconv.c:3046
+#: src/gtkconv.c:5683
 msgid "Send"
 msgstr "送出"
 
-#: src/gtkconv.c:2997 src/gtkconv.c:4162
+#: src/gtkconv.c:2967 src/gtkconv.c:4127
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3003 src/gtkconv.c:4147
+#: src/gtkconv.c:2973 src/gtkconv.c:4112
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
 #. Warn button
-#: src/gtkconv.c:3010
+#: src/gtkconv.c:2980
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3014
+#: src/gtkconv.c:2984
 msgid "Warn the user"
 msgstr "警告使用者"
 
-#: src/gtkconv.c:3021 src/gtkconv.c:3456
+#: src/gtkconv.c:2991 src/gtkconv.c:3426
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Block button
-#: src/gtkconv.c:3024
+#: src/gtkconv.c:2994
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3028
+#: src/gtkconv.c:2998
 msgid "Block the user"
 msgstr "封鎖使用者"
 
 #. Invite
-#: src/gtkconv.c:3086 src/gtkconv.c:5721
+#: src/gtkconv.c:3056 src/gtkconv.c:5686
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3059
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:3098
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3109
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkconv.c:3150
+#: src/gtkconv.c:3120
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3136
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3148
 msgid "Normal font size"
 msgstr "正常字體"
 
-#: src/gtkconv.c:3190
+#: src/gtkconv.c:3160
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3177
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkconv.c:3219
+#: src/gtkconv.c:3189
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkconv.c:3231
+#: src/gtkconv.c:3201
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkconv.c:3246
+#: src/gtkconv.c:3216
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkconv.c:3257
+#: src/gtkconv.c:3227
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkconv.c:3268
+#: src/gtkconv.c:3238
 msgid "Insert smiley"
 msgstr "插入表情"
 
-#: src/gtkconv.c:3325
+#: src/gtkconv.c:3295
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3346
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3403
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3445
+#: src/gtkconv.c:3415
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:3982
+#: src/gtkconv.c:3911 src/server.c:1298
+#, c-format
+msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
+msgstr ""
+
+#: src/gtkconv.c:3915 src/server.c:1301
+#, fuzzy, c-format
+msgid "---- New Conversation @ %s ----\n"
+msgstr "與 %s 的交談"
+
+#: src/gtkconv.c:3947
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4640 src/gtkconv.c:4762
+#: src/gtkconv.c:4605 src/gtkconv.c:4727
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5036
+#: src/gtkconv.c:5001
 msgid "Disable Animation"
 msgstr "關閉動畫"
 
-#: src/gtkconv.c:5045
+#: src/gtkconv.c:5010
 msgid "Enable Animation"
 msgstr "開啟動畫"
 
-#: src/gtkconv.c:5052
+#: src/gtkconv.c:5017
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:5058
+#: src/gtkconv.c:5023
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
@@ -5506,51 +5480,51 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkimhtml.c:498
+#: src/gtkimhtml.c:530
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:505
+#: src/gtkimhtml.c:537
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:1601
+#: src/gtkimhtml.c:1642
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:1609
+#: src/gtkimhtml.c:1650
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:1618
+#: src/gtkimhtml.c:1659
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:1640
+#: src/gtkimhtml.c:1681
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: src/gtknotify.c:193
+#: src/gtknotify.c:199
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 
-#: src/gtknotify.c:201
+#: src/gtknotify.c:207
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自:</span> %s\n"
 
-#: src/gtknotify.c:206
+#: src/gtknotify.c:212
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題:</span> %s\n"
 
-#: src/gtknotify.c:210
+#: src/gtknotify.c:216
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -5561,7 +5535,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:225
+#: src/gtknotify.c:231
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -6052,24 +6026,24 @@
 msgstr "所設定的使用者自定瀏覽器「%s」是無效的。超連結將不會被執行。"
 
 #: src/gtkprefs.c:1253
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Opera"
+msgstr "Opera"
 
 #: src/gtkprefs.c:1254
-msgid "Opera"
-msgstr "Opera"
+msgid "Netscape"
+msgstr "Netscape"
 
 #: src/gtkprefs.c:1255
-msgid "Galeon"
-msgstr "Galeon"
+msgid "Mozilla"
+msgstr "Mozilla"
 
 #: src/gtkprefs.c:1256
-msgid "Netscape"
-msgstr "Netscape"
+msgid "Konqueror"
+msgstr "Konqueror"
 
 #: src/gtkprefs.c:1257
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "Galeon"
+msgstr "Galeon"
 
 #: src/gtkprefs.c:1266
 msgid "Manual"
@@ -6365,7 +6339,7 @@
 msgid "Plugins"
 msgstr "模組清單"
 
-#: src/gtkrequest.c:170
+#: src/gtkrequest.c:172
 msgid "Apply"
 msgstr "套用"
 
@@ -6475,7 +6449,7 @@
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行 `%s -h' 以獲得更進一步的資訊。\n"
 
-#: src/html.c:304
+#: src/html.c:305
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -6597,23 +6571,23 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) 報告 %s 由閒置返回 @ %s"
 
-#: src/main.c:234
+#: src/main.c:235
 msgid "Please enter your login."
 msgstr "請您登入。"
 
-#: src/main.c:326
+#: src/main.c:323
 msgid "<New User>"
 msgstr "<新使用者>"
 
-#: src/main.c:368
+#: src/main.c:365
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:384
+#: src/main.c:381
 msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/main.c:434 src/win32/systray.c:197
+#: src/main.c:431
 msgid "Sign On"
 msgstr "登入"
 
@@ -6647,30 +6621,30 @@
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:57
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:879
+#: src/server.c:874
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 個訊息)"
 
-#: src/server.c:891
+#: src/server.c:886
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1089 src/server.c:1099
+#: src/server.c:1084 src/server.c:1094
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1117 src/server.c:1125
+#: src/server.c:1112 src/server.c:1120
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1166
+#: src/server.c:1161
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6679,11 +6653,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1169
+#: src/server.c:1164
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1259
+#: src/server.c:1254
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6692,20 +6666,20 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1263
+#: src/server.c:1258
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1269
+#: src/server.c:1264
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
-#: src/server.c:1441
+#: src/server.c:1436
 msgid "Gaim - Popup"
 msgstr "Gaim - 訊息"
 
-#: src/server.c:1468
+#: src/server.c:1463
 msgid "More Info"
 msgstr "更多資訊"
 
@@ -6740,37 +6714,6 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: src/win32/systray.c:42
-msgid "Gaim Instant Messenger"
-msgstr "Gaim"
-
-#: src/win32/systray.c:43
-msgid "Gaim Instant Messenger - Signed off"
-msgstr "Gaim - 已登出"
-
-#: src/win32/systray.c:44
-msgid "Gaim Instant Messenger - Away"
-msgstr "Gaim - 離開"
-
-#: src/win32/systray.c:140
-msgid "New"
-msgstr "新訊息"
-
-#: src/win32/systray.c:173
-msgid "Set Away Message"
-msgstr "設定離開訊息"
-
-#: src/win32/systray.c:182
-msgid "I'm Back"
-msgstr "我回來了!"
-
-#: src/win32/systray.c:371
-msgid "Exit"
-msgstr "離開"
-
 #: src/plugin.c:222
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
@@ -6785,14 +6728,64 @@
 msgid "Custom"
 msgstr "使用者自定"
 
-#: src/gtkdebug.c:141
+#: src/gtkdebug.c:142
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:184
+#: src/gtkdebug.c:182
+msgid "Pause"
+msgstr "暫停"
+
+#: src/gtkdebug.c:188
 msgid "Timestamps"
 msgstr "時間戳記"
 
+#~ msgid "Enter your password."
+#~ msgstr "請輸入您的密碼。"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "%s: %s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s: %s"
+
+#~ msgid "%s was unable to sign on"
+#~ msgstr "%s 無法登入"
+
+#~ msgid "Signon Error"
+#~ msgstr "登入錯誤"
+
+#~ msgid "Notice"
+#~ msgstr "通知"
+
+#~ msgid "%s has been signed off"
+#~ msgstr "%s 已經登出"
+
+#~ msgid "Connection Error"
+#~ msgstr "連線錯誤"
+
+#~ msgid "Gaim Instant Messenger"
+#~ msgstr "Gaim"
+
+#~ msgid "Gaim Instant Messenger - Signed off"
+#~ msgstr "Gaim - 已登出"
+
+#~ msgid "Gaim Instant Messenger - Away"
+#~ msgstr "Gaim - 離開"
+
+#~ msgid "New"
+#~ msgstr "新訊息"
+
+#~ msgid "Set Away Message"
+#~ msgstr "設定離開訊息"
+
+#~ msgid "I'm Back"
+#~ msgstr "我回來了!"
+
+#~ msgid "Exit"
+#~ msgstr "離開"
+
 #~ msgid "Pager Host:"
 #~ msgstr "傳呼系統伺服器:"
 
@@ -6808,9 +6801,6 @@
 #~ msgid "Control-_W closes window"
 #~ msgstr "按下 Ctrl-W 關閉視窗(_W)"
 
-#~ msgid "Pause"
-#~ msgstr "暫停"
-
 #~ msgid "Gaim - Save Image"
 #~ msgstr "Gaim - 儲存影像"