pidgin: 3ba789b2: I missed the traditional Chinese po file...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 3ba789b2288c2880c7a984b204ad5450055ba746
Ancestor: af1b05036356a660886f2116813a03c1ca597010
Author: datallah at pidgin.im
Date: 2008-08-16T02:33:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3ba789b2288c2880c7a984b204ad5450055ba746

Modified files:
        po/ChangeLog po/zh_TW.po

ChangeLog: 

I missed the traditional Chinese po file in the first round. References #6557.

-------------- next part --------------
============================================================
--- po/ChangeLog	0416ff147d7609b97cde77a0960c0546e3ef45d5
+++ po/ChangeLog	f88249ddb568c697afbcea33dc1d59b8cc019046
@@ -3,6 +3,7 @@ version 2.5.0
 version 2.5.0
 	* Albanian translation updated (Besnik Bleta)
 	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Czech translation updated (David Vachulka)
 	* Dutch translation updated (Daniël Heres, Hylke Bons)
 	* Estonian translation updated (Ivar Smolin)
============================================================
--- po/zh_TW.po	dd0cf028e244346cf2ace704bc3b1b6a73c01cee
+++ po/zh_TW.po	855427ca92302c2739f3303010c4db5a881cba25
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2008, Ambrose C. Li <acli at ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.537 2008/05/12 02:13:23 acli Exp $
+# $InternalId: zh_TW.po,v 1.540 2008/08/10 08:37:23 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -48,10 +48,10 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.4.2\n"
+"Project-Id-Version: Pidgin 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 08:57-0400\n"
-"PO-Revision-Date: 2008-05-11 18:00-0400\n"
+"POT-Creation-Date: 2008-08-15 22:30-0400\n"
+"PO-Revision-Date: 2008-08-09 16:16-0400\n"
 "Last-Translator: Ambrose C. Li <acli at ada.dhs.org>, Paladin R. Liu "
 "<paladin at ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n at linux.org.tw>\n"
@@ -141,6 +141,10 @@ msgstr "別名："
 msgid "Alias:"
 msgstr "別名："
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "在伺服器上建立這個帳號"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -381,6 +385,7 @@ msgstr "暱稱"
 msgid "Nickname"
 msgstr "暱稱"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "é–’ç½®"
@@ -461,6 +466,9 @@ msgstr "觀看日誌..."
 msgid "View Log..."
 msgstr "觀看日誌..."
 
+msgid "View All Logs"
+msgstr "觀看所有日誌"
+
 msgid "Show"
 msgstr "顯示"
 
@@ -658,6 +666,17 @@ msgstr "傳送到"
 msgid "Send To"
 msgstr "傳送到"
 
+msgid "Invite message"
+msgstr "邀請訊息"
+
+msgid "Invite"
+msgstr "邀請"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr "請輸入您想邀請的使用者名稱，以及選擇性填寫邀請的訊息。"
+
 msgid "Conversation"
 msgstr "交談"
 
@@ -670,6 +689,9 @@ msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰..."
 msgid "Add Buddy Pounce..."
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰..."
 
+msgid "Invite..."
+msgstr "邀請..."
+
 msgid "Enable Logging"
 msgstr "開始記錄日誌"
 
@@ -679,9 +701,12 @@ msgstr "<自動回應> "
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "使用者列表：\n"
+# XXX 20080810
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "使用者列表（%d個使用者）：\n"
+msgstr[1] "使用者列表（%d個使用者）：\n"
 
 msgid "Supported debug options are:  version"
 msgstr "æ”¯æ´çš„é™¤éŒ¯é¸é …æœ‰ï¼šversion"
@@ -696,7 +721,18 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
+#, c-format
 msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s 不是有效的訊息類別，請輸入「/help msgcolor」指令列出所有有效的訊息類別。"
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s 不是有效的顏色，請輸入「/help msgcolor」指令列出所有有效的顏色。"
+
+msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
@@ -737,6 +773,19 @@ msgstr "statuses：「狀態清單」視
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;類別&gt; &lt;前景顏色&gt; &lt;背景顏色&gt;：為交談視窗中不同類別"
+"的訊息設定顏色。<br>    &lt;類別&gt;：receive、send、highlight、action、"
+"timestamp<br>    &lt;前景顏色/背景顏色&gt;：black、red、green、blue、white、"
+"gray、darkgray、magenta、cyan、default<br><br>例：<br>    msgcolor` send "
+"cyan default"
+
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
@@ -757,8 +806,10 @@ msgstr "暫停"
 msgstr "暫停"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
+msgstr[1] "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
 
 #. Create the window.
 msgid "File Transfers"
@@ -873,6 +924,9 @@ msgstr "與 %s 的交談"
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
+msgid "All Conversations"
+msgstr "所有交談"
+
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -911,9 +965,6 @@ msgstr "即時訊息"
 msgid "IM"
 msgstr "即時訊息"
 
-msgid "Invite"
-msgstr "邀請"
-
 # TODO 要覆查 - 20061028
 msgid "(none)"
 msgstr "(沒有名字)"
@@ -1119,6 +1170,7 @@ msgstr "%s 送出一個訊息給您。 (
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "æœªçŸ¥çš„æ•æ‰äº‹ä»¶ã€‚è«‹å›žå ±é€™å€‹å•é¡Œï¼"
 
@@ -1487,6 +1539,7 @@ msgstr "當新的交談開啟時，這å€
 "conversation into the current conversation."
 msgstr "當新的交談開啟時，這個模組將會把上次的交談內容也顯示出來。"
 
+#, c-format
 msgid "Online"
 msgstr "上線"
 
@@ -1836,6 +1889,7 @@ msgstr ""
 "由解析程序讀取時發生錯誤：\n"
 "%s"
 
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "由解析程序讀取時碰到檔案結尾"
 
@@ -1926,6 +1980,7 @@ msgstr "檔案 %s 傳送完畢"
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
+#, c-format
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
@@ -1933,6 +1988,7 @@ msgstr "ä½ å–æ¶ˆäº† %s 的傳送"
 msgid "You canceled the transfer of %s"
 msgstr "ä½ å–æ¶ˆäº† %s 的傳送"
 
+#, c-format
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
@@ -2123,6 +2179,7 @@ msgstr "您目前使用的是 %s，但é€
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您目前使用的是 %s，但這模組需要 %s。"
 
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "這個模組未有定義它的 ID。"
 
@@ -2134,8 +2191,9 @@ msgstr "ABI 版本不符 %d.%d.x (需要
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI 版本不符 %d.%d.x (需要%d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "模組並未實作所有必要的功能"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr "模組並未提供所有必需的函數 (list_icon、login 及 close)"
 
 #, c-format
 msgid ""
@@ -2230,6 +2288,10 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
+# XXX 20080810 acli
+msgid "Create a new directory for each user"
+msgstr "çµ¦æ¯å€‹ä½¿ç”¨è€…å»ºç«‹è©²ä½¿ç”¨è€…å°ˆç”¨çš„ç›®ç¶ "
+
 msgid "Notes"
 msgstr "備註"
 
@@ -2813,13 +2875,11 @@ msgid ""
 
 # FIXME 沒有譯「toolkit」- 20071023 acli
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://developer."
-"pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 查"
-"閱 FAQ 部分。"
+"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱 FAQ 部分。"
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
@@ -2876,9 +2936,6 @@ msgstr "無法開啟Socket"
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-msgid "Error setting socket options"
-msgstr "設定 Socket é¸é …æ™‚éŒ¯èª¤"
-
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket åˆ°é€šè¨ŠåŸ "
 
@@ -2928,6 +2985,9 @@ msgstr "儲存好友清單..."
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
+msgid "Load buddylist from file..."
+msgstr "自檔案讀取好友清單..."
+
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
@@ -3025,6 +3085,7 @@ msgstr "上線"
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
+#, c-format
 msgid "Away"
 msgstr "離開"
 
@@ -3104,9 +3165,6 @@ msgstr "儲存好友清單到檔案中..
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-msgid "Load buddylist from file..."
-msgstr "自檔案讀取好友清單..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -3224,6 +3282,9 @@ msgstr "編碼"
 msgid "Encodings"
 msgstr "編碼"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "自動偵測來訊 UTF-8"
+
 msgid "Real name"
 msgstr "姓名"
 
@@ -3240,8 +3301,8 @@ msgstr "模式無效"
 # NOTE 第一個 %s 為367碼的第二個參數，指定黑名單某一個ban的ban mask
 # NOTE 第二個 %s 為建立這個ban的帳號 (nick)
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "禁止 %s（由 %s 在 %ld 秒前設定）"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "禁止 %s（由 %s 在 %s前設定）"
 
 # NOTE %s 為367碼的第二個參數，指定黑名單某一個ban的ban mask
 #, c-format
@@ -3416,6 +3477,9 @@ msgstr "away [訊息]：設定一個離é
 "away."
 msgstr "away [訊息]：設定一個離開訊息，或者在離開時不指定任何訊息。"
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp &lt;暱稱&gt; &lt;訊息&gt;：向給定的暱稱送出 ctcp 訊息"
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv：送出一個指令到 chanserv"
 
@@ -3670,6 +3734,8 @@ msgstr "國家"
 msgid "Country"
 msgstr "國家"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "電話"
 
@@ -3882,6 +3948,9 @@ msgstr "相容性"
 msgid "Capabilities"
 msgstr "相容性"
 
+msgid "Priority"
+msgstr "優先次序"
+
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
@@ -3890,9 +3959,6 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-msgid "Priority"
-msgstr "優先次序"
-
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 msgid "Middle Name"
@@ -3944,6 +4010,7 @@ msgstr "長時間離開"
 msgid "Extended Away"
 msgstr "長時間離開"
 
+#, c-format
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -3980,7 +4047,7 @@ msgid "Email Address"
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
 msgid "Email Address"
-msgstr "電子郵件"
+msgstr "電子郵件地址"
 
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
@@ -4676,8 +4743,8 @@ msgstr "XMPP 訊息錯誤"
 msgstr "XMPP 訊息錯誤"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (代碼 %s)"
+msgid "(Code %s)"
+msgstr "(代碼 %s)"
 
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
@@ -4700,12 +4767,12 @@ msgstr "ä½¿ç”¨é è¨­å€¼(_A)"
 msgstr "ä½¿ç”¨é è¨­å€¼(_A)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "聊天室 %s 發生錯誤"
+msgid "Error joining chat %s"
+msgstr "åŠ å…¥èŠå¤©å®¤ %s 時發生錯誤"
 
 #, c-format
-msgid "Error joining chat %s"
-msgstr "åŠ å…¥èŠå¤©å®¤ %s 時發生錯誤"
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4796,170 +4863,223 @@ msgstr ""
 msgstr ""
 "%s 在本地端的好友清單，郤不在伺服器上；您要新增這個好友至伺服器的好友清單嗎？"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤（可能是用戶端的 Bug）"
 
+#, c-format
 msgid "Invalid email address"
-msgstr "電子郵件位址無效"
+msgstr "電子郵件地址無效"
 
+#, c-format
 msgid "User does not exist"
 msgstr "使用者不存在"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "æ²’çµ¦äºˆå®Œæ•´é ˜åŸŸåç¨± (FQDN)"
 
+#, c-format
 msgid "Already logged in"
 msgstr "已經登入"
 
+#, c-format
 msgid "Invalid username"
 msgstr "帳號無效。"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "暱稱無效"
 
+#, c-format
 msgid "List full"
 msgstr "好友清單已滿"
 
+#, c-format
 msgid "Already there"
 msgstr "已經在清單裡"
 
+#, c-format
 msgid "Not on list"
 msgstr "不在清單中"
 
+#, c-format
 msgid "User is offline"
 msgstr "使用者是離線的"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
+#, c-format
 msgid "Too many groups"
 msgstr "太多群組"
 
+#, c-format
 msgid "Invalid group"
 msgstr "群組無效"
 
+#, c-format
 msgid "User not in group"
 msgstr "使用者不在群組內"
 
+#, c-format
 msgid "Group name too long"
 msgstr "群組名稱過長"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號群組"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "å˜—è©¦å°‡ä¸€å€‹ä½¿ç”¨è€…åŠ å…¥ä¸å­˜åœ¨çš„ç¾¤çµ„"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "傳送通知失敗"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
+#, c-format
 msgid "Not logged in"
 msgstr "尚未登入"
 
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
+#, c-format
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX æš«è­¯
+#, c-format
 msgid "Command disabled"
 msgstr "指令被停用"
 
+#, c-format
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
+#, c-format
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
+#, c-format
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
+#, c-format
 msgid "Unable to write"
 msgstr "無法寫入"
 
+#, c-format
 msgid "Session overload"
 msgstr "工作階段超載"
 
+#, c-format
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
+#, c-format
 msgid "Not expected"
 msgstr "æ²’æœ‰é æœŸçš„ç„¡æ•ˆåƒæ•¸"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "暱稱的變更過於急速"
 
+#, c-format
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "認證失敗"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
 #  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#, c-format
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
@@ -4982,6 +5102,9 @@ msgstr "呼叫 %s 中..."
 msgid "Nudging %s..."
 msgstr "呼叫 %s 中..."
 
+msgid "Email Address..."
+msgstr "電子郵件..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
@@ -5019,9 +5142,21 @@ msgstr "不允許"
 msgid "Disallow"
 msgstr "不允許"
 
-msgid "This Hotmail account may not be active."
-msgstr "這個Hotmail帳號可能尚未被啟動。"
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "與 %s 相關的被封鎖的文字"
 
+msgid "No text is blocked for this account."
+msgstr "這個帳戶沒有文字被封鎖。"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN 的伺服器目前正在封鎖乎合下列 regular expression 的文字：<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "這個帳號的電子郵件功能未有啟動。"
+
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
@@ -5079,6 +5214,9 @@ msgstr "允許 / 不允許 Mobile Page..
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
+msgid "View Blocked Text..."
+msgstr "檢視被封鎖的文字..."
+
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
@@ -5281,15 +5419,9 @@ msgstr "Windows Live ID 認證：無法é
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID 認證：無法連線"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr "Windows Live ID 認證：在伺服器傳來的回應無法找到認證符記"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID 認證：回應無效"
 
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID 認證失敗"
-
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的群組。"
@@ -5342,6 +5474,9 @@ msgstr "暫時無法提供服務"
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "å› ç‚ºè¡Œå‹•è¨Šæ¯éŽé•·ï¼Œæ‰€ä»¥ç„¡æ³•é€å‡ºï¼š"
+
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
@@ -5376,6 +5511,22 @@ msgstr[1] ""
 "\n"
 "當維護工作結束，您將可以再度登入。"
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"å› ç‚ºç³»çµ±ä¸å¯ç”¨ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼›é€™é€šå¸¸è¡¨ç¤ºå°æ–¹å·²è¢«å°éŽ–ï¼Œæˆ–å°æ–¹çš„å¸³è™Ÿä¸¦ä¸å­˜"
+"在。"
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "å› ç‚ºå‚³é€è¨Šæ¯çš„é€Ÿåº¦å¤ªå¿«ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºã€‚"
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "å› ç‚ºç™¼ç”Ÿä¸æ˜Žçš„ç·¨ç¢¼éŒ¯èª¤ï¼Œè¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "å› ç‚ºç™¼ç”Ÿä¸æ˜Žçš„éŒ¯èª¤ï¼Œè¨Šæ¯ç„¡æ³•é€å‡ºã€‚"
+
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -5494,6 +5645,9 @@ msgstr "您所輸入的帳號無效。"
 msgid "The username specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
+msgid "This Hotmail account may not be active."
+msgstr "這個Hotmail帳號可能尚未被啟動。"
+
 msgid "Has you"
 msgstr "ä½ åœ¨ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®è£"
 
@@ -5537,8 +5691,10 @@ msgstr "登入中"
 msgstr "登入中"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "與伺服器失去連線（%d 秒內收不到任何資料）"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "與伺服器失去連線（%d 秒內收不到任何資料）"
+msgstr[1] "與伺服器失去連線（%d 秒內收不到任何資料）"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5642,9 +5798,13 @@ msgid ""
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）"
+msgstr[0] "從伺服器新增或更新了 %d 個好友（包括伺服器上已在好友清單上的好友）"
+msgstr[1] "從伺服器新增或更新了 %d 個好友（包括伺服器上已在好友清單上的好友）"
 
 msgid "Add contacts from server"
 msgstr "å¾žä¼ºæœå™¨åŠ å…¥è¯çµ¡äºº"
@@ -6119,6 +6279,7 @@ msgstr "錯誤：沒有安裝 SSL 支援
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6274,11 +6435,11 @@ msgstr "本地端的允許／拒絕清å–
 msgid "In local permit/deny"
 msgstr "本地端的允許／拒絕清單"
 
-msgid "Too evil (sender)"
-msgstr "太邪惡了（寄件人）"
+msgid "Warning level too high (sender)"
+msgstr "（發訊者）警告等級過高"
 
-msgid "Too evil (receiver)"
-msgstr "太邪惡了（收件人）"
+msgid "Warning level too high (receiver)"
+msgstr "（收訊者）警告等級過高"
 
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
@@ -6366,7 +6527,7 @@ msgid "Trillian Encryption"
 msgstr "舊式 ICQ UTF8"
 
 msgid "Trillian Encryption"
-msgstr "Trillian åŠ å¯†"
+msgstr "Trillian å¼åŠ å¯†"
 
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
@@ -6393,19 +6554,28 @@ msgstr "照相機"
 msgid "Camera"
 msgstr "照相機"
 
+# XXX 20080810 畫面分享 (Apple) / 螢幕共享 / 螢幕分享
+msgid "Screen Sharing"
+msgstr "螢幕共享"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
+#, c-format
 msgid "Not Available"
 msgstr "長時間離開"
 
+#, c-format
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#, c-format
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
+#, c-format
 msgid "Invisible"
 msgstr "隱身"
 
@@ -6438,11 +6608,11 @@ msgid "Connection established, cookie se
 msgstr "已送出使用者名稱"
 
 msgid "Connection established, cookie sent"
-msgstr "連線已建立，並已送出 Cookie"
+msgstr "成功建立連線，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
-msgstr "完成連線"
+msgstr "完成連線中"
 
 #, c-format
 msgid ""
@@ -6458,7 +6628,7 @@ msgid "Incorrect password."
 msgstr "使用者名稱無效。"
 
 msgid "Incorrect password."
-msgstr "錯誤的密碼。"
+msgstr "密碼錯誤。"
 
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -6466,6 +6636,7 @@ msgstr "您的帳號目前停用中。"
 
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
 #  NOTE 譯文更動 by Ambrose
+#  NOTE 20080810 - cnscode.org.tw 譯「unavailable」為「不可用」
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
@@ -6479,7 +6650,6 @@ msgstr ""
 "æ‚¨çš„é€£ç·šï¼æ–·ç·šå‹•ä½œå¤ªéŽé »ç¹ã€‚è«‹ç­‰å¾…ååˆ†é˜å¾Œå†è¡Œé‡è©¦ã€‚å¦‚æžœæ‚¨ä¾ç„¶ç¹¼çºŒå˜—è©¦è‘—é€£"
 "ç·šï¼Œé‚£éº¼æ‚¨çš„ç­‰å¾…æ™‚é–“å°‡æœƒæ›´åŠ çš„å»¶é•·ã€‚"
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
@@ -6521,10 +6691,11 @@ msgid "Unable to get a valid login hash.
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
 msgid "Unable to get a valid login hash."
-msgstr "無法取得有效的登入碼。"
+msgstr "無法取得有效的登入雜湊。"
 
+#. allow multple logins?
 msgid "Password sent"
-msgstr "密碼送出"
+msgstr "成功送出密碼"
 
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
@@ -6632,14 +6803,17 @@ msgstr[1] "您遺失了 %hu 個由 %s é€
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "您遺失了 %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä»–ï¼ˆå¥¹ï¼‰å¤ªé‚ªæƒ¡äº†ã€‚"
 msgstr[1] "您遺失了 %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä»–ï¼ˆå¥¹ï¼‰å¤ªé‚ªæƒ¡äº†ã€‚"
 
 #, 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."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] "您遺失了 %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºæ‚¨å¤ªé‚ªæƒ¡äº†ã€‚"
 msgstr[1] "您遺失了 %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºæ‚¨å¤ªé‚ªæƒ¡äº†ã€‚"
 
@@ -6672,9 +6846,6 @@ msgstr "成為成員的時間"
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-msgid "Available Message"
-msgstr "尚有訊息"
-
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
@@ -6683,7 +6854,7 @@ msgid ""
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
-msgstr "ã€Œç„¡æ³•é¡¯ç¤ºä¾†è‡ªé€™å€‹ä½¿ç”¨è€…çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒåŒ…å«äº†ç„¡æ•ˆå­—å…ƒã€‚ã€"
+msgstr "ï¼ˆç„¡æ³•é¡¯ç¤ºä¾†è‡ªé€™å€‹ä½¿ç”¨è€…çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒåŒ…å«äº†ç„¡æ•ˆå­—å…ƒã€‚ï¼‰"
 
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6702,12 +6873,17 @@ msgstr "å€‹äººç¶²é "
 msgid "Personal Web Page"
 msgstr "å€‹äººç¶²é "
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "其他資訊"
 
 msgid "Zip Code"
 msgstr "郵遞區號"
 
+msgid "Work Information"
+msgstr "工作資訊"
+
 msgid "Division"
 msgstr "部門"
 
@@ -6717,9 +6893,6 @@ msgstr "ç¶²é "
 msgid "Web Page"
 msgstr "ç¶²é "
 
-msgid "Work Information"
-msgstr "工作資訊"
-
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
@@ -6915,13 +7088,6 @@ msgstr "無法傳送即時訊息影像ï¼
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-msgid "Away Message"
-msgstr "離開訊息"
-
-# XXX 好像不對，又好像沒問題
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(搜尋中)</i>"
-
 #  NOTE 蘋果自己的中文網站只寫「iTunes Store」（英文）了事 :P
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
@@ -7002,6 +7168,7 @@ msgstr "使用電子郵件地址搜尋å¥
 msgid "Search for a buddy by email address"
 msgstr "使用電子郵件地址搜尋好友"
 
+# XXX not exact
 msgid "Type the email address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
@@ -7049,6 +7216,9 @@ msgstr ""
 "務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸及\n"
 "直接的即時訊息（較慢，但不會暴露您的 IP 位址）"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "允許同時多次登入"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
@@ -7057,6 +7227,7 @@ msgstr "正在嘗試連線至 %s:%hu。"
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s:%hu。"
 
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過代理伺服器連線。"
 
@@ -7355,13 +7526,6 @@ msgstr "請注意，假如您是創立è€
 "this operation will eventually remove this Qun."
 msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。"
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "代碼 0x%02X：%s"
-
-msgid "Group Operation Error"
-msgstr "群組操作錯誤"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "允許這個要求？"
@@ -7392,22 +7556,6 @@ msgstr "送出即時訊息失敗。"
 msgid "Failed to send IM."
 msgstr "送出即時訊息失敗。"
 
-msgid "Keep alive error"
-msgstr "Keep Alive 錯誤"
-
-msgid "Error requesting login token"
-msgstr "取得登入符記途中發生錯誤"
-
-msgid "Unable to login. Check debug log."
-msgstr "無法登入，請檢查除錯記錄。"
-
-msgid "Unable to login"
-msgstr "無法登入"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "無法連結。"
-
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
 # XXX libgaim/account.c - 「Unknownã€æŒ‡ä¸çŸ¥é“æ˜¯ä»€éº¼é€šè¨Šå”å®šï¼Œè­¯ã€Œä¸æ˜Žã€è¼ƒå¥½ï¼ˆå› ç‚ºä¸€å®šã€Œæ›¾ç¶“çŸ¥é“ã€ï¼Œ
@@ -7419,16 +7567,47 @@ msgstr "未知（代碼 %d）"
 msgid "Unknown-%d"
 msgstr "未知（代碼 %d）"
 
-msgid "TCP Address"
-msgstr "TCP 位址"
+#  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
+#  XXX 現在似乎叫「等級」，參閱http://vip.qq.com/freedom/freedom_vipgrade.html
+msgid "Level"
+msgstr "等級"
 
-msgid "UDP Address"
-msgstr "UDP 位址"
+# XXX 20080810 acli - ä¸çŸ¥é€™æ˜¯ä»€éº¼ï¼Œå› ç‚ºQQ的會員等級制中，「會員」等同「VIP」，所以不知何謂「Member」
+# XXX 20080810 acli - 但原始碼中「Member」字串似乎是一定出現的，所以似乎應該是指「用戶」
+msgid "Member"
+msgstr "用戶"
 
-#  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
-msgid "Level"
-msgstr "成長階段"
+# NOTE QQ官方網站寫「VIP」（沒有官方中文名稱）
+msgid " VIP"
+msgstr " VIP"
 
+msgid " TCP"
+msgstr " TCP"
+
+#, fuzzy
+msgid " FromMobile"
+msgstr " 使用行動裝置"
+
+#, fuzzy
+msgid " BindMobile"
+msgstr " 綁定行動裝置"
+
+#, fuzzy
+msgid " Video"
+msgstr " 視訊"
+
+#, fuzzy
+msgid " Space"
+msgstr " Space"
+
+# FIXME 20080810 acli - 這是很差的譯文，但原文太差了，沒辦法
+msgid "Flag"
+msgstr "旗標"
+
+# NOTE 20080810 acli - 這只是除錯用的，其實可以不譯
+msgid "Ver"
+msgstr "版本"
+
 msgid "Invalid name"
 msgstr "名稱無效"
 
@@ -7442,12 +7621,17 @@ msgstr "<b>最近更新時間：</b>%s<b
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
+# XXX 20080810 acli - 是否「確實」位址？
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>伺服器真實位址：</b>%s：%d<br>\n"
 
 # XXX - 20061027
 #, c-format
@@ -7499,15 +7683,101 @@ msgid "Connect using TCP"
 msgstr "QQ 協定模組"
 
 msgid "Connect using TCP"
-msgstr "使用 TCP 連結"
+msgstr "使用 TCP 連線"
 
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "resend interval(s)"
+msgstr "每隔多少秒重覆送出"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "Keep alive interval(s)"
+msgstr "每隔多少秒送出 Keep Alive"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "Update interval(s)"
+msgstr "每隔多少秒更新"
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "標題無效"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+#, fuzzy
+msgid "Keep alive error"
+msgstr "每隔多少秒送出 Keep Alive"
+
+msgid "Failed to connect server"
+msgstr "無法連線到伺服器"
+
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"與伺服器之間的連線突然中斷：\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
+msgid "Write Error"
+msgstr "寫入錯誤"
+
+msgid "Connection lost"
+msgstr "連線中斷"
+
+msgid "Couldn't resolve host"
+msgstr "無法解析主機"
+
+msgid "hostname is NULL or port is 0"
+msgstr "主機名稱數值為 NULL æˆ–é€šè¨ŠåŸ æ•¸å€¼ç‚º 0"
+
+#  XXX 20080810 acli - 原文好像有問題
 #, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "連線伺服器 %s 中，將會嘗試 %d 次"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "無法連線。"
+
+msgid "Could not resolve hostname"
+msgstr "無法解析主機"
+
+msgid "Unable to login. Check debug log."
+msgstr "無法登入，請檢查除錯記錄。"
+
+msgid "Unable to login"
+msgstr "無法登入"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+# FIXME 譯文有待改進  - 20070912 acli
+#, fuzzy
+msgid "Failed room reply"
+msgstr "登入失敗，沒有回應"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "您 [%d] å·²ç¶“è¢«åŠ å…¥ç¾¤çµ„ \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
+#, c-format
 msgid "%d has declined the file %s"
 msgstr "%d 拒絕了檔案「%s」"
 
@@ -7518,13 +7788,6 @@ msgstr "%d 取消了「%s」的傳送"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-msgid "Connection lost"
-msgstr "連線中斷"
-
-# FIXME 譯文有待改進  - 20070912 acli
-msgid "Login failed, no reply"
-msgstr "登入失敗，沒有回應"
-
 msgid "Do you want to add this buddy?"
 msgstr "æ‚¨è¦åŠ å…¥é€™å€‹ä½¿ç”¨è€…åˆ°å¥½å‹æ¸…å–®ä¸­å—Žï¼Ÿ"
 
@@ -7562,6 +7825,14 @@ msgstr "%s 不在您的好友清單內"
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "自 %s 發佈的通告"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "連線關閉（寫入）"
 
@@ -8158,6 +8429,7 @@ msgstr "<br><b>é »é“ä¸»é¡Œï¼š</b><br>%s
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>é »é“ä¸»é¡Œï¼š</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>é »é“æ¨¡å¼ï¼š</b>"
 
@@ -8182,6 +8454,7 @@ msgstr "é »é“å…¬é‘°æ¸…å–®"
 msgid "Channel Public Keys List"
 msgstr "é »é“å…¬é‘°æ¸…å–®"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8574,9 +8847,15 @@ msgstr "讀取 SILC 密鑰對途中出ç
 msgid "Error loading SILC key pair"
 msgstr "讀取 SILC 密鑰對途中出現錯誤"
 
+# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息（quit message），ui_name通常就是「pidgin」
+#, c-format
+msgid "Download %s: %s"
+msgstr "下載 %s，請瀏覽 %s"
+
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
+#, c-format
 msgid "Normal"
 msgstr "正常"
 
@@ -8956,35 +9235,45 @@ msgstr "伺服器沒有統計資料"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸ä¿¡ä»»ï¼ä¸æ”¯æ´æ‚¨çš„å…¬é‘°"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„å¯†é‘°äº¤æ›ç¾¤çµ„ (KE group)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„åŠ å¯†æ–¹å¼ (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„å…¬é–‹é‘°åŒ™è­‰æ›¸æ¨™æº– (PKCS)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„é›œæ¹Šå‡½æ•¸ (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„èº«ä»½é©—è­‰ä»£ç¢¼ (HMAC)"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "å¤±æ•—ï¼šéŒ¯èª¤çš„ç°½ç« "
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
@@ -9011,12 +9300,6 @@ msgstr "無法建立 Socket 監聽"
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-msgid "Couldn't resolve host"
-msgstr "無法解析主機"
-
-msgid "Could not resolve hostname"
-msgstr "無法解析主機"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -9086,6 +9369,7 @@ msgstr "不允許對 %s 發出警告。"
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "è¨Šæ¯è¢«ä¸Ÿæ£„ï¼Œå› ç‚ºæ‚¨é”åˆ°äº†ä¼ºæœå™¨æ‰€é™åˆ¶çš„ç™¼é€é€Ÿåº¦ã€‚"
 
@@ -9105,32 +9389,41 @@ msgstr "您遺失了一個由 %s 送來ç
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå‚³é€çš„é€Ÿåº¦å¤ªå¿«ã€‚"
 
+#, c-format
 msgid "Failure."
 msgstr "失敗。"
 
+#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
+#, c-format
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
+#, c-format
 msgid "Email lookup restricted."
-msgstr "禁止 Email 檢查。"
+msgstr "禁止 E-Mail 檢查。"
 
+#, c-format
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
+#, c-format
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
+#, c-format
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
+#, c-format
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
@@ -9138,17 +9431,21 @@ msgstr "æœªçŸ¥çš„å¤±æ•—åŽŸå› ï¼š%s。"
 msgid "Failure unknown: %s."
 msgstr "æœªçŸ¥çš„å¤±æ•—åŽŸå› ï¼š%s。"
 
+#, c-format
 msgid "Incorrect username or password."
 msgstr "錯誤的帳號或密碼。"
 
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "æš«æ™‚ç„¡æ³•ä½¿ç”¨è©²é …æœå‹™ã€‚"
 
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高，以致無法登入。"
 
+#, c-format
 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."
@@ -9467,9 +9764,6 @@ msgstr "%s 提出一次過傳送 %d 個æ
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 提出一次過傳送 %d 個檔案。\n"
 
-msgid "Write Error"
-msgstr "寫入錯誤"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
@@ -9783,6 +10077,14 @@ msgstr "無法解析主機"
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "要求 %s 的注意中..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s 要求您注意！"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9813,14 +10115,6 @@ msgstr "%s 改變暱稱為 %s。\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "要求 %s 的注意中..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s 要求您注意！"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9835,6 +10129,21 @@ msgstr "接受邀請嗎？"
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "捷徑"
+
+msgid "The text-shortcut for the smiley"
+msgstr "與表情相關的文字捷徑"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "已儲存的圖像"
+
+# FIXME 20080810 acli - 我覺得我譯錯了，但不知其實這是什麼意思
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "已儲存（而目前會使用）的圖像"
+
 # FIXME ambiguous - 20061025
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
@@ -9894,6 +10203,12 @@ msgstr "+++ %s 不再閒置"
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9987,22 +10302,31 @@ msgstr " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "連線被電腦上的其他軟體中斷。"
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "é ç«¯ä¸»æ©Ÿé—œé–‰äº†é€£ç·šã€‚"
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "連線已逾時"
 
 # XXX - 20061027
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "連線被拒。"
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "位址已在使用中"
+
 msgid "Internet Messenger"
 msgstr "網路即時通"
 
@@ -10115,8 +10439,8 @@ msgstr "基本設定(_B)"
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-msgid "Create this new account on the server"
-msgstr "在伺服器上建立這個新帳號"
+msgid "Create _this new account on the server"
+msgstr "在伺服器上建立這個新帳號(_T)"
 
 msgid "_Advanced"
 msgstr "進階設定(_A)"
@@ -10213,6 +10537,12 @@ msgstr "移除(_R)"
 msgid "_Remove"
 msgstr "移除(_R)"
 
+msgid "Set Custom Icon"
+msgstr "設定自訂圖示"
+
+msgid "Remove Custom Icon"
+msgstr "移除自定圖示"
+
 msgid "Add _Buddy..."
 msgstr "新增好友(_B)..."
 
@@ -10316,7 +10646,7 @@ msgstr "/帳號(_A)"
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-msgid "/Accounts/Manage"
+msgid "/Accounts/Manage Accounts"
 msgstr "/帳號/管理"
 
 #. Tools
@@ -10338,6 +10668,9 @@ msgstr "/工具/隱私設定(_I)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
+msgid "/Tools/Smile_y"
+msgstr "/工具/表情(_Y)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
@@ -10502,14 +10835,14 @@ msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>歡迎使用 %s!</span>\n"
 "\n"
 "您未有啟動任何帳號，請透過好友清單上的「帳號->管理」指令，到「帳號清單」啟動"
-"帳號。帳號一經啟動，就隨時可以登入或變更狀態；這樣，您就可以跟您的好友通訊"
-"了！"
+"即時訊息帳號。帳號一經啟動，就隨時可以登入或變更狀態；這樣，您就可以跟您的好"
+"友通訊了！"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10567,7 +10900,14 @@ msgstr "請給您新增的群組輸入å
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
+msgid "Enable Account"
+msgstr "啟動帳號"
+
 # XXX
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/帳號/啟動帳號"
+
+# XXX
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
@@ -10583,13 +10923,6 @@ msgstr "停用帳號(_D)"
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-msgid "Enable Account"
-msgstr "啟動帳號"
-
-# XXX
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/帳號/啟動帳號"
-
 msgid "/Tools"
 msgstr "/工具"
 
@@ -10676,9 +11009,6 @@ msgstr "更改大小"
 msgid "Change Size"
 msgstr "更改大小"
 
-msgid "Remove Custom Icon"
-msgstr "移除自定圖示"
-
 msgid "Show All"
 msgstr "全部顯示"
 
@@ -10956,12 +11286,13 @@ msgstr "嚴重錯誤訊息"
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-msgid "lead developer"
-msgstr "主要開發者"
-
 msgid "developer"
 msgstr "開發者"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "張家興"
+
 msgid "support"
 msgstr "支援"
 
@@ -10993,6 +11324,9 @@ msgstr "原作者"
 msgid "original author"
 msgstr "原作者"
 
+msgid "lead developer"
+msgstr "主要開發者"
+
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -11158,6 +11492,9 @@ msgstr "新挪威文"
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
+msgid "Occitan"
+msgstr "奧西坦文"
+
 msgid "Punjabi"
 msgstr "旁遮普文"
 
@@ -11266,6 +11603,7 @@ msgstr ""
 "作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程"
 "式恕不提供任何保用。<BR><BR>"
 
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin é »é“<BR><BR>"
@@ -11417,24 +11755,36 @@ msgstr "按右鍵以讀取未讀訊息..
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-msgid "Change Status"
-msgstr "變更狀態"
+msgid "_Change Status"
+msgstr "變更狀態(_C)"
 
-msgid "Show Buddy List"
-msgstr "顯示好友清單"
+msgid "Show Buddy _List"
+msgstr "顯示好友清單(_L)"
 
-msgid "New Message..."
-msgstr "新訊息..."
+msgid "_Unread Messages"
+msgstr "未讀訊息(_U)"
 
-msgid "Mute Sounds"
-msgstr "靜音"
+msgid "New _Message..."
+msgstr "新訊息(_M)..."
 
-msgid "Blink on New Message"
-msgstr "有新訊息時閃動"
+msgid "_Accounts"
+msgstr "帳號(_A)"
 
-msgid "Quit"
-msgstr "結束程式"
+msgid "Plu_gins"
+msgstr "模組清單(_G)"
 
+msgid "Pr_eferences"
+msgstr "偏好設定(_E)"
+
+msgid "Mute _Sounds"
+msgstr "靜音(_S)"
+
+msgid "_Blink on New Message"
+msgstr "有新訊息時閃動(_B)"
+
+msgid "_Quit"
+msgstr "結束程式(_Q)"
+
 #  NOTE 這是指「未開始」傳輸檔案，不是「未啟動」
 msgid "Not started"
 msgstr "未開始"
@@ -11499,6 +11849,14 @@ msgstr "檔案傳輸細節(_D)"
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
+#. Pause button
+msgid "_Pause"
+msgstr "暫停(_P)"
+
+#. Resume button
+msgid "_Resume"
+msgstr "恢復(_R)"
+
 #  NOTE Nautilus譯「貼上文本」，Abiwordè­¯ã€Œæœªæ ¼å¼åŒ–è²¼ä¸Šã€ï¼Œè½ä¾†éƒ½æœ‰äº›æ€ª
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -11507,7 +11865,7 @@ msgid "Disable _smileys in selected text
 msgstr "æ¸…é™¤æ ¼å¼åŒ–(_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "在選擇的範圍內停用表情(_S)"
 
 msgid "Hyperlink color"
 msgstr "連結顏色"
@@ -11534,17 +11892,24 @@ msgid "\"Attention\" Name Color"
 msgstr "收到訊息時，用來顯示對方帳號的顏色。"
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "「請您注意」的帳號顏色"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "收到訊息內含有自己名稱的訊息時，用來顯示對方帳號的顏色。"
+msgstr "收到訊息內含有自己的名稱時，用來顯示對方帳號的顏色。"
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "動作訊息帳號顏色"
 
 msgid "Color to draw the name of an action message."
+msgstr "收到的訊息是代表對方發出的一個動作時，用來顯示對帳號的顏色。"
+
+msgid "Action Message Name Color for Whispered Message"
 msgstr ""
+"收到的訊息是對方以「輕聲的說」這種動作發出的訊息時，用來顯示對方帳號的顏色"
 
+msgid "Whisper Message Name Color"
+msgstr "輕聲訊息帳號顏色"
+
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
@@ -11613,9 +11978,14 @@ msgstr "儲存影像"
 msgid "Save Image"
 msgstr "儲存影像"
 
+#, c-format
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "插入自訂表情(_A)..."
+
 msgid "Select Font"
 msgstr "選擇字型"
 
@@ -11652,9 +12022,20 @@ msgstr "插入影像"
 msgid "Insert Image"
 msgstr "插入影像"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"é€™å€‹è¡¨æƒ…å·²è¢«åœç”¨ï¼Œå› ç‚ºç›¸é—œçš„æ·å¾‘å·²æœ‰ä¸€å€‹è‡ªè¨‚è¡¨æƒ…ï¼š\n"
+" %s"
+
 msgid "Smile!"
 msgstr "笑一個！"
 
+msgid "_Manage custom smileys"
+msgstr "管理自訂表情(_M)"
+
 #  XXX è­¯æ–‡ä¸é€šé †
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
@@ -12060,7 +12441,7 @@ msgid "Keyboard Shortcuts"
 msgstr "圖示"
 
 msgid "Keyboard Shortcuts"
-msgstr "鍵盤㨗徑"
+msgstr "鍵盤捷徑"
 
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
@@ -12147,7 +12528,7 @@ msgid "Minimum input area height in line
 msgstr "最小化所有新交談視窗(_Z)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "文字輸入區的最少行數："
 
 msgid "Font"
 msgstr "å­—åž‹"
@@ -12312,21 +12693,27 @@ msgstr "選取音效"
 msgid "Sound Selection"
 msgstr "選取音效"
 
+#, c-format
 msgid "Quietest"
 msgstr "最小聲"
 
+#, c-format
 msgid "Quieter"
 msgstr "再小聲"
 
+#, c-format
 msgid "Quiet"
 msgstr "小聲"
 
+#, c-format
 msgid "Loud"
 msgstr "大聲"
 
+#, c-format
 msgid "Louder"
 msgstr "再大聲"
 
+#, c-format
 msgid "Loudest"
 msgstr "最大聲"
 
@@ -12359,6 +12746,12 @@ msgstr "播放"
 msgid "Play"
 msgstr "播放"
 
+msgid "_Browse..."
+msgstr "瀏覽(_B)..."
+
+msgid "_Reset"
+msgstr "重置(_R)"
+
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
@@ -12531,6 +12924,46 @@ msgstr "狀態：%s"
 msgid "Status for %s"
 msgstr "狀態：%s"
 
+msgid "Custom Smiley"
+msgstr "自訂表情"
+
+msgid "Duplicate Shortcut"
+msgstr "重覆的表情定義"
+
+# XXX 20080810 acli - æš«è­¯
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr "給定的捷徑已有相關的自訂表情，請指定另一個捷徑。"
+
+msgid "More Data needed"
+msgstr "需要進一步的資料"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "請給這個表情給定一個相關的捷徑。"
+
+msgid "Please select an image for the smiley."
+msgstr "請給這個表情選擇一個圖像。"
+
+msgid "Edit Smiley"
+msgstr "修改表情"
+
+msgid "Add Smiley"
+msgstr "新增表情"
+
+msgid "Smiley _Image"
+msgstr "表情圖像(_I)"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "表情捷徑(_H)"
+
+msgid "Smiley"
+msgstr "表情"
+
+msgid "Custom Smiley Manager"
+msgstr "自訂表情管理"
+
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
@@ -12666,9 +13099,6 @@ msgstr "開啟郵件(_O)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-msgid "_Pause"
-msgstr "暫停(_P)"
-
 #  FIXME Tooltip中文怎寫？
 msgid "Pidgin Tooltip"
 msgstr "Pidgin Tooltip"
@@ -12688,9 +13118,6 @@ msgstr "ç„¡"
 msgid "none"
 msgstr "ç„¡"
 
-msgid "Display Statistics"
-msgstr "顯示統計資料"
-
 msgid "Response Probability:"
 msgstr "「回答」或然率："
 
@@ -13286,6 +13713,7 @@ msgstr "選擇顏色"
 msgid "Select Color"
 msgstr "選擇顏色"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
@@ -13514,6 +13942,7 @@ msgstr "æ™‚é–“æˆ³è¨˜æ ¼å¼é¸é …"
 msgid "Timestamp Format Options"
 msgstr "æ™‚é–“æˆ³è¨˜æ ¼å¼é¸é …"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "強制使用24å°æ™‚åˆ¶æ™‚é–“æ ¼å¼(_F)"
 
@@ -13684,20 +14113,57 @@ msgstr "幫助為 XMPP 伺服器或客æˆ
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#. feel free to not translate this
-#: ../pidgin/gtkdialogs.c:77
-msgid "Ka-Hing Cheung"
-msgstr "張家興"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "代碼 0x%02X：%s"
 
-#~ msgid "_Resume"
-#~ msgstr "恢復(_R)"
+#~ msgid "Group Operation Error"
+#~ msgstr "群組操作錯誤"
 
+#~ msgid "Error setting socket options"
+#~ msgstr "設定 Socket é¸é …æ™‚éŒ¯èª¤"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr "Windows Live ID 認證：在伺服器傳來的回應無法找到認證符記"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Windows Live ID 認證失敗"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "太邪惡了（寄件人）"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "太邪惡了（收件人）"
+
+#~ msgid "Available Message"
+#~ msgstr "尚有訊息"
+
+#~ msgid "Away Message"
+#~ msgstr "離開訊息"
+
+# XXX 好像不對，又好像沒問題
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(搜尋中)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "取得登入符記途中發生錯誤"
+
+#~ msgid "TCP Address"
+#~ msgstr "TCP 位址"
+
+#~ msgid "UDP Address"
+#~ msgstr "UDP 位址"
+
+#~ msgid "E-Mail"
+#~ msgstr "電子郵件"
+
+#~ msgid "E-mail"
+#~ msgstr "電子郵件"
+
 #~ msgid "Screen name:"
 #~ msgstr "帳號："
 
-#~ msgid "Screen Name"
-#~ msgstr "帳號"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "有人在聊天室中提到您的名字"
 
@@ -13788,16 +14254,9 @@ msgstr "張家興"
 #~ msgid "User has typed something and stopped"
 #~ msgstr "對方輸入了一些東西，不過暫停了"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "%s has typed something and stopped"
-#~ msgstr "對方輸入了一些東西，不過暫停了"
+#~ msgid "Display Statistics"
+#~ msgstr "顯示統計資料"
 
-#, fuzzy
-#~ msgid "S_mile!"
-#~ msgstr "笑一個！"
-
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s 從「%s」狀態改變為「%s」"
 
@@ -13870,10 +14329,6 @@ msgstr "張家興"
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "/帳號(_A)/新增\\/編輯"
 
-#  XXX
-#~ msgid "_Smiley"
-#~ msgstr "笑一個！(_S)"
-
 #~ msgid "Conversation History"
 #~ msgstr "交談歷史"