aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/zh_HK.po711
-rw-r--r--po/zh_TW.po711
2 files changed, 870 insertions, 552 deletions
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2a49cd69c..45643cc5c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.31.90\n"
+"Project-Id-Version: empathy 2.31.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 20:02+0800\n"
-"PO-Revision-Date: 2010-08-23 20:02+0800\n"
+"POT-Creation-Date: 2010-09-05 19:51+0800\n"
+"PO-Revision-Date: 2010-09-05 19:51+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"
@@ -19,8 +19,8 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
-msgstr "使用 Google Talk、Facebook、MSN,與其他聊天服務和他人對話"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk、Facebook、MSN 與其他聊天服務和他人對話"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
@@ -83,9 +83,9 @@ msgstr "在狀態區域顯示收到事件"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
-msgstr "在狀態區域顯示收到事件。如果不啟用的話,收到事件會直接顯示給使用者看。"
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "在狀態區域顯示收到事件。如果不啟用的話,收到事件會直接呈現給使用者。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
@@ -292,7 +292,8 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否應在啟動時自動登入你的帳號。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
@@ -428,7 +429,7 @@ msgstr "管理訊息與 VoIP 帳號"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2092
+#: ../src/empathy-accounts-dialog.c:2151
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
@@ -611,18 +612,18 @@ msgstr "證書使用不安全的密碼演算法,或是密碼處理上較弱"
#: ../libempathy/empathy-utils.c:376
msgid ""
"The length of the server certificate, or the depth of the server certificate "
-"chain exceed the limits imposed by the crypto library"
-msgstr "伺服器證書的長度,或是伺服器證書鏈的深度超過密碼函式庫所能處理的限制。"
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "伺服器證書的長度,或是伺服器證書鏈的深度超過密碼函式庫所能處理的範圍"
-#: ../libempathy/empathy-utils.c:529
+#: ../libempathy/empathy-utils.c:540
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:545
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:546
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -670,60 +671,92 @@ msgstr "未來"
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:606
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+#, fuzzy
+#| msgid "Password:"
+msgid "Password"
+msgstr "密碼:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "伺服器"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "連接埠"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1137
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1480
+#: ../libempathy-gtk/empathy-account-widget.c:1522
+msgid "A_pply"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1552
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1548
+#: ../libempathy-gtk/empathy-account-widget.c:1618
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1390
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "帳號:"
-#: ../libempathy-gtk/empathy-account-widget.c:1559
-msgid "Enabled"
+#: ../libempathy-gtk/empathy-account-widget.c:1629
+#, fuzzy
+#| msgid "Enabled"
+msgid "_Enabled"
msgstr "已啟用"
-#: ../libempathy-gtk/empathy-account-widget.c:1624
+#: ../libempathy-gtk/empathy-account-widget.c:1694
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1627
+#: ../libempathy-gtk/empathy-account-widget.c:1697
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
+#: ../libempathy-gtk/empathy-account-widget.c:1790
+msgid "Ca_ncel"
+msgstr ""
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1996
+#: ../libempathy-gtk/empathy-account-widget.c:2078
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2104
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2026
+#: ../libempathy-gtk/empathy-account-widget.c:2108
msgid "New account"
msgstr "新增帳號"
@@ -745,11 +778,11 @@ msgstr "進階"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "密碼(_W):"
@@ -790,7 +823,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>範例:</b> 使用者名稱"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "登入 I_D:"
@@ -808,26 +841,24 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>範例:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#, fuzzy
+#| msgid "Character set:"
+msgid "Ch_aracter set:"
+msgstr "字集:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "你的 ICQ UIN 是?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "你的 ICQ 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "字集(_C):"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:246
-msgid "New Network"
-msgstr "新增網絡"
-
#: ../libempathy-gtk/empathy-account-widget-sip.c:183
#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
@@ -893,6 +924,14 @@ msgstr "真實姓名:"
msgid "Servers"
msgstr "伺服器"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "你的 IRC 網名是?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "哪個 IRC 網絡?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>範例:</b> user@gmail.com"
@@ -901,20 +940,34 @@ msgstr "<b>範例:</b> user@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>範例:</b> user@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#, fuzzy
+#| msgid "_Encryption required (TLS/SSL)"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "要求加密[TLS/SSL](_E)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#, fuzzy
+#| msgid "_Ignore SSL certificate errors"
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL 證書錯誤(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "覆蓋伺服器設定值"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#, fuzzy
+#| msgid "Pri_ority:"
+msgid "Priori_ty:"
msgstr "優先權(_O):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "資源(_U):"
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -925,50 +978,42 @@ msgstr ""
"如果你是 facebook.com/<b>badger</b> 的話,請輸入 <b>badger</b>。\n"
"如果你還沒有 Facebook 使用者名稱,請使用 <a href=\"http://www.facebook.com/username/\">此網頁</a> 來選用一個。"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "使用舊版 SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "你的 Facebook 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "你的 Facebook 使用者名稱是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "你的 Google ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "你的 Google 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "你的 Jabber ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "你的 Jabber 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "你想要的 Jabber ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "你想要的 Jabber 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "要求加密[TLS/SSL](_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "忽略 SSL 證書錯誤(_I)"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>範例:</b> user@hotmail.com"
@@ -982,25 +1027,29 @@ msgid "What is your Windows Live password?"
msgstr "你的 Windows Live 密碼是?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "電子郵件位址(_E):"
+#, fuzzy
+#| msgid "E-mail address:"
+msgid "E-_mail address:"
+msgstr "電子信箱位址:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#, fuzzy
+#| msgid "Nickname:"
+msgid "Nic_kname:"
+msgstr "網名:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "名(_F):"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "姓(_L):"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "網名(_N):"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "發佈的名稱(_P):"
@@ -1078,25 +1127,27 @@ msgid "_Username:"
msgstr "使用者名稱(_U):"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#, fuzzy
+#| msgid "_Ignore conference and chat room invitations"
+msgid "I_gnore conference and chat room invitations"
+msgstr "忽略會議與聊天室邀請(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "Use _Yahoo! Japan"
msgstr "使用 Yahoo! 日本(_Y)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "你的 Yahoo! ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! password?"
msgstr "你的 Yahoo! 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "Yahoo! I_D:"
msgstr "Yahoo I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "忽略會議與聊天室邀請(_I)"
-
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "聊天室清單地區(_R):"
@@ -1130,141 +1181,141 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裏放大"
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "你不被允許更改這個主題"
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>:設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>:加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>:加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <網名>:更改在目前伺服器上的你的網名"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>:送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
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 chat room\""
msgstr "/say <訊息>:送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來說:「/say /join 是用來加入新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr "/help [<命令>]:顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "無效的聯絡人"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "主題:"
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-chat.c:1847
#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1272,12 +1323,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1285,17 +1336,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1305,46 +1356,46 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "談話"
@@ -1368,7 +1419,7 @@ msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:288
msgid "Edit Contact Information"
msgstr "編輯聯絡人資訊"
@@ -1390,85 +1441,84 @@ msgid "Subscription Request"
msgstr "訂閱要求"
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "是否想要移除羣組「%s」?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2086
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "正在移除羣組"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2055
#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2225
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2171
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "是否想要移除聯絡人「%s」?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2173
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "正在移除聯絡人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:360
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:463
+#: ../libempathy-gtk/empathy-individual-menu.c:514
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:504
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:546
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "視像通話(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:604
+#: ../libempathy-gtk/empathy-individual-menu.c:642
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../libempathy-gtk/empathy-individual-menu.c:683
msgid "Send File"
msgstr "傳送檔案"
#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Share My Desktop"
msgstr "分享我的桌面"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1537
-#: ../libempathy-gtk/empathy-individual-menu.c:721
-#: ../libempathy-gtk/empathy-individual-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "喜好"
#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:748
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "資訊(_M)"
@@ -1478,13 +1528,13 @@ msgid "_Edit"
msgstr "編輯(_E)"
#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:970
#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "邀請你到這個聊天室"
#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:981
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1518,148 +1568,152 @@ msgid "Birthday:"
msgstr "生日:"
#: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
#: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "國家:"
#: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "州:"
#: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "市:"
#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "區域:"
#: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "郵遞區號:"
#: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "街:"
#: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "建築:"
#: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "樓層:"
#: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "室:"
#: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "文字:"
#: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "描述:"
#: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "準確度等級:"
#: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "錯誤:"
#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (米):"
#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (米):"
#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "速度:"
#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "方位:"
#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "爬升速度:"
#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "上次更新於:"
#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "經度:"
#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "緯度:"
#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "緯度:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:578
+#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:594
-msgid "<b>Location</b>, "
-msgstr "<b>位置<b>,"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s、%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:642
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:838
-#: ../libempathy-gtk/empathy-individual-widget.c:832
+#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:894
-#: ../libempathy-gtk/empathy-individual-widget.c:890
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1669,7 +1723,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1218
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "別名:"
@@ -1689,7 +1743,7 @@ msgstr "聯絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1419
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "識別身分:"
@@ -1721,48 +1775,58 @@ msgid "_Add Group"
msgstr "加入羣組(_G)"
#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
msgid "Select"
msgstr "選擇"
#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1231
+#: ../src/empathy-main-window.c:1247
msgid "Group"
msgstr "羣組"
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:302
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
msgid "Linked Contacts"
msgstr "已連結的聯絡人"
-#: ../libempathy-gtk/empathy-individual-linker.c:252
+#: ../libempathy-gtk/empathy-individual-linker.c:354
msgid "Select contacts to link"
msgstr "選取要連結的聯絡人"
-#: ../libempathy-gtk/empathy-individual-linker.c:303
+#: ../libempathy-gtk/empathy-individual-linker.c:428
msgid "New contact preview"
msgstr "新增聯絡人預覽"
-#: ../libempathy-gtk/empathy-individual-menu.c:108
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "在所方清單所選的聯絡人將連結在一起。"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:799
+#: ../libempathy-gtk/empathy-individual-menu.c:837
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-individual-menu.c:829
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
msgctxt "Link individual (contextual menu)"
msgid "_Link…"
msgstr "連結(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1552
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1772,36 +1836,39 @@ msgstr[0] "後設聯絡人包含 %u 位聯絡人"
msgid "<b>Location</b> at (date)"
msgstr "<b>位置</b> 於 (日期)"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "新增網絡"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#, fuzzy
+#| msgid "Which IRC network?"
+msgid "Choose an IRC network"
+msgstr "哪個 IRC 網絡?"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "新增伺服器"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "伺服器"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "連接埠"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-linking-dialog.c:92
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:109
msgid "Link Contacts"
msgstr "連結聯絡人"
#. Add button
-#: ../libempathy-gtk/empathy-linking-dialog.c:102
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid "_Link"
msgstr "連結(_L)"
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "帳號"
-
#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "日期"
@@ -1812,11 +1879,11 @@ msgid "Conversations"
msgstr "談話"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Find next"
+msgid "Find Next"
msgstr "尋找下一個"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "Find previous"
+msgid "Find Previous"
msgstr "尋找上一個"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
@@ -1983,6 +2050,76 @@ msgstr "清爽"
msgid "Blue"
msgstr "藍色"
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certrificate is not signed by a Certification Authority"
+msgstr "證書並非由證書授權中心所簽署"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "證書已逾期"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "證書尚未啟用"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "證書並未擁有預期的指紋"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "證書所驗證的主機名稱與伺服器名稱不符"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "證書為自我簽署"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "證書已被原本發出的證書授權機構撤銷"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "證書於密碼防護上較弱"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "證書長度超出可驗證的範圍"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "證書格式不良"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "預期的證書主機名稱:%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "證書主機名稱:%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "繼續"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "此連線未受信任。你無論如何都要繼續嗎?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "請記住此選擇以供未來連線使用"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "證書詳細資料"
+
#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Unable to open URI"
msgstr "無法開啓 URI"
@@ -2175,8 +2312,7 @@ msgstr "所選的聯絡人已經離線。"
msgid "No error message"
msgstr "沒有錯誤訊息"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
@@ -2259,7 +2395,7 @@ msgid ""
msgstr "你可以回到前頁再次輸入帳號的詳細資料或結束此助理,稍後再從「編輯」選單加入帳號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1311
+#: ../src/empathy-account-assistant.c:1310
msgid "An error occurred"
msgstr "發生錯誤"
@@ -2268,36 +2404,36 @@ msgstr "發生錯誤"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:604
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "新增 %s 帳號"
-#: ../src/empathy-account-assistant.c:510
+#: ../src/empathy-account-assistant.c:509
msgid "What kind of chat account do you have?"
msgstr "你的聊天帳號是哪一種?"
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:515
msgid "Do you have any other chat accounts you want to set up?"
msgstr "你還想要設定其他的聊天帳號嗎?"
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:521
msgid "Enter your account details"
msgstr "請輸入你的帳號詳細資料"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
msgid "What kind of chat account do you want to create?"
msgstr "你想要建立何種聊天帳號?"
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:532
msgid "Do you want to create other chat accounts?"
msgstr "是否想要建立其他聊天帳號?"
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:539
msgid "Enter the details for the new account"
msgstr "請輸入新帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:655
+#: ../src/empathy-account-assistant.c:654
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2305,41 +2441,41 @@ msgid ""
"calls."
msgstr "使用 Empathy 可以在網上跟附近的人聊天,或是和使用 Google Talk、AIM、Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網絡攝影機還可以進行語音或視像通話。"
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:671
msgid "Do you have an account you've been using with another chat program?"
msgstr "你是否有使用其他聊天程式的帳號?"
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:694
msgid "Yes, import my account details from "
msgstr "是的,請匯入我的帳號詳細資料於"
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:715
msgid "Yes, I'll enter my account details now"
msgstr "是的,我現在要輸入帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:737
msgid "No, I want a new account"
msgstr "不,我想要新的帳號"
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:747
msgid "No, I just want to see people online nearby for now"
msgstr "不,我現在只想看看附近有誰上線"
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:768
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:859
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../src/empathy-account-assistant.c:1125
+#: ../src/empathy-account-assistant.c:1124
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2347,16 +2483,16 @@ msgid ""
"disable this feature by using the 'Accounts' dialog"
msgstr "Empathy 可以自動探索與你連線到相同網絡上的人們,並且和他們聊天。如果你想要使用此功能,請檢查下列詳細資料是否正確。你也可以在以後簡單地更改這些細節,或是用「帳號」對話窗來停用此功能"
-#: ../src/empathy-account-assistant.c:1131
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1186
msgid "Edit->Accounts"
msgstr "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1146
msgid "I don't want to enable this feature for now"
msgstr "我現在不想要啟用這項功能"
-#: ../src/empathy-account-assistant.c:1183
+#: ../src/empathy-account-assistant.c:1182
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2364,23 +2500,23 @@ msgid ""
"the Accounts dialog"
msgstr "你無法與連線到你本機網絡的人們聊天,因為 telepathy-salut 尚未安裝。如果你想要啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳號"
-#: ../src/empathy-account-assistant.c:1189
+#: ../src/empathy-account-assistant.c:1188
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1234
msgid "Messaging and VoIP Accounts Assistant"
msgstr "訊息與 VoIP 帳號助理"
-#: ../src/empathy-account-assistant.c:1269
+#: ../src/empathy-account-assistant.c:1268
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1278
+#: ../src/empathy-account-assistant.c:1277
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1296
+#: ../src/empathy-account-assistant.c:1295
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
@@ -2397,33 +2533,33 @@ msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存你的新帳號。"
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
msgid "Connecting…"
msgstr "連線中…"
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "離線 — %s"
-#: ../src/empathy-accounts-dialog.c:324
+#: ../src/empathy-accounts-dialog.c:334
#, c-format
msgid "Disconnected — %s"
msgstr "已斷線 — %s"
-#: ../src/empathy-accounts-dialog.c:335
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "離線 — 無網絡連線"
-#: ../src/empathy-accounts-dialog.c:342
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "未知的狀態"
-#: ../src/empathy-accounts-dialog.c:354
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "離線 — 帳號已停用"
-#: ../src/empathy-accounts-dialog.c:795
+#: ../src/empathy-accounts-dialog.c:805
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2431,16 +2567,16 @@ msgstr ""
"你即將建立新的帳號,這樣會放棄\n"
"你所做的更改。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1142
+#: ../src/empathy-accounts-dialog.c:1152
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "是否想要從你的電腦上移除羣組 %s?"
-#: ../src/empathy-accounts-dialog.c:1146
+#: ../src/empathy-accounts-dialog.c:1156
msgid "This will not remove your account on the server."
msgstr "這不會移除伺服器上的你的帳號。"
-#: ../src/empathy-accounts-dialog.c:1383
+#: ../src/empathy-accounts-dialog.c:1394
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2448,7 +2584,7 @@ msgstr ""
"你即將建立另一個帳號,這樣會放棄\n"
"你所做的更改。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1960
+#: ../src/empathy-accounts-dialog.c:1997
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2457,28 +2593,40 @@ msgstr ""
"你所做的更改。確定要繼續?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "正在載入帳號資訊"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "尚未安裝通訊協定"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "協定:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "要加入新的帳號,你必須先安裝每個會用到的通訊協定後端程式。"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "加入(_A)…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr "- Empathy 認證用戶端"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy 認證用戶端"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
msgid "People nearby"
msgstr "附近的人"
@@ -3076,32 +3224,31 @@ msgstr "通訊協定"
msgid "Source"
msgstr "來源"
-#. Labels for empty contact list
-#: ../src/empathy-main-window.c:95
+#: ../src/empathy-main-window.c:383
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1213
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "聯絡人"
-#: ../src/empathy-main-window.c:1538
+#: ../src/empathy-main-window.c:1554
msgid "Contact List"
msgstr "聯絡人清單"
-#: ../src/empathy-main-window.c:1647
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3195,29 +3342,29 @@ msgstr "成員"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:605
+#: ../src/empathy-new-chatroom-dialog.c:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"需要邀請:%s\n"
"需要密碼:%s\n"
"成員:%s"
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
@@ -3530,8 +3677,8 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "不要顯示任何對話窗;執行任何作業(例:匯入)並離開"
#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "如果有任何非 salut 的帳號,就不要顯示任何對話窗"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "如果有任何非 Salut 的帳號,就不要顯示任何對話窗"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -3553,6 +3700,18 @@ msgstr "Empathy 帳號"
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#~ msgid "_Character set:"
+#~ msgstr "字集(_C):"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "電子郵件位址(_E):"
+
+#~ msgid "_Nickname:"
+#~ msgstr "暱稱(_N):"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>位置<b>,"
+
#~ msgid "Send and receive messages"
#~ msgstr "傳送與接收訊息"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 19b2236ee..152c3d919 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.31.90\n"
+"Project-Id-Version: empathy 2.31.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 20:02+0800\n"
-"PO-Revision-Date: 2010-08-22 12:43+0800\n"
+"POT-Creation-Date: 2010-09-05 19:51+0800\n"
+"PO-Revision-Date: 2010-08-29 09:54+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -19,8 +19,8 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
-msgstr "使用 Google Talk、Facebook、MSN,與其他聊天服務和他人對話"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk、Facebook、MSN 與其他聊天服務和他人對話"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
@@ -83,9 +83,9 @@ msgstr "在狀態區域顯示收到事件"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
-msgstr "在狀態區域顯示收到事件。如果不啟用的話,收到事件會直接顯示給使用者看。"
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "在狀態區域顯示收到事件。如果不啟用的話,收到事件會直接呈現給使用者。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
@@ -292,7 +292,8 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
@@ -430,7 +431,7 @@ msgstr "管理訊息與 VoIP 帳號"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2092
+#: ../src/empathy-accounts-dialog.c:2151
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
@@ -613,18 +614,18 @@ msgstr "憑證使用不安全的密碼演算法,或是密碼處理上較弱"
#: ../libempathy/empathy-utils.c:376
msgid ""
"The length of the server certificate, or the depth of the server certificate "
-"chain exceed the limits imposed by the crypto library"
-msgstr "伺服器憑證的長度,或是伺服器憑證鏈的深度超過密碼函式庫所能處理的限制。"
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "伺服器憑證的長度,或是伺服器憑證鏈的深度超過密碼函式庫所能處理的範圍"
-#: ../libempathy/empathy-utils.c:529
+#: ../libempathy/empathy-utils.c:540
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:545
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:546
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -672,60 +673,92 @@ msgstr "未來"
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:606
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+#, fuzzy
+#| msgid "Password:"
+msgid "Password"
+msgstr "密碼:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "伺服器"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "連接埠"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1137
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "使用者名稱:"
-#: ../libempathy-gtk/empathy-account-widget.c:1480
+#: ../libempathy-gtk/empathy-account-widget.c:1522
+msgid "A_pply"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1552
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1548
+#: ../libempathy-gtk/empathy-account-widget.c:1618
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1390
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "帳號:"
-#: ../libempathy-gtk/empathy-account-widget.c:1559
-msgid "Enabled"
+#: ../libempathy-gtk/empathy-account-widget.c:1629
+#, fuzzy
+#| msgid "Enabled"
+msgid "_Enabled"
msgstr "已啟用"
-#: ../libempathy-gtk/empathy-account-widget.c:1624
+#: ../libempathy-gtk/empathy-account-widget.c:1694
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1627
+#: ../libempathy-gtk/empathy-account-widget.c:1697
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
+#: ../libempathy-gtk/empathy-account-widget.c:1790
+msgid "Ca_ncel"
+msgstr ""
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1996
+#: ../libempathy-gtk/empathy-account-widget.c:2078
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2104
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2026
+#: ../libempathy-gtk/empathy-account-widget.c:2108
msgid "New account"
msgstr "新增帳號"
@@ -747,11 +780,11 @@ msgstr "進階"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "密碼(_W):"
@@ -792,7 +825,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>範例:</b> 使用者名稱"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "登入 I_D:"
@@ -810,26 +843,24 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>範例:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#, fuzzy
+#| msgid "Character set:"
+msgid "Ch_aracter set:"
+msgstr "字集:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "您的 ICQ UIN 是?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "您的 ICQ 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "字集(_C):"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:246
-msgid "New Network"
-msgstr "新增網路"
-
#: ../libempathy-gtk/empathy-account-widget-sip.c:183
#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
@@ -895,6 +926,14 @@ msgstr "真實姓名:"
msgid "Servers"
msgstr "伺服器"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "您的 IRC 暱稱是?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "哪個 IRC 網路?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@gmail.com"
msgstr "<b>範例:</b> user@gmail.com"
@@ -903,20 +942,34 @@ msgstr "<b>範例:</b> user@gmail.com"
msgid "<b>Example:</b> user@jabber.org"
msgstr "<b>範例:</b> user@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#, fuzzy
+#| msgid "_Encryption required (TLS/SSL)"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "要求加密[TLS/SSL](_E)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#, fuzzy
+#| msgid "_Ignore SSL certificate errors"
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL 憑證錯誤(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "覆蓋伺服器設定值"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#, fuzzy
+#| msgid "Pri_ority:"
+msgid "Priori_ty:"
msgstr "優先權(_O):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "資源(_U):"
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -928,50 +981,42 @@ msgstr ""
"如果您還沒有 Facebook 使用者名稱,請使用 <a href=\"http://www.facebook.com/"
"username/\">此網頁</a> 來選用一個。"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "使用舊版 SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "您的 Facebook 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "您的 Facebook 使用者名稱是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "您的 Google ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "您的 Google 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "您的 Jabber ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "您的 Jabber 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "您想要的 Jabber ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "您想要的 Jabber 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "要求加密[TLS/SSL](_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "忽略 SSL 憑證錯誤(_I)"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>範例:</b> user@hotmail.com"
@@ -985,25 +1030,29 @@ msgid "What is your Windows Live password?"
msgstr "您的 Windows Live 密碼是?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "電子郵件位址(_E):"
+#, fuzzy
+#| msgid "E-mail address:"
+msgid "E-_mail address:"
+msgstr "電子信箱位址:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#, fuzzy
+#| msgid "Nickname:"
+msgid "Nic_kname:"
+msgstr "暱稱:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "名(_F):"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "姓(_L):"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "暱稱(_N):"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "發佈的名稱(_P):"
@@ -1081,25 +1130,27 @@ msgid "_Username:"
msgstr "使用者名稱(_U):"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#, fuzzy
+#| msgid "_Ignore conference and chat room invitations"
+msgid "I_gnore conference and chat room invitations"
+msgstr "忽略會議與聊天室邀請(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "Use _Yahoo! Japan"
msgstr "使用 Yahoo! 日本(_Y)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "您的 Yahoo! ID 是?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! password?"
msgstr "您的 Yahoo! 密碼是?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "Yahoo! I_D:"
msgstr "Yahoo I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "忽略會議與聊天室邀請(_I)"
-
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "聊天室清單地區(_R):"
@@ -1133,51 +1184,51 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裡放大"
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "您不被允許變更這個主題"
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>:設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>:加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>:加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>:開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <暱稱>:變更在目前伺服器上的您的暱稱"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>:送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1186,7 +1237,7 @@ msgstr ""
"/say <訊息>:送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
"說:「/say /join 是用來加入新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1194,84 +1245,84 @@ msgstr ""
"/help [<命令>]:顯示所有支援的指令。如果有定義這個 <命令> 的話,便顯示它的用"
"法。"
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令;請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "無效的連絡人"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤;%s"
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "主題:"
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-chat.c:1847
#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1279,12 +1330,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1292,17 +1343,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1312,46 +1363,46 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "密碼錯誤;請再試一次:"
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護:"
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "談話"
@@ -1375,7 +1426,7 @@ msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:288
msgid "Edit Contact Information"
msgstr "編輯連絡人資訊"
@@ -1397,85 +1448,84 @@ msgid "Subscription Request"
msgstr "訂閱要求"
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "是否想要移除群組「%s」?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2086
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "正在移除群組"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2055
#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2225
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2171
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "是否想要移除連絡人「%s」?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2173
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "正在移除連絡人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:360
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:463
+#: ../libempathy-gtk/empathy-individual-menu.c:514
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:504
+#: ../libempathy-gtk/empathy-individual-menu.c:557
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:546
+#: ../libempathy-gtk/empathy-individual-menu.c:599
msgctxt "menu item"
msgid "_Video Call"
msgstr "視訊通話(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:604
+#: ../libempathy-gtk/empathy-individual-menu.c:642
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../libempathy-gtk/empathy-individual-menu.c:683
msgid "Send File"
msgstr "傳送檔案"
#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:725
msgid "Share My Desktop"
msgstr "分享我的桌面"
#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1537
-#: ../libempathy-gtk/empathy-individual-menu.c:721
-#: ../libempathy-gtk/empathy-individual-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "喜好"
#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:748
+#: ../libempathy-gtk/empathy-individual-menu.c:786
msgid "Infor_mation"
msgstr "資訊(_M)"
@@ -1485,13 +1535,13 @@ msgid "_Edit"
msgstr "編輯(_E)"
#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:970
#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "邀請您到這個聊天室"
#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:981
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1525,148 +1575,152 @@ msgid "Birthday:"
msgstr "生日:"
#: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "國家 ISO 碼:"
#: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "國家:"
#: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "州:"
#: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "市:"
#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "區域:"
#: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "郵遞區號:"
#: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "街:"
#: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "建築:"
#: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "樓層:"
#: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "室:"
#: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "文字:"
#: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "描述:"
#: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "準確度等級:"
#: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "錯誤:"
#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (公尺):"
#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (公尺):"
#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "速度:"
#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "方位:"
#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "爬升速度:"
#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "上次更新於:"
#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "經度:"
#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "緯度:"
#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "緯度:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:578
+#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:594
-msgid "<b>Location</b>, "
-msgstr "<b>位置<b>,"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s、%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:642
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:838
-#: ../libempathy-gtk/empathy-individual-widget.c:832
+#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:894
-#: ../libempathy-gtk/empathy-individual-widget.c:890
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1676,7 +1730,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1218
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "別名:"
@@ -1696,7 +1750,7 @@ msgstr "連絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1419
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "識別身分:"
@@ -1729,48 +1783,58 @@ msgid "_Add Group"
msgstr "加入群組(_G)"
#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
msgid "Select"
msgstr "選擇"
#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1231
+#: ../src/empathy-main-window.c:1247
msgid "Group"
msgstr "群組"
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:302
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
msgid "Linked Contacts"
msgstr "已連結的聯絡人"
-#: ../libempathy-gtk/empathy-individual-linker.c:252
+#: ../libempathy-gtk/empathy-individual-linker.c:354
msgid "Select contacts to link"
msgstr "選取要連結的連絡人"
-#: ../libempathy-gtk/empathy-individual-linker.c:303
+#: ../libempathy-gtk/empathy-individual-linker.c:428
msgid "New contact preview"
msgstr "新增連絡人預覽"
-#: ../libempathy-gtk/empathy-individual-menu.c:108
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "在所方清單所選的聯絡人將連結在一起。"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:799
+#: ../libempathy-gtk/empathy-individual-menu.c:837
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-individual-menu.c:829
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
msgctxt "Link individual (contextual menu)"
msgid "_Link…"
msgstr "連結(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1552
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1780,36 +1844,39 @@ msgstr[0] "後設聯絡人包含 %u 位聯絡人"
msgid "<b>Location</b> at (date)"
msgstr "<b>位置</b> 於 (日期)"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "新增網路"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#, fuzzy
+#| msgid "Which IRC network?"
+msgid "Choose an IRC network"
+msgstr "哪個 IRC 網路?"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "新增伺服器"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "伺服器"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "連接埠"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-linking-dialog.c:92
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:109
msgid "Link Contacts"
msgstr "連結聯絡人"
#. Add button
-#: ../libempathy-gtk/empathy-linking-dialog.c:102
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
msgid "_Link"
msgstr "連結(_L)"
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "帳號"
-
#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
msgstr "日期"
@@ -1820,11 +1887,11 @@ msgid "Conversations"
msgstr "談話"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Find next"
+msgid "Find Next"
msgstr "尋找下一個"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "Find previous"
+msgid "Find Previous"
msgstr "尋找上一個"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
@@ -1991,6 +2058,76 @@ msgstr "清爽"
msgid "Blue"
msgstr "藍色"
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certrificate is not signed by a Certification Authority"
+msgstr "憑證並非由憑證授權中心所簽署"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "憑證已逾期"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "憑證尚未啟用"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "憑證並未擁有預期的指紋"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "憑證所驗證的主機名稱與伺服器名稱不符"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "憑證為自我簽署"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "憑證已被原本發出的憑證授權機構撤銷"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "憑證於密碼防護上較弱"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "憑證長度超出可驗證的範圍"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "憑證格式不良"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "預期的憑證主機名稱:%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "憑證主機名稱:%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "繼續"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "此連線未受信任。您無論如何都要繼續嗎?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "請記住此選擇以供未來連線使用"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "憑證詳細資料"
+
#: ../libempathy-gtk/empathy-ui-utils.c:1698
msgid "Unable to open URI"
msgstr "無法開啓 URI"
@@ -2183,8 +2320,7 @@ msgstr "所選的聯絡人已經離線。"
msgid "No error message"
msgstr "沒有錯誤訊息"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
@@ -2277,7 +2413,7 @@ msgstr ""
"號。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1311
+#: ../src/empathy-account-assistant.c:1310
msgid "An error occurred"
msgstr "發生錯誤"
@@ -2286,36 +2422,36 @@ msgstr "發生錯誤"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:604
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "新增 %s 帳號"
-#: ../src/empathy-account-assistant.c:510
+#: ../src/empathy-account-assistant.c:509
msgid "What kind of chat account do you have?"
msgstr "您的聊天帳號是哪一種?"
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:515
msgid "Do you have any other chat accounts you want to set up?"
msgstr "您還想要設定其他的聊天帳號嗎?"
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:521
msgid "Enter your account details"
msgstr "請輸入您的帳號詳細資料"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
msgid "What kind of chat account do you want to create?"
msgstr "您想要建立何種聊天帳號?"
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:532
msgid "Do you want to create other chat accounts?"
msgstr "是否想要建立其他聊天帳號?"
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:539
msgid "Enter the details for the new account"
msgstr "請輸入新帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:655
+#: ../src/empathy-account-assistant.c:654
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2326,41 +2462,41 @@ msgstr ""
"Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視"
"訊通話。"
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:671
msgid "Do you have an account you've been using with another chat program?"
msgstr "您是否有使用其他聊天程式的帳號?"
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:694
msgid "Yes, import my account details from "
msgstr "是的,請匯入我的帳號詳細資料於"
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:715
msgid "Yes, I'll enter my account details now"
msgstr "是的,我現在要輸入帳號的詳細資料"
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:737
msgid "No, I want a new account"
msgstr "不,我想要新的帳號"
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:747
msgid "No, I just want to see people online nearby for now"
msgstr "不,我現在只想看看附近有誰上線"
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:768
msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號:"
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:859
msgid "No, that's all for now"
msgstr "不,目前就這樣"
-#: ../src/empathy-account-assistant.c:1125
+#: ../src/empathy-account-assistant.c:1124
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2371,16 +2507,16 @@ msgstr ""
"用此功能,請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節,或是"
"用「帳號」對話窗來停用此功能"
-#: ../src/empathy-account-assistant.c:1131
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1186
msgid "Edit->Accounts"
msgstr "編輯 -> 帳號"
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1146
msgid "I don't want to enable this feature for now"
msgstr "我現在不想要啟用這項功能"
-#: ../src/empathy-account-assistant.c:1183
+#: ../src/empathy-account-assistant.c:1182
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2391,23 +2527,23 @@ msgstr ""
"啟用此功能,請安裝 telepathy-salut 套件,並從「帳號」對話窗建立「附近的人」帳"
"號"
-#: ../src/empathy-account-assistant.c:1189
+#: ../src/empathy-account-assistant.c:1188
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 尚未安裝"
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1234
msgid "Messaging and VoIP Accounts Assistant"
msgstr "訊息與 VoIP 帳號助理"
-#: ../src/empathy-account-assistant.c:1269
+#: ../src/empathy-account-assistant.c:1268
msgid "Welcome to Empathy"
msgstr "歡迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1278
+#: ../src/empathy-account-assistant.c:1277
msgid "Import your existing accounts"
msgstr "匯入現有的帳號"
-#: ../src/empathy-account-assistant.c:1296
+#: ../src/empathy-account-assistant.c:1295
msgid "Please enter personal details"
msgstr "請輸入個人詳細資料"
@@ -2424,33 +2560,33 @@ msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存您的新帳號。"
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
msgid "Connecting…"
msgstr "連線中…"
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline — %s"
msgstr "離線 — %s"
-#: ../src/empathy-accounts-dialog.c:324
+#: ../src/empathy-accounts-dialog.c:334
#, c-format
msgid "Disconnected — %s"
msgstr "已斷線 — %s"
-#: ../src/empathy-accounts-dialog.c:335
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline — No Network Connection"
msgstr "離線 — 無網路連線"
-#: ../src/empathy-accounts-dialog.c:342
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "未知的狀態"
-#: ../src/empathy-accounts-dialog.c:354
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline — Account Disabled"
msgstr "離線 — 帳號已停用"
-#: ../src/empathy-accounts-dialog.c:795
+#: ../src/empathy-accounts-dialog.c:805
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2458,16 +2594,16 @@ msgstr ""
"您即將建立新的帳號,這樣會放棄\n"
"您所做的變更。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1142
+#: ../src/empathy-accounts-dialog.c:1152
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "是否想要從您的電腦上移除群組 %s?"
-#: ../src/empathy-accounts-dialog.c:1146
+#: ../src/empathy-accounts-dialog.c:1156
msgid "This will not remove your account on the server."
msgstr "這不會移除伺服器上的您的帳號。"
-#: ../src/empathy-accounts-dialog.c:1383
+#: ../src/empathy-accounts-dialog.c:1394
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2475,7 +2611,7 @@ msgstr ""
"您即將建立另一個帳號,這樣會放棄\n"
"您所做的變更。確定要繼續?"
-#: ../src/empathy-accounts-dialog.c:1960
+#: ../src/empathy-accounts-dialog.c:1997
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2484,28 +2620,40 @@ msgstr ""
"您所做的變更。確定要繼續?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "正在載入帳號資訊"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "尚未安裝通訊協定"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "協定:"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "要加入新的帳號,您必須先安裝每個會用到的通訊協定後端程式。"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "加入(_A)…"
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr "- Empathy 認證用戶端"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy 認證用戶端"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
msgid "People nearby"
msgstr "附近的人"
@@ -3105,32 +3253,31 @@ msgstr "通訊協定"
msgid "Source"
msgstr "來源"
-#. Labels for empty contact list
-#: ../src/empathy-main-window.c:95
+#: ../src/empathy-main-window.c:383
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1213
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "連絡人"
-#: ../src/empathy-main-window.c:1538
+#: ../src/empathy-main-window.c:1554
msgid "Contact List"
msgstr "連絡人清單"
-#: ../src/empathy-main-window.c:1647
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3224,29 +3371,29 @@ msgstr "成員"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:605
+#: ../src/empathy-new-chatroom-dialog.c:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
+"%s\n"
"需要邀請:%s\n"
"需要密碼:%s\n"
"成員:%s"
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
@@ -3562,8 +3709,8 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "不要顯示任何對話窗;執行任何作業(例:匯入)並離開"
#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "如果有任何非 salut 的帳號,就不要顯示任何對話窗"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "如果有任何非 Salut 的帳號,就不要顯示任何對話窗"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -3585,6 +3732,18 @@ msgstr "Empathy 帳號"
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#~ msgid "_Character set:"
+#~ msgstr "字集(_C):"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "電子郵件位址(_E):"
+
+#~ msgid "_Nickname:"
+#~ msgstr "暱稱(_N):"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>位置<b>,"
+
#~ msgid "Send and receive messages"
#~ msgstr "傳送與接收訊息"