# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1053923184 0
# Node ID 166ed121e555637fc146a0b40299d2f8be37d697
# Parent  3cf1f969a31af14ea61e6b2336da9efd2e025e71
[gaim-migrate @ 5927]
Ambrose LI (acli) updated the traditional Chinese (zh_TW) translation

committer: Tailor Script <tailor@pidgin.im>

diff -r 3cf1f969a31a -r 166ed121e555 po/zh_TW.po
--- a/po/zh_TW.po	Mon May 26 04:25:00 2003 +0000
+++ b/po/zh_TW.po	Mon May 26 04:26:24 2003 +0000
@@ -1,23 +1,31 @@
 # Traditional Chinese translation for Gaim.
-# Copyright (C) 2000-2003 Free Software Foundation, Inc.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+#
+# Ambrose C. Li <acli@ada.dhs.org>, May 2003
+# Paladin R. Liu <paladin@ms1.hinet.net>, May 2003
 #
-# Forked from simplified Chinese translation by Hashao <hashao@china.com>, 2000.
-# Updated by Rocky S. Lee <rocky@gnuchina.org>, Jan 2002
-# Updated by Paladin Liu <paladin@ms1.hinet.net>, (Jul 2002?)
-# Updated by Ambrose Li <acli@ada.dhs.org>, May 2003
-# 
-# 请随便修正，添加，更新，领功。我没有毅力长期维护。多谢
+# ----------------------------------------------------------
+# For internal use only:
+# FIXME 表示發現了問題，遲早要解決
+# NOTE  表示翻譯有困難，解決了，但不寫下會不明白為什麼這樣譯
+# TODO  表示發現了問題，但不知如何解決
+# XXX   表示可能有問題，要複查；有問題需討論
+# ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
+# ----------------------------------------------------------
+# FIXME 未有統一譯法的字詞：Postal code、Profile、Direct IM
+# NOTE  中文統一用「」引號；URL、指令等該用'/"者除外
+# ----------------------------------------------------------
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim\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"
+"Project-Id-Version: Gaim 0.64cvs\n"
+"POT-Creation-Date: 2003-05-25 18:03+0800\n"
+"PO-Revision-Date: 2003-05-25 17:11+0800\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: plugins/docklet/docklet.c:94 src/multi.c:285 src/win32/systray.c:359
 msgid "Auto-login"
@@ -25,32 +33,32 @@
 
 #: plugins/docklet/docklet.c:97
 msgid "New Message.."
-msgstr "打新訊息..."
+msgstr "新訊息"
 
 #: plugins/docklet/docklet.c:98
 msgid "Join A Chat..."
-msgstr "加入聊天..."
+msgstr "加入聊天室"
 
 #: plugins/docklet/docklet.c:129
 msgid "New..."
-msgstr "新..."
-
-#: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
-#: 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
+msgstr "新增"
+
+#: plugins/docklet/docklet.c:133 src/gtkblist.c:1517 src/gtkpounce.c:566
+#: src/gtkprefs.c:1092 src/protocols/gg/gg.c:71 src/protocols/irc/irc.c:1035
+#: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3444
+#: src/protocols/jabber/jabber.c:3498 src/protocols/oscar/oscar.c:2824
+#: src/protocols/oscar/oscar.c:4510 src/protocols/oscar/oscar.c:5396
+#: src/protocols/oscar/oscar.c:5725
 msgid "Away"
 msgstr "離開"
 
 #: plugins/docklet/docklet.c:139 src/away.c:530
 msgid "Back"
-msgstr "我回來了！"
+msgstr "返回"
 
 #: plugins/docklet/docklet.c:147
 msgid "Mute Sounds"
-msgstr "關掉音效"
+msgstr "靜音"
 
 #: plugins/docklet/docklet.c:152
 msgid "File Transfers..."
@@ -58,7 +66,7 @@
 
 #: plugins/docklet/docklet.c:153
 msgid "Accounts..."
-msgstr "帳戶一覽"
+msgstr "帳號清單"
 
 #: plugins/docklet/docklet.c:154
 msgid "Preferences..."
@@ -70,11 +78,11 @@
 
 #: plugins/docklet/docklet.c:167
 msgid "Quit"
-msgstr "退出"
+msgstr "結束程式"
 
 #: plugins/docklet/docklet.c:451
 msgid "Tray Icon Configuration"
-msgstr "Tray Icon 設定"
+msgstr "工作匣圖示設定"
 
 #. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
@@ -82,7 +90,7 @@
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
 #: plugins/docklet/docklet.c:460
 msgid "_Hide new messages until tray icon is clicked"
-msgstr "直至按一下系統匣之前，新收到的訊息都要暫時隱藏起來(_H)"
+msgstr "隱藏新訊息直到工作匣圖示被點擊(_H)"
 
 #. *< api_version
 #. *< type
@@ -93,14 +101,14 @@
 #. *< id
 #: plugins/docklet/docklet.c:484
 msgid "System Tray Icon"
-msgstr ""
+msgstr "系統工作匣圖示"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/docklet/docklet.c:487
 msgid "Displays an icon for Gaim in the system tray."
-msgstr "在系統匣內為 Gaim 提供一個圖示。"
+msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
 #. *  description
 #: plugins/docklet/docklet.c:489
@@ -110,6 +118,9 @@
 "functions, and to toggle display of the buddy list or login window. Also "
 "allows messages to be queued until the icon is clicked, similar to ICQ."
 msgstr ""
+"在工作匣上（例如 GNOME 或 KDE 等的工作匣）顯示 Gaim 目前的狀態，同時可以快速"
+"的操作 Gaim 所提供的功能（例如開關 Gaim 的登入視窗或好友清單），以及將訊息存"
+"到佇列中，直到工作匣圖示被點擊，就如同使用 ICQ 一樣。"
 
 #. *< api_version
 #. *< type
@@ -120,31 +131,31 @@
 #. *< id
 #: plugins/autorecon.c:85
 msgid "Auto-Reconnect"
-msgstr ""
+msgstr "自動重新連線"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/autorecon.c:88 plugins/autorecon.c:90
 msgid "When you are kicked offline, this reconnects you."
-msgstr "被逼拆接後，這個插件會幫您自動的重新連接。"
+msgstr "當你斷線時，系統會自動幫你重新連線。"
 
 #: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
 msgid "Mail Server"
-msgstr "郵件伺服器："
+msgstr "郵件伺服器"
 
 #: plugins/chkmail.c:131
 #, c-format
 msgid "%s (%d new/%d total)"
-msgstr "%s（新郵件%d件╱總%d件）"
+msgstr "%s（%d 封新郵件 / 共 %d 封郵件）"
 
 #: plugins/chkmail.c:203
 msgid "Check Mail"
-msgstr ""
+msgstr "檢查信箱"
 
 #: plugins/chkmail.c:207
 msgid "Check email every X seconds.\n"
-msgstr "每隔Ｘ秒鐘，就替您檢查有沒有新郵件。\n"
+msgstr "每隔 X 秒檢查一次信箱。\n"
 
 #. *< api_version
 #. *< type
@@ -155,14 +166,14 @@
 #. *< id
 #: plugins/events.c:225
 msgid "Event Test"
-msgstr ""
+msgstr "事件測試"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/events.c:228 plugins/events.c:230
 msgid "Test to see that all events are working properly."
-msgstr "檢查各種「事件」是否都正常運作。"
+msgstr "檢查各種事件是否都正常運作。"
 
 #. *< api_version
 #. *< type
@@ -173,14 +184,14 @@
 #. *< id
 #: plugins/filectl.c:203
 msgid "Gaim File Control"
-msgstr ""
+msgstr "Gaim 檔案控制"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/filectl.c:206 plugins/filectl.c:208
 msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "讓您可以為 Gaim 編寫命令稿。"
+msgstr "允許您在檔案中輸入指令以控制 Gaim。"
 
 #. *< api_version
 #. *< type
@@ -191,14 +202,14 @@
 #. *< id
 #: plugins/gaiminc.c:72
 msgid "Gaim Demonstration Plugin"
-msgstr ""
+msgstr "Gaim 範例模組"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/gaiminc.c:75
 msgid "An example plugin that does stuff - see the description."
-msgstr "這是個搞事的插件──請看說明。"
+msgstr "一個 Gaim 的範例模組 - 請看介紹。"
 
 #. *  description
 #: plugins/gaiminc.c:77
@@ -208,10 +219,10 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"這是個非常「酷」的插件，搞作很多東東：\n"
-"• 當您登入時，告訴您是誰寫了這套軟件的\n"
-"• 任何接收到的訊息都反轉過來顯示\n"
-"• 當好友登入後，隨即向好友發出一個訊息"
+"這是一個很有趣的模組，它具有下列的功能：\n"
+"- 它可以在您登入的時候，告訴您是誰寫了這個程式\n"
+"- 它會反解所有送入的訊息\n"
+"- 它會在您的好友登入時，立刻送出一個訊息給他們"
 
 #: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
@@ -223,17 +234,18 @@
 
 #: plugins/gtik.c:747
 msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr ""
+msgstr "在下面的輸入區中，以「+」符號做區隔。"
 
 #. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
-msgstr ""
+msgstr "選取這個選項，將只會顯示符號和價格："
 
 #: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
 msgstr ""
 
+# TODO 載入模組，看看這究竟是什麼
 #: plugins/gtik.c:994
 msgid "(No"
 msgstr "(No"
@@ -244,17 +256,17 @@
 
 #: plugins/history.c:79
 msgid "History"
-msgstr ""
+msgstr "歷史記錄"
 
 #: plugins/history.c:81
 msgid "Shows recently logged conversations in new conversations."
-msgstr "新交談內同時顯示最近紀錄了的過去交談內容"
+msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
 #: plugins/history.c:82
 msgid ""
 "When a new conversation is opened this plugin will insert the last XXX of "
 "the last conversation into the current conversation."
-msgstr ""
+msgstr "開始新交談時，這個模組為您在交談視窗中顯示上次交談最後的若干行。"
 
 #. *< api_version
 #. *< type
@@ -265,27 +277,26 @@
 #. *< id
 #: plugins/iconaway.c:75
 msgid "Iconify on Away"
-msgstr ""
+msgstr "離開時最小化"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/iconaway.c:78 plugins/iconaway.c:80
 msgid "Iconifies the away box and the buddy list when you go away."
-msgstr "當您離開時，隨即把好友清單及顯示離開訊息的視窗圖示化。"
-
-#: plugins/idle.c:78 src/protocols/irc/irc.c:952
+msgstr "在您離開時，最小化離開訊息視窗及好友清單。"
+
+#: plugins/idle.c:78 src/protocols/irc/irc.c:951
 msgid "Idle Time"
 msgstr "閒置時間"
 
-# #: plugins/idle.c:86
 #: plugins/idle.c:86
 msgid "Set"
-msgstr "設"
+msgstr "設定帳號"
 
 #: plugins/idle.c:91
 msgid "idle for"
-msgstr "為閒置了"
+msgstr "閒置時間"
 
 #: plugins/idle.c:98 plugins/timestamp.c:86
 msgid "minutes."
@@ -293,15 +304,15 @@
 
 #: plugins/idle.c:104
 msgid "_Set"
-msgstr "更改設定(_S)"
+msgstr "設定(_S)"
 
 #: plugins/idle.c:127
 msgid "I'dle Mak'er"
-msgstr ""
+msgstr "I'dle Mak'er"
 
 #: plugins/idle.c:129 plugins/idle.c:130
 msgid "Allows you to hand-configure how long you've been idle for"
-msgstr "讓您自訂您「閒置」了多久"
+msgstr "允許您自定進入閒置狀態時顯示多少閒置時間"
 
 #. *< api_version
 #. *< type
@@ -312,26 +323,26 @@
 #. *< id
 #: plugins/mailchk.c:149
 msgid "Mail Checker"
-msgstr ""
+msgstr "郵件檢查"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/mailchk.c:152 plugins/mailchk.c:154
 msgid "Checks for new local mail."
-msgstr "替您檢查您的電腦上有沒有新郵件。"
+msgstr "檢查本地的新郵件。"
 
 #: plugins/notify.c:442
 msgid "Unable to write to config file"
-msgstr "無法寫入設定檔案"
+msgstr "無法寫入設定檔"
 
 #: plugins/notify.c:443
 msgid "Notify plugin"
-msgstr ""
+msgstr "通知模組"
 
 #: plugins/notify.c:573
 msgid "Notify For"
-msgstr ""
+msgstr "通知種類"
 
 #: plugins/notify.c:574
 msgid "_IM windows"
@@ -339,53 +350,53 @@
 
 #: plugins/notify.c:579
 msgid "_Chat windows"
-msgstr "群組聊天視窗(_C)"
+msgstr "聊天視窗(_C)"
 
 #. --------------
 #: plugins/notify.c:585
 msgid "Notification Methods"
-msgstr "通知方法"
+msgstr "通知方式"
 
 #: plugins/notify.c:588
 msgid "Prepend _string into window title (hit enter to save):"
-msgstr "在視窗標題前加上下列文字(_S)（請按 Enter 鍵儲存）："
+msgstr "加入字串到視窗標題之前（按 Enter 儲存）："
 
 #: plugins/notify.c:599
 msgid "_Quote window title"
-msgstr "在視窗標題加上引號(_Q)"
+msgstr "視窗標題前後加上引號(_Q)"
 
 #: plugins/notify.c:604
 msgid "Set Window Manager \"_URGENT\" Hint"
-msgstr "設定視窗管理程式用的「_URGENT」提示"
+msgstr "強迫視窗管理員顯示提示(_U)"
 
 #: plugins/notify.c:609
 msgid "Insert c_ount of new messages into window title"
-msgstr "替視窗標題加上新訊息的數量(_O)"
+msgstr "加入新訊息數目到視窗標題中(_O)"
 
 #: plugins/notify.c:614
 msgid "_Notify even if conversation is in focus"
-msgstr "即使交談是在個已對準焦點(i_n focus)的視窗中，依舊發出通知"
+msgstr "當這個交談取得輸入焦點時，依然執行通知的動作(_N)"
 
 #. --------------
 #: plugins/notify.c:620
 msgid "Notification Removal"
-msgstr "何時移除通知"
+msgstr "通知移除"
 
 #: plugins/notify.c:621
 msgid "Remove when conversation window gains _focus"
-msgstr "當交談的視窗被您對準了焦點(_focus)"
+msgstr "當交談取得輸入焦點時移除通知(_F)"
 
 #: plugins/notify.c:626
 msgid "Remove when conversation window _receives click"
-msgstr "當交談的視窗被您按了一下(_R)"
+msgstr "當交談視窗被點選時移除通知(_R)"
 
 #: plugins/notify.c:631
 msgid "Remove when _typing in conversation window"
-msgstr "當您在交談的視窗開始打字(_T)"
+msgstr "當在交談視窗中輸入時移除通知(_T)"
 
 #: plugins/notify.c:636
 msgid "Appl_y"
-msgstr "立即使用(_Y)"
+msgstr "套用(_Y)"
 
 #. *< api_version
 #. *< type
@@ -396,14 +407,14 @@
 #. *< id
 #: plugins/notify.c:699
 msgid "Message Notification"
-msgstr ""
+msgstr "訊息通知"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/notify.c:702 plugins/notify.c:704
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "給您幾個不同的方法，通知您有未曾閱讀的即時訊息。"
+msgstr "提供多種方式來通知您有未讀取的訊息。"
 
 #: plugins/raw.c:152
 msgid "Raw"
@@ -411,13 +422,15 @@
 
 #: plugins/raw.c:154
 msgid "Lets you send raw input to text-based protocols."
-msgstr ""
+msgstr "讓您向文字模式的各種協定直接輸入指令。"
 
 #: plugins/raw.c:155
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
+"讓您向文字模式的各種協定（即 Jabber、MSN、IRC 及 TOC）直接輸入原始指令。在輸"
+"入欄位輸入指令，按 Enter 鍵送出；相關資訊會在除錯視窗顯示。"
 
 #. *< api_version
 #. *< type
@@ -428,58 +441,58 @@
 #. *< id
 #: plugins/simple.c:30
 msgid "Simple Plugin"
-msgstr ""
+msgstr "簡易模組"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/simple.c:33 plugins/simple.c:35
 msgid "Tests to see that most things are working."
-msgstr "測試 Gaim 是否大體上正常"
+msgstr "用來測試是否大多東西都正常運作。"
 
 #: plugins/spellchk.c:411
 msgid "Text Replacements"
-msgstr ""
+msgstr "文字取代"
 
 #: plugins/spellchk.c:435
 msgid "You type"
-msgstr "您打的文字是"
+msgstr "您輸入"
 
 #: plugins/spellchk.c:447
 msgid "You send"
-msgstr "但實際上送出"
+msgstr "您送出"
 
 #: plugins/spellchk.c:473
 msgid "Add a new text replacement"
-msgstr "新訂一個文子替換規則"
+msgstr "加入一個新的文字取代規則"
 
 #: plugins/spellchk.c:480
 msgid "You _type:"
-msgstr "你打的文字是(_T)："
+msgstr "您輸入(_T)："
 
 #: plugins/spellchk.c:494
 msgid "You _send:"
-msgstr "但實際上送出(_S)："
+msgstr "您送出(_S)："
 
 #: plugins/spellchk.c:534
 msgid "Text replacement"
-msgstr ""
+msgstr "文字取代"
 
 #: plugins/spellchk.c:536 plugins/spellchk.c:537
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "讓你自訂送出訊息前，怎樣更改您打出的訊息。"
+msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
 #: plugins/timestamp.c:72
 msgid "iChat Timestamp"
-msgstr ""
+msgstr "iChat 時間戳記"
 
 #: plugins/timestamp.c:79
 msgid "Delay"
-msgstr "每隔多少分鐘"
+msgstr "延遲"
 
 #: plugins/timestamp.c:92
 msgid "_Apply"
-msgstr "立即使用(_A)"
+msgstr "套用(_A)"
 
 #. *< api_version
 #. *< type
@@ -490,32 +503,32 @@
 #. *< id
 #: plugins/timestamp.c:145
 msgid "Timestamp"
-msgstr ""
+msgstr "時間戳記"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/timestamp.c:148 plugins/timestamp.c:150
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "每隔Ｎ分鐘，給交談加上 iChat 式的時間戳記。"
+msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:210
 msgid "Mouse Gestures Configuration"
-msgstr ""
+msgstr "滑鼠動作設定"
 
 #: plugins/gestures/gestures.c:217
 msgid "Middle mouse button"
-msgstr ""
+msgstr "滑鼠中鍵"
 
 #: plugins/gestures/gestures.c:222
 msgid "Right mouse button"
-msgstr ""
+msgstr "滑鼠右鍵"
 
 #. "Visual gesture display" checkbox
 #: plugins/gestures/gestures.c:234
 msgid "_Visual gesture display"
-msgstr ""
+msgstr "顯示動作路徑(_V)"
 
 #. *< api_version
 #. *< type
@@ -526,14 +539,14 @@
 #. *< id
 #: plugins/gestures/gestures.c:261
 msgid "Mouse Gestures"
-msgstr ""
+msgstr "滑鼠動作"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/gestures/gestures.c:264
 msgid "Provides support for mouse gestures"
-msgstr ""
+msgstr "提供滑鼠動作的支援"
 
 #. *  description
 #: plugins/gestures/gestures.c:266
@@ -545,6 +558,12 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
+"支援交談視窗中的滑鼠動作。\n"
+"按下滑鼠中間鍵並拖曳滑鼠以執行實際動作：\n"
+"\n"
+"往下後向右拖曳為關閉一個交談。\n"
+"往上後向左拖曳為切換到前一個交談。\n"
+"往上後向右拖曳為切換到下一個交談。"
 
 #. *< api_version
 #. *< type
@@ -555,34 +574,33 @@
 #. *< id
 #: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:283
 msgid "Buddy Ticker"
-msgstr ""
+msgstr "好友跑馬燈"
 
 #. *< name
 #. *< version
 #. *  summary
 #: plugins/ticker/ticker.c:286 plugins/ticker/ticker.c:288
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "這是一個顯示好友狀態的走馬燈。"
+msgstr "水平捲動版本的好友清單"
 
 #: plugins/win32/transparency/win2ktrans.c:123
 #: plugins/win32/transparency/win2ktrans.c:412
 #: plugins/win32/transparency/win2ktrans.c:446
 msgid "Opacity:"
-msgstr "暗度："
+msgstr "不透明度："
 
 #. IM Convo trans options
 #: plugins/win32/transparency/win2ktrans.c:393
 msgid "IM Conversation Windows"
-msgstr "交談視窗選項"
+msgstr "即時訊息交談視窗"
 
 #: plugins/win32/transparency/win2ktrans.c:394
 msgid "_IM window transparency"
-msgstr "即時訊息視窗之透明度(_I)"
-
-# XXX don't know how to translate "slider"
+msgstr "即時訊息視窗透明度(_I)"
+
 #: plugins/win32/transparency/win2ktrans.c:404
 msgid "_Show slider bar in IM window"
-msgstr ""
+msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
 #: plugins/win32/transparency/win2ktrans.c:429 src/gtkprefs.c:606
@@ -591,11 +609,11 @@
 
 #: plugins/win32/transparency/win2ktrans.c:430
 msgid "_Keep Buddy List window on top"
-msgstr "好友清單永遠在其他視窗之上(_K)"
+msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #: plugins/win32/transparency/win2ktrans.c:433
 msgid "_Buddy List window transparency"
-msgstr "好友清單視窗之透明度(_B)"
+msgstr "好友清單視窗透明度(_B)"
 
 #. *< api_version
 #. *< type
@@ -606,7 +624,7 @@
 #. *< id
 #: plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
-msgstr ""
+msgstr "透明度"
 
 #. *< name
 #. *< version
@@ -618,9 +636,9 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"這套插件讓顯示交談的視窗可以有可變的透明度。\n"
+"這個模組可以讓交談視窗產生半透明的效果。\n"
 "\n"
-"※註：這套插件要視窗2000或XP方可運作。"
+"* 請注意：這個模組需要 Win2000 或 WinXP 才能產生效果。"
 
 #. IM Convo trans options
 #: plugins/win32/winprefs/winprefs.c:141
@@ -629,7 +647,7 @@
 
 #: plugins/win32/winprefs/winprefs.c:142
 msgid "_Start Gaim on Windows startup"
-msgstr "啟動 Window_s 時自動啟動 Gaim"
+msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #: plugins/win32/winprefs/winprefs.c:170
 msgid "WinGaim Options"
@@ -637,11 +655,11 @@
 
 #: plugins/win32/winprefs/winprefs.c:172 plugins/win32/winprefs/winprefs.c:173
 msgid "Options specific to Windows Gaim."
-msgstr "Windows Gaim 特有選項"
+msgstr "Windows Gaim 的相關選項。"
 
 #: plugins/perl/perl.c:396
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
-msgstr "GAIM::register 收到了無效的參數；請讀 PERL-HOWTO 的說明。"
+msgstr "GAIM::register 呼叫時並沒有提供適當的參數。請參考 PERL-HOWTO。"
 
 #. *< api_version
 #. *< type
@@ -652,13 +670,13 @@
 #. *< id
 #: plugins/perl/perl.c:1376
 msgid "Perl Plugin Loader"
-msgstr ""
+msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
 #: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
 msgid "Provides support for loading perl plugins."
-msgstr "給您支援載入用 Perl 寫的插件。"
+msgstr "提供讀入 Perl 模組的支援。"
 
 #. *< api_version
 #. *< type
@@ -669,7 +687,7 @@
 #. *< id
 #: plugins/statenotify.c:68
 msgid "Buddy State Notification"
-msgstr ""
+msgstr "好友狀態通知"
 
 #. *< name
 #. *< version
@@ -678,15 +696,15 @@
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "在顯示交談內容的視窗中同時顯示好友的登出、離開及閒置。"
+msgstr "在交談視窗中顯示好友離開或是由離開（閒置）返回的通知訊息。"
 
 #: 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/msn.c:311 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1273
-#: src/protocols/yahoo/yahoo.c:1352
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1275
+#: src/protocols/yahoo/yahoo.c:1354
 msgid "Available"
-msgstr "有空"
+msgstr "上線"
 
 #: src/protocols/gg/gg.c:70
 msgid "Available for friends only"
@@ -694,23 +712,24 @@
 
 #: src/protocols/gg/gg.c:72
 msgid "Away for friends only"
-msgstr "離開了（只有好友可以看到我）"
-
-#: 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
+msgstr "離開（只有好友可以看到我）"
+
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3447
+#: src/protocols/jabber/jabber.c:3510 src/protocols/oscar/oscar.c:2828
+#: src/protocols/oscar/oscar.c:4498 src/protocols/oscar/oscar.c:4525
+#: src/protocols/oscar/oscar.c:5730 src/protocols/yahoo/yahoo.c:1087
+#: src/protocols/yahoo/yahoo.c:1297 src/protocols/yahoo/yahoo.c:1364
 msgid "Invisible"
-msgstr "隱了身"
-
+msgstr "隱身"
+
+# XXX
 #: src/protocols/gg/gg.c:74
 msgid "Invisible for friends only"
-msgstr "隱了身（只好好友可以看到我）"
+msgstr "隱身（只有好友可以看到我）"
 
 #: src/protocols/gg/gg.c:75
 msgid "Unavailable"
-msgstr "沒空"
+msgstr "離線"
 
 #: src/protocols/gg/gg.c:157
 msgid "Unable to resolve hostname."
@@ -718,7 +737,7 @@
 
 #: src/protocols/gg/gg.c:160
 msgid "Unable to connect to server."
-msgstr "無法連接到伺服器。"
+msgstr "無法連線到伺服器。"
 
 #: src/protocols/gg/gg.c:163
 msgid "Invalid response from server."
@@ -738,7 +757,7 @@
 
 #: src/protocols/gg/gg.c:175
 msgid "Unknown Error Code."
-msgstr "不明的錯誤代碼。"
+msgstr "未知的錯誤代碼。"
 
 #: src/protocols/gg/gg.c:280
 #, c-format
@@ -747,7 +766,7 @@
 
 #: src/protocols/gg/gg.c:301
 msgid "Could not connect"
-msgstr "無法連接"
+msgstr "無法連結"
 
 #: src/protocols/gg/gg.c:308
 msgid "Unable to read socket"
@@ -755,7 +774,7 @@
 
 #: src/protocols/gg/gg.c:418
 msgid "Unable to connect."
-msgstr "無法連接。"
+msgstr "無法連結。"
 
 #: src/protocols/gg/gg.c:434
 msgid "Reading data"
@@ -767,7 +786,7 @@
 
 #: src/protocols/gg/gg.c:440
 msgid "Reading server key"
-msgstr "讀取伺服器的公鑰中"
+msgstr "讀取 Server Key 中"
 
 #: src/protocols/gg/gg.c:443
 msgid "Exchanging key hash"
@@ -775,20 +794,21 @@
 
 #: src/protocols/gg/gg.c:452
 msgid "Critical error in GG library\n"
-msgstr "在 GG Library 中發生了重大錯誤\n"
+msgstr "在 GG Library 中的重大錯誤\n"
 
 #: src/protocols/gg/gg.c:471 src/protocols/gg/gg.c:567
 #, c-format
 msgid "Connect to %s failed"
-msgstr "連接到 %s 失敗"
+msgstr "連結到 %s 失敗"
 
 #: src/protocols/gg/gg.c:520
 msgid "Unable to ping server"
 msgstr "無法取得伺服器回應"
 
+# XXX
 #: src/protocols/gg/gg.c:532
 msgid "Send as message"
-msgstr "以訊息的形式送出"
+msgstr "以訊息送出"
 
 #: src/protocols/gg/gg.c:540
 msgid "Looking up GG server"
@@ -796,7 +816,7 @@
 
 #: src/protocols/gg/gg.c:543
 msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "您給予了一個無效的 Gadu-Gadu UIN"
+msgstr "無效的 Gadu-Gadu UIN 定義"
 
 #: src/protocols/gg/gg.c:592
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
@@ -814,12 +834,11 @@
 msgid "Active"
 msgstr "啟動"
 
-# XXX the gtkft.c usage is not very good (in the source), ditto for "No" below
-#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1033
+#: src/protocols/gg/gg.c:686
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1034
+#: src/protocols/gg/gg.c:686
 msgid "No"
 msgstr "否"
 
@@ -831,10 +850,9 @@
 msgid "First name"
 msgstr "名"
 
-# XXX blank out "Second Name" for now
 #: src/protocols/gg/gg.c:699
 msgid "Second Name"
-msgstr " "
+msgstr ""
 
 #: src/protocols/gg/gg.c:703
 msgid "Nick"
@@ -850,17 +868,17 @@
 msgstr "性別"
 
 #. Line 5
-#: src/protocols/gg/gg.c:727 src/dialogs.c:2028 src/dialogs.c:2667
+#: src/dialogs.c:2040 src/dialogs.c:2679 src/protocols/gg/gg.c:727
 msgid "City"
 msgstr "城市"
 
 #: src/protocols/gg/gg.c:760
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
-msgstr "對不起，Gadu-Gadu 伺服器上並沒有儲存任何的好友清單！"
+msgstr "Gadu-Gadu 伺服器上並沒有儲存任何的好友清單。"
 
 #: src/protocols/gg/gg.c:768
 msgid "Couldn't Import Buddy List from Server"
-msgstr "無法自伺服器處匯入好友清單"
+msgstr "無法自伺服器上取得好友名單"
 
 #: src/protocols/gg/gg.c:829
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
@@ -876,7 +894,7 @@
 
 #: src/protocols/gg/gg.c:851
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-msgstr "無法刪除在 Gadu-Gadu 的伺服器上的好友清單"
+msgstr "無法刪除在 Gadu-Gadu 伺服器上的好友清單"
 
 #: src/protocols/gg/gg.c:859
 msgid "Password changed successfully"
@@ -888,25 +906,25 @@
 
 #: src/protocols/gg/gg.c:977
 msgid "Error communicating with Gadu-Gadu server"
-msgstr "跟 Gadu-Gadu 的伺服器通訊時發生了錯誤。"
+msgstr "和 Gadu-Gadu 伺服器溝通時發生錯誤"
 
 #: 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."
 msgstr ""
-"因為與 Gadu-Gadu 的 HTTP 伺服器通訊時出現了問題，您作的請求無法完成。請等一會"
-"後再重試。"
+"因為和 Gadu-Gadu HTTP 伺服器溝通時發生問題，所以 Gaim 沒有辦法完成您所指定的"
+"工作。請待會兒重試。"
 
 #: src/protocols/gg/gg.c:1006
 msgid "Unable to import Gadu-Gadu buddy list"
-msgstr "無法匯入 Gadu-Gadu 好友清單"
+msgstr "無法匯入 Gadu-Gadu 的好友清單"
 
 #: 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 的好友清單伺服器。請等一會後再重試。"
+msgstr "Gaim 無法連上 Gadu-Gadu 好友清單伺服器。請晚點再試一次。"
 
 #: src/protocols/gg/gg.c:1076
 msgid "Couldn't export buddy list"
@@ -915,68 +933,69 @@
 #: 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 無法連接到好友清單伺服器。請等一會後再重試。"
+msgstr "Gaim 無法連上好友清單伺服器。請晚點再試一次。"
 
 #: src/protocols/gg/gg.c:1099
 msgid "Unable to delete Gadu-Gadu buddy list"
-msgstr "無法刪除 Gadu-Gadu 的好友清單"
+msgstr "無法刪除 Gadu-Gadu 好友清單"
 
 #: src/protocols/gg/gg.c:1148
 msgid "Unable to access directory"
-msgstr "無法讀取目錄"
+msgstr "無法存取目錄"
 
 #: 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 無法連接至目錄伺服器，以致無法為您在目錄中作搜尋。請等一會後再重試。"
+"因為 Gaim 沒有辦法連上名錄伺服器，所以無法搜尋名錄上的資料。請待會兒再試一"
+"次。"
 
 #: src/protocols/gg/gg.c:1182
 msgid "Unable to change Gadu-Gadu password"
-msgstr "無法更改 Gadu-Gadu 密碼"
+msgstr "無法修改 Gadu-Gadu 密碼"
 
 #: 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."
 msgstr ""
-"因為連接到 Gadu-Gadu 的伺服器時發生了問題，Gaim 無法替您修改您的密碼。請等一"
-"會後再重試。"
+"因為 Gaim 沒有辦法連上 Gadu-Gadu 伺服器，所以無法修改您的密碼。請待會兒再試一"
+"次。"
 
 #: src/protocols/gg/gg.c:1199
 msgid "Directory Search"
-msgstr "目錄搜尋"
-
-#: 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
+msgstr "名錄搜尋"
+
+#: src/dialogs.c:2149 src/dialogs.c:2158 src/protocols/gg/gg.c:1207
+#: src/protocols/jabber/jabber.c:4333 src/protocols/oscar/oscar.c:5923
+#: src/protocols/toc/toc.c:1453
 msgid "Change Password"
 msgstr "修改密碼"
 
 #: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
-msgstr "自伺服器上匯入好友清單"
+msgstr "自伺服器上匯入好友名單"
 
 #: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
-msgstr "匯出好友清單到伺服器上"
+msgstr "匯出好友名單到伺服器上"
 
 #: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
-msgstr "將伺服器上的好友清單刪除"
+msgstr "將伺服器上的好友名單刪除"
 
 #: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
-msgstr "無法存取您的個人檔案。"
+msgstr "無法讀取使用者簡介檔。"
 
 #: 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."
 msgstr ""
-"因為連接至目錄伺服器時出現了錯誤，Gaim 無法存取這使用者的個人檔案。請等一會後"
-"再重試。"
+"因為 Gaim 沒有辦法連上名錄伺服器，所以無法取得使用者的人個資料。請待會兒再試"
+"一次。"
 
 #. *< api_version
 #. *< type
@@ -990,50 +1009,50 @@
 #. *  summary
 #: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu 通訊協定插件"
+msgstr "Gadu-Gadu 協定模組"
 
 #: src/protocols/icq/gaim_icq.c:224
 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:2648
-#: src/dialogs.c:2434 src/gtkconv.c:807 src/gtkconv.c:2646 src/gtkconv.c:3790
-#: src/prpl.c:637
+msgstr "Gaim 在連結 ICQ 伺服器時發生錯誤。"
+
+#: src/dialogs.c:2446 src/gtkconv.c:807 src/gtkconv.c:2646 src/gtkconv.c:3790
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2672
+#: src/prpl.c:521
 msgid "Add"
-msgstr "增加"
+msgstr "加入"
 
 #. Cancel button.
-#: 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
+#: src/buddy_chat.c:309 src/dialogs.c:471 src/dialogs.c:482 src/dialogs.c:494
+#: src/dialogs.c:2097 src/dialogs.c:2210 src/dialogs.c:2270 src/dialogs.c:2435
+#: src/dialogs.c:2621 src/dialogs.c:2770 src/dialogs.c:3418 src/dialogs.c:3910
+#: src/dialogs.c:4388 src/dialogs.c:4961 src/multi.c:1550 src/multi.c:1914
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1118
+#: src/protocols/irc/irc.c:1447 src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:217
+#: src/protocols/oscar/oscar.c:2404 src/protocols/oscar/oscar.c:2441
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2521
+#: src/protocols/oscar/oscar.c:5604 src/protocols/oscar/oscar.c:5808
+#: src/protocols/oscar/oscar.c:5856 src/protocols/yahoo/yahoo.c:1204
+#: src/prpl.c:522
 msgid "Cancel"
 msgstr "取消"
 
 #: src/protocols/icq/gaim_icq.c:294
 #, c-format
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-msgstr "使用者 %s（%s%s%s%s%s）想要批准他加您入他的好友清單。"
-
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/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
+msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
+
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1722
+#: src/protocols/msn/notification.c:448 src/protocols/msn/notification.c:722
+#: src/protocols/oscar/oscar.c:2600 src/protocols/oscar/oscar.c:5052
 msgid "Authorize"
-msgstr "批准"
-
-#: 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
+msgstr "給予認證"
+
+#: src/dialogs.c:2434 src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/jabber.c:1723 src/protocols/msn/notification.c:449
+#: src/protocols/msn/notification.c:724 src/protocols/oscar/oscar.c:2602
+#: src/protocols/oscar/oscar.c:5053
 msgid "Deny"
 msgstr "拒絕"
 
@@ -1041,19 +1060,19 @@
 msgid "Send message through server"
 msgstr "透過伺服器傳送訊息"
 
-#: 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/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2376 src/protocols/jabber/jabber.c:4250
+#: src/protocols/jabber/jabber.c:4297 src/protocols/msn/dispatch.c:165
+#: src/protocols/msn/msn.c:426 src/protocols/msn/notification.c:1289
 #: src/protocols/napster/napster.c:515
 msgid "Unable to connect"
-msgstr "無法連接"
+msgstr "無法連線"
 
 #: src/protocols/icq/gaim_icq.c:352
 msgid "Connecting..."
-msgstr "連接中"
-
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3881
+msgstr "連線中..."
+
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3907
 msgid "Nick:"
 msgstr "暱稱："
 
@@ -1065,194 +1084,195 @@
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
-msgstr "(為這個訊息轉換編碼時出現了錯誤。請檢查帳戶的「編碼」設定是否有誤。)"
-
-#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2636
+msgstr "（為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項）"
+
+#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2630
 #, c-format
 msgid "DCC Chat with %s closed"
-msgstr "跟 %s 的 DCC 聊天經已結束"
-
-#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2645
+msgstr "和 %s 的 DCC 聊天已關閉"
+
+#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2639
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "和 %s 的 DCC 聊天已經被建立"
 
 #: src/protocols/irc/irc.c:691
 msgid "No topic is set"
-msgstr "未有聊天主題"
-
-# XXX note: this message is displayed when the channel is *first* entered (!)
-#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1775
+msgstr "沒有設定主題"
+
+# NOTE 剛進入聊天室時會顯示這個；如果「changed」直譯「修改」會很奇怪
+#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1769
 #, 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 "-:- 模式改變/%s [%c%c %s]；更改者：%s"
-
-#: src/protocols/irc/irc.c:935 src/protocols/irc/irc.c:948
+msgstr "-:- 模式/%s [%c%c %s] 被 %s 設定"
+
+#: src/protocols/irc/irc.c:934 src/protocols/irc/irc.c:947
 msgid "User"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:939
+#: src/protocols/irc/irc.c:938
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:943 src/protocols/irc/irc.c:1109
-#: src/protocols/irc/irc.c:1667
+#: src/protocols/irc/irc.c:942 src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1661
 msgid "IRC Operator"
-msgstr "IRC 管理員"
-
-#: src/protocols/irc/irc.c:956
+msgstr "IRC 操作者"
+
+#: src/protocols/irc/irc.c:955
 msgid "Channels"
 msgstr "頻道"
 
-#: src/protocols/irc/irc.c:962
+#: src/protocols/irc/irc.c:961
 #, c-format
 msgid "%s is an Identified User"
-msgstr "%s 是個身份經過驗證的使用者"
-
-#: src/protocols/irc/irc.c:989
+msgstr "%s 是一個已驗證的使用者"
+
+#: src/protocols/irc/irc.c:976
 #, c-format
 msgid "%ld seconds [signon: %s]"
-msgstr "%ld 秒 [登入時間：%s]"
+msgstr "%ld 秒 [登入：%s]"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1109
+#: src/protocols/irc/irc.c:1096
 msgid "Rehashing server"
-msgstr ""
+msgstr "重新設定伺服器中"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1112
+#: src/protocols/irc/irc.c:1099
 msgid "No such nick/channel"
-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
+msgstr "沒有那個暱稱或頻道"
+
+#: src/protocols/irc/irc.c:1099 src/protocols/irc/irc.c:1102
+#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1111
+#: src/protocols/irc/irc.c:1476 src/protocols/irc/irc.c:1619
 msgid "IRC Error"
 msgstr "IRC 錯誤"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1115
+#: src/protocols/irc/irc.c:1102
 msgid "No such server"
-msgstr "無此伺服器"
+msgstr "沒有那部伺服器"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1120
+#: src/protocols/irc/irc.c:1107
 msgid "No nickname given"
 msgstr "沒有給予暱稱"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1123
+#: src/protocols/irc/irc.c:1110
 msgid "You're not an IRC operator!"
-msgstr "您並非 IRC 管理員啊！"
-
-#: src/protocols/irc/irc.c:1127
+msgstr "您不是一個 IRC 操作者！"
+
+#: src/protocols/irc/irc.c:1114
 msgid "That nick is already in use.  Please enter a new nick"
-msgstr "這個暱稱已有別人用了，另選別的一個吧！"
+msgstr "這個暱稱已經在使用中。請輸入一個新的暱稱"
 
 #. 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
+#: src/dialogs.c:2206 src/dialogs.c:2338 src/dialogs.c:2620 src/dialogs.c:2766
+#: src/dialogs.c:3903 src/dialogs.c:4382 src/protocols/irc/irc.c:1117
+#: src/protocols/msn/msn.c:170 src/protocols/msn/msn.c:181
+#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
+#: src/protocols/oscar/oscar.c:2440 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:5807 src/protocols/oscar/oscar.c:5855
+#: src/protocols/yahoo/yahoo.c:1203
 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
+msgstr "確定"
+
+#: src/protocols/irc/irc.c:1403 src/protocols/irc/irc.c:1409
+#: src/protocols/irc/irc.c:1415 src/protocols/irc/irc.c:1429
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 資訊"
 
-#: src/protocols/irc/irc.c:1452
+#: src/protocols/irc/irc.c:1439
 #, c-format
 msgid "%s would like to establish a DCC chat"
-msgstr "%s 希望跟您做個 DCC 聊天"
-
-#: src/protocols/irc/irc.c:1453
+msgstr "%s 想要建立一個 DCC 聊天"
+
+#: src/protocols/irc/irc.c:1442
 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:1453 src/protocols/oscar/oscar.c:2396
-#: src/protocols/oscar/oscar.c:5563
+msgstr ""
+"這個要求將會建立起兩部電腦間的連線，而訊息將不會透過 IRC 伺服器來進行傳送"
+
+#: src/protocols/irc/irc.c:1446 src/protocols/oscar/oscar.c:2403
+#: src/protocols/oscar/oscar.c:5603
 msgid "Connect"
-msgstr "連接"
-
-#: src/protocols/irc/irc.c:1479
+msgstr "連線"
+
+#: src/protocols/irc/irc.c:1473
 #, c-format
 msgid "Received an invalid file send request from %s."
-msgstr "從 %s 收到了個無效的檔案傳輸要求。"
-
-#: src/protocols/irc/irc.c:1560 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:276 src/protocols/msn/notification.c:731
+msgstr "收到一個來自於 %s 無效的檔案送出需求。"
+
+#: src/protocols/irc/irc.c:1554 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:280 src/protocols/msn/notification.c:735
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: src/protocols/irc/irc.c:1623
+#: src/protocols/irc/irc.c:1617
 #, c-format
 msgid "You have been kicked from %s: %s"
-msgstr "您給人從 %s 趕走了：%s"
-
-#: src/protocols/irc/irc.c:1628
+msgstr "您被踢出 %s: %s"
+
+#: src/protocols/irc/irc.c:1622
 #, c-format
 msgid "Kicked by %s: %s"
-msgstr "您被 %s 趕走了：%s"
+msgstr "被 %s 踢出：%s"
+
+#: src/protocols/irc/irc.c:1678 src/protocols/irc/irc.c:2940
+msgid "CTCP ClientInfo"
+msgstr "CTCP 客戶端資訊"
 
 #: src/protocols/irc/irc.c:1684 src/protocols/irc/irc.c:2946
-msgid "CTCP ClientInfo"
-msgstr ""
+msgid "CTCP UserInfo"
+msgstr "CTCP 使用者資訊"
 
 #: src/protocols/irc/irc.c:1690 src/protocols/irc/irc.c:2952
-msgid "CTCP UserInfo"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1696 src/protocols/irc/irc.c:2958
 msgid "CTCP Version"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1724 src/protocols/irc/irc.c:2964
+msgstr "CTCP 版本"
+
+#: src/protocols/irc/irc.c:1718 src/protocols/irc/irc.c:2958
 msgid "CTCP Ping"
-msgstr ""
-
-#: src/protocols/irc/irc.c:1977 src/protocols/oscar/oscar.c:695
+msgstr "CTCP Ping"
+
+#: src/protocols/irc/irc.c:1971 src/protocols/oscar/oscar.c:695
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
-msgstr "登入中：%s"
-
-#: src/protocols/irc/irc.c:2233
+msgstr "登入：%s"
+
+#: src/protocols/irc/irc.c:2227
 #, c-format
 msgid "Topic for %s is %s"
-msgstr "%s 的聊天主題為 %s"
-
-#: src/protocols/irc/irc.c:2329
+msgstr "%s 的主題為 %s"
+
+#: src/protocols/irc/irc.c:2323
 #, c-format
 msgid "You have left %s"
 msgstr "您離開了 %s"
 
-#: src/protocols/irc/irc.c:2330
+#: src/protocols/irc/irc.c:2324
 msgid "IRC Part"
-msgstr ""
-
-#: src/protocols/irc/irc.c:2385
+msgstr "IRC 離開"
+
+#: src/protocols/irc/irc.c:2379
 msgid "<I>Requesting DCC CHAT</I>"
-msgstr "<I>要求 DCC 聊天中</I>"
-
-#: src/protocols/irc/irc.c:2402
+msgstr "<I>要求 DCC 聊天</I>"
+
+#: src/protocols/irc/irc.c:2396
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
-msgstr "<B>管理員專用指令：<BR>REHASH RESTART</B>"
-
-#: src/protocols/irc/irc.c:2407
+msgstr "<B>IRC 操作者指令：<BR>REHASH RESTART</B>"
+
+#: src/protocols/irc/irc.c:2401
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1260,35 +1280,35 @@
 "<B>CTCP 指令：<BR>CLIENTINFO <暱稱><BR>USERINFO <暱稱><BR>VERSION <暱稱"
 "><BR>PING <暱稱></B><BR>"
 
-#: src/protocols/irc/irc.c:2415
+#: src/protocols/irc/irc.c:2409
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>DCC 指令：<BR>CHAT <暱稱></B>"
 
-#: src/protocols/irc/irc.c:2420
+#: src/protocols/irc/irc.c:2414
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
 "W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
 "CTCP commands<BR>Type /HELP DCC for DCC commands"
 msgstr ""
-"<B>目前支援以下指令：<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC "
-"KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W "
-"WHOWAS<BR>輸入 /HELP OPER 列出管理員專用指令<BR>輸入 /HELP CTCP 列出CTCP 指令"
-"<BR>輸入 /HELP DCC 列出 DCC 指令"
-
-#: src/protocols/irc/irc.c:2443
+"<B>目前支援的指令：<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC KICK<BR>OP "
+"DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W WHOWAS<BR>輸"
+"入 /HELP OPER 顯示操作者指令<BR>輸入 /HELP CTCP 顯示 CTCP 指令<BR>輸入 /HELP "
+"DCC 顯示 DCC 指令"
+
+#: src/protocols/irc/irc.c:2437
 msgid "<B>Unknown command</B>"
-msgstr "<B>無此指令</B>"
-
-#: src/protocols/irc/irc.c:2503
+msgstr "<B>未知的指令</B>"
+
+#: src/protocols/irc/irc.c:2497
 msgid "Channel:"
-msgstr "頻道："
-
-#: src/protocols/irc/irc.c:2508 src/main.c:350 src/multi.c:809
+msgstr "頻道:"
+
+#: src/main.c:350 src/multi.c:809 src/protocols/irc/irc.c:2502
 msgid "Password:"
 msgstr "密碼："
 
-#: src/protocols/irc/irc.c:2933
+#: src/protocols/irc/irc.c:2927
 msgid "DCC Chat"
 msgstr "DCC 聊天"
 
@@ -1302,34 +1322,34 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3039 src/protocols/irc/irc.c:3041
+#: src/protocols/irc/irc.c:3033 src/protocols/irc/irc.c:3035
 msgid "IRC Protocol Plugin"
-msgstr "IRC 通訊協定插件"
-
-#: src/protocols/irc/irc.c:3061 src/protocols/jabber/jabber.c:2958
-#: src/protocols/jabber/jabber.c:4425 src/protocols/napster/napster.c:660
+msgstr "IRC 協定模組"
+
+#: src/protocols/irc/irc.c:3055 src/protocols/jabber/jabber.c:2963
+#: src/protocols/jabber/jabber.c:4430 src/protocols/napster/napster.c:660
 msgid "Server:"
 msgstr "伺服器："
 
-#: 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
+#: src/multi.c:1135 src/protocols/irc/irc.c:3060
+#: src/protocols/jabber/jabber.c:4441 src/protocols/msn/msn.c:1206
+#: src/protocols/napster/napster.c:666
 msgid "Port:"
-msgstr "連接埠："
-
-#: src/protocols/irc/irc.c:3072
+msgstr "通訊埠："
+
+#: src/protocols/irc/irc.c:3066
 msgid "Encoding:"
 msgstr "編碼："
 
 #: src/protocols/jabber/jabber.c:990
 msgid "Unable to change password."
-msgstr "無法更改密碼"
+msgstr "無法更改密碼。"
 
 #: src/protocols/jabber/jabber.c:991
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
-msgstr "您沒有打對您的舊密碼，故此您的密碼沒被更改。"
+msgstr "您所輸入的舊密碼是錯的。您的密碼沒有更改。"
 
 #: src/protocols/jabber/jabber.c:997
 msgid "Unable to change password"
@@ -1339,26 +1359,26 @@
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
-msgstr "您打了的新密碼跟您的舊密碼一模一樣，故此您的密碼沒被更改。"
-
-#: src/protocols/jabber/jabber.c:1175 src/blist.c:714 src/gtkpounce.c:298
+msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
+
+#: src/blist.c:714 src/gtkpounce.c:298 src/protocols/jabber/jabber.c:1175
 msgid "Unknown"
 msgstr "未知"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3438
-#: src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3443
+#: src/protocols/jabber/jabber.c:3494
 msgid "Chatty"
-msgstr "很想聊天"
-
-#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3440
-#: src/protocols/jabber/jabber.c:3497
+msgstr "想聊天"
+
+#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3445
+#: src/protocols/jabber/jabber.c:3502
 msgid "Extended Away"
-msgstr "外出去了"
-
-#: 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
+msgstr "長時間離開"
+
+#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:3446
+#: src/protocols/jabber/jabber.c:3506 src/protocols/oscar/oscar.c:2818
+#: src/protocols/oscar/oscar.c:4513 src/protocols/oscar/oscar.c:5726
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -1372,250 +1392,242 @@
 msgid "Error %s: %s"
 msgstr "錯誤 %s：%s"
 
+# XXX check with Paladin
 #: src/protocols/jabber/jabber.c:1537
 msgid "Unknown Error in presence"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1713
+msgstr "未知的出現錯誤。"
+
+#: src/protocols/jabber/jabber.c:1715
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
-msgstr "使用者 %s 想要將您加入他的好友清單中。"
-
-#: src/protocols/jabber/jabber.c:1738
+msgstr "使用者 %s 想要將您加入他（她）的好友清單中。"
+
+#: src/protocols/jabber/jabber.c:1743
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1741
+msgstr "Jabber 使用者 %s 並不存在，所以將不會加入到您的名單中。"
+
+#: src/protocols/jabber/jabber.c:1746
 msgid "No such user."
-msgstr "無此人。"
-
-#: 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
+msgstr "沒有這個使用者。"
+
+#: src/blist.c:438 src/dialogs.c:913 src/protocols/jabber/jabber.c:1837
+#: src/protocols/msn/notification.c:76 src/protocols/msn/notification.c:77
+#: src/protocols/msn/notification.c:622
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1905
+#: src/protocols/jabber/jabber.c:1910
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:1939
+#: src/protocols/jabber/jabber.c:1944
 msgid "Unknown login error"
-msgstr "不明的登入錯誤"
-
-#: src/protocols/jabber/jabber.c:2289
+msgstr "未知的登入錯誤"
+
+#: src/protocols/jabber/jabber.c:2294
 msgid "Password successfully changed."
 msgstr "密碼修改成功。"
 
-#: src/protocols/jabber/jabber.c:2334 src/protocols/jabber/jabber.c:4243
+#: src/protocols/jabber/jabber.c:2339 src/protocols/jabber/jabber.c:4248
 msgid "Connection lost"
-msgstr "失去連接"
-
-#: src/protocols/jabber/jabber.c:2342
+msgstr "失去連線"
+
+#: src/protocols/jabber/jabber.c:2347
 msgid "Connected"
-msgstr "連接成功"
-
-#: src/protocols/jabber/jabber.c:2345
+msgstr "連線成功"
+
+#: src/protocols/jabber/jabber.c:2350
 msgid "Requesting Authentication Method"
-msgstr "要求認證方式中"
+msgstr "要求認證的方式中"
 
 #. we have no chats yet
-#: 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/jabber/jabber.c:2370 src/protocols/msn/dispatch.c:170
+#: src/protocols/msn/msn.c:420 src/protocols/napster/napster.c:507
 #: src/protocols/yahoo/yahoo.c:988
 msgid "Connecting"
-msgstr "連接中"
-
-#: src/protocols/jabber/jabber.c:2691
+msgstr "連線中"
+
+#: src/protocols/jabber/jabber.c:2696
 #, 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:2693
+msgstr "使用者 %s 是一個無效的 Jabber 帳號，所以不會被加入到名單中。"
+
+#: src/protocols/jabber/jabber.c:2698
 msgid "Unable to add buddy."
-msgstr "無法新增好友。"
-
-#: src/protocols/jabber/jabber.c:2694
+msgstr "無法加入好友。"
+
+#: src/protocols/jabber/jabber.c:2699
 msgid "Jabber Error"
 msgstr "Jabber 錯誤"
 
-#: src/protocols/jabber/jabber.c:2953
+#: src/protocols/jabber/jabber.c:2958
 msgid "Room:"
 msgstr "聊天室："
 
-#: src/protocols/jabber/jabber.c:2964
+#: src/protocols/jabber/jabber.c:2969
 msgid "Handle:"
 msgstr "暱稱："
 
-#: src/protocols/jabber/jabber.c:2994
+#: src/protocols/jabber/jabber.c:2999
 msgid "Unable to join chat"
-msgstr "無法進入聊天室"
-
-#: src/protocols/jabber/jabber.c:3230 src/protocols/jabber/jabber.c:3281
-#: src/protocols/jabber/jabber.c:3706
+msgstr "無法加入聊天室"
+
+#: src/protocols/jabber/jabber.c:3235 src/protocols/jabber/jabber.c:3286
+#: src/protocols/jabber/jabber.c:3711
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
-#: src/protocols/jabber/jabber.c:3231
+#: src/protocols/jabber/jabber.c:3236
 msgid "Error"
 msgstr "錯誤"
 
-#: src/protocols/jabber/jabber.c:3282 src/protocols/jabber/jabber.c:3341
-#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3732
+#: src/protocols/jabber/jabber.c:3287 src/protocols/jabber/jabber.c:3346
+#: src/protocols/jabber/jabber.c:3357 src/protocols/jabber/jabber.c:3737
 msgid "Status"
 msgstr "狀態"
 
-#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3374
-#: src/protocols/oscar/oscar.c:5366
+#: src/protocols/jabber/jabber.c:3357 src/protocols/jabber/jabber.c:3379
+#: src/protocols/oscar/oscar.c:5400
 msgid "Not Authorized"
-msgstr "未獲批准"
-
-#: src/protocols/jabber/jabber.c:3387
+msgstr "未認證"
+
+#: src/protocols/jabber/jabber.c:3392
 msgid "View Error Msg"
 msgstr "觀看錯誤訊息"
 
-#: src/protocols/jabber/jabber.c:3399 src/gtkconv.c:794
+#: src/gtkconv.c:794 src/protocols/jabber/jabber.c:3404
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/protocols/jabber/jabber.c:3406
+#: src/protocols/jabber/jabber.c:3411
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: src/protocols/jabber/jabber.c:3409
+#: src/protocols/jabber/jabber.c:3414
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-# XXX tentative translation
-#: src/protocols/jabber/jabber.c:3416
+#: src/protocols/jabber/jabber.c:3421
 msgid "Cancel Presence Notification"
-msgstr "取消通知在或不在"
-
-#: src/protocols/jabber/jabber.c:3424
+msgstr "取消出現通知"
+
+#: src/protocols/jabber/jabber.c:3429
 msgid "Re-request authorization"
-msgstr "再次要求批准您加其入好友清單"
+msgstr "重新要求認證"
 
 #. state is one of our own strings. it won't be NULL.
-#: 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
+#: src/multi.c:275 src/protocols/jabber/jabber.c:3442
+#: src/protocols/jabber/jabber.c:3492 src/protocols/oscar/oscar.c:2830
+#: src/protocols/oscar/oscar.c:4508 src/protocols/oscar/oscar.c:5724
+#: src/protocols/yahoo/yahoo.c:1091 src/protocols/zephyr/zephyr.c:865
+#: src/protocols/zephyr/zephyr.c:875
 msgid "Online"
-msgstr "在線"
-
-#: src/protocols/jabber/jabber.c:3627
+msgstr "上線"
+
+#: src/protocols/jabber/jabber.c:3632
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3628
+#: src/protocols/jabber/jabber.c:3633
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3634
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3630
+#: src/protocols/jabber/jabber.c:3635
 msgid "Nickname"
 msgstr "暱稱"
 
-# 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
+#: src/dialogs.c:2891 src/protocols/jabber/jabber.c:3636
 msgid "URL"
-msgstr "網址"
-
-#: src/protocols/jabber/jabber.c:3632
+msgstr "URL"
+
+#: src/protocols/jabber/jabber.c:3637
 msgid "Street Address"
 msgstr "街道地址"
 
-# XXX this probably means "second line of address"
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3638
 msgid "Extended Address"
-msgstr "　　　　"
-
-# XXX wrong if used in HK
-#: src/protocols/jabber/jabber.c:3634
+msgstr "地址(續)"
+
+#: src/protocols/jabber/jabber.c:3639
 msgid "Locality"
 msgstr "市╱村"
 
-# XXX wrong if used in HK
-#: src/protocols/jabber/jabber.c:3635
+#: src/protocols/jabber/jabber.c:3640
 msgid "Region"
 msgstr "省╱州"
 
-# XXX no consistency (Taiwan vs Canada)
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/jabber.c:3641
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2050 src/dialogs.c:2685
+#: src/dialogs.c:2062 src/dialogs.c:2697 src/protocols/jabber/jabber.c:3642
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/jabber.c:3638
+#: src/protocols/jabber/jabber.c:3643
 msgid "Telephone"
-msgstr "電話號碼"
-
-#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2743
+msgstr "電話"
+
+#: src/dialogs.c:2755 src/protocols/jabber/jabber.c:3644
 msgid "Email"
-msgstr "電郵地址"
-
-#: src/protocols/jabber/jabber.c:3640
+msgstr "電子郵件"
+
+#: src/protocols/jabber/jabber.c:3645
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: src/protocols/jabber/jabber.c:3641
+#: src/protocols/jabber/jabber.c:3646
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: src/protocols/jabber/jabber.c:3642
+#: src/protocols/jabber/jabber.c:3647
 msgid "Title"
 msgstr "職銜"
 
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3648
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/jabber.c:3644
+#: src/protocols/jabber/jabber.c:3649
 msgid "Birthday"
 msgstr "生日"
 
-# FIXME: prefs.c usage probably incompatible with other files!!! yuck!!!
-#: src/protocols/jabber/jabber.c:3645 src/dialogs.c:2889 src/gtkprefs.c:429
-#: src/gtkprefs.c:1404
+#: src/dialogs.c:2901 src/gtkprefs.c:429 src/gtkprefs.c:1404
+#: src/protocols/jabber/jabber.c:3650
 msgid "Description"
-msgstr "說明"
-
-#: src/protocols/jabber/jabber.c:3670
+msgstr "描述"
+
+#: src/protocols/jabber/jabber.c:3675
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
-msgstr ""
-"以下欄位您都可以選擇填或不填，不想填的都不用理會，只填寫您想填的便可以了"
-
-#: src/protocols/jabber/jabber.c:3671
+msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可"
+
+#: src/protocols/jabber/jabber.c:3676
 msgid "User Identity"
 msgstr "使用者識別"
 
-#: src/protocols/jabber/jabber.c:4097
+#: src/protocols/jabber/jabber.c:4102
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4172
+#: src/protocols/jabber/jabber.c:4177
 msgid "Server Registration successful!"
-msgstr "在伺服器註冊成功！"
-
-#: src/protocols/jabber/jabber.c:4199
+msgstr "伺服器註冊成功！"
+
+#: src/protocols/jabber/jabber.c:4204
 msgid "Unknown registration error"
-msgstr "不明的註冊錯誤"
-
-#: src/protocols/jabber/jabber.c:4314 src/protocols/oscar/oscar.c:5876
-#: src/protocols/toc/toc.c:1441 src/dialogs.c:2222
+msgstr "未知的註冊錯誤"
+
+#: src/dialogs.c:2234 src/protocols/jabber/jabber.c:4319
+#: src/protocols/oscar/oscar.c:5917 src/protocols/toc/toc.c:1441
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1629,30 +1641,30 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4403 src/protocols/jabber/jabber.c:4405
+#: src/protocols/jabber/jabber.c:4408 src/protocols/jabber/jabber.c:4410
 msgid "Jabber Protocol Plugin"
-msgstr "Jabber 通訊協定插件"
+msgstr "Jabber 協定模組"
 
 # XXX
-#: src/protocols/jabber/jabber.c:4431
+#: src/protocols/jabber/jabber.c:4436
 msgid "Resource:"
 msgstr "資源："
 
-#: src/protocols/jabber/jabber.c:4442
+#: src/protocols/jabber/jabber.c:4447
 msgid "Connect Server:"
-msgstr "接到伺服器："
+msgstr "連結伺服器："
 
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:217
 msgid "Protocol not supported"
-msgstr "不支援這種通訊協定"
+msgstr "不支援這個通訊協定"
 
 #: src/protocols/msn/dispatch.c:52
 msgid "Unable to request INF\n"
-msgstr ""
+msgstr "無法取得 INF\n"
 
 #: src/protocols/msn/dispatch.c:69 src/protocols/msn/notification.c:241
 msgid "Unable to login using MD5"
-msgstr "無法以 MD5 登入"
+msgstr "無法使用 MD5 登入"
 
 #: src/protocols/msn/dispatch.c:78
 msgid "Unable to send USR\n"
@@ -1660,50 +1672,52 @@
 
 #: 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"
-msgstr ""
+msgstr "取得無效的 XFR\n"
 
 #: src/protocols/msn/dispatch.c:128
 msgid "Unable to transfer"
-msgstr ""
+msgstr "無法傳送"
 
 #: src/protocols/msn/dispatch.c:150
 msgid "Unable to parse message."
-msgstr "無法分析訊息。"
-
-#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:390
-#: src/protocols/msn/notification.c:1289
+msgstr "無法解析訊息。"
+
+#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:394
+#: src/protocols/msn/notification.c:1299
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1296
+#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1306
 msgid "Syncing with server"
-msgstr "與伺服器同步中"
-
-#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1309
+msgstr "正在與伺服器同步中"
+
+#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1319
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
+# NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
 #: src/protocols/msn/error.c:33
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr "語法錯誤（大抵是 Gaim 的 Bug）"
-
+msgstr "語法錯誤（可能是 Gaim 的 Bug）"
+
+# NOTE: cf "Syntax error" above for word order
 #: src/protocols/msn/error.c:37
 msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "參數無效（大抵是 Gaim 的 Bug）"
-
-# FIXME
+msgstr "參數無效（可能是 Gaim 的 Bug）"
+
 #: src/protocols/msn/error.c:40
 msgid "Invalid User"
-msgstr "使用者無效"
+msgstr "無效的使用者"
 
 #: src/protocols/msn/error.c:44
 msgid "Fully Qualified Domain Name missing"
-msgstr "沒有給予完整領域名稱 (FQDN)"
-
+msgstr "沒給予完整領域名稱 (FQDN)"
+
+# XXX 原文有文法上的錯誤
 #: src/protocols/msn/error.c:47
 msgid "Already Login"
 msgstr "已經登入"
@@ -1714,15 +1728,15 @@
 
 #: src/protocols/msn/error.c:53
 msgid "Invalid Friendly Name"
-msgstr "無效的易讀暱稱"
+msgstr "無效的暱稱"
 
 #: src/protocols/msn/error.c:56
 msgid "List Full"
-msgstr "清單已滿"
+msgstr "好友清單已滿"
 
 #: src/protocols/msn/error.c:59
 msgid "Already there"
-msgstr "已經在那裡"
+msgstr "已經在清單裡"
 
 #: src/protocols/msn/error.c:62
 msgid "Not on list"
@@ -1730,36 +1744,37 @@
 
 #: src/protocols/msn/error.c:65
 msgid "User is offline"
-msgstr "對方不在線上"
+msgstr "使用者是離線的"
 
 #: src/protocols/msn/error.c:68
 msgid "Already in the mode"
-msgstr "已經在要求的模式下了"
+msgstr "已經在這個模式中"
 
 #: src/protocols/msn/error.c:71
 msgid "Already in opposite list"
-msgstr "同時在「被允許」和「被拒」的清單裡"
+msgstr "已經在相對的清單中"
 
 #: src/protocols/msn/error.c:75
 msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "試圖新增一個好友至一個不存在的群組"
+msgstr "無法將好友加入一個不存在的群組"
 
 #: src/protocols/msn/error.c:79
 msgid "Switchboard failed"
-msgstr ""
+msgstr "Switchboard 失敗"
 
 #: src/protocols/msn/error.c:82
 msgid "Notify Transfer failed"
-msgstr ""
+msgstr "傳送通知失敗"
 
 #: src/protocols/msn/error.c:86
 msgid "Required fields missing"
-msgstr "必要的欄位沒有填上"
+msgstr "找不到所需要的欄位"
 
 #: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr "尚未登入"
 
+# XXX 參閱上列網站 (www.hypothetic.org) 第500號錯誤
 #: src/protocols/msn/error.c:93
 msgid "Internal server error"
 msgstr "內部伺服器錯誤"
@@ -1778,35 +1793,36 @@
 
 #: src/protocols/msn/error.c:105
 msgid "Wrong CHL value sent to server"
-msgstr ""
+msgstr "錯誤的 CHL 值傳送到了伺服器"
 
 #: src/protocols/msn/error.c:109
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
+# XXX「unavailable」譯「不存在」好像很奇怪，可能有待改進
 #: src/protocols/msn/error.c:112
 msgid "Server unavailable"
-msgstr "伺服器暫停使用"
+msgstr "伺服器不存在"
 
 #: src/protocols/msn/error.c:115
 msgid "Peer Notification server down"
-msgstr ""
+msgstr "點對點通知伺服器暫停服務"
 
 #: src/protocols/msn/error.c:118
 msgid "Database connect error"
-msgstr "資料庫連接錯誤"
+msgstr "資料庫連結錯誤"
 
 #: src/protocols/msn/error.c:122
 msgid "Server is going down (abandon ship)"
-msgstr "伺服器要停機了（快走罷！）"
+msgstr "伺服器將暫停服務"
 
 #: src/protocols/msn/error.c:126
 msgid "Error creating connection"
-msgstr "連接建立時發生了錯誤"
+msgstr "連線開啟錯誤"
 
 #: src/protocols/msn/error.c:130
 msgid "CVR parameters are either unknown or not allowed"
-msgstr ""
+msgstr "CVR 參數是未知或是不允許的"
 
 #: src/protocols/msn/error.c:136
 msgid "Session overload"
@@ -1814,218 +1830,204 @@
 
 #: src/protocols/msn/error.c:139
 msgid "User is too active"
-msgstr ""
+msgstr "使用者太過活躍"
 
 #: src/protocols/msn/error.c:142
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
-# FIXME
+# NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
 #: src/protocols/msn/error.c:145
 msgid "Not expected"
-msgstr "沒有預期的"
+msgstr "沒有預期的無效參數"
 
 #: src/protocols/msn/error.c:148
 msgid "Bad friend file"
-msgstr ""
+msgstr "無效的好友檔案"
 
 #: src/protocols/msn/error.c:152
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-# FIXME
 #: src/protocols/msn/error.c:155
 msgid "Not allowed when offline"
-msgstr "在離線時是不被允許的"
+msgstr "在離線時不允許這個指令"
 
 #: src/protocols/msn/error.c:158
 msgid "Not accepting new users"
-msgstr "暫時不接受新用戶"
+msgstr "不接受新的使用者"
 
 #: src/protocols/msn/error.c:162
 msgid "Passport account not yet verified"
-msgstr "您的 Passport 帳號未被驗證"
+msgstr "護照帳號尚未經過驗證"
 
 #: src/protocols/msn/error.c:166
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr "不明的錯誤代碼 %d"
-
-#: src/protocols/msn/msn.c:60
+msgstr "未知的錯誤代碼 %d"
+
+#: src/protocols/msn/msn.c:59
 msgid "Your new MSN friendly name is too long."
-msgstr "您新設的易讀暱稱太長了。"
-
-#: 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
+msgstr "您的新 MSN 暱稱太長。"
+
+#: src/protocols/msn/msn.c:71 src/protocols/msn/msn.c:90
+#: src/protocols/msn/msn.c:148 src/protocols/msn/msn.c:470
+#: src/protocols/msn/msn.c:580 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:631 src/protocols/msn/msn.c:647
+#: src/protocols/msn/msn.c:679 src/protocols/msn/msn.c:688
+#: src/protocols/msn/msn.c:721 src/protocols/msn/msn.c:730
+#: src/protocols/msn/msn.c:745 src/protocols/msn/msn.c:755
+#: src/protocols/msn/msn.c:770 src/protocols/msn/msn.c:780
+#: src/protocols/msn/msn.c:802 src/protocols/msn/msn.c:853
+#: src/protocols/msn/msn.c:892 src/protocols/msn/msn.c:984
+#: src/protocols/msn/msn.c:1007 src/protocols/msn/msn.c:1022
+#: src/protocols/msn/msn.c:1034 src/protocols/msn/msn.c:1056
+#: src/protocols/msn/msn.c:1066 src/protocols/msn/notification.c:113
+#: src/protocols/msn/notification.c:143 src/protocols/msn/notification.c:904
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: src/protocols/msn/msn.c:167
+#: src/protocols/msn/msn.c:166
 msgid "Set your friendly name."
-msgstr "設定易讀暱稱。"
-
-#: src/protocols/msn/msn.c:168
+msgstr "設定您的暱稱。"
+
+#: src/protocols/msn/msn.c:167
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "您在 MSN 的暱稱將會如此顯示。"
 
-#: src/protocols/msn/msn.c:180
+#: src/protocols/msn/msn.c:179
 msgid "Set your home phone number."
-msgstr "您的設定住宅電話號碼："
-
-#: src/protocols/msn/msn.c:191
+msgstr "設定您的住家電話號碼。"
+
+#: src/protocols/msn/msn.c:190
 msgid "Set your work phone number."
-msgstr "您的辦公電話號碼："
-
-#: src/protocols/msn/msn.c:202
+msgstr "設定您的辦公室電話號碼。"
+
+#: src/protocols/msn/msn.c:201
 msgid "Set your mobile phone number."
-msgstr "您的手提電話號碼："
-
-#: src/protocols/msn/msn.c:214
-msgid "MSN Mobile Support"
-msgstr "MSN 對行動裝置的支援"
+msgstr "設定您的行動電話號碼。"
+
+#: src/protocols/msn/msn.c:210
+msgid "Allow MSN Mobile pages?"
+msgstr "允許 MSN 傳呼？"
+
+#: src/protocols/msn/msn.c:211
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+"您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
+"裝置上呢？"
 
 #: src/protocols/msn/msn.c:215
-msgid "Do you want to enable or disable MSN Mobile device support?"
-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 "您允許好友清單內的人透過您的手機傳呼您嗎？"
+msgid "Allow"
+msgstr "允許"
+
+#: src/protocols/msn/msn.c:216
+msgid "Disallow"
+msgstr "不允許"
 
 #: src/protocols/msn/msn.c:233
-msgid "Allow"
-msgstr "允許"
-
-#: src/protocols/msn/msn.c:234
-msgid "Disallow"
-msgstr "拒絕"
-
-#: src/protocols/msn/msn.c:251
 msgid "Send a mobile message."
-msgstr "向手機送出訊息"
-
-#: src/protocols/msn/msn.c:253
+msgstr "送出行動訊息。"
+
+#: src/protocols/msn/msn.c:235
 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
+#: src/about.c:169 src/dialogs.c:4197 src/protocols/msn/msn.c:236
+#: src/prpl.c:311 src/prpl.c:622 src/server.c:1433
 msgid "Close"
 msgstr "關閉"
 
-#: src/protocols/msn/msn.c:317 src/protocols/yahoo/yahoo.c:1142
+#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1142
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態：</b>%s"
 
-#: src/protocols/msn/msn.c:330 src/protocols/msn/msn.c:573
+#: src/protocols/msn/msn.c:312 src/protocols/msn/msn.c:556
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:331 src/protocols/msn/msn.c:575
+#: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:558
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1069
-#: src/protocols/yahoo/yahoo.c:1277 src/protocols/yahoo/yahoo.c:1353
+#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1355
 msgid "Be Right Back"
-msgstr "很快就會回來"
-
-#: src/protocols/msn/msn.c:332 src/protocols/msn/msn.c:577
+msgstr "馬上回來"
+
+#: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:560
 #: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1071
-#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1354
+#: src/protocols/yahoo/yahoo.c:1281 src/protocols/yahoo/yahoo.c:1356
 msgid "Busy"
-msgstr "忙碌中"
-
-#: src/protocols/msn/msn.c:333 src/protocols/msn/msn.c:579
+msgstr "忙碌"
+
+#: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:562
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1079
-#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1358
+#: src/protocols/yahoo/yahoo.c:1289 src/protocols/yahoo/yahoo.c:1360
 msgid "On The Phone"
-msgstr "通電話中"
-
-#: src/protocols/msn/msn.c:334 src/protocols/msn/msn.c:581
+msgstr "電話中"
+
+#: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:564
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1083
-#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1360
+#: src/protocols/yahoo/yahoo.c:1293 src/protocols/yahoo/yahoo.c:1362
 msgid "Out To Lunch"
-msgstr "去吃午飯了"
-
-#: src/protocols/msn/msn.c:335 src/protocols/msn/msn.c:583
+msgstr "外出用餐"
+
+#: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:566
 #: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:877
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:347
+#: src/protocols/msn/msn.c:329
 msgid "Set Friendly Name"
-msgstr "設定易讀暱稱"
-
-#: src/protocols/msn/msn.c:355
+msgstr "設定暱稱"
+
+#: src/protocols/msn/msn.c:337
 msgid "Set Home Phone Number"
-msgstr "設定住宅電話號碼"
-
-#: src/protocols/msn/msn.c:361
+msgstr "設定住家電話號碼"
+
+#: src/protocols/msn/msn.c:343
 msgid "Set Work Phone Number"
-msgstr "設定辦公電話號碼"
-
-#: src/protocols/msn/msn.c:367
+msgstr "設定工作電話號碼"
+
+#: src/protocols/msn/msn.c:349
 msgid "Set Mobile Phone Number"
-msgstr "設定手提電話號碼"
-
-#: src/protocols/msn/msn.c:376
+msgstr "設定行動電話號碼"
+
+#: src/protocols/msn/msn.c:358
 msgid "Enable/Disable Mobile Devices"
-msgstr "啟用╱停用行動裝置"
-
-#: src/protocols/msn/msn.c:383
+msgstr "開啟 / 關閉行動裝置"
+
+#: src/protocols/msn/msn.c:365
 msgid "Allow/Disallow Mobile Pages"
-msgstr "允許╱拒絕傳呼"
-
-#: src/protocols/msn/msn.c:405
+msgstr "允許 / 不允許 Mobile Page"
+
+#: src/protocols/msn/msn.c:387
 msgid "Send to Mobile"
-msgstr "傳送至手機"
-
-#: src/protocols/msn/msn.c:677
+msgstr "傳送至行動電話"
+
+#: src/protocols/msn/msn.c:660
 #, 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 ""
-"MSN 的暱稱必須像「user@server.com」一樣，但是您打算「允許」的好友暱稱並不乎合"
-"這個指定的格式，所以您的「允許」清單沒有被修改。"
-"也許您是想輸入「%s@hotmail.com」？"
-
-#: src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:722
+"MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。"
+"目前將不會變更您的允許清單。"
+
+#: src/protocols/msn/msn.c:664 src/protocols/msn/msn.c:705
 msgid "Invalid MSN screenname"
-msgstr "無效的 MSN 賬號"
-
-#: src/protocols/msn/msn.c:718
+msgstr "無效的 MSN 使用者帳號"
+
+#: src/protocols/msn/msn.c:701
 #, 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 block list."
 msgstr ""
+"MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。"
+"目前將不會變更您的封鎖清單。"
 
 #. *< api_version
 #. *< type
@@ -2037,61 +2039,61 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1199
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1182
 msgid "MSN Protocol Plugin"
-msgstr "MSN 通訊協定插件"
-
-#: src/protocols/msn/msn.c:1217
+msgstr "MSN 協定模組"
+
+#: src/protocols/msn/msn.c:1200
 msgid "Login Server:"
-msgstr "伺服器："
+msgstr "登入伺服器："
 
 #: src/protocols/msn/notification.c:224
 msgid "Unable to request INF"
-msgstr ""
+msgstr "無法取得 INF"
 
 #: src/protocols/msn/notification.c:250
 msgid "Unable to send USR"
-msgstr ""
-
-#: src/protocols/msn/notification.c:282
+msgstr "無法送出 USR"
+
+#: src/protocols/msn/notification.c:286
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#: src/protocols/msn/notification.c:306
+#: src/protocols/msn/notification.c:310
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/notification.c:312
+#: src/protocols/msn/notification.c:316
 msgid "Password sent"
-msgstr "密碼已送出"
-
-#: src/protocols/msn/notification.c:329
+msgstr "密碼送出"
+
+#: src/protocols/msn/notification.c:333
 msgid "You have been disconnected. You have signed on from another location."
-msgstr "因為您由其他的地方登入，您已被拆接了。"
-
-#: src/protocols/msn/notification.c:335
+msgstr "您被中斷連線，因為您由其他的地方登入。"
+
+#: src/protocols/msn/notification.c:339
 msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr "因為 MSN 的伺服器要暫停維修，您已被拆接了。"
-
-#: src/protocols/msn/notification.c:440
+msgstr "您已中斷連線，MSN 伺服器將暫時關閉。"
+
+#: src/protocols/msn/notification.c:444
 #, 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:713
+msgstr "使用者 %s（%s）想要將 %s 加入他（她）的好友清單。"
+
+#: src/protocols/msn/notification.c:716
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr "使用者 %s（%s）想要將您加入他的好友清單。"
-
-#: src/protocols/msn/notification.c:1082
+msgstr "使用者 %s（%s）想要將您加入他們的好友清單"
+
+#: src/protocols/msn/notification.c:1086
 msgid "Got invalid XFR"
-msgstr ""
-
-#: src/protocols/msn/notification.c:1125
+msgstr "取得無效的 XFR"
+
+#: src/protocols/msn/notification.c:1129
 msgid "Unable to transfer to notification server"
-msgstr ""
-
-#: src/protocols/msn/notification.c:1251
+msgstr "無法傳送至通知伺服器"
+
+#: src/protocols/msn/notification.c:1261
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -2101,20 +2103,24 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr ""
-
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1089
-#: src/gtkpounce.c:570 src/gtkprefs.c:1108
+"MSN 伺服器將要關閉 %s 分鐘以進行維護。屆時您將會由伺服器上自動登出。請儘快結"
+"束您目前的交談。\n"
+"\n"
+"當維護工作結束，您將可以再度登入伺服器。"
+
+#: src/gtkpounce.c:570 src/gtkprefs.c:1108 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:1089
 msgid "Idle"
 msgstr "閒置"
 
 #: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
-msgstr ""
+msgstr "目前的交談閒置太久，並且已經逾時。"
 
 #: src/protocols/msn/switchboard.c:125
 #, c-format
 msgid "%s has closed the conversation window."
-msgstr "%s 已關閉了他那邊這段交談的視窗了。"
+msgstr "%s 關閉了交談視窗。"
 
 #: src/protocols/msn/switchboard.c:225
 msgid "An MSN message may not have been received."
@@ -2122,49 +2128,49 @@
 
 #: src/protocols/napster/napster.c:249
 msgid "Unable to read header from server"
-msgstr ""
+msgstr "無法由伺服器讀取標頭資訊"
 
 #: src/protocols/napster/napster.c:326
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
-msgstr "使用者：%s個、檔案：%s個、大小：%sGB"
+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 "無法加「%s」到您的 Napster 書籤裡去"
+msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
 #: src/protocols/napster/napster.c:345
 msgid "You were disconnected from the server."
-msgstr "您給伺服器拆接了。"
+msgstr "您已經停止與伺服器的連線。"
 
 #. MSG_CLIENT_WHOIS
 #: src/protocols/napster/napster.c:401
 #, c-format
 msgid "%s requested your information"
-msgstr "%s 要求了您的個人資料。"
+msgstr "%s 查詢您的使用者資訊"
 
 #: src/protocols/napster/napster.c:431
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
-msgstr "因為您由其他的地方登入，您已被拆接了。"
+msgstr "您被中斷連線，因為您由其他的地方登入。"
 
 #. MSG_CLIENT_PING
 #: src/protocols/napster/napster.c:437
 #, c-format
 msgid "%s requested a PING"
-msgstr ""
-
-#: src/protocols/napster/napster.c:551 src/gtkblist.c:1500
+msgstr "%s 要求一個 PING"
+
+#: src/gtkblist.c:1500 src/protocols/napster/napster.c:551
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5089
+#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5123
 #: src/protocols/toc/toc.c:1195
 msgid "Join what group:"
-msgstr "加入群組："
+msgstr "加入哪個群組："
 
 #. *< api_version
 #. *< type
@@ -2178,55 +2184,56 @@
 #. *  summary
 #: src/protocols/napster/napster.c:641 src/protocols/napster/napster.c:643
 msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER 通訊協定插件"
-
+msgstr "NAPSTER 協定模組"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 #: src/protocols/oscar/oscar.c:190
 msgid "Invalid error"
-msgstr ""
+msgstr "無效錯誤"
 
 #: src/protocols/oscar/oscar.c:191
 msgid "Invalid SNAC"
-msgstr ""
+msgstr "無效的 SNAC"
 
 #: 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"
-msgstr ""
+msgstr "沒有指定服務"
 
 #: src/protocols/oscar/oscar.c:197
 msgid "Obsolete SNAC"
-msgstr ""
+msgstr "過時的 SNAC"
 
 #: 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"
-msgstr ""
+msgstr "回覆太大了"
 
 #: src/protocols/oscar/oscar.c:202
 msgid "Responses lost"
-msgstr ""
+msgstr "遺失回應"
 
 #: src/protocols/oscar/oscar.c:203
 msgid "Request denied"
@@ -2240,37 +2247,38 @@
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
+# XXX "local"是譯「本地」嗎
 #: src/protocols/oscar/oscar.c:206
 msgid "In local permit/deny"
-msgstr ""
+msgstr "在本地的允許╱拒絕清單"
 
 #: 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"
-msgstr ""
+msgstr "使用者暫時不在"
 
 #: src/protocols/oscar/oscar.c:210
 msgid "No match"
-msgstr ""
+msgstr "沒有相符合的"
 
 #: src/protocols/oscar/oscar.c:211
 msgid "List overflow"
-msgstr ""
+msgstr "清單溢出"
 
 #: src/protocols/oscar/oscar.c:212
 msgid "Request ambiguous"
-msgstr ""
+msgstr "要求不明確"
 
 #: src/protocols/oscar/oscar.c:213
 msgid "Queue full"
-msgstr ""
+msgstr "佇列滿了"
 
 #: src/protocols/oscar/oscar.c:214
 msgid "Not while on AOL"
@@ -2279,7 +2287,7 @@
 #: src/protocols/oscar/oscar.c:485
 #, c-format
 msgid "Direct IM with %s closed"
-msgstr "和 %s 的即時訊息已完結了"
+msgstr "和 %s 的即時訊息關閉"
 
 #: src/protocols/oscar/oscar.c:487
 #, c-format
@@ -2289,20 +2297,21 @@
 #: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:602
 #: src/protocols/toc/toc.c:615 src/protocols/toc/toc.c:678
 msgid "Disconnected."
-msgstr "拆接了。"
+msgstr "停止連線。"
 
 #: 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 拆接了。"
-
+msgstr "您已經由聊天室 %s 停止連線。"
+
+# XXX TODO 照字面看新譯法比較有可能，但Paladin兄的原譯法亦非沒可能的，最好能查證一下
 #: src/protocols/oscar/oscar.c:572
 msgid "Chat is currently unavailable"
-msgstr "暫時不能交談"
+msgstr "目前無法使用聊天室"
 
 #: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:708
 msgid "Couldn't connect to host"
-msgstr "無法連接到伺服器"
+msgstr "無法連到伺服器"
 
 #: src/protocols/oscar/oscar.c:690
 msgid "Unable to login to AIM"
@@ -2310,28 +2319,28 @@
 
 #: src/protocols/oscar/oscar.c:801 src/protocols/oscar/oscar.c:1187
 msgid "Could Not Connect"
-msgstr "無法連接"
+msgstr "無法連線"
 
 #: src/protocols/oscar/oscar.c:808
 msgid "Connection established, cookie sent"
-msgstr "連接成功，並已送出了 Cookie"
+msgstr "連線已建立，並已送出 Cookie"
 
 #: src/protocols/oscar/oscar.c:875 src/protocols/oscar/oscar.c:887
 #: src/protocols/oscar/oscar.c:892
 msgid "File Transfer Aborted"
-msgstr "檔案傳輸已經異常中止了"
+msgstr "取消檔案傳輸"
 
 #: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish listener socket."
-msgstr ""
+msgstr "無法建立監聽器 Socket。"
 
 #: src/protocols/oscar/oscar.c:888
 msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案描述符"
+msgstr "無法建立檔案介紹。"
 
 #: src/protocols/oscar/oscar.c:893
 msgid "Unable to create new connection."
-msgstr "無法建立新的連接"
+msgstr "無法開啟新連結。"
 
 #. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:1077 src/protocols/toc/toc.c:551
@@ -2341,12 +2350,12 @@
 #. Suspended account
 #: src/protocols/oscar/oscar.c:1081
 msgid "Your account is currently suspended."
-msgstr "您的帳戶給吊銷了。"
+msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
 #: src/protocols/oscar/oscar.c:1085
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "AOL 即時傳訊系統服務目前暫停服務。"
+msgstr "AOL 即時訊息服務暫時不存在。"
 
 #. connecting too frequently
 #: src/protocols/oscar/oscar.c:1089
@@ -2354,14 +2363,14 @@
 "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."
 msgstr ""
-"您的連接／拆接動作太過頻繁了。請等待十分鐘後才再行重試，否則您只會浪費更多時"
-"間。"
+"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線，那麼您的等待時間將會更加的延長。"
 
 #. client too old
 #: src/protocols/oscar/oscar.c:1093
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "您所使用的客戶端程式太過老舊。請更新到 %s 或更新的版本。"
+msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
 #: src/protocols/oscar/oscar.c:1097 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
@@ -2378,111 +2387,109 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"您很有可能很快便會被拆接。在找到解決這種問題的方案前，您可以考慮改用 TOC。"
-"當您要尋找新版本時，請到 %s 找。"
+"您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 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 ""
+msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
 #: src/protocols/oscar/oscar.c:1347
 msgid "Gaim was Unable to get a valid login hash."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1901 src/protocols/oscar/oscar.c:5407
+msgstr "Gaim 無法取得有效的登入授權碼。"
+
+#: src/protocols/oscar/oscar.c:1901 src/protocols/oscar/oscar.c:5441
 #, c-format
 msgid "Direct IM with %s established"
-msgstr "成功建立了和 %s 的直接即時訊息"
+msgstr "和 %s 的即時訊息已經被建立"
 
 #: src/protocols/oscar/oscar.c:2228 src/protocols/oscar/oscar.c:2250
 msgid "(There was an error receiving this message)"
-msgstr "(接收這個訊息時發生了錯誤)"
+msgstr "（收取這個訊息時發生錯誤）"
 
 #: src/protocols/oscar/oscar.c:2395
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s 現正要求與 %s 直接連接"
-
-#: src/protocols/oscar/oscar.c:2396
+msgstr "%s 剛剛要求直接連線到 %s"
+
+#: src/protocols/oscar/oscar.c:2398
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"傳送圖像必須和對方直接連接。對方可因此獲知您的 IP 位址，這可能會對您的隱私構"
-"成危險。"
-
-#: 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
+"這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
+"這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
+
 #: src/protocols/oscar/oscar.c:2430
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
+
+#: src/protocols/oscar/oscar.c:2438
 msgid "Authorization Request Message:"
-msgstr "要求批准加別人到您的好友清單，請輸入您的理由："
-
-#: src/protocols/oscar/oscar.c:2431
+msgstr "認證要求訊息："
+
+#: src/protocols/oscar/oscar.c:2439
 msgid "Please authorize me!"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2459
+msgstr "請通過我的認證！"
+
+#: src/protocols/oscar/oscar.c:2467
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
-msgstr ""
-"使用者 %s 要任何人加到好友清單前，都要他事先批准。您想向他作出這個要求嗎？"
-
-#: src/protocols/oscar/oscar.c:2463
+msgstr "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎？"
+
+#: src/protocols/oscar/oscar.c:2472 src/protocols/oscar/oscar.c:2474
 msgid "Request Authorization"
-msgstr "要求批准您加其入好友清單"
-
-#: 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
+msgstr "要求認證"
+
+#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
+#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2590
+#: src/protocols/oscar/oscar.c:2610 src/protocols/oscar/oscar.c:2985
+#: src/protocols/oscar/oscar.c:3037 src/protocols/oscar/oscar.c:5044
+#: src/protocols/oscar/oscar.c:5090
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2505
+#: src/protocols/oscar/oscar.c:2518
 msgid "Authorization Denied Message:"
-msgstr "要求批准被拒，理由如下："
-
-#: src/protocols/oscar/oscar.c:2577
+msgstr "拒絕認證訊息："
+
+#: src/protocols/oscar/oscar.c:2590
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"使用者 %lu 想要將您加入他的好友清單中，理由如下：\n"
+"使用者 %lu 因為下列原因，想要將您加入他們的好友清單中：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
+#: src/protocols/oscar/oscar.c:2598 src/protocols/oscar/oscar.c:5050
 msgid "Authorization Request"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2591
+msgstr "認證要求"
+
+#: src/protocols/oscar/oscar.c:2610
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
 "the following reason:\n"
 "%s"
 msgstr ""
-"使用者 %lu 拒絕了您將其加入好友清單的要求，理由如下：\n"
+"使用者 %lu 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2592
+#: src/protocols/oscar/oscar.c:2611
 msgid "ICQ authorization denied."
-msgstr "要求批准被拒。"
+msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2618
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
-msgstr "使用者 %lu 批准了您的要求，您可以加他到您的好友清單了。"
-
-#: src/protocols/oscar/oscar.c:2607
+msgstr "使用者 %lu 同意了您將其加入好友清單的要求。"
+
+#: src/protocols/oscar/oscar.c:2626
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2490,12 +2497,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"您收到了個特別訊息\n"
+"您收到一個特別的訊息\n"
 "\n"
-"發訊人：%s [%s]\n"
+"來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615
+#: src/protocols/oscar/oscar.c:2634
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2503,12 +2510,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"您收到了個 ICQ 傳呼\n"
+"您收到一個 ICQ Page\n"
 "\n"
-"發訊人：%s [%s]\n"
+"來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:2642
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2516,213 +2523,209 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"您從 %s [%s] 收到了一封 ICQ 郵件\n"
+"您收到一個來自於 %s [%s] 的 ICQ 郵件\n"
 "\n"
-"內文：\n"
+"訊息為：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2644
+#: src/protocols/oscar/oscar.c:2663
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
-msgstr "ICQ 使用者 %lu 傳給了您一個好友：%s (%s)"
-
-#: src/protocols/oscar/oscar.c:2648
+msgstr "ICQ 使用者 %lu 送來一個聯絡人：%s (%s)"
+
+#: src/protocols/oscar/oscar.c:2669
 msgid "Do you want to add this contact to your Buddy List?"
-msgstr "您想將他（她）加入到您的好友清單中嗎？"
-
-#: src/protocols/oscar/oscar.c:2648
+msgstr "您想將他（她）加入到您的好友名單中嗎？"
+
+#: src/protocols/oscar/oscar.c:2673
 msgid "Decline"
-msgstr "不加了"
-
-#: src/protocols/oscar/oscar.c:2730
+msgstr "婉拒"
+
+#: src/protocols/oscar/oscar.c:2755
 #, 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:2739
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。"
+msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們都是無效的。"
+
+#: src/protocols/oscar/oscar.c:2764
 #, 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:2748
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。"
+msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們都太大了。"
+
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-"您遺失了由 %2$s 送來的 %1$hu 個訊息，因為訊息的發送速率已超過了上限。"
-msgstr[1] ""
-"您遺失了由 %2$s 送來的 %1$hu 個訊息，因為訊息的發送速率已超過了上限。"
-
-#: src/protocols/oscar/oscar.c:2757
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度太快。"
+
+#: src/protocols/oscar/oscar.c:2782
 #, 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:2766
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他 / 她太邪惡了。"
+
+#: src/protocols/oscar/oscar.c:2791
 #, 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:2775
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
+
+#: src/protocols/oscar/oscar.c:2800
 #, 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:2791 src/protocols/oscar/oscar.c:4496
-#: src/protocols/oscar/oscar.c:5688
+msgstr[0] "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
+
+#: src/protocols/oscar/oscar.c:2816 src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:5729
 msgid "Free For Chat"
-msgstr "可和我聊天"
-
-#: src/protocols/oscar/oscar.c:2795 src/protocols/oscar/oscar.c:4490
-#: src/protocols/oscar/oscar.c:5686
+msgstr "我有空聊天"
+
+#: src/protocols/oscar/oscar.c:2820 src/protocols/oscar/oscar.c:4516
+#: src/protocols/oscar/oscar.c:5727
 msgid "Not Available"
-msgstr "不在"
-
-#: src/protocols/oscar/oscar.c:2797 src/protocols/oscar/oscar.c:4493
-#: src/protocols/oscar/oscar.c:5687
+msgstr "長時間離開"
+
+#: src/protocols/oscar/oscar.c:2822 src/protocols/oscar/oscar.c:4519
+#: src/protocols/oscar/oscar.c:5728
 msgid "Occupied"
-msgstr "忙碌中"
-
-#: src/protocols/oscar/oscar.c:2801
+msgstr "忙碌"
+
+# TODO 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#: src/protocols/oscar/oscar.c:2826
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2861
+#: src/protocols/oscar/oscar.c:2886
 #, 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:2863
+msgstr "<B>帳號：</B> %s<BR><B>狀態：</B> %s<HR>%s"
+
+#: src/protocols/oscar/oscar.c:2888
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>狀態：</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2947
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤：%s\n"
 
-#: src/protocols/oscar/oscar.c:2923
+#: src/protocols/oscar/oscar.c:2948
 msgid "Unknown error"
-msgstr "不明的錯誤"
+msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:2983
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出："
 
-#: src/protocols/oscar/oscar.c:3010
+#: src/protocols/oscar/oscar.c:3035
 #, c-format
 msgid "User information for %s unavailable:"
-msgstr "找不到使用者 %s 的個人資訊："
-
-#: src/protocols/oscar/oscar.c:3044
+msgstr "使用者 %s 的個人資訊並不存在："
+
+#: src/protocols/oscar/oscar.c:3069
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: src/protocols/oscar/oscar.c:3047
+#: src/protocols/oscar/oscar.c:3072
 msgid "Voice"
 msgstr "聲音"
 
-#: src/protocols/oscar/oscar.c:3050 src/protocols/oscar/oscar.c:5712
+#: src/protocols/oscar/oscar.c:3075 src/protocols/oscar/oscar.c:5753
 msgid "Direct IM"
-msgstr "直接即時訊息"
-
-#: src/protocols/oscar/oscar.c:3053 src/gtkblist.c:1509
+msgstr "直接消息"
+
+#: src/gtkblist.c:1509 src/protocols/oscar/oscar.c:3078
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3056 src/protocols/oscar/oscar.c:5724
+#: src/protocols/oscar/oscar.c:3081 src/protocols/oscar/oscar.c:5765
 msgid "Get File"
-msgstr "接收文件"
-
-#: src/protocols/oscar/oscar.c:3059 src/protocols/oscar/oscar.c:5718
+msgstr "接收檔案"
+
+#: src/protocols/oscar/oscar.c:3084 src/protocols/oscar/oscar.c:5759
 msgid "Send File"
-msgstr "傳送文件"
-
-#: src/protocols/oscar/oscar.c:3063
+msgstr "傳送檔案"
+
+#: src/protocols/oscar/oscar.c:3088
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3066
+#: src/protocols/oscar/oscar.c:3091
 msgid "Add-Ins"
-msgstr "插件"
-
-#: src/protocols/oscar/oscar.c:3069
+msgstr "模組"
+
+#: src/protocols/oscar/oscar.c:3094
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:3072
+#: src/protocols/oscar/oscar.c:3097
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy 錯誤"
 
-#: src/protocols/oscar/oscar.c:3075
+# XXX 很多PO都沒有譯AP一詞，有翻的都是看不明的語文，不知有沒有譯錯
+#: src/protocols/oscar/oscar.c:3100
 msgid "AP User"
-msgstr "AP 用戶"
-
-#: src/protocols/oscar/oscar.c:3078
+msgstr "應用程式使用者"
+
+#: src/protocols/oscar/oscar.c:3103
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3106
 msgid "Nihilist"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3084
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:3109
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3087
+#: src/protocols/oscar/oscar.c:3112
 msgid "ICQ Unknown"
-msgstr "不明的 ICQ 功能"
-
-#: src/protocols/oscar/oscar.c:3090
+msgstr "ICQ 未知"
+
+#: src/protocols/oscar/oscar.c:3115
 msgid "Trillian Encryption"
-msgstr "Trillian 加密功能"
-
-#: src/protocols/oscar/oscar.c:3093
+msgstr "Trillian 加密"
+
+#: src/protocols/oscar/oscar.c:3118
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3157
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
-msgstr "無法給您顯示收到的資料，因為不知道這些資料的內碼是什麼。"
-
-#: src/protocols/oscar/oscar.c:3139
+msgstr "<I>因為使用了未知的編碼，所以無法顯示訊息。</i>"
+
+#: src/protocols/oscar/oscar.c:3164
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
-msgstr "自 <b>%s</b> 已登入<br>\n"
-
-#: src/protocols/oscar/oscar.c:3144
+msgstr "上線時間：<b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3169
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
-msgstr "自 <b>%s</b> 已使用這個服務<br>\n"
-
-#: src/protocols/oscar/oscar.c:3150
+msgstr "成為成員的時間：<b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Idle : <b>%s</b>"
-msgstr "閒置了 <b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3153
+msgstr "閒置：<b>%s</b>"
+
+#: src/protocols/oscar/oscar.c:3178
 msgid "Idle: <b>Active</b>"
-msgstr "<b>沒有閒置</b>"
-
-#: src/protocols/oscar/oscar.c:3155
+msgstr "閒置：<b>沒閒置</b>"
+
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2730,485 +2733,482 @@
 "%s%s%s\n"
 "<hr>\n"
 msgstr ""
-"帳號：<B>%s</B>  %s <BR>\n"
+"使用者名稱：<B>%s</B>  %s <BR>\n"
 "警告等級：<B>%d %%</B><BR>\n"
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:3187
+#: src/protocols/oscar/oscar.c:3212
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:3198
+#: src/protocols/oscar/oscar.c:3223
 msgid "Client Capabilities: "
 msgstr "客戶端相容性："
 
-#: src/protocols/oscar/oscar.c:3204
+#: src/protocols/oscar/oscar.c:3229
 msgid "<i>No Information Provided</i>"
-msgstr "<i>未有提供任何信息</i>"
-
-#: src/protocols/oscar/oscar.c:3228
+msgstr "<i>未提供任何信息</i>"
+
+#: src/protocols/oscar/oscar.c:3253
 msgid "Your AIM connection may be lost."
-msgstr "您的 AIM 連接可能已被切斷了。"
-
-#: src/protocols/oscar/oscar.c:3589
+msgstr "您的 AIM 可能斷線了。"
+
+#: src/protocols/oscar/oscar.c:3614
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3615
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
-"因為您已經超過了發送訊息速率的上限，您最近的訊息未能送出。請等待十秒後再試一"
+"最近一個訊息並未送出，因為您已經達到發送訊息速率的上限。請等待十秒後再試一"
 "次。"
 
-#: src/protocols/oscar/oscar.c:3650
+#: src/protocols/oscar/oscar.c:3675
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
-msgstr "因為您用同一帳號已經由其他的地方登入，您已被拆接了。"
-
-#: src/protocols/oscar/oscar.c:3652
+msgstr "您被中斷連線，因為您由其他的地方登入這個帳號。"
+
+#: src/protocols/oscar/oscar.c:3677
 msgid "You have been signed off for an unknown reason."
-msgstr "您因為不明的原因，已經給自動登出了。"
-
-#: src/protocols/oscar/oscar.c:3879
+msgstr "您因為不明原因而登出。"
+
+#: src/protocols/oscar/oscar.c:3905
 msgid "UIN:"
-msgstr "帳號："
-
-#: src/protocols/oscar/oscar.c:3884
+msgstr "使用者帳號："
+
+#: src/protocols/oscar/oscar.c:3910
 msgid "First Name:"
 msgstr "名："
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3913
 msgid "Last Name:"
 msgstr "姓："
 
-#: src/protocols/oscar/oscar.c:3890 src/protocols/oscar/oscar.c:3896
+#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3922
 msgid "Email Address:"
-msgstr "電郵地址："
-
-#: src/protocols/oscar/oscar.c:3901
+msgstr "電子郵件："
+
+#: src/protocols/oscar/oscar.c:3927
 msgid "Mobile Phone:"
-msgstr "手機號碼："
-
-#: src/protocols/oscar/oscar.c:3904
+msgstr "行動電話："
+
+#: src/protocols/oscar/oscar.c:3930
 msgid "Gender:"
 msgstr "性別："
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3930
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3930
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3913
+#: src/protocols/oscar/oscar.c:3939
 msgid "Birthday:"
 msgstr "生日："
 
-#: src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3944
 msgid "Age:"
 msgstr "年齡："
 
-#: src/protocols/oscar/oscar.c:3921
+#: src/protocols/oscar/oscar.c:3947
 msgid "Personal Web Page:"
 msgstr "個人網頁："
 
-#: src/protocols/oscar/oscar.c:3924
+#: src/protocols/oscar/oscar.c:3950
 msgid "Additional Information:"
-msgstr "自訂資料："
-
-#: src/protocols/oscar/oscar.c:3928
+msgstr "其他資訊："
+
+#: src/protocols/oscar/oscar.c:3954
 msgid "Home Address:"
-msgstr "住宅地址"
-
-#: src/protocols/oscar/oscar.c:3930 src/protocols/oscar/oscar.c:3946
+msgstr "住家地址："
+
+#: src/protocols/oscar/oscar.c:3956 src/protocols/oscar/oscar.c:3972
 msgid "Address:"
-msgstr "街道地址"
-
-#: src/protocols/oscar/oscar.c:3933 src/protocols/oscar/oscar.c:3949
+msgstr "地址："
+
+#: src/protocols/oscar/oscar.c:3959 src/protocols/oscar/oscar.c:3975
 msgid "City:"
 msgstr "城市："
 
-#: src/protocols/oscar/oscar.c:3936 src/protocols/oscar/oscar.c:3952
+# NOTE 不能翻成「州份」，蠻怪的。而且與其他的不同
+#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:3978
 msgid "State:"
 msgstr "省╱州："
 
-#: src/protocols/oscar/oscar.c:3939 src/protocols/oscar/oscar.c:3955
+#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3981
 msgid "Zip Code:"
-msgstr "郵區號碼："
-
-#: src/protocols/oscar/oscar.c:3944
+msgstr "郵遞區號："
+
+#: src/protocols/oscar/oscar.c:3970
 msgid "Work Address:"
-msgstr "辦公地址："
-
-#: src/protocols/oscar/oscar.c:3960
+msgstr "工作地址："
+
+#: src/protocols/oscar/oscar.c:3986
 msgid "Work Information:"
-msgstr "工作詳情："
-
-#: src/protocols/oscar/oscar.c:3962
+msgstr "工作資訊："
+
+#: src/protocols/oscar/oscar.c:3988
 msgid "Company:"
-msgstr "所屬機構："
-
-#: src/protocols/oscar/oscar.c:3965
+msgstr "公司名稱："
+
+#: src/protocols/oscar/oscar.c:3991
 msgid "Division:"
-msgstr "所屬部門："
-
-#: src/protocols/oscar/oscar.c:3968
+msgstr "部門："
+
+#: src/protocols/oscar/oscar.c:3994
 msgid "Position:"
 msgstr "職位："
 
-#: src/protocols/oscar/oscar.c:3971
+#: src/protocols/oscar/oscar.c:3997
 msgid "Web Page:"
-msgstr "網址："
-
-#: src/protocols/oscar/oscar.c:4039
+msgstr "網頁："
+
+#: src/protocols/oscar/oscar.c:4065
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
-msgstr "<B>%s 有下列暱稱：</B><BR>"
-
-#: src/protocols/oscar/oscar.c:4057
+msgstr "<B>%s 擁有下列的帳號：</B><BR>"
+
+#: src/protocols/oscar/oscar.c:4083
 #, c-format
 msgid "No results found for email address %s"
-msgstr "找不到有關郵址 %s 的資料"
-
-#: src/protocols/oscar/oscar.c:4078
+msgstr "找不到和電子郵件 %s 相關的結果"
+
+#: src/protocols/oscar/oscar.c:4104
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "您會收到一封叫您確認 %s 的電郵。"
-
-#: src/protocols/oscar/oscar.c:4080
+msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
+
+#: src/protocols/oscar/oscar.c:4106
 msgid "Account Confirmation Requested"
-msgstr "送出了確認帳號的要求"
-
-#: src/protocols/oscar/oscar.c:4108
+msgstr "帳號確認"
+
+#: src/protocols/oscar/oscar.c:4134
 msgid "Error Changing Account Info"
-msgstr "無法更改帳戶資料"
-
-# XXX with interpretative comment
-#: src/protocols/oscar/oscar.c:4111
+msgstr "更改帳號資訊錯誤"
+
+#: src/protocols/oscar/oscar.c:4137
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
-msgstr ""
-"錯誤 0x%04x: 無法把您的暱稱改成您所指定的格式，因為不計算大小寫和空白，新舊暱"
-"稱並不一樣。"
-
-#: src/protocols/oscar/oscar.c:4114
+msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。"
+
+#: src/protocols/oscar/oscar.c:4140
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
-msgstr ""
-"錯誤 0x%04x: 無法把您的暱稱改成您所指定的格式，因為您所指定的新暱稱以空白收"
-"尾。"
-
-#: src/protocols/oscar/oscar.c:4117
+msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號以空白結束。"
+
+#: src/protocols/oscar/oscar.c:4143
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
-msgstr ""
-"錯誤 0x%04x: 無法把您的暱稱改成您所指定的格式，因為您所指定的新暱稱太長了。"
-
-# XXX with interpretation (don't know whether it's right)
-#: src/protocols/oscar/oscar.c:4120
+msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。"
+
+#: src/protocols/oscar/oscar.c:4146
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"錯誤 0x%04x: 無法修改您的電郵地址，因為伺服器還未做完您先前所要求的其他修改。"
-
-#: src/protocols/oscar/oscar.c:4123
+"錯誤 0x%04x：無法改變電子郵件地址，因為您已經送出的其他要求還未處理好。"
+
+#: src/protocols/oscar/oscar.c:4149
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"錯誤 0x%04x: 無法修改您的電郵地址，因為已經有太多暱稱使用這個電郵地址了。"
-
-#: src/protocols/oscar/oscar.c:4126
+"錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
+
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr "錯誤 0x%04x: 無法修改您的電郵地址，因為這並非一個有效的電郵地址。"
-
-#: src/protocols/oscar/oscar.c:4129
+msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。"
+
+#: src/protocols/oscar/oscar.c:4155
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "錯誤 0x%04x: 不明的錯誤。"
-
-#: src/protocols/oscar/oscar.c:4139
+msgstr "錯誤 0x%04x：未知錯誤。"
+
+#: src/protocols/oscar/oscar.c:4165
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-"您的暱稱目前的顯示格式是這樣的：\n"
+"您的帳號目前被格式化如下：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4140 src/protocols/oscar/oscar.c:4146
+#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4172
 msgid "Account Info"
-msgstr "帳戶資料"
-
-#: src/protocols/oscar/oscar.c:4145
+msgstr "帳號資訊"
+
+#: src/protocols/oscar/oscar.c:4171
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "%s 的電郵地址是 %s。"
-
-#: src/protocols/oscar/oscar.c:4367
+msgstr "%s 的電子郵件為 %s"
+
+#: src/protocols/oscar/oscar.c:4393
 msgid "Unable to set AIM profile."
-msgstr "無法設定 AIM 的個人檔案。"
-
-#: src/protocols/oscar/oscar.c:4368
+msgstr "無法設定 AIM 個人資料。"
+
+#: src/protocols/oscar/oscar.c:4394
 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 "
 "fully connected."
 msgstr ""
-"您大概在登入完了之前就已經要求修改您的個人檔案了；故此，您的個人檔案未能成功"
-"修改。請待您登入完了之後再試試重改一遍。"
-
-#: src/protocols/oscar/oscar.c:4397
+"您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
+"再重新進行設定。"
+
+#: src/protocols/oscar/oscar.c:4423
 #, 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:4399
+msgstr "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
+
+#: src/protocols/oscar/oscar.c:4425
 msgid "Profile too long."
-msgstr "您的個人檔案太大了。"
-
-#: src/protocols/oscar/oscar.c:4415
+msgstr "個人資訊過長。"
+
+#: src/protocols/oscar/oscar.c:4441
 msgid "Unable to set AIM away message."
-msgstr "無法為 AIM 設定離開訊息。"
-
-#: src/protocols/oscar/oscar.c:4416
+msgstr "無法設定 AIM 離開訊息。"
+
+#: src/protocols/oscar/oscar.c:4442
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
-"您大概在登入完了之前就已經嘗試設定您的離開訊息了；故此，您的狀態仍然是"
-"「在」。請您等到登入完了之後重試。"
-
-#: src/protocols/oscar/oscar.c:4455
+"您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請在"
+"完全登入後再設定一次。"
+
+#: src/protocols/oscar/oscar.c:4481
 #, 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:4457
+msgstr "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
+
+#: src/protocols/oscar/oscar.c:4483
 msgid "Away message too long."
-msgstr "離開訊息太長"
-
-#: src/protocols/oscar/oscar.c:4670
+msgstr "離開訊息過長。"
+
+#: src/protocols/oscar/oscar.c:4696
 msgid "Unable To Retrive Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:4697
 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 "
 "a few hours."
 msgstr ""
-"Gaim 暫時無法從 AIM 的伺服器讀取您的好友清單。您的好友清單依然健在；幾個鐘頭"
-"後應該再次可用。"
-
-# XXX did not check context
-#: src/protocols/oscar/oscar.c:4761 src/protocols/oscar/oscar.c:4762
-#: src/protocols/oscar/oscar.c:4767
+"Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
+"失，可能可以在幾個小時後取得。"
+
+#: src/protocols/oscar/oscar.c:4787 src/protocols/oscar/oscar.c:4788
+#: src/protocols/oscar/oscar.c:4793
 msgid "Orphans"
-msgstr "無組孤兒"
-
-#: src/protocols/oscar/oscar.c:4931
+msgstr "孤兒們"
+
+#: src/protocols/oscar/oscar.c:4957
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"無法把 %s 新增到您的好友清單內，因為您的好友清單已有太多好友了。您可以從好友"
-"清單內移除掉一個好友，再試試看。"
-
-#: src/protocols/oscar/oscar.c:4931 src/protocols/oscar/oscar.c:4944
+"因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
+"試。"
+
+#: src/protocols/oscar/oscar.c:4957 src/protocols/oscar/oscar.c:4970
 msgid "(no name)"
-msgstr "【無名氏】"
-
-#: src/protocols/oscar/oscar.c:4932 src/protocols/oscar/oscar.c:4945
+msgstr "(沒有名字)"
+
+#: src/protocols/oscar/oscar.c:4958 src/protocols/oscar/oscar.c:4971
 msgid "Unable To Add"
-msgstr "無法新增"
-
-#: src/protocols/oscar/oscar.c:4944
+msgstr "無法加入"
+
+#: src/protocols/oscar/oscar.c:4970
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 msgstr ""
-"無法新增好友 %s，但原因不明。最常見的原因是您已有太多好友在好友清單內了。"
-
-#: src/protocols/oscar/oscar.c:4979
+"因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
+"過所系統允許的上限。"
+
+#: src/protocols/oscar/oscar.c:5005
 #, 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:4984
+msgstr "使用者 %s 已經允許您加入到他們的好友清單中。您是不是也要將他們加入呢？"
+
+#: src/protocols/oscar/oscar.c:5011
 msgid "Authorization Given"
-msgstr "要求已獲批准"
-
-#: src/protocols/oscar/oscar.c:5014
+msgstr "給予認證"
+
+#: src/protocols/oscar/oscar.c:5044
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
-msgstr "使用者 %s 想將您加入他的好友清單中，理由如下：%s"
+msgstr ""
+"使用者 %s 因為下列原因，想要將您加入他們的好友清單中：\n"
+"%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5086
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
-msgstr "使用者 %s 允許了您將其加入您的好友清單的要求。"
-
-#: src/protocols/oscar/oscar.c:5053
+msgstr "使用者 %s 允許了您將他們加入好友清單的要求。"
+
+#: src/protocols/oscar/oscar.c:5087
 msgid "Authorization Granted"
-msgstr "要求已獲批准"
+msgstr "給予認證"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5056
+#: src/protocols/oscar/oscar.c:5090
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
 "following reason:\n"
 "%s"
-msgstr "使用者 %s 拒絕了您將其加入您的好友清單的要求，理由如下："
-
-#: src/protocols/oscar/oscar.c:5057
+msgstr ""
+"使用者 %s 因為下列原因，拒絕了您將他們加入好友清單的要求：\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:5091
 msgid "Authorization Denied"
-msgstr "要求批准被拒"
-
-# XXX tentative translation. see irc log on 20030523
-#: src/protocols/oscar/oscar.c:5094 src/protocols/toc/toc.c:1200
+msgstr "認證拒絕"
+
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
+#: src/protocols/oscar/oscar.c:5128 src/protocols/toc/toc.c:1200
 msgid "Exchange:"
 msgstr "聊天室號碼："
 
-#: src/protocols/oscar/oscar.c:5314
+#: src/protocols/oscar/oscar.c:5348
 msgid "<b>Status:</b> "
 msgstr "<b>狀態：</b>"
 
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5357
 msgid "<b>Logged In:</b> "
-msgstr "<b>登入了</b> "
-
-# Context: amount of time logged in
-#: src/protocols/oscar/oscar.c:5330
+msgstr "<b>登入時間：</b>"
+
+#: src/protocols/oscar/oscar.c:5364
 msgid "<b>Capabilities:</b> "
-msgstr "<b>通訊協定相容性：</b>"
-
-#: src/protocols/oscar/oscar.c:5338
+msgstr "<b>相容性：</b>"
+
+#: src/protocols/oscar/oscar.c:5372
 msgid "<b>Status:</b> Not Authorized"
-msgstr "<b>狀態：</b>未獲批准"
-
-#: src/protocols/oscar/oscar.c:5342 src/gtkblist.c:861
+msgstr "<b>狀態：</b>未認證"
+
+#: src/gtkblist.c:861 src/protocols/oscar/oscar.c:5376
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態：</b>離線"
 
-#: src/protocols/oscar/oscar.c:5368
+#: src/protocols/oscar/oscar.c:5402
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:5583
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:5596
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您選擇了與 %s 連接起來，作直接的即時訊息。"
-
-#: src/protocols/oscar/oscar.c:5563
+msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
+
+#: src/protocols/oscar/oscar.c:5599
 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:5702
+msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？"
+
+#: src/protocols/oscar/oscar.c:5743
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:5736
+#: src/protocols/oscar/oscar.c:5777
 msgid "Re-request Authorization"
-msgstr "再次要求批准您加其入好友清單"
-
-#: src/protocols/oscar/oscar.c:5757
+msgstr "重新要求認證"
+
+#: src/protocols/oscar/oscar.c:5798
 msgid "The new formatting is invalid."
-msgstr "新的顯示格式並不有效。"
-
-#: src/protocols/oscar/oscar.c:5758
+msgstr "新的格式是無效的。"
+
+#: src/protocols/oscar/oscar.c:5799
 msgid "Screenname formatting can change only capitalization and whitespace."
-msgstr "更改帳號的顯示格式，祗可更改大小寫，及加減空白。"
-
-#: src/protocols/oscar/oscar.c:5764
+msgstr "帳號格式化只能改變大寫以及空白。"
+
+#: src/protocols/oscar/oscar.c:5805
 msgid "New screenname formatting:"
-msgstr "帳號的顯示格式應該是這樣的："
-
-#: src/protocols/oscar/oscar.c:5813
+msgstr "新的帳號格式："
+
+#: src/protocols/oscar/oscar.c:5854
 msgid "Change Address To:"
-msgstr "註冊電郵地址應為："
-
-#: src/protocols/oscar/oscar.c:5826
+msgstr "變更地址為："
+
+#: src/protocols/oscar/oscar.c:5867
 msgid "You are awaiting authorization from the following buddies:<BR>"
-msgstr "下列的好友仍未批准您加其入好友清單：<BR>"
-
-#: src/protocols/oscar/oscar.c:5851
+msgstr "您目前正在等待下列好友的認證：<BR>"
+
+#: src/protocols/oscar/oscar.c:5892
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>沒有人未批准您</i>"
-
-#: src/protocols/oscar/oscar.c:5856
+msgstr "<i>您並沒有在等待驗證</i>"
+
+#: src/protocols/oscar/oscar.c:5897
 #, 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 ""
-"%s<BR><BR>希望再次要求這些好友批准您加他們入好友清單，您可以在好友清單用滑鼠"
-"右鍵按一下好友的名字，再按一下「再次要求批准您加其入好友清單」即可。"
-
-#: src/protocols/oscar/oscar.c:5889
+"%s<BR><BR>您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，"
+"然後選擇「要求重新認證」。"
+
+#: src/protocols/oscar/oscar.c:5930
 msgid "Change Password (URL)"
-msgstr "修改密碼 (URL)"
-
-#: src/protocols/oscar/oscar.c:5900
+msgstr "修改密碼(URL)"
+
+#: src/protocols/oscar/oscar.c:5941
 msgid "Format Screenname"
-msgstr "設定帳號的顯示格式"
-
-#: src/protocols/oscar/oscar.c:5906
+msgstr "格式化帳號"
+
+#: src/protocols/oscar/oscar.c:5947
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:5912
+#: src/protocols/oscar/oscar.c:5953
 msgid "Display Current Registered Address"
-msgstr "顯示您目前註了冊的電郵地址"
-
-#: src/protocols/oscar/oscar.c:5918
+msgstr "顯示目前所註冊的地址"
+
+#: src/protocols/oscar/oscar.c:5959
 msgid "Change Current Registered Address"
-msgstr "更改您的註冊電郵地址"
-
-#: src/protocols/oscar/oscar.c:5927
+msgstr "修改目前所註冊的地址"
+
+#: src/protocols/oscar/oscar.c:5968
 msgid "Show Buddies Awaiting Authorization"
-msgstr "列出有誰仍未批准您"
-
-#: src/protocols/oscar/oscar.c:5935
+msgstr "顯示等待認證的好友"
+
+#: src/protocols/oscar/oscar.c:5976
 msgid "Search for Buddy by Email"
-msgstr "以電郵地址找尋好友"
+msgstr "使用電子郵件搜尋好友"
 
 #. *< api_version
 #. *< type
@@ -3220,22 +3220,22 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:6096 src/protocols/oscar/oscar.c:6098
 msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ 通訊協定插件"
-
-#: src/protocols/oscar/oscar.c:6075
+msgstr "AIM/ICQ 協定模組"
+
+#: src/protocols/oscar/oscar.c:6116
 msgid "Auth Host:"
 msgstr "認證伺服器："
 
-#: src/protocols/oscar/oscar.c:6081
+#: src/protocols/oscar/oscar.c:6122
 msgid "Auth Port:"
-msgstr "連接埠號碼："
+msgstr "認證通訊埠："
 
 #: src/protocols/toc/toc.c:190
 #, c-format
 msgid "Looking up %s"
-msgstr "搜尋 %s 中"
+msgstr "找尋 %s 中"
 
 #: src/protocols/toc/toc.c:490
 #, c-format
@@ -3250,22 +3250,21 @@
 #: src/protocols/toc/toc.c:496
 #, c-format
 msgid "Message too long, last %s bytes truncated."
-msgstr "訊息太長，最後的 %s 位元組被截去了。"
+msgstr "訊息太長，最後的 %s 位元組被截去。"
 
 #: src/protocols/toc/toc.c:499
 #, c-format
 msgid "%s not currently logged in."
-msgstr "%s 目前尚未登入。"
-
-# FIXME... what is this?! 
+msgstr "%s 目前並未登入。"
+
 #: src/protocols/toc/toc.c:502
 #, c-format
 msgid "Warning of %s not allowed."
-msgstr "不可警告 %s。"
+msgstr "警告：%s 是不被允許的。"
 
 #: src/protocols/toc/toc.c:505
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "訊息被丟棄，因為您已超過了伺服器所限制的發送速度。"
+msgstr "訊息被丟棄，因為您達到了伺服器所限制的發送速度。"
 
 #: src/protocols/toc/toc.c:508
 #, c-format
@@ -3285,7 +3284,7 @@
 #: src/protocols/toc/toc.c:517
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快了。"
+msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
 
 #: src/protocols/toc/toc.c:520
 msgid "Failure."
@@ -3293,19 +3292,19 @@
 
 #: src/protocols/toc/toc.c:523
 msgid "Too many matches."
-msgstr "太多匹配的查詢結果。"
+msgstr "匹配太多。"
 
 #: src/protocols/toc/toc.c:526
 msgid "Need more qualifiers."
-msgstr "須更多的限定詞。"
+msgstr "需輸入更多檢索條件。"
 
 #: src/protocols/toc/toc.c:529
 msgid "Dir service temporarily unavailable."
-msgstr "目錄服務目前暫停使用。"
+msgstr "目錄服務暫時不存在。"
 
 #: src/protocols/toc/toc.c:532
 msgid "Email lookup restricted."
-msgstr "電郵查詢被限制了。"
+msgstr "禁止 eMail 檢查。"
 
 #: src/protocols/toc/toc.c:535
 msgid "Keyword ignored."
@@ -3317,32 +3316,32 @@
 
 #: src/protocols/toc/toc.c:541
 msgid "User has no directory information."
-msgstr "在目錄內沒有這個使用者的資訊。"
+msgstr "這個使用者沒有他的相關資訊。"
 
 #: src/protocols/toc/toc.c:545
 msgid "Country not supported."
-msgstr "不支援這個國家。"
+msgstr "這個國家不被支援。"
 
 #: src/protocols/toc/toc.c:548
 #, c-format
 msgid "Failure unknown: %s."
-msgstr "不明的失敗原因：%s。"
+msgstr "未知的失敗原因：%s。"
 
 #: src/protocols/toc/toc.c:554
 msgid "The service is temporarily unavailable."
-msgstr "服務暫時目前暫停使用。"
+msgstr "服務暫時不存在。"
 
 #: src/protocols/toc/toc.c:557
 msgid "Your warning level is currently too high to log in."
-msgstr "您的警告等級實在太高了，目前無法登入。"
+msgstr "您目前登入系統的警告等級太高，以致無法登入。"
 
 #: src/protocols/toc/toc.c:560
 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."
 msgstr ""
-"您的連接／拆接動作太過頻繁。請等待十分鐘後才再行重試，否則您只會浪費更多時"
-"間。"
+"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線，那麼您的等待時間將會更加的延長。"
 
 #: src/protocols/toc/toc.c:562
 #, c-format
@@ -3352,19 +3351,19 @@
 #: src/protocols/toc/toc.c:565
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "發生了一個未知的錯誤 %d。資訊：%s"
+msgstr "一個未知的錯誤 %d 發生。資訊：%s"
 
 #: src/protocols/toc/toc.c:582
 msgid "Connection Closed"
-msgstr "拆接了"
+msgstr "連線關閉"
 
 #: src/protocols/toc/toc.c:620
 msgid "Waiting for reply..."
-msgstr "等待回覆中"
+msgstr "等待回覆中..."
 
 #: src/protocols/toc/toc.c:685
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC 結束了暫停狀態。您現在可以繼續傳送您的訊息。"
+msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
 #: src/protocols/toc/toc.c:874
 msgid "Password Change Successful"
@@ -3372,7 +3371,7 @@
 
 #: src/protocols/toc/toc.c:878
 msgid "TOC has sent a PAUSE command."
-msgstr "TOC 傳來了一個 PAUSE 指令。"
+msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
 #: src/protocols/toc/toc.c:879
 msgid ""
@@ -3380,8 +3379,8 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 msgstr ""
-"在這情況下，TOC 不但不會理會您送出去的訊息，它甚至會因為您試圖送出訊息而趕您"
-"走。幸好，這種情形祗會是暫時性的；請您耐心等待。"
+"當這個發生時，TOC 會忽略所有送來的訊息，同時可能在您送出訊息時，將您踢出系"
+"統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態，請您見諒。"
 
 #: src/protocols/toc/toc.c:1323
 msgid "Get Dir Info"
@@ -3389,31 +3388,31 @@
 
 #: src/protocols/toc/toc.c:1447
 msgid "Set Dir Info"
-msgstr "設定目錄內的資訊"
+msgstr "設定使用者個人資訊"
 
 #: src/protocols/toc/toc.c:1570
 #, c-format
 msgid "Could not open %s for writing!"
-msgstr "無法開啟 %s，或該檔案無法寫入！"
+msgstr "無法開啟 %s 以供寫入！"
 
 #: src/protocols/toc/toc.c:1606
 msgid "File transfer failed; other side probably canceled."
-msgstr ""
+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 "無法連接，也無法傳輸了。"
+msgstr "無法開啟連線以供傳輸。"
 
 #: src/protocols/toc/toc.c:1815
 msgid "Could not connect for transfer!"
-msgstr "無法連接，也無法傳輸了！"
+msgstr "無法開啟傳輸的連線！"
 
 #: src/protocols/toc/toc.c:1848
 msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-
-#: src/protocols/toc/toc.c:1948 src/gtkft.c:1058
+msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
+
+#: src/gtkft.c:1059 src/protocols/toc/toc.c:1948
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
@@ -3422,16 +3421,11 @@
 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:1989
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr "%s 要求您傳送一個檔案給他。"
-
-#: src/protocols/toc/toc.c:1991 src/gtkft.c:1111 src/server.c:1239
-msgid "Accept"
-msgstr "接受"
+msgstr "%s 要求您傳送檔案給他（她）。"
 
 #. *< api_version
 #. *< type
@@ -3443,62 +3437,62 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2061 src/protocols/toc/toc.c:2063
+#: src/protocols/toc/toc.c:2064 src/protocols/toc/toc.c:2066
 msgid "TOC Protocol Plugin"
-msgstr "TOC 通訊協定插件"
-
-#: src/protocols/toc/toc.c:2081
+msgstr "TOC 協定模組"
+
+#: src/protocols/toc/toc.c:2084
 msgid "TOC Host:"
-msgstr "TOC 主機："
-
-#: src/protocols/toc/toc.c:2087
+msgstr "TOC 伺服器："
+
+#: src/protocols/toc/toc.c:2090
 msgid "TOC Port:"
-msgstr "TOC 連接埠："
+msgstr "TOC 通訊埠："
 
 #: src/protocols/yahoo/yahoo.c:605
 msgid "Your Yahoo! message did not get sent."
-msgstr "您的 Yahoo! 短訊沒有被送出。"
-
-#: src/protocols/yahoo/yahoo.c:1073 src/protocols/yahoo/yahoo.c:1281
-#: src/protocols/yahoo/yahoo.c:1355
+msgstr "您的 Yahoo! 訊息並沒有被送出。"
+
+#: src/protocols/yahoo/yahoo.c:1073 src/protocols/yahoo/yahoo.c:1283
+#: src/protocols/yahoo/yahoo.c:1357
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1075 src/protocols/yahoo/yahoo.c:1283
-#: src/protocols/yahoo/yahoo.c:1356
+#: src/protocols/yahoo/yahoo.c:1075 src/protocols/yahoo/yahoo.c:1285
+#: src/protocols/yahoo/yahoo.c:1358
 msgid "Not At Desk"
-msgstr "離開了書卓"
-
-#: src/protocols/yahoo/yahoo.c:1077 src/protocols/yahoo/yahoo.c:1285
-#: src/protocols/yahoo/yahoo.c:1357
+msgstr "不在座位"
+
+#: src/protocols/yahoo/yahoo.c:1077 src/protocols/yahoo/yahoo.c:1287
+#: src/protocols/yahoo/yahoo.c:1359
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:1081 src/protocols/yahoo/yahoo.c:1289
-#: src/protocols/yahoo/yahoo.c:1359
+#: src/protocols/yahoo/yahoo.c:1081 src/protocols/yahoo/yahoo.c:1291
+#: src/protocols/yahoo/yahoo.c:1361
 msgid "On Vacation"
-msgstr "放了假"
-
-#: src/protocols/yahoo/yahoo.c:1085 src/protocols/yahoo/yahoo.c:1293
-#: src/protocols/yahoo/yahoo.c:1361
+msgstr "渡假去了"
+
+#: src/protocols/yahoo/yahoo.c:1085 src/protocols/yahoo/yahoo.c:1295
+#: src/protocols/yahoo/yahoo.c:1363
 msgid "Stepped Out"
-msgstr "外出一會"
-
-#: src/protocols/yahoo/yahoo.c:1202
+msgstr "走出去了"
+
+#: src/protocols/yahoo/yahoo.c:1201
 msgid "Active which ID?"
-msgstr "啟動那個帳號？"
-
-#: src/protocols/yahoo/yahoo.c:1213
+msgstr "啟動哪一個 ID？"
+
+#: src/protocols/yahoo/yahoo.c:1212
 msgid "Activate ID"
-msgstr "啟動帳號"
-
-#: src/protocols/yahoo/yahoo.c:1438
+msgstr "啟動 ID"
+
+#: src/protocols/yahoo/yahoo.c:1440
 msgid "Pager Host:"
-msgstr "傳呼台主機："
-
-#: src/protocols/yahoo/yahoo.c:1444
+msgstr "傳呼系統伺服器："
+
+#: src/protocols/yahoo/yahoo.c:1446
 msgid "Pager Port:"
-msgstr "連接埠號碼："
+msgstr "傳呼系統通訊埠："
 
 #. *< api_version
 #. *< type
@@ -3510,14 +3504,14 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1530 src/protocols/yahoo/yahoo.c:1532
+#: src/protocols/yahoo/yahoo.c:1532 src/protocols/yahoo/yahoo.c:1534
 msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 通訊協定插件"
+msgstr "Yahoo 協定模組"
 
 #: src/protocols/zephyr/zephyr.c:336
 #, c-format
 msgid "<b>User:</b> %s<br>"
-msgstr "<b>帳號：</b>%s</br>"
+msgstr "<b>使用者：</b>%s<br>"
 
 #: src/protocols/zephyr/zephyr.c:338
 #, c-format
@@ -3526,12 +3520,12 @@
 
 #: src/protocols/zephyr/zephyr.c:340
 msgid "<br>Hidden or not logged-in"
-msgstr "<br>隱了身，或者根本沒有登入"
+msgstr "<br>隱藏或未登入"
 
 #: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<br>At %s since %s"
-msgstr "<br>從 %2$s 起已經在 %1$s"
+msgstr "<br>從 %2$s 起已在 %1$s"
 
 #: src/protocols/zephyr/zephyr.c:573 src/protocols/zephyr/zephyr.c:574
 msgid "Anyone"
@@ -3539,32 +3533,32 @@
 
 #: src/protocols/zephyr/zephyr.c:598
 msgid "Already logged in with Zephyr"
-msgstr "已經登入了 Zephyr"
-
-# XXX the translated text is an interpretation, perhaps should redo it
+msgstr "已經登入 Zephyr"
+
 #: 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 "因為 Zephyr 用您登入系統的帳號，您是不可能擁有多個 Zephyr 帳戶的。"
 
+# TODO: 在 Google 找到的資料說 Zephyr 的 ZLocate 是一種名錄服務，不過在這裡不知是什麼意思
 #: src/protocols/zephyr/zephyr.c:847
 msgid "ZLocate"
-msgstr "ZLocate"
-
-# XXX From Google, a zephyr class is actually like a semi-private chat room
+msgstr ""
+
+# TODO: 在 Google 找到的資料說 Zephyr 的 Class 不是類別，而是一種半私人的聊天室
 #: src/protocols/zephyr/zephyr.c:887
 msgid "Class:"
 msgstr ""
 
-# XXX From Google, a zephyr instance is actually like a newsgroup or a chat room
+# TODO: 在 Google 找到的資料說 Zephyr 的 Instance 是一種公共的聊天室
 #: src/protocols/zephyr/zephyr.c:892
 msgid "Instance:"
 msgstr ""
 
 #: src/protocols/zephyr/zephyr.c:897
 msgid "Recipient:"
-msgstr "收訊人："
+msgstr "接受者："
 
 #. *< api_version
 #. *< type
@@ -3578,12 +3572,12 @@
 #. *  summary
 #: src/protocols/zephyr/zephyr.c:1029 src/protocols/zephyr/zephyr.c:1031
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr 通訊協定插件"
+msgstr "Zephyr 協定模組"
 
 #: src/about.c:74
 #, c-format
 msgid "About Gaim v%s"
-msgstr "關於 Gaim（第%s版）"
+msgstr "關於 Gaim v%s"
 
 #: src/about.c:106
 msgid ""
@@ -3591,13 +3585,13 @@
 "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>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 的 #gaim 頻道<BR><BR>"
+msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR>"
 
 #: src/about.c:120
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
@@ -3614,20 +3608,23 @@
 "(developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
 msgstr ""
 "  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:"
+"A>&gt;<BR>  Sean Egan (主要開發者) &lt;<A HREF=\"mailto:bj91704@binghamton."
+"edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian 'ChipX86' Hammond (開發者"
+"及網站管理員)<BR>  Herman Bloggs (Windows 版本移植) &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>"
-
+"'faceprint' Walp (開發者)<BR>  Mark 'KingAnt' Doliner (開發者)<BR>  Luke "
+"'LSchiere' Schierer (支援)<BR><BR>"
+
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schiere 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
+# NOTE 不過，翻成「狂熱的模組作者」會比較好
 #: 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>"
-msgstr "<FONT SIZE=\"3\">已退任的開發者：</FONT><BR>"
+msgstr "<FONT SIZE=\"3\">前任開發者：</FONT><BR>"
 
 #: src/about.c:149
 msgid ""
@@ -3638,12 +3635,14 @@
 "&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
 "Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 msgstr ""
-"  Adam Fritzler (前任 libfaim 維護者)<BR>  Eric Warmenhoven (前任首席開發者)"
-"&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 (程式編寫者兼御用司機【懶人】)"
-"<BR><BR>"
+"  Adam Fritzler (前 libfaim 維護者)<BR>  Eric Warmenhoven (前主要開發者)&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 (程式編寫者兼指定司機 [懶人])<BR><BR><FONT SIZE=\"3\">正體中文化：</FONT><BR>"
+"  Ambrose C. Li &lt;<A HREF=\"mailto://acli@ada.dhs.org\">acli@ada.dhs.org</A>&gt;<BR>"
+"  Paladin R. Liu &lt;<A HREF=\"mailto://paladin@ms1.hinet.net\">paladin@ms1.hinet.net</A>&gt;<BR>"
+"  URL: <A HREF=\"http://gaim.dnsq.org/\">http://gaim.dnsq.org</A><BR><BR>"
 
 #: src/away.c:221
 msgid "Gaim - Away!"
@@ -3675,12 +3674,12 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies, and the group were not removed.\n"
 msgstr ""
-"%2$s 群組內有 %1$d 個好友沒有登入，故此，他們沒有從群組中移除掉；這些好友以及"
-"其群組都沒有被移除掉。\n"
+"%d 個在 %s 群組的好友並沒有被移除，因為他們所對應的帳號並沒有登入。這些好友及"
+"群組沒有被移除。\n"
 
 #: src/blist.c:683
 msgid "Group not removed"
-msgstr "群組沒有被移除"
+msgstr "群組未被移除"
 
 #: src/blist.c:850
 msgid "Invalid Groupname"
@@ -3689,7 +3688,7 @@
 #: src/blist.c:1572
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr "無沒分析您的好友清單，所以沒有讀入它了。"
+msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
 #: src/blist.c:1574
 msgid "Buddy List Error"
@@ -3702,8 +3701,7 @@
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
-msgstr ""
-"Gaim 現正把您的好友清單轉換成新的格式；新的好友清單檔案將會在 %s 那裡。"
+msgstr "Gaim 正在轉換您的舊好友清單為新格式，同時將它存放於 %s"
 
 #: src/blist.c:1583
 msgid "Converting Buddy List"
@@ -3713,24 +3711,26 @@
 msgid ""
 "Communication with the browser failed. Please close all windows and try "
 "again."
-msgstr "無法與瀏覽器聯絡；請關閉所有視窗之後再行重試。"
+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 "無法執行您的瀏覽器，因為您選了「自訂」瀏覽器，卻沒有設定自訂的指令。"
+msgstr ""
+"因為您使用了「使用者自定瀏覽器」的選項，而瀏覽器並沒有被設定，因此瀏覽器沒有"
+"辦法被啟動。"
 
 #: src/browser.c:609
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
-msgstr "試圖執行您選擇了的瀏覽器「%s」時遇到了錯誤"
-
-#: src/buddy_chat.c:250
+msgstr "啟動您所選擇的瀏覽器時發生錯誤：%s"
+
+#: src/buddy_chat.c:250 src/dialogs.c:1358
 msgid ""
-"You are not currently signed on wit any protocols that have the ability to "
+"You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "您現時用以登入的通訊協定當中，並沒有可讓您聊天的通訊協定。"
+msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
 #: src/buddy_chat.c:264
 msgid "Join Chat"
@@ -3742,7 +3742,7 @@
 
 #: src/buddy_chat.c:280
 msgid "Join Chat As:"
-msgstr "以何身份聊天："
+msgstr "加入聊天為："
 
 #. Join button.
 #: src/buddy_chat.c:303
@@ -3751,62 +3751,62 @@
 
 #: src/conversation.c:404
 msgid "Unable to send message. The message is too large."
-msgstr "無法送出訊息：太大了"
+msgstr "無法送出訊息。這個訊息太大了。"
 
 #: src/conversation.c:412
 msgid "Unable to send message."
-msgstr "無法送出訊息"
+msgstr "無法送出訊息。"
 
 # #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 # #: src/buddy_chat.c:1544
 # #, c-format
 # msgid "%d %s in room"
-# msgstr "聊天室內有 %d 個人"
+# msgstr "聊天室有 %d 家伙"
 #: src/conversation.c:1973
 #, c-format
 msgid "%s entered the room."
-msgstr "%s 進入了聊天室。"
+msgstr "%s 進入聊天室。"
 
 # #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 # #: src/buddy_chat.c:1544
 # #, c-format
 # msgid "%d %s in room"
-# msgstr "聊天室內有 %d 個人"
+# msgstr "聊天室有 %d 家伙"
 #: src/conversation.c:1976
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] 進入了聊天室。"
+msgstr "%s [<I>%s</I>] 進入聊天室。"
 
 #: src/conversation.c:2025
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s 改了暱稱，如今叫 %s 了"
+msgstr "%s 改變暱稱為 %s"
 
 #: src/conversation.c:2068
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s 離開了聊天室 (%s)。"
+msgstr "%s 離開聊天室 (%s)。"
 
 #: src/conversation.c:2070
 #, c-format
 msgid "%s left the room."
-msgstr "%s 離開了聊天室。"
+msgstr "%s 離開聊天室。"
 
 #: src/conversation.c:2254
 msgid "Last created window"
-msgstr "最近開啟的同一視窗"
+msgstr "上一個開啟的視窗"
 
 #: src/conversation.c:2256
 msgid "New window"
-msgstr "開新視窗"
+msgstr "新視窗"
 
 #: src/conversation.c:2258
 msgid "By group"
-msgstr "每群組各開一視窗"
+msgstr "依群組"
 
 #: src/conversation.c:2260
 msgid "By account"
-msgstr "每帳號各開一視窗"
+msgstr "依帳號"
 
 #: src/dialogs.c:364
 msgid "Warn User"
@@ -3824,13 +3824,13 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">警告 %s 嗎？</span>\n"
+"<span weight=\"bold\" size=\"larger\">警告 %s?</span>\n"
 "\n"
-"警告 %s 會提高他的警告等級，令他發出訊息的速率受到愈趨嚴厲的限制。\n"
+"這個動作將會增加 %s 的警告等級，同時他 / 她將被限制以更嚴格的速率限制。\n"
 
 #: src/dialogs.c:389
 msgid "Warn _anonymously?"
-msgstr "以匿名者的身分發出警告嗎？"
+msgstr "以匿名的身份發出警告？(_A)"
 
 #: src/dialogs.c:396
 msgid "<b>Anonymous warnings are less severe.</b>"
@@ -3840,444 +3840,436 @@
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "您真的要將 %s 從您的好友清單中移除嗎？"
-
-#: src/dialogs.c:468
+msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
+
+#: src/dialogs.c:469 src/dialogs.c:470
 msgid "Remove Buddy"
-msgstr "移除"
-
-#: src/dialogs.c:474
+msgstr "移除好友"
+
+#: src/dialogs.c:478
 #, 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:475
+msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
+
+#: src/dialogs.c:480 src/dialogs.c:481
 msgid "Remove Chat"
-msgstr "移除"
-
-#: src/dialogs.c:481
+msgstr "移除聊天室"
+
+#: src/dialogs.c:489
 #, 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:483
+msgstr ""
+"您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
+
+#: src/dialogs.c:492 src/dialogs.c:493
 msgid "Remove Group"
-msgstr "移除"
-
-#: src/dialogs.c:633
+msgstr "移除群組"
+
+#: src/dialogs.c:645
 msgid "New Message"
-msgstr "新的即時訊息"
-
-#: src/dialogs.c:651
+msgstr "新訊息"
+
+#: src/dialogs.c:663
 msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr "您想跟誰傳即時訊息？請輸入對方的帳號吧。\n"
-
-# XXX check all contexts (see also "_Account:" below) (q.v.)
-#: src/dialogs.c:667 src/dialogs.c:768 src/dialogs.c:3725
+msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
+
+#: src/dialogs.c:679 src/dialogs.c:780 src/dialogs.c:3737
 msgid "_Screenname:"
-msgstr "對方帳號(_S)："
-
-# XXX check all contexts (see also "_Screenname:" above) (q.v.)
-#: src/dialogs.c:682 src/dialogs.c:784 src/gtkpounce.c:520
+msgstr "帳號(_S)："
+
+#: src/dialogs.c:694 src/dialogs.c:796 src/gtkpounce.c:520
 msgid "_Account:"
-msgstr "您的帳號(_A)："
-
-#: src/dialogs.c:737
+msgstr "帳號(_A)："
+
+#: src/dialogs.c:749
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:768
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
-msgstr "您想取得誰的個人資訊？請輸入對方的帳號吧。\n"
-
-#: src/dialogs.c:935
+msgstr "請輸入您所想要查詢對象的帳號。\n"
+
+#: src/dialogs.c:947
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/dialogs.c:952
+#: src/dialogs.c:964
 msgid "Please enter the name of the group to be added.\n"
-msgstr "請給您打算新增的群組起個名字。\n"
-
-#: src/dialogs.c:961 src/dialogs.c:4273
+msgstr "請輸入群組名稱以進行新增。\n"
+
+#: src/dialogs.c:973 src/dialogs.c:4285
 msgid "_Group:"
 msgstr "群組(_G)："
 
-#: src/dialogs.c:1043
+#: src/dialogs.c:1055
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/dialogs.c:1062
+#: src/dialogs.c:1074
 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 ""
-"您想新增誰到您的好友清單裡呢？請輸入對方的帳號。您也可以同時給您的好友輸入一"
-"個別名；在可能的情況下，Gaim 會顯示您輸入的別名而非您好友的帳號。\n"
-
-#: src/dialogs.c:1081
+"請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
+"在好友清單中顯示。\n"
+
+#: src/dialogs.c:1093
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/dialogs.c:1094
+#: src/dialogs.c:1106
 msgid "Alias"
 msgstr "別名"
 
-#: src/dialogs.c:1104
+#: src/dialogs.c:1116
 msgid "Group"
 msgstr "群組"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1113
+#: src/dialogs.c:1125
 msgid "Add To"
-msgstr "加入到"
-
-#: 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
+msgstr "增加到"
+
+#: src/dialogs.c:1365
 msgid "Add Chat"
-msgstr "新增聊天室"
-
-#: src/dialogs.c:1376
+msgstr "加入聊天室"
+
+#: src/dialogs.c:1388
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
-msgstr ""
-"請給您打算新增到好友名單的聊天室起個別名，或可額外輸入其他您認為有用的有關資"
-"訊。\n"
-
-#: src/dialogs.c:1385
+msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n"
+
+#: src/dialogs.c:1397
 msgid "Account:"
 msgstr "帳號："
 
-#: src/dialogs.c:1404 src/multi.c:821
+#: src/dialogs.c:1416 src/multi.c:821
 msgid "Alias:"
 msgstr "別名："
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1427
 msgid "Group:"
 msgstr "群組："
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1760
 msgid "Privacy"
-msgstr "隱私"
-
-#: src/dialogs.c:1759
+msgstr "隱私設定"
+
+#: src/dialogs.c:1771
 msgid "Changes to privacy settings take effect immediately."
-msgstr "更改隱私設定，即時生效。"
-
-#: src/dialogs.c:1768
+msgstr "隱私設定將立刻生效。"
+
+#: src/dialogs.c:1780
 msgid "Set privacy for:"
-msgstr "給哪個帳戶設定隱私："
-
-#: src/dialogs.c:1785
+msgstr "帳號："
+
+#: src/dialogs.c:1797
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/dialogs.c:1789
+#: src/dialogs.c:1801
 msgid "Allow only users on my buddy list"
-msgstr "只允許好友清單內的使用者和我聯絡"
-
-#: src/dialogs.c:1793
+msgstr "只允許好友清單中的使用者"
+
+#: src/dialogs.c:1805
 msgid "Allow only the users below"
-msgstr "只允許下列的使用者和我聯絡"
-
-#: src/dialogs.c:1831
+msgstr "允許下列的使用者和我聯絡"
+
+#: src/dialogs.c:1843
 msgid "Deny all users"
 msgstr "拒絕所有使用者"
 
-#: src/dialogs.c:1835
+#: src/dialogs.c:1847
 msgid "Block the users below"
 msgstr "拒絕以下的使用者"
 
-#: src/dialogs.c:1950
+#: src/dialogs.c:1962
 msgid "Set Directory Info"
-msgstr "設定目錄資訊"
-
-#: src/dialogs.c:1958
+msgstr "設定使用者資訊"
+
+#: src/dialogs.c:1970
 msgid "Directory Info"
 msgstr "目錄資訊"
 
-#: src/dialogs.c:1968
+#: src/dialogs.c:1980
 #, c-format
 msgid "Setting Dir Info for %s:"
-msgstr ""
-
-#: src/dialogs.c:1980
+msgstr "設定 %s 的使用者資訊："
+
+#: src/dialogs.c:1992
 msgid "Allow Web Searches To Find Your Info"
-msgstr "允許透過 Web 來檢視您的個人資訊"
+msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
 #. Line 1
-#: src/dialogs.c:1983 src/dialogs.c:2627
+#: src/dialogs.c:1995 src/dialogs.c:2639
 msgid "First Name"
 msgstr "名"
 
-# XXX blanking this out
 #. Line 2
-#: src/dialogs.c:1994 src/dialogs.c:2637
+#: src/dialogs.c:2006 src/dialogs.c:2649
 msgid "Middle Name"
-msgstr "　"
+msgstr ""
 
 #. Line 3
-#: src/dialogs.c:2006 src/dialogs.c:2647
+#: src/dialogs.c:2018 src/dialogs.c:2659
 msgid "Last Name"
 msgstr "姓"
 
+# NOTE「小名」大概也可以，但「Maiden Name」通常係指未嫁時的「本姓」
 #. Line 4
-#: src/dialogs.c:2017 src/dialogs.c:2657
+#: src/dialogs.c:2029 src/dialogs.c:2669
 msgid "Maiden Name"
 msgstr "本姓"
 
 #. Line 6
-#: src/dialogs.c:2039 src/dialogs.c:2676
+#: src/dialogs.c:2051 src/dialogs.c:2688
 msgid "State"
 msgstr "省╱州"
 
-#: src/dialogs.c:2081 src/dialogs.c:2254 src/dialogs.c:3394 src/dialogs.c:4194
-#: src/dialogs.c:4944
+#: src/dialogs.c:2093 src/dialogs.c:2266 src/dialogs.c:3406 src/dialogs.c:4206
+#: src/dialogs.c:4956
 msgid "Save"
 msgstr "儲存"
 
-#: src/dialogs.c:2104
+#: src/dialogs.c:2116
 msgid "New passwords do not match."
-msgstr "兩個新密碼並不相符。"
-
-#: src/dialogs.c:2110
+msgstr "新密碼並不相符。"
+
+#: src/dialogs.c:2122
 msgid "Fill out all fields completely."
-msgstr "請填妥整份表格。"
-
-#: src/dialogs.c:2153
+msgstr "請完成所有表格的填寫。"
+
+#: src/dialogs.c:2165
 #, c-format
 msgid "Changing password for %s:"
-msgstr "給 %s 更改密碼:"
-
-#: src/dialogs.c:2161
+msgstr "修改 %s 的密碼："
+
+#: src/dialogs.c:2173
 msgid "Original Password"
 msgstr "舊密碼"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2184
 msgid "New Password"
 msgstr "新密碼"
 
-#: src/dialogs.c:2183
+#: src/dialogs.c:2195
 msgid "New Password (again)"
 msgstr "新密碼（再次確認）"
 
-#: src/dialogs.c:2231
+#: src/dialogs.c:2243
 #, c-format
 msgid "Changing info for %s:"
-msgstr "更改 %s 的自訂資料："
-
-#: src/dialogs.c:2312
+msgstr "修改 %s 的資訊："
+
+#: src/dialogs.c:2324
 msgid "Below are the results of your search: "
-msgstr "您所查詢的結果如下："
-
-#: src/dialogs.c:2420
+msgstr "以下是您所做查詢的結果："
+
+#: src/dialogs.c:2432
 msgid "Permit"
-msgstr "允許這個"
-
-#: src/dialogs.c:2452
+msgstr "許可"
+
+#: src/dialogs.c:2464
 msgid "Add Permit"
-msgstr "新增獲允許的使用者"
-
-#: src/dialogs.c:2454
+msgstr "加入許可"
+
+#: src/dialogs.c:2466
 msgid "Add Deny"
-msgstr "新增被拒的使用者"
-
-#: src/dialogs.c:2522
+msgstr "加入拒絕"
+
+#: src/dialogs.c:2534
 msgid "Log Conversation"
-msgstr "錄下交談內容"
-
-#: src/dialogs.c:2603 src/dialogs.c:2736
+msgstr "記錄交談"
+
+#: src/dialogs.c:2615 src/dialogs.c:2748
 msgid "Search for Buddy"
 msgstr "找尋好友"
 
-#: src/dialogs.c:2703
+#: src/dialogs.c:2715
 msgid "Find Buddy By Info"
-msgstr "以個人資料找尋好友"
-
-#: src/dialogs.c:2730
+msgstr "以資訊找尋好友"
+
+#: src/dialogs.c:2742
 msgid "Find Buddy By Email"
-msgstr "以電郵地址找尋好友"
-
-#: src/dialogs.c:2834
+msgstr "以電子郵件來找尋好友"
+
+#: src/dialogs.c:2846
 msgid "Insert Link"
-msgstr "加入鏈結"
-
-#: src/dialogs.c:2836
+msgstr "加入連結"
+
+#: src/dialogs.c:2848
 msgid "Insert"
-msgstr "加入鏈結"
-
-#: src/dialogs.c:2855
+msgstr "插入"
+
+#: src/dialogs.c:2867
 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:3020 src/dialogs.c:3037
+msgstr "請輸入您所要插入的 URL 及它的描述，描述是選擇性的，可不用輸入。\n"
+
+#: src/dialogs.c:3032 src/dialogs.c:3049
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:3068 src/dialogs.c:3085
+#: src/dialogs.c:3080 src/dialogs.c:3097
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:3169 src/dialogs.c:3192
+#: src/dialogs.c:3181 src/dialogs.c:3204
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:3258
-msgid "You cannot save an away message with a blank title"
-msgstr "您不能建立一個沒有原因的離開訊息"
-
-#: src/dialogs.c:3260
-msgid ""
-"Please give the message a title, or choose \"Use\" to use without saving."
-msgstr "請給這個離開訊息打個原因，不然您可以選擇「使用，但不儲存」。"
-
 #: src/dialogs.c:3270
+msgid "You cannot save an away message with a blank title"
+msgstr "您不能儲存一個沒有原因的離開訊息"
+
+#: src/dialogs.c:3272
+msgid ""
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr "請給予訊息一個標題；或按「使用」來使用，同時不儲存它。"
+
+#: src/dialogs.c:3282
 msgid "You cannot create an empty away message"
-msgstr "您不能建立一個空白的離開訊息"
-
-#: src/dialogs.c:3335 src/dialogs.c:3343
+msgstr "您無法建立一個空白的離開訊息"
+
+#: src/dialogs.c:3347 src/dialogs.c:3355
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:3353
+#: src/dialogs.c:3365
 msgid "Away title: "
 msgstr "離開原因："
 
-#: src/dialogs.c:3398
+#: src/dialogs.c:3410
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:3402
+#: src/dialogs.c:3414
 msgid "Use"
-msgstr "使用，但不儲存"
+msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3550
+#: src/dialogs.c:3562
 msgid "Smile!"
 msgstr "笑一個！"
 
-#: src/dialogs.c:3596 src/dialogs.c:3674
+#: src/dialogs.c:3608 src/dialogs.c:3686
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3625
+#: src/dialogs.c:3637
 msgid "Please enter an aliased name for this chat.\n"
-msgstr "請給這個聊天室輸入別名。\n"
-
-#: src/dialogs.c:3637 src/dialogs.c:3739
+msgstr "請為這個聊天室輸入一個別名。\n"
+
+#: src/dialogs.c:3649 src/dialogs.c:3751
 msgid "_Alias:"
 msgstr "別名(_A)："
 
+# XXX 下半句好像不很通順，或者只是我中文不好
 #. Setup the label containing the description.
-#: src/dialogs.c:3704
+#: src/dialogs.c:3716
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
-msgstr "請在給下列用戶輸入別名，或者在您的好友清單內修改這個好友的名稱。\n"
-
-#: src/dialogs.c:3793 src/dialogs.c:3800
+msgstr "請為下列的人員輸入別名，或者更改他在好友清單中所記錄的帳號。\n"
+
+#: src/dialogs.c:3805 src/dialogs.c:3812
 #, c-format
 msgid "Couldn't write to %s."
-msgstr "無法寫入 %s。"
-
-#: src/dialogs.c:3824
+msgstr "無法寫入到 %s。"
+
+#: src/dialogs.c:3836
 msgid "Save Log File"
 msgstr "儲存日誌檔"
 
-#: src/dialogs.c:3854
+#: src/dialogs.c:3866
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "無法刪除檔案 %s。"
 
-#: src/dialogs.c:3873
+#: src/dialogs.c:3885
 msgid "Clear Log"
 msgstr "清除日誌"
 
-#: src/dialogs.c:3882
+#: src/dialogs.c:3894
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎？"
 
-#: src/dialogs.c:3927
+#: src/dialogs.c:3939
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "無法開啟日誌檔 %s。"
 
-#: src/dialogs.c:4066
+#: src/dialogs.c:4078
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: src/dialogs.c:4068
+#: src/dialogs.c:4080
 msgid "System Log"
-msgstr "觀看系統日誌"
-
-#: src/dialogs.c:4089
+msgstr "系統日誌"
+
+#: src/dialogs.c:4101
 #, c-format
 msgid "Couldn't open log file %s"
-msgstr "無法開啟日誌檔 %s。"
-
-#: src/dialogs.c:4110
+msgstr "無法開啟日誌檔 %s"
+
+#: src/dialogs.c:4122
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4167
+#: src/dialogs.c:4179
 msgid "Log"
 msgstr "日誌"
 
-#: src/dialogs.c:4189
+#: src/dialogs.c:4201
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4247
+#: src/dialogs.c:4259
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/dialogs.c:4264
+#: src/dialogs.c:4276
 msgid "Please enter a new name for the selected group.\n"
-msgstr "請給您選擇了的群組輸入新名。\n"
-
-#: src/dialogs.c:4340 src/dialogs.c:4349
+msgstr "請為選取的群組輸入一個新的名稱。\n"
+
+#: src/dialogs.c:4352 src/dialogs.c:4361
 msgid "Rename Buddy"
 msgstr "修改好友名稱"
 
-#: src/dialogs.c:4356
+#: src/dialogs.c:4368
 msgid "New name:"
 msgstr "新名字："
 
 #: src/ft.c:135
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "%s 不是一個有效的檔案名。\n"
+msgstr "%s 不是一個有效的檔案名稱。\n"
 
 #: src/ft.c:149
 #, c-format
 msgid "%s was not found.\n"
-msgstr "找不到 %s。\n"
+msgstr "%s 找不到。\n"
 
 #: src/ft.c:741
 #, c-format
 msgid "File transfer to %s aborted.\n"
-msgstr "往 %s 的檔案傳輸已異常中止了。\n"
+msgstr "傳送檔案到 %s 被取消。\n"
 
 #: src/ft.c:743
 #, c-format
 msgid "File transfer from %s aborted.\n"
-msgstr "從 %s 的檔案傳輸已異常中止了。\n"
+msgstr "由 %s 傳送檔案被取消。\n"
 
 #: src/gaim-disclosure.c:253
 msgid "Expander Size"
@@ -4299,10 +4291,18 @@
 "    OPTIONS:\n"
 "       -h, --help [commmand]    Show help for command\n"
 msgstr ""
+"使用方式: %s command [OPTIONS] [URI]\n"
+"\n"
+"    指令:\n"
+"       uri                      Handle AIM: URI\n"
+"       quit                     關閉正在執行的 Gaim\n"
+"\n"
+"    選項:\n"
+"       -h, --help [commmand]    顯示指令的說明\n"
 
 #: src/gaim-remote.c:136 src/gaim-remote.c:152
 msgid "Gaim not running (on session 0)\n"
-msgstr ""
+msgstr "Gaim 並未執行（在工作階段 0）\n"
 
 #: src/gaim-remote.c:164
 msgid ""
@@ -4326,6 +4326,24 @@
 "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
+"\n"
+"AIM: URI 用法：\n"
+"送出一個即時訊息到一個帳號:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"在這個例子中，「Penguin」是我們想送出即時訊息的對象，同時\n"
+"「hello world」是所要送出的訊息。「+」是被用來當成字串中的空白。\n"
+"請注意上面由引號括起來的部份 - 如果你在 Shell 上執行這個，「&」\n"
+"必需被轉為脫逸字元，不然指令的執行就會到那裡為止。\n"
+"同時，下面的動作將會為帳號開啟一個沒有任何內容的交談視窗：\n"
+"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\n"
+"加入一個聊天室：\n"
+"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"加入「PenguinLounge」這個聊天室。\n"
+"\n"
+"加入一個好友到您的好友清單中：\n"
+"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"提示您加入「Penguin」到您的好友清單中。\n"
 
 #: src/gaim-remote.c:184
 msgid ""
@@ -4333,17 +4351,16 @@
 "Close running copy of Gaim\n"
 msgstr ""
 "\n"
-"關掉目前正在執行的 Gaim\n"
-
-# XXX probably should keep the english msg for "portability"
+"關閉正在執行的 Gaim\n"
+
 #. for people like myself, who are too lazy to add an away msg :)
 #: src/gaimrc.c:52
 msgid "sorry, i ran out for a while. bbl"
-msgstr "sorry, i ran out for a while. bbl / 對不起了，外出一會，很快回來"
+msgstr "不好意思，我離開一下下。"
 
 #: src/gaimrc.c:294 src/gaimrc.c:327 src/gaimrc.c:1453
 msgid "boring default"
-msgstr "懶改名的預設"
+msgstr "無聊（預設）"
 
 #: src/gaimrc.c:1551
 #, c-format
@@ -4358,23 +4375,23 @@
 msgid ""
 "Gaim was unable to save your preferences. Please verify that you have enough "
 "free space."
-msgstr "Gaim 無法儲存您的偏好設定。請查一查您是否在磁碟上已無空間。"
+msgstr "Gaim 無法寫入您的偏好設定。請確認您擁有足夠的磁碟空間。"
 
 #: src/gtkblist.c:398
 msgid "Add a _Buddy"
-msgstr "新增好友(_B)"
+msgstr "新增一個好友(_B)"
 
 #: src/gtkblist.c:399
 msgid "Add a C_hat"
-msgstr "新增聊天室(_H)"
+msgstr "新增一個聊天室(_H)"
 
 #: src/gtkblist.c:400
 msgid "_Delete Group"
-msgstr "移除群組(_D)"
+msgstr "刪除群組(_D)"
 
 #: src/gtkblist.c:401
 msgid "_Rename"
-msgstr "重新命名(_R)"
+msgstr "重命名(_R)"
 
 #: src/gtkblist.c:403
 msgid "_Join"
@@ -4411,97 +4428,97 @@
 
 #: src/gtkblist.c:750
 msgid "/Buddies/New _Instant Message..."
-msgstr "/好友(B)/送出即時訊息(_I)..."
+msgstr "/好友/新即時訊息(_I)"
 
 #: src/gtkblist.c:751
 msgid "/Buddies/Join a _Chat..."
-msgstr "/好友(B)/加入聊天室(_C)..."
+msgstr "/好友/加入聊天室(_C)"
 
 #: src/gtkblist.c:752
 msgid "/Buddies/Get _User Info..."
-msgstr "/好友(B)/取得使用者資訊(_U)..."
+msgstr "/好友/取得使用者資訊(_U)"
 
 #: src/gtkblist.c:754
 msgid "/Buddies/Show _Offline Buddies"
-msgstr "/好友(B)/顯示離線的好友(_O)"
+msgstr "/好友/顯示離線好友(_O)"
 
 #: src/gtkblist.c:755
 msgid "/Buddies/Show _Empty Groups"
-msgstr "/好友(B)/顯示沒有好友的群組(_E)"
+msgstr "/好友/顯示空白的群組(_E)"
 
 #: src/gtkblist.c:756
 msgid "/Buddies/_Add a Buddy..."
-msgstr "/好友(B)/加一個好友入好友清單(_A)..."
+msgstr "/好友/新增一個好友(_A)"
 
 #: src/gtkblist.c:757
 msgid "/Buddies/Add a C_hat..."
-msgstr "/好友(B)/加一個聊天室入好友清單(_H)..."
+msgstr "/好友/新增一個聊天室(_H)"
 
 #: src/gtkblist.c:758
 msgid "/Buddies/Add a _Group..."
-msgstr "/好友(B)/加一個群組入好友清單(_G)..."
+msgstr "/好友/新增一個群組(_G)"
 
 #: src/gtkblist.c:760
 msgid "/Buddies/_Signoff"
-msgstr "/好友(B)/登出(_S)"
+msgstr "/好友/登出(_S)"
 
 #: src/gtkblist.c:761
 msgid "/Buddies/_Quit"
-msgstr "/好友(B)/退出 Gaim (_Q)"
+msgstr "/好友/結束程式(_Q)"
 
 #. Tools
 #: src/gtkblist.c:764
 msgid "/_Tools"
-msgstr "/工具(_T)"
+msgstr "工具(_T)"
 
 #: src/gtkblist.c:765
 msgid "/Tools/_Away"
-msgstr "/工具(T)/離開(_A)"
+msgstr "/工具/離開(_A)"
 
 #: src/gtkblist.c:766
 msgid "/Tools/Buddy _Pounce"
-msgstr "/工具(T)/好友狀態捕捉(_P)"
+msgstr "/工具/好友狀態捕捉(_P)"
 
 #: src/gtkblist.c:767
 msgid "/Tools/P_rotocol Actions"
-msgstr "/工具(T)/通訊協定相關功能(_R)"
+msgstr "/工具/通訊協定相關設定(_R)"
 
 #: src/gtkblist.c:769
 msgid "/Tools/A_ccounts..."
-msgstr "/工具(T)/帳戶一覽(_C)"
+msgstr "/工具/帳號清單(_C)"
 
 #: src/gtkblist.c:770
 msgid "/Tools/_File Transfers..."
-msgstr "/工具(T)/文件傳輸(_F)"
+msgstr "/工具/檔案傳輸(_F)"
 
 #: src/gtkblist.c:771
 msgid "/Tools/Preferences..."
-msgstr "/工具(T)/偏好設定"
+msgstr "/工具/偏好設定"
 
 #: src/gtkblist.c:772
 msgid "/Tools/Pr_ivacy..."
-msgstr "/工具(T)/隱私設定(_I)"
+msgstr "/工具/隱私設定(_I)"
 
 #: src/gtkblist.c:774
 msgid "/Tools/View System _Log..."
-msgstr "/工具(T)/觀看系統日誌(_L)"
+msgstr "觀看系統日誌(_L)"
 
 #. Help
 #: src/gtkblist.c:777
 msgid "/_Help"
-msgstr "/說明(_H)"
+msgstr "說明(_H)"
 
 #: src/gtkblist.c:778
 msgid "/Help/Online _Help"
-msgstr "/說明(H)/線上求助(_H)"
+msgstr "線上說明(_H)"
 
 #: src/gtkblist.c:779
 msgid "/Help/_Debug Window..."
-msgstr "/說明(H)/除錯視窗(_D)"
+msgstr "/說明/除錯視窗(_D)"
 
 #: src/gtkblist.c:780
 msgid "/Help/_About..."
-msgstr "/說明(H)/關於 G_aim"
+msgstr "/說明/關於(_A)"
 
 #: src/gtkblist.c:814
 #, c-format
@@ -4510,7 +4527,7 @@
 "<b>Account:</b> %s"
 msgstr ""
 "\n"
-"<b>帳號：</b> %s"
+"<b>帳號：</b>%s"
 
 #: src/gtkblist.c:873
 #, c-format
@@ -4547,7 +4564,7 @@
 "<b>Idle:</b>"
 msgstr ""
 "\n"
-"<b>閒置了</b>"
+"<b>閒置：</b>"
 
 #: src/gtkblist.c:891
 msgid ""
@@ -4555,7 +4572,7 @@
 "<b>Warned:</b>"
 msgstr ""
 "\n"
-"<b>被警告：</b>"
+"<b>警告：<b>"
 
 #: src/gtkblist.c:893
 msgid ""
@@ -4563,7 +4580,7 @@
 "<b>Description:</b> Spooky"
 msgstr ""
 "\n"
-"<b>說明：</b>見鬼啦……"
+"<b>介紹：</b>幽靈"
 
 #: src/gtkblist.c:894
 msgid ""
@@ -4571,39 +4588,39 @@
 "<b>Status</b>: Awesome"
 msgstr ""
 "\n"
-"<b>狀態：</b>好極了"
+"<b>狀態：</b>很好"
 
 #: src/gtkblist.c:1186
 #, c-format
 msgid "Idle (%dh%02dm) "
-msgstr "閒置了%d小時%d分鐘"
+msgstr "閒置（%d 小時 %d 分）"
 
 #: src/gtkblist.c:1188
 #, c-format
 msgid "Idle (%dm) "
-msgstr "閒置了%d分鐘"
+msgstr "閒置（%d 分）"
 
 #: src/gtkblist.c:1192
 #, c-format
 msgid "Warned (%d%%) "
-msgstr "警告 (%d%%) "
-
-#: src/gtkblist.c:1329
-msgid "Do not sort automatically"
-msgstr "不要自動排序，我自己排"
-
-# XXX for Chinese, sorting order is radicals first, then stroke count (!)
+msgstr "警告 (%d%%)"
+
+#: src/gtkblist.c:1329 src/gtkblist.c:1333 src/gtkprefs.c:604
+#: src/gtkprefs.c:1110
+msgid "None"
+msgstr "無"
+
 #: src/gtkblist.c:1330
 msgid "Alphabetical"
-msgstr "以字母順序"
+msgstr "依照字母"
 
 #: src/gtkblist.c:1331
 msgid "By status"
-msgstr "以狀態"
+msgstr "依照狀態"
 
 #: src/gtkblist.c:1332
 msgid "By log size"
-msgstr "以交談記錄的大小"
+msgstr "依照日誌大小"
 
 #: src/gtkblist.c:1358 src/gtkprefs.c:1810
 msgid "Buddy List"
@@ -4619,18 +4636,18 @@
 
 #: src/gtkblist.c:1388
 msgid "/Tools/Protocol Actions"
-msgstr "/工具/協定相關功能"
+msgstr "/工具/通訊協定相關設定"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 #: src/gtkblist.c:1471
 msgid "/Buddies/Show Offline Buddies"
-msgstr "/好友/顯示離線的好友"
+msgstr "/好友/顯示離線好友"
 
 #: src/gtkblist.c:1473
 msgid "/Buddies/Show Empty Groups"
-msgstr "/好友/顯示沒有好友的群組"
+msgstr "/好友/顯示空的好的群組"
 
 #: src/gtkblist.c:1491 src/gtkconv.c:766
 msgid "IM"
@@ -4638,23 +4655,23 @@
 
 #: src/gtkblist.c:1497
 msgid "Send a message to the selected buddy"
-msgstr "傳送訊息給選定了的好友"
+msgstr "傳送訊息給被選取的好友"
 
 #: src/gtkblist.c:1506
 msgid "Get information on the selected buddy"
-msgstr "顯示被選定了的好友的資訊"
+msgstr "取得被選取好友的資訊"
 
 #: src/gtkblist.c:1514
 msgid "Join a chat room"
-msgstr "進入聊天室"
+msgstr "加入一個聊天室"
 
 #: src/gtkblist.c:1522
 msgid "Set an away message"
-msgstr "設定您的離開訊息"
+msgstr "設定一個離開訊息"
 
 #: src/gtkconv.c:219
 msgid "Gaim - Insert Image"
-msgstr "Gaim - 加入影像"
+msgstr "Gaim - 插入影像"
 
 #: src/gtkconv.c:774
 msgid "Un-Ignore"
@@ -4682,30 +4699,28 @@
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
-msgstr ""
-"您想邀請誰呢？請輸入對方的帳號；您想的話，也可輸入一則跟這個邀請一齊送出的短"
-"訊。"
+msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
 #: src/gtkconv.c:928
 msgid "_Buddy:"
-msgstr "好友(_B)"
+msgstr "好友(_B)："
 
 #: src/gtkconv.c:948
 msgid "_Message:"
-msgstr "訊息(_M)"
+msgstr "訊息(_M)："
 
 #: src/gtkconv.c:1977
 msgid "User is typing..."
-msgstr "對方正在打字..."
+msgstr "使用者正在輸入..."
 
 #: src/gtkconv.c:1985
 msgid "User has typed something and paused"
-msgstr "對方剛才在打字，不過現停了下來"
+msgstr "使用者輸入了些東西，不過目前暫停輸入"
 
 #. Build the Send As menu
 #: src/gtkconv.c:2092
 msgid "_Send As"
-msgstr "以何身份送出(_S)"
+msgstr "使用帳號(_S)"
 
 #. Conversation menu
 #: src/gtkconv.c:2542
@@ -4714,23 +4729,23 @@
 
 #: src/gtkconv.c:2543
 msgid "/Conversation/_Save As..."
-msgstr "/交談(C)/把交談內容存檔(_S)..."
+msgstr "/交談/另存新檔(_S)..."
 
 #: src/gtkconv.c:2545
 msgid "/Conversation/View _Log..."
-msgstr "/交談(C)/觀看日誌(_L)"
+msgstr "/交談/觀看歷史記錄(_L)"
 
 #: src/gtkconv.c:2547
 msgid "/Conversation/Insert _URL..."
-msgstr "/交談(C)/加入 _URL..."
+msgstr "/交談/插入 URL(_U)"
 
 #: src/gtkconv.c:2549
 msgid "/Conversation/Insert _Image..."
-msgstr "/交談(C)/加入圖像(_I)..."
+msgstr "/交談/插入影像(_I)"
 
 #: src/gtkconv.c:2552
 msgid "/Conversation/_Close"
-msgstr "/交談(C)/關閉此視窗(_C)"
+msgstr "/交談/關閉(_C)"
 
 #. Options
 #: src/gtkconv.c:2556
@@ -4739,31 +4754,31 @@
 
 #: src/gtkconv.c:2557
 msgid "/Options/Enable _Logging"
-msgstr "/選項(O)/記錄日誌(_L)"
+msgstr "/選項/開始記錄日誌(_L)"
 
 #: src/gtkconv.c:2558
 msgid "/Options/Enable _Sounds"
-msgstr "/選項(O)/使用音效(_S)"
+msgstr "/選項/開啟音效(_S)"
 
 #: src/gtkconv.c:2594
 msgid "/Conversation/View Log..."
-msgstr "/交談/觀看日誌"
+msgstr "/交談/觀看歷史記錄"
 
 #: src/gtkconv.c:2596
 msgid "/Conversation/Insert URL..."
-msgstr "/交談/加入 URL..."
+msgstr "/交談/插入 URL..."
 
 #: src/gtkconv.c:2598
 msgid "/Conversation/Insert Image..."
-msgstr "/交談/加入影像..."
+msgstr "/交談/插入影像..."
 
 #: src/gtkconv.c:2600
 msgid "/Options/Enable Logging"
-msgstr "/選項/記錄日誌"
+msgstr "/選項/開始記錄日誌"
 
 #: src/gtkconv.c:2602
 msgid "/Options/Enable Sounds"
-msgstr "/選項/使用音效"
+msgstr "/選項/開啟音效"
 
 #. From right to left...
 #. Send button
@@ -4774,11 +4789,11 @@
 
 #: src/gtkconv.c:2649 src/gtkconv.c:3793
 msgid "Add the user to your buddy list"
-msgstr "加這個使用者到好友清單內"
+msgstr "將使用者加入您的好友清單"
 
 #: src/gtkconv.c:2655 src/gtkconv.c:3784
 msgid "Remove the user from your buddy list"
-msgstr "由好友清單移除這個使用者"
+msgstr "將使用者自您的好友清單中移除"
 
 #. Warn button
 #: src/gtkconv.c:2662
@@ -4787,20 +4802,20 @@
 
 #: src/gtkconv.c:2666
 msgid "Warn the user"
-msgstr "警告這個使用者"
+msgstr "警告使用者"
 
 #: src/gtkconv.c:2673 src/gtkconv.c:3104
 msgid "Get the user's information"
-msgstr "取得有關這個使用者的資訊"
+msgstr "取得使用者資訊"
 
 #. Block button
 #: src/gtkconv.c:2676
 msgid "Block"
-msgstr "堵住他的嘴！"
+msgstr "封鎖"
 
 #: src/gtkconv.c:2680
 msgid "Block the user"
-msgstr "拒絕這個使用者"
+msgstr "封鎖使用者"
 
 #. Invite
 #: src/gtkconv.c:2738 src/gtkconv.c:5028
@@ -4809,7 +4824,7 @@
 
 #: src/gtkconv.c:2741
 msgid "Invite a user"
-msgstr "邀請一個使用者"
+msgstr "邀請使用者"
 
 #: src/gtkconv.c:2780
 msgid "Bold"
@@ -4821,43 +4836,43 @@
 
 #: src/gtkconv.c:2802
 msgid "Underline"
-msgstr "加底線"
+msgstr "底線"
 
 #: src/gtkconv.c:2818
 msgid "Larger font size"
-msgstr "大一點"
+msgstr "放大字體"
 
 #: src/gtkconv.c:2830
 msgid "Normal font size"
-msgstr "正常大小"
+msgstr "正常字體"
 
 #: src/gtkconv.c:2842
 msgid "Smaller font size"
-msgstr "小一點"
+msgstr "縮小字體"
 
 #: src/gtkconv.c:2859
 msgid "Font Face"
-msgstr "改字型"
+msgstr "字型"
 
 #: src/gtkconv.c:2871
 msgid "Foreground font color"
-msgstr "改文字顏色"
+msgstr "前景顏色"
 
 #: src/gtkconv.c:2883
 msgid "Background color"
-msgstr "改背景顏色"
+msgstr "背景顏色"
 
 #: src/gtkconv.c:2898
 msgid "Insert image"
-msgstr "加入即時訊息影像"
+msgstr "插入影像"
 
 #: src/gtkconv.c:2909
 msgid "Insert link"
-msgstr "加入鏈結"
+msgstr "插入連結"
 
 #: src/gtkconv.c:2920
 msgid "Insert smiley"
-msgstr "加入一個笑臉"
+msgstr "插入表情"
 
 #: src/gtkconv.c:2977
 msgid "Topic:"
@@ -4866,34 +4881,33 @@
 #. Setup the label telling how many people are in the room.
 #: src/gtkconv.c:3024
 msgid "0 people in room"
-msgstr "沒有人在這個聊天室"
+msgstr "沒有人在這個房間"
 
 #: src/gtkconv.c:3081
 msgid "IM the user"
-msgstr "向這個使用者發出即時訊息"
+msgstr "送出即時訊息給使用者"
 
 #: src/gtkconv.c:3093
 msgid "Ignore the user"
-msgstr "忽略這個使用者"
+msgstr "忽略使用者"
 
 #: src/gtkconv.c:3622
 msgid "Close conversation"
-msgstr "結束交談"
+msgstr "關閉交談"
 
 #: 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 個人"
+msgstr[0] "%d 個人在這個房間"
 
 #: src/gtkconv.c:4709
 msgid "Disable Animation"
-msgstr "停用動畫"
+msgstr "關閉動畫"
 
 #: src/gtkconv.c:4718
 msgid "Enable Animation"
-msgstr "使用動畫"
+msgstr "開啟動畫"
 
 #: src/gtkconv.c:4725
 msgid "Hide Icon"
@@ -4903,176 +4917,181 @@
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkft.c:104
+#: src/gtkft.c:105
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/gtkft.c:107
+#: src/gtkft.c:108
 msgid "Unknown."
-msgstr "不明。"
-
-#: src/gtkft.c:144
+msgstr "未知。"
+
+#: src/gtkft.c:145
 #, c-format
 msgid "%.2f KB/s"
-msgstr "每秒 %.2f KB"
-
-#: src/gtkft.c:219
+msgstr "%.2f KB/s"
+
+#: src/gtkft.c:220
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自：</b>"
 
-#: src/gtkft.c:222
+#: src/gtkft.c:223
 msgid "<b>Sending To:</b>"
-msgstr "<b>傳送至：</b>"
-
-#: src/gtkft.c:446
+msgstr "<b>傳送到：</b>"
+
+#: src/gtkft.c:447
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:453
+#: src/gtkft.c:454
 msgid "Filename"
-msgstr "檔案名"
-
-#: src/gtkft.c:460
+msgstr "檔名"
+
+#: src/gtkft.c:461
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:467
+#: src/gtkft.c:468
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:497
+#: src/gtkft.c:498
 msgid "Filename:"
-msgstr "檔案路徑："
-
-#: src/gtkft.c:498
+msgstr "檔名："
+
+#: src/gtkft.c:499
 msgid "Status:"
 msgstr "狀態："
 
-#: src/gtkft.c:499
+#: src/gtkft.c:500
 msgid "Speed:"
-msgstr "速率："
-
-#: src/gtkft.c:500
-msgid "Time Elapsed:"
-msgstr "已用時間："
+msgstr "速度："
 
 #: src/gtkft.c:501
+msgid "Time Elapsed:"
+msgstr "經過時間："
+
+#: src/gtkft.c:502
 msgid "Time Remaining:"
-msgstr "所餘時間："
-
-#: src/gtkft.c:567
+msgstr "尚需時間："
+
+#: src/gtkft.c:568
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:597
 msgid "_Keep the dialog open"
-msgstr "不關閉此視窗(_K)"
-
-#: src/gtkft.c:606
+msgstr "保持對話框開啟(_K)"
+
+#: src/gtkft.c:607
 msgid "_Clear finished transfers"
-msgstr "檔案傳輸完成後，自動清除有關該傳輸的紀錄（_C）"
+msgstr "清除已完成的傳輸(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:615
+#: src/gtkft.c:616
 msgid "Show download details"
-msgstr "顯示下載詳情"
-
-#: src/gtkft.c:616
+msgstr "顯示下載細節"
+
+#: src/gtkft.c:617
 msgid "Hide download details"
-msgstr "不顯示下載詳情"
+msgstr "隱藏下載細節"
 
 #. Pause button
-#: src/gtkft.c:658
+#: src/gtkft.c:659
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:668
+#: src/gtkft.c:669
 msgid "_Resume"
-msgstr "繼續(_R)"
-
-#: src/gtkft.c:1011
+msgstr "恢復(_R)"
+
+#: src/gtkft.c:1012
 msgid "That file does not exist."
-msgstr "沒有這個檔案。"
-
-#: src/gtkft.c:1018
+msgstr "檔案不存在。"
+
+#: src/gtkft.c:1019
 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:1056
+msgstr "無法傳送空的檔案。"
+
+#: src/gtkft.c:1032
+msgid "That file already exists."
+msgstr "那個檔案已經存在。"
+
+#: src/gtkft.c:1033
+msgid "Would you like to overwrite it?"
+msgstr "您要覆蓋它嗎？"
+
+#: src/gtkft.c:1057
 msgid "Gaim - Open..."
-msgstr "Gaim - 開啟舊檔..."
-
-#: src/gtkft.c:1105
+msgstr "Gaim - 開啟..."
+
+#: src/gtkft.c:1106
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s 想傳 %s (%s) 給您"
+msgstr "%s 想要送 %s (%s) 給您"
 
 #: src/gtkimhtml.c:342
 msgid "_Copy Link Location"
-msgstr "複製這個鏈結的網址(_C)"
+msgstr "複製連結位址(_C)"
 
 #: src/gtkimhtml.c:349
 msgid "_Open Link in Browser"
-msgstr "用瀏覽器開啟這個鏈結(_O)"
-
+msgstr "在瀏覽器中打開連結(_O)"
+
+# TODO report spelling mistake ("base" 應為 "based")
+# FIXME "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
+# ANS 我想是這樣沒錯
 #: src/gtkimhtml.c:1664
 msgid ""
 "Gaim was unable to guess the image type base on the file extension "
 "supplied.  Defaulting to PNG."
-msgstr ""
-"Gaim 猜不到這個檔案的檔型表示的究竟是那種格式的圖像，盲猜之下只有當它是 PNG "
-"了。"
+msgstr "Gaim 無法依照副檔名來判別影像格式，使用 PNG 為預設值。"
 
 #: src/gtkimhtml.c:1672
 #, c-format
 msgid "Error saving image: %s"
-msgstr "儲存影像時發生了錯誤：%s"
+msgstr "儲存影像錯誤：%s"
 
 #: src/gtkimhtml.c:1681
 msgid "Gaim - Save Image"
-msgstr "Gaim - 儲存圖像"
+msgstr "Gaim - 儲存影像"
 
 #: src/gtkimhtml.c:1703
 msgid "_Save Image..."
-msgstr "儲存圖示為(_S)..."
+msgstr "儲存影像(_S)..."
 
 #: src/gtkpounce.c:122
 msgid "Select a file"
-msgstr "請選擇一個檔案"
+msgstr "選擇檔案"
 
 #: src/gtkpounce.c:172
 msgid "Please enter a buddy to pounce."
-msgstr "請輸入一個好友來進行狀態捕捉。"
+msgstr "請輸入一個好友以進行捕捉。"
 
 #: src/gtkpounce.c:344
 #, c-format
 msgid "%s has started typing to you"
-msgstr "%s 開始打字給您了"
+msgstr "%s 開始輸入訊息給您"
 
 #: src/gtkpounce.c:345
 #, c-format
 msgid "%s has signed on"
-msgstr "%s 登入了"
+msgstr "%s 已經登入"
 
 #: src/gtkpounce.c:346
 #, c-format
 msgid "%s has returned from being idle"
-msgstr "%s 剛才閒置了，現在回來了"
+msgstr "%s 由閒置返回"
 
 #: src/gtkpounce.c:347
 #, c-format
 msgid "%s has returned from being away"
-msgstr "%s 剛才離開了，現在回來了"
+msgstr "%s 由離開返回"
 
 #: src/gtkpounce.c:348
 #, c-format
 msgid "%s has stopped typing to you"
-msgstr "%s 停了打字給您"
+msgstr "%s 停止輸入訊息給您"
 
 #: src/gtkpounce.c:349
 #, c-format
@@ -5082,16 +5101,16 @@
 #: src/gtkpounce.c:350
 #, c-format
 msgid "%s has become idle"
-msgstr "%s 閒置了"
+msgstr "%s 變更狀態為閒置"
 
 #: src/gtkpounce.c:351
 #, c-format
 msgid "%s has gone away."
-msgstr "%s 離開了"
+msgstr "%s 已經離開。"
 
 #: src/gtkpounce.c:352
 msgid "Unknown pounce event. Please report this!"
-msgstr "捕捉到了不明的好友狀態。請向開發者報告！"
+msgstr "未知的捕捉事件。請回報這個問題！"
 
 #. "New Buddy Pounce"
 #: src/gtkpounce.c:495 src/gtkpounce.c:885
@@ -5100,7 +5119,7 @@
 
 #: src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
-msgstr "修改好友狀態捕捉"
+msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
 #: src/gtkpounce.c:513
@@ -5109,7 +5128,7 @@
 
 #: src/gtkpounce.c:535
 msgid "_Buddy Name:"
-msgstr "好友帳號(_B)："
+msgstr "好友名稱(_B)："
 
 #. Create the "Pounce When" frame.
 #: src/gtkpounce.c:554
@@ -5126,24 +5145,24 @@
 
 #: src/gtkpounce.c:568
 msgid "Return from away"
-msgstr "離開後回來"
+msgstr "由離開返回"
 
 #: src/gtkpounce.c:572
 msgid "Return from idle"
-msgstr "閒置後回來"
+msgstr "由閒置返回"
 
 #: src/gtkpounce.c:574
 msgid "Buddy starts typing"
-msgstr "對方開始打字"
+msgstr "好友開始輸入"
 
 #: src/gtkpounce.c:576
 msgid "Buddy stops typing"
-msgstr "對方停止打字"
+msgstr "好友停止輸入"
 
 #. Create the "Pounce Action" frame.
 #: src/gtkpounce.c:605
 msgid "Pounce Action"
-msgstr "對應的動作"
+msgstr "捕捉動作"
 
 #: src/gtkpounce.c:612
 msgid "Open an IM window"
@@ -5151,7 +5170,7 @@
 
 #: src/gtkpounce.c:613
 msgid "Popup notification"
-msgstr "即現通知"
+msgstr "彈出通知"
 
 #: src/gtkpounce.c:614
 msgid "Send a message"
@@ -5175,7 +5194,7 @@
 
 #: src/gtkpounce.c:706
 msgid "_Save this pounce after activation"
-msgstr "儲存設定(_S)（這樣才能在每次事件發生時發生作用）"
+msgstr "儲存設定並啟動(_S)"
 
 #. "Remove Buddy Pounce"
 #: src/gtkpounce.c:892
@@ -5188,13 +5207,15 @@
 
 #: src/gtkprefs.c:208
 msgid "D_isplay remote nicknames if no alias is set"
-msgstr "沒有設定別名時，顯示對方的暱稱(_I)"
+msgstr "當別名沒有設定時，以對方所設定的暱稱顯示(_I)"
 
 #: 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/gtkprefs.c:422
 msgid "Icon"
@@ -5202,7 +5223,7 @@
 
 #: src/gtkprefs.c:456
 msgid "Style"
-msgstr "樣式"
+msgstr "風格"
 
 #: src/gtkprefs.c:457
 msgid "_Bold"
@@ -5214,23 +5235,23 @@
 
 #: src/gtkprefs.c:459
 msgid "_Underline"
-msgstr "加有底線(_U)"
+msgstr "底線(_U)"
 
 #: src/gtkprefs.c:460
 msgid "_Strikethrough"
-msgstr "加有刪除線(_S)"
+msgstr "刪除的文字(_S)"
 
 #: src/gtkprefs.c:462
 msgid "Face"
-msgstr "字型"
+msgstr "字體"
 
 #: src/gtkprefs.c:465
 msgid "Use custo_m face"
-msgstr "自訂字體(_M)"
+msgstr "使用者自定字體(_M)"
 
 #: src/gtkprefs.c:479
 msgid "Use custom si_ze"
-msgstr "自訂字型大小(_Z)"
+msgstr "使用者自定字體大小(_Z)"
 
 #: src/gtkprefs.c:487
 msgid "Color"
@@ -5250,15 +5271,15 @@
 
 #: src/gtkprefs.c:536
 msgid "Show graphical _smileys"
-msgstr "使用圖像方式顯示笑臉(_S)"
+msgstr "顯示表情(_S)"
 
 #: src/gtkprefs.c:537
 msgid "Show _timestamp on messages"
-msgstr "顯示訊息的時間戳(_T)"
+msgstr "顯示訊息時間(_T)"
 
 #: src/gtkprefs.c:538
 msgid "Show _URLs as links"
-msgstr "以超鏈結顯示 _URL"
+msgstr "顯示 URL 為超連結(_U)"
 
 #: src/gtkprefs.c:540
 msgid "_Highlight misspelled words"
@@ -5270,63 +5291,63 @@
 
 #: src/gtkprefs.c:544
 msgid "Ignore font _faces"
-msgstr "忽略字型(_F)"
+msgstr "忽略字體(_F)"
 
 #: src/gtkprefs.c:545
 msgid "Ignore font si_zes"
-msgstr "忽略字型大小(_Z)"
+msgstr "忽略字體大小(_Z)"
 
 #: src/gtkprefs.c:557
 msgid "Send Message"
-msgstr "訊息的送出"
+msgstr "送出訊息"
 
 #: src/gtkprefs.c:558
 msgid "_Enter sends message"
-msgstr "按下 _Enter 鍵隨即送出訊息"
+msgstr "按下 Enter 送出訊息(_E)"
 
 #: src/gtkprefs.c:559
 msgid "C_ontrol-Enter sends message"
-msgstr "按下 Ctrl-Enter 鍵隨即送出訊息(_O)"
+msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
 #: src/gtkprefs.c:561
 msgid "Window Closing"
-msgstr "視窗的關閉"
+msgstr "視窗關閉"
 
 #: src/gtkprefs.c:562
 msgid "E_scape closes window"
-msgstr "按下 E_scape 鍵隨即關閉視窗"
+msgstr "按下 Escape 關閉視窗(_S)"
 
 #: src/gtkprefs.c:563
 msgid "Control-_W closes window"
-msgstr "按下 Ctrl-_W 鍵隨即關閉視窗"
+msgstr "按下 Ctrl-W 關閉視窗(_W)"
 
 #: src/gtkprefs.c:565
 msgid "Insertions"
-msgstr "加入東西"
+msgstr "插入選項"
 
 #: src/gtkprefs.c:566
 msgid "Control-{B/I/U/S} inserts _HTML tags"
-msgstr "按下 Ctrl-{B/I/U/S} 加入 _HTML 標籤"
+msgstr "按下 Ctrl-{B/I/U/S} 插入 HTML 標籤(_H)"
 
 #: src/gtkprefs.c:567
 msgid "Control-(number) inserts _smileys"
-msgstr "按下 CTRL-數字鍵 來加入一個笑臉(_S)"
+msgstr "按下 CTRL-(數字鍵) 來插入表情(_S)"
 
 #: src/gtkprefs.c:585
 msgid "Buddy List Sorting"
-msgstr "好友清單的排序"
+msgstr "好友清單排序"
 
 #: src/gtkprefs.c:594
 msgid "Sorting:"
-msgstr "自動排序："
+msgstr "自動排序方式："
 
 #: src/gtkprefs.c:599
 msgid "Buddy List Toolbar"
-msgstr "好友清單選項"
+msgstr "好友清單工具列"
 
 #: src/gtkprefs.c:600 src/gtkprefs.c:679 src/gtkprefs.c:722
 msgid "Show _buttons as:"
-msgstr "按紐樣式(_B)："
+msgstr "顯示按鍵為(_B)："
 
 #: src/gtkprefs.c:601 src/gtkprefs.c:680 src/gtkprefs.c:723
 msgid "Pictures"
@@ -5338,15 +5359,11 @@
 
 #: src/gtkprefs.c:603 src/gtkprefs.c:682 src/gtkprefs.c:725
 msgid "Pictures and text"
-msgstr "圖文並茂"
-
-#: src/gtkprefs.c:604 src/gtkprefs.c:1110
-msgid "None"
-msgstr "無"
+msgstr "圖形與文字"
 
 #: src/gtkprefs.c:607
 msgid "_Raise window on events"
-msgstr "當有事件發生時，隨即將視窗提到最頂端(_R)"
+msgstr "當事件發生時，將視窗提到最上方(_R)"
 
 #: src/gtkprefs.c:609
 msgid "Group Display"
@@ -5363,7 +5380,7 @@
 
 #: src/gtkprefs.c:614
 msgid "Show buddy _icons"
-msgstr "顯示好友類別圖示(_I)"
+msgstr "顯示好友圖示(_I)"
 
 #: src/gtkprefs.c:615
 msgid "Show _warning levels"
@@ -5375,7 +5392,7 @@
 
 #: src/gtkprefs.c:625
 msgid "Dim i_dle buddies"
-msgstr "以灰色顯示閒置的好友(_D)"
+msgstr "把閒置的好友設為灰色(_D)"
 
 #: src/gtkprefs.c:643 src/gtkprefs.c:1811
 msgid "Conversations"
@@ -5387,11 +5404,11 @@
 
 #: src/gtkprefs.c:659
 msgid "Show IMs and chats in _same tabbed window."
-msgstr "將所有的即時訊息並聊天，統統顯示在同一個分頁視窗(_S)"
+msgstr "將所有的即時訊息和聊天顯示在同一個標籤視窗中。(_S)"
 
 #: src/gtkprefs.c:678 src/gtkprefs.c:721
 msgid "Window"
-msgstr "即時訊息視窗"
+msgstr "視窗"
 
 #: src/gtkprefs.c:685 src/gtkprefs.c:728
 msgid "New window _width:"
@@ -5403,15 +5420,15 @@
 
 #: src/gtkprefs.c:687 src/gtkprefs.c:730
 msgid "_Entry field height:"
-msgstr "輸入欄位的高度(_E)："
+msgstr "輸入欄高度(_E)："
 
 #: src/gtkprefs.c:688 src/gtkprefs.c:731
 msgid "_Raise windows on events"
-msgstr "當有事件發生時，隨即將視窗提到最頂端(_R)"
+msgstr "當事件發生時，將視窗提到最上方(_R)"
 
 #: src/gtkprefs.c:689
 msgid "Hide window on _send"
-msgstr "送出訊息後隨即隱藏視窗(_S)"
+msgstr "送出訊息後關閉視窗(_S)"
 
 #: src/gtkprefs.c:692
 msgid "Buddy Icons"
@@ -5423,7 +5440,7 @@
 
 #: src/gtkprefs.c:694
 msgid "Disable buddy icon a_nimation"
-msgstr "好友圖示不使用動畫(_N)"
+msgstr "關閉好友圖示動畫(_N)"
 
 #: src/gtkprefs.c:697
 msgid "Show _logins in window"
@@ -5431,27 +5448,27 @@
 
 #: src/gtkprefs.c:698
 msgid "Show a_liases in tabs/titles"
-msgstr "在分頁標籤或視窗標題顯示別名(_L)"
+msgstr "在標題和標籤上顯示別名(_L)"
 
 #: src/gtkprefs.c:700
 msgid "Typing Notification"
-msgstr "打字通知"
+msgstr "輸入通知"
 
 #: src/gtkprefs.c:701
 msgid "Notify buddies that you are _typing to them"
-msgstr "通知您的好友您正在打訊息給他(_T)"
+msgstr "通知您的好友您正在發訊息給他們(_T)"
 
 #: src/gtkprefs.c:733
 msgid "Tab Completion"
-msgstr ""
+msgstr "Tab Completion"
 
 #: src/gtkprefs.c:734
 msgid "_Tab-complete nicks"
-msgstr "使用 _Tab Completion 完成輸入好友的別名"
+msgstr "使用 Tab 鍵幫助輸入暱稱(_T)"
 
 #: src/gtkprefs.c:735
 msgid "_Old-style tab completion"
-msgstr "舊式 Tab C_ompletion"
+msgstr "舊式 Tab Completion (_O)"
 
 #: src/gtkprefs.c:738
 msgid "_Show people joining/leaving in window"
@@ -5459,15 +5476,15 @@
 
 #: src/gtkprefs.c:739
 msgid "Co_lorize screennames"
-msgstr "以彩色顯示好友暱稱(_L)"
+msgstr "將帳號以顏色區別(_L)"
 
 #: src/gtkprefs.c:756
 msgid "IM Tabs"
-msgstr "即時訊息分頁"
+msgstr "即時訊息標籤"
 
 #: src/gtkprefs.c:757 src/gtkprefs.c:767
 msgid "Tab _placement:"
-msgstr "分頁標籤位置(_P)："
+msgstr "標籤位置(_P)："
 
 #: src/gtkprefs.c:758 src/gtkprefs.c:768
 msgid "Top"
@@ -5489,35 +5506,37 @@
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
-msgstr "將所有的聊天內容顯示在同一個分頁視窗中(_I)"
+msgstr "將所有的即時訊息顯示在同一個有標籤的視窗中(_I)"
 
 #: src/gtkprefs.c:766
 msgid "Chat Tabs"
-msgstr "交談分頁"
+msgstr "聊天室標籤"
 
 #: src/gtkprefs.c:773
 msgid "Show all c_hats in one tabbed window"
-msgstr "將所有的聊天顯示在同一個分頁視窗(_H)"
+msgstr "將所有的聊天顯示在同一個有標籤的視窗中(_H)"
 
 #: src/gtkprefs.c:776
 msgid "Tab Options"
-msgstr "分頁選項"
+msgstr "標籤選項"
 
 #: src/gtkprefs.c:777
 msgid "Show _close button on tabs."
-msgstr "每個分頁的標籤旁都分別顯示關閉格(_C)"
+msgstr "在標籤上顯示關閉鍵(_C)。"
 
 #: src/gtkprefs.c:797
 msgid "Proxy Type"
-msgstr "代理伺服器類別"
+msgstr "代理伺服器型態"
 
 #: src/gtkprefs.c:798
 msgid "Proxy _type:"
-msgstr "代理伺服器類別(_T)："
-
+msgstr "代理伺服器型態(_T)："
+
+# NOTE 可以有代理伺服器但毋須用
+# NOTE 香港普遍用「毋須」，但講國語「毋須」會不通順，「不使用」較好
 #: src/gtkprefs.c:799
 msgid "No proxy"
-msgstr "毋須代理伺服器"
+msgstr "不使用代理伺服器"
 
 #: src/gtkprefs.c:804
 msgid "Proxy Server"
@@ -5529,11 +5548,11 @@
 
 #: src/gtkprefs.c:831
 msgid "Port"
-msgstr "連接埠號碼"
+msgstr "通訊埠"
 
 #: src/gtkprefs.c:847
 msgid "_User"
-msgstr "帳號(_U)"
+msgstr "使用者(_U)"
 
 #: src/gtkprefs.c:861
 msgid "Pa_ssword"
@@ -5542,7 +5561,7 @@
 #: src/gtkprefs.c:882
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr "您自訂的瀏覽器「%s」並不有效，故此，您將不可能使用超鏈結功能。"
+msgstr "所設定的使用者自定瀏覽器「%s」是無效的。超連結將不會被執行。"
 
 #: src/gtkprefs.c:903
 msgid "Konqueror"
@@ -5566,11 +5585,11 @@
 
 #: src/gtkprefs.c:915
 msgid "Manual"
-msgstr "自訂"
+msgstr "使用者自定"
 
 #: src/gtkprefs.c:939
 msgid "Browser Selection"
-msgstr "瀏覽器"
+msgstr "選擇瀏覽器"
 
 #: src/gtkprefs.c:943
 msgid "_Browser"
@@ -5578,7 +5597,7 @@
 
 #: src/gtkprefs.c:951
 msgid "_Manual: "
-msgstr "自訂(_M)"
+msgstr "使用者自定(_M)："
 
 #: src/gtkprefs.c:966
 msgid "Browser Options"
@@ -5586,23 +5605,23 @@
 
 #: src/gtkprefs.c:967
 msgid "Open new _window by default"
-msgstr "叫出瀏覽器時，每次都開一個新的視窗(_W)"
+msgstr "預設為彈出一個新的視窗(_W)"
 
 #: src/gtkprefs.c:981
 msgid "Message Logs"
-msgstr "日誌"
+msgstr "訊息日誌"
 
 #: src/gtkprefs.c:982
 msgid "_Log all instant messages"
-msgstr "記錄所有的即時訊息(_L)"
+msgstr "記錄所有即時訊息(_L)"
 
 #: src/gtkprefs.c:983
 msgid "Log all c_hats"
-msgstr "記錄所有的交談內容(_H)"
+msgstr "記錄所有聊天內容(_H)"
 
 #: src/gtkprefs.c:984
 msgid "Strip _HTML from logs"
-msgstr "以純文字檔記錄日誌（將日誌中的 _HTML 標籤去除）"
+msgstr "將交談記錄中的 HTML 標籤去除(_H)"
 
 #: src/gtkprefs.c:986
 msgid "System Logs"
@@ -5614,7 +5633,7 @@
 
 #: src/gtkprefs.c:989
 msgid "Log when buddies become _idle/un-idle"
-msgstr "記錄好友的閒置／回來(_I)"
+msgstr "記錄好友的閒置／取消閒置(_I)"
 
 #: src/gtkprefs.c:991
 msgid "Log when buddies go away/come _back"
@@ -5626,7 +5645,7 @@
 
 #: src/gtkprefs.c:994
 msgid "I_ndividual log file for each buddy's signons"
-msgstr "使用個別的檔案來記錄個別好友的登入(_N)"
+msgstr "使用個別的檔案來記錄每一個好友的登入(_N)"
 
 #: src/gtkprefs.c:1027
 msgid "Sound Options"
@@ -5634,31 +5653,31 @@
 
 #: src/gtkprefs.c:1028
 msgid "_No sounds when you log in"
-msgstr "登入期間時不要發出音效(_N)"
+msgstr "登入期間不啟動音效(_N)"
 
 #: src/gtkprefs.c:1029
 msgid "_Sounds while away"
-msgstr "離開狀態中也依舊發出音效(_S)"
+msgstr "離開時仍發出音效(_S)"
 
 #: src/gtkprefs.c:1032
 msgid "Sound Method"
-msgstr "發聲方法"
+msgstr "聲音模式"
 
 #: src/gtkprefs.c:1033
 msgid "_Method"
-msgstr "發聲方法(_M)"
+msgstr "模式(_M)"
 
 #: src/gtkprefs.c:1036
 msgid "Console beep"
-msgstr "一般嗶聲"
+msgstr "嗶一聲"
 
 #: src/gtkprefs.c:1038
 msgid "Automatic"
-msgstr "自動選擇"
+msgstr "自動"
 
 #: src/gtkprefs.c:1045
 msgid "Command"
-msgstr "自訂指令"
+msgstr "指令"
 
 #: src/gtkprefs.c:1054
 #, c-format
@@ -5666,8 +5685,8 @@
 "Sound c_ommand\n"
 "(%s for filename)"
 msgstr ""
-"音效指令(_O) \n"
-"（指令中的檔案名寫「%s」）"
+"音效指令\n"
+"(%s 代表輸入檔名)(_C)"
 
 #: src/gtkprefs.c:1093
 msgid "_Sending messages removes away status"
@@ -5683,7 +5702,7 @@
 
 #: src/gtkprefs.c:1099
 msgid "Seconds before _resending:"
-msgstr "每隔多少秒送一次自動回應(_R)："
+msgstr "送出回覆前的等待秒數(_R)："
 
 #: src/gtkprefs.c:1101
 msgid "_Don't send auto-response"
@@ -5691,28 +5710,27 @@
 
 #: src/gtkprefs.c:1102
 msgid "_Only send auto-response when idle"
-msgstr "只在閒置的時候才送出自動回應(_O)"
+msgstr "只在閒置的時候送出自動回應(_O)"
 
 #: src/gtkprefs.c:1103
 msgid "Do_n't send auto-response in active conversations"
-msgstr "千萬不要送出自動回應予進行中的交談(_N)"
+msgstr "不要在目前進行的交談視窗中送出自動回應(_N)"
 
 #: src/gtkprefs.c:1109
 msgid "Idle _time reporting:"
-msgstr "怎樣計算閒置時間(_T)"
+msgstr "閒置時間報告(_T)："
 
 #: src/gtkprefs.c:1111
 msgid "Gaim usage"
-msgstr "Gaim 閒置了多久"
+msgstr "Gaim 使用狀況"
 
 #: src/gtkprefs.c:1114
 msgid "X usage"
-msgstr "X 閒置了多久"
-
-# context: "Windows" here means "Microsoft Windows"
+msgstr "X Window 使用狀況"
+
 #: src/gtkprefs.c:1116
 msgid "Windows usage"
-msgstr "Windows 閒置了多久"
+msgstr "Windows 使用狀況"
 
 #: src/gtkprefs.c:1123
 msgid "Auto-away"
@@ -5720,15 +5738,15 @@
 
 #: src/gtkprefs.c:1124
 msgid "Set away _when idle"
-msgstr "閒置時自動設為離開狀態(_W)"
+msgstr "閒置時自動設為離開(_W)"
 
 #: src/gtkprefs.c:1125
 msgid "_Minutes before setting away:"
-msgstr "閒置多少分鐘才算離開(_M)："
+msgstr "閒置多久設為離開(_M)："
 
 #: src/gtkprefs.c:1131
 msgid "Away m_essage:"
-msgstr "離開訊息(_M)"
+msgstr "離開訊息(_M)："
 
 #: src/gtkprefs.c:1188
 #, c-format
@@ -5741,9 +5759,9 @@
 msgstr ""
 "<span size=\"larger\">%s %s</span>\n"
 "\n"
-"<span weight=\"bold\">著者：</span>\t%s\n"
-"<span weight=\"bold\">網頁：</span>\t\t%s\n"
-"<span weight=\"bold\">路徑：</span>\t%s"
+"<span weight=\"bold\">作者：</span>\t%s\n"
+"<span weight=\"bold\">網站：</span>\t\t%s\n"
+"<span weight=\"bold\">檔名：</span>\t%s"
 
 #: src/gtkprefs.c:1193
 #, c-format
@@ -5756,29 +5774,29 @@
 msgstr ""
 "<span size=\"larger\">%s %s</span>\n"
 "\n"
-"<span weight=\"bold\">著者：</span>  %s\n"
-"<span weight=\"bold\">網頁：</span>  %s\n"
-"<span weight=\"bold\">路徑：</span>  %s"
+"<span weight=\"bold\">作者：</span>  %s\n"
+"<span weight=\"bold\">網站：</span>  %s\n"
+"<span weight=\"bold\">檔名：</span>  %s"
 
 #: src/gtkprefs.c:1368
 msgid "Load"
-msgstr "載入使用"
+msgstr "載入"
 
 #: src/gtkprefs.c:1375
 msgid "Name"
-msgstr "插件名稱"
+msgstr "姓名"
 
 #: src/gtkprefs.c:1422
 msgid "Details"
-msgstr "其他資料"
+msgstr "詳細資料"
 
 #: src/gtkprefs.c:1521
 msgid "Sound Selection"
-msgstr "音效選擇"
+msgstr "選取音效"
 
 #: src/gtkprefs.c:1614
 msgid "Play"
-msgstr "播音"
+msgstr "播放"
 
 #: src/gtkprefs.c:1621
 msgid "Event"
@@ -5802,7 +5820,7 @@
 
 #: src/gtkprefs.c:1806
 msgid "Smiley Themes"
-msgstr "Smiley 主題"
+msgstr "表情主題"
 
 #: src/gtkprefs.c:1807
 msgid "Fonts"
@@ -5810,11 +5828,11 @@
 
 #: src/gtkprefs.c:1808
 msgid "Message Text"
-msgstr "訊息顯示"
+msgstr "訊息文字"
 
 #: src/gtkprefs.c:1809
 msgid "Shortcuts"
-msgstr "捷徑"
+msgstr "快捷鍵"
 
 #: src/gtkprefs.c:1812
 msgid "IMs"
@@ -5822,7 +5840,7 @@
 
 #: src/gtkprefs.c:1814
 msgid "Tabs"
-msgstr "分頁顯示"
+msgstr "標籤"
 
 #: src/gtkprefs.c:1815
 msgid "Proxy"
@@ -5847,7 +5865,7 @@
 
 #: src/gtkprefs.c:1823
 msgid "Away / Idle"
-msgstr "離開╱閒置"
+msgstr "離開 / 閒置"
 
 #: src/gtkprefs.c:1824
 msgid "Away Messages"
@@ -5855,7 +5873,7 @@
 
 #: src/gtkprefs.c:1827
 msgid "Plugins"
-msgstr "插件"
+msgstr "模組清單"
 
 #: src/gtkprefs.c:1877 src/main.c:376 src/win32/systray.c:355
 msgid "Preferences"
@@ -5863,50 +5881,49 @@
 
 #: src/gtkutils.c:284
 msgid "Can't save icon file to disk."
-msgstr "無法儲存圖示檔案。"
+msgstr "無法儲存圖示檔案磁碟上。"
 
 #: src/gtkutils.c:319
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 儲存圖示"
 
-#: src/html.c:326
+#: src/html.c:322
 msgid "g003: Error opening connection.\n"
-msgstr "g003: 連接開啟錯誤。\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"
+msgstr "無法開啟目錄 %s 來進行記錄"
 
 #: src/log.c:248 src/log.c:264
 #, c-format
 msgid "IM Sessions with %s\n"
-msgstr "跟 %s 的歷次即時通訊\n"
+msgstr "與 %s 的即時訊息工作階段\n"
 
 #: src/log.c:251 src/log.c:267
 #, c-format
 msgid "IM Sessions with %s"
-msgstr "跟 %s 的歷次即時通訊"
+msgstr "與 %s 的即時訊息工作階段"
 
 #: src/log.c:298
 #, c-format
 msgid "+++ %s (%s) signed on @ %s"
-msgstr "+++ %s (%s) 登入了 @ %s"
+msgstr "+++ %s (%s) 登入 @ %s"
 
 #: src/log.c:303
 #, c-format
 msgid "+++ %s (%s) signed off @ %s"
-msgstr "+++ %s (%s) 登出了 @ %s"
+msgstr "+++ %s (%s) 已經登出 @ %s"
 
 #: src/log.c:308
 #, c-format
 msgid "+++ %s (%s) changed away state @ %s"
-msgstr "+++ %s (%s) 改變了離開狀態 @ %s"
+msgstr "+++ %s (%s) 變更狀態為離開 @ %s"
 
 #: src/log.c:313
 #, c-format
@@ -5916,88 +5933,86 @@
 #: src/log.c:318
 #, c-format
 msgid "+++ %s (%s) became idle @ %s"
-msgstr "+++ %s (%s) 閒置了 @ %s"
+msgstr "+++ %s (%s) 變更狀態為閒置 @ %s"
 
 #: src/log.c:323
 #, c-format
 msgid "+++ %s (%s) returned from idle @ %s"
-msgstr "+++ %s (%s) 不閒置了 @ %s"
+msgstr "+++ %s (%s) 由閒置返回 @ %s"
 
 #: src/log.c:328
 #, c-format
 msgid "+++ Program exit @ %s"
-msgstr "+++ 退出了程式 @ %s"
+msgstr "+++ 程式結束 @ %s"
 
 #: src/log.c:335
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr ""
+msgstr "%s (%s) 報告 %s (%s) 登入 @ %s"
 
 #: src/log.c:340
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr "根據 %s (%s)，%s (%s) 已登出了 @ %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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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)-:
+msgstr "請您登入。"
+
 #: src/main.c:274
 msgid "<New User>"
-msgstr "【新用戶】"
-
-# XXX This is a window title. Do we really want to translate this?
+msgstr "<新使用者>"
+
 #: src/main.c:316
 msgid "Login"
 msgstr "登入"
@@ -6009,7 +6024,7 @@
 #. And now for the buttons
 #: src/main.c:366
 msgid "Accounts"
-msgstr "帳號一覽"
+msgstr "帳號清單"
 
 #: src/main.c:382 src/win32/systray.c:191
 msgid "Sign On"
@@ -6053,7 +6068,7 @@
 
 #: src/multi.c:887
 msgid "User Options"
-msgstr "帳戶選項"
+msgstr "使用者自定選項"
 
 #: src/multi.c:897
 msgid "New Mail Notifications"
@@ -6062,7 +6077,7 @@
 #: src/multi.c:958
 #, c-format
 msgid "%s Options"
-msgstr "%s選項"
+msgstr "%s 選項"
 
 #: src/multi.c:1002
 msgid "Register with server"
@@ -6074,23 +6089,24 @@
 
 #: src/multi.c:1049
 msgid "Proxy _Type"
-msgstr "代理伺服器類別(_T)"
+msgstr "代理伺服器型態(_T)"
 
 #: src/multi.c:1058
 msgid "Use Global Proxy Settings"
-msgstr "使用整體的代理伺服器設定"
-
+msgstr "使用全域的代理伺服器設定"
+
+# NOTE 理由同前，不用「毋須」，改為「不使用」
 #: src/multi.c:1067
 msgid "No Proxy"
-msgstr "毋須代理伺服器"
+msgstr "不使用代理伺服器"
 
 #: src/multi.c:1119
 msgid "_Host:"
-msgstr "主機位址(_H)"
+msgstr "主機位址(_H)："
 
 #: src/multi.c:1155
 msgid "_User:"
-msgstr "帳號(_U)："
+msgstr "使用者(_U)："
 
 #: src/multi.c:1171
 msgid "Pa_ssword:"
@@ -6098,27 +6114,28 @@
 
 #: src/multi.c:1245
 msgid "Modify Account"
-msgstr "修改帳戶"
+msgstr "修改帳號"
 
 #: src/multi.c:1264
 msgid "Show more options"
-msgstr "顯示多些代理伺服器選項"
+msgstr "顯示較多的選項"
 
 #: src/multi.c:1264
 msgid "Show fewer options"
-msgstr "顯示少些代理伺服器選項"
-
-# XXX verify context
+msgstr "顯示較少的選項"
+
 #: src/multi.c:1375
 msgid "_Login"
-msgstr "帳號(_L)"
+msgstr "登入(_L)"
 
 #: src/multi.c:1393
 #, c-format
 msgid ""
 "Please enter your password for %s.\n"
 "\n"
-msgstr "請輸入您 %s 的密碼。\n"
+msgstr ""
+"請輸入您在 %s 的密碼。\n"
+"\n"
 
 #: src/multi.c:1404
 msgid "_Password"
@@ -6134,124 +6151,124 @@
 "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 套件。"
+"您試著使用 TOC 協定來登入即時訊息的帳號。因為這個協定比 OSCAR 要來的差，所以"
+"現在預設只被編譯為一個模組。如果要用這個來登入帳號，請將您的帳號改為使用 "
+"OSCAR 或載入 TOC 模組。"
 
 #: src/multi.c:1465
 msgid "Protocol not found."
-msgstr "無此通訊協定。"
+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
+msgstr "您確定要刪除 %s？"
+
+#: src/multi.c:1549
 msgid "Delete"
 msgstr "刪除"
 
-#: src/multi.c:1576
+#: src/multi.c:1579
 msgid "Account Editor"
-msgstr "帳號管理"
-
-#: src/multi.c:1615
+msgstr "帳號清單"
+
+#: src/multi.c:1618
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/multi.c:1665
+#: src/multi.c:1668
 msgid "Done."
-msgstr "登入完了。"
-
-#: src/multi.c:1901
+msgstr "完成。"
+
+#: src/multi.c:1904
 msgid "Signon: "
-msgstr "登入中："
-
-#: src/multi.c:1960
+msgstr "登入："
+
+#: src/multi.c:1963
 msgid "Signon"
 msgstr "登入"
 
-#: src/multi.c:1972
+#: src/multi.c:1975
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/multi.c:2027
+#: src/multi.c:2030
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
-
-#: src/multi.c:2048
+"%s\n"
+"%s: %s"
+
+#: src/multi.c:2051
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 無法登入"
 
-#: src/multi.c:2049
+#: src/multi.c:2052
 msgid "Signon Error"
 msgstr "登入錯誤"
 
-#: src/multi.c:2060
+#: src/multi.c:2063
 msgid "Notice"
 msgstr "通知"
 
-#: src/multi.c:2072
+#: src/multi.c:2075
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s 已經登出"
 
-#: src/multi.c:2073
+#: src/multi.c:2076
 msgid "Connection Error"
-msgstr "連接錯誤"
-
-# XXX tentative "translation" (interpretation) per the context
-#: src/prpl.c:230
+msgstr "連線錯誤"
+
+#: src/prpl.c:113
 msgid "No actions available"
-msgstr "您目前用的通訊協定沒有提供任何相關的功能"
-
-#: src/prpl.c:380
+msgstr "不允許任何動作"
+
+#: src/prpl.c:263
 #, c-format
 msgid "%s has mail from %s: %s"
-msgstr "%s 收到了從 %s 來的郵件：%s"
-
-#: src/prpl.c:380
+msgstr "%s 收到來自 %s 的信件：%s"
+
+#: src/prpl.c:263
 msgid "No Subject"
-msgstr "無標題"
-
-#: src/prpl.c:382
+msgstr "沒有主題"
+
+#: src/prpl.c:265
 #, c-format
 msgid "%s has new mail."
-msgstr "%s 收到了新郵件。"
-
-#: src/prpl.c:385
+msgstr "%s 有新郵件。"
+
+#: src/prpl.c:268
 #, 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:401
+msgstr[0] "%s 有 %d 封新郵件。"
+
+#: src/prpl.c:284
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新郵件"
 
-#: src/prpl.c:420
+#: src/prpl.c:303
 msgid "Open Mail"
 msgstr "開啟郵件"
 
-#: src/prpl.c:622
+#: src/prpl.c:505
 #, 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:630
+msgstr "%s%s%s%s 加入了 %s 為他 / 她的好友 %s%s%s"
+
+#: src/prpl.c:513
 msgid ""
 "\n"
 "\n"
@@ -6259,31 +6276,31 @@
 msgstr ""
 "\n"
 "\n"
-"您想將他（她）加入到您的好友清單中嗎？"
-
-#: src/prpl.c:633
+"您想將他（她）加入到您的好友名單中嗎？"
+
+#: src/prpl.c:516
 msgid "Gaim - Information"
 msgstr "Gaim - 資訊"
 
-#: src/prpl.c:636
-msgid "Gaim - Confirm"
-msgstr "Gaim - 確認"
-
-#: src/prpl.c:678
+#: src/prpl.c:519
+msgid "Add buddy to your list?"
+msgstr "將使用者加入您的好友清單？"
+
+#: src/prpl.c:563
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "您的系統中並未存在任何可供您註冊一個新帳號的通訊協定。"
 
-#: src/prpl.c:715
+#: src/prpl.c:600
 msgid "Gaim - Registration"
 msgstr "Gaim - 註冊"
 
-#: src/prpl.c:728
+#: src/prpl.c:613
 msgid "Registration Information"
 msgstr "註冊資訊"
 
-#: src/prpl.c:742
+#: src/prpl.c:627
 msgid "Register"
 msgstr "註冊"
 
@@ -6303,12 +6320,12 @@
 #: src/server.c:1074 src/server.c:1081
 #, c-format
 msgid "%s logged in."
-msgstr "%s 登入了。"
+msgstr "%s 登入。"
 
 #: src/server.c:1097 src/server.c:1104
 #, c-format
 msgid "%s logged out."
-msgstr "%s 登出了。"
+msgstr "%s 登出。"
 
 #: src/server.c:1138
 #, c-format
@@ -6316,12 +6333,12 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 msgstr ""
-"%s 剛被 %s 警告過了。\n"
-"您目前的警告等級是 %d%%"
+"%s 剛剛被 %s 警告了。\n"
+"您的新警告等級為 %d%%"
 
 #: src/server.c:1141
 msgid "an anonymous person"
-msgstr "警告一個匿名者嗎？"
+msgstr "一個匿名者"
 
 #: src/server.c:1229
 #, c-format
@@ -6329,23 +6346,23 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 msgstr ""
+"使用者「%s」邀請 %s 到好友聊天室：「%s」\n"
+"%s"
 
 #: src/server.c:1233
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "使用者「%s」邀請 %s 到聊天室「%s」\n"
+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:1408
+msgid "Accept chat invitation?"
+msgstr "接受邀請嗎？"
+
+#: src/server.c:1411
 msgid "Gaim - Popup"
-msgstr "Gaim - 彈出資訊"
-
-#: src/server.c:1435
+msgstr "Gaim - 訊息"
+
+#: src/server.c:1438
 msgid "More Info"
 msgstr "更多資訊"
 
@@ -6363,11 +6380,11 @@
 
 #: src/sound.c:82
 msgid "Message received begins conversation"
-msgstr "收到訊息，開始交談"
+msgstr "訊息收到，開始進行交談"
 
 #: src/sound.c:83
 msgid "Message sent"
-msgstr "送出訊息"
+msgstr "訊息送出"
 
 #: src/sound.c:84
 msgid "Person enters chat"
@@ -6379,11 +6396,11 @@
 
 #: src/sound.c:86
 msgid "You talk in chat"
-msgstr "您在聊天室說話"
+msgstr "您已進入聊天室"
 
 #: src/sound.c:87
 msgid "Others talk in chat"
-msgstr "其他人在聊天室說話"
+msgstr "其他人進入聊天室"
 
 #: src/sound.c:90
 msgid "Someone says your name in chat"
@@ -6392,38 +6409,35 @@
 #: src/sound.c:184
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "所選檔案 (%s) 並不存在，故此無法播出音效。"
+msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。"
 
 #: src/sound.c:197
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
-msgstr "選了以自訂指令發聲，但沒有設定任何指令，故此無法播出音效。"
+msgstr "無法播放音效，因為選取了「指令」為播放模式，可是並沒有設定任何指令。"
 
 #: src/sound.c:206
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
-msgstr "但無法執行自訂指令，故此無法播出音效。"
+msgstr "無法播放音效，因為所設定的音效指令沒有辦法被執行：%s"
 
 #: src/util.c:109 src/util.c:114 src/util.c:119 src/util.c:122
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
-msgstr[1] "日"
 
 #: src/util.c:110 src/util.c:114 src/util.c:128 src/util.c:130
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
-msgstr[1] "小時"
 
 #: src/util.c:110 src/util.c:119 src/util.c:128 src/util.c:133
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "分鐘"
-msgstr[1] "分鐘"
+msgstr[0] "分"
 
 #. full help text
 #: src/util.c:710
@@ -6444,20 +6458,34 @@
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
 msgstr ""
+"Gaim %s\n"
+"使用方式: %s [選項]...\n"
+"\n"
+"  -a, --acct          顯示帳號清單\n"
+"  -w, --away[=MESG]   登入後顯示為離開 (選擇性參數 MESG 用來指定所要\n"
+"                      使用的離開訊息名稱)\n"
+"  -l, --login[=NAME]  自動登入 (選擇性參數 NAME 用來指定所要登入的帳\n"
+"                      號，同時以逗號做為分隔)\n"
+"  -n, --loginwin      不自動登入；顯示登入視窗\n"
+"  -u, --user=NAME     使用帳號 NAME\n"
+"  -f, --file=FILE     使用 FILE 為設定檔\n"
+"  -d, --debug         將除錯訊息輸出到標準輸出上\n"
+"  -v, --version       顯示版本訊息並離開\n"
+"  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
 #: src/util.c:725
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. 欲知詳情，請用「%s -h」指令。\n"
+msgstr "Gaim %s。執行 `%s -h' 以獲得更進一步的資訊。\n"
 
 #: src/util.c:1013
 msgid "Not connected to AIM"
-msgstr "未有連接到 AIM 伺服器"
+msgstr "沒有連到 AIM"
 
 #: src/util.c:1022 src/util.c:1061
 msgid "No screenname given."
-msgstr "沒有給予暱稱"
+msgstr "沒有給予帳號。"
 
 #: src/util.c:1098
 msgid "No roomname given."
@@ -6465,30 +6493,30 @@
 
 #: src/util.c:1117
 msgid "Invalid AIM URI"
-msgstr "無效的 AIM 網址"
+msgstr "無效的 AIM URI"
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
 #: src/win32/systray.c:36
 msgid "Gaim Instant Messenger"
-msgstr "Gaim 即時傳訊系統"
+msgstr "Gaim"
 
 #: src/win32/systray.c:37
 msgid "Gaim Instant Messenger - Signed off"
-msgstr "Gaim 即時傳訊系統──登出"
+msgstr "Gaim - 登出"
 
 #: src/win32/systray.c:38
 msgid "Gaim Instant Messenger - Away"
-msgstr "Gaim 即時傳訊系統──離開"
+msgstr "Gaim - 離開"
 
 #: src/win32/systray.c:134
 msgid "New"
-msgstr "新"
+msgstr "新訊息"
 
 #: src/win32/systray.c:167
 msgid "Set Away Message"
-msgstr "設定您的離開訊息"
+msgstr "設定離開訊息"
 
 #: src/win32/systray.c:176
 msgid "I'm Back"
@@ -6496,21 +6524,21 @@
 
 #: src/win32/systray.c:365
 msgid "Exit"
-msgstr "退出"
+msgstr "離開"
 
 #: src/plugin.c:231
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
-msgstr "插件 %s 未有提供有效的插件資訊"
+msgstr "這個模組 %s 並未傳回任何有效的模組訊息"
 
 #: src/plugin.c:236
 msgid "Gaim was unable to load your plugin."
-msgstr "Gaim 無法載入您的這個插件"
+msgstr "Gaim 無法讀入您所提供的模組。"
 
 #. * Custom away message.
 #: src/prpl.h:172
 msgid "Custom"
-msgstr "自訂"
+msgstr "使用者自定"
 
 #: src/gtkdebug.c:94
 msgid "Debug Window"
@@ -6522,26 +6550,72 @@
 
 #: src/gtkdebug.c:136
 msgid "Timestamps"
-msgstr "時間戳"
+msgstr "時間戳記"
 
 #~ msgid "Set Friendly Name:"
-#~ msgstr "設定易讀的暱稱："
+#~ msgstr "設定暱稱："
 
 #~ msgid "Set Home Phone Number:"
-#~ msgstr "您的住宅電話號碼："
+#~ msgstr "設定住家電話號碼："
 
 #~ msgid "Set Work Phone Number:"
-#~ msgstr "您的辦公電話號碼："
+#~ msgstr "設定工作電話號碼："
 
 #~ msgid "Set Mobile Phone Number:"
-#~ msgstr "您的手提電話號碼："
+#~ msgstr "設定行動電話號碼："
+
+#~ msgid "MSN Mobile Support"
+#~ msgstr "MSN 行動通訊支援"
+
+#~ msgid "Do you want to enable or disable MSN Mobile device support?"
+#~ msgstr "您要開啟或關閉 MSN 行動通訊支援嗎？"
+
+#~ msgid "Enable"
+#~ msgstr "開啟"
+
+#~ msgid "Disable"
+#~ msgstr "關閉"
 
 #~ msgid "Send message:"
 #~ msgstr "送出訊息："
 
+#~ msgid "Accept"
+#~ msgstr "接受"
+
+#~ msgid ""
+#~ "You are not currently signed on wit any protocols that have the ability "
+#~ "to chat."
+#~ msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
+
 #~ msgid "Gaim - Prompt"
 #~ msgstr "Gaim - 提示"
 
+#~ msgid "Gaim - Confirm"
+#~ msgstr "Gaim - 確認"
+
+#~ msgid "Buddy Chat Invite"
+#~ msgstr "邀請好友聊天"
+
+#~ msgid ""
+#~ "The maximum number of buddies allowed in your buddy list is %d, and you "
+#~ "have %d.  Until you are below the limit, some buddies will not show up as "
+#~ "online."
+#~ msgstr ""
+#~ "您所能擁有在好友清單中的好友數目為 %d 個，而您目前所擁有的為 %d 個。直到您"
+#~ "在清單中的好友數少於這個限制，不然有些在線上的好友將不會被顯示出來。"
+
+#~ msgid "Maximum buddy list length exceeded."
+#~ msgstr "超出好友清單的上限"
+
+#~ msgid "Could not add the buddy %s for an unknown reason."
+#~ msgstr "您因為不明原因而無法加入好友 %s。"
+
+#~ msgid "Conversation"
+#~ msgstr "交談"
+
+#~ msgid "/Buddies/_Show Offline Buddies"
+#~ msgstr "/好友/顯示離線的好友(_S)"
+
 #~ msgid "Gaim Chat"
 #~ msgstr "Gaim 聊天"
 
@@ -6557,50 +6631,200 @@
 #~ msgid "List of subscribed chats"
 #~ msgstr "訂閱的聊天室清單"
 
+#~ msgid "Chat List"
+#~ msgstr "聊天室清單"
+
+#~ msgid "Allows you to add chat rooms to your buddy list."
+#~ msgstr "允許您加入一個聊天室到您的好友清單中。"
+
+#~ msgid ""
+#~ "Allows you to add chat rooms to your buddy list. Click the configure "
+#~ "button to choose which rooms."
+#~ msgstr ""
+#~ "允許您將聊天室加入您的好友清單中。請點選設定鍵來決定加入哪一個聊天室。"
+
+#~ msgid "User unverified"
+#~ msgstr "使用者尚未認證"
+
+#~ msgid "Error transferring"
+#~ msgstr "傳輸錯誤"
+
+#~ msgid "Unable to connect to Notification Server"
+#~ msgstr "無法連線到通知伺服器。"
+
+#~ msgid "Gaim was unable to send an MSN message"
+#~ msgstr "Gaim 無法送出 MSN 訊息"
+
+#~ msgid ""
+#~ "Gaim encountered an error communicating with the MSN switchboard server.  "
+#~ "Please try again later."
+#~ msgstr "Gaim 與 MSN 交換伺服器溝通時發生錯誤。請待會兒再試一次。"
+
+#~ msgid "%dh%02dm"
+#~ msgstr "%d 小時 %02d 分"
+
+#~ msgid "%dm"
+#~ msgstr "%d 分"
+
+#~ msgid "About Gaim..."
+#~ msgstr "關於 Gaim"
+
+#~ msgid "Tray Icon"
+#~ msgstr "工作匣圖示"
+
+#~ msgid "Robert McQueen &lt;robot101@debian.org>"
+#~ msgstr "Robert McQueen &lt;robot101@debian.org>"
+
+#~ msgid "Iconify On Away"
+#~ msgstr "離開時最小化"
+
 #~ msgid "yes"
-#~ msgstr "確定"
+#~ msgstr "是"
 
 #~ msgid "no"
-#~ msgstr "取消"
+#~ msgstr "否"
 
 #~ msgid "Gadu-Gadu User"
 #~ msgstr "Gadu-Gadu 使用者"
 
+#~ msgid "Remove From Roster"
+#~ msgstr "自 Roster 移除"
+
+#~ msgid "Be right back"
+#~ msgstr "馬上回來"
+
+#~ msgid "Away from the computer"
+#~ msgstr "離開電腦"
+
+#~ msgid "On the phone"
+#~ msgstr "電話中"
+
+#~ msgid "Out to lunch"
+#~ msgstr "外出用餐"
+
+#~ msgid "Reset All Friendly Names"
+#~ msgstr "重設所有暱稱"
+
 #~ msgid "connection error (rend)\n"
-#~ msgstr "連接錯誤 (rend)\n"
+#~ msgstr "連線錯誤 (rend)\n"
 
 #~ msgid "major connection error\n"
-#~ msgstr "嚴重連接錯誤\n"
+#~ msgstr "重要連線錯誤\n"
+
+#~ msgid "Buddy canceled transfer"
+#~ msgstr "好友取消傳輸"
 
 #~ msgid "Password sent, waiting for response\n"
-#~ msgstr "已送出了密碼，等待回應中\n"
+#~ msgstr "送出密碼，等待回應\n"
 
 #~ msgid "internal connection error\n"
-#~ msgstr "內部連接錯誤\n"
+#~ msgstr "內部連線錯誤\n"
 
 #~ msgid "Signed off.\n"
-#~ msgstr "登出了。\n"
+#~ msgstr "登出。\n"
+
+#~ msgid "Transfer timed out"
+#~ msgstr "傳輸逾時"
+
+#~ msgid "Couldn't open listener to send file"
+#~ msgstr "無法開啟監聽器來傳送檔案"
+
+#~ msgid ""
+#~ "You have received an ICQ email\n"
+#~ "\n"
+#~ "1=%s\n"
+#~ "2=%s\n"
+#~ "3=%s\n"
+#~ "4=%s\n"
+#~ "5=%s\n"
+#~ "6=%s\n"
+#~ msgstr ""
+#~ "您收到一封 ICQ 的電子郵件\n"
+#~ "\n"
+#~ "1=%s\n"
+#~ "2=%s\n"
+#~ "3=%s\n"
+#~ "4=%s\n"
+#~ "5=%s\n"
+#~ "6=%s\n"
+
+#~ msgid "You missed %hu messages from %s because they were invalid."
+#~ msgstr "您遺失了 %hu 個由 %s 送來的訊息，因為它們是無效的。"
+
+#~ msgid "You missed %hu messages from %s because they were too large."
+#~ msgstr "您遺失了 %hu 個由 %s 送來的訊息，因為它們太大了。"
+
+#~ msgid ""
+#~ "You missed %hu messages from %s because the rate limit has been exceeded."
+#~ msgstr "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度太快。"
+
+#~ msgid "You missed %hu messages from %s because he/she was too evil."
+#~ msgstr "您遺失了 %hu 個由 %s 送來的訊息，因為他 / 她太邪惡了。"
+
+#~ msgid "You missed %hu messages from %s because you are too evil."
+#~ msgstr "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
+
+#~ msgid "You missed %hu messages from %s for an unknown reason."
+#~ msgstr "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
+
+#~ msgid "%s has declined to receive a file from %s.\n"
+#~ msgstr "%s 拒絕接收來自於 %s 的檔案。\n"
+
+#~ msgid "No reason was given."
+#~ msgstr "沒有給予原因。"
 
 #~ msgid "IM Image"
-#~ msgstr "即時訊息圖片"
+#~ msgstr "即時訊息影像"
 
 #~ msgid "Stocks"
 #~ msgstr "股票"
 
+#~ msgid ""
+#~ "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>Remote client does not "
+#~ "support sending status messages.</I><BR>"
+#~ msgstr ""
+#~ "<B>帳號：</B> %s<BR><B>狀態：</B> %s<BR><HR><BR><I>遠方的客戶端不支援狀態"
+#~ "訊息的傳送。</I><BR>"
+
+#~ msgid ""
+#~ "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><I>User has no status message."
+#~ "</I><BR>"
+#~ msgstr ""
+#~ "<B>帳號：</B> %s<BR><B>狀態：</B> %s<BR><HR>%s<I>使用者沒有狀態訊息。</"
+#~ "I><BR>"
+
 #~ msgid "Get Capabilities"
-#~ msgstr "取得相容性資訊"
+#~ msgstr "取得相容性"
 
 #~ msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 #~ msgstr "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
 
+#~ msgid ""
+#~ "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko."
+#~ "net</A>&gt;<BR>  Sean Egan (coder) &lt;<A HREF=\"mailto:"
+#~ "bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR><BR>"
+#~ msgstr ""
+#~ "  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><BR>"
+
+#~ msgid "<FONT SIZE=\"3\">Win32 Port:</FONT><BR>"
+#~ msgstr "<FONT SIZE=\"3\">Win32 移植：</FONT><BR>"
+
 #~ msgid "Gaim - Login"
 #~ msgstr "Gaim - 登入"
 
 #~ msgid "Un-Alias"
 #~ msgstr "取消別名"
 
+#~ msgid "[no message]"
+#~ msgstr "[沒有一個訊息]"
+
 #~ msgid "[Click to edit]"
-#~ msgstr "[ 編輯 ]"
+#~ msgstr "[點擊後編輯]"
+
+#~ msgid "Capabilities: %s\n"
+#~ msgstr "相容性：%s\n"
 
 #~ msgid ""
 #~ "Alias: %s               \n"
@@ -6612,13 +6836,16 @@
 #~ "%s%s%s%s%s%s"
 
 #~ msgid "Idle: "
-#~ msgstr "閒置時間："
+#~ msgstr "閒置："
+
+#~ msgid "Send Instant Message"
+#~ msgstr "送出即時訊息"
 
 #~ msgid "Start/join a Buddy Chat"
-#~ msgstr "開始或加入好友的聊天"
+#~ msgstr "開始 / 加入好友聊天室"
 
 #~ msgid "Activate Away Message"
-#~ msgstr "開啟離開訊息"
+#~ msgstr "使用離開訊息"
 
 #~ msgid "Gaim - Buddy List"
 #~ msgstr "Gaim - 好友清單"
@@ -6626,6 +6853,27 @@
 #~ msgid "File"
 #~ msgstr "檔案"
 
+#~ msgid "_Join A Chat"
+#~ msgstr "加入聊天室(_J)"
+
+#~ msgid "Import Buddy List"
+#~ msgstr "匯入好友清單"
+
+#~ msgid "Hide"
+#~ msgstr "隱藏"
+
+#~ msgid "Buddy Pounce"
+#~ msgstr "好友狀態捕捉"
+
+#~ msgid "_Accounts..."
+#~ msgstr "帳號清單(_A)"
+
+#~ msgid "_Preferences..."
+#~ msgstr "偏好設定(_P)"
+
+#~ msgid "Protocol Actions"
+#~ msgstr "通訊協定相關設定"
+
 #~ msgid "About Gaim"
 #~ msgstr "關於 Gaim"
 
@@ -6636,37 +6884,70 @@
 #~ msgstr "新增一個群組"
 
 #~ msgid "Remove selected Buddy/Group"
-#~ msgstr "移除被選取的好友或群組"
+#~ msgstr "移除被選取的好友 / 群組"
 
 #~ msgid "Edit Buddies"
-#~ msgstr "修改好友清單"
+#~ msgstr "編輯好友"
 
 #~ msgid "Gaim - Group Chats"
-#~ msgstr "Gaim - 群組聊天"
+#~ msgstr "Gaim - 群組聊天室"
+
+#~ msgid "_Save Conversation"
+#~ msgstr "儲存交談(_S)"
+
+#~ msgid "View _History"
+#~ msgstr "觀看歷史記錄(_H)"
+
+#~ msgid "Insert _URL"
+#~ msgstr "加入連結(_U)"
+
+#~ msgid "_Close"
+#~ msgstr "關閉(_C)"
+
+#~ msgid "Enable _Logging"
+#~ msgstr "開始記錄日誌(_L)"
+
+#~ msgid " [TYPING]"
+#~ msgstr "[輸入中]"
+
+#~ msgid " [TYPED]"
+#~ msgstr "[已輸入]"
 
 #~ msgid "Gaim - Conversations"
-#~ msgstr "Gaim - 交談"
+#~ msgstr "Gaim - 聊天"
 
 #~ msgid "Send message as: "
 #~ msgstr "送出訊息為："
 
+#~ msgid "Removing '%s' from buddy list.\n"
+#~ msgstr "由好友名單移除 '%s'。\n"
+
 #~ msgid "Gaim - Add Group"
 #~ msgstr "Gaim - 加入群組"
 
 #~ msgid "Gaim - Add Buddy"
 #~ msgstr "Gaim - 新增好友"
 
+#~ msgid "Gaim - Privacy"
+#~ msgstr "Gaim - 隱私設定"
+
 #~ msgid "Gaim - New Buddy Pounce"
 #~ msgstr "Gaim - 新增好友狀態捕捉"
 
 #~ msgid "Pounce on sign on"
-#~ msgstr "好友登入"
+#~ msgstr "當好友登入時"
 
 #~ msgid "Pounce when buddy is typing to you"
 #~ msgstr "當好友正在發訊息給你時"
 
+#~ msgid "_Save"
+#~ msgstr "儲存(_S)"
+
+#~ msgid "C_ancel"
+#~ msgstr "取消(_A)"
+
 #~ msgid "Gaim - Set Dir Info"
-#~ msgstr "Gaim - 設定目錄資訊"
+#~ msgstr "Gaim - 設定 Dir 資訊"
 
 #~ msgid "Gaim - Password Change"
 #~ msgstr "Gaim - 修改密碼"
@@ -6678,10 +6959,10 @@
 #~ msgstr "Gaim - 加入許可"
 
 #~ msgid "Gaim - Log Conversation"
-#~ msgstr "Gaim - 記錄交談"
+#~ msgstr "Gaim - 記錄聊天內容"
 
 #~ msgid "Gaim - Add URL"
-#~ msgstr "Gaim - 增加 URL"
+#~ msgstr "Gaim - 加入連結"
 
 #~ msgid "Import to:"
 #~ msgstr "匯入到："
@@ -6713,19 +6994,106 @@
 #~ msgid "Enter Password"
 #~ msgstr "輸入密碼"
 
+#~ msgid "Password for %s:"
+#~ msgstr "修改 %s 的密碼："
+
+#~ msgid "Gaim Account Signon"
+#~ msgstr "Gaim 帳號登入"
+
+#~ msgid "Show _debug window"
+#~ msgstr "顯示除錯視窗(_D)"
+
+#~ msgid "Buttons"
+#~ msgstr "按鍵"
+
+#~ msgid "_Hide IM/Info/Chat buttons"
+#~ msgstr "隱藏「即時訊息、資訊、聊天」按鍵(_H)"
+
+#~ msgid "Show _pictures on buttons"
+#~ msgstr "在按鍵上顯示圖示"
+
+#~ msgid "_Save window size/position"
+#~ msgstr "保存視窗的大小和位置(_S)"
+
+#~ msgid "Hide _groups with no online buddies"
+#~ msgstr "隱藏目前沒有線上好友的群組(_G)"
+
+#~ msgid "Buddy List Tabs"
+#~ msgstr "好友清單標籤"
+
+#~ msgid "Internal"
+#~ msgstr "內部"
+
+#~ msgid "_Ignore new conversations when away"
+#~ msgstr "在離開時，將忽略所有的新訊息(_I)"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\" color=\"red\">%s</span>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\" color=\"red\">%s</span>\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">URL:</span>\t%s\n"
+#~ "<span weight=\"bold\">File name:</span>\t%s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">作者：</span>\t%s\n"
+#~ "<span weight=\"bold\">URL：</span>\t%s\n"
+#~ "<span weight=\"bold\">檔名：</span>\t%s"
+
 #~ msgid "Gaim - Sound Configuration"
 #~ msgstr "Gaim - 音效設定"
 
 #~ msgid "IM Window"
 #~ msgstr "即時訊息視窗"
 
+#~ msgid "Chat Window"
+#~ msgstr "聊天室視窗"
+
+#~ msgid "Gaim - Debug Window"
+#~ msgstr "Gaim - 除錯視窗"
+
+#~ msgid "ICQ Protocol detected."
+#~ msgstr "偵測到 ICQ 通訊協定。"
+
+#~ msgid ""
+#~ "Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As "
+#~ "such, it was probably not compiled from the same version of the source as "
+#~ "this application was, and cannot be guaranteed to work.  It is "
+#~ "recommended that you use the AIM/ICQ protocol to connect to ICQ"
+#~ msgstr ""
+#~ "Gaim 載入了 ICQ 模組。這個模組目前已經被淘汰了。同時，它可能不是使用相同的"
+#~ "原始碼來進行編譯的動作，所以不能保證它能正常的工作。我們建議您改用 AIM/"
+#~ "ICQ 協定來連結 ICQ"
+
 #~ msgid ""
 #~ "%s has requested a DCC chat.  Would you like to establish the direct "
 #~ "connection?"
 #~ msgstr "%s 要求和您用 DCC 來聊天。您想接受他的邀請嗎？"
 
 #~ msgid "You missed %d messages from %s because they are too evil."
-#~ msgstr "您遺失了由 %2$s 送來的 %1$d 個訊息，因為這些訊息可能不懷好意。"
+#~ msgstr "您遺失了 %d 個由 %s 送來的訊息，因為它太邪惡了。"
 
 #~ msgid ""
 #~ "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -6739,13 +7107,13 @@
 #~ msgstr "網址"
 
 #~ msgid "Password: "
-#~ msgstr "密  碼："
+#~ msgstr "密碼："
 
 #~ msgid "About"
-#~ msgstr "關    於"
+#~ msgstr "關於"
 
 #~ msgid "Perl"
-#~ msgstr "Perl 插件"
+#~ msgstr "Perl"
 
 #~ msgid "Load Script"
 #~ msgstr "讀取命令稿"
@@ -6775,7 +7143,7 @@
 #~ msgstr "刪除的文字"
 
 #~ msgid "Strike"
-#~ msgstr "刪除"
+#~ msgstr "刪除線"
 
 #~ msgid "Decrease font size"
 #~ msgstr "縮小字體"
@@ -6787,7 +7155,7 @@
 #~ msgstr "正常"
 
 #~ msgid "Increase font size"
-#~ msgstr "增大字體"
+#~ msgstr "放大字體"
 
 #~ msgid "Big"
 #~ msgstr "大"
@@ -6802,10 +7170,19 @@
 #~ msgstr "背景顏色"
 
 #~ msgid "Link"
-#~ msgstr "鏈結"
+#~ msgstr "連結"
+
+#~ msgid "Smiley"
+#~ msgstr "笑一個！"
+
+#~ msgid "Sound"
+#~ msgstr "音效"
+
+#~ msgid "Gaim - Warn user?"
+#~ msgstr "Gaim - 警告使用者？"
 
 #~ msgid "Do you really want to warn %s?"
-#~ msgstr "你真的想警告 %s？"
+#~ msgstr "您確定要警告 %s？"
 
 #~ msgid "Gaim - Remove %s?"
 #~ msgstr "Gaim - 移除 %s？"
@@ -6823,22 +7200,22 @@
 #~ msgstr "連絡"
 
 #~ msgid "Block List"
-#~ msgstr "拒絕清單"
+#~ msgstr "封鎖"
 
 #~ msgid "Select Autos"
-#~ msgstr "選取自動登入"
+#~ msgstr "選擇自動登入"
 
 #~ msgid "Select None"
-#~ msgstr "取消選取"
+#~ msgstr "取消選擇"
 
 #~ msgid "Gaim - Plugin List"
-#~ msgstr "Gaim - 插件列表"
+#~ msgstr "Gaim - 模組清單"
 
 #~ msgid "Gaim - Plugins"
-#~ msgstr "Gaim - 插件"
+#~ msgstr "Gaim - 模組"
 
 #~ msgid "Loaded Plugins"
-#~ msgstr "已載入的插件"
+#~ msgstr "讀入模組"
 
 #~ msgid "Load a plugin from a file"
 #~ msgstr "由檔案讀取一個插件"
@@ -6850,20 +7227,29 @@
 #~ msgstr "設定被選取的插件"
 
 #~ msgid "Reload"
-#~ msgstr "重新讀取"
+#~ msgstr "重新載入"
 
 #~ msgid "Reload the selected plugin"
-#~ msgstr "重新讀取被選取的插件"
+#~ msgstr "重新載入被選取的模組"
 
 #~ msgid "Unload"
-#~ msgstr "移除"
+#~ msgstr "卸載"
 
 #~ msgid "Unload the selected plugin"
-#~ msgstr "移除被選取的插件"
+#~ msgstr "卸載被選取的模組"
 
 #~ msgid "Close this window"
 #~ msgstr "關閉這個視窗"
 
+#~ msgid "Use _borderless buttons"
+#~ msgstr "使用沒有邊框的按鈕(_B)"
+
+#~ msgid "Ignore Ti_K Automated Messages"
+#~ msgstr "忽略 Tik 自動訊息(_K)"
+
+#~ msgid "_Raise Window on Events"
+#~ msgstr "當事件發生時，將視窗提到最上方(_R)"
+
 #~ msgid "Gaim debug output window"
 #~ msgstr "Gaim 除錯視窗"
 
@@ -6877,34 +7263,37 @@
 #~ msgstr "無法送出 HTTP 要求"
 
 #~ msgid "Buddies List import from Server failed (%s)"
-#~ msgstr "自伺服器上匯入好友清單失敗（%s）"
+#~ msgstr "自伺服器上匯入好友名單失敗（%s）"
 
 #~ msgid "Buddies List export to Server failed (%s)"
-#~ msgstr "匯出好友清單到伺服器上失敗（%s）"
+#~ msgstr "匯出好友名單到伺服器上失敗（%s）"
 
 #~ msgid "Deletion of Buddies List from Server failed (%s)"
-#~ msgstr "刪除伺服器上的好友清單失敗（%s）"
+#~ msgstr "將好友清單伺服器上刪除失敗 (%s)"
 
 #~ msgid "Connect to search service failed (%s)"
-#~ msgstr "連接到搜尋服務失敗（%s）"
+#~ msgstr "連結到搜尋伺服器失敗(%s)"
+
+#~ msgid "Changing Password failed (%s)"
+#~ msgstr "修改密碼失敗(%s)"
 
 #~ msgid "Password Change Error!"
 #~ msgstr "密碼修改錯誤！"
 
 #~ msgid "Password Change"
-#~ msgstr "修改密碼"
+#~ msgstr "密碼修改"
 
 #~ msgid "Invalid Jabber I.D."
-#~ msgstr "無效的 Jabber 名稱"
+#~ msgstr "無效的 Jabber 使用者帳號"
 
 #~ msgid "MSN Error"
 #~ msgstr "MSN 錯誤"
 
 #~ msgid "Chat Error!"
-#~ msgstr "聊天錯誤！"
+#~ msgstr "聊天室錯誤！"
 
 #~ msgid "Gaim - Chat"
-#~ msgstr "Gaim - 聊天"
+#~ msgstr "Gaim - 聊天室"
 
 #~ msgid "Gaim - Oscar SNAC Error"
 #~ msgstr "Gaim - Oscar SNAC 錯誤"
@@ -6915,14 +7304,17 @@
 #~ msgid "Gaim - Warning"
 #~ msgstr "Gaim - 警告"
 
+#~ msgid "TOC Resume"
+#~ msgstr "TOC 繼續"
+
 #~ msgid "Chat Error"
-#~ msgstr "聊天發生錯誤"
+#~ msgstr "聊天室錯誤"
 
 #~ msgid "Could not write file header!"
 #~ msgstr "無法寫入檔頭！"
 
 #~ msgid "Attempting to sign on...."
-#~ msgstr "正在嘗試登入…"
+#~ msgstr "正在嘗試登入..."
 
 #~ msgid "Offline. Click to bring up login box."
 #~ msgstr "斷線。點選以帶出登入視窗。"
@@ -6936,11 +7328,14 @@
 #~ msgid "Can't create Gaim applet!"
 #~ msgstr "無法建立 Gaim 小程式！"
 
+#~ msgid "About..."
+#~ msgstr "關於"
+
 #~ msgid "Message Error"
 #~ msgstr "訊息錯誤"
 
 #~ msgid "Unable to send message: Unknown reason"
-#~ msgstr "無法送出訊息：未知原因"
+#~ msgstr "無法送出訊息：未知的原因。"
 
 #~ msgid "Buddy Pounce Error"
 #~ msgstr "好友狀態捕捉錯誤"
@@ -6949,7 +7344,7 @@
 #~ msgstr "Gaim - 修改密碼錯誤"
 
 #~ msgid "Unable to remove file %s - %s"
-#~ msgstr "無法刪除檔案 %s - %s"
+#~ msgstr "無法移除檔案 %s - %s"
 
 #~ msgid "Preferences Error"
 #~ msgstr "偏好設定錯誤"
@@ -6960,14 +7355,23 @@
 #~ msgid "Perl Scripts"
 #~ msgstr "Perl 命令稿"
 
+#~ msgid "Select"
+#~ msgstr "選取"
+
 #~ msgid "Automatically show buddy list on sign on"
-#~ msgstr "在登入時自動顯示好友清單"
+#~ msgstr "在登入時自動顯示好友名單"
+
+#~ msgid "Edit"
+#~ msgstr "編輯"
 
 #~ msgid "Protocol Error"
 #~ msgstr "通訊協定錯誤"
 
 #~ msgid "Disconnect"
-#~ msgstr "中止連接"
+#~ msgstr "停止連線"
+
+#~ msgid "Warned"
+#~ msgstr "警告"
 
 #~ msgid "All options take effect immediately unless otherwise noted."
 #~ msgstr "所有的選項將在設定後馬上生效。"
@@ -6997,8 +7401,11 @@
 #~ msgid "HTTP"
 #~ msgstr "HTTP"
 
+#~ msgid "Conversation Options"
+#~ msgstr "交談選項"
+
 #~ msgid "Keyboard Options"
-#~ msgstr "鍵盤選單"
+#~ msgstr "鍵盤選項"
 
 #~ msgid "F2 toggles timestamp display"
 #~ msgstr "按 F2 顯示時間戳記"
@@ -7013,13 +7420,13 @@
 #~ msgstr "視窗大小"
 
 #~ msgid "Tab Placement"
-#~ msgstr "分頁位置"
+#~ msgstr "標籤位置"
 
 #~ msgid "Show conversations in the same tabbed window"
 #~ msgstr "將所有的交談顯示在同一個有標籤的視窗中"
 
 #~ msgid "Italic Text"
-#~ msgstr "斜体文字"
+#~ msgstr "斜體文字"
 
 #~ msgid "Font Size for Text"
 #~ msgstr "文字的字體大小"
@@ -7034,4 +7441,10 @@
 #~ msgstr "自動離開，經過"
 
 #~ msgid "Make Away"
-#~ msgstr "設定為離開狀態"
+#~ msgstr "離開"
+
+#~ msgid "Autoreconnect"
+#~ msgstr "自動重新連線"
+
+#~ msgid "<b>Status:</b> %s%s%s"
+#~ msgstr "<b>狀態：</b> %s%s%s"
\ No newline at end of file