changeset 5502:a6c08c86bf7f

[gaim-migrate @ 5901] Ambrose LI (acli) writes: " Sync'd to the latest CVS (as of now), still only about 91% finished I suggest that "None" sorting order should be reworded as "Do not sort automatically"; "None" in the context would not make sense when translated to Chinese (see second patch in bug 739709) " committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 23 May 2003 20:49:28 +0000
parents 36d2c875a822
children 38ae6c7b4387
files po/zh_TW.po
diffstat 1 files changed, 1916 insertions(+), 1792 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_TW.po	Fri May 23 17:23:14 2003 +0000
+++ b/po/zh_TW.po	Fri May 23 20:49:28 2003 +0000
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
-"POT-Creation-Date: 2003-05-19 01:16-0400\n"
+"POT-Creation-Date: 2003-05-22 21:52-0400\n"
 "PO-Revision-Date: 2002-07-09 17:02+0800\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -19,7 +19,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plugins/docklet/docklet.c:94 src/multi.c:284 src/win32/systray.c:359
+#: plugins/docklet/docklet.c:94 src/multi.c:285 src/win32/systray.c:359
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -36,11 +36,11 @@
 msgstr "新..."
 
 #: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
-#: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1179
-#: src/protocols/jabber/jabber.c:3402 src/protocols/jabber/jabber.c:3456
-#: src/protocols/oscar/oscar.c:2780 src/protocols/oscar/oscar.c:4456
-#: src/protocols/oscar/oscar.c:5333 src/protocols/oscar/oscar.c:5655
-#: src/gtkblist.c:1511 src/gtkpounce.c:564 src/prefs.c:1091
+#: src/protocols/irc/irc.c:1048 src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:3439 src/protocols/jabber/jabber.c:3493
+#: src/protocols/oscar/oscar.c:2799 src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:5362 src/protocols/oscar/oscar.c:5684
+#: src/gtkblist.c:1517 src/gtkpounce.c:566 src/gtkprefs.c:1092
 msgid "Away"
 msgstr "離開"
 
@@ -274,7 +274,7 @@
 msgid "Iconifies the away box and the buddy list when you go away."
 msgstr "當您離開時,隨即把好友清單及顯示離開訊息的視窗圖示化。"
 
-#: plugins/idle.c:78 src/protocols/irc/irc.c:951
+#: plugins/idle.c:78 src/protocols/irc/irc.c:952
 msgid "Idle Time"
 msgstr "閒置時間"
 
@@ -321,69 +321,69 @@
 msgid "Checks for new local mail."
 msgstr "替您檢查您的電腦上有沒有新郵件。"
 
-#: plugins/notify.c:439
+#: plugins/notify.c:442
 msgid "Unable to write to config file"
 msgstr "無法寫入設定檔案"
 
-#: plugins/notify.c:439
+#: plugins/notify.c:443
 msgid "Notify plugin"
 msgstr ""
 
-#: plugins/notify.c:569
+#: plugins/notify.c:573
 msgid "Notify For"
 msgstr ""
 
-#: plugins/notify.c:570
+#: plugins/notify.c:574
 msgid "_IM windows"
 msgstr "即時訊息視窗(_I)"
 
-#: plugins/notify.c:575
+#: plugins/notify.c:579
 msgid "_Chat windows"
 msgstr "群組聊天視窗(_C)"
 
 #. --------------
-#: plugins/notify.c:581
+#: plugins/notify.c:585
 msgid "Notification Methods"
 msgstr "通知方法"
 
-#: plugins/notify.c:584
+#: plugins/notify.c:588
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr "在視窗標題前加上下列文字(_S)(請按 Enter 鍵儲存):"
 
-#: plugins/notify.c:595
+#: plugins/notify.c:599
 msgid "_Quote window title"
 msgstr "在視窗標題加上引號(_Q)"
 
-#: plugins/notify.c:600
+#: plugins/notify.c:604
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "設定視窗管理程式用的「_URGENT」提示"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:609
 msgid "Insert c_ount of new messages into window title"
 msgstr "替視窗標題加上新訊息的數量(_O)"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:614
 msgid "_Notify even if conversation is in focus"
 msgstr "即使交談是在個已對準焦點(i_n focus)的視窗中,依舊發出通知"
 
 #. --------------
-#: plugins/notify.c:616
+#: plugins/notify.c:620
 msgid "Notification Removal"
 msgstr "何時移除通知"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:621
 msgid "Remove when conversation window gains _focus"
 msgstr "當交談的視窗被您對準了焦點(_focus)"
 
-#: plugins/notify.c:622
+#: plugins/notify.c:626
 msgid "Remove when conversation window _receives click"
 msgstr "當交談的視窗被您按了一下(_R)"
 
-#: plugins/notify.c:627
+#: plugins/notify.c:631
 msgid "Remove when _typing in conversation window"
 msgstr "當您在交談的視窗開始打字(_T)"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:636
 msgid "Appl_y"
 msgstr "立即使用(_Y)"
 
@@ -394,14 +394,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:695
+#: plugins/notify.c:699
 msgid "Message Notification"
-msgstr "通知收到訊息"
+msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:698 plugins/notify.c:700
+#: plugins/notify.c:702 plugins/notify.c:704
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "給您幾個不同的方法,通知您有未曾閱讀的即時訊息。"
 
@@ -585,7 +585,7 @@
 msgstr ""
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:605
+#: plugins/win32/transparency/win2ktrans.c:429 src/gtkprefs.c:606
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -639,7 +639,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特有選項"
 
-#: plugins/perl/perl.c:395
+#: plugins/perl/perl.c:396
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register 收到了無效的參數;請讀 PERL-HOWTO 的說明。"
 
@@ -650,13 +650,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1377
+#: plugins/perl/perl.c:1376
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1379 plugins/perl/perl.c:1380
+#: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
 msgid "Provides support for loading perl plugins."
 msgstr "給您支援載入用 Perl 寫的插件。"
 
@@ -680,11 +680,11 @@
 "idle."
 msgstr "在顯示交談內容的視窗中同時顯示好友的登出、離開及閒置。"
 
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1187
-#: src/protocols/msn/msn.c:314 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1190
+#: src/protocols/msn/msn.c:329 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:1269
-#: src/protocols/yahoo/yahoo.c:1348
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1273
+#: src/protocols/yahoo/yahoo.c:1352
 msgid "Available"
 msgstr "有空"
 
@@ -696,11 +696,11 @@
 msgid "Away for friends only"
 msgstr "離開了(只有好友可以看到我)"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3405
-#: src/protocols/jabber/jabber.c:3468 src/protocols/oscar/oscar.c:2784
-#: src/protocols/oscar/oscar.c:4444 src/protocols/oscar/oscar.c:4471
-#: src/protocols/oscar/oscar.c:5660 src/protocols/yahoo/yahoo.c:1086
-#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1358
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3442
+#: src/protocols/jabber/jabber.c:3505 src/protocols/oscar/oscar.c:2803
+#: src/protocols/oscar/oscar.c:4472 src/protocols/oscar/oscar.c:4499
+#: src/protocols/oscar/oscar.c:5689 src/protocols/yahoo/yahoo.c:1087
+#: src/protocols/yahoo/yahoo.c:1295 src/protocols/yahoo/yahoo.c:1362
 msgid "Invisible"
 msgstr "隱了身"
 
@@ -798,99 +798,99 @@
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "您給予了一個無效的 Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:591
+#: src/protocols/gg/gg.c:592
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:654
+#: src/protocols/gg/gg.c:655
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:660
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜尋引擎"
 
-#: src/protocols/gg/gg.c:684
+#: src/protocols/gg/gg.c:685
 msgid "Active"
 msgstr "啟動"
 
 # XXX the gtkft.c usage is not very good (in the source), ditto for "No" below
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1031
+#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1033
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1032
+#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1034
 msgid "No"
 msgstr "否"
 
-#: src/protocols/gg/gg.c:689
+#: src/protocols/gg/gg.c:690
 msgid "UIN"
 msgstr "帳號"
 
-#: src/protocols/gg/gg.c:693
+#: src/protocols/gg/gg.c:694
 msgid "First name"
 msgstr "名"
 
 # XXX blank out "Second Name" for now
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:699
 msgid "Second Name"
 msgstr " "
 
-#: src/protocols/gg/gg.c:702
+#: src/protocols/gg/gg.c:703
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:709 src/protocols/gg/gg.c:712
+#: src/protocols/gg/gg.c:710 src/protocols/gg/gg.c:713
 msgid "Birth year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:718 src/protocols/gg/gg.c:720
-#: src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:719 src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:723
 msgid "Sex"
 msgstr "性別"
 
 #. Line 5
-#: src/protocols/gg/gg.c:726 src/dialogs.c:2087 src/dialogs.c:2724
+#: src/protocols/gg/gg.c:727 src/dialogs.c:2028 src/dialogs.c:2667
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:758
+#: src/protocols/gg/gg.c:760
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "對不起,Gadu-Gadu 伺服器上並沒有儲存任何的好友清單!"
 
-#: src/protocols/gg/gg.c:764
+#: src/protocols/gg/gg.c:768
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器處匯入好友清單"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:829
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好友清單傳送到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:829
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好友清單到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:844
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友清單自 Gadu-Gadu 伺服器上刪除"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:851
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在 Gadu-Gadu 的伺服器上的好友清單"
 
-#: src/protocols/gg/gg.c:846
+#: src/protocols/gg/gg.c:859
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:865
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:962
+#: src/protocols/gg/gg.c:977
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "跟 Gadu-Gadu 的伺服器通訊時發生了錯誤。"
 
-#: src/protocols/gg/gg.c:963
+#: src/protocols/gg/gg.c:978
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -898,45 +898,45 @@
 "因為與 Gadu-Gadu 的 HTTP 伺服器通訊時出現了問題,您作的請求無法完成。請等一會"
 "後再重試。"
 
-#: src/protocols/gg/gg.c:990
+#: src/protocols/gg/gg.c:1006
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "無法匯入 Gadu-Gadu 好友清單"
 
-#: src/protocols/gg/gg.c:991
+#: src/protocols/gg/gg.c:1007
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 無法連接到 Gadu-Gadu 的好友清單伺服器。請等一會後再重試。"
 
-#: src/protocols/gg/gg.c:1059
+#: src/protocols/gg/gg.c:1076
 msgid "Couldn't export buddy list"
 msgstr "無法匯出好友清單"
 
-#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1082
+#: src/protocols/gg/gg.c:1077 src/protocols/gg/gg.c:1100
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 無法連接到好友清單伺服器。請等一會後再重試。"
 
-#: src/protocols/gg/gg.c:1081
+#: src/protocols/gg/gg.c:1099
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "無法刪除 Gadu-Gadu 的好友清單"
 
-#: src/protocols/gg/gg.c:1129
+#: src/protocols/gg/gg.c:1148
 msgid "Unable to access directory"
 msgstr "無法讀取目錄"
 
-#: src/protocols/gg/gg.c:1130
+#: src/protocols/gg/gg.c:1149
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr ""
 "Gaim 無法連接至目錄伺服器,以致無法為您在目錄中作搜尋。請等一會後再重試。"
 
-#: src/protocols/gg/gg.c:1162
+#: src/protocols/gg/gg.c:1182
 msgid "Unable to change Gadu-Gadu password"
 msgstr "無法更改 Gadu-Gadu 密碼"
 
-#: src/protocols/gg/gg.c:1163
+#: src/protocols/gg/gg.c:1183
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -944,33 +944,33 @@
 "因為連接到 Gadu-Gadu 的伺服器時發生了問題,Gaim 無法替您修改您的密碼。請等一"
 "會後再重試。"
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1199
 msgid "Directory Search"
 msgstr "目錄搜尋"
 
-#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4291
-#: src/protocols/oscar/oscar.c:5846 src/protocols/toc/toc.c:1449
-#: src/dialogs.c:2194 src/dialogs.c:2203
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:4328
+#: src/protocols/oscar/oscar.c:5882 src/protocols/toc/toc.c:1453
+#: src/dialogs.c:2137 src/dialogs.c:2146
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1193
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "自伺服器上匯入好友清單"
 
-#: src/protocols/gg/gg.c:1199
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "匯出好友清單到伺服器上"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: src/protocols/gg/gg.c:1237
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "無法存取您的個人檔案。"
 
-#: src/protocols/gg/gg.c:1238
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -988,7 +988,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1349 src/protocols/gg/gg.c:1351
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 通訊協定插件"
 
@@ -996,21 +996,26 @@
 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:2629
-#: src/dialogs.c:2491 src/gtkconv.c:806 src/gtkconv.c:2645 src/gtkconv.c:3791
-#: src/prpl.c:706
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2648
+#: src/dialogs.c:2434 src/gtkconv.c:807 src/gtkconv.c:2646 src/gtkconv.c:3790
+#: src/prpl.c:637
 msgid "Add"
 msgstr "增加"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1430
-#: src/protocols/oscar/oscar.c:2387 src/protocols/oscar/oscar.c:2450
-#: src/protocols/oscar/oscar.c:5534 src/protocols/toc/toc.c:1979
-#: src/buddy_chat.c:307 src/dialogs.c:467 src/dialogs.c:474 src/dialogs.c:482
-#: src/dialogs.c:2144 src/dialogs.c:2255 src/dialogs.c:2315 src/dialogs.c:2480
-#: src/dialogs.c:2666 src/dialogs.c:2815 src/dialogs.c:3460 src/dialogs.c:3952
-#: src/dialogs.c:4430 src/dialogs.c:5003 src/gtkft.c:1110 src/multi.c:1507
-#: src/multi.c:1871 src/prpl.c:250 src/prpl.c:706 src/server.c:1237
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1131
+#: src/protocols/irc/irc.c:1453 src/protocols/msn/msn.c:172
+#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:205 src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:2433 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:2508 src/protocols/oscar/oscar.c:5563
+#: src/protocols/oscar/oscar.c:5767 src/protocols/oscar/oscar.c:5815
+#: src/protocols/toc/toc.c:1991 src/protocols/yahoo/yahoo.c:1205
+#: src/buddy_chat.c:309 src/dialogs.c:468 src/dialogs.c:475 src/dialogs.c:483
+#: src/dialogs.c:2085 src/dialogs.c:2198 src/dialogs.c:2258 src/dialogs.c:2423
+#: src/dialogs.c:2609 src/dialogs.c:2758 src/dialogs.c:3406 src/dialogs.c:3898
+#: src/dialogs.c:4376 src/dialogs.c:4949 src/gtkft.c:1112 src/multi.c:1547
+#: src/multi.c:1911 src/prpl.c:637 src/server.c:1239
 msgid "Cancel"
 msgstr "取消"
 
@@ -1019,16 +1024,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:1682
-#: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:649
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
+#: src/protocols/msn/notification.c:444 src/protocols/msn/notification.c:719
+#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
 msgid "Authorize"
 msgstr "批准"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1682
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:650
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
-#: src/dialogs.c:2479
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
+#: src/protocols/msn/notification.c:445 src/protocols/msn/notification.c:720
+#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
+#: src/dialogs.c:2422
 msgid "Deny"
 msgstr "拒絕"
 
@@ -1036,11 +1041,11 @@
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2300
-#: src/protocols/jabber/jabber.c:2335 src/protocols/jabber/jabber.c:4208
-#: src/protocols/jabber/jabber.c:4255 src/protocols/msn/dispatch.c:165
-#: src/protocols/msn/msn.c:429 src/protocols/msn/notification.c:1238
-#: src/protocols/napster/napster.c:512
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2336
+#: src/protocols/jabber/jabber.c:2371 src/protocols/jabber/jabber.c:4245
+#: src/protocols/jabber/jabber.c:4292 src/protocols/msn/dispatch.c:165
+#: src/protocols/msn/msn.c:444 src/protocols/msn/notification.c:1279
+#: src/protocols/napster/napster.c:515
 msgid "Unable to connect"
 msgstr "無法連接"
 
@@ -1048,7 +1053,7 @@
 msgid "Connecting..."
 msgstr "連接中"
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3858
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3881
 msgid "Nick:"
 msgstr "暱稱:"
 
@@ -1062,12 +1067,12 @@
 "the Account Editor)"
 msgstr "(為這個訊息轉換編碼時出現了錯誤。請檢查帳戶的「編碼」設定是否有誤。)"
 
-#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2613
+#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2636
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "跟 %s 的 DCC 聊天經已結束"
 
-#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2622
+#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2645
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "和 %s 的 DCC 聊天已經被建立"
@@ -1076,166 +1081,178 @@
 msgid "No topic is set"
 msgstr "未有聊天主題"
 
-#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1752
+# XXX note: this message is displayed when the channel is *first* entered (!)
+#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1775
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
-msgstr "<B>%s 把聊天主題修改為:%s</B>"
+msgstr "<B>%s 設定了聊天主題為:%s</B>"
 
 #: src/protocols/irc/irc.c:757
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
-msgstr ""
-
-#: src/protocols/irc/irc.c:934 src/protocols/irc/irc.c:947
+msgstr "-:- 模式改變/%s [%c%c %s];更改者:%s"
+
+#: src/protocols/irc/irc.c:935 src/protocols/irc/irc.c:948
 msgid "User"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:938
+#: src/protocols/irc/irc.c:939
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:942 src/protocols/irc/irc.c:1096
-#: src/protocols/irc/irc.c:1644
+#: src/protocols/irc/irc.c:943 src/protocols/irc/irc.c:1109
+#: src/protocols/irc/irc.c:1667
 msgid "IRC Operator"
 msgstr "IRC 管理員"
 
-#: src/protocols/irc/irc.c:955
+#: src/protocols/irc/irc.c:956
 msgid "Channels"
 msgstr "頻道"
 
-#: src/protocols/irc/irc.c:961
+#: src/protocols/irc/irc.c:962
 #, c-format
 msgid "%s is an Identified User"
 msgstr "%s 是個身份經過驗證的使用者"
 
-#: src/protocols/irc/irc.c:976
+#: src/protocols/irc/irc.c:989
 #, c-format
 msgid "%ld seconds [signon: %s]"
-msgstr ""
+msgstr "%ld 秒 [登入時間:%s]"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1109
 msgid "Rehashing server"
 msgstr ""
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1099
+#: src/protocols/irc/irc.c:1112
 msgid "No such nick/channel"
-msgstr "沒有那個暱稱或頻道"
-
-#: src/protocols/irc/irc.c:1099 src/protocols/irc/irc.c:1102
-#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1110
-#: src/protocols/irc/irc.c:1459 src/protocols/irc/irc.c:1602
+msgstr "無此暱稱或頻道"
+
+#: src/protocols/irc/irc.c:1112 src/protocols/irc/irc.c:1115
+#: src/protocols/irc/irc.c:1120 src/protocols/irc/irc.c:1124
+#: src/protocols/irc/irc.c:1482 src/protocols/irc/irc.c:1625
 msgid "IRC Error"
 msgstr "IRC 錯誤"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1102
+#: src/protocols/irc/irc.c:1115
 msgid "No such server"
-msgstr "沒有那部伺服器"
+msgstr "無此伺服器"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1107
+#: src/protocols/irc/irc.c:1120
 msgid "No nickname given"
-msgstr "沒有給暱稱"
+msgstr "沒有給予暱稱"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1110
+#: src/protocols/irc/irc.c:1123
 msgid "You're not an IRC operator!"
 msgstr "您並非 IRC 管理員啊!"
 
-#: src/protocols/irc/irc.c:1113
+#: src/protocols/irc/irc.c:1127
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "這個暱稱已有別人用了,另選別的一個吧!"
 
-#: src/protocols/irc/irc.c:1393 src/protocols/irc/irc.c:1399
-#: src/protocols/irc/irc.c:1405 src/protocols/irc/irc.c:1419
+#. Build OK Button
+#: src/protocols/irc/irc.c:1130 src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/oscar/oscar.c:2432
+#: src/protocols/oscar/oscar.c:2507 src/protocols/oscar/oscar.c:5766
+#: src/protocols/oscar/oscar.c:5814 src/protocols/yahoo/yahoo.c:1204
+#: src/dialogs.c:2194 src/dialogs.c:2326 src/dialogs.c:2608 src/dialogs.c:2754
+#: src/dialogs.c:3891 src/dialogs.c:4370
+msgid "OK"
+msgstr "好!"
+
+#: src/protocols/irc/irc.c:1416 src/protocols/irc/irc.c:1422
+#: src/protocols/irc/irc.c:1428 src/protocols/irc/irc.c:1442
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 資訊"
 
-#: src/protocols/irc/irc.c:1429
+#: src/protocols/irc/irc.c:1452
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s 希望跟您做個 DCC 聊天"
 
-#: src/protocols/irc/irc.c:1430
+#: src/protocols/irc/irc.c:1453
 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:1430 src/protocols/oscar/oscar.c:2387
-#: src/protocols/oscar/oscar.c:5534
+#: src/protocols/irc/irc.c:1453 src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:5563
 msgid "Connect"
 msgstr "連接"
 
-#: src/protocols/irc/irc.c:1456
+#: src/protocols/irc/irc.c:1479
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "從 %s 收到了個無效的檔案傳輸要求。"
 
-#: src/protocols/irc/irc.c:1537 src/protocols/msn/error.c:132
-#: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:659
+#: src/protocols/irc/irc.c:1560 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:276 src/protocols/msn/notification.c:731
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: src/protocols/irc/irc.c:1600
+#: src/protocols/irc/irc.c:1623
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "您給人從 %s 趕走了:%s"
 
-#: src/protocols/irc/irc.c:1605
+#: src/protocols/irc/irc.c:1628
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "您被 %s 趕走了:%s"
 
-#: src/protocols/irc/irc.c:1661 src/protocols/irc/irc.c:2923
+#: src/protocols/irc/irc.c:1684 src/protocols/irc/irc.c:2946
 msgid "CTCP ClientInfo"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1667 src/protocols/irc/irc.c:2929
+#: src/protocols/irc/irc.c:1690 src/protocols/irc/irc.c:2952
 msgid "CTCP UserInfo"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1673 src/protocols/irc/irc.c:2935
+#: src/protocols/irc/irc.c:1696 src/protocols/irc/irc.c:2958
 msgid "CTCP Version"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1701 src/protocols/irc/irc.c:2941
+#: src/protocols/irc/irc.c:1724 src/protocols/irc/irc.c:2964
 msgid "CTCP Ping"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1954 src/protocols/oscar/oscar.c:693
+#: src/protocols/irc/irc.c:1977 src/protocols/oscar/oscar.c:695
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
-msgstr "登入:%s"
-
-#: src/protocols/irc/irc.c:2210
+msgstr "登入中:%s"
+
+#: src/protocols/irc/irc.c:2233
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s 的聊天主題為 %s"
 
-#: src/protocols/irc/irc.c:2306
+#: src/protocols/irc/irc.c:2329
 #, c-format
 msgid "You have left %s"
 msgstr "您離開了 %s"
 
-#: src/protocols/irc/irc.c:2307
+#: src/protocols/irc/irc.c:2330
 msgid "IRC Part"
 msgstr ""
 
-#: src/protocols/irc/irc.c:2362
+#: src/protocols/irc/irc.c:2385
 msgid "<I>Requesting DCC CHAT</I>"
-msgstr ""
-
-#: src/protocols/irc/irc.c:2379
+msgstr "<I>要求 DCC 聊天中</I>"
+
+#: src/protocols/irc/irc.c:2402
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>管理員專用指令:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2384
+#: src/protocols/irc/irc.c:2407
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1243,11 +1260,11 @@
 "<B>CTCP 指令:<BR>CLIENTINFO <暱稱><BR>USERINFO <暱稱><BR>VERSION <暱稱"
 "><BR>PING <暱稱></B><BR>"
 
-#: src/protocols/irc/irc.c:2392
+#: src/protocols/irc/irc.c:2415
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>DCC 指令:<BR>CHAT <暱稱></B>"
 
-#: src/protocols/irc/irc.c:2397
+#: src/protocols/irc/irc.c:2420
 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 "
@@ -1259,19 +1276,19 @@
 "WHOWAS<BR>輸入 /HELP OPER 列出管理員專用指令<BR>輸入 /HELP CTCP 列出CTCP 指令"
 "<BR>輸入 /HELP DCC 列出 DCC 指令"
 
-#: src/protocols/irc/irc.c:2420
+#: src/protocols/irc/irc.c:2443
 msgid "<B>Unknown command</B>"
 msgstr "<B>無此指令</B>"
 
-#: src/protocols/irc/irc.c:2480
+#: src/protocols/irc/irc.c:2503
 msgid "Channel:"
 msgstr "頻道:"
 
-#: src/protocols/irc/irc.c:2485 src/main.c:346 src/multi.c:773
+#: src/protocols/irc/irc.c:2508 src/main.c:350 src/multi.c:809
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/protocols/irc/irc.c:2910
+#: src/protocols/irc/irc.c:2933
 msgid "DCC Chat"
 msgstr "DCC 聊天"
 
@@ -1285,311 +1302,320 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3016 src/protocols/irc/irc.c:3018
+#: src/protocols/irc/irc.c:3039 src/protocols/irc/irc.c:3041
 msgid "IRC Protocol Plugin"
 msgstr "IRC 通訊協定插件"
 
-#: src/protocols/irc/irc.c:3038 src/protocols/jabber/jabber.c:2921
-#: src/protocols/jabber/jabber.c:4388 src/protocols/napster/napster.c:657
+#: src/protocols/irc/irc.c:3061 src/protocols/jabber/jabber.c:2958
+#: src/protocols/jabber/jabber.c:4425 src/protocols/napster/napster.c:660
 msgid "Server:"
 msgstr "伺服器:"
 
-#: src/protocols/irc/irc.c:3043 src/protocols/jabber/jabber.c:4399
-#: src/protocols/msn/msn.c:1208 src/protocols/napster/napster.c:663
-#: src/multi.c:1099
+#: src/protocols/irc/irc.c:3066 src/protocols/jabber/jabber.c:4436
+#: src/protocols/msn/msn.c:1223 src/protocols/napster/napster.c:666
+#: src/multi.c:1135
 msgid "Port:"
 msgstr "連接埠:"
 
-#: src/protocols/irc/irc.c:3049
+#: src/protocols/irc/irc.c:3072
 msgid "Encoding:"
 msgstr "編碼:"
 
-#: src/protocols/jabber/jabber.c:989
+#: src/protocols/jabber/jabber.c:990
 msgid "Unable to change password."
 msgstr "無法更改密碼"
 
-#: src/protocols/jabber/jabber.c:990
+#: src/protocols/jabber/jabber.c:991
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr "您沒有打對您的舊密碼,故此您的密碼沒被更改。"
 
-#: src/protocols/jabber/jabber.c:995
+#: src/protocols/jabber/jabber.c:997
 msgid "Unable to change password"
 msgstr "無法更改密碼"
 
-#: src/protocols/jabber/jabber.c:996
+#: src/protocols/jabber/jabber.c:998
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr "您打了的新密碼跟您的舊密碼一模一樣,故此您的密碼沒被更改。"
 
-#: src/protocols/jabber/jabber.c:1172 src/blist.c:712 src/gtkpounce.c:296
+#: src/protocols/jabber/jabber.c:1175 src/blist.c:714 src/gtkpounce.c:298
 msgid "Unknown"
 msgstr "未知"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1181 src/protocols/jabber/jabber.c:3401
-#: src/protocols/jabber/jabber.c:3452
+#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3489
 msgid "Chatty"
 msgstr "很想聊天"
 
-#: src/protocols/jabber/jabber.c:1183 src/protocols/jabber/jabber.c:3403
-#: src/protocols/jabber/jabber.c:3460
+#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3440
+#: src/protocols/jabber/jabber.c:3497
 msgid "Extended Away"
 msgstr "外出去了"
 
-#: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3404
-#: src/protocols/jabber/jabber.c:3464 src/protocols/oscar/oscar.c:2774
-#: src/protocols/oscar/oscar.c:4459 src/protocols/oscar/oscar.c:5656
+#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:3441
+#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2793
+#: src/protocols/oscar/oscar.c:4487 src/protocols/oscar/oscar.c:5685
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: src/protocols/jabber/jabber.c:1391
+#: src/protocols/jabber/jabber.c:1427
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 錯誤 %s"
 
-#: src/protocols/jabber/jabber.c:1498
+#: src/protocols/jabber/jabber.c:1534
 #, c-format
 msgid "Error %s: %s"
 msgstr "錯誤 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1501
+#: src/protocols/jabber/jabber.c:1537
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1677
+#: src/protocols/jabber/jabber.c:1713
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他的好友清單中。"
 
-#: src/protocols/jabber/jabber.c:1702
+#: src/protocols/jabber/jabber.c:1738
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1705
+#: src/protocols/jabber/jabber.c:1741
 msgid "No such user."
 msgstr "無此人。"
 
-#: src/protocols/jabber/jabber.c:1796 src/protocols/msn/notification.c:549
-#: src/protocols/msn/notification.c:705 src/protocols/msn/notification.c:706
-#: src/blist.c:437 src/dialogs.c:960
+#: src/protocols/jabber/jabber.c:1832 src/protocols/msn/notification.c:76
+#: src/protocols/msn/notification.c:77 src/protocols/msn/notification.c:619
+#: src/blist.c:438 src/dialogs.c:901
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1869
+#: src/protocols/jabber/jabber.c:1905
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:1903
+#: src/protocols/jabber/jabber.c:1939
 msgid "Unknown login error"
 msgstr "不明的登入錯誤"
 
-#: src/protocols/jabber/jabber.c:2253
+#: src/protocols/jabber/jabber.c:2289
 msgid "Password successfully changed."
 msgstr "密碼修改成功。"
 
-#: src/protocols/jabber/jabber.c:2298 src/protocols/jabber/jabber.c:4206
+#: src/protocols/jabber/jabber.c:2334 src/protocols/jabber/jabber.c:4243
 msgid "Connection lost"
 msgstr "失去連接"
 
-#: src/protocols/jabber/jabber.c:2306
+#: src/protocols/jabber/jabber.c:2342
 msgid "Connected"
 msgstr "連接成功"
 
-#: src/protocols/jabber/jabber.c:2309
+#: src/protocols/jabber/jabber.c:2345
 msgid "Requesting Authentication Method"
 msgstr "要求認證方式中"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2329 src/protocols/msn/dispatch.c:170
-#: src/protocols/msn/msn.c:423 src/protocols/napster/napster.c:504
-#: src/protocols/yahoo/yahoo.c:987
+#: src/protocols/jabber/jabber.c:2365 src/protocols/msn/dispatch.c:170
+#: src/protocols/msn/msn.c:438 src/protocols/napster/napster.c:507
+#: src/protocols/yahoo/yahoo.c:988
 msgid "Connecting"
 msgstr "連接中"
 
-#: src/protocols/jabber/jabber.c:2655
+#: src/protocols/jabber/jabber.c:2691
 #, 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:2657
+#: src/protocols/jabber/jabber.c:2693
+msgid "Unable to add buddy."
+msgstr "無法新增好友。"
+
+#: src/protocols/jabber/jabber.c:2694
 msgid "Jabber Error"
 msgstr "Jabber 錯誤"
 
-#: src/protocols/jabber/jabber.c:2916
+#: src/protocols/jabber/jabber.c:2953
 msgid "Room:"
 msgstr "聊天室:"
 
-#: src/protocols/jabber/jabber.c:2927
+#: src/protocols/jabber/jabber.c:2964
 msgid "Handle:"
 msgstr "暱稱:"
 
-#: src/protocols/jabber/jabber.c:2957
+#: src/protocols/jabber/jabber.c:2994
 msgid "Unable to join chat"
 msgstr "無法進入聊天室"
 
-#: src/protocols/jabber/jabber.c:3193 src/protocols/jabber/jabber.c:3244
-#: src/protocols/jabber/jabber.c:3669
+#: src/protocols/jabber/jabber.c:3230 src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3706
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
-#: src/protocols/jabber/jabber.c:3194
+#: src/protocols/jabber/jabber.c:3231
 msgid "Error"
 msgstr "錯誤"
 
-#: src/protocols/jabber/jabber.c:3245 src/protocols/jabber/jabber.c:3304
-#: src/protocols/jabber/jabber.c:3315 src/protocols/jabber/jabber.c:3695
+#: src/protocols/jabber/jabber.c:3282 src/protocols/jabber/jabber.c:3341
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3732
 msgid "Status"
 msgstr "狀態"
 
-#: src/protocols/jabber/jabber.c:3315 src/protocols/jabber/jabber.c:3337
-#: src/protocols/oscar/oscar.c:5337
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3374
+#: src/protocols/oscar/oscar.c:5366
 msgid "Not Authorized"
 msgstr "未獲批准"
 
-#: src/protocols/jabber/jabber.c:3350
+#: src/protocols/jabber/jabber.c:3387
 msgid "View Error Msg"
 msgstr "觀看錯誤訊息"
 
-#: src/protocols/jabber/jabber.c:3362 src/gtkconv.c:793
+#: src/protocols/jabber/jabber.c:3399 src/gtkconv.c:794
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/protocols/jabber/jabber.c:3369
+#: src/protocols/jabber/jabber.c:3406
 msgid "Un-hide From"
-msgstr "現身於"
-
-#: src/protocols/jabber/jabber.c:3372
+msgstr "現身給"
+
+#: src/protocols/jabber/jabber.c:3409
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 # XXX tentative translation
-#: src/protocols/jabber/jabber.c:3379
+#: src/protocols/jabber/jabber.c:3416
 msgid "Cancel Presence Notification"
 msgstr "取消通知在或不在"
 
-#: src/protocols/jabber/jabber.c:3387
+#: src/protocols/jabber/jabber.c:3424
 msgid "Re-request authorization"
 msgstr "再次要求批准您加其入好友清單"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3450
-#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4454
-#: src/protocols/oscar/oscar.c:5654 src/protocols/yahoo/yahoo.c:1090
-#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:872
-#: src/multi.c:274
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3487
+#: src/protocols/oscar/oscar.c:2805 src/protocols/oscar/oscar.c:4482
+#: src/protocols/oscar/oscar.c:5683 src/protocols/yahoo/yahoo.c:1091
+#: src/protocols/zephyr/zephyr.c:865 src/protocols/zephyr/zephyr.c:875
+#: src/multi.c:275
 msgid "Online"
 msgstr "在線"
 
-#: src/protocols/jabber/jabber.c:3590
+#: src/protocols/jabber/jabber.c:3627
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3591
+#: src/protocols/jabber/jabber.c:3628
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3592
+#: src/protocols/jabber/jabber.c:3629
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3593
+#: src/protocols/jabber/jabber.c:3630
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/jabber.c:3594 src/dialogs.c:2936
+# XXX should probably leave as "URL" in jabber.c, but translated in dialogs.c
+# XXX sigh, can't do that
+#: src/protocols/jabber/jabber.c:3631 src/dialogs.c:2879
 msgid "URL"
-msgstr "URL"
-
-#: src/protocols/jabber/jabber.c:3595
+msgstr "網址"
+
+#: src/protocols/jabber/jabber.c:3632
 msgid "Street Address"
 msgstr "街道地址"
 
 # XXX this probably means "second line of address"
-#: src/protocols/jabber/jabber.c:3596
+#: src/protocols/jabber/jabber.c:3633
 msgid "Extended Address"
 msgstr "    "
 
-#: src/protocols/jabber/jabber.c:3597
+# XXX wrong if used in HK
+#: src/protocols/jabber/jabber.c:3634
 msgid "Locality"
 msgstr "市╱村"
 
-#: src/protocols/jabber/jabber.c:3598
+# XXX wrong if used in HK
+#: src/protocols/jabber/jabber.c:3635
 msgid "Region"
 msgstr "省╱州"
 
-#: src/protocols/jabber/jabber.c:3599
+# XXX no consistency (Taiwan vs Canada)
+#: src/protocols/jabber/jabber.c:3636
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3600 src/dialogs.c:2109 src/dialogs.c:2742
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2050 src/dialogs.c:2685
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/jabber.c:3601
+#: src/protocols/jabber/jabber.c:3638
 msgid "Telephone"
 msgstr "電話號碼"
 
-#: src/protocols/jabber/jabber.c:3602 src/dialogs.c:2800
+#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2743
 msgid "Email"
 msgstr "電郵地址"
 
-#: src/protocols/jabber/jabber.c:3603
+#: src/protocols/jabber/jabber.c:3640
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: src/protocols/jabber/jabber.c:3604
+#: src/protocols/jabber/jabber.c:3641
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: src/protocols/jabber/jabber.c:3605
+#: src/protocols/jabber/jabber.c:3642
 msgid "Title"
 msgstr "職銜"
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3643
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/jabber.c:3607
+#: src/protocols/jabber/jabber.c:3644
 msgid "Birthday"
 msgstr "生日"
 
 # FIXME: prefs.c usage probably incompatible with other files!!! yuck!!!
-#: src/protocols/jabber/jabber.c:3608 src/dialogs.c:2946 src/prefs.c:428
-#: src/prefs.c:1403
+#: src/protocols/jabber/jabber.c:3645 src/dialogs.c:2889 src/gtkprefs.c:429
+#: src/gtkprefs.c:1404
 msgid "Description"
 msgstr "說明"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3670
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 "以下欄位您都可以選擇填或不填,不想填的都不用理會,只填寫您想填的便可以了"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/jabber.c:3671
 msgid "User Identity"
 msgstr "使用者識別"
 
-#: src/protocols/jabber/jabber.c:4060
+#: src/protocols/jabber/jabber.c:4097
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4135
+#: src/protocols/jabber/jabber.c:4172
 msgid "Server Registration successful!"
 msgstr "在伺服器註冊成功!"
 
-#: src/protocols/jabber/jabber.c:4162
+#: src/protocols/jabber/jabber.c:4199
 msgid "Unknown registration error"
 msgstr "不明的註冊錯誤"
 
-#: src/protocols/jabber/jabber.c:4277 src/protocols/oscar/oscar.c:5840
-#: src/protocols/toc/toc.c:1437 src/dialogs.c:2279
+#: src/protocols/jabber/jabber.c:4314 src/protocols/oscar/oscar.c:5876
+#: src/protocols/toc/toc.c:1441 src/dialogs.c:2222
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1603,20 +1629,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4366 src/protocols/jabber/jabber.c:4368
+#: src/protocols/jabber/jabber.c:4403 src/protocols/jabber/jabber.c:4405
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 通訊協定插件"
 
 # XXX
-#: src/protocols/jabber/jabber.c:4394
+#: src/protocols/jabber/jabber.c:4431
 msgid "Resource:"
 msgstr "資源:"
 
-#: src/protocols/jabber/jabber.c:4405
+#: src/protocols/jabber/jabber.c:4442
 msgid "Connect Server:"
 msgstr "接到伺服器:"
 
-#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:159
+#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:217
 msgid "Protocol not supported"
 msgstr "不支援這種通訊協定"
 
@@ -1624,7 +1650,7 @@
 msgid "Unable to request INF\n"
 msgstr ""
 
-#: src/protocols/msn/dispatch.c:69 src/protocols/msn/notification.c:183
+#: src/protocols/msn/dispatch.c:69 src/protocols/msn/notification.c:241
 msgid "Unable to login using MD5"
 msgstr "無法以 MD5 登入"
 
@@ -1632,9 +1658,9 @@
 msgid "Unable to send USR\n"
 msgstr "無法送出 USR\n"
 
-#: src/protocols/msn/dispatch.c:84 src/protocols/msn/notification.c:198
+#: src/protocols/msn/dispatch.c:84 src/protocols/msn/notification.c:256
 msgid "Requesting to send password"
-msgstr "現正要求向伺器傳出密碼"
+msgstr "向伺服器要求傳送密碼中"
 
 #: src/protocols/msn/dispatch.c:100
 msgid "Got invalid XFR\n"
@@ -1646,339 +1672,355 @@
 
 #: src/protocols/msn/dispatch.c:150
 msgid "Unable to parse message."
-msgstr ""
-
-#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:330
-#: src/protocols/msn/notification.c:1248
+msgstr "無法分析訊息。"
+
+#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:390
+#: src/protocols/msn/notification.c:1289
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1255
+#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1296
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
-#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1268
+#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1309
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
-#: src/protocols/msn/error.c:32
+#: src/protocols/msn/error.c:33
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "語法錯誤(大抵是 Gaim 的 Bug)"
 
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:37
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "參數無效(大抵是 Gaim 的 Bug)"
 
 # FIXME
-#: src/protocols/msn/error.c:39
+#: src/protocols/msn/error.c:40
 msgid "Invalid User"
-msgstr "無效的使用者"
-
-#: src/protocols/msn/error.c:43
+msgstr "使用者無效"
+
+#: src/protocols/msn/error.c:44
 msgid "Fully Qualified Domain Name missing"
-msgstr ""
-
-#: src/protocols/msn/error.c:46
+msgstr "沒有給予完整領域名稱 (FQDN)"
+
+#: src/protocols/msn/error.c:47
 msgid "Already Login"
 msgstr "已經登入"
 
-#: src/protocols/msn/error.c:49
+#: src/protocols/msn/error.c:50
 msgid "Invalid Username"
 msgstr "無效的使用者名稱"
 
-#: src/protocols/msn/error.c:52
+#: src/protocols/msn/error.c:53
 msgid "Invalid Friendly Name"
 msgstr "無效的易讀暱稱"
 
-#: src/protocols/msn/error.c:55
+#: src/protocols/msn/error.c:56
 msgid "List Full"
 msgstr "清單已滿"
 
-#: src/protocols/msn/error.c:58
+#: src/protocols/msn/error.c:59
 msgid "Already there"
-msgstr "己經在那裡"
-
-#: src/protocols/msn/error.c:61
+msgstr "已經在那裡"
+
+#: src/protocols/msn/error.c:62
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/error.c:64
+#: src/protocols/msn/error.c:65
 msgid "User is offline"
 msgstr "對方不在線上"
 
-#: src/protocols/msn/error.c:67
+#: src/protocols/msn/error.c:68
 msgid "Already in the mode"
-msgstr ""
-
-#: src/protocols/msn/error.c:70
+msgstr "已經在要求的模式下了"
+
+#: src/protocols/msn/error.c:71
 msgid "Already in opposite list"
-msgstr ""
-
-#: src/protocols/msn/error.c:74
+msgstr "同時在「被允許」和「被拒」的清單裡"
+
+#: src/protocols/msn/error.c:75
 msgid "Tried to add a contact to a group that doesn't exist"
-msgstr ""
-
-#: src/protocols/msn/error.c:78
+msgstr "試圖新增一個好友至一個不存在的群組"
+
+#: src/protocols/msn/error.c:79
 msgid "Switchboard failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:81
+#: src/protocols/msn/error.c:82
 msgid "Notify Transfer failed"
 msgstr ""
 
-#: src/protocols/msn/error.c:85
+#: src/protocols/msn/error.c:86
 msgid "Required fields missing"
-msgstr ""
-
-#: src/protocols/msn/error.c:88 src/protocols/oscar/oscar.c:194
+msgstr "必要的欄位沒有填上"
+
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#: src/protocols/msn/error.c:92
+#: src/protocols/msn/error.c:93
 msgid "Internal server error"
 msgstr "內部伺服器錯誤"
 
-#: src/protocols/msn/error.c:95
+#: src/protocols/msn/error.c:96
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
-#: src/protocols/msn/error.c:98
+#: src/protocols/msn/error.c:99
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
-#: src/protocols/msn/error.c:101
+#: src/protocols/msn/error.c:102
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:105
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: src/protocols/msn/error.c:108
+#: src/protocols/msn/error.c:109
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
-#: src/protocols/msn/error.c:111
+#: src/protocols/msn/error.c:112
 msgid "Server unavailable"
 msgstr "伺服器暫停使用"
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:115
 msgid "Peer Notification server down"
 msgstr ""
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:118
 msgid "Database connect error"
 msgstr "資料庫連接錯誤"
 
-#: src/protocols/msn/error.c:121
+#: src/protocols/msn/error.c:122
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器要停機了(快走罷!)"
 
-#: src/protocols/msn/error.c:125
+#: src/protocols/msn/error.c:126
 msgid "Error creating connection"
 msgstr "連接建立時發生了錯誤"
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:130
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: src/protocols/msn/error.c:135
+#: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "工作階段超載"
 
-#: src/protocols/msn/error.c:138
+#: src/protocols/msn/error.c:139
 msgid "User is too active"
 msgstr ""
 
-#: src/protocols/msn/error.c:141
+#: src/protocols/msn/error.c:142
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
 # FIXME
-#: src/protocols/msn/error.c:144
+#: src/protocols/msn/error.c:145
 msgid "Not expected"
 msgstr "沒有預期的"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:148
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:152
 msgid "Authentication failed"
 msgstr "認證失敗"
 
 # FIXME
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:155
 msgid "Not allowed when offline"
 msgstr "在離線時是不被允許的"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:158
 msgid "Not accepting new users"
 msgstr "暫時不接受新用戶"
 
-#: src/protocols/msn/error.c:161
+#: src/protocols/msn/error.c:162
 msgid "Passport account not yet verified"
-msgstr "您的 Passport 帳號未被確定"
-
-#: src/protocols/msn/error.c:165
+msgstr "您的 Passport 帳號未被驗證"
+
+#: src/protocols/msn/error.c:166
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "不明的錯誤代碼 %d"
 
-#: src/protocols/msn/msn.c:59
+#: src/protocols/msn/msn.c:60
 msgid "Your new MSN friendly name is too long."
 msgstr "您新設的易讀暱稱太長了。"
 
-#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:92
-#: src/protocols/msn/msn.c:150 src/protocols/msn/msn.c:473
-#: src/protocols/msn/msn.c:582 src/protocols/msn/msn.c:598
-#: src/protocols/msn/msn.c:633 src/protocols/msn/msn.c:649
-#: src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:690
-#: src/protocols/msn/msn.c:723 src/protocols/msn/msn.c:732
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:757
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:782
-#: src/protocols/msn/msn.c:804 src/protocols/msn/msn.c:855
-#: src/protocols/msn/msn.c:894 src/protocols/msn/msn.c:986
-#: src/protocols/msn/msn.c:1009 src/protocols/msn/msn.c:1024
-#: src/protocols/msn/msn.c:1036 src/protocols/msn/msn.c:1058
-#: src/protocols/msn/msn.c:1068 src/protocols/msn/notification.c:55
-#: src/protocols/msn/notification.c:85 src/protocols/msn/notification.c:858
+#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:91
+#: src/protocols/msn/msn.c:149 src/protocols/msn/msn.c:488
+#: src/protocols/msn/msn.c:597 src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:648 src/protocols/msn/msn.c:664
+#: src/protocols/msn/msn.c:696 src/protocols/msn/msn.c:705
+#: src/protocols/msn/msn.c:738 src/protocols/msn/msn.c:747
+#: src/protocols/msn/msn.c:762 src/protocols/msn/msn.c:772
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:797
+#: src/protocols/msn/msn.c:819 src/protocols/msn/msn.c:870
+#: src/protocols/msn/msn.c:909 src/protocols/msn/msn.c:1001
+#: src/protocols/msn/msn.c:1024 src/protocols/msn/msn.c:1039
+#: src/protocols/msn/msn.c:1051 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1083 src/protocols/msn/notification.c:113
+#: src/protocols/msn/notification.c:143 src/protocols/msn/notification.c:900
 msgid "Write error"
-msgstr ""
-
-#: src/protocols/msn/msn.c:162
-msgid "Set Friendly Name:"
-msgstr "設定易讀的暱稱:"
-
-#: src/protocols/msn/msn.c:171
-msgid "Set Home Phone Number:"
-msgstr "您的住宅電話號碼:"
-
-#: src/protocols/msn/msn.c:181
-msgid "Set Work Phone Number:"
-msgstr "您的辦公電話號碼:"
+msgstr "寫入錯誤"
+
+#: src/protocols/msn/msn.c:167
+msgid "Set your friendly name."
+msgstr "設定易讀暱稱。"
+
+#: src/protocols/msn/msn.c:168
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "您在 MSN 的暱稱將會如此顯示。"
+
+#: src/protocols/msn/msn.c:180
+msgid "Set your home phone number."
+msgstr "您的設定住宅電話號碼:"
 
 #: src/protocols/msn/msn.c:191
-msgid "Set Mobile Phone Number:"
-msgstr "您的手提電話號碼:"
+msgid "Set your work phone number."
+msgstr "您的辦公電話號碼:"
 
 #: src/protocols/msn/msn.c:202
+msgid "Set your mobile phone number."
+msgstr "您的手提電話號碼:"
+
+#: src/protocols/msn/msn.c:214
 msgid "MSN Mobile Support"
-msgstr ""
-
-#: src/protocols/msn/msn.c:203
+msgstr "MSN 對行動裝置的支援"
+
+#: src/protocols/msn/msn.c:215
 msgid "Do you want to enable or disable MSN Mobile device support?"
-msgstr ""
-
-#: src/protocols/msn/msn.c:206
-msgid "Enable"
-msgstr ""
-
-#: src/protocols/msn/msn.c:207
-msgid "Disable"
-msgstr ""
-
-#: src/protocols/msn/msn.c:217
-msgid "MSN Mobile Pages"
-msgstr ""
+msgstr "您要啟用 MSN 對行動裝置的支援麼?"
 
 #: src/protocols/msn/msn.c:218
+msgid "Enable"
+msgstr "啟用"
+
+#: src/protocols/msn/msn.c:219
+msgid "Disable"
+msgstr "停用"
+
+#: src/protocols/msn/msn.c:229
+msgid "MSN Mobile Pages"
+msgstr "MSN 傳呼"
+
+#: src/protocols/msn/msn.c:230
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you "
 "mobile pages?"
 msgstr "您允許好友清單內的人透過您的手機傳呼您嗎?"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:233
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:234
 msgid "Disallow"
 msgstr "拒絕"
 
-#: src/protocols/msn/msn.c:239
-msgid "Send message:"
-msgstr "送出訊息:"
-
-#: src/protocols/msn/msn.c:302 src/protocols/yahoo/yahoo.c:1141
+#: src/protocols/msn/msn.c:251
+msgid "Send a mobile message."
+msgstr "向手機送出訊息"
+
+#: src/protocols/msn/msn.c:253
+msgid "Page"
+msgstr "傳呼"
+
+#: src/protocols/msn/msn.c:254 src/about.c:169 src/dialogs.c:4185
+#: src/prpl.c:428 src/prpl.c:737 src/server.c:1430
+msgid "Close"
+msgstr "關閉"
+
+#: src/protocols/msn/msn.c:317 src/protocols/yahoo/yahoo.c:1142
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態:</b>%s"
 
-#: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:330 src/protocols/msn/msn.c:573
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:560
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1068
-#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1349
+#: src/protocols/msn/msn.c:331 src/protocols/msn/msn.c:575
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1069
+#: src/protocols/yahoo/yahoo.c:1277 src/protocols/yahoo/yahoo.c:1353
 msgid "Be Right Back"
 msgstr "很快就會回來"
 
-#: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:562
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1070
-#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1350
+#: src/protocols/msn/msn.c:332 src/protocols/msn/msn.c:577
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1354
 msgid "Busy"
 msgstr "忙碌中"
 
-#: src/protocols/msn/msn.c:318 src/protocols/msn/msn.c:564
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1078
-#: src/protocols/yahoo/yahoo.c:1283 src/protocols/yahoo/yahoo.c:1354
+#: src/protocols/msn/msn.c:333 src/protocols/msn/msn.c:579
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1079
+#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1358
 msgid "On The Phone"
 msgstr "通電話中"
 
-#: src/protocols/msn/msn.c:319 src/protocols/msn/msn.c:566
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1082
-#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1356
+#: src/protocols/msn/msn.c:334 src/protocols/msn/msn.c:581
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1083
+#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1360
 msgid "Out To Lunch"
 msgstr "去吃午飯了"
 
-#: src/protocols/msn/msn.c:320 src/protocols/msn/msn.c:568
-#: src/protocols/zephyr/zephyr.c:859 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/msn/msn.c:335 src/protocols/msn/msn.c:583
+#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:877
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:332
+#: src/protocols/msn/msn.c:347
 msgid "Set Friendly Name"
 msgstr "設定易讀暱稱"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:355
 msgid "Set Home Phone Number"
 msgstr "設定住宅電話號碼"
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:361
 msgid "Set Work Phone Number"
 msgstr "設定辦公電話號碼"
 
-#: src/protocols/msn/msn.c:352
+#: src/protocols/msn/msn.c:367
 msgid "Set Mobile Phone Number"
 msgstr "設定手提電話號碼"
 
-#: src/protocols/msn/msn.c:361
+#: src/protocols/msn/msn.c:376
 msgid "Enable/Disable Mobile Devices"
-msgstr ""
-
-#: src/protocols/msn/msn.c:368
+msgstr "啟用╱停用行動裝置"
+
+#: src/protocols/msn/msn.c:383
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許╱拒絕傳呼"
 
-#: src/protocols/msn/msn.c:390
+#: src/protocols/msn/msn.c:405
 msgid "Send to Mobile"
 msgstr "傳送至手機"
 
-#: src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:677
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
 "%s@hotmail.com. No changes were made to your allow list."
 msgstr ""
-
-#: src/protocols/msn/msn.c:666 src/protocols/msn/msn.c:707
+"MSN 的暱稱必須像「user@server.com」一樣,但是您打算「允許」的好友暱稱並不乎合"
+"這個指定的格式,所以您的「允許」清單沒有被修改。"
+"也許您是想輸入「%s@hotmail.com」?"
+
+#: src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:722
 msgid "Invalid MSN screenname"
 msgstr "無效的 MSN 賬號"
 
-#: src/protocols/msn/msn.c:703
+#: src/protocols/msn/msn.c:718
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -1995,61 +2037,61 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1182 src/protocols/msn/msn.c:1184
+#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1199
 msgid "MSN Protocol Plugin"
 msgstr "MSN 通訊協定插件"
 
-#: src/protocols/msn/msn.c:1202
+#: src/protocols/msn/msn.c:1217
 msgid "Login Server:"
 msgstr "伺服器:"
 
-#: src/protocols/msn/notification.c:166
+#: src/protocols/msn/notification.c:224
 msgid "Unable to request INF"
 msgstr ""
 
-#: src/protocols/msn/notification.c:192
+#: src/protocols/msn/notification.c:250
 msgid "Unable to send USR"
 msgstr ""
 
-#: src/protocols/msn/notification.c:222
+#: src/protocols/msn/notification.c:282
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:306
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/notification.c:252
+#: src/protocols/msn/notification.c:312
 msgid "Password sent"
 msgstr "密碼已送出"
 
-#: src/protocols/msn/notification.c:269
+#: src/protocols/msn/notification.c:329
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "因為您由其他的地方登入,您已被拆接了。"
 
-#: src/protocols/msn/notification.c:275
+#: src/protocols/msn/notification.c:335
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "因為 MSN 的伺服器要暫停維修,您已被拆接了。"
 
-#: src/protocols/msn/notification.c:370
+#: src/protocols/msn/notification.c:440
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s(%s)想要將 %s 加入他的好友清單。"
 
-#: src/protocols/msn/notification.c:643
+#: src/protocols/msn/notification.c:713
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "使用者 %s(%s)想要將您加入他的好友清單。"
 
-#: src/protocols/msn/notification.c:1040
+#: src/protocols/msn/notification.c:1082
 msgid "Got invalid XFR"
 msgstr ""
 
-#: src/protocols/msn/notification.c:1083
+#: src/protocols/msn/notification.c:1125
 msgid "Unable to transfer to notification server"
 msgstr ""
 
-#: src/protocols/msn/notification.c:1209
+#: src/protocols/msn/notification.c:1251
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -2060,8 +2102,8 @@
 "sign in."
 msgstr ""
 
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1088
-#: src/gtkpounce.c:568 src/prefs.c:1107
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1089
+#: src/gtkpounce.c:570 src/gtkprefs.c:1108
 msgid "Idle"
 msgstr "閒置"
 
@@ -2072,13 +2114,9 @@
 #: src/protocols/msn/switchboard.c:125
 #, c-format
 msgid "%s has closed the conversation window."
-msgstr ""
-
-#.
-#. * TODO: Investigate this, as it seems to occur frequently with
-#. *       the old prpl.
-#.
-#: src/protocols/msn/switchboard.c:224
+msgstr "%s 已關閉了他那邊這段交談的視窗了。"
+
+#: src/protocols/msn/switchboard.c:225
 msgid "An MSN message may not have been received."
 msgstr "有個 MSN 訊息可能沒被收到。"
 
@@ -2089,46 +2127,42 @@
 #: src/protocols/napster/napster.c:326
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
-msgstr ""
+msgstr "使用者:%s個、檔案:%s個、大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
 #: src/protocols/napster/napster.c:337
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr ""
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:344
+msgstr "無法加「%s」到您的 Napster 書籤裡去"
+
+#: src/protocols/napster/napster.c:345
 msgid "You were disconnected from the server."
 msgstr "您給伺服器拆接了。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:400
+#: src/protocols/napster/napster.c:401
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 要求了您的個人資料。"
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/napster/napster.c:429
+#: src/protocols/napster/napster.c:431
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "因為您由其他的地方登入,您已被拆接了。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:434
+#: src/protocols/napster/napster.c:437
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:548 src/gtkblist.c:1494
+#: src/protocols/napster/napster.c:551 src/gtkblist.c:1500
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/napster/napster.c:562 src/protocols/oscar/oscar.c:5060
-#: src/protocols/toc/toc.c:1191
+#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5089
+#: src/protocols/toc/toc.c:1195
 msgid "Join what group:"
 msgstr "加入群組:"
 
@@ -2142,7 +2176,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:638 src/protocols/napster/napster.c:640
+#: src/protocols/napster/napster.c:641 src/protocols/napster/napster.c:643
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 通訊協定插件"
 
@@ -2156,15 +2190,15 @@
 
 #: src/protocols/oscar/oscar.c:192
 msgid "Rate to host"
-msgstr ""
+msgstr "傳至主機之速率"
 
 #: src/protocols/oscar/oscar.c:193
 msgid "Rate to client"
-msgstr ""
+msgstr "至客戶端之速率"
 
 #: src/protocols/oscar/oscar.c:195
 msgid "Service unavailable"
-msgstr ""
+msgstr "服務暫停使用"
 
 #: src/protocols/oscar/oscar.c:196
 msgid "Service not defined"
@@ -2176,15 +2210,15 @@
 
 #: src/protocols/oscar/oscar.c:198
 msgid "Not supported by host"
-msgstr ""
+msgstr "不被主機支援"
 
 #: src/protocols/oscar/oscar.c:199
 msgid "Not supported by client"
-msgstr ""
+msgstr "不被客戶端支援"
 
 #: src/protocols/oscar/oscar.c:200
 msgid "Refused by client"
-msgstr ""
+msgstr "給客戶端拒絕了"
 
 #: src/protocols/oscar/oscar.c:201
 msgid "Reply too big"
@@ -2196,7 +2230,7 @@
 
 #: src/protocols/oscar/oscar.c:203
 msgid "Request denied"
-msgstr ""
+msgstr "要求被拒"
 
 #: src/protocols/oscar/oscar.c:204
 msgid "Busted SNAC payload"
@@ -2204,7 +2238,7 @@
 
 #: src/protocols/oscar/oscar.c:205
 msgid "Insufficient rights"
-msgstr ""
+msgstr "權限不夠"
 
 #: src/protocols/oscar/oscar.c:206
 msgid "In local permit/deny"
@@ -2212,11 +2246,11 @@
 
 #: src/protocols/oscar/oscar.c:207
 msgid "Too evil (sender)"
-msgstr ""
+msgstr "發訊者不懷好意"
 
 #: src/protocols/oscar/oscar.c:208
 msgid "Too evil (receiver)"
-msgstr ""
+msgstr "收訊者不懷好意"
 
 #: src/protocols/oscar/oscar.c:209
 msgid "User temporarily unavailable"
@@ -2257,65 +2291,65 @@
 msgid "Disconnected."
 msgstr "拆接了。"
 
-#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:854
+#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:855
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 拆接了。"
 
-#: src/protocols/oscar/oscar.c:571
+#: src/protocols/oscar/oscar.c:572
 msgid "Chat is currently unavailable"
 msgstr "暫時不能交談"
 
-#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:706
+#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:708
 msgid "Couldn't connect to host"
 msgstr "無法連接到伺服器"
 
-#: src/protocols/oscar/oscar.c:688
+#: src/protocols/oscar/oscar.c:690
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:799 src/protocols/oscar/oscar.c:1182
+#: src/protocols/oscar/oscar.c:801 src/protocols/oscar/oscar.c:1187
 msgid "Could Not Connect"
 msgstr "無法連接"
 
-#: src/protocols/oscar/oscar.c:806
+#: src/protocols/oscar/oscar.c:808
 msgid "Connection established, cookie sent"
 msgstr "連接成功,並已送出了 Cookie"
 
-#: src/protocols/oscar/oscar.c:873 src/protocols/oscar/oscar.c:884
-#: src/protocols/oscar/oscar.c:888
+#: src/protocols/oscar/oscar.c:875 src/protocols/oscar/oscar.c:887
+#: src/protocols/oscar/oscar.c:892
 msgid "File Transfer Aborted"
 msgstr "檔案傳輸已經異常中止了"
 
-#: src/protocols/oscar/oscar.c:873
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish listener socket."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:884
+#: src/protocols/oscar/oscar.c:888
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案描述符"
 
-#: src/protocols/oscar/oscar.c:888
+#: src/protocols/oscar/oscar.c:893
 msgid "Unable to create new connection."
 msgstr "無法建立新的連接"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1072 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1077 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1081
 msgid "Your account is currently suspended."
 msgstr "您的帳戶給吊銷了。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1080
+#: src/protocols/oscar/oscar.c:1085
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時傳訊系統服務目前暫停服務。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1084
+#: src/protocols/oscar/oscar.c:1089
 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."
@@ -2324,52 +2358,52 @@
 "間。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1088
+#: src/protocols/oscar/oscar.c:1093
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請更新到 %s 或更新的版本。"
 
-#: src/protocols/oscar/oscar.c:1092 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1097 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "認證失敗"
 
-#: src/protocols/oscar/oscar.c:1120
+#: src/protocols/oscar/oscar.c:1125
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1221 src/protocols/oscar/oscar.c:1250
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1226 src/protocols/oscar/oscar.c:1256
+#: src/protocols/oscar/oscar.c:1344
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"您很有可能很快便會被拆接。在問題被解決前,您可以考慮改用 TOC。請到 %s 找更新"
-"了的版本。"
-
-#: src/protocols/oscar/oscar.c:1223 src/protocols/oscar/oscar.c:1252
+"您很有可能很快便會被拆接。在找到解決這種問題的方案前,您可以考慮改用 TOC。"
+"當您要尋找新版本時,請到 %s 找。"
+
+#: src/protocols/oscar/oscar.c:1229 src/protocols/oscar/oscar.c:1259
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1338
+#: src/protocols/oscar/oscar.c:1347
 msgid "Gaim was Unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1892 src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:1901 src/protocols/oscar/oscar.c:5407
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "成功建立了和 %s 的直接即時訊息"
 
-#: src/protocols/oscar/oscar.c:2219 src/protocols/oscar/oscar.c:2241
+#: src/protocols/oscar/oscar.c:2228 src/protocols/oscar/oscar.c:2250
 msgid "(There was an error receiving this message)"
 msgstr "(接收這個訊息時發生了錯誤)"
 
-#: src/protocols/oscar/oscar.c:2386
+#: 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:2387
+#: src/protocols/oscar/oscar.c:2396
 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 "
@@ -2378,20 +2412,20 @@
 "傳送圖像必須和對方直接連接。對方可因此獲知您的 IP 位址,這可能會對您的隱私構"
 "成危險。"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2422
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
 # FIXME... still a bad translation
-#: src/protocols/oscar/oscar.c:2421
+#: src/protocols/oscar/oscar.c:2430
 msgid "Authorization Request Message:"
 msgstr "要求批准加別人到您的好友清單,請輸入您的理由:"
 
-#: src/protocols/oscar/oscar.c:2421
+#: src/protocols/oscar/oscar.c:2431
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2459
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -2399,23 +2433,23 @@
 msgstr ""
 "使用者 %s 要任何人加到好友清單前,都要他事先批准。您想向他作出這個要求嗎?"
 
-#: src/protocols/oscar/oscar.c:2450
+#: src/protocols/oscar/oscar.c:2463
 msgid "Request Authorization"
 msgstr "要求批准您加其入好友清單"
 
-#: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2486
-#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2560
-#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2940
-#: src/protocols/oscar/oscar.c:2991 src/protocols/oscar/oscar.c:4985
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:2497 src/protocols/oscar/oscar.c:2499
+#: src/protocols/oscar/oscar.c:2506 src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2591 src/protocols/oscar/oscar.c:2960
+#: src/protocols/oscar/oscar.c:3012 src/protocols/oscar/oscar.c:5014
+#: src/protocols/oscar/oscar.c:5056
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2492
+#: src/protocols/oscar/oscar.c:2505
 msgid "Authorization Denied Message:"
 msgstr "要求批准被拒,理由如下:"
 
-#: src/protocols/oscar/oscar.c:2560
+#: src/protocols/oscar/oscar.c:2577
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
@@ -2424,11 +2458,11 @@
 "使用者 %lu 想要將您加入他的好友清單中,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
+#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
 msgid "Authorization Request"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2574
+#: src/protocols/oscar/oscar.c:2591
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -2438,17 +2472,17 @@
 "使用者 %lu 拒絕了您將其加入好友清單的要求,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2575
+#: src/protocols/oscar/oscar.c:2592
 msgid "ICQ authorization denied."
 msgstr "要求批准被拒。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2581
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "使用者 %lu 批准了您的要求,您可以加他到您的好友清單了。"
 
-#: src/protocols/oscar/oscar.c:2588
+#: src/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2461,7 +2495,7 @@
 "發訊人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2596
+#: src/protocols/oscar/oscar.c:2615
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2474,7 +2508,7 @@
 "發訊人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2604
+#: src/protocols/oscar/oscar.c:2623
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2487,34 +2521,34 @@
 "內文:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2625
+#: src/protocols/oscar/oscar.c:2644
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "ICQ 使用者 %lu 傳給了您一個好友:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2648
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您想將他(她)加入到您的好友清單中嗎?"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2648
 msgid "Decline"
 msgstr "不加了"
 
-#: src/protocols/oscar/oscar.c:2711
+#: src/protocols/oscar/oscar.c:2730
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了由 %2$s 送來的 %1$hu 個訊息,因為那是個無效的訊息。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$hu 個訊息,因為那些都是無效的訊息。"
 
-#: src/protocols/oscar/oscar.c:2720
+#: src/protocols/oscar/oscar.c:2739
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了由 %2$s 送來的 %1$hu 個訊息,因為這個訊息太大了。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$hu 個訊息,因為這些訊息都太大了。"
 
-#: src/protocols/oscar/oscar.c:2729
+#: src/protocols/oscar/oscar.c:2748
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2525,170 +2559,170 @@
 msgstr[1] ""
 "您遺失了由 %2$s 送來的 %1$hu 個訊息,因為訊息的發送速率已超過了上限。"
 
-#: src/protocols/oscar/oscar.c:2738
+#: src/protocols/oscar/oscar.c:2757
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了由 %2$s 送來的 %1$hu 個訊息,因為發訊人可能不懷好意。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$hu 個訊息,因為發訊人可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:2747
+#: src/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了由 %2$s 送來的 %1$d 個訊息,因為您可能不懷好意。"
 msgstr[1] "您遺失了由 %2$s 送來的 %1$d 個訊息,因為您可能不懷好意。"
 
-#: src/protocols/oscar/oscar.c:2756
+#: src/protocols/oscar/oscar.c:2775
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
 msgstr[1] "您因為不明的原因,而遺失了由 %2$s 送來的 %1$d 個訊息。"
 
-#: src/protocols/oscar/oscar.c:2772 src/protocols/oscar/oscar.c:4468
-#: src/protocols/oscar/oscar.c:5659
+#: src/protocols/oscar/oscar.c:2791 src/protocols/oscar/oscar.c:4496
+#: src/protocols/oscar/oscar.c:5688
 msgid "Free For Chat"
 msgstr "可和我聊天"
 
-#: src/protocols/oscar/oscar.c:2776 src/protocols/oscar/oscar.c:4462
-#: src/protocols/oscar/oscar.c:5657
+#: src/protocols/oscar/oscar.c:2795 src/protocols/oscar/oscar.c:4490
+#: src/protocols/oscar/oscar.c:5686
 msgid "Not Available"
 msgstr "不在"
 
-#: src/protocols/oscar/oscar.c:2778 src/protocols/oscar/oscar.c:4465
-#: src/protocols/oscar/oscar.c:5658
+#: src/protocols/oscar/oscar.c:2797 src/protocols/oscar/oscar.c:4493
+#: src/protocols/oscar/oscar.c:5687
 msgid "Occupied"
 msgstr "忙碌中"
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:2801
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2842
+#: src/protocols/oscar/oscar.c:2861
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:2863
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2922
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:2904
+#: src/protocols/oscar/oscar.c:2923
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2939
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
-#: src/protocols/oscar/oscar.c:2990
+#: src/protocols/oscar/oscar.c:3010
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "找不到使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3023
+#: src/protocols/oscar/oscar.c:3044
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/protocols/oscar/oscar.c:3026
+#: src/protocols/oscar/oscar.c:3047
 msgid "Voice"
 msgstr "聲音"
 
-#: src/protocols/oscar/oscar.c:3029 src/protocols/oscar/oscar.c:5683
+#: src/protocols/oscar/oscar.c:3050 src/protocols/oscar/oscar.c:5712
 msgid "Direct IM"
 msgstr "直接即時訊息"
 
-#: src/protocols/oscar/oscar.c:3032 src/gtkblist.c:1503
+#: src/protocols/oscar/oscar.c:3053 src/gtkblist.c:1509
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3035 src/protocols/oscar/oscar.c:5695
+#: src/protocols/oscar/oscar.c:3056 src/protocols/oscar/oscar.c:5724
 msgid "Get File"
 msgstr "接收文件"
 
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5689
+#: src/protocols/oscar/oscar.c:3059 src/protocols/oscar/oscar.c:5718
 msgid "Send File"
 msgstr "傳送文件"
 
-#: src/protocols/oscar/oscar.c:3042
+#: src/protocols/oscar/oscar.c:3063
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3045
+#: src/protocols/oscar/oscar.c:3066
 msgid "Add-Ins"
 msgstr "插件"
 
-#: src/protocols/oscar/oscar.c:3048
+#: src/protocols/oscar/oscar.c:3069
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3072
 msgid "EveryBuddy Bug"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3054
+msgstr "EveryBuddy 錯誤"
+
+#: src/protocols/oscar/oscar.c:3075
 msgid "AP User"
 msgstr "AP 用戶"
 
-#: src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:3078
 msgid "ICQ RTF"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3060
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:3081
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3063
+#: src/protocols/oscar/oscar.c:3084
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3066
+#: src/protocols/oscar/oscar.c:3087
 msgid "ICQ Unknown"
 msgstr "不明的 ICQ 功能"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3090
 msgid "Trillian Encryption"
 msgstr "Trillian 加密功能"
 
-#: src/protocols/oscar/oscar.c:3072
+#: src/protocols/oscar/oscar.c:3093
 msgid "ICQ UTF8"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3111
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3132
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "無法給您顯示收到的資料,因為不知道這些資料的內碼是什麼。"
 
-#: src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3139
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "自 <b>%s</b> 已登入<br>\n"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3144
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "自 <b>%s</b> 已使用這個服務<br>\n"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3150
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "閒置了 <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3153
 msgid "Idle: <b>Active</b>"
 msgstr "<b>沒有閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3134
+#: src/protocols/oscar/oscar.c:3155
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2701,28 +2735,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:3166
+#: src/protocols/oscar/oscar.c:3187
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3198
 msgid "Client Capabilities: "
-msgstr "Client 相容性:"
-
-#: src/protocols/oscar/oscar.c:3183
+msgstr "客戶端相容性:"
+
+#: src/protocols/oscar/oscar.c:3204
 msgid "<i>No Information Provided</i>"
 msgstr "<i>未有提供任何信息</i>"
 
-# XXX improper translation here
-#: src/protocols/oscar/oscar.c:3206
+#: src/protocols/oscar/oscar.c:3228
 msgid "Your AIM connection may be lost."
-msgstr "您的 AIM 可能已拆接了。"
-
-#: src/protocols/oscar/oscar.c:3567
+msgstr "您的 AIM 連接可能已被切斷了。"
+
+#: src/protocols/oscar/oscar.c:3589
 msgid "Rate limiting error."
-msgstr "速率限制錯誤"
-
-#: src/protocols/oscar/oscar.c:3568
+msgstr "速率限制錯誤。"
+
+#: src/protocols/oscar/oscar.c:3590
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
@@ -2730,199 +2763,210 @@
 "因為您已經超過了發送訊息速率的上限,您最近的訊息未能送出。請等待十秒後再試一"
 "次。"
 
-#: src/protocols/oscar/oscar.c:3627
+#: src/protocols/oscar/oscar.c:3650
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "因為您用同一帳號已經由其他的地方登入,您已被拆接了。"
 
-#: src/protocols/oscar/oscar.c:3629
+#: src/protocols/oscar/oscar.c:3652
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明的原因,已經給自動登出了。"
 
-#: src/protocols/oscar/oscar.c:3856
+#: src/protocols/oscar/oscar.c:3879
 msgid "UIN:"
 msgstr "帳號:"
 
-#: src/protocols/oscar/oscar.c:3861
+#: src/protocols/oscar/oscar.c:3884
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3887
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3867 src/protocols/oscar/oscar.c:3873
+#: src/protocols/oscar/oscar.c:3890 src/protocols/oscar/oscar.c:3896
 msgid "Email Address:"
 msgstr "電郵地址:"
 
-#: src/protocols/oscar/oscar.c:3878
-msgid "Mobile Phone:"
-msgstr "手機號碼:"
-
-#: src/protocols/oscar/oscar.c:3881
-msgid "Gender:"
-msgstr "性別:"
-
-#: src/protocols/oscar/oscar.c:3881
-msgid "Female"
-msgstr "女"
-
-#: src/protocols/oscar/oscar.c:3881
-msgid "Male"
-msgstr "男"
-
-#: src/protocols/oscar/oscar.c:3890
-msgid "Birthday:"
-msgstr "生日:"
-
-#: src/protocols/oscar/oscar.c:3895
-msgid "Age:"
-msgstr "年齡:"
-
-#: src/protocols/oscar/oscar.c:3898
-msgid "Personal Web Page:"
-msgstr "個人網頁:"
-
 #: src/protocols/oscar/oscar.c:3901
-msgid "Additional Information:"
-msgstr "自訂資料:"
-
-#: src/protocols/oscar/oscar.c:3905
-msgid "Home Address:"
-msgstr "住宅地址"
-
-#: src/protocols/oscar/oscar.c:3907 src/protocols/oscar/oscar.c:3923
-msgid "Address:"
-msgstr "街道地址"
-
-#: src/protocols/oscar/oscar.c:3910 src/protocols/oscar/oscar.c:3926
-msgid "City:"
-msgstr "城市:"
-
-#: src/protocols/oscar/oscar.c:3913 src/protocols/oscar/oscar.c:3929
-msgid "State:"
-msgstr "省/州:"
-
-#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
-msgid "Zip Code:"
-msgstr "郵區號碼:"
+msgid "Mobile Phone:"
+msgstr "手機號碼:"
+
+#: src/protocols/oscar/oscar.c:3904
+msgid "Gender:"
+msgstr "性別:"
+
+#: src/protocols/oscar/oscar.c:3904
+msgid "Female"
+msgstr "女"
+
+#: src/protocols/oscar/oscar.c:3904
+msgid "Male"
+msgstr "男"
+
+#: src/protocols/oscar/oscar.c:3913
+msgid "Birthday:"
+msgstr "生日:"
+
+#: src/protocols/oscar/oscar.c:3918
+msgid "Age:"
+msgstr "年齡:"
 
 #: src/protocols/oscar/oscar.c:3921
+msgid "Personal Web Page:"
+msgstr "個人網頁:"
+
+#: src/protocols/oscar/oscar.c:3924
+msgid "Additional Information:"
+msgstr "自訂資料:"
+
+#: src/protocols/oscar/oscar.c:3928
+msgid "Home Address:"
+msgstr "住宅地址"
+
+#: src/protocols/oscar/oscar.c:3930 src/protocols/oscar/oscar.c:3946
+msgid "Address:"
+msgstr "街道地址"
+
+#: src/protocols/oscar/oscar.c:3933 src/protocols/oscar/oscar.c:3949
+msgid "City:"
+msgstr "城市:"
+
+#: src/protocols/oscar/oscar.c:3936 src/protocols/oscar/oscar.c:3952
+msgid "State:"
+msgstr "省╱州:"
+
+#: src/protocols/oscar/oscar.c:3939 src/protocols/oscar/oscar.c:3955
+msgid "Zip Code:"
+msgstr "郵區號碼:"
+
+#: src/protocols/oscar/oscar.c:3944
 msgid "Work Address:"
 msgstr "辦公地址:"
 
-#: src/protocols/oscar/oscar.c:3937
+#: src/protocols/oscar/oscar.c:3960
 msgid "Work Information:"
-msgstr "工作方面的資料:"
-
-#: src/protocols/oscar/oscar.c:3939
+msgstr "工作詳情:"
+
+#: src/protocols/oscar/oscar.c:3962
 msgid "Company:"
 msgstr "所屬機構:"
 
-#: src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3965
 msgid "Division:"
 msgstr "所屬部門:"
 
-#: src/protocols/oscar/oscar.c:3945
+#: src/protocols/oscar/oscar.c:3968
 msgid "Position:"
 msgstr "職位:"
 
-#: src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3971
 msgid "Web Page:"
 msgstr "網址:"
 
-#: src/protocols/oscar/oscar.c:4016
+#: src/protocols/oscar/oscar.c:4039
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 有下列暱稱:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4034
+#: src/protocols/oscar/oscar.c:4057
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到有關郵址 %s 的資料"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4078
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您會收到一封叫您確認 %s 的電郵。"
 
-#: src/protocols/oscar/oscar.c:4057
+#: src/protocols/oscar/oscar.c:4080
 msgid "Account Confirmation Requested"
 msgstr "送出了確認帳號的要求"
 
-#: src/protocols/oscar/oscar.c:4085
+#: src/protocols/oscar/oscar.c:4108
 msgid "Error Changing Account Info"
 msgstr "無法更改帳戶資料"
 
-#: src/protocols/oscar/oscar.c:4088
+# XXX with interpretative comment
+#: src/protocols/oscar/oscar.c:4111
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4091
+"錯誤 0x%04x: 無法把您的暱稱改成您所指定的格式,因為不計算大小寫和空白,新舊暱"
+"稱並不一樣。"
+
+#: src/protocols/oscar/oscar.c:4114
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4094
+"錯誤 0x%04x: 無法把您的暱稱改成您所指定的格式,因為您所指定的新暱稱以空白收"
+"尾。"
+
+#: src/protocols/oscar/oscar.c:4117
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4097
+"錯誤 0x%04x: 無法把您的暱稱改成您所指定的格式,因為您所指定的新暱稱太長了。"
+
+# XXX with interpretation (don't know whether it's right)
+#: src/protocols/oscar/oscar.c:4120
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4100
+"錯誤 0x%04x: 無法修改您的電郵地址,因為伺服器還未做完您先前所要求的其他修改。"
+
+#: src/protocols/oscar/oscar.c:4123
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4103
+"錯誤 0x%04x: 無法修改您的電郵地址,因為已經有太多暱稱使用這個電郵地址了。"
+
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4106
+msgstr "錯誤 0x%04x: 無法修改您的電郵地址,因為這並非一個有效的電郵地址。"
+
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4116
+msgstr "錯誤 0x%04x: 不明的錯誤。"
+
+#: src/protocols/oscar/oscar.c:4139
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
+"您的暱稱目前的顯示格式是這樣的:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:4140 src/protocols/oscar/oscar.c:4146
 msgid "Account Info"
 msgstr "帳戶資料"
 
-#: src/protocols/oscar/oscar.c:4122
+#: src/protocols/oscar/oscar.c:4145
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電郵地址是 %s。"
 
-#: src/protocols/oscar/oscar.c:4344
+#: src/protocols/oscar/oscar.c:4367
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 的個人檔案。"
 
-#: src/protocols/oscar/oscar.c:4345
+#: src/protocols/oscar/oscar.c:4368
 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 "
@@ -2931,22 +2975,22 @@
 "您大概在登入完了之前就已經要求修改您的個人檔案了;故此,您的個人檔案未能成功"
 "修改。請待您登入完了之後再試試重改一遍。"
 
-#: src/protocols/oscar/oscar.c:4372
+#: src/protocols/oscar/oscar.c:4397
 #, 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:4374
+#: src/protocols/oscar/oscar.c:4399
 msgid "Profile too long."
 msgstr "您的個人檔案太大了。"
 
-#: src/protocols/oscar/oscar.c:4390
+#: src/protocols/oscar/oscar.c:4415
 msgid "Unable to set AIM away message."
 msgstr "無法為 AIM 設定離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4391
+#: src/protocols/oscar/oscar.c:4416
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2955,22 +2999,22 @@
 "您大概在登入完了之前就已經嘗試設定您的離開訊息了;故此,您的狀態仍然是"
 "「在」。請您等到登入完了之後重試。"
 
-#: src/protocols/oscar/oscar.c:4427
+#: src/protocols/oscar/oscar.c:4455
 #, 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:4429
+#: src/protocols/oscar/oscar.c:4457
 msgid "Away message too long."
 msgstr "離開訊息太長"
 
-#: src/protocols/oscar/oscar.c:4642
+#: src/protocols/oscar/oscar.c:4670
 msgid "Unable To Retrive Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4642
+#: src/protocols/oscar/oscar.c:4671
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -2979,12 +3023,13 @@
 "Gaim 暫時無法從 AIM 的伺服器讀取您的好友清單。您的好友清單依然健在;幾個鐘頭"
 "後應該再次可用。"
 
-#: src/protocols/oscar/oscar.c:4732 src/protocols/oscar/oscar.c:4733
-#: src/protocols/oscar/oscar.c:4738
+# XXX did not check context
+#: src/protocols/oscar/oscar.c:4761 src/protocols/oscar/oscar.c:4762
+#: src/protocols/oscar/oscar.c:4767
 msgid "Orphans"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4902
+msgstr "無組孤兒"
+
+#: src/protocols/oscar/oscar.c:4931
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -2993,15 +3038,15 @@
 "無法把 %s 新增到您的好友清單內,因為您的好友清單已有太多好友了。您可以從好友"
 "清單內移除掉一個好友,再試試看。"
 
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:4931 src/protocols/oscar/oscar.c:4944
 msgid "(no name)"
 msgstr "【無名氏】"
 
-#: src/protocols/oscar/oscar.c:4903 src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4932 src/protocols/oscar/oscar.c:4945
 msgid "Unable To Add"
 msgstr "無法新增"
 
-#: src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:4944
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3010,18 +3055,18 @@
 msgstr ""
 "無法新增好友 %s,但原因不明。最常見的原因是您已有太多好友在好友清單內了。"
 
-#: src/protocols/oscar/oscar.c:4950
+#: src/protocols/oscar/oscar.c:4979
 #, 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:4955
+#: src/protocols/oscar/oscar.c:4984
 msgid "Authorization Given"
 msgstr "要求已獲批准"
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3029,17 +3074,17 @@
 msgstr "使用者 %s 想將您加入他的好友清單中,理由如下:%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5052
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "使用者 %s 允許了您將其加入您的好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5053
 msgid "Authorization Granted"
 msgstr "要求已獲批准"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5056
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3047,119 +3092,121 @@
 "%s"
 msgstr "使用者 %s 拒絕了您將其加入您的好友清單的要求,理由如下:"
 
-#: src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:5057
 msgid "Authorization Denied"
 msgstr "要求批准被拒"
 
-# XXX unknown meaning -> probably mistranslated
-#: src/protocols/oscar/oscar.c:5065 src/protocols/toc/toc.c:1196
+# XXX tentative translation. see irc log on 20030523
+#: src/protocols/oscar/oscar.c:5094 src/protocols/toc/toc.c:1200
 msgid "Exchange:"
-msgstr "交換:"
-
-#: src/protocols/oscar/oscar.c:5285
+msgstr "聊天室號碼:"
+
+#: src/protocols/oscar/oscar.c:5314
 msgid "<b>Status:</b> "
 msgstr "<b>狀態:</b>"
 
-#: src/protocols/oscar/oscar.c:5294
+#: src/protocols/oscar/oscar.c:5323
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入了</b> "
 
 # Context: amount of time logged in
-#: src/protocols/oscar/oscar.c:5301
+#: src/protocols/oscar/oscar.c:5330
 msgid "<b>Capabilities:</b> "
 msgstr "<b>通訊協定相容性:</b>"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5338
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態:</b>未獲批准"
 
-#: src/protocols/oscar/oscar.c:5313 src/gtkblist.c:855
+#: src/protocols/oscar/oscar.c:5342 src/gtkblist.c:861
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態:</b>離線"
 
-#: src/protocols/oscar/oscar.c:5339
+#: src/protocols/oscar/oscar.c:5368
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5520
+#: src/protocols/oscar/oscar.c:5549
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:5533
+#: src/protocols/oscar/oscar.c:5562
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 連接起來,作直接的即時訊息。"
 
-#: src/protocols/oscar/oscar.c:5534
+#: src/protocols/oscar/oscar.c:5563
 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:5673
+#: src/protocols/oscar/oscar.c:5702
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:5707
+#: src/protocols/oscar/oscar.c:5736
 msgid "Re-request Authorization"
 msgstr "再次要求批准您加其入好友清單"
 
-#: src/protocols/oscar/oscar.c:5728
+#: src/protocols/oscar/oscar.c:5757
 msgid "The new formatting is invalid."
 msgstr "新的顯示格式並不有效。"
 
-#: src/protocols/oscar/oscar.c:5729
+#: src/protocols/oscar/oscar.c:5758
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "更改帳號的顯示格式,祗可更改大小寫,及加減空白。"
 
-#: src/protocols/oscar/oscar.c:5735
+#: src/protocols/oscar/oscar.c:5764
 msgid "New screenname formatting:"
 msgstr "帳號的顯示格式應該是這樣的:"
 
-#: src/protocols/oscar/oscar.c:5780
-msgid "Change Address To: "
+#: src/protocols/oscar/oscar.c:5813
+msgid "Change Address To:"
 msgstr "註冊電郵地址應為:"
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:5826
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "下列的好友仍未批准您加其入好友清單:<BR>"
 
-#: src/protocols/oscar/oscar.c:5815
+#: src/protocols/oscar/oscar.c:5851
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>沒有人未批准您</i>"
 
-#: src/protocols/oscar/oscar.c:5820
+#: src/protocols/oscar/oscar.c:5856
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
 "clicking on them and clicking \"Re-request authorization.\""
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:5853
+"%s<BR><BR>希望再次要求這些好友批准您加他們入好友清單,您可以在好友清單用滑鼠"
+"右鍵按一下好友的名字,再按一下「再次要求批准您加其入好友清單」即可。"
+
+#: src/protocols/oscar/oscar.c:5889
 msgid "Change Password (URL)"
 msgstr "修改密碼 (URL)"
 
-#: src/protocols/oscar/oscar.c:5864
+#: src/protocols/oscar/oscar.c:5900
 msgid "Format Screenname"
 msgstr "設定帳號的顯示格式"
 
-#: src/protocols/oscar/oscar.c:5870
+#: src/protocols/oscar/oscar.c:5906
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:5876
+#: src/protocols/oscar/oscar.c:5912
 msgid "Display Current Registered Address"
 msgstr "顯示您目前註了冊的電郵地址"
 
-#: src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:5918
 msgid "Change Current Registered Address"
 msgstr "更改您的註冊電郵地址"
 
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:5927
 msgid "Show Buddies Awaiting Authorization"
 msgstr "列出有誰仍未批准您"
 
-#: src/protocols/oscar/oscar.c:5899
+#: src/protocols/oscar/oscar.c:5935
 msgid "Search for Buddy by Email"
 msgstr "以電郵地址找尋好友"
 
@@ -3173,15 +3220,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6019 src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6057
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 通訊協定插件"
 
-#: src/protocols/oscar/oscar.c:6039
+#: src/protocols/oscar/oscar.c:6075
 msgid "Auth Host:"
 msgstr "認證伺服器:"
 
-#: src/protocols/oscar/oscar.c:6045
+#: src/protocols/oscar/oscar.c:6081
 msgid "Auth Port:"
 msgstr "連接埠號碼:"
 
@@ -3315,68 +3362,74 @@
 msgid "Waiting for reply..."
 msgstr "等待回覆中"
 
-#: src/protocols/toc/toc.c:684
+#: src/protocols/toc/toc.c:685
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:873
+#: src/protocols/toc/toc.c:874
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:876
+#: src/protocols/toc/toc.c:878
 msgid "TOC has sent a PAUSE command."
-msgstr ""
-
-#: src/protocols/toc/toc.c:876
+msgstr "TOC 傳來了一個 PAUSE 指令。"
+
+#: src/protocols/toc/toc.c:879
 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 "
 "is only temporary, please be patient."
 msgstr ""
-
-#: src/protocols/toc/toc.c:1319
+"在這情況下,TOC 不但不會理會您送出去的訊息,它甚至會因為您試圖送出訊息而趕您"
+"走。幸好,這種情形祗會是暫時性的;請您耐心等待。"
+
+#: src/protocols/toc/toc.c:1323
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1443
+#: src/protocols/toc/toc.c:1447
 msgid "Set Dir Info"
-msgstr ""
-
-#: src/protocols/toc/toc.c:1566
+msgstr "設定目錄內的資訊"
+
+#: src/protocols/toc/toc.c:1570
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s,或該檔案無法寫入!"
 
-#: src/protocols/toc/toc.c:1644 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1891
+#: src/protocols/toc/toc.c:1606
+msgid "File transfer failed; other side probably canceled."
+msgstr ""
+
+#: src/protocols/toc/toc.c:1651 src/protocols/toc/toc.c:1691
+#: src/protocols/toc/toc.c:1903
 msgid "Could not connect for transfer."
 msgstr "無法連接,也無法傳輸了。"
 
-#: src/protocols/toc/toc.c:1806
+#: src/protocols/toc/toc.c:1815
 msgid "Could not connect for transfer!"
 msgstr "無法連接,也無法傳輸了!"
 
-#: src/protocols/toc/toc.c:1838
+#: src/protocols/toc/toc.c:1848
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1936 src/gtkft.c:1056
+#: src/protocols/toc/toc.c:1948 src/gtkft.c:1058
 msgid "Gaim - Save As..."
-msgstr "Gaim - 儲存為…"
-
-#: src/protocols/toc/toc.c:1970
+msgstr "Gaim - 儲存為..."
+
+#: src/protocols/toc/toc.c:1982
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1977
+#: src/protocols/toc/toc.c:1989
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送一個檔案給他。"
 
-#: src/protocols/toc/toc.c:1979 src/gtkft.c:1109 src/server.c:1237
+#: src/protocols/toc/toc.c:1991 src/gtkft.c:1111 src/server.c:1239
 msgid "Accept"
 msgstr "接受"
 
@@ -3390,56 +3443,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2049 src/protocols/toc/toc.c:2051
+#: src/protocols/toc/toc.c:2061 src/protocols/toc/toc.c:2063
 msgid "TOC Protocol Plugin"
 msgstr "TOC 通訊協定插件"
 
-#: src/protocols/toc/toc.c:2069
+#: src/protocols/toc/toc.c:2081
 msgid "TOC Host:"
 msgstr "TOC 主機:"
 
-#: src/protocols/toc/toc.c:2075
+#: src/protocols/toc/toc.c:2087
 msgid "TOC Port:"
 msgstr "TOC 連接埠:"
 
-#: src/protocols/yahoo/yahoo.c:604
+#: src/protocols/yahoo/yahoo.c:605
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 短訊沒有被送出。"
 
-#: src/protocols/yahoo/yahoo.c:1072 src/protocols/yahoo/yahoo.c:1277
-#: src/protocols/yahoo/yahoo.c:1351
+#: src/protocols/yahoo/yahoo.c:1073 src/protocols/yahoo/yahoo.c:1281
+#: src/protocols/yahoo/yahoo.c:1355
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1074 src/protocols/yahoo/yahoo.c:1279
-#: src/protocols/yahoo/yahoo.c:1352
+#: src/protocols/yahoo/yahoo.c:1075 src/protocols/yahoo/yahoo.c:1283
+#: src/protocols/yahoo/yahoo.c:1356
 msgid "Not At Desk"
-msgstr "從書卓走開了"
-
-#: src/protocols/yahoo/yahoo.c:1076 src/protocols/yahoo/yahoo.c:1281
-#: src/protocols/yahoo/yahoo.c:1353
+msgstr "離開了書卓"
+
+#: src/protocols/yahoo/yahoo.c:1077 src/protocols/yahoo/yahoo.c:1285
+#: src/protocols/yahoo/yahoo.c:1357
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:1080 src/protocols/yahoo/yahoo.c:1285
-#: src/protocols/yahoo/yahoo.c:1355
+#: src/protocols/yahoo/yahoo.c:1081 src/protocols/yahoo/yahoo.c:1289
+#: src/protocols/yahoo/yahoo.c:1359
 msgid "On Vacation"
 msgstr "放了假"
 
-#: src/protocols/yahoo/yahoo.c:1084 src/protocols/yahoo/yahoo.c:1289
-#: src/protocols/yahoo/yahoo.c:1357
+#: src/protocols/yahoo/yahoo.c:1085 src/protocols/yahoo/yahoo.c:1293
+#: src/protocols/yahoo/yahoo.c:1361
 msgid "Stepped Out"
 msgstr "外出一會"
 
-#: src/protocols/yahoo/yahoo.c:1209
+#: src/protocols/yahoo/yahoo.c:1202
+msgid "Active which ID?"
+msgstr "啟動那個帳號?"
+
+#: src/protocols/yahoo/yahoo.c:1213
 msgid "Activate ID"
-msgstr "啟動帳戶"
-
-#: src/protocols/yahoo/yahoo.c:1434
+msgstr "啟動帳號"
+
+#: src/protocols/yahoo/yahoo.c:1438
 msgid "Pager Host:"
 msgstr "傳呼台主機:"
 
-#: src/protocols/yahoo/yahoo.c:1440
+#: src/protocols/yahoo/yahoo.c:1444
 msgid "Pager Port:"
 msgstr "連接埠號碼:"
 
@@ -3453,7 +3510,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1526 src/protocols/yahoo/yahoo.c:1528
+#: src/protocols/yahoo/yahoo.c:1530 src/protocols/yahoo/yahoo.c:1532
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 通訊協定插件"
 
@@ -3465,46 +3522,49 @@
 #: src/protocols/zephyr/zephyr.c:338
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
-msgstr ""
+msgstr "<b>別名:</b>%s<br>"
 
 #: src/protocols/zephyr/zephyr.c:340
 msgid "<br>Hidden or not logged-in"
-msgstr ""
+msgstr "<br>隱了身,或者根本沒有登入"
 
 #: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<br>At %s since %s"
-msgstr ""
+msgstr "<br>從 %2$s 起已經在 %1$s"
 
 #: src/protocols/zephyr/zephyr.c:573 src/protocols/zephyr/zephyr.c:574
 msgid "Anyone"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:597
+msgstr "任何人"
+
+#: src/protocols/zephyr/zephyr.c:598
 msgid "Already logged in with Zephyr"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:597
+msgstr "已經登入了 Zephyr"
+
+# XXX the translated text is an interpretation, perhaps should redo it
+#: src/protocols/zephyr/zephyr.c:599
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:844
+msgstr "因為 Zephyr 用您登入系統的帳號,您是不可能擁有多個 Zephyr 帳戶的。"
+
+#: src/protocols/zephyr/zephyr.c:847
 msgid "ZLocate"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:884
+msgstr "ZLocate"
+
+# XXX From Google, a zephyr class is actually like a semi-private chat room
+#: src/protocols/zephyr/zephyr.c:887
 msgid "Class:"
-msgstr "類別:"
-
-#: src/protocols/zephyr/zephyr.c:889
+msgstr ""
+
+# XXX From Google, a zephyr instance is actually like a newsgroup or a chat room
+#: src/protocols/zephyr/zephyr.c:892
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:894
+#: src/protocols/zephyr/zephyr.c:897
 msgid "Recipient:"
-msgstr ""
+msgstr "收訊人:"
 
 #. *< api_version
 #. *< type
@@ -3516,14 +3576,14 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1026 src/protocols/zephyr/zephyr.c:1028
+#: src/protocols/zephyr/zephyr.c:1029 src/protocols/zephyr/zephyr.c:1031
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 通訊協定插件"
 
 #: src/about.c:74
 #, c-format
 msgid "About Gaim v%s"
-msgstr "關於 Gaim v%s"
+msgstr "關於 Gaim(第%s版)"
 
 #: src/about.c:106
 msgid ""
@@ -3531,9 +3591,9 @@
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
-"Gaim 是一個模組化的即時傳訊系統,同時提供 AIM、ICQ、Yahoo!、MSN、IRC、"
-"Jabber、Napster、Zephyr 以及 Gadu-Gadu 等多種功能。以 GTK+ 台階開發,"
-"以 GPL 的方式發佈。<BR><BR>"
+"Gaim 係一個模組化的即時傳訊系統,同時提供 AIM、ICQ、Yahoo!、MSN、IRC、"
+"Jabber、Napster、Zephyr 以及 Gadu-Gadu 等多種功能。透過 GTK+ 台階開發,以 "
+"GPL 的方式授權發佈。<BR><BR>"
 
 #: src/about.c:116
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
@@ -3556,14 +3616,14 @@
 "  Rob Flynn (維護者) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
 "A>&gt;<BR>  Sean Egan (首席開發者) &lt;<A HREF=\"mailto:bj91704@binghamton."
 "edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian Hammond 號 'ChipX86' (開"
-"發者兼網路管理員)<BR>  Herman Bloggs (win32 移植者) &lt;<A HREF=\"mailto:"
+"發者兼網路管理員)<BR>  Herman Bloggs (移植至 win32) &lt;<A HREF=\"mailto:"
 "hermanator12002@yahoo.com\">hermanator12002@yahoo.com</A>&gt;<BR>  Nathan "
 "Walp 號 'faceprint' (開發者)<BR>  Mark Doliner 號 'KingAnt' (開發者)<BR>  "
 "Luke Schierer 號 'LSchiere' (用者支援)<BR><BR>"
 
 #: src/about.c:137
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
-msgstr "<FONT SIZE=\"3\">極賣力的修補檔案編寫者:</FONT><BR>"
+msgstr "<FONT SIZE=\"3\">異常賣力的修補檔案編寫者:</FONT><BR>"
 
 #: src/about.c:147
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
@@ -3582,14 +3642,9 @@
 "&lt;<A HREF=\"mailto:warmenhoven@yahoo.com\">warmenhoven@yahoo.com</A>&gt;"
 "<BR>  Jim Duchek (前任維護者)<BR>  Jim Seymour (前任 Jabber 開發者)<BR>  "
 "Mark Spencer (原著者) &lt;<A HREF=\"mailto:markster@marko.net"
-"\">markster@marko.net</A>&gt;<BR>  Syd Logan (程式編寫者及御用司機【懶人】)"
+"\">markster@marko.net</A>&gt;<BR>  Syd Logan (程式編寫者兼御用司機【懶人】)"
 "<BR><BR>"
 
-#: src/about.c:169 src/dialogs.c:4239 src/prpl.c:500 src/prpl.c:806
-#: src/server.c:1428
-msgid "Close"
-msgstr "關閉"
-
 #: src/away.c:221
 msgid "Gaim - Away!"
 msgstr "Gaim - 離開!"
@@ -3610,92 +3665,95 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:365 src/prefs.c:1812
+#: src/blist.c:366 src/gtkprefs.c:1813
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:677
+#: src/blist.c:678
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies, and the group were not removed.\n"
 msgstr ""
-
-#: src/blist.c:681
-msgid "Group Not Removed"
-msgstr ""
-
-#: src/blist.c:848
+"%2$s 群組內有 %1$d 個好友沒有登入,故此,他們沒有從群組中移除掉;這些好友以及"
+"其群組都沒有被移除掉。\n"
+
+#: src/blist.c:683
+msgid "Group not removed"
+msgstr "群組沒有被移除"
+
+#: src/blist.c:850
 msgid "Invalid Groupname"
-msgstr ""
-
-#: src/blist.c:1570
+msgstr "無效的群組名稱"
+
+#: src/blist.c:1572
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-
-#: src/blist.c:1572
+msgstr "無沒分析您的好友清單,所以沒有讀入它了。"
+
+#: src/blist.c:1574
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1578
+#: src/blist.c:1580
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
 msgstr ""
-
-#: src/blist.c:1581
+"Gaim 現正把您的好友清單轉換成新的格式;新的好友清單檔案將會在 %s 那裡。"
+
+#: src/blist.c:1583
 msgid "Converting Buddy List"
-msgstr ""
-
-#: src/browser.c:426 src/browser.c:453
+msgstr "轉換好友清單中"
+
+#: src/browser.c:429 src/browser.c:457
 msgid ""
-"Communication with the browser failed.  Please close all windows and try "
+"Communication with the browser failed. Please close all windows and try "
 "again."
-msgstr ""
-
-#: src/browser.c:586
+msgstr "無法與瀏覽器聯絡;請關閉所有視窗之後再行重試。"
+
+#: src/browser.c:591
 msgid ""
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
-msgstr ""
-
-#: src/browser.c:601
+msgstr "無法執行您的瀏覽器,因為您選了「自訂」瀏覽器,卻沒有設定自訂的指令。"
+
+#: src/browser.c:609
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
-msgstr ""
-
-#: src/buddy_chat.c:249 src/dialogs.c:1405
+msgstr "試圖執行您選擇了的瀏覽器「%s」時遇到了錯誤"
+
+#: src/buddy_chat.c:250
 msgid ""
-"You are not currently signed on with any protocols that have the ability to "
+"You are not currently signed on wit any protocols that have the ability to "
 "chat."
-msgstr "您現時用以登入的通訊協定當中,並沒任何一個是可供您聊天的。"
-
-#: src/buddy_chat.c:262
+msgstr "您現時用以登入的通訊協定當中,並沒有可讓您聊天的通訊協定。"
+
+#: src/buddy_chat.c:264
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:270
 msgid "Buddy Chat"
 msgstr "與好友聊天"
 
-#: src/buddy_chat.c:278
+#: src/buddy_chat.c:280
 msgid "Join Chat As:"
-msgstr "加入聊天為:"
+msgstr "以何身份聊天:"
 
 #. Join button.
-#: src/buddy_chat.c:301
+#: src/buddy_chat.c:303
 msgid "Join"
 msgstr "加入"
 
-#: src/conversation.c:402
+#: src/conversation.c:404
 msgid "Unable to send message. The message is too large."
 msgstr "無法送出訊息:太大了"
 
-#: src/conversation.c:411
+#: src/conversation.c:412
 msgid "Unable to send message."
 msgstr "無法送出訊息"
 
@@ -3704,7 +3762,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室內有 %d 個人"
-#: src/conversation.c:1972
+#: src/conversation.c:1973
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入了聊天室。"
@@ -3714,51 +3772,51 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室內有 %d 個人"
-#: src/conversation.c:1975
+#: src/conversation.c:1976
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入了聊天室。"
 
-#: src/conversation.c:2024
+#: src/conversation.c:2025
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s 改變了暱稱為 %s"
-
-#: src/conversation.c:2067
+msgstr "%s 改了暱稱,如今叫 %s 了"
+
+#: src/conversation.c:2068
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開了聊天室 (%s)。"
 
-#: src/conversation.c:2069
+#: src/conversation.c:2070
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開了聊天室。"
 
-#: src/conversation.c:2253
+#: src/conversation.c:2254
 msgid "Last created window"
 msgstr "最近開啟的同一視窗"
 
-#: src/conversation.c:2255
+#: src/conversation.c:2256
 msgid "New window"
 msgstr "開新視窗"
 
-#: src/conversation.c:2257
+#: src/conversation.c:2258
 msgid "By group"
 msgstr "每群組各開一視窗"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2260
 msgid "By account"
 msgstr "每帳號各開一視窗"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:364
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:364
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:379
+#: src/dialogs.c:380
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3770,453 +3828,456 @@
 "\n"
 "警告 %s 會提高他的警告等級,令他發出訊息的速率受到愈趨嚴厲的限制。\n"
 
-#: src/dialogs.c:388
+#: src/dialogs.c:389
 msgid "Warn _anonymously?"
 msgstr "以匿名者的身分發出警告嗎?"
 
-#: src/dialogs.c:395
+#: src/dialogs.c:396
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:467
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您真的要將 %s 從您的好友清單中移除嗎?"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:468
 msgid "Remove Buddy"
 msgstr "移除"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:474
 #, 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:474
+#: src/dialogs.c:475
 msgid "Remove Chat"
 msgstr "移除"
 
-#: src/dialogs.c:480
+#: src/dialogs.c:481
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "您真的要將整個群組「%s」及其內的好友,一併從您的好友清單中移除嗎?"
 
-#: src/dialogs.c:482
+#: src/dialogs.c:483
 msgid "Remove Group"
 msgstr "移除"
 
-#: src/dialogs.c:692
+#: src/dialogs.c:633
 msgid "New Message"
 msgstr "新的即時訊息"
 
-#: src/dialogs.c:710
+#: src/dialogs.c:651
 msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr ""
+msgstr "您想跟誰傳即時訊息?請輸入對方的帳號吧。\n"
 
 # XXX check all contexts (see also "_Account:" below) (q.v.)
-#: src/dialogs.c:726 src/dialogs.c:827 src/dialogs.c:3779
+#: src/dialogs.c:667 src/dialogs.c:768 src/dialogs.c:3725
 msgid "_Screenname:"
 msgstr "對方帳號(_S):"
 
 # XXX check all contexts (see also "_Screenname:" above) (q.v.)
-#: src/dialogs.c:741 src/dialogs.c:843 src/gtkpounce.c:518
+#: src/dialogs.c:682 src/dialogs.c:784 src/gtkpounce.c:520
 msgid "_Account:"
 msgstr "您的帳號(_A):"
 
-#: src/dialogs.c:796
+#: src/dialogs.c:737
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:756
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
-msgstr ""
-
-#: src/dialogs.c:994
+msgstr "您想取得誰的個人資訊?請輸入對方的帳號吧。\n"
+
+#: src/dialogs.c:935
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/dialogs.c:1011
+#: src/dialogs.c:952
 msgid "Please enter the name of the group to be added.\n"
-msgstr ""
-
-#: src/dialogs.c:1020 src/dialogs.c:4327
+msgstr "請給您打算新增的群組起個名字。\n"
+
+#: src/dialogs.c:961 src/dialogs.c:4273
 msgid "_Group:"
 msgstr "群組(_G):"
 
-#: src/dialogs.c:1102
+#: src/dialogs.c:1043
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/dialogs.c:1121
+#: src/dialogs.c:1062
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-
-#: src/dialogs.c:1140
+"您想新增誰到您的好友清單裡呢?請輸入對方的帳號。您也可以同時給您的好友輸入一"
+"個別名;在可能的情況下,Gaim 會顯示您輸入的別名而非您好友的帳號。\n"
+
+#: src/dialogs.c:1081
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/dialogs.c:1153
+#: src/dialogs.c:1094
 msgid "Alias"
 msgstr "別名"
 
-#: src/dialogs.c:1163
+#: src/dialogs.c:1104
 msgid "Group"
 msgstr "群組"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1172
+#: src/dialogs.c:1113
 msgid "Add To"
 msgstr "加入到"
 
-#: src/dialogs.c:1412
+#: src/dialogs.c:1346
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "您現時用以登入的通訊協定當中,並沒有可讓您聊天的通訊協定。"
+
+#: src/dialogs.c:1353
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/dialogs.c:1435
+#: src/dialogs.c:1376
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-
-#: src/dialogs.c:1444
+"請給您打算新增到好友名單的聊天室起個別名,或可額外輸入其他您認為有用的有關資"
+"訊。\n"
+
+#: src/dialogs.c:1385
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/dialogs.c:1463 src/multi.c:785
+#: src/dialogs.c:1404 src/multi.c:821
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/dialogs.c:1474
+#: src/dialogs.c:1415
 msgid "Group:"
 msgstr "群組:"
 
-#: src/dialogs.c:1807
+#: src/dialogs.c:1748
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/dialogs.c:1818
+#: src/dialogs.c:1759
 msgid "Changes to privacy settings take effect immediately."
 msgstr "更改隱私設定,即時生效。"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1768
 msgid "Set privacy for:"
 msgstr "給哪個帳戶設定隱私:"
 
-#: src/dialogs.c:1844
+#: src/dialogs.c:1785
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/dialogs.c:1848
+#: src/dialogs.c:1789
 msgid "Allow only users on my buddy list"
 msgstr "只允許好友清單內的使用者和我聯絡"
 
-#: src/dialogs.c:1852
+#: src/dialogs.c:1793
 msgid "Allow only the users below"
 msgstr "只允許下列的使用者和我聯絡"
 
-#: src/dialogs.c:1890
+#: src/dialogs.c:1831
 msgid "Deny all users"
 msgstr "拒絕所有使用者"
 
-#: src/dialogs.c:1894
+#: src/dialogs.c:1835
 msgid "Block the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/dialogs.c:2009
+#: src/dialogs.c:1950
 msgid "Set Directory Info"
 msgstr "設定目錄資訊"
 
-#: src/dialogs.c:2017
+#: src/dialogs.c:1958
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:1968
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr ""
 
-#: src/dialogs.c:2039
+#: src/dialogs.c:1980
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允許透過 Web 來檢視您的個人資訊"
 
 #. Line 1
-#: src/dialogs.c:2042 src/dialogs.c:2684
+#: src/dialogs.c:1983 src/dialogs.c:2627
 msgid "First Name"
 msgstr "名"
 
+# XXX blanking this out
 #. Line 2
-#: src/dialogs.c:2053 src/dialogs.c:2694
+#: src/dialogs.c:1994 src/dialogs.c:2637
 msgid "Middle Name"
-msgstr ""
+msgstr " "
 
 #. Line 3
-#: src/dialogs.c:2065 src/dialogs.c:2704
+#: src/dialogs.c:2006 src/dialogs.c:2647
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:2076 src/dialogs.c:2714
+#: src/dialogs.c:2017 src/dialogs.c:2657
 msgid "Maiden Name"
-msgstr "外家姓"
+msgstr "本姓"
 
 #. Line 6
-#: src/dialogs.c:2098 src/dialogs.c:2733
+#: src/dialogs.c:2039 src/dialogs.c:2676
 msgid "State"
 msgstr "省╱州"
 
-#: src/dialogs.c:2140 src/dialogs.c:2311 src/dialogs.c:3448 src/dialogs.c:4248
-#: src/dialogs.c:4998
+#: src/dialogs.c:2081 src/dialogs.c:2254 src/dialogs.c:3394 src/dialogs.c:4194
+#: src/dialogs.c:4944
 msgid "Save"
 msgstr "儲存"
 
-#: src/dialogs.c:2162
-msgid "New Passwords Do Not Match"
-msgstr "兩個新密碼並不相符"
-
-#: src/dialogs.c:2167
-msgid "Fill out all fields completely"
-msgstr "請填妥整份表格"
-
-#: src/dialogs.c:2210
+#: src/dialogs.c:2104
+msgid "New passwords do not match."
+msgstr "兩個新密碼並不相符。"
+
+#: src/dialogs.c:2110
+msgid "Fill out all fields completely."
+msgstr "請填妥整份表格。"
+
+#: src/dialogs.c:2153
 #, c-format
 msgid "Changing password for %s:"
 msgstr "給 %s 更改密碼:"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2161
 msgid "Original Password"
 msgstr "舊密碼"
 
-#: src/dialogs.c:2229
+#: src/dialogs.c:2172
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2183
 msgid "New Password (again)"
 msgstr "新密碼(再次確認)"
 
-#. Build OK Button
-#: src/dialogs.c:2251 src/dialogs.c:2383 src/dialogs.c:2665 src/dialogs.c:2811
-#: src/dialogs.c:3945 src/dialogs.c:4424 src/prpl.c:245
-msgid "OK"
-msgstr "好!"
-
-#: src/dialogs.c:2288
+#: src/dialogs.c:2231
 #, c-format
 msgid "Changing info for %s:"
 msgstr "更改 %s 的自訂資料:"
 
-#: src/dialogs.c:2369
+#: src/dialogs.c:2312
 msgid "Below are the results of your search: "
-msgstr "以下是您所查詢的結果:"
-
-#: src/dialogs.c:2477
+msgstr "您所查詢的結果如下:"
+
+#: src/dialogs.c:2420
 msgid "Permit"
 msgstr "允許這個"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2452
 msgid "Add Permit"
 msgstr "新增獲允許的使用者"
 
-#: src/dialogs.c:2511
+#: src/dialogs.c:2454
 msgid "Add Deny"
 msgstr "新增被拒的使用者"
 
-#: src/dialogs.c:2579
+#: src/dialogs.c:2522
 msgid "Log Conversation"
 msgstr "錄下交談內容"
 
-#: src/dialogs.c:2660 src/dialogs.c:2793
+#: src/dialogs.c:2603 src/dialogs.c:2736
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2760
+#: src/dialogs.c:2703
 msgid "Find Buddy By Info"
 msgstr "以個人資料找尋好友"
 
-#: src/dialogs.c:2787
+#: src/dialogs.c:2730
 msgid "Find Buddy By Email"
 msgstr "以電郵地址找尋好友"
 
-#: src/dialogs.c:2891
+#: src/dialogs.c:2834
 msgid "Insert Link"
 msgstr "加入鏈結"
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:2836
 msgid "Insert"
 msgstr "加入鏈結"
 
-#: src/dialogs.c:2912
+#: src/dialogs.c:2855
 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:3077 src/dialogs.c:3094
+#: src/dialogs.c:3020 src/dialogs.c:3037
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:3125 src/dialogs.c:3142
+#: src/dialogs.c:3068 src/dialogs.c:3085
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:3226 src/dialogs.c:3249
+#: src/dialogs.c:3169 src/dialogs.c:3192
 msgid "Select Font"
 msgstr "選擇字型"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3314
+#: src/dialogs.c:3258
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能建立一個沒有原因的離開訊息"
 
-#: src/dialogs.c:3315
+#: src/dialogs.c:3260
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給這個離開訊息打個原因,不然您可以選擇「使用,但不儲存」。"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3324
+#: src/dialogs.c:3270
 msgid "You cannot create an empty away message"
 msgstr "您不能建立一個空白的離開訊息"
 
-#: src/dialogs.c:3389 src/dialogs.c:3397
+#: src/dialogs.c:3335 src/dialogs.c:3343
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3407
+#: src/dialogs.c:3353
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:3452
+#: src/dialogs.c:3398
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:3456
+#: src/dialogs.c:3402
 msgid "Use"
 msgstr "使用,但不儲存"
 
 #. show everything
-#: src/dialogs.c:3604
+#: src/dialogs.c:3550
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/dialogs.c:3650 src/dialogs.c:3728
+#: src/dialogs.c:3596 src/dialogs.c:3674
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3679
+#: src/dialogs.c:3625
 msgid "Please enter an aliased name for this chat.\n"
 msgstr "請給這個聊天室輸入別名。\n"
 
-#: src/dialogs.c:3691 src/dialogs.c:3793
+#: src/dialogs.c:3637 src/dialogs.c:3739
 msgid "_Alias:"
 msgstr "別名(_A):"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3758
+#: src/dialogs.c:3704
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
 msgstr "請在給下列用戶輸入別名,或者在您的好友清單內修改這個好友的名稱。\n"
 
-#: src/dialogs.c:3847 src/dialogs.c:3854
+#: src/dialogs.c:3793 src/dialogs.c:3800
 #, c-format
 msgid "Couldn't write to %s."
-msgstr ""
-
-#: src/dialogs.c:3878
+msgstr "無法寫入 %s。"
+
+#: src/dialogs.c:3824
 msgid "Save Log File"
 msgstr "儲存日誌檔"
 
-#: src/dialogs.c:3908
+#: src/dialogs.c:3854
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "無法刪除檔案 %s。"
 
-#: src/dialogs.c:3927
+#: src/dialogs.c:3873
 msgid "Clear Log"
 msgstr "清除日誌"
 
-#: src/dialogs.c:3936
+#: src/dialogs.c:3882
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎?"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:3927
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "無法開啟日誌檔 %s。"
 
-#: src/dialogs.c:4120
+#: src/dialogs.c:4066
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: src/dialogs.c:4122
+#: src/dialogs.c:4068
 msgid "System Log"
 msgstr "觀看系統日誌"
 
-#: src/dialogs.c:4143
+#: src/dialogs.c:4089
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "無法開啟日誌檔 %s。"
 
-#: src/dialogs.c:4164
+#: src/dialogs.c:4110
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4221
+#: src/dialogs.c:4167
 msgid "Log"
 msgstr "日誌"
 
-#: src/dialogs.c:4243
+#: src/dialogs.c:4189
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4301
+#: src/dialogs.c:4247
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:4318
+#: src/dialogs.c:4264
 msgid "Please enter a new name for the selected group.\n"
 msgstr "請給您選擇了的群組輸入新名。\n"
 
-#: src/dialogs.c:4394 src/dialogs.c:4403
+#: src/dialogs.c:4340 src/dialogs.c:4349
 msgid "Rename Buddy"
 msgstr "修改好友名稱"
 
-#: src/dialogs.c:4410
+#: src/dialogs.c:4356
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/ft.c:130
+#: src/ft.c:135
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是一個有效的檔案名。\n"
 
-#: src/ft.c:144
+#: src/ft.c:149
 #, c-format
 msgid "%s was not found.\n"
 msgstr "找不到 %s。\n"
 
-#: src/ft.c:738
+#: src/ft.c:741
 #, c-format
 msgid "File transfer to %s aborted.\n"
-msgstr ""
-
-#: src/ft.c:740
+msgstr "往 %s 的檔案傳輸已異常中止了。\n"
+
+#: src/ft.c:743
 #, c-format
 msgid "File transfer from %s aborted.\n"
-msgstr ""
+msgstr "從 %s 的檔案傳輸已異常中止了。\n"
 
 #: src/gaim-disclosure.c:253
 msgid "Expander Size"
@@ -4271,175 +4332,178 @@
 "\n"
 "Close running copy of Gaim\n"
 msgstr ""
-
+"\n"
+"關掉目前正在執行的 Gaim\n"
+
+# XXX probably should keep the english msg for "portability"
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:50
+#: src/gaimrc.c:52
 msgid "sorry, i ran out for a while. bbl"
-msgstr ""
-
-#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1451
+msgstr "sorry, i ran out for a while. bbl / 對不起了,外出一會,很快回來"
+
+#: src/gaimrc.c:294 src/gaimrc.c:327 src/gaimrc.c:1453
 msgid "boring default"
-msgstr ""
-
-#: src/gaimrc.c:1549
+msgstr "懶改名的預設"
+
+#: src/gaimrc.c:1551
 #, c-format
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/gaimrc.c:1606
+#: src/gaimrc.c:1609
 msgid "Unable to Save Preferences"
 msgstr "無法儲存偏好設定"
 
-#: src/gaimrc.c:1606
+#: src/gaimrc.c:1610
 msgid ""
-"Gaim was unable to save your preferences.  Please verify that you have "
-"enough free space."
-msgstr "Gaim 無法儲存您的偏好設定。請查一查您的磁盤是否已無空間。"
-
-#: src/gtkblist.c:392
+"Gaim was unable to save your preferences. Please verify that you have enough "
+"free space."
+msgstr "Gaim 無法儲存您的偏好設定。請查一查您是否在磁碟上已無空間。"
+
+#: src/gtkblist.c:398
 msgid "Add a _Buddy"
 msgstr "新增好友(_B)"
 
-#: src/gtkblist.c:393
+#: src/gtkblist.c:399
 msgid "Add a C_hat"
 msgstr "新增聊天室(_H)"
 
-#: src/gtkblist.c:394
+#: src/gtkblist.c:400
 msgid "_Delete Group"
 msgstr "移除群組(_D)"
 
-#: src/gtkblist.c:395
+#: src/gtkblist.c:401
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
-#: src/gtkblist.c:397
+#: src/gtkblist.c:403
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:398 src/gtkblist.c:429
+#: src/gtkblist.c:404 src/gtkblist.c:435
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: src/gtkblist.c:399 src/gtkblist.c:430
+#: src/gtkblist.c:405 src/gtkblist.c:436
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:408
+#: src/gtkblist.c:414
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: src/gtkblist.c:410
+#: src/gtkblist.c:416
 msgid "_IM"
 msgstr "即時訊息(_I)"
 
-#: src/gtkblist.c:411
+#: src/gtkblist.c:417
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:412
+#: src/gtkblist.c:418
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:743
+#: src/gtkblist.c:749
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:744
+#: src/gtkblist.c:750
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友(B)/送出即時訊息(_I)..."
 
-#: src/gtkblist.c:745
+#: src/gtkblist.c:751
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天室(_C)..."
 
-#: src/gtkblist.c:746
+#: src/gtkblist.c:752
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友(B)/取得使用者資訊(_U)..."
 
-#: src/gtkblist.c:748
+#: src/gtkblist.c:754
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/顯示離線的好友(_O)"
 
-#: src/gtkblist.c:749
+#: src/gtkblist.c:755
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/顯示沒有好友的群組(_E)"
 
-#: src/gtkblist.c:750
+#: src/gtkblist.c:756
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友(B)/加一個好友入好友清單(_A)..."
 
-#: src/gtkblist.c:751
+#: src/gtkblist.c:757
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友(B)/加一個聊天室入好友清單(_H)..."
 
-#: src/gtkblist.c:752
+#: src/gtkblist.c:758
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友(B)/加一個群組入好友清單(_G)..."
 
-#: src/gtkblist.c:754
+#: src/gtkblist.c:760
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:755
+#: src/gtkblist.c:761
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出 Gaim (_Q)"
 
 #. Tools
-#: src/gtkblist.c:758
+#: src/gtkblist.c:764
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:759
+#: src/gtkblist.c:765
 msgid "/Tools/_Away"
 msgstr "/工具(T)/離開(_A)"
 
-#: src/gtkblist.c:760
+#: src/gtkblist.c:766
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:761
+#: src/gtkblist.c:767
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/通訊協定相關功能(_R)"
 
-#: src/gtkblist.c:763
+#: src/gtkblist.c:769
 msgid "/Tools/A_ccounts..."
-msgstr "/工具(T)/帳戶(_C)"
-
-#: src/gtkblist.c:764
+msgstr "/工具(T)/帳戶一覽(_C)"
+
+#: src/gtkblist.c:770
 msgid "/Tools/_File Transfers..."
 msgstr "/工具(T)/文件傳輸(_F)"
 
-#: src/gtkblist.c:765
+#: src/gtkblist.c:771
 msgid "/Tools/Preferences..."
 msgstr "/工具(T)/偏好設定"
 
-#: src/gtkblist.c:766
+#: src/gtkblist.c:772
 msgid "/Tools/Pr_ivacy..."
 msgstr "/工具(T)/隱私設定(_I)"
 
-#: src/gtkblist.c:768
+#: src/gtkblist.c:774
 msgid "/Tools/View System _Log..."
 msgstr "/工具(T)/觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:771
+#: src/gtkblist.c:777
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/gtkblist.c:772
+#: src/gtkblist.c:778
 msgid "/Help/Online _Help"
 msgstr "/說明(H)/線上求助(_H)"
 
-#: src/gtkblist.c:773
+#: src/gtkblist.c:779
 msgid "/Help/_Debug Window..."
 msgstr "/說明(H)/除錯視窗(_D)"
 
-#: src/gtkblist.c:774
+#: src/gtkblist.c:780
 msgid "/Help/_About..."
 msgstr "/說明(H)/關於 G_aim"
 
-#: src/gtkblist.c:808
+#: src/gtkblist.c:814
 #, c-format
 msgid ""
 "\n"
@@ -4448,12 +4512,12 @@
 "\n"
 "<b>帳號:</b> %s"
 
-#: src/gtkblist.c:867
+#: src/gtkblist.c:873
 #, c-format
 msgid "%d%%"
-msgstr ""
-
-#: src/gtkblist.c:881
+msgstr "%d%%"
+
+#: src/gtkblist.c:887
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4461,7 +4525,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:882
+#: src/gtkblist.c:888
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4469,7 +4533,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:883
+#: src/gtkblist.c:889
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4477,7 +4541,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:884
+#: src/gtkblist.c:890
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4485,7 +4549,7 @@
 "\n"
 "<b>閒置了</b>"
 
-#: src/gtkblist.c:885
+#: src/gtkblist.c:891
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4493,431 +4557,460 @@
 "\n"
 "<b>被警告:</b>"
 
-#: src/gtkblist.c:887
+#: src/gtkblist.c:893
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
-
-#: src/gtkblist.c:1179
+"\n"
+"<b>說明:</b>見鬼啦……"
+
+#: src/gtkblist.c:894
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
+msgstr ""
+"\n"
+"<b>狀態:</b>好極了"
+
+#: src/gtkblist.c:1186
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置了%d小時%d分鐘"
 
-#: src/gtkblist.c:1181
+#: src/gtkblist.c:1188
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置了%d分鐘"
 
-#: src/gtkblist.c:1185
+#: src/gtkblist.c:1192
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1352 src/prefs.c:1809
+#: src/gtkblist.c:1329
+msgid "Do not sort automatically"
+msgstr "不要自動排序,我自己排"
+
+# XXX for Chinese, sorting order is radicals first, then stroke count (!)
+#: src/gtkblist.c:1330
+msgid "Alphabetical"
+msgstr "以字母順序"
+
+#: src/gtkblist.c:1331
+msgid "By status"
+msgstr "以狀態"
+
+#: src/gtkblist.c:1332
+msgid "By log size"
+msgstr "以交談記錄的大小"
+
+#: src/gtkblist.c:1358 src/gtkprefs.c:1810
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: src/gtkblist.c:1376
+#: src/gtkblist.c:1382
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:1379
+#: src/gtkblist.c:1385
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:1382
+#: src/gtkblist.c:1388
 msgid "/Tools/Protocol Actions"
 msgstr "/工具/協定相關功能"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1465
+#: src/gtkblist.c:1471
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線的好友"
 
-#: src/gtkblist.c:1467
+#: src/gtkblist.c:1473
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示沒有好友的群組"
 
-#: src/gtkblist.c:1485 src/gtkconv.c:765
+#: src/gtkblist.c:1491 src/gtkconv.c:766
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:1491
+#: src/gtkblist.c:1497
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給選定了的好友"
 
-#: src/gtkblist.c:1500
+#: src/gtkblist.c:1506
 msgid "Get information on the selected buddy"
 msgstr "顯示被選定了的好友的資訊"
 
-#: src/gtkblist.c:1508
+#: src/gtkblist.c:1514
 msgid "Join a chat room"
 msgstr "進入聊天室"
 
-#: src/gtkblist.c:1516
+#: src/gtkblist.c:1522
 msgid "Set an away message"
 msgstr "設定您的離開訊息"
 
-#: src/gtkconv.c:218
+#: src/gtkconv.c:219
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 加入影像"
 
-#: src/gtkconv.c:773
+#: src/gtkconv.c:774
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:775 src/prefs.c:541
+#: src/gtkconv.c:776 src/gtkprefs.c:542
 msgid "Ignore"
 msgstr "忽略使用者"
 
 #. Info button
-#: src/gtkconv.c:784 src/gtkconv.c:2668
+#: src/gtkconv.c:785 src/gtkconv.c:2669
 msgid "Info"
 msgstr "訊息內容"
 
-#: src/gtkconv.c:804 src/gtkconv.c:2651 src/gtkconv.c:3782
+#: src/gtkconv.c:805 src/gtkconv.c:2652 src/gtkconv.c:3781
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:878
+#: src/gtkconv.c:879
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:906
+#: src/gtkconv.c:907
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-
-#: src/gtkconv.c:927
+"您想邀請誰呢?請輸入對方的帳號;您想的話,也可輸入一則跟這個邀請一齊送出的短"
+"訊。"
+
+#: src/gtkconv.c:928
 msgid "_Buddy:"
 msgstr "好友(_B)"
 
-#: src/gtkconv.c:947
+#: src/gtkconv.c:948
 msgid "_Message:"
 msgstr "訊息(_M)"
 
-#: src/gtkconv.c:1976
+#: src/gtkconv.c:1977
 msgid "User is typing..."
 msgstr "對方正在打字..."
 
-#: src/gtkconv.c:1984
+#: src/gtkconv.c:1985
 msgid "User has typed something and paused"
 msgstr "對方剛才在打字,不過現停了下來"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2091
+#: src/gtkconv.c:2092
 msgid "_Send As"
 msgstr "以何身份送出(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:2541
+#: src/gtkconv.c:2542
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2543
 msgid "/Conversation/_Save As..."
 msgstr "/交談(C)/把交談內容存檔(_S)..."
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2545
 msgid "/Conversation/View _Log..."
 msgstr "/交談(C)/觀看日誌(_L)"
 
-#: src/gtkconv.c:2546
+#: src/gtkconv.c:2547
 msgid "/Conversation/Insert _URL..."
 msgstr "/交談(C)/加入 _URL..."
 
-#: src/gtkconv.c:2548
+#: src/gtkconv.c:2549
 msgid "/Conversation/Insert _Image..."
 msgstr "/交談(C)/加入圖像(_I)..."
 
-#: src/gtkconv.c:2551
+#: src/gtkconv.c:2552
 msgid "/Conversation/_Close"
 msgstr "/交談(C)/關閉此視窗(_C)"
 
 #. Options
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2556
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:2556
+#: src/gtkconv.c:2557
 msgid "/Options/Enable _Logging"
 msgstr "/選項(O)/記錄日誌(_L)"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2558
 msgid "/Options/Enable _Sounds"
 msgstr "/選項(O)/使用音效(_S)"
 
-#: src/gtkconv.c:2593
+#: src/gtkconv.c:2594
 msgid "/Conversation/View Log..."
 msgstr "/交談/觀看日誌"
 
-#: src/gtkconv.c:2595
+#: src/gtkconv.c:2596
 msgid "/Conversation/Insert URL..."
 msgstr "/交談/加入 URL..."
 
-#: src/gtkconv.c:2597
+#: src/gtkconv.c:2598
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/加入影像..."
 
-#: src/gtkconv.c:2599
+#: src/gtkconv.c:2600
 msgid "/Options/Enable Logging"
 msgstr "/選項/記錄日誌"
 
-#: src/gtkconv.c:2601
+#: src/gtkconv.c:2602
 msgid "/Options/Enable Sounds"
 msgstr "/選項/使用音效"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2625 src/gtkconv.c:2627 src/gtkconv.c:2725 src/gtkconv.c:2727
-#: src/gtkconv.c:5022
+#: src/gtkconv.c:2626 src/gtkconv.c:2628 src/gtkconv.c:2726 src/gtkconv.c:2728
+#: src/gtkconv.c:5025
 msgid "Send"
 msgstr "送出"
 
-#: src/gtkconv.c:2648 src/gtkconv.c:3794
+#: src/gtkconv.c:2649 src/gtkconv.c:3793
 msgid "Add the user to your buddy list"
 msgstr "加這個使用者到好友清單內"
 
-#: src/gtkconv.c:2654 src/gtkconv.c:3785
+#: src/gtkconv.c:2655 src/gtkconv.c:3784
 msgid "Remove the user from your buddy list"
 msgstr "由好友清單移除這個使用者"
 
 #. Warn button
-#: src/gtkconv.c:2661
+#: src/gtkconv.c:2662
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2665
+#: src/gtkconv.c:2666
 msgid "Warn the user"
 msgstr "警告這個使用者"
 
-#: src/gtkconv.c:2672 src/gtkconv.c:3103
+#: src/gtkconv.c:2673 src/gtkconv.c:3104
 msgid "Get the user's information"
-msgstr "這個使用者沒有他的相關資訊。"
+msgstr "取得有關這個使用者的資訊"
 
 #. Block button
-#: src/gtkconv.c:2675
+#: src/gtkconv.c:2676
 msgid "Block"
 msgstr "堵住他的嘴!"
 
-#: src/gtkconv.c:2679
+#: src/gtkconv.c:2680
 msgid "Block the user"
 msgstr "拒絕這個使用者"
 
 #. Invite
-#: src/gtkconv.c:2737 src/gtkconv.c:5025
+#: src/gtkconv.c:2738 src/gtkconv.c:5028
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:2740
+#: src/gtkconv.c:2741
 msgid "Invite a user"
 msgstr "邀請一個使用者"
 
-#: src/gtkconv.c:2779
+#: src/gtkconv.c:2780
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2791
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:2802
 msgid "Underline"
-msgstr "底線"
-
-#: src/gtkconv.c:2817
+msgstr "加底線"
+
+#: src/gtkconv.c:2818
 msgid "Larger font size"
-msgstr "字型變大一點"
-
-#: src/gtkconv.c:2829
+msgstr "大一點"
+
+#: src/gtkconv.c:2830
 msgid "Normal font size"
-msgstr "正常字型大小"
-
-#: src/gtkconv.c:2841
+msgstr "正常大小"
+
+#: src/gtkconv.c:2842
 msgid "Smaller font size"
-msgstr "字型變小一點"
-
-#: src/gtkconv.c:2858
+msgstr "小一點"
+
+#: src/gtkconv.c:2859
 msgid "Font Face"
-msgstr "文字的字型"
-
-#: src/gtkconv.c:2870
+msgstr "改字型"
+
+#: src/gtkconv.c:2871
 msgid "Foreground font color"
-msgstr "字型顏色"
-
-#: src/gtkconv.c:2882
+msgstr "改文字顏色"
+
+#: src/gtkconv.c:2883
 msgid "Background color"
-msgstr "背景顏色"
-
-#: src/gtkconv.c:2897
+msgstr "改背景顏色"
+
+#: src/gtkconv.c:2898
 msgid "Insert image"
 msgstr "加入即時訊息影像"
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2909
 msgid "Insert link"
 msgstr "加入鏈結"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2920
 msgid "Insert smiley"
 msgstr "加入一個笑臉"
 
-#: src/gtkconv.c:2976
+#: src/gtkconv.c:2977
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3023
+#: src/gtkconv.c:3024
 msgid "0 people in room"
 msgstr "沒有人在這個聊天室"
 
-#: src/gtkconv.c:3080
+#: src/gtkconv.c:3081
 msgid "IM the user"
 msgstr "向這個使用者發出即時訊息"
 
-#: src/gtkconv.c:3092
+#: src/gtkconv.c:3093
 msgid "Ignore the user"
 msgstr "忽略這個使用者"
 
-#: src/gtkconv.c:3623
+#: src/gtkconv.c:3622
 msgid "Close conversation"
 msgstr "結束交談"
 
-#: src/gtkconv.c:4228 src/gtkconv.c:4350
+#: src/gtkconv.c:4227 src/gtkconv.c:4349
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室內有 %d 個人"
 msgstr[1] "聊天室內有 %d 個人"
 
-#: src/gtkconv.c:4710
+#: src/gtkconv.c:4709
 msgid "Disable Animation"
 msgstr "停用動畫"
 
-#: src/gtkconv.c:4719
+#: src/gtkconv.c:4718
 msgid "Enable Animation"
 msgstr "使用動畫"
 
-#: src/gtkconv.c:4726
+#: src/gtkconv.c:4725
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:4732
+#: src/gtkconv.c:4731
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkft.c:103
+#: src/gtkft.c:104
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/gtkft.c:106
+#: src/gtkft.c:107
 msgid "Unknown."
-msgstr "未知"
-
-#: src/gtkft.c:143
+msgstr "不明。"
+
+#: src/gtkft.c:144
 #, c-format
 msgid "%.2f KB/s"
-msgstr ""
-
-#: src/gtkft.c:218
+msgstr "每秒 %.2f KB"
+
+#: src/gtkft.c:219
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: src/gtkft.c:221
+#: src/gtkft.c:222
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送至:</b>"
 
-#: src/gtkft.c:445
+#: src/gtkft.c:446
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:452
+#: src/gtkft.c:453
 msgid "Filename"
 msgstr "檔案名"
 
-#: src/gtkft.c:459
+#: src/gtkft.c:460
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:466
+#: src/gtkft.c:467
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:497
 msgid "Filename:"
 msgstr "檔案路徑:"
 
-#: src/gtkft.c:497
-msgid "Status:"
-msgstr "狀態:%s"
-
 #: src/gtkft.c:498
-msgid "Speed:"
-msgstr "速率:"
+msgid "Status:"
+msgstr "狀態:"
 
 #: src/gtkft.c:499
+msgid "Speed:"
+msgstr "速率:"
+
+#: src/gtkft.c:500
 msgid "Time Elapsed:"
 msgstr "已用時間:"
 
-#: src/gtkft.c:500
+#: src/gtkft.c:501
 msgid "Time Remaining:"
 msgstr "所餘時間:"
 
-#: src/gtkft.c:566
+#: src/gtkft.c:567
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: src/gtkft.c:595
+#: src/gtkft.c:596
 msgid "_Keep the dialog open"
 msgstr "不關閉此視窗(_K)"
 
-#: src/gtkft.c:605
+#: src/gtkft.c:606
 msgid "_Clear finished transfers"
 msgstr "檔案傳輸完成後,自動清除有關該傳輸的紀錄(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:614
+#: src/gtkft.c:615
 msgid "Show download details"
 msgstr "顯示下載詳情"
 
-#: src/gtkft.c:615
+#: src/gtkft.c:616
 msgid "Hide download details"
 msgstr "不顯示下載詳情"
 
 #. Pause button
-#: src/gtkft.c:657
+#: src/gtkft.c:658
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:667
+#: src/gtkft.c:668
 msgid "_Resume"
 msgstr "繼續(_R)"
 
-#: src/gtkft.c:1009
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "沒有這個檔案。"
 
-#: src/gtkft.c:1016
-msgid "Can not send a file of 0 bytes."
-msgstr "不能輸送空檔案!"
-
-#: src/gtkft.c:1028
+#: src/gtkft.c:1018
+msgid "Cannot send a file of 0 bytes."
+msgstr "不可輸送空檔案吧!"
+
+#: src/gtkft.c:1030
 msgid "That file already exists. Would you like to overwrite it?"
 msgstr "該檔案已存在了,您要把它覆蓋掉嗎?"
 
-#: src/gtkft.c:1054
+#: src/gtkft.c:1056
 msgid "Gaim - Open..."
 msgstr "Gaim - 開啟舊檔..."
 
-#: src/gtkft.c:1103
+#: src/gtkft.c:1105
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr ""
+msgstr "%s 想傳 %s (%s) 給您"
 
 #: src/gtkimhtml.c:342
 msgid "_Copy Link Location"
@@ -4932,6 +5025,8 @@
 "Gaim was unable to guess the image type base on the file extension "
 "supplied.  Defaulting to PNG."
 msgstr ""
+"Gaim 猜不到這個檔案的檔型表示的究竟是那種格式的圖像,盲猜之下只有當它是 PNG "
+"了。"
 
 #: src/gtkimhtml.c:1672
 #, c-format
@@ -4946,975 +5041,626 @@
 msgid "_Save Image..."
 msgstr "儲存圖示為(_S)..."
 
-#: src/gtkpounce.c:121
+#: src/gtkpounce.c:122
 msgid "Select a file"
 msgstr "請選擇一個檔案"
 
-#: src/gtkpounce.c:170
+#: src/gtkpounce.c:172
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友來進行狀態捕捉。"
 
-#: src/gtkpounce.c:342
+#: src/gtkpounce.c:344
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 開始打字給您了"
 
-#: src/gtkpounce.c:343
+#: src/gtkpounce.c:345
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 登入了"
 
-#: src/gtkpounce.c:344
+#: src/gtkpounce.c:346
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s 剛才閒置了,現在回來了"
 
-#: src/gtkpounce.c:345
+#: src/gtkpounce.c:347
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s 剛才離開了,現在回來了"
 
-#: src/gtkpounce.c:346
+#: src/gtkpounce.c:348
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s 停了打字給您"
 
-#: src/gtkpounce.c:347
+#: src/gtkpounce.c:349
 #, c-format
 msgid "%s has signed off"
 msgstr "%s 已經登出"
 
-#: src/gtkpounce.c:348
+#: src/gtkpounce.c:350
 #, c-format
 msgid "%s has become idle"
 msgstr "%s 閒置了"
 
-#: src/gtkpounce.c:349
+#: src/gtkpounce.c:351
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 離開了"
 
-#: src/gtkpounce.c:350
+#: src/gtkpounce.c:352
 msgid "Unknown pounce event. Please report this!"
 msgstr "捕捉到了不明的好友狀態。請向開發者報告!"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:493 src/gtkpounce.c:883
+#: src/gtkpounce.c:495 src/gtkpounce.c:885
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/gtkpounce.c:493
+#: src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "修改好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:513
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:535
 msgid "_Buddy Name:"
 msgstr "好友帳號(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:554
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:562
 msgid "Sign on"
 msgstr "登入"
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:564
 msgid "Sign off"
 msgstr "登出"
 
-#: src/gtkpounce.c:566
+#: src/gtkpounce.c:568
 msgid "Return from away"
 msgstr "離開後回來"
 
-#: src/gtkpounce.c:570
+#: src/gtkpounce.c:572
 msgid "Return from idle"
 msgstr "閒置後回來"
 
-#: src/gtkpounce.c:572
+#: src/gtkpounce.c:574
 msgid "Buddy starts typing"
 msgstr "對方開始打字"
 
-#: src/gtkpounce.c:574
+#: src/gtkpounce.c:576
 msgid "Buddy stops typing"
 msgstr "對方停止打字"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:603
+#: src/gtkpounce.c:605
 msgid "Pounce Action"
 msgstr "對應的動作"
 
-#: src/gtkpounce.c:610
+#: src/gtkpounce.c:612
 msgid "Open an IM window"
 msgstr "開啟即時訊息視窗"
 
-#: src/gtkpounce.c:611
-msgid "Popup notification"
-msgstr "即現通知"
-
-#: src/gtkpounce.c:612
-msgid "Send a message"
-msgstr "送出訊息"
-
 #: src/gtkpounce.c:613
+msgid "Popup notification"
+msgstr "即現通知"
+
+#: src/gtkpounce.c:614
+msgid "Send a message"
+msgstr "送出訊息"
+
+#: src/gtkpounce.c:615
 msgid "Execute a command"
 msgstr "執行指令"
 
-#: src/gtkpounce.c:614
+#: src/gtkpounce.c:616
 msgid "Play a sound"
 msgstr "播放音效"
 
-#: src/gtkpounce.c:618 src/gtkpounce.c:620 src/multi.c:678
+#: src/gtkpounce.c:620 src/gtkpounce.c:622 src/multi.c:714
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/gtkpounce.c:621 src/prefs.c:1636
+#: src/gtkpounce.c:623 src/gtkprefs.c:1637
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkpounce.c:704
+#: src/gtkpounce.c:706
 msgid "_Save this pounce after activation"
 msgstr "儲存設定(_S)(這樣才能在每次事件發生時發生作用)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:890
+#: src/gtkpounce.c:892
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/gtkutils.c:318
-msgid "Gaim - Save Icon"
-msgstr "Gaim - 儲存圖示"
-
-#: src/html.c:326
-msgid "g003: Error opening connection.\n"
-msgstr "g003: 連接開啟錯誤。\n"
-
-#: src/log.c:118
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - 儲存聊天內容"
-
-#: src/log.c:159 src/log.c:180 src/log.c:193
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr ""
-
-#: src/log.c:247 src/log.c:263
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr ""
-
-#: src/log.c:250 src/log.c:266
-#, c-format
-msgid "IM Sessions with %s"
-msgstr ""
-
-#: src/log.c:297
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:302
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:307
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr ""
-
-#: src/log.c:312
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:317
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:322
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:327
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr ""
-
-#: src/log.c:334
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
-
-#: src/log.c:339
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr ""
-
-#: src/log.c:344
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr ""
-
-#: src/log.c:349
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr ""
-
-#: src/log.c:354
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr ""
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr ""
-
-#: src/log.c:372
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr ""
-
-#: src/log.c:377
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr ""
-
-#: src/log.c:382
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr ""
-
-#: src/log.c:387
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr ""
-
-#: src/log.c:392
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr ""
-
-#: src/log.c:398
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr ""
-
-#: src/main.c:181
-msgid "Please enter your login."
-msgstr "請輸入您的帳號。"
-
-#: src/main.c:270
-msgid "<New User>"
-msgstr "【新用戶】"
-
-# XXX This is a window title. Do we really want to translate this?
-#: src/main.c:312
-msgid "Login"
-msgstr "登入"
-
-#: src/main.c:328
-msgid "Screen Name:"
-msgstr "帳號:"
-
-#. And now for the buttons
-#: src/main.c:362
-msgid "Accounts"
-msgstr "帳號一覽"
-
-#: src/main.c:372 src/prefs.c:1876 src/win32/systray.c:355
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: src/main.c:378 src/win32/systray.c:191
-msgid "Sign On"
-msgstr "登入"
-
-#: src/multi.c:264
-msgid "Screenname"
-msgstr "帳號"
-
-#: src/multi.c:292
-msgid "Protocol"
-msgstr "通訊協定"
-
-#: src/multi.c:621
-msgid "Load Buddy Icon"
-msgstr "讀取好友圖示"
-
-#: src/multi.c:665
-msgid "Buddy Icon File:"
-msgstr "好友圖示檔案:"
-
-#: src/multi.c:684 src/prefs.c:1640
-msgid "Reset"
-msgstr "重置"
-
-#: src/multi.c:711
-msgid "Login Options"
-msgstr "登入選項"
-
-#: src/multi.c:723
-msgid "Protocol:"
-msgstr "通訊協定:"
-
-#: src/multi.c:738
-msgid "Screenname:"
-msgstr "帳號:"
-
-#: src/multi.c:793
-msgid "Remember Password"
-msgstr "記住密碼"
-
-#: src/multi.c:794
-msgid "Auto-Login"
-msgstr "自動登入"
-
-#: src/multi.c:851
-msgid "User Options"
-msgstr "帳戶選項"
-
-#: src/multi.c:861
-msgid "New Mail Notifications"
-msgstr "新郵件通知"
-
-#: src/multi.c:922
-#, c-format
-msgid "%s Options"
-msgstr "%s選項"
-
-#: src/multi.c:966
-msgid "Register with server"
-msgstr "向伺服器註冊"
-
-#: src/multi.c:999
-msgid "Proxy Options"
-msgstr "代理伺服器選項"
-
-#: src/multi.c:1013
-msgid "Proxy _Type"
-msgstr "代理伺服器類別(_T)"
-
-#: src/multi.c:1022
-msgid "Use Global Proxy Settings"
-msgstr "使用整體的代理伺服器設定"
-
-#: src/multi.c:1031
-msgid "No Proxy"
-msgstr "毋須代理伺服器"
-
-#: src/multi.c:1083
-msgid "_Host:"
-msgstr "主機位址(_H)"
-
-#: src/multi.c:1119
-msgid "_User:"
-msgstr "帳號(_U):"
-
-#: src/multi.c:1135
-msgid "Pa_ssword:"
-msgstr "密碼(_S):"
-
-#: src/multi.c:1209
-msgid "Modify Account"
-msgstr "修改帳戶"
-
-#: src/multi.c:1228
-msgid "Show more options"
-msgstr "顯示多些代理伺服器選項"
-
-#: src/multi.c:1228
-msgid "Show fewer options"
-msgstr "顯示少些代理伺服器選項"
-
-# XXX verify context
-#: src/multi.c:1339
-msgid "_Login"
-msgstr "帳號(_L)"
-
-#: src/multi.c:1357
-#, c-format
-msgid ""
-"Please enter your password for %s.\n"
-"\n"
-msgstr "請輸入您 %s 的密碼。\n"
-
-#: src/multi.c:1368
-msgid "_Password"
-msgstr "密碼(_P)"
-
-#: src/multi.c:1419
-msgid "TOC not found."
-msgstr "找不到 TOC。"
-
-#: src/multi.c:1420
-msgid ""
-"You have attempted to login an IM account using the TOC protocol.  Because "
-"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
-"default.  To login, edit this account to use OSCAR or load the TOC plugin."
-msgstr ""
-"您試圖以 TOC 通訊協定登入一個即時訊息帳戶。因為這個通訊協定實在比 OSCAR 遜"
-"色,目前祗預設了以套件形式提供這個通訊協定。要登入這個帳戶,請改用 OSCAR,或"
-"者載入 TOC 套件。"
-
-#: src/multi.c:1426
-msgid "Protocol not found."
-msgstr "無此通訊協定。"
-
-#: src/multi.c:1427
-msgid ""
-"You cannot log this account in; you do not have the protocol it uses loaded, "
-"or the protocol does not have a login function."
-msgstr ""
-"您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的通訊協定,或者這個通"
-"訊協定並不提供登入的功能。"
-
-#: src/multi.c:1506
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "您確定要刪除 %s 嗎?"
-
-#: src/multi.c:1507
-msgid "Delete"
-msgstr "刪除"
-
-#: src/multi.c:1536
-msgid "Account Editor"
-msgstr "帳號管理"
-
-#: src/multi.c:1575
-msgid "_Modify"
-msgstr "修改(_M)"
-
-#: src/multi.c:1625
-msgid "Done."
-msgstr "登入完了。"
-
-#: src/multi.c:1861
-msgid "Signon: "
-msgstr "登入:"
-
-#: src/multi.c:1920
-msgid "Signon"
-msgstr "登    入"
-
-#: src/multi.c:1932
-msgid "Cancel All"
-msgstr "全部取消"
-
-#: src/multi.c:1987
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-
-#: src/multi.c:2009
-#, c-format
-msgid "%s was unable to sign on"
-msgstr "%s 無法登入"
-
-#: src/multi.c:2010
-msgid "Signon Error"
-msgstr "登入錯誤"
-
-#: src/multi.c:2021
-msgid "Notice"
-msgstr "通知"
-
-#: src/multi.c:2033
-#, c-format
-msgid "%s has been signed off"
-msgstr "%s 已經登出"
-
-#: src/multi.c:2034
-msgid "Connection Error"
-msgstr "連接錯誤"
-
-#: src/prefs.c:205
+#: src/gtkprefs.c:206
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/prefs.c:207
+#: src/gtkprefs.c:208
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "沒有設定別名時,顯示對方的暱稱(_I)"
 
-#: src/prefs.c:388
+#: src/gtkprefs.c:389
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
 
-#: src/prefs.c:421
+#: src/gtkprefs.c:422
 msgid "Icon"
 msgstr "圖示"
 
-#: src/prefs.c:455
+#: src/gtkprefs.c:456
 msgid "Style"
 msgstr "樣式"
 
-#: src/prefs.c:456
+#: src/gtkprefs.c:457
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: src/prefs.c:457
+#: src/gtkprefs.c:458
 msgid "_Italics"
 msgstr "斜體(_I)"
 
-#: src/prefs.c:458
+#: src/gtkprefs.c:459
 msgid "_Underline"
 msgstr "加有底線(_U)"
 
-#: src/prefs.c:459
+#: src/gtkprefs.c:460
 msgid "_Strikethrough"
 msgstr "加有刪除線(_S)"
 
-#: src/prefs.c:461
+#: src/gtkprefs.c:462
 msgid "Face"
 msgstr "字型"
 
-#: src/prefs.c:464
+#: src/gtkprefs.c:465
 msgid "Use custo_m face"
 msgstr "自訂字體(_M)"
 
-#: src/prefs.c:478
+#: src/gtkprefs.c:479
 msgid "Use custom si_ze"
 msgstr "自訂字型大小(_Z)"
 
-#: src/prefs.c:486
+#: src/gtkprefs.c:487
 msgid "Color"
 msgstr "顏色"
 
-#: src/prefs.c:491
+#: src/gtkprefs.c:492
 msgid "_Text color"
 msgstr "文字顏色(_T)"
 
-#: src/prefs.c:508
+#: src/gtkprefs.c:509
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#: src/prefs.c:534 src/prefs.c:695 src/prefs.c:736
+#: src/gtkprefs.c:535 src/gtkprefs.c:696 src/gtkprefs.c:737
 msgid "Display"
 msgstr "顯示"
 
-#: src/prefs.c:535
+#: src/gtkprefs.c:536
 msgid "Show graphical _smileys"
-msgstr "使用圖顯示笑臉(_S)"
-
-#: src/prefs.c:536
+msgstr "使用圖像方式顯示笑臉(_S)"
+
+#: src/gtkprefs.c:537
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息的時間戳(_T)"
 
-#: src/prefs.c:537
+#: src/gtkprefs.c:538
 msgid "Show _URLs as links"
 msgstr "以超鏈結顯示 _URL"
 
-#: src/prefs.c:539
+#: src/gtkprefs.c:540
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/prefs.c:542
+#: src/gtkprefs.c:543
 msgid "Ignore c_olors"
 msgstr "忽略顏色(_O)"
 
-#: src/prefs.c:543
+#: src/gtkprefs.c:544
 msgid "Ignore font _faces"
 msgstr "忽略字型(_F)"
 
-#: src/prefs.c:544
+#: src/gtkprefs.c:545
 msgid "Ignore font si_zes"
 msgstr "忽略字型大小(_Z)"
 
-#: src/prefs.c:556
+#: src/gtkprefs.c:557
 msgid "Send Message"
 msgstr "訊息的送出"
 
-#: src/prefs.c:557
+#: src/gtkprefs.c:558
 msgid "_Enter sends message"
 msgstr "按下 _Enter 鍵隨即送出訊息"
 
-#: src/prefs.c:558
+#: src/gtkprefs.c:559
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 鍵隨即送出訊息(_O)"
 
-#: src/prefs.c:560
+#: src/gtkprefs.c:561
 msgid "Window Closing"
 msgstr "視窗的關閉"
 
-#: src/prefs.c:561
+#: src/gtkprefs.c:562
 msgid "E_scape closes window"
 msgstr "按下 E_scape 鍵隨即關閉視窗"
 
-#: src/prefs.c:562
+#: src/gtkprefs.c:563
 msgid "Control-_W closes window"
 msgstr "按下 Ctrl-_W 鍵隨即關閉視窗"
 
-#: src/prefs.c:565
+#: src/gtkprefs.c:565
+msgid "Insertions"
+msgstr "加入東西"
+
+#: src/gtkprefs.c:566
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "按下 Ctrl-{B/I/U/S} 加入 _HTML 標籤"
 
-#: src/prefs.c:566
+#: src/gtkprefs.c:567
 msgid "Control-(number) inserts _smileys"
 msgstr "按下 CTRL-數字鍵 來加入一個笑臉(_S)"
 
-#: src/prefs.c:584
+#: src/gtkprefs.c:585
 msgid "Buddy List Sorting"
 msgstr "好友清單的排序"
 
-#: src/prefs.c:593
+#: src/gtkprefs.c:594
 msgid "Sorting:"
-msgstr "排序:"
-
-#: src/prefs.c:598
+msgstr "自動排序:"
+
+#: src/gtkprefs.c:599
 msgid "Buddy List Toolbar"
 msgstr "好友清單選項"
 
-#: src/prefs.c:599 src/prefs.c:678 src/prefs.c:721
+#: src/gtkprefs.c:600 src/gtkprefs.c:679 src/gtkprefs.c:722
 msgid "Show _buttons as:"
 msgstr "按紐樣式(_B):"
 
-#: src/prefs.c:600 src/prefs.c:679 src/prefs.c:722
+#: src/gtkprefs.c:601 src/gtkprefs.c:680 src/gtkprefs.c:723
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/prefs.c:601 src/prefs.c:680 src/prefs.c:723
+#: src/gtkprefs.c:602 src/gtkprefs.c:681 src/gtkprefs.c:724
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs.c:602 src/prefs.c:681 src/prefs.c:724
+#: src/gtkprefs.c:603 src/gtkprefs.c:682 src/gtkprefs.c:725
 msgid "Pictures and text"
 msgstr "圖文並茂"
 
-#: src/prefs.c:603 src/prefs.c:1109
+#: src/gtkprefs.c:604 src/gtkprefs.c:1110
 msgid "None"
 msgstr "無"
 
-#: src/prefs.c:606
+#: src/gtkprefs.c:607
 msgid "_Raise window on events"
 msgstr "當有事件發生時,隨即將視窗提到最頂端(_R)"
 
-#: src/prefs.c:608
+#: src/gtkprefs.c:609
 msgid "Group Display"
 msgstr "群組顯示"
 
 #. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/prefs.c:610
+#: src/gtkprefs.c:611
 msgid "Show _numbers in groups"
 msgstr "顯示群組裡的好友數目(_N)"
 
-#: src/prefs.c:612
+#: src/gtkprefs.c:613
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/prefs.c:613
+#: src/gtkprefs.c:614
 msgid "Show buddy _icons"
 msgstr "顯示好友類別圖示(_I)"
 
-#: src/prefs.c:614
+#: src/gtkprefs.c:615
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/prefs.c:619
+#: src/gtkprefs.c:620
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/prefs.c:624
+#: src/gtkprefs.c:625
 msgid "Dim i_dle buddies"
 msgstr "以灰色顯示閒置的好友(_D)"
 
-#: src/prefs.c:642 src/prefs.c:1810
+#: src/gtkprefs.c:643 src/gtkprefs.c:1811
 msgid "Conversations"
 msgstr "交談"
 
-#: src/prefs.c:650
+#: src/gtkprefs.c:651
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/prefs.c:658
+#: src/gtkprefs.c:659
 msgid "Show IMs and chats in _same tabbed window."
 msgstr "將所有的即時訊息並聊天,統統顯示在同一個分頁視窗(_S)"
 
-#: src/prefs.c:677 src/prefs.c:720
+#: src/gtkprefs.c:678 src/gtkprefs.c:721
 msgid "Window"
 msgstr "即時訊息視窗"
 
-#: src/prefs.c:684 src/prefs.c:727
+#: src/gtkprefs.c:685 src/gtkprefs.c:728
 msgid "New window _width:"
 msgstr "新視窗寬度(_W):"
 
-#: src/prefs.c:685 src/prefs.c:728
+#: src/gtkprefs.c:686 src/gtkprefs.c:729
 msgid "New window _height:"
 msgstr "新視窗高度(_H):"
 
-#: src/prefs.c:686 src/prefs.c:729
+#: src/gtkprefs.c:687 src/gtkprefs.c:730
 msgid "_Entry field height:"
 msgstr "輸入欄位的高度(_E):"
 
-#: src/prefs.c:687 src/prefs.c:730
+#: src/gtkprefs.c:688 src/gtkprefs.c:731
 msgid "_Raise windows on events"
 msgstr "當有事件發生時,隨即將視窗提到最頂端(_R)"
 
-#: src/prefs.c:688
+#: src/gtkprefs.c:689
 msgid "Hide window on _send"
 msgstr "送出訊息後隨即隱藏視窗(_S)"
 
-#: src/prefs.c:691
+#: src/gtkprefs.c:692
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/prefs.c:692
+#: src/gtkprefs.c:693
 msgid "Hide buddy _icons"
 msgstr "隱藏好友圖示(_I)"
 
-#: src/prefs.c:693
+#: src/gtkprefs.c:694
 msgid "Disable buddy icon a_nimation"
 msgstr "好友圖示不使用動畫(_N)"
 
-#: src/prefs.c:696
+#: src/gtkprefs.c:697
 msgid "Show _logins in window"
 msgstr "在視窗中顯示登入訊息(_L)"
 
-#: src/prefs.c:697
+#: src/gtkprefs.c:698
 msgid "Show a_liases in tabs/titles"
 msgstr "在分頁標籤或視窗標題顯示別名(_L)"
 
-#: src/prefs.c:699
+#: src/gtkprefs.c:700
 msgid "Typing Notification"
 msgstr "打字通知"
 
-#: src/prefs.c:700
+#: src/gtkprefs.c:701
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在打訊息給他(_T)"
 
-#: src/prefs.c:732
+#: src/gtkprefs.c:733
 msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:733
+#: src/gtkprefs.c:734
 msgid "_Tab-complete nicks"
 msgstr "使用 _Tab Completion 完成輸入好友的別名"
 
-#: src/prefs.c:734
+#: src/gtkprefs.c:735
 msgid "_Old-style tab completion"
 msgstr "舊式 Tab C_ompletion"
 
-#: src/prefs.c:737
+#: src/gtkprefs.c:738
 msgid "_Show people joining/leaving in window"
 msgstr "在視窗中顯示其他人進入或離開的事件(_S)"
 
-#: src/prefs.c:738
+#: src/gtkprefs.c:739
 msgid "Co_lorize screennames"
 msgstr "以彩色顯示好友暱稱(_L)"
 
-#: src/prefs.c:755
+#: src/gtkprefs.c:756
 msgid "IM Tabs"
 msgstr "即時訊息分頁"
 
-#: src/prefs.c:756 src/prefs.c:766
+#: src/gtkprefs.c:757 src/gtkprefs.c:767
 msgid "Tab _placement:"
 msgstr "分頁標籤位置(_P):"
 
-#: src/prefs.c:757 src/prefs.c:767
+#: src/gtkprefs.c:758 src/gtkprefs.c:768
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/prefs.c:758 src/prefs.c:768
+#: src/gtkprefs.c:759 src/gtkprefs.c:769
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/prefs.c:759 src/prefs.c:769
+#: src/gtkprefs.c:760 src/gtkprefs.c:770
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/prefs.c:760 src/prefs.c:770
+#: src/gtkprefs.c:761 src/gtkprefs.c:771
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/prefs.c:762
+#: src/gtkprefs.c:763
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
 msgstr "將所有的聊天內容顯示在同一個分頁視窗中(_I)"
 
-#: src/prefs.c:765
+#: src/gtkprefs.c:766
 msgid "Chat Tabs"
 msgstr "交談分頁"
 
-#: src/prefs.c:772
+#: src/gtkprefs.c:773
 msgid "Show all c_hats in one tabbed window"
 msgstr "將所有的聊天顯示在同一個分頁視窗(_H)"
 
-#: src/prefs.c:775
+#: src/gtkprefs.c:776
 msgid "Tab Options"
 msgstr "分頁選項"
 
-#: src/prefs.c:776
+#: src/gtkprefs.c:777
 msgid "Show _close button on tabs."
 msgstr "每個分頁的標籤旁都分別顯示關閉格(_C)"
 
-#: src/prefs.c:796
+#: src/gtkprefs.c:797
 msgid "Proxy Type"
 msgstr "代理伺服器類別"
 
-#: src/prefs.c:797
+#: src/gtkprefs.c:798
 msgid "Proxy _type:"
 msgstr "代理伺服器類別(_T):"
 
-#: src/prefs.c:798
+#: src/gtkprefs.c:799
 msgid "No proxy"
 msgstr "毋須代理伺服器"
 
-#: src/prefs.c:803
+#: src/gtkprefs.c:804
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/prefs.c:816
+#: src/gtkprefs.c:817
 msgid "_Host"
 msgstr "主機位址(_H)"
 
-#: src/prefs.c:830
+#: src/gtkprefs.c:831
 msgid "Port"
 msgstr "連接埠號碼"
 
-#: src/prefs.c:846
+#: src/gtkprefs.c:847
 msgid "_User"
 msgstr "帳號(_U)"
 
-#: src/prefs.c:860
+#: src/gtkprefs.c:861
 msgid "Pa_ssword"
 msgstr "密碼(_S)"
 
-#: src/prefs.c:881
+#: src/gtkprefs.c:882
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "您自訂的瀏覽器「%s」並不有效,故此,您將不可能使用超鏈結功能。"
 
-#: src/prefs.c:902
+#: src/gtkprefs.c:903
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/prefs.c:903
+#: src/gtkprefs.c:904
 msgid "Opera"
 msgstr "Opera"
 
-#: src/prefs.c:904
+#: src/gtkprefs.c:905
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:905
+#: src/gtkprefs.c:906
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:906
+#: src/gtkprefs.c:907
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/prefs.c:914
+#: src/gtkprefs.c:915
 msgid "Manual"
 msgstr "自訂"
 
-#: src/prefs.c:938
+#: src/gtkprefs.c:939
 msgid "Browser Selection"
 msgstr "瀏覽器"
 
-#: src/prefs.c:942
+#: src/gtkprefs.c:943
 msgid "_Browser"
 msgstr "瀏覽器(_B)"
 
-#: src/prefs.c:950
+#: src/gtkprefs.c:951
 msgid "_Manual: "
 msgstr "自訂(_M)"
 
-#: src/prefs.c:965
+#: src/gtkprefs.c:966
 msgid "Browser Options"
 msgstr "瀏覽器選項"
 
-#: src/prefs.c:966
+#: src/gtkprefs.c:967
 msgid "Open new _window by default"
 msgstr "叫出瀏覽器時,每次都開一個新的視窗(_W)"
 
-#: src/prefs.c:980
+#: src/gtkprefs.c:981
 msgid "Message Logs"
 msgstr "日誌"
 
-#: src/prefs.c:981
+#: src/gtkprefs.c:982
 msgid "_Log all instant messages"
 msgstr "記錄所有的即時訊息(_L)"
 
-#: src/prefs.c:982
+#: src/gtkprefs.c:983
 msgid "Log all c_hats"
 msgstr "記錄所有的交談內容(_H)"
 
-#: src/prefs.c:983
+#: src/gtkprefs.c:984
 msgid "Strip _HTML from logs"
 msgstr "以純文字檔記錄日誌(將日誌中的 _HTML 標籤去除)"
 
-#: src/prefs.c:985
+#: src/gtkprefs.c:986
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/prefs.c:986
+#: src/gtkprefs.c:987
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出(_S)"
 
-#: src/prefs.c:988
+#: src/gtkprefs.c:989
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/回來(_I)"
 
-#: src/prefs.c:990
+#: src/gtkprefs.c:991
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來(_B)"
 
-#: src/prefs.c:991
+#: src/gtkprefs.c:992
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
 
-#: src/prefs.c:993
+#: src/gtkprefs.c:994
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "使用個別的檔案來記錄個別好友的登入(_N)"
 
-#: src/prefs.c:1026
+#: src/gtkprefs.c:1027
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/prefs.c:1027
+#: src/gtkprefs.c:1028
 msgid "_No sounds when you log in"
 msgstr "登入期間時不要發出音效(_N)"
 
-#: src/prefs.c:1028
+#: src/gtkprefs.c:1029
 msgid "_Sounds while away"
 msgstr "離開狀態中也依舊發出音效(_S)"
 
-#: src/prefs.c:1031
+#: src/gtkprefs.c:1032
 msgid "Sound Method"
 msgstr "發聲方法"
 
-#: src/prefs.c:1032
+#: src/gtkprefs.c:1033
 msgid "_Method"
 msgstr "發聲方法(_M)"
 
-#: src/prefs.c:1035
+#: src/gtkprefs.c:1036
 msgid "Console beep"
 msgstr "一般嗶聲"
 
-#: src/prefs.c:1037
+#: src/gtkprefs.c:1038
 msgid "Automatic"
 msgstr "自動選擇"
 
-#: src/prefs.c:1044
+#: src/gtkprefs.c:1045
 msgid "Command"
 msgstr "自訂指令"
 
-#: src/prefs.c:1053
+#: src/gtkprefs.c:1054
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5923,68 +5669,68 @@
 "音效指令(_O) \n"
 "(指令中的檔案名寫「%s」)"
 
-#: src/prefs.c:1092
+#: src/gtkprefs.c:1093
 msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態(_S)"
 
-#: src/prefs.c:1093
+#: src/gtkprefs.c:1094
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/prefs.c:1095
+#: src/gtkprefs.c:1096
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/prefs.c:1098
+#: src/gtkprefs.c:1099
 msgid "Seconds before _resending:"
 msgstr "每隔多少秒送一次自動回應(_R):"
 
-#: src/prefs.c:1100
+#: src/gtkprefs.c:1101
 msgid "_Don't send auto-response"
 msgstr "不要送出自動回應(_D)"
 
-#: src/prefs.c:1101
+#: src/gtkprefs.c:1102
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候才送出自動回應(_O)"
 
-#: src/prefs.c:1102
+#: src/gtkprefs.c:1103
 msgid "Do_n't send auto-response in active conversations"
 msgstr "千萬不要送出自動回應予進行中的交談(_N)"
 
-#: src/prefs.c:1108
+#: src/gtkprefs.c:1109
 msgid "Idle _time reporting:"
 msgstr "怎樣計算閒置時間(_T)"
 
-#: src/prefs.c:1110
+#: src/gtkprefs.c:1111
 msgid "Gaim usage"
-msgstr "Gaim 的閒置時間"
-
-#: src/prefs.c:1113
+msgstr "Gaim 閒置了多久"
+
+#: src/gtkprefs.c:1114
 msgid "X usage"
-msgstr "X 的閒置時間"
+msgstr "X 閒置了多久"
 
 # context: "Windows" here means "Microsoft Windows"
-#: src/prefs.c:1115
+#: src/gtkprefs.c:1116
 msgid "Windows usage"
-msgstr "Windows 的閒置時間"
-
-#: src/prefs.c:1122
+msgstr "Windows 閒置了多久"
+
+#: src/gtkprefs.c:1123
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/prefs.c:1123
+#: src/gtkprefs.c:1124
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開狀態(_W)"
 
-#: src/prefs.c:1124
+#: src/gtkprefs.c:1125
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘才算離開(_M):"
 
-#: src/prefs.c:1130
+#: src/gtkprefs.c:1131
 msgid "Away m_essage:"
 msgstr "離開訊息(_M)"
 
-#: src/prefs.c:1187
+#: src/gtkprefs.c:1188
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5999,7 +5745,7 @@
 "<span weight=\"bold\">網頁:</span>\t\t%s\n"
 "<span weight=\"bold\">路徑:</span>\t%s"
 
-#: src/prefs.c:1192
+#: src/gtkprefs.c:1193
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -6014,143 +5760,498 @@
 "<span weight=\"bold\">網頁:</span>  %s\n"
 "<span weight=\"bold\">路徑:</span>  %s"
 
-#: src/prefs.c:1367
+#: src/gtkprefs.c:1368
 msgid "Load"
-msgstr "使用"
-
-#: src/prefs.c:1374
+msgstr "載入使用"
+
+#: src/gtkprefs.c:1375
 msgid "Name"
-msgstr "名稱"
-
-#: src/prefs.c:1421
+msgstr "插件名稱"
+
+#: src/gtkprefs.c:1422
 msgid "Details"
 msgstr "其他資料"
 
-#: src/prefs.c:1520
+#: src/gtkprefs.c:1521
 msgid "Sound Selection"
 msgstr "音效選擇"
 
-#: src/prefs.c:1613
+#: src/gtkprefs.c:1614
 msgid "Play"
 msgstr "播音"
 
-#: src/prefs.c:1620
+#: src/gtkprefs.c:1621
 msgid "Event"
 msgstr "事件"
 
-#: src/prefs.c:1644
+#: src/gtkprefs.c:1641 src/multi.c:720
+msgid "Reset"
+msgstr "重置"
+
+#: src/gtkprefs.c:1645
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/prefs.c:1768
+#: src/gtkprefs.c:1769
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/prefs.c:1804
+#: src/gtkprefs.c:1805
 msgid "Interface"
 msgstr "介面"
 
-#: src/prefs.c:1805
+#: src/gtkprefs.c:1806
 msgid "Smiley Themes"
 msgstr "Smiley 主題"
 
-#: src/prefs.c:1806
+#: src/gtkprefs.c:1807
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs.c:1807
+#: src/gtkprefs.c:1808
 msgid "Message Text"
 msgstr "訊息顯示"
 
-#: src/prefs.c:1808
+#: src/gtkprefs.c:1809
 msgid "Shortcuts"
 msgstr "捷徑"
 
-#: src/prefs.c:1811
+#: src/gtkprefs.c:1812
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/prefs.c:1813
+#: src/gtkprefs.c:1814
 msgid "Tabs"
 msgstr "分頁顯示"
 
-#: src/prefs.c:1814
+#: src/gtkprefs.c:1815
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1817
+#: src/gtkprefs.c:1818
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/prefs.c:1819
+#: src/gtkprefs.c:1820
 msgid "Logging"
 msgstr "日誌"
 
-#: src/prefs.c:1820
+#: src/gtkprefs.c:1821
 msgid "Sounds"
 msgstr "音效"
 
-#: src/prefs.c:1821
+#: src/gtkprefs.c:1822
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/prefs.c:1822
+#: src/gtkprefs.c:1823
 msgid "Away / Idle"
 msgstr "離開╱閒置"
 
-#: src/prefs.c:1823
+#: src/gtkprefs.c:1824
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/prefs.c:1826
+#: src/gtkprefs.c:1827
 msgid "Plugins"
 msgstr "插件"
 
-#: src/prpl.c:219
-msgid "Gaim - Prompt"
-msgstr "Gaim - 提示"
-
-# XXX weird translation?
-#: src/prpl.c:302
+#: src/gtkprefs.c:1877 src/main.c:376 src/win32/systray.c:355
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: src/gtkutils.c:284
+msgid "Can't save icon file to disk."
+msgstr "無法儲存圖示檔案。"
+
+#: src/gtkutils.c:319
+msgid "Gaim - Save Icon"
+msgstr "Gaim - 儲存圖示"
+
+#: src/html.c:326
+msgid "g003: Error opening connection.\n"
+msgstr "g003: 連接開啟錯誤。\n"
+
+#: src/log.c:119
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - 儲存聊天內容"
+
+# XXX assuming "log" as in an IM/Chat log... wrong if this can be system log
+#: src/log.c:160 src/log.c:181 src/log.c:194
+#, c-format
+msgid "Unable to make directory %s for logging"
+msgstr "無法為交談記錄建立目錄 %s"
+
+#: src/log.c:248 src/log.c:264
+#, c-format
+msgid "IM Sessions with %s\n"
+msgstr "跟 %s 的歷次即時通訊\n"
+
+#: src/log.c:251 src/log.c:267
+#, c-format
+msgid "IM Sessions with %s"
+msgstr "跟 %s 的歷次即時通訊"
+
+#: src/log.c:298
+#, c-format
+msgid "+++ %s (%s) signed on @ %s"
+msgstr "+++ %s (%s) 登入了 @ %s"
+
+#: src/log.c:303
+#, c-format
+msgid "+++ %s (%s) signed off @ %s"
+msgstr "+++ %s (%s) 登出了 @ %s"
+
+#: src/log.c:308
+#, c-format
+msgid "+++ %s (%s) changed away state @ %s"
+msgstr "+++ %s (%s) 改變了離開狀態 @ %s"
+
+#: src/log.c:313
+#, c-format
+msgid "+++ %s (%s) came back @ %s"
+msgstr "+++ %s (%s) 回來了 @ %s"
+
+#: src/log.c:318
+#, c-format
+msgid "+++ %s (%s) became idle @ %s"
+msgstr "+++ %s (%s) 閒置了 @ %s"
+
+#: src/log.c:323
+#, c-format
+msgid "+++ %s (%s) returned from idle @ %s"
+msgstr "+++ %s (%s) 不閒置了 @ %s"
+
+#: src/log.c:328
+#, c-format
+msgid "+++ Program exit @ %s"
+msgstr "+++ 退出了程式 @ %s"
+
+#: src/log.c:335
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed on @ %s"
+msgstr ""
+
+#: src/log.c:340
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed off @ %s"
+msgstr "根據 %s (%s),%s (%s) 已登出了 @ %s"
+
+#: src/log.c:345
+#, c-format
+msgid "%s (%s) reported that %s (%s) went away @ %s"
+msgstr "根據 %s (%s),%s (%s) 已離開了 @ %s"
+
+#: src/log.c:350
+#, c-format
+msgid "%s (%s) reported that %s (%s) came back @ %s"
+msgstr "根據 %s (%s),%s (%s) 已回來了 @ %s"
+
+#: src/log.c:355
+#, c-format
+msgid "%s (%s) reported that %s (%s) became idle @ %s"
+msgstr "根據 %s (%s),%s (%s) 已閒置了 @ %s"
+
+#: src/log.c:361
+#, c-format
+msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
+msgstr "根據 %s (%s),%s (%s) 已不閒置了 @ %s"
+
+#: src/log.c:373
+#, c-format
+msgid "%s (%s) reported that %s signed on @ %s"
+msgstr "根據 %s (%s),%s 已登入了 @ %s"
+
+#: src/log.c:378
+#, c-format
+msgid "%s (%s) reported that %s signed off @ %s"
+msgstr "根據 %s (%s),%s 已登出了 @ %s"
+
+#: src/log.c:383
+#, c-format
+msgid "%s (%s) reported that %s went away @ %s"
+msgstr "根據 %s (%s),%s 已離開了 @ %s"
+
+#: src/log.c:388
+#, c-format
+msgid "%s (%s) reported that %s came back @ %s"
+msgstr "根據 %s (%s),%s 已回來了 @ %s"
+
+#: src/log.c:393
+#, c-format
+msgid "%s (%s) reported that %s became idle @ %s"
+msgstr "根據 %s (%s),%s 已閒置了 @ %s"
+
+#: src/log.c:399
+#, c-format
+msgid "%s (%s) reported that %s returned from idle @ %s"
+msgstr "根據 %s (%s),%s 已不閒置了 @ %s"
+
+#: src/main.c:185
+msgid "Please enter your login."
+msgstr "請輸入您的帳號。"
+
+# XXX According to the Debian dictionary, this is zh-CN'ism (but I say it like this)-:
+#: src/main.c:274
+msgid "<New User>"
+msgstr "【新用戶】"
+
+# XXX This is a window title. Do we really want to translate this?
+#: src/main.c:316
+msgid "Login"
+msgstr "登入"
+
+#: src/main.c:332
+msgid "Screen Name:"
+msgstr "帳號:"
+
+#. And now for the buttons
+#: src/main.c:366
+msgid "Accounts"
+msgstr "帳號一覽"
+
+#: src/main.c:382 src/win32/systray.c:191
+msgid "Sign On"
+msgstr "登入"
+
+#: src/multi.c:265
+msgid "Screenname"
+msgstr "帳號"
+
+#: src/multi.c:293
+msgid "Protocol"
+msgstr "通訊協定"
+
+#: src/multi.c:657
+msgid "Load Buddy Icon"
+msgstr "讀取好友圖示"
+
+#: src/multi.c:701
+msgid "Buddy Icon File:"
+msgstr "好友圖示檔案:"
+
+#: src/multi.c:747
+msgid "Login Options"
+msgstr "登入選項"
+
+#: src/multi.c:759
+msgid "Protocol:"
+msgstr "通訊協定:"
+
+#: src/multi.c:774
+msgid "Screenname:"
+msgstr "帳號:"
+
+#: src/multi.c:829
+msgid "Remember Password"
+msgstr "記住密碼"
+
+#: src/multi.c:830
+msgid "Auto-Login"
+msgstr "自動登入"
+
+#: src/multi.c:887
+msgid "User Options"
+msgstr "帳戶選項"
+
+#: src/multi.c:897
+msgid "New Mail Notifications"
+msgstr "新郵件通知"
+
+#: src/multi.c:958
+#, c-format
+msgid "%s Options"
+msgstr "%s選項"
+
+#: src/multi.c:1002
+msgid "Register with server"
+msgstr "向伺服器註冊"
+
+#: src/multi.c:1035
+msgid "Proxy Options"
+msgstr "代理伺服器選項"
+
+#: src/multi.c:1049
+msgid "Proxy _Type"
+msgstr "代理伺服器類別(_T)"
+
+#: src/multi.c:1058
+msgid "Use Global Proxy Settings"
+msgstr "使用整體的代理伺服器設定"
+
+#: src/multi.c:1067
+msgid "No Proxy"
+msgstr "毋須代理伺服器"
+
+#: src/multi.c:1119
+msgid "_Host:"
+msgstr "主機位址(_H)"
+
+#: src/multi.c:1155
+msgid "_User:"
+msgstr "帳號(_U):"
+
+#: src/multi.c:1171
+msgid "Pa_ssword:"
+msgstr "密碼(_S):"
+
+#: src/multi.c:1245
+msgid "Modify Account"
+msgstr "修改帳戶"
+
+#: src/multi.c:1264
+msgid "Show more options"
+msgstr "顯示多些代理伺服器選項"
+
+#: src/multi.c:1264
+msgid "Show fewer options"
+msgstr "顯示少些代理伺服器選項"
+
+# XXX verify context
+#: src/multi.c:1375
+msgid "_Login"
+msgstr "帳號(_L)"
+
+#: src/multi.c:1393
+#, c-format
+msgid ""
+"Please enter your password for %s.\n"
+"\n"
+msgstr "請輸入您 %s 的密碼。\n"
+
+#: src/multi.c:1404
+msgid "_Password"
+msgstr "密碼(_P)"
+
+#: src/multi.c:1456
+msgid "TOC not found."
+msgstr "找不到 TOC。"
+
+#: src/multi.c:1457
+msgid ""
+"You have attempted to login an IM account using the TOC protocol.  Because "
+"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
+"default. To login, edit this account to use OSCAR or load the TOC plugin."
+msgstr ""
+"您試圖以 TOC 通訊協定登入一個即時訊息帳戶。因為這個通訊協定實在比 OSCAR 遜"
+"色,目前祗預設了以套件形式提供這個通訊協定。要登入這個帳戶,請在帳戶一覽那兒"
+"修改這個帳戶成使用 OSCAR 登入;假如您真的想用 TOC,請載入 TOC 套件。"
+
+#: src/multi.c:1465
+msgid "Protocol not found."
+msgstr "無此通訊協定。"
+
+#: src/multi.c:1466
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+"您無法使用這個帳號來登入;您可能沒有設定這個帳號所使用的通訊協定,或者這個通"
+"訊協定並不提供登入的功能。"
+
+#: src/multi.c:1546
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "您確定要刪除 %s 嗎?"
+
+#: src/multi.c:1547
+msgid "Delete"
+msgstr "刪除"
+
+#: src/multi.c:1576
+msgid "Account Editor"
+msgstr "帳號管理"
+
+#: src/multi.c:1615
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: src/multi.c:1665
+msgid "Done."
+msgstr "登入完了。"
+
+#: src/multi.c:1901
+msgid "Signon: "
+msgstr "登入中:"
+
+#: src/multi.c:1960
+msgid "Signon"
+msgstr "登入"
+
+#: src/multi.c:1972
+msgid "Cancel All"
+msgstr "全部取消"
+
+#: src/multi.c:2027
+#, c-format
+msgid ""
+"%s\n"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:2048
+#, c-format
+msgid "%s was unable to sign on"
+msgstr "%s 無法登入"
+
+#: src/multi.c:2049
+msgid "Signon Error"
+msgstr "登入錯誤"
+
+#: src/multi.c:2060
+msgid "Notice"
+msgstr "通知"
+
+#: src/multi.c:2072
+#, c-format
+msgid "%s has been signed off"
+msgstr "%s 已經登出"
+
+#: src/multi.c:2073
+msgid "Connection Error"
+msgstr "連接錯誤"
+
+# XXX tentative "translation" (interpretation) per the context
+#: src/prpl.c:230
 msgid "No actions available"
-msgstr "沒有可用動作"
-
-#: src/prpl.c:452
+msgstr "您目前用的通訊協定沒有提供任何相關的功能"
+
+#: src/prpl.c:380
 #, c-format
 msgid "%s has mail from %s: %s"
-msgstr "%s 從 %s 收到了郵件:%s"
-
-#: src/prpl.c:452
+msgstr "%s 收到了從 %s 來的郵件:%s"
+
+#: src/prpl.c:380
 msgid "No Subject"
 msgstr "無標題"
 
-#: src/prpl.c:454
+#: src/prpl.c:382
 #, c-format
 msgid "%s has new mail."
 msgstr "%s 收到了新郵件。"
 
-#: src/prpl.c:457
+#: src/prpl.c:385
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 收到了一封郵件。"
 msgstr[1] "%s 收到了 %d 封郵件。"
 
-#: src/prpl.c:473
+#: src/prpl.c:401
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新郵件"
 
-#: src/prpl.c:492
+#: src/prpl.c:420
 msgid "Open Mail"
 msgstr "開啟郵件"
 
-#: src/prpl.c:694
+#: src/prpl.c:622
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 把 %s 加了入他的好友清單上了%s%s%s"
 
-#: src/prpl.c:702
+#: src/prpl.c:630
 msgid ""
 "\n"
 "\n"
@@ -6160,56 +6261,56 @@
 "\n"
 "您想將他(她)加入到您的好友清單中嗎?"
 
-#: src/prpl.c:704
+#: src/prpl.c:633
 msgid "Gaim - Information"
 msgstr "Gaim - 資訊"
 
-#: src/prpl.c:706
+#: src/prpl.c:636
 msgid "Gaim - Confirm"
 msgstr "Gaim - 確認"
 
-#: src/prpl.c:747
+#: src/prpl.c:678
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "您的系統中並未存在任何可供您註冊一個新帳號的通訊協定。"
 
-#: src/prpl.c:784
+#: src/prpl.c:715
 msgid "Gaim - Registration"
 msgstr "Gaim - 註冊"
 
-#: src/prpl.c:797
+#: src/prpl.c:728
 msgid "Registration Information"
 msgstr "註冊資訊"
 
-#: src/prpl.c:811
+#: src/prpl.c:742
 msgid "Register"
 msgstr "註冊"
 
-#: src/server.c:54
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:880
+#: src/server.c:882
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 個訊息)"
 
-#: src/server.c:892
+#: src/server.c:894
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1072 src/server.c:1079
+#: src/server.c:1074 src/server.c:1081
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1095 src/server.c:1102
+#: src/server.c:1097 src/server.c:1104
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1136
+#: src/server.c:1138
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6218,88 +6319,88 @@
 "%s 剛被 %s 警告過了。\n"
 "您目前的警告等級是 %d%%"
 
-#: src/server.c:1139
+#: src/server.c:1141
 msgid "an anonymous person"
 msgstr "警告一個匿名者嗎?"
 
-#: src/server.c:1227
+#: src/server.c:1229
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
 
-#: src/server.c:1231
+#: src/server.c:1233
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr ""
-
-#: src/server.c:1237
+msgstr "使用者「%s」邀請 %s 到聊天室「%s」\n"
+
+#: src/server.c:1239
 msgid "Buddy Chat Invite"
 msgstr "邀請與好友聊天"
 
 # XXX meaningless if a "proper" translation is used :-(
 # XXX This is a window title. Do we really want to translate this?
-#: src/server.c:1406
+#: src/server.c:1408
 msgid "Gaim - Popup"
 msgstr "Gaim - 彈出資訊"
 
-#: src/server.c:1433
+#: src/server.c:1435
 msgid "More Info"
 msgstr "更多資訊"
 
-#: src/sound.c:78
+#: src/sound.c:79
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/sound.c:79
+#: src/sound.c:80
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/sound.c:80
+#: src/sound.c:81
 msgid "Message received"
 msgstr "收到訊息"
 
-#: src/sound.c:81
-msgid "Message received begins conversation"
-msgstr "收到訊息,開始交談"
-
 #: src/sound.c:82
-msgid "Message sent"
-msgstr "送出訊息"
+msgid "Message received begins conversation"
+msgstr "收到訊息,開始交談"
 
 #: src/sound.c:83
+msgid "Message sent"
+msgstr "送出訊息"
+
+#: src/sound.c:84
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: src/sound.c:84
-msgid "Person leaves chat"
-msgstr "有人離開聊天室"
-
 #: src/sound.c:85
+msgid "Person leaves chat"
+msgstr "有人離開聊天室"
+
+#: src/sound.c:86
 msgid "You talk in chat"
 msgstr "您在聊天室說話"
 
-#: src/sound.c:86
+#: src/sound.c:87
 msgid "Others talk in chat"
 msgstr "其他人在聊天室說話"
 
-#: src/sound.c:89
+#: src/sound.c:90
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: src/sound.c:183
+#: src/sound.c:184
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "所選檔案 (%s) 並不存在,故此無法播出音效。"
 
-#: src/sound.c:195
+#: src/sound.c:197
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "選了以自訂指令發聲,但沒有設定任何指令,故此無法播出音效。"
 
-#: src/sound.c:202
+#: src/sound.c:206
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -6325,7 +6426,7 @@
 msgstr[1] "分鐘"
 
 #. full help text
-#: src/util.c:717
+#: src/util.c:710
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6345,24 +6446,24 @@
 msgstr ""
 
 #. short message
-#: src/util.c:732
+#: src/util.c:725
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. 欲知詳情,請用「%s -h」指令。\n"
 
-#: src/util.c:1020
+#: src/util.c:1013
 msgid "Not connected to AIM"
 msgstr "未有連接到 AIM 伺服器"
 
-#: src/util.c:1029 src/util.c:1068
+#: src/util.c:1022 src/util.c:1061
 msgid "No screenname given."
 msgstr "沒有給予暱稱"
 
-#: src/util.c:1105
+#: src/util.c:1098
 msgid "No roomname given."
 msgstr "沒有給予聊天室名稱。"
 
-#: src/util.c:1124
+#: src/util.c:1117
 msgid "Invalid AIM URI"
 msgstr "無效的 AIM 網址"
 
@@ -6397,12 +6498,12 @@
 msgid "Exit"
 msgstr "退出"
 
-#: src/plugin.c:227
+#: src/plugin.c:231
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
 msgstr "插件 %s 未有提供有效的插件資訊"
 
-#: src/plugin.c:231
+#: src/plugin.c:236
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 無法載入您的這個插件"
 
@@ -6411,10 +6512,36 @@
 msgid "Custom"
 msgstr "自訂"
 
-#: src/gtkdebug.c:71
+#: src/gtkdebug.c:94
 msgid "Debug Window"
 msgstr "除錯視窗"
 
+#: src/gtkdebug.c:130
+msgid "Pause"
+msgstr "暫停"
+
+#: src/gtkdebug.c:136
+msgid "Timestamps"
+msgstr "時間戳"
+
+#~ msgid "Set Friendly Name:"
+#~ msgstr "設定易讀的暱稱:"
+
+#~ msgid "Set Home Phone Number:"
+#~ msgstr "您的住宅電話號碼:"
+
+#~ msgid "Set Work Phone Number:"
+#~ msgstr "您的辦公電話號碼:"
+
+#~ msgid "Set Mobile Phone Number:"
+#~ msgstr "您的手提電話號碼:"
+
+#~ msgid "Send message:"
+#~ msgstr "送出訊息:"
+
+#~ msgid "Gaim - Prompt"
+#~ msgstr "Gaim - 提示"
+
 #~ msgid "Gaim Chat"
 #~ msgstr "Gaim 聊天"
 
@@ -6677,9 +6804,6 @@
 #~ msgid "Link"
 #~ msgstr "鏈結"
 
-#~ msgid "Image"
-#~ msgstr "影像"
-
 #~ msgid "Do you really want to warn %s?"
 #~ msgstr "你真的想警告 %s?"