Updated Traditional Chinese translation(Hong Kong and Taiwan)

2 files changed, 291 insertions, 492 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 48b72b463..329bda2ab 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -3,14 +3,14 @@
 # Abel Cheung <abel@oaka.org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
 # Tryneeds translation team, 2009.
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2009.
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.28.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-26 18:57+0800\n"
-"PO-Revision-Date: 2009-12-26 18:58+0800\n"
+"POT-Creation-Date: 2010-01-01 15:02+0800\n"
+"PO-Revision-Date: 2010-01-01 15:06+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy IM Client"
-msgstr "Empathy IM 客戶端程式"
+msgstr "Empathy 即時通客戶端"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "IM Client"
-msgstr "IM 客戶端"
+msgstr "即時通客戶端"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "Send and receive messages"
@@ -62,9 +62,8 @@ msgid "Connection managers should be used"
 msgstr "使用連線管理程式"
 
 #: ../data/empathy.schemas.in.h:7
-#, fuzzy
 msgid "Contact list sort criterion"
-msgstr "聯絡人清單排序條件"
+msgstr "聯絡人清單排序準則"
 
 #: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
@@ -219,10 +218,8 @@ msgid "Show offline contacts"
 msgstr "顯示離線聯絡人"
 
 #: ../data/empathy.schemas.in.h:46
-#, fuzzy
-#| msgid "Protocol"
 msgid "Show protocols"
-msgstr "安全式通訊協定"
+msgstr "顯示協定"
 
 #: ../data/empathy.schemas.in.h:47
 msgid "Spell checking languages"
@@ -394,12 +391,8 @@ msgid "Whether or not to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
 #: ../data/empathy.schemas.in.h:83
-#, fuzzy
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
 msgid "Whether or not to show protocols for contacts in the contact list."
-msgstr "是否在聯絡人清單中顯示離線的聯絡人。"
+msgstr "是否要顯示聯絡人清單內的聯絡人使用協定。"
 
 #: ../data/empathy.schemas.in.h:84
 msgid "Whether or not to show the contact list in chat rooms."
@@ -420,12 +413,11 @@ msgid "Whether to use the theme for chat rooms or not."
 msgstr "是否在聊天室使用佈景主題。"
 
 #: ../data/empathy.schemas.in.h:88
-#, fuzzy
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
-msgstr "排序聯絡人清單時要使用哪個條件。預設值是使用聯絡人的名稱「name」數值來排序。而數值「state」則會使用其狀態來排序聯絡人清單。"
+msgstr "排序聯絡人清單時要使用哪個準則。預設值是使用聯絡人的名稱「name」數值來排序。而數值「state」則會使用其狀態來排序聯絡人清單。"
 
 #: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
@@ -500,16 +492,12 @@ msgid "Offline"
 msgstr "離線"
 
 #: ../libempathy/empathy-utils.c:286
-#, fuzzy
-#| msgid "No reason was specified"
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
 #: ../libempathy/empathy-utils.c:288
-#, fuzzy
-#| msgid "%s has disconnected"
 msgid "User requested disconnect"
-msgstr "中斷選取的裝置"
+msgstr "連接不上要求的使用者"
 
 #: ../libempathy/empathy-utils.c:290
 msgid "Network error"
@@ -638,16 +626,12 @@ msgid "Enabled"
 msgstr "已啟用"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1460
-#, fuzzy
-#| msgid "This will not remove your account on the server."
 msgid "This account already exists on the server"
-msgstr "這不會移除你在伺服器上所擁有的帳戶。"
+msgstr "此帳號已經存在這個伺服器上"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1463
-#, fuzzy
-#| msgid "_Create a new account"
 msgid "Create a new account on the server"
-msgstr "在選取的裝置上建立新的檔案系統"
+msgstr "在這個伺服器上建立新的帳號"
 
 #. To translators: The first parameter is the login id and the
 #. * second one is the server. The resulting string will be something
@@ -773,8 +757,6 @@ msgstr "新網絡"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:184
 #: ../libempathy-gtk/empathy-account-widget-sip.c:217
-#, fuzzy
-#| msgid "_About"
 msgid "Auto"
 msgstr "自動"
 
@@ -793,23 +775,18 @@ msgstr "TLS"
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:222
-#, fuzzy
-#| msgid "Western"
 msgid "Register"
-msgstr "暫存器"
+msgstr "註冊"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:227
-#, fuzzy
 msgid "Options"
 msgstr "選項"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:230
-#, fuzzy
-#| msgid "No"
 msgid "None"
-msgstr "＊無＊"
+msgstr "無"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
@@ -825,7 +802,7 @@ msgstr "網絡:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
-msgstr "稱呼："
+msgstr "網名:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
@@ -917,7 +894,7 @@ msgstr "電子郵件(_E):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
-msgstr "名字(_F):"
+msgstr "名(_F):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_Jabber ID:"
@@ -925,7 +902,7 @@ msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Last Name:"
-msgstr "姓氏(_L):"
+msgstr "姓(_L):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Nickname:"
@@ -941,10 +918,8 @@ msgid "<b>Keep-Alive Options</b>"
 msgstr "顯示有關 GNOME 的選項"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#, fuzzy
-#| msgid "<b>Location</b>"
 msgid "<b>Miscellaneous Options</b>"
-msgstr "其它選項"
+msgstr "<b>雜項</b>"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 #, fuzzy
@@ -952,87 +927,74 @@ msgid "<b>NAT Traversal Options</b>"
 msgstr "顯示有關 GNOME 的選項"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#, fuzzy
-#| msgid "<b>Location</b>"
 msgid "<b>Proxy Options</b>"
-msgstr "求助選項"
+msgstr "<b>Proxy 選項</b>"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
 msgstr "<span size=\"small\"><b>範例：</b> user@my.sip.server</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-#, fuzzy
-#| msgid "Authentication failed"
 msgid "Authentication username:"
-msgstr "伺服器使用者名稱"
+msgstr "認證使用者名稱："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-#, fuzzy
-#| msgid "Discover STUN"
 msgid "Discover Binding"
-msgstr "按鍵組合"
+msgstr "探索 Binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "自動探索 STUN 伺服器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Hostname of the proxy for outbound requests."
-msgstr ""
+msgstr "資料傳出要求所使用的 proxy 主機名稱。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-#, fuzzy
 msgid "Interval (seconds)"
-msgstr "更新間隔(_U):"
+msgstr "間隔（秒）"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid ""
 "Look up the DNS SRV record at the service's domain for the host name of a "
 "STUN server."
-msgstr ""
+msgstr "查詢位於伺服器 domain 的 DNS SRV 紀錄以取得某個 STUN 伺服器的主機名稱。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#, fuzzy
 msgid "Loose Routing"
-msgstr "路由表資訊"
+msgstr "寬鬆路由"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#, fuzzy
 msgid "Mechanism:"
-msgstr "SASL 機制"
+msgstr "機制："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Port of the proxy for outbound requests."
-msgstr ""
+msgstr "資料傳出要求所使用的 proxy 連接埠。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#, fuzzy
-#| msgid "_Port:"
 msgid "Port:"
-msgstr "連接埠(_P):"
+msgstr "連接埠："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN 伺服器:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#, fuzzy
-#| msgid "_Server:"
 msgid "Server:"
-msgstr "<b>伺服器</b>"
+msgstr "伺服器:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid ""
 "The username for SIP authentication, if different from the SIP URI\n"
 "username."
 msgstr ""
+"SIP 驗證用的使用者名稱，如果和 SIP URI 不同時使用\n"
+"使用。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#, fuzzy
-#| msgid "STUN port:"
 msgid "Transport:"
-msgstr "傳送(_T):"
+msgstr "傳送通訊埠:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid ""
@@ -1044,7 +1006,7 @@ msgstr ""
 msgid ""
 "Use the loose routing behavior and the Route header as recommended in RFC "
 "3261."
-msgstr ""
+msgstr "使用寬鬆路由行為以及使用 RFC 3261 內所建議的 Route 標頭。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "What is your SIP account password?"
@@ -1116,88 +1078,78 @@ msgid "Failed to reconnect this chat"
 msgstr "無法重連這個聊天會議"
 
 #: ../libempathy-gtk/empathy-chat.c:621
-#, fuzzy
 msgid "Failed to join chatroom"
-msgstr ""
-"無法加入遊戲桌。\n"
-"中止加入。"
+msgstr "加入聊天室失敗"
 
 #: ../libempathy-gtk/empathy-chat.c:639
-#, fuzzy
 msgid "Failed to open private chat"
-msgstr "無法重連這個聊天會議"
+msgstr "開啟私人對話失敗"
 
 #: ../libempathy-gtk/empathy-chat.c:678
-#, fuzzy
 msgid "Topic not supported on this conversation"
-msgstr "這台打印機不支援打印。"
+msgstr "此對話的主題不被支援"
 
 #: ../libempathy-gtk/empathy-chat.c:684
-#, fuzzy
 msgid "You are not allowed to change the topic"
-msgstr "你不允許存取系統設定。"
+msgstr "你不被允許更改這個主題"
 
 #: ../libempathy-gtk/empathy-chat.c:802
 msgid "/clear, clear all messages from the current conversation"
-msgstr ""
+msgstr "/clear，清除目前對話的所有訊息"
 
 #: ../libempathy-gtk/empathy-chat.c:805
-#, fuzzy
 msgid "/topic <topic>, set the topic of the current conversation"
-msgstr "設定為目前頁面(_P)"
+msgstr "/topic <主題>，設置目前對話的主題"
 
 #: ../libempathy-gtk/empathy-chat.c:808
-#, fuzzy
 msgid "/join <chatroom id>, join a new chatroom"
-msgstr "建立新的使用者 ID"
+msgstr "/join <聊天室 id>，加入新的聊天室"
 
 #: ../libempathy-gtk/empathy-chat.c:811
-#, fuzzy
 msgid "/j <chatroom id>, join a new chatroom"
-msgstr "建立新的使用者 ID"
+msgstr "/j <聊天室 id>，加入新的聊天室"
 
 #: ../libempathy-gtk/empathy-chat.c:814
 msgid "/query <contact id> [<message>], open a private chat"
-msgstr ""
+msgstr "/query <聯絡人 id> [<訊息>]，開啟私人對話"
 
 #: ../libempathy-gtk/empathy-chat.c:817
 msgid "/msg <contact id> <message>, open a private chat"
-msgstr ""
+msgstr "/msg <聯絡人 id> <訊息>，開啟私人對話"
 
 #: ../libempathy-gtk/empathy-chat.c:820
 msgid "/nick <nickname>, change your nickname on current server"
-msgstr ""
+msgstr "/nick <網名>，更改在目前伺服器上的你的網名"
 
 #: ../libempathy-gtk/empathy-chat.c:823
 msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr ""
+msgstr "/me <訊息>，送出一個 ACTION 訊息到目前的對話中"
 
 #: ../libempathy-gtk/empathy-chat.c:826
 msgid ""
 "/say <message>, send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chatroom\""
-msgstr ""
+msgstr "/say <訊息>，送出 <訊息> 到目前的對話中。這用於傳送以「/」開頭的訊息。舉例來說：「/say /join 是用來加入新的聊天室」"
 
 #: ../libempathy-gtk/empathy-chat.c:831
 msgid ""
 "/help [<command>], show all supported commands. If <command> is defined, "
 "show its usage."
-msgstr ""
+msgstr "/help [<命令>]，顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
 
 #: ../libempathy-gtk/empathy-chat.c:841
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s"
-msgstr "用法："
+msgstr "用法: %s"
 
 #: ../libempathy-gtk/empathy-chat.c:870
-#, fuzzy
 msgid "Unknown command"
-msgstr "不明指令"
+msgstr "未知的命令"
 
 #: ../libempathy-gtk/empathy-chat.c:991
 msgid "Unknown command, see /help for the available commands"
-msgstr ""
+msgstr "未知的指令，請參見 /help 以取得可用的指令"
 
 #: ../libempathy-gtk/empathy-chat.c:1130
 msgid "offline"
@@ -1231,7 +1183,7 @@ msgstr "傳送訊息「%s」時發生錯誤；%s"
 #: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
 msgid "Topic set to: %s"
-msgstr "主題設定為：%s"
+msgstr "主題設定為: %s"
 
 #: ../libempathy-gtk/empathy-chat.c:1181
 msgid "No topic defined"
@@ -1307,31 +1259,27 @@ msgid "%s has joined the room"
 msgstr "%s 已經加入此聊天室"
 
 #: ../libempathy-gtk/empathy-chat.c:1859
-#, fuzzy, c-format
-#| msgid "%s is now online."
+#, c-format
 msgid "%s is now known as %s"
-msgstr "將它視為(_U)"
+msgstr "%s 現在被稱為 %s"
 
 #: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
 msgid "Disconnected"
 msgstr "已斷線"
 
 #: ../libempathy-gtk/empathy-chat.c:2521
-#, fuzzy
 msgid "Wrong password; please try again:"
-msgstr "請使用不同的密碼再試一次。"
+msgstr "密碼錯誤；請再試一次:"
 
 #: ../libempathy-gtk/empathy-chat.c:2522
-#, fuzzy
 msgid "Retry"
-msgstr "重試(_R)"
+msgstr "重試"
 
 #: ../libempathy-gtk/empathy-chat.c:2527
 msgid "This room is protected by a password:"
-msgstr ""
+msgstr "此聊天室已被密碼保護:"
 
 #: ../libempathy-gtk/empathy-chat.c:2528
-#, fuzzy
 msgid "Join"
 msgstr "加入"
 
@@ -1454,10 +1402,8 @@ msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:496
 #: ../src/empathy-chat-window.c:864
-#, fuzzy
-#| msgid "Inviting to this room"
 msgid "Inviting you to this room"
-msgstr "%s 正在邀請你加入 %s"
+msgstr "邀請你到這個聊天室"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:527
 msgid "_Invite to chatroom"
@@ -1721,10 +1667,8 @@ msgstr "新增談話"
 
 #. add video toggle
 #: ../libempathy-gtk/empathy-new-call-dialog.c:188
-#, fuzzy
-#| msgid "Send video"
 msgid "Send _Video"
-msgstr "傳送視像"
+msgstr "傳送視像(_V)"
 
 #. add chat button
 #: ../libempathy-gtk/empathy-new-call-dialog.c:196
@@ -1734,10 +1678,8 @@ msgstr "通話(_C)"
 
 #. Tweak the dialog
 #: ../libempathy-gtk/empathy-new-call-dialog.c:206
-#, fuzzy
-#| msgid "Call"
 msgid "New Call"
-msgstr "打出新電話"
+msgstr "新通話"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2028,33 +1970,28 @@ msgid "Vietnamese"
 msgstr "越南文"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-#, fuzzy
 msgid "The contact selected cannot receive files."
-msgstr "所選的檔案無法移至回收筒。"
+msgstr "所選的聯絡人無法接收檔案。"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-#, fuzzy
 msgid "The contact selected is offline."
-msgstr "遠端主機不在網上"
+msgstr "所選的聯絡人已經離線。"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
-#, fuzzy
 msgid "No error message"
 msgstr "沒有錯誤訊息"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
-#, fuzzy
 msgid "Instant Message (Empathy)"
-msgstr "收到即時訊息"
+msgstr "即時通訊 (Empathy)"
 
 #: ../src/empathy.c:893
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
 #: ../src/empathy.c:897
-#, fuzzy
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "啟動時不顯示聯絡人清單"
+msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
 
 #: ../src/empathy.c:901
 msgid "Show the accounts dialog"
@@ -2062,7 +1999,7 @@ msgstr "顯示帳號對話盒"
 
 #: ../src/empathy.c:913
 msgid "- Empathy IM Client"
-msgstr "- Empathy IM 客戶端程式"
+msgstr "- Empathy 即時通客戶端"
 
 #: ../src/empathy-about-dialog.c:84
 msgid ""
@@ -2229,39 +2166,33 @@ msgstr "還有與你的 %s 帳號相關的修改尚未儲存。"
 #. * an unsaved new account
 #: ../src/empathy-accounts-dialog.c:69
 msgid "Your new account has not been saved yet."
-msgstr ""
+msgstr "尚未儲存你的新帳號。"
 
 #: ../src/empathy-accounts-dialog.c:232 ../src/empathy-call-window.c:729
 msgid "Connecting..."
 msgstr "連線中..."
 
 #: ../src/empathy-accounts-dialog.c:259
-#, fuzzy, c-format
-#| msgid "Disconnected"
+#, c-format
 msgid "Disconnected - %s"
-msgstr "「%s」已斷線"
+msgstr "已斷線 - %s"
 
 #: ../src/empathy-accounts-dialog.c:264
-#, fuzzy, c-format
-#| msgid "Offline"
+#, c-format
 msgid "Offline - %s"
-msgstr "離線"
+msgstr "離線 - %s"
 
 #: ../src/empathy-accounts-dialog.c:277
-#, fuzzy
 msgid "Offline - No Network Connection"
-msgstr "找不到網絡設備"
+msgstr "離線 - 無網絡連線"
 
 #: ../src/empathy-accounts-dialog.c:285
-#, fuzzy
-#| msgid "Unknown reason"
 msgid "Unknown Status"
-msgstr "電池狀態不詳"
+msgstr "未知的狀態"
 
 #: ../src/empathy-accounts-dialog.c:296
-#, fuzzy
 msgid "Offline - Account disabled"
-msgstr "準備帳號「%s」離線工作"
+msgstr "離線 - 帳號已停用"
 
 #: ../src/empathy-accounts-dialog.c:645
 msgid ""
@@ -2274,11 +2205,11 @@ msgstr ""
 #: ../src/empathy-accounts-dialog.c:934
 #, c-format
 msgid "Do you want to remove %s from your computer?"
-msgstr "你想要從你的電腦中移除羣組「%s」？"
+msgstr "是否想要從你的電腦上移除羣組 %s？"
 
 #: ../src/empathy-accounts-dialog.c:938
 msgid "This will not remove your account on the server."
-msgstr "這不會移除你在伺服器上所擁有的帳戶。"
+msgstr "這不會移除伺服器上的你的帳號。"
 
 #: ../src/empathy-accounts-dialog.c:1120
 msgid ""
@@ -2305,10 +2236,8 @@ msgid "No protocol installed"
 msgstr "尚未安裝通訊協定"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-#, fuzzy
-#| msgid "Protocol"
 msgid "Protocol:"
-msgstr "通訊協定(_P):"
+msgstr "協定："
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid ""
@@ -2321,9 +2250,8 @@ msgid "_Add..."
 msgstr "加入(_A)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-#, fuzzy
 msgid "_Import..."
-msgstr "匯入(_I)..."
+msgstr "匯入...(_I)"
 
 #: ../src/empathy-call-window.c:453
 msgid "Contrast"
@@ -2377,44 +2305,43 @@ msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
 #: ../src/empathy-call-window.c:1761
-#, fuzzy
 msgid "Technical Details"
-msgstr "<b>技術資料：</b>"
+msgstr "技術細節"
 
 #: ../src/empathy-call-window.c:1799
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式"
 
 #: ../src/empathy-call-window.c:1804
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式"
 
 #: ../src/empathy-call-window.c:1810
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
-msgstr ""
+msgstr "無法和 %s 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。"
 
 #: ../src/empathy-call-window.c:1816
 msgid "There was a failure on the network"
-msgstr ""
+msgstr "這個網絡上有錯誤發生"
 
 #: ../src/empathy-call-window.c:1820
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
-msgstr ""
+msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
 
 #: ../src/empathy-call-window.c:1823
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
-msgstr ""
+msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
 
 #: ../src/empathy-call-window.c:1833
 #, c-format
@@ -2422,47 +2349,43 @@ msgid ""
 "Something not expected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
-msgstr ""
+msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單的「除錯」視窗中收集的紀錄。"
 
 #: ../src/empathy-call-window.c:1841
 msgid "There was a failure in the call engine"
-msgstr ""
+msgstr "通話引擎內有錯誤發生"
 
 #: ../src/empathy-call-window.c:1880
 msgid "Can't establish audio stream"
-msgstr ""
+msgstr "無法建立音訊串流"
 
 #: ../src/empathy-call-window.c:1890
 msgid "Can't establish video stream"
-msgstr ""
+msgstr "無法建立視像串流"
 
 #: ../src/empathy-call-window.ui.h:1
-#, fuzzy
-#| msgid "Compact contact list"
 msgid "Call the contact again"
-msgstr "Bourne Again Shell"
+msgstr "再播打聯絡人一次"
 
 #: ../src/empathy-call-window.ui.h:2
-#, fuzzy
 msgid "Camera Off"
-msgstr "Eight Off"
+msgstr "相機關閉"
 
 #: ../src/empathy-call-window.ui.h:3
-#, fuzzy
 msgid "Camera On"
-msgstr "%s (已登入)"
+msgstr "相機開啟"
 
 #: ../src/empathy-call-window.ui.h:4
 msgid "Disable camera and stop sending video"
-msgstr ""
+msgstr "停用相機並中止傳送視像"
 
 #: ../src/empathy-call-window.ui.h:5
 msgid "Enable camera and send video"
-msgstr ""
+msgstr "啟用相機並送出視像"
 
 #: ../src/empathy-call-window.ui.h:6
 msgid "Enable camera but don't send video"
-msgstr ""
+msgstr "啟用相機但不要送出視像"
 
 #: ../src/empathy-call-window.ui.h:7
 msgid "Hang up"
@@ -2470,11 +2393,9 @@ msgstr "掛斷"
 
 #: ../src/empathy-call-window.ui.h:8
 msgid "Hang up current call"
-msgstr ""
+msgstr "掛斷目前通話"
 
 #: ../src/empathy-call-window.ui.h:9
-#, fuzzy
-#| msgid "Video preview"
 msgid "Preview"
 msgstr "預覽"
 
@@ -2487,59 +2408,52 @@ msgid "Send Audio"
 msgstr "傳送音訊"
 
 #: ../src/empathy-call-window.ui.h:12
-#, fuzzy
 msgid "Toggle audio transmission"
-msgstr "切換從 %s 錄音"
+msgstr "切換音訊傳播"
 
 #: ../src/empathy-call-window.ui.h:13
 msgid "V_ideo"
-msgstr ""
+msgstr "影像(_I)"
 
 #: ../src/empathy-call-window.ui.h:14
-#, fuzzy
-#| msgid "Video input"
 msgid "Video Off"
-msgstr "Eight Off"
+msgstr "視像關閉"
 
 #: ../src/empathy-call-window.ui.h:15
-#, fuzzy
-#| msgid "Video input"
 msgid "Video On"
-msgstr "%s (已登入)"
+msgstr "視像開啟"
 
 #: ../src/empathy-call-window.ui.h:16
-#, fuzzy
-#| msgid "Video preview"
 msgid "Video Preview"
-msgstr "影片預覽的高度"
+msgstr "視像預覽"
 
 #: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "檢視(_V)"
 
 #: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
-msgstr[0] "未讀"
+msgstr[0] "%s (%d 個未讀)"
 
 #: ../src/empathy-chat-window.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] "其它遊戲區"
+msgstr[0] "%s (與 %u 其他的)"
 
 #: ../src/empathy-chat-window.c:463
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] "還有很多人..."
+msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
 #: ../src/empathy-chat-window.c:472
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] "顯示所有工作區中的視窗"
+msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
 #: ../src/empathy-chat-window.c:683
 msgid "Typing a message."
@@ -2550,9 +2464,8 @@ msgid "C_lear"
 msgstr "清除(_L)"
 
 #: ../src/empathy-chat-window.ui.h:2
-#, fuzzy
 msgid "C_ontact"
-msgstr "聯絡人"
+msgstr "聯絡人(_O)"
 
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2563,9 +2476,8 @@ msgid "Insert _Smiley"
 msgstr "插入表情符號(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
-#, fuzzy
 msgid "Invite _Participant..."
-msgstr "出席者"
+msgstr "邀請參與...(_P)"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -2628,20 +2540,17 @@ msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
 #: ../src/empathy-event-manager.c:345
-#, fuzzy
-#| msgid "Incoming voice call"
 msgid "Incoming video call"
-msgstr "來電的聲音"
+msgstr "傳入的視像通話"
 
 #: ../src/empathy-event-manager.c:345
 msgid "Incoming call"
 msgstr "來電"
 
 #: ../src/empathy-event-manager.c:349
-#, fuzzy, c-format
-#| msgid "%s is calling you, do you want to answer?"
+#, c-format
 msgid "%s is video calling you, do you want to answer?"
-msgstr "你確定要加入影片檔案「%s」？"
+msgstr "%s 要與你進行視像通話，是否要接聽？"
 
 #: ../src/empathy-event-manager.c:350
 #, c-format
@@ -2657,10 +2566,9 @@ msgid "_Answer"
 msgstr "接聽(_A)"
 
 #: ../src/empathy-event-manager.c:495
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Incoming video call from %s"
-msgstr "收到來自 %s 的檔案傳輸"
+msgstr "來自 %s 的視像電話"
 
 #: ../src/empathy-event-manager.c:495
 #, c-format
@@ -2874,17 +2782,14 @@ msgid "%s account"
 msgstr "%s 帳號"
 
 #: ../src/empathy-main-window.c:431
-#, fuzzy
 msgid "Reconnect"
-msgstr "已斷線"
+msgstr "重新連接"
 
 #: ../src/empathy-main-window.c:438
-#, fuzzy
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #: ../src/empathy-main-window.c:445
-#, fuzzy
 msgid "Close"
 msgstr "關閉"
 
@@ -2917,24 +2822,20 @@ msgid "N_ormal Size"
 msgstr "正常大小(_O)"
 
 #: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
-#, fuzzy
 msgid "New _Call..."
-msgstr "打出新電話"
+msgstr "新通話...(_C)"
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大小加大頭貼(_A)"
 
 #: ../src/empathy-main-window.ui.h:9
-#, fuzzy
 msgid "P_references"
 msgstr "偏好設定(_R)"
 
 #: ../src/empathy-main-window.ui.h:10
-#, fuzzy
-#| msgid "Protocol"
 msgid "Show P_rotocols"
-msgstr "顯示提示"
+msgstr "顯示協定(_R)"
 
 #: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
@@ -3124,9 +3025,8 @@ msgid "Location"
 msgstr "位置"
 
 #: ../src/empathy-preferences.ui.h:13
-#, fuzzy
 msgid "Location sources:"
-msgstr "預設來源"
+msgstr "位置來源："
 
 #: ../src/empathy-preferences.ui.h:14
 msgid "Notifications"
@@ -3179,7 +3079,7 @@ msgstr "佈景主題"
 
 #: ../src/empathy-preferences.ui.h:25
 msgid "_Cellphone"
-msgstr "流動電話(_C)"
+msgstr "手機(_C)"
 
 #: ../src/empathy-preferences.ui.h:26
 msgid "_Enable bubble notifications"
@@ -3191,12 +3091,11 @@ msgstr "啟用音效通知(_E)"
 
 #: ../src/empathy-preferences.ui.h:28
 msgid "_GPS"
-msgstr "_GPS"
+msgstr "GPS(_G)"
 
 #: ../src/empathy-preferences.ui.h:29
-#, fuzzy
 msgid "_Network (IP, Wifi)"
-msgstr "Metricom Starmode IP"
+msgstr "網絡（IP, Wifi）(_N)"
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -3300,30 +3199,6 @@ msgid ""
 "extension."
 msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 
-#~ msgid "C_all"
-#~ msgstr "通話(_A)"
-
-#~ msgid "_Next"
-#~ msgstr "下一個(_N)"
-
-#~ msgid "Add new"
-#~ msgstr "加入新的"
-
-#~ msgid "Cr_eate"
-#~ msgstr "建立(_E)"
-
-#~ msgid "_Reuse an existing account"
-#~ msgstr "重複使用既存的帳號(_R)"
-
-#~ msgid "account"
-#~ msgstr "帳號"
-
-#~ msgid "No error specified"
-#~ msgstr "沒有指定的錯誤"
-
-#~ msgid "Unknown error"
-#~ msgstr "不明的錯誤"
-
 #~ msgid "Can't set an empty display name"
 #~ msgstr "不能設定空白的顯示名稱"
 
@@ -3333,6 +3208,9 @@ msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 #~ msgid "_View Previous Conversations"
 #~ msgstr "檢視前一次談話(_V)"
 
+#~ msgid "C_all"
+#~ msgstr "通話(_A)"
+
 #~ msgid ""
 #~ "The contact to display in the applet. Empty means no contact is displayed."
 #~ msgstr "要在面板程式中顯示的連絡人。留空代表不顯示連絡人。"
@@ -3379,12 +3257,30 @@ msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 #~ "\n"
 #~ "當您往後決定要將該帳號重新加入時，上述資源將仍然可以取用。"
 
+#~ msgid "Add new"
+#~ msgstr "加入新的"
+
+#~ msgid "Cr_eate"
+#~ msgstr "建立(_E)"
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "重複使用既存的帳號(_R)"
+
+#~ msgid "account"
+#~ msgstr "帳號"
+
 #~ msgid "Conversations (%d)"
 #~ msgstr "談話 (%d)"
 
 #~ msgid "_Contact"
 #~ msgstr "連絡人(_C)"
 
+#~ msgid "No error specified"
+#~ msgstr "沒有指定的錯誤"
+
+#~ msgid "Unknown error"
+#~ msgstr "不明的錯誤"
+
 #~ msgid "Allow _GPS usage"
 #~ msgstr "允許使用 _GPS"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d8c49afb1..80b437cf0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,14 +3,14 @@
 # Abel Cheung <abel@oaka.org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
 # Tryneeds translation team, 2009.
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2009.
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.28.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-26 18:57+0800\n"
-"PO-Revision-Date: 2009-12-26 08:08+0800\n"
+"POT-Creation-Date: 2010-01-01 15:02+0800\n"
+"PO-Revision-Date: 2010-01-01 10:59+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy IM Client"
-msgstr "Empathy IM 客戶端程式"
+msgstr "Empathy 即時通客戶端"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "IM Client"
-msgstr "IM 客戶端"
+msgstr "即時通客戶端"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "Send and receive messages"
@@ -62,9 +62,8 @@ msgid "Connection managers should be used"
 msgstr "使用連線管理程式"
 
 #: ../data/empathy.schemas.in.h:7
-#, fuzzy
 msgid "Contact list sort criterion"
-msgstr "連絡人清單排序條件"
+msgstr "連絡人清單排序準則"
 
 #: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
@@ -219,10 +218,8 @@ msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
 #: ../data/empathy.schemas.in.h:46
-#, fuzzy
-#| msgid "Protocol"
 msgid "Show protocols"
-msgstr "安全式通訊協定"
+msgstr "顯示協定"
 
 #: ../data/empathy.schemas.in.h:47
 msgid "Spell checking languages"
@@ -394,12 +391,8 @@ msgid "Whether or not to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
 #: ../data/empathy.schemas.in.h:83
-#, fuzzy
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
 msgid "Whether or not to show protocols for contacts in the contact list."
-msgstr "是否在連絡人清單中顯示離線的連絡人。"
+msgstr "是否要顯示聯絡人清單內的聯絡人使用協定。"
 
 #: ../data/empathy.schemas.in.h:84
 msgid "Whether or not to show the contact list in chat rooms."
@@ -420,13 +413,12 @@ msgid "Whether to use the theme for chat rooms or not."
 msgstr "是否在聊天室使用佈景主題。"
 
 #: ../data/empathy.schemas.in.h:88
-#, fuzzy
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
-"排序連絡人清單時要使用哪個條件。預設值是使用連絡人的名稱「name」數值來排序。"
+"排序連絡人清單時要使用哪個準則。預設值是使用連絡人的名稱「name」數值來排序。"
 "而數值「state」則會使用其狀態來排序連絡人清單。"
 
 #: ../libempathy/empathy-ft-handler.c:839
@@ -502,16 +494,12 @@ msgid "Offline"
 msgstr "離線"
 
 #: ../libempathy/empathy-utils.c:286
-#, fuzzy
-#| msgid "No reason was specified"
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
 #: ../libempathy/empathy-utils.c:288
-#, fuzzy
-#| msgid "%s has disconnected"
 msgid "User requested disconnect"
-msgstr "中斷選取的裝置"
+msgstr "連接不上要求的使用者"
 
 #: ../libempathy/empathy-utils.c:290
 msgid "Network error"
@@ -640,16 +628,12 @@ msgid "Enabled"
 msgstr "已啟用"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1460
-#, fuzzy
-#| msgid "This will not remove your account on the server."
 msgid "This account already exists on the server"
-msgstr "這不會移除您在伺服器上所擁有的帳戶。"
+msgstr "此帳號已經存在這個伺服器上"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1463
-#, fuzzy
-#| msgid "_Create a new account"
 msgid "Create a new account on the server"
-msgstr "在選取的裝置上建立新的檔案系統"
+msgstr "在這個伺服器上建立新的帳號"
 
 #. To translators: The first parameter is the login id and the
 #. * second one is the server. The resulting string will be something
@@ -775,8 +759,6 @@ msgstr "新網路"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:184
 #: ../libempathy-gtk/empathy-account-widget-sip.c:217
-#, fuzzy
-#| msgid "_About"
 msgid "Auto"
 msgstr "自動"
 
@@ -795,23 +777,18 @@ msgstr "TLS"
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:222
-#, fuzzy
-#| msgid "Western"
 msgid "Register"
-msgstr "暫存器"
+msgstr "註冊"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:227
-#, fuzzy
 msgid "Options"
 msgstr "選項"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:230
-#, fuzzy
-#| msgid "No"
 msgid "None"
-msgstr "＊無＊"
+msgstr "無"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
@@ -827,7 +804,7 @@ msgstr "網路:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
-msgstr "稱呼："
+msgstr "暱稱:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
@@ -919,7 +896,7 @@ msgstr "電子郵件(_E):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
-msgstr "名字(_F):"
+msgstr "名(_F):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_Jabber ID:"
@@ -927,7 +904,7 @@ msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Last Name:"
-msgstr "姓氏(_L):"
+msgstr "姓(_L):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Nickname:"
@@ -943,10 +920,8 @@ msgid "<b>Keep-Alive Options</b>"
 msgstr "顯示有關 GNOME 的選項"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#, fuzzy
-#| msgid "<b>Location</b>"
 msgid "<b>Miscellaneous Options</b>"
-msgstr "其它選項"
+msgstr "<b>雜項</b>"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 #, fuzzy
@@ -954,87 +929,75 @@ msgid "<b>NAT Traversal Options</b>"
 msgstr "顯示有關 GNOME 的選項"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#, fuzzy
-#| msgid "<b>Location</b>"
 msgid "<b>Proxy Options</b>"
-msgstr "求助選項"
+msgstr "<b>Proxy 選項</b>"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
 msgstr "<span size=\"small\"><b>範例：</b> user@my.sip.server</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-#, fuzzy
-#| msgid "Authentication failed"
 msgid "Authentication username:"
-msgstr "伺服器使用者名稱"
+msgstr "認證使用者名稱："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-#, fuzzy
-#| msgid "Discover STUN"
 msgid "Discover Binding"
-msgstr "按鍵組合"
+msgstr "探索 Binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "自動探索 STUN 伺服器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Hostname of the proxy for outbound requests."
-msgstr ""
+msgstr "資料傳出要求所使用的 proxy 主機名稱。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-#, fuzzy
 msgid "Interval (seconds)"
-msgstr "更新間隔(_U):"
+msgstr "間隔（秒）"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid ""
 "Look up the DNS SRV record at the service's domain for the host name of a "
 "STUN server."
 msgstr ""
+"查詢位於伺服器 domain 的 DNS SRV 紀錄以取得某個 STUN 伺服器的主機名稱。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#, fuzzy
 msgid "Loose Routing"
-msgstr "路由表資訊"
+msgstr "寬鬆路由"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-#, fuzzy
 msgid "Mechanism:"
-msgstr "SASL 機制"
+msgstr "機制："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Port of the proxy for outbound requests."
-msgstr ""
+msgstr "資料傳出要求所使用的 proxy 連接埠。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#, fuzzy
-#| msgid "_Port:"
 msgid "Port:"
-msgstr "連接埠(_P):"
+msgstr "連接埠："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN 伺服器:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#, fuzzy
-#| msgid "_Server:"
 msgid "Server:"
-msgstr "<b>伺服器</b>"
+msgstr "伺服器:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid ""
 "The username for SIP authentication, if different from the SIP URI\n"
 "username."
 msgstr ""
+"SIP 驗證用的使用者名稱，如果和 SIP URI 不同時使用\n"
+"使用。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#, fuzzy
-#| msgid "STUN port:"
 msgid "Transport:"
-msgstr "傳送(_T):"
+msgstr "傳送通訊埠:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid ""
@@ -1046,7 +1009,7 @@ msgstr ""
 msgid ""
 "Use the loose routing behavior and the Route header as recommended in RFC "
 "3261."
-msgstr ""
+msgstr "使用寬鬆路由行為以及使用 RFC 3261 內所建議的 Route 標頭。"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "What is your SIP account password?"
@@ -1118,61 +1081,52 @@ msgid "Failed to reconnect this chat"
 msgstr "無法重連這個聊天會議"
 
 #: ../libempathy-gtk/empathy-chat.c:621
-#, fuzzy
 msgid "Failed to join chatroom"
-msgstr ""
-"無法加入遊戲桌。\n"
-"中止加入。"
+msgstr "加入聊天室失敗"
 
 #: ../libempathy-gtk/empathy-chat.c:639
-#, fuzzy
 msgid "Failed to open private chat"
-msgstr "無法重連這個聊天會議"
+msgstr "開啟私人對話失敗"
 
 #: ../libempathy-gtk/empathy-chat.c:678
-#, fuzzy
 msgid "Topic not supported on this conversation"
-msgstr "這台印表機不支援列印。"
+msgstr "此對話的主題不被支援"
 
 #: ../libempathy-gtk/empathy-chat.c:684
-#, fuzzy
 msgid "You are not allowed to change the topic"
-msgstr "您不允許存取系統設定。"
+msgstr "您不被允許變更這個主題"
 
 #: ../libempathy-gtk/empathy-chat.c:802
 msgid "/clear, clear all messages from the current conversation"
-msgstr ""
+msgstr "/clear，清除目前對話的所有訊息"
 
 #: ../libempathy-gtk/empathy-chat.c:805
-#, fuzzy
 msgid "/topic <topic>, set the topic of the current conversation"
-msgstr "設定為目前頁面(_P)"
+msgstr "/topic <主題>，設置目前對話的主題"
 
 #: ../libempathy-gtk/empathy-chat.c:808
-#, fuzzy
 msgid "/join <chatroom id>, join a new chatroom"
-msgstr "建立新的使用者 ID"
+msgstr "/join <聊天室 id>，加入新的聊天室"
 
 #: ../libempathy-gtk/empathy-chat.c:811
-#, fuzzy
 msgid "/j <chatroom id>, join a new chatroom"
-msgstr "建立新的使用者 ID"
+msgstr "/j <聊天室 id>，加入新的聊天室"
 
 #: ../libempathy-gtk/empathy-chat.c:814
 msgid "/query <contact id> [<message>], open a private chat"
-msgstr ""
+msgstr "/query <聯絡人 id> [<訊息>]，開啟私人對話"
 
 #: ../libempathy-gtk/empathy-chat.c:817
 msgid "/msg <contact id> <message>, open a private chat"
-msgstr ""
+msgstr "/msg <聯絡人 id> <訊息>，開啟私人對話"
 
 #: ../libempathy-gtk/empathy-chat.c:820
 msgid "/nick <nickname>, change your nickname on current server"
-msgstr ""
+msgstr "/nick <暱稱>，變更在目前伺服器上的您的暱稱"
 
 #: ../libempathy-gtk/empathy-chat.c:823
 msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr ""
+msgstr "/me <訊息>，送出一個 ACTION 訊息到目前的對話中"
 
 #: ../libempathy-gtk/empathy-chat.c:826
 msgid ""
@@ -1180,26 +1134,29 @@ msgid ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chatroom\""
 msgstr ""
+"/say <訊息>，送出 <訊息> 到目前的對話中。這用於傳送以「/」開頭的訊息。舉例來"
+"說：「/say /join 是用來加入新的聊天室」"
 
 #: ../libempathy-gtk/empathy-chat.c:831
 msgid ""
 "/help [<command>], show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
+"/help [<命令>]，顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用"
+"法。"
 
 #: ../libempathy-gtk/empathy-chat.c:841
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s"
-msgstr "用法："
+msgstr "用法: %s"
 
 #: ../libempathy-gtk/empathy-chat.c:870
-#, fuzzy
 msgid "Unknown command"
-msgstr "不明指令"
+msgstr "未知的命令"
 
 #: ../libempathy-gtk/empathy-chat.c:991
 msgid "Unknown command, see /help for the available commands"
-msgstr ""
+msgstr "未知的指令，請參見 /help 以取得可用的指令"
 
 #: ../libempathy-gtk/empathy-chat.c:1130
 msgid "offline"
@@ -1233,7 +1190,7 @@ msgstr "傳送訊息「%s」時發生錯誤；%s"
 #: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
 msgid "Topic set to: %s"
-msgstr "主題設定為：%s"
+msgstr "主題設定為: %s"
 
 #: ../libempathy-gtk/empathy-chat.c:1181
 msgid "No topic defined"
@@ -1309,31 +1266,27 @@ msgid "%s has joined the room"
 msgstr "%s 已經加入此聊天室"
 
 #: ../libempathy-gtk/empathy-chat.c:1859
-#, fuzzy, c-format
-#| msgid "%s is now online."
+#, c-format
 msgid "%s is now known as %s"
-msgstr "將它視為(_U)"
+msgstr "%s 現在被稱為 %s"
 
 #: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
 msgid "Disconnected"
 msgstr "已斷線"
 
 #: ../libempathy-gtk/empathy-chat.c:2521
-#, fuzzy
 msgid "Wrong password; please try again:"
-msgstr "請使用不同的密碼再試一次。"
+msgstr "密碼錯誤；請再試一次:"
 
 #: ../libempathy-gtk/empathy-chat.c:2522
-#, fuzzy
 msgid "Retry"
-msgstr "重試(_R)"
+msgstr "重試"
 
 #: ../libempathy-gtk/empathy-chat.c:2527
 msgid "This room is protected by a password:"
-msgstr ""
+msgstr "此聊天室已被密碼保護:"
 
 #: ../libempathy-gtk/empathy-chat.c:2528
-#, fuzzy
 msgid "Join"
 msgstr "加入"
 
@@ -1456,10 +1409,8 @@ msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:496
 #: ../src/empathy-chat-window.c:864
-#, fuzzy
-#| msgid "Inviting to this room"
 msgid "Inviting you to this room"
-msgstr "%s 正在邀請您加入 %s"
+msgstr "邀請您到這個聊天室"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:527
 msgid "_Invite to chatroom"
@@ -1724,10 +1675,8 @@ msgstr "新增談話"
 
 #. add video toggle
 #: ../libempathy-gtk/empathy-new-call-dialog.c:188
-#, fuzzy
-#| msgid "Send video"
 msgid "Send _Video"
-msgstr "傳送視訊"
+msgstr "傳送視訊(_V)"
 
 #. add chat button
 #: ../libempathy-gtk/empathy-new-call-dialog.c:196
@@ -1737,10 +1686,8 @@ msgstr "通話(_C)"
 
 #. Tweak the dialog
 #: ../libempathy-gtk/empathy-new-call-dialog.c:206
-#, fuzzy
-#| msgid "Call"
 msgid "New Call"
-msgstr "打出新電話"
+msgstr "新通話"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2031,33 +1978,28 @@ msgid "Vietnamese"
 msgstr "越南文"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-#, fuzzy
 msgid "The contact selected cannot receive files."
-msgstr "所選的檔案無法移至回收筒。"
+msgstr "所選的聯絡人無法接收檔案。"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-#, fuzzy
 msgid "The contact selected is offline."
-msgstr "遠端主機不在線上"
+msgstr "所選的聯絡人已經離線。"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
-#, fuzzy
 msgid "No error message"
 msgstr "沒有錯誤訊息"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
-#, fuzzy
 msgid "Instant Message (Empathy)"
-msgstr "收到即時訊息"
+msgstr "即時通訊 (Empathy)"
 
 #: ../src/empathy.c:893
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
 #: ../src/empathy.c:897
-#, fuzzy
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "啟動時不顯示連絡人清單"
+msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
 
 #: ../src/empathy.c:901
 msgid "Show the accounts dialog"
@@ -2065,7 +2007,7 @@ msgstr "顯示帳號對話盒"
 
 #: ../src/empathy.c:913
 msgid "- Empathy IM Client"
-msgstr "- Empathy IM 客戶端程式"
+msgstr "- Empathy 即時通客戶端"
 
 #: ../src/empathy-about-dialog.c:84
 msgid ""
@@ -2245,39 +2187,33 @@ msgstr "還有與您的 %s 帳號相關的修改尚未儲存。"
 #. * an unsaved new account
 #: ../src/empathy-accounts-dialog.c:69
 msgid "Your new account has not been saved yet."
-msgstr ""
+msgstr "尚未儲存您的新帳號。"
 
 #: ../src/empathy-accounts-dialog.c:232 ../src/empathy-call-window.c:729
 msgid "Connecting..."
 msgstr "連線中..."
 
 #: ../src/empathy-accounts-dialog.c:259
-#, fuzzy, c-format
-#| msgid "Disconnected"
+#, c-format
 msgid "Disconnected - %s"
-msgstr "「%s」已斷線"
+msgstr "已斷線 - %s"
 
 #: ../src/empathy-accounts-dialog.c:264
-#, fuzzy, c-format
-#| msgid "Offline"
+#, c-format
 msgid "Offline - %s"
-msgstr "離線"
+msgstr "離線 - %s"
 
 #: ../src/empathy-accounts-dialog.c:277
-#, fuzzy
 msgid "Offline - No Network Connection"
-msgstr "找不到網路設備"
+msgstr "離線 - 無網路連線"
 
 #: ../src/empathy-accounts-dialog.c:285
-#, fuzzy
-#| msgid "Unknown reason"
 msgid "Unknown Status"
-msgstr "電池狀態不詳"
+msgstr "未知的狀態"
 
 #: ../src/empathy-accounts-dialog.c:296
-#, fuzzy
 msgid "Offline - Account disabled"
-msgstr "準備帳號「%s」離線工作"
+msgstr "離線 - 帳號已停用"
 
 #: ../src/empathy-accounts-dialog.c:645
 msgid ""
@@ -2290,11 +2226,11 @@ msgstr ""
 #: ../src/empathy-accounts-dialog.c:934
 #, c-format
 msgid "Do you want to remove %s from your computer?"
-msgstr "您想要從您的電腦中移除群組「%s」？"
+msgstr "是否想要從您的電腦上移除群組 %s？"
 
 #: ../src/empathy-accounts-dialog.c:938
 msgid "This will not remove your account on the server."
-msgstr "這不會移除您在伺服器上所擁有的帳戶。"
+msgstr "這不會移除伺服器上的您的帳號。"
 
 #: ../src/empathy-accounts-dialog.c:1120
 msgid ""
@@ -2321,10 +2257,8 @@ msgid "No protocol installed"
 msgstr "尚未安裝通訊協定"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-#, fuzzy
-#| msgid "Protocol"
 msgid "Protocol:"
-msgstr "通訊協定(_P):"
+msgstr "協定："
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid ""
@@ -2337,9 +2271,8 @@ msgid "_Add..."
 msgstr "加入(_A)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-#, fuzzy
 msgid "_Import..."
-msgstr "匯入(_I)..."
+msgstr "匯入...(_I)"
 
 #: ../src/empathy-call-window.c:453
 msgid "Contrast"
@@ -2393,44 +2326,43 @@ msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
 #: ../src/empathy-call-window.c:1761
-#, fuzzy
 msgid "Technical Details"
-msgstr "<b>技術資料：</b>"
+msgstr "技術細節"
 
 #: ../src/empathy-call-window.c:1799
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
 
 #: ../src/empathy-call-window.c:1804
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
 
 #: ../src/empathy-call-window.c:1810
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
-msgstr ""
+msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
 
 #: ../src/empathy-call-window.c:1816
 msgid "There was a failure on the network"
-msgstr ""
+msgstr "這個網路上有錯誤發生"
 
 #: ../src/empathy-call-window.c:1820
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
-msgstr ""
+msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
 
 #: ../src/empathy-call-window.c:1823
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
-msgstr ""
+msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
 
 #: ../src/empathy-call-window.c:1833
 #, c-format
@@ -2439,46 +2371,44 @@ msgid ""
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
+"在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
+"從求助選單的「除錯」視窗中收集的紀錄。"
 
 #: ../src/empathy-call-window.c:1841
 msgid "There was a failure in the call engine"
-msgstr ""
+msgstr "通話引擎內有錯誤發生"
 
 #: ../src/empathy-call-window.c:1880
 msgid "Can't establish audio stream"
-msgstr ""
+msgstr "無法建立音訊串流"
 
 #: ../src/empathy-call-window.c:1890
 msgid "Can't establish video stream"
-msgstr ""
+msgstr "無法建立視訊串流"
 
 #: ../src/empathy-call-window.ui.h:1
-#, fuzzy
-#| msgid "Compact contact list"
 msgid "Call the contact again"
-msgstr "Bourne Again Shell"
+msgstr "再播打聯絡人一次"
 
 #: ../src/empathy-call-window.ui.h:2
-#, fuzzy
 msgid "Camera Off"
-msgstr "Eight Off"
+msgstr "相機關閉"
 
 #: ../src/empathy-call-window.ui.h:3
-#, fuzzy
 msgid "Camera On"
-msgstr "%s (已登入)"
+msgstr "相機開啟"
 
 #: ../src/empathy-call-window.ui.h:4
 msgid "Disable camera and stop sending video"
-msgstr ""
+msgstr "停用相機並中止傳送視訊"
 
 #: ../src/empathy-call-window.ui.h:5
 msgid "Enable camera and send video"
-msgstr ""
+msgstr "啟用相機並送出視訊"
 
 #: ../src/empathy-call-window.ui.h:6
 msgid "Enable camera but don't send video"
-msgstr ""
+msgstr "啟用相機但不要送出視訊"
 
 #: ../src/empathy-call-window.ui.h:7
 msgid "Hang up"
@@ -2486,11 +2416,9 @@ msgstr "掛斷"
 
 #: ../src/empathy-call-window.ui.h:8
 msgid "Hang up current call"
-msgstr ""
+msgstr "掛斷目前通話"
 
 #: ../src/empathy-call-window.ui.h:9
-#, fuzzy
-#| msgid "Video preview"
 msgid "Preview"
 msgstr "預覽"
 
@@ -2503,59 +2431,52 @@ msgid "Send Audio"
 msgstr "傳送音訊"
 
 #: ../src/empathy-call-window.ui.h:12
-#, fuzzy
 msgid "Toggle audio transmission"
-msgstr "切換從 %s 錄音"
+msgstr "切換音訊傳播"
 
 #: ../src/empathy-call-window.ui.h:13
 msgid "V_ideo"
-msgstr ""
+msgstr "影像(_I)"
 
 #: ../src/empathy-call-window.ui.h:14
-#, fuzzy
-#| msgid "Video input"
 msgid "Video Off"
-msgstr "Eight Off"
+msgstr "視訊關閉"
 
 #: ../src/empathy-call-window.ui.h:15
-#, fuzzy
-#| msgid "Video input"
 msgid "Video On"
-msgstr "%s (已登入)"
+msgstr "視訊開啟"
 
 #: ../src/empathy-call-window.ui.h:16
-#, fuzzy
-#| msgid "Video preview"
 msgid "Video Preview"
-msgstr "影片預覽的高度"
+msgstr "視訊預覽"
 
 #: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "檢視(_V)"
 
 #: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
-msgstr[0] "未讀"
+msgstr[0] "%s (%d 個未讀)"
 
 #: ../src/empathy-chat-window.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] "其它遊戲區"
+msgstr[0] "%s (與 %u 其他的)"
 
 #: ../src/empathy-chat-window.c:463
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] "還有很多人..."
+msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
 #: ../src/empathy-chat-window.c:472
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] "顯示所有工作區中的視窗"
+msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
 #: ../src/empathy-chat-window.c:683
 msgid "Typing a message."
@@ -2566,9 +2487,8 @@ msgid "C_lear"
 msgstr "清除(_L)"
 
 #: ../src/empathy-chat-window.ui.h:2
-#, fuzzy
 msgid "C_ontact"
-msgstr "連絡人"
+msgstr "連絡人(_O)"
 
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2579,9 +2499,8 @@ msgid "Insert _Smiley"
 msgstr "插入表情符號(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
-#, fuzzy
 msgid "Invite _Participant..."
-msgstr "出席者"
+msgstr "邀請參與...(_P)"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -2644,20 +2563,17 @@ msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
 #: ../src/empathy-event-manager.c:345
-#, fuzzy
-#| msgid "Incoming voice call"
 msgid "Incoming video call"
-msgstr "來電的聲音"
+msgstr "傳入的視訊通話"
 
 #: ../src/empathy-event-manager.c:345
 msgid "Incoming call"
 msgstr "來電"
 
 #: ../src/empathy-event-manager.c:349
-#, fuzzy, c-format
-#| msgid "%s is calling you, do you want to answer?"
+#, c-format
 msgid "%s is video calling you, do you want to answer?"
-msgstr "您確定要加入影片檔案「%s」？"
+msgstr "%s 要與您進行視訊通話，是否要接聽？"
 
 #: ../src/empathy-event-manager.c:350
 #, c-format
@@ -2673,10 +2589,9 @@ msgid "_Answer"
 msgstr "接聽(_A)"
 
 #: ../src/empathy-event-manager.c:495
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Incoming video call from %s"
-msgstr "收到來自 %s 的檔案傳輸"
+msgstr "來自 %s 的視訊電話"
 
 #: ../src/empathy-event-manager.c:495
 #, c-format
@@ -2890,17 +2805,14 @@ msgid "%s account"
 msgstr "%s 帳號"
 
 #: ../src/empathy-main-window.c:431
-#, fuzzy
 msgid "Reconnect"
-msgstr "已斷線"
+msgstr "重新連接"
 
 #: ../src/empathy-main-window.c:438
-#, fuzzy
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #: ../src/empathy-main-window.c:445
-#, fuzzy
 msgid "Close"
 msgstr "關閉"
 
@@ -2933,24 +2845,20 @@ msgid "N_ormal Size"
 msgstr "正常大小(_O)"
 
 #: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
-#, fuzzy
 msgid "New _Call..."
-msgstr "打出新電話"
+msgstr "新通話...(_C)"
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大小加大頭貼(_A)"
 
 #: ../src/empathy-main-window.ui.h:9
-#, fuzzy
 msgid "P_references"
 msgstr "偏好設定(_R)"
 
 #: ../src/empathy-main-window.ui.h:10
-#, fuzzy
-#| msgid "Protocol"
 msgid "Show P_rotocols"
-msgstr "顯示提示"
+msgstr "顯示協定(_R)"
 
 #: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
@@ -3142,9 +3050,8 @@ msgid "Location"
 msgstr "位置"
 
 #: ../src/empathy-preferences.ui.h:13
-#, fuzzy
 msgid "Location sources:"
-msgstr "預設來源"
+msgstr "位置來源："
 
 #: ../src/empathy-preferences.ui.h:14
 msgid "Notifications"
@@ -3199,7 +3106,7 @@ msgstr "佈景主題"
 
 #: ../src/empathy-preferences.ui.h:25
 msgid "_Cellphone"
-msgstr "行動電話(_C)"
+msgstr "手機(_C)"
 
 #: ../src/empathy-preferences.ui.h:26
 msgid "_Enable bubble notifications"
@@ -3211,12 +3118,11 @@ msgstr "啟用音效通知(_E)"
 
 #: ../src/empathy-preferences.ui.h:28
 msgid "_GPS"
-msgstr "_GPS"
+msgstr "GPS(_G)"
 
 #: ../src/empathy-preferences.ui.h:29
-#, fuzzy
 msgid "_Network (IP, Wifi)"
-msgstr "Metricom Starmode IP"
+msgstr "網路（IP, Wifi）(_N)"
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -3320,30 +3226,6 @@ msgid ""
 "extension."
 msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 
-#~ msgid "C_all"
-#~ msgstr "通話(_A)"
-
-#~ msgid "_Next"
-#~ msgstr "下一個(_N)"
-
-#~ msgid "Add new"
-#~ msgstr "加入新的"
-
-#~ msgid "Cr_eate"
-#~ msgstr "建立(_E)"
-
-#~ msgid "_Reuse an existing account"
-#~ msgstr "重複使用既存的帳號(_R)"
-
-#~ msgid "account"
-#~ msgstr "帳號"
-
-#~ msgid "No error specified"
-#~ msgstr "沒有指定的錯誤"
-
-#~ msgid "Unknown error"
-#~ msgstr "不明的錯誤"
-
 #~ msgid "Can't set an empty display name"
 #~ msgstr "不能設定空白的顯示名稱"
 
@@ -3353,6 +3235,9 @@ msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 #~ msgid "_View Previous Conversations"
 #~ msgstr "檢視前一次談話(_V)"
 
+#~ msgid "C_all"
+#~ msgstr "通話(_A)"
+
 #~ msgid ""
 #~ "The contact to display in the applet. Empty means no contact is displayed."
 #~ msgstr "要在面板程式中顯示的連絡人。留空代表不顯示連絡人。"
@@ -3399,12 +3284,30 @@ msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 #~ "\n"
 #~ "當您往後決定要將該帳號重新加入時，上述資源將仍然可以取用。"
 
+#~ msgid "Add new"
+#~ msgstr "加入新的"
+
+#~ msgid "Cr_eate"
+#~ msgstr "建立(_E)"
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "重複使用既存的帳號(_R)"
+
+#~ msgid "account"
+#~ msgstr "帳號"
+
 #~ msgid "Conversations (%d)"
 #~ msgstr "談話 (%d)"
 
 #~ msgid "_Contact"
 #~ msgstr "連絡人(_C)"
 
+#~ msgid "No error specified"
+#~ msgstr "沒有指定的錯誤"
+
+#~ msgid "Unknown error"
+#~ msgstr "不明的錯誤"
+
 #~ msgid "Allow _GPS usage"
 #~ msgstr "允許使用 _GPS"