Update a bunch of translations.

Fixes #10842, #10841, #10840, #10838, #10836, #10834, #10806, #10679.

1 files changed, 389 insertions, 376 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index d965247044..446f60d064 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,4 +1,4 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.20 2009/08/04 05:20:24 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.22 2009/11/27 10:02:35 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
@@ -8,7 +8,7 @@
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.600 2009/09/03 13:49:05 acli Exp $
+# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -24,6 +24,14 @@
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
 # (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
+# Jabber術語 (20091127) presence、subscription 等參閱
+# - http://www.2cm.com.tw/coverstory_content.asp?sn=0701010062
+# - http://nctur.lib.nctu.edu.tw/handle/987654321/3479
+# - http://voiplab.niu.edu.tw/Course98.html (尤其是 http://voiplab.niu.edu.tw/ppt/SIP/05.IMPS.pdf)
+# - presence service 如出現譯「現狀資訊服務」
+# - subscribe to presence 譯「訂閱XXX的狀態資訊」
+# - identifier 譯「辨識碼」
+# - message body 譯「訊息內容」
 # SILC問題：似乎臺灣和香港的「密碼學」術語相差甚遠，很頭痛 (^^;)
 # - Key 暫譯「密鑰」，原因：「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
@@ -52,9 +60,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.2\n"
+"Project-Id-Version: Pidgin 2.6.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
 "PO-Revision-Date: 2009-09-03 06:04-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -693,9 +701,8 @@ msgstr "開始記錄日誌"
 msgid "Enable Sounds"
 msgstr "啟動音效"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "無法連結"
+msgstr "連線成功。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
@@ -707,9 +714,8 @@ msgid_plural "List of %d users:\n"
 msgstr[0] "使用者列表（%d個使用者）：\n"
 msgstr[1] "使用者列表（%d個使用者）：\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "支援的除錯選項有：version"
+msgstr "支援的除錯選項有：plugins version"
 
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
@@ -1600,10 +1606,10 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "上列網址的 TinyURL：%s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "TinyURL 正在取得縮短的網址中，請稍候..."
 
 # XXX 暫譯 - 20090729 acli
 msgid "Only create TinyURL for URLs of this length or greater"
@@ -1627,6 +1633,7 @@ msgstr "當接收到含有網址的訊息時，使用 TinyURL 縮短網址，好
 msgid "Online"
 msgstr "上線"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1745,7 +1752,7 @@ msgstr "這張證書是自簽的，無法自動進行核實。"
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
-msgstr ""
+msgstr "無法信賴這張證書，因為目前沒有可信賴的證書可以驗證這張證書。"
 
 msgid "The certificate is not valid yet."
 msgstr "這張證書尚未生效。"
@@ -1981,9 +1988,9 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "解析程序已結束，但未有回覆我方發出的請求"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "解析 %s 途中發生了錯誤：%d"
+msgstr "將 %s 轉換成 punycode 途中發生了錯誤：%d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2286,17 +2293,14 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "發生了一個嚴重的 Farsight2 錯誤。"
 
-#, fuzzy
 msgid "Conference error"
-msgstr "會議室錯誤。"
+msgstr "會議室錯誤"
 
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "你的麥克風出現錯誤。"
+msgstr "你的麥克風出現錯誤"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "你的 webcam 出現錯誤。"
+msgstr "你的 webcam 出現錯誤"
 
 # FIXME 譯文有待改進 - acli 20090902
 #, c-format
@@ -2835,12 +2839,15 @@ msgstr "一次性密碼支援"
 msgid "Enforce that passwords are used only once."
 msgstr "強制密碼只用一次"
 
+# XXX 譯文不太通順 - acli 20091128
 #. *  description
 msgid ""
 "Allows you to enforce on a per-account basis that passwords not being saved "
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"針對個別不記住密碼的帳號，讓你強制成功登入後不會再使用同一個密碼。注意：使用"
+"這個功能，帳號必須停用「記住密碼」選項"
 
 #. *< type
 #. *< ui_requirement
@@ -3256,10 +3263,12 @@ msgstr "選取一個聊天室給好友；%s"
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "上線"
 
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -4060,13 +4069,13 @@ msgid ""
 msgstr "%s 將不再可以檢視你的狀態更新。你要繼續這個動作嗎？"
 
 msgid "Cancel Presence Notification"
-msgstr "取消上線狀態通知"
+msgstr "取消發出狀態資訊通知（移除自己）"
 
 msgid "Un-hide From"
-msgstr "現身給"
+msgstr "現身給此好友"
 
 msgid "Temporarily Hide From"
-msgstr "暫時隱身於"
+msgstr "暫時隱身於此好友"
 
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
@@ -4076,7 +4085,7 @@ msgstr "要求或重新要求認證"
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
-msgstr "從好友名單中移除"
+msgstr "取消訂閱狀態資訊（移除好友）"
 
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
@@ -4087,12 +4096,14 @@ msgstr "登入"
 msgid "Log Out"
 msgstr "登出"
 
+#. 2
 msgid "Chatty"
 msgstr "想聊天"
 
 msgid "Extended Away"
 msgstr "長時間離開"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -4354,33 +4365,32 @@ msgstr "正在聽的音樂"
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
 msgid "Both"
-msgstr "已互相認證"
+msgstr "訂閱及發出狀態資訊通知（已互相認證）"
 
 #  NOTE Jabber 術語，見「Both」條
 msgid "From (To pending)"
-msgstr "已認證對方（但仍等待對方認證你）"
+msgstr "訂閱對方狀態資訊，未認證發出狀態資訊通知"
 
-# FIXME 原文一詞兩義，根本無法翻譯
-#  NOTE gntnotify 字義為「發信人」
 #  NOTE Jabber 術語字義見「Both」條
 msgid "From"
-msgstr "已認證對方"
+msgstr "訂閱對方狀態資訊"
 
 #  NOTE Jabber 術語，見「Both」條
 msgid "To"
-msgstr "已獲對方認證"
+msgstr "發出狀態資訊通知"
 
 #  NOTE Jabber 術語，見「Both」條
 msgid "None (To pending)"
-msgstr "無（但正等待對方認證你）"
+msgstr "無，等待認證發出狀態資訊通知"
 
+#. 0
 msgid "None"
 msgstr "無"
 
 #  NOTE Jabber 術語，見「Both」條
 #. subscription type
 msgid "Subscription"
-msgstr "認證狀態"
+msgstr "狀態資訊訂閱"
 
 # XXX 要覆查 - acli 20070914
 msgid "Mood Text"
@@ -4520,7 +4530,7 @@ msgstr "不提供該項服務"
 #  NOTE 必須事先取得「Subscription」（認證）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 msgid "Subscription Required"
-msgstr "必須認證"
+msgstr "必須訂閱狀態資訊"
 
 msgid "Unexpected Request"
 msgstr "未預期的要求"
@@ -4723,11 +4733,9 @@ msgid "Unable to initiate media with %s: user is not online"
 msgstr "無法與 %s 進行媒體通話，因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
-#  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
-#  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "無法與 %s 進行媒體通話，因為未獲對方認證"
+msgstr "無法與 %s 進行媒體通話，因為未有訂閱對方的狀態資訊"
 
 msgid "Media Initiation Failed"
 msgstr "媒體通話啟動失敗"
@@ -4752,9 +4760,8 @@ msgstr "config：設定一個聊天室"
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [聊天室]：離開聊天室。"
+msgstr "part [訊息]：離開聊天室。"
 
 msgid "register:  Register with a chat room."
 msgstr "register：加入一個聊天室"
@@ -4878,7 +4885,7 @@ msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
 msgid "Unknown Error in presence"
-msgstr "不明的上線狀態錯誤"
+msgstr "不明的狀態資訊錯誤"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4939,11 +4946,9 @@ msgid "Unable to send file to %s, user is not online"
 msgstr "無法傳送檔案至 %s，因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
-#  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
-#  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "無法傳送檔案至 %s，因為未獲對方認證"
+msgstr "無法傳送檔案至 %s，因為未有訂閱對方的狀態資訊"
 
 #  FIXME 這不通順 - acli 20070614
 #, c-format
@@ -5435,7 +5440,7 @@ msgstr "傳送至流動電話"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5664,9 +5669,8 @@ msgstr "無法新增使用者"
 msgid "Unknown error (%d)"
 msgstr "不明錯誤（代碼 %d）"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "無法新增使用者"
+msgstr "無法移除使用者"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "因為行動訊息過長，所以無法送出："
@@ -5909,28 +5913,84 @@ msgstr "%s 將你加入他（她）的好友清單。"
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將你從他（她）的好友清單中移除。"
 
+#. 1
+msgid "Angry"
+msgstr "憤怒"
+
+#. 2
+msgid "Excited"
+msgstr "興奮"
+
+# XXX 譯文有待改進 - 20091126 acli
+#. 3
+msgid "Grumpy"
+msgstr "暴躁"
+
+#. 4
+msgid "Happy"
+msgstr "開心"
+
+#. 5
+msgid "In Love"
+msgstr "戀愛中"
+
+#. 6
+msgid "Invincible"
+msgstr "無敵"
+
+#. 7
+msgid "Sad"
+msgstr "憂愁"
+
+# XXX 原文瞹眛，譯文可能有錯 =P  - acli 20091127
+#. 8
+msgid "Hot"
+msgstr "火熱"
+
+#. 9
+msgid "Sick"
+msgstr "生病"
+
+#. 10
+msgid "Sleepy"
+msgstr "想睡"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "你目前的心情"
+msgstr "目前的心情"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "使用者情緒"
+msgstr "新心情"
 
-#, fuzzy
 msgid "Change your Mood"
-msgstr "修改密碼"
+msgstr "修改心情"
 
-#, fuzzy
 msgid "How do you feel right now?"
-msgstr "我現在不在位子上"
+msgstr "你現在覺得怎樣？"
+
+msgid "The PIN you entered is invalid."
+msgstr "你所輸入的密碼無效。"
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "你所輸入的密碼過短或過長（應為 4 至 10 個數字）。"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "你所輸入的密碼無效，密碼必須由數字（0 至 9）組成。"
+
+msgid "The two PINs you entered do not match."
+msgstr "兩個密碼並不相符。"
+
+msgid "The name you entered is invalid."
+msgstr "你所輸入的名稱無效。"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "你所輸入的出生日期無效，正確格式應為：YYYY-MM-DD（年-月-日）。"
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "寫入錯誤"
+msgstr "更新個人資料途中發生錯誤"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5938,359 +5998,307 @@ msgid "Profile"
 msgstr "個人資料"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "未能讀取你的個人資料，請稍後重試。"
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "帳號"
+msgstr "密碼"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "確認密碼"
 
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "姓"
+msgstr "網名"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "隱藏電話號碼"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "流動電話號碼"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "使用者資料"
+msgstr "更新個人資料"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "你可以在這裏更新你在 MXit 的個人資料"
 
 msgid "View Splash"
-msgstr ""
+msgstr "檢視啟動畫面"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "目前沒有可用的啟動畫面"
 
-#, fuzzy
 msgid "About"
-msgstr "關於我"
+msgstr "關於此模組"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "修改密碼..."
+msgstr "修改心情..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "修改密碼..."
+msgstr "修改個人資料..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "觀看日誌..."
+msgstr "檢視啟動畫面..."
 
+# XXX 這隨時會變成不對... - acli 20091127
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "關於我"
+msgstr "關於此模組..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "這個訊息太大了。"
+msgstr "你要傳送的檔案太大了！"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "無法連線至 MXit 的 HTTP 伺服器，請檢查伺服器設定。"
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "登入中"
+msgstr "登入中..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "無法連線至伺服器。請輸入你希望連線至的伺服器的位址。"
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "無法連線至 MXit 伺服器，請檢查伺服器設定。"
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "連線中"
+msgstr "連線中..."
+
+msgid "The nick name you entered is invalid."
+msgstr "你所輸入的網名無效。"
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "你所輸入的密碼過短或過長（長度應為 7 至 10 個數字）。"
 
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
+msgstr "MXit 帳號"
 
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "網名"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "註冊新的 XMPP 帳戶"
+msgstr "註冊新的 MXit 帳戶"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "請輸入以下的欄位"
+msgstr "請輸入以下的欄位："
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "無法連線 MXit 的 WAP 網站，請稍後重試。"
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit 目前無法處理這個要求，請稍後重試。"
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "輸入了錯誤的保安碼，請稍後重試。"
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "你的工作階段已逾時，請稍後重試。"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "指定的國家是無效的，請重試。"
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "帳號未有註冊，請先註冊。"
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgstr "帳號已註冊，請選擇另一個帳號。"
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "暫時無法使用伺服器；請稍後重試"
+msgstr "內部錯誤，請稍後重試"
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "未有輸入保安碼"
 
-# FIXME flagged "有保安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
-#, fuzzy
 msgid "Security Code"
-msgstr "有保安功能"
+msgstr "保安碼"
 
-# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "輸入驗證文字"
+msgstr "輸入保安碼"
 
-#, fuzzy
 msgid "Your Country"
 msgstr "國家"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "選用語文"
+msgstr "語文"
 
-# NOTE 在這裏「Require」是指別人如果要新增您為好友，得先向您發出驗證要求，再由您允許
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "必須驗證"
+msgstr "MXit 授權"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit 帳號驗核"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "伺服器資訊"
+msgstr "讀取使用者資訊中..."
+
+msgid "Loading menu..."
+msgstr "載入清單中..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "送出訊息"
+msgstr "狀態訊息"
 
-# NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#, fuzzy
+# NOTE 這是「是否隱藏電話號碼？」之意 - acli 20091127
 msgid "Hidden Number"
-msgstr "英文別名"
+msgstr "隱藏電話號碼"
 
-#, fuzzy
 msgid "Your Mobile Number..."
-msgstr "設定流動電話號碼..."
+msgstr "流動電話號碼..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "伺服器"
+msgstr "WAP 伺服器"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "使用 TCP 連線"
+msgstr "使用 HTTP 連線"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "啟用啟動畫面彈出視窗"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "與 MXit 的連線已中斷，請重新連線。"
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP 訊息錯誤"
+msgstr "送出訊息錯誤"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "無法解析主機名稱"
+msgstr "目前無法處理送出的要求"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "等候 MXit 伺服器送出回應已逾時。"
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "成功加入羣組"
+msgstr "成功登入..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s 送來了一個加密的訊息，但這個用戶端目前還沒有解密的支援。"
 
-#, fuzzy
 msgid "Message Error"
-msgstr "XMPP 訊息錯誤"
+msgstr "訊息錯誤"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "無法以指定的通訊協定進行重新導向"
 
-#, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "MXit 的伺服器發生了內部錯誤。"
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "登入錯誤：%s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "登出錯誤：%s (%i)"
+
+# NOTE 指收到 CP_CMD_CONTACT (received contact update packet)，但出現錯誤 (???) - acli 20091128
+# NOTE 似乎是指更新好友狀態/好友清單，但出現錯誤 - acli 20091128
 msgid "Contact Error"
-msgstr "連線錯誤"
+msgstr "好友資訊錯誤"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "XMPP 訊息錯誤"
+msgstr "送出訊息途中發生錯誤"
 
-#, fuzzy
+# NOTE 似乎是指發出狀態資訊通知，以更新自己的狀態，但出現錯誤 - acli 20091128
 msgid "Status Error"
-msgstr "串流錯誤"
+msgstr "更新狀態資訊途中發生錯誤"
 
-#, fuzzy
+# NOTE 似乎是指更新自己的心情，但出現錯誤 - acli 20091128
 msgid "Mood Error"
-msgstr "圖像錯誤"
+msgstr "更新心情途中發生錯誤"
 
-#, fuzzy
+# NOTE 似乎是指發出邀請(?)，但出現錯誤 - acli 20091128
+# NOTE http://devzone.mxit.com/trac/libpurple/
 msgid "Invitation Error"
-msgstr "移除註冊錯誤"
+msgstr "邀請好友途中發生錯誤"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "連線錯誤"
+msgstr "移除好友途中發生錯誤"
 
 #  NOTE Jabber 術語，見「Both」條
-#, fuzzy
 msgid "Subscription Error"
-msgstr "認證狀態"
+msgstr "訂閱狀態資訊途中發生錯誤"
 
-#, fuzzy
+# NOTE 指發出 CP_CMD_UPDATE (Send an update contact packet to the MXit server) 指令後收到錯誤回覆 - acli 20091128
 msgid "Contact Update Error"
-msgstr "連線錯誤"
+msgstr "更新好友資訊途中發生錯誤"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "檔案傳輸"
+msgstr "檔案傳輸錯誤"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "無法新增好友狀態捕捉"
+msgstr "無法建立 MultiMx 聊天室"
 
-#, fuzzy
+# XXX 好像很怪 - acli 20091127
 msgid "MultiMx Invitation Error"
-msgstr "移除註冊錯誤"
+msgstr "MultiMx 邀請錯誤"
 
-#, fuzzy
+# NOTE 指讀取或修改個人資料期間發生錯誤 - acli 20091128
 msgid "Profile Error"
-msgstr "寫入錯誤"
+msgstr "存取個人資料途中發生錯誤"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "從 MXit 收到了無效的封包。"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "（在讀取階段 0x01 時）MXit 發生連線錯誤"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "（在讀取階段 0x02 時）MXit 發生連線錯誤"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "（在讀取階段 0x03 時）MXit 發生連線錯誤"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "（在讀取階段 0x04 時）MXit 發生連線錯誤"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "（在讀取階段 0x05 時）MXit 發生連線錯誤"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "憤怒"
+msgstr "（在讀取階段 0x06 時）MXit 發生連線錯誤"
 
-msgid "Excited"
-msgstr "興奮"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "羣組"
-
-msgid "Happy"
-msgstr "開心"
-
-msgid "In Love"
-msgstr "戀愛中"
-
-msgid "Invincible"
-msgstr "無敵"
-
-msgid "Sad"
-msgstr "憂愁"
-
-#, fuzzy
-msgid "Hot"
-msgstr "主機位址(_H)："
-
-#, fuzzy
-msgid "Sick"
-msgstr "網名"
-
-msgid "Sleepy"
-msgstr "想睡"
-
-# NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
-#, fuzzy
 msgid "Pending"
-msgstr "傳送中"
+msgstr "等候中"
 
-#, fuzzy
 msgid "Invited"
-msgstr "邀請"
+msgstr "已邀請"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "拒絕"
+msgstr "已拒絕"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "刪除"
+msgstr "已刪除"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit 廣告"
 
-#, fuzzy
 msgid "More Information"
-msgstr "工作資訊"
+msgstr "更多資訊"
 
 #, c-format
 msgid "No such user: %s"
@@ -6320,7 +6328,7 @@ msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "你現在就要設定嗎？（注意：設定後是無法修改的！）"
 
 msgid "Lost connection with server"
-msgstr "與伺服器之間的連線中斷"
+msgstr "與伺服器之間的連線突然中斷"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -7078,46 +7086,42 @@ msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "被家長監控限制，無法接收即時訊息"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgstr "未同意使用條款前無法送出短訊"
 
-#, fuzzy
 msgid "Cannot send SMS"
-msgstr "無法傳送檔案"
+msgstr "無法送出短訊"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "無法傳送目錄。"
+msgstr "無法送出短訊至指定的國家"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "無法送出短訊至不明的國家"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "機械人帳號無法啟動即時通訊"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "機械人帳號無法向這個使用者送出即時通訊"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "機械人帳號進行即時通訊的次數已達到了上限"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "機械人帳號進行即時通訊的次數已達到了每日的上限"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgstr "機械人帳號進行即時通訊的次數已達到了每月的上限"
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "無法送出訊息。"
+msgstr "無法接收離線訊息"
 
-#, fuzzy
 msgid "Offline message store full"
-msgstr "離線訊息"
+msgstr "離線訊息庫已滿"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7303,29 +7307,27 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "你所使用的用戶端程式太過老舊。請到 %s 更新"
+msgstr "你所使用的用戶端程式太舊。請到 %s 更新"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"你的連線／斷線動作太過頻繁。請等待一分鐘後再行重試。如果你依然繼續嘗試連線，"
-"那麼你的等待時間將會更加的延長。"
+"你的IP位址的連線／斷線動作太過頻繁。請等待一分鐘後再行重試。如果你依然繼續嘗"
+"試連線，那麼你的等待時間將會更加的延長。"
 
 msgid "The SecurID key entered is invalid"
 msgstr "你所輸入的 SecurID 碼無效"
@@ -7459,21 +7461,21 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "無法送出訊息 (%s)。"
+msgstr "無法送出訊息：%s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "無法送出訊息至 %s："
+msgstr "無法送出訊息至 %s：%s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "無法送出訊息至 %s："
+msgstr "無法送出訊息至 %s：%s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7495,20 +7497,18 @@ msgstr "兼容性"
 msgid "Your AIM connection may be lost."
 msgstr "你的 AIM 可能斷線了。"
 
-#  The conversion failed!
 #. The conversion failed!
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "（無法顯示來自這個使用者的訊息，因為它包含了無效字符。）"
 
-#, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
-"你最近做的一個動作無法完成，因為你已經達到發送訊息速率的上限。請等待十秒後再"
-"試一次。"
+"你最近做的一個動作無法完成，因為你已經達到這個動作的速率的上限。請等待十秒後"
+"再試一次。\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -10360,7 +10360,7 @@ msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
 msgid "Presence"
-msgstr "上線狀態"
+msgstr "現狀"
 
 # NOTE 下次登入時不報稱離線，所以加「暫時」字眼
 msgid "Appear Offline"
@@ -10380,7 +10380,7 @@ msgid "Initiate Conference"
 msgstr "開啟會議室"
 
 msgid "Presence Settings"
-msgstr "上線狀態設定"
+msgstr "現狀設定"
 
 msgid "Start Doodling"
 msgstr "開始 Doodle"
@@ -10402,14 +10402,15 @@ msgstr "加入好友目前所在的聊天室..."
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
+# XXX「obtain」譯文可能有問題 - acli 20091127
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "無法取得電訊網絡，所以無法送出短訊。"
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "未知的電訊網絡，所以無法送出短訊。"
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "正在要求電訊網絡送出短訊。"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10977,6 +10978,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"讓你可以透過即時通訊與好友聊天，支援 AIM、Google Talk、Jabber/XMPP、MSN、"
+"Yahoo 等等"
 
 msgid "Internet Messenger"
 msgstr "網絡即時通"
@@ -12300,6 +12303,9 @@ msgstr "馬其頓文"
 msgid "Mongolian"
 msgstr "蒙古文"
 
+msgid "Malay"
+msgstr "馬來文"
+
 #  NOTE 譯文不統一，一般似乎偏向音譯，但譯音也不統一
 #  NOTE 音譯包括：博克馬爾、波克默爾、布克莫爾、巴克摩
 #  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
@@ -12388,6 +12394,9 @@ msgstr "泰文"
 msgid "Turkish"
 msgstr "土耳其文"
 
+msgid "Ukranian"
+msgstr "烏克蘭文"
+
 msgid "Urdu"
 msgstr "烏爾都文"
 
@@ -12451,6 +12460,11 @@ msgid ""
 "primary language is <b>English</b>.  You are welcome to post in another "
 "language, but the responses may be less helpful.<br/><br/>"
 msgstr ""
+"<font size=\"4\">其他 Pidgin 使用者提供的支援：</font><a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>這是個<b>公開的</b>郵件論壇！"
+"（<a href=\"http://pidgin.im/pipermail/support/\">論壇存檔</a>）<br/>本論壇恕"
+"不為第三者開發的模組（包括通訊協定模組）提供任何支援！<br/>發帖請以<b>英文</"
+"b>為主；以中文或其他語文發帖亦可，但收到的回覆未必有用。<br/><br/>"
 
 #, c-format
 msgid ""
@@ -13035,7 +13049,7 @@ msgstr ""
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "目錄"
 
 msgid "use DIR for config files"
 msgstr "設定檔所在目錄"
@@ -13056,16 +13070,16 @@ msgid "don't automatically login"
 msgstr "不自動登入"
 
 msgid "NAME"
-msgstr ""
+msgstr "名稱"
 
-#, fuzzy
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
-"啟動指定的帳號 (透過 NAME 參數來指定啟動的\n"
-"                      帳號，並使用逗號分隔；"
+"啟動指定的帳號 (可選擇指定啟動的帳號名稱，\n"
+"                      啟動多個帳號時請使用逗號分隔，\n"
+"                      不指定帳號名稱時只會啟動頭一個帳號)"
 
 msgid "X display to use"
 msgstr "使用指定的 X display"
@@ -13321,21 +13335,20 @@ msgid "Unknown.... Please report this!"
 msgstr "未知的捕捉事件……請匯報這個問題！"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "（使用者自定）"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(預設)"
+# NOTE 這是「none」表情主題的標題（太奇怪了，這是沒有圖示的主題喎）
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "預設的 Pidgin 音效主題"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Pidgin 好友清單主題編輯器"
+msgstr "預設的 Pidgin 好友清單主題"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "預設的 Pidgin 狀態圖示主題"
 
 # XXX 要覆查 - 20090730
 msgid "Theme failed to unpack."
@@ -13347,19 +13360,29 @@ msgstr "無法載入表情主題。"
 msgid "Theme failed to copy."
 msgstr "無法複製表情主題。"
 
-#  NOTE 直譯「安裝主題」好像很無棱兩可，加個「檔」字好像較好
-msgid "Install Theme"
-msgstr "安裝主題檔"
+msgid "Theme Selections"
+msgstr "主題選擇"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "在下面的清單中選取一個你所想喜歡的表情主題。你可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-msgid "Icon"
-msgstr "圖示"
+msgid "Buddy List Theme:"
+msgstr "好友清單主題："
+
+msgid "Status Icon Theme:"
+msgstr "狀態圖示主題："
+
+msgid "Sound Theme:"
+msgstr "音效主題："
+
+msgid "Smiley Theme:"
+msgstr "表情主題："
 
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑"
@@ -13367,10 +13390,6 @@ msgstr "鍵盤捷徑"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "好友清單主題"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
@@ -13459,10 +13478,6 @@ msgstr "文字輸入區的最少行數："
 msgid "Font"
 msgstr "字型"
 
-#  XXX 要覆查 - acli 20070614
-msgid "Use document font from _theme"
-msgstr "使用主題指定的文件字型(_T)"
-
 msgid "Use font from _theme"
 msgstr "使用主題指定的字型(_T)"
 
@@ -13485,16 +13500,13 @@ msgstr "無法啟動代理伺服器設定程式。"
 msgid "Cannot start browser configuration program."
 msgstr "無法啟動瀏覽器設定程式。"
 
-# #NOTE 和下一個「Enable Account」對應。
-#, fuzzy
 msgid "Disabled"
-msgstr "停用帳號(_D)"
+msgstr "停用"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "使用自動偵測得來的 IP 位址(_A)：%s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U)："
 
@@ -13510,78 +13522,28 @@ msgstr "通訊埠"
 msgid "_Enable automatic router port forwarding"
 msgstr "啟用路由器的自動連接埠轉送(_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "自定通訊埠監聽範圍(_M)"
+msgstr "自定通訊埠監聽範圍(_M)："
 
-#, fuzzy
 msgid "_Start:"
-msgstr "狀態(_S)："
+msgstr "起始(_S)："
 
-#, fuzzy
 msgid "_End:"
-msgstr "展開(_E)"
+msgstr "結束(_E)："
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "中繼伺服器 (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "STUN 伺服器(_U)："
+msgstr "TURN 伺服器(_U)："
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "帳號："
+msgstr "帳號(_R)："
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "密碼："
-
-msgid "Proxy Server &amp; Browser"
-msgstr "代理伺服器及瀏覽器"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>找不到代理伺服器設定程式。</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>找不到瀏覽器設定程式。</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器或瀏覽器設定。"
-
-msgid "Configure _Proxy"
-msgstr "設定代理伺服器(_P)"
-
-msgid "Configure _Browser"
-msgstr "設定瀏覽器(_B)"
-
-msgid "Proxy Server"
-msgstr "代理伺服器"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "使用 SOCKS4 代理伺服器時使用遠端 DNS"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "代理伺服器型態(_T)："
-
-# NOTE 理由同前，不用「毋須」，改為「不使用」
-msgid "No proxy"
-msgstr "不使用代理伺服器"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "通訊埠(_P)："
-
-#, fuzzy
-msgid "User_name:"
-msgstr "帳號："
+msgstr "密碼(_W)："
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13622,6 +13584,15 @@ msgstr "使用者自定"
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "請使用 GNOME 的「偏好設定」功能更改瀏覽器設定"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>找不到瀏覽器設定程式。</b>"
+
+msgid "Configure _Browser"
+msgstr "設定瀏覽器(_B)"
+
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
@@ -13645,6 +13616,36 @@ msgstr ""
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
+msgid "Proxy Server"
+msgstr "代理伺服器"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器設定"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>找不到代理伺服器設定程式。</b>"
+
+msgid "Configure _Proxy"
+msgstr "設定代理伺服器(_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "使用 SOCKS4 代理伺服器時使用遠端 DNS (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "代理伺服器型態(_T)："
+
+# NOTE 理由同前，不用「毋須」，改為「不使用」
+msgid "No proxy"
+msgstr "不使用代理伺服器"
+
+msgid "P_ort:"
+msgstr "通訊埠(_O)："
+
+msgid "User_name:"
+msgstr "帳號(_N)："
+
 msgid "Log _format:"
 msgstr "日誌格式(_F)："
 
@@ -13728,25 +13729,18 @@ msgstr "閒置時間基準(_R)"
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-msgid "_Auto-reply:"
-msgstr "何時送出自動回應(_A)："
-
-msgid "When both away and idle"
-msgstr "當離開並同時閒置時"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "自動離開"
-
 # NOTE 譯文更動 by Ambrose
 msgid "_Minutes before becoming idle:"
 msgstr "閒置多少分鐘更改狀態(_M)："
 
-msgid "Change status when _idle"
-msgstr "閒置時更改狀態(_I)"
+msgid "Change to this status when _idle:"
+msgstr "閒置時更改狀態為(_I)："
+
+msgid "_Auto-reply:"
+msgstr "何時送出自動回應(_A)："
 
-msgid "Change _status to:"
-msgstr "更改狀態為(_S)："
+msgid "When both away and idle"
+msgstr "當離開並同時閒置時"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13761,15 +13755,15 @@ msgstr "啟動時套用的狀態："
 msgid "Interface"
 msgstr "介面"
 
-msgid "Smiley Themes"
-msgstr "表情主題"
-
 msgid "Browser"
 msgstr "瀏覽器"
 
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
+msgid "Themes"
+msgstr "主題"
+
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
@@ -14115,10 +14109,6 @@ msgstr "Pidgin 工具提示"
 msgid "Pidgin smileys"
 msgstr "為 Pidgin 特別設計的表情圖示"
 
-# NOTE 這是「none」表情主題的標題（太奇怪了，這是沒有圖示的主題喎）
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "不使用表情圖示，選擇這個主題即可。"
 
@@ -14789,6 +14779,10 @@ msgstr "GtkTreeView 水平間隔距離"
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
+# NOTE 這是指「Conversation History」類文字的字型(?!)設定 - acli 20091127
+msgid "Conversation History"
+msgstr "交談歷史"
+
 #  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20070415
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
@@ -15260,7 +15254,6 @@ msgstr "啟動"
 msgid "_Start %s on Windows startup"
 msgstr "當 Windows 啟動時同時執行 %s (_S)"
 
-#, fuzzy
 msgid "Allow multiple instances"
 msgstr "允許同時執行多個進程"
 
@@ -15325,28 +15318,48 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "這張證書聲稱由一所 Pidgin 不認識的根證書機構簽發。"
+#~ msgid ""
+#~ "The root certificate this one claims to be issued by is unknown to Pidgin."
+#~ msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。"
 
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "透過多種通訊協定發送即時訊息"
 
+#~ msgid "Without this only the first account will be enabled)."
+#~ msgstr "如果不指定帳號，將只會啟動第一個帳號)"
+
+#  NOTE 直譯「安裝主題」好像很無棱兩可，加個「檔」字好像較好
+#~ msgid "Install Theme"
+#~ msgstr "安裝主題檔"
+
+#~ msgid "Icon"
+#~ msgstr "圖示"
+
+#  XXX 要覆查 - acli 20070614
+#~ msgid "Use document font from _theme"
+#~ msgstr "使用主題指定的文件字型(_T)"
+
 #~ msgid "_Start port:"
 #~ msgstr "啟始通訊埠(_S)："
 
 #~ msgid "_End port:"
 #~ msgstr "結束通訊埠(_E)："
 
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "代理伺服器及瀏覽器"
+
 #~ msgid "_User:"
 #~ msgstr "使用者(_U)："
 
+#~ msgid "Auto-away"
+#~ msgstr "自動離開"
+
+#~ msgid "Change _status to:"
+#~ msgstr "更改狀態為(_S)："
+
 #~ msgid "GTK+ Runtime Version"
 #~ msgstr "GTK+ Runtime 版本"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "如果不指定帳號，將只會啟動第一個帳號)"
-
 #~ msgid "Calling ... "
 #~ msgstr "撥打中..."