[gnome-online-accounts] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- From: Chao-Hsiung Liao <chliao src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- Date: Fri, 2 Aug 2013 02:50:54 +0000 (UTC)
commit 3b700f8b6ed3f189af6859f85e03999a4ca19bfd
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date: Fri Aug 2 10:50:48 2013 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 634 +++++++++++++++++++++++++++++-----------------------------
po/zh_TW.po | 634 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 634 insertions(+), 634 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index eb4ab76..b7addb3 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-online-accounts 3.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 22:53+0800\n"
-"PO-Revision-Date: 2013-02-27 22:53+0800\n"
+"POT-Creation-Date: 2013-08-02 10:50+0800\n"
+"PO-Revision-Date: 2013-08-02 10:50+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
"Language: \n"
@@ -17,66 +17,49 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
-#. shut up -Wunused-but-set-variable
-#: ../data/goa-daemon.desktop.in.in.h:1 ../src/daemon/goadaemon.c:212
-msgid "Online Accounts"
-msgstr "網上帳號"
-
-#: ../data/goa-daemon.desktop.in.in.h:2
-msgid "Provides the org.gnome.OnlinesAccounts name on the session bus"
-msgstr "在作業階段匯流排提供 org.gnome.OnlinesAccounts 名稱"
-
#. TODO: more specific
-#: ../src/daemon/goadaemon.c:802 ../src/daemon/goadaemon.c:1150
+#: ../src/daemon/goadaemon.c:775 ../src/daemon/goadaemon.c:985
#, c-format
msgid "Failed to find a provider for: %s"
msgstr "無法尋找到此提供者：%s"
-#: ../src/daemon/goadaemon.c:992
-msgid "An online account needs attention"
-msgstr "有個網上帳號要求注意"
-
-#: ../src/daemon/goadaemon.c:1001
-msgid "Open Online Accounts..."
-msgstr "開啟網上帳號..."
-
#. TODO: more specific
-#: ../src/daemon/goadaemon.c:1138
+#: ../src/daemon/goadaemon.c:973
msgid "ProviderType property is not set for account"
msgstr "帳號沒有設定 ProviderType 屬性"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:214 ../src/goabackend/goahttpclient.c:155
+#: ../src/goabackend/goaewsclient.c:234 ../src/goabackend/goahttpclient.c:175
#, c-format
msgid "Code: %u - Unexpected response from server"
msgstr "代碼：%u - 伺服器有未預期的回應"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:240
+#: ../src/goabackend/goaewsclient.c:250
#, c-format
msgid "Failed to parse autodiscover response XML"
msgstr "無法解析自動探索回應 XML"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:250
+#: ../src/goabackend/goaewsclient.c:260
#, c-format
msgid "Failed to find Autodiscover element"
msgstr "找不到 Autodiscover 元素"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:264
+#: ../src/goabackend/goaewsclient.c:274
#, c-format
msgid "Failed to find Response element"
msgstr "找不到 Response 元素"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:278
+#: ../src/goabackend/goaewsclient.c:288
#, c-format
msgid "Failed to find Account element"
msgstr "找不到 Account 元素"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:295
+#: ../src/goabackend/goaewsclient.c:305
#, c-format
msgid "Failed to find ASUrl and OABUrl in autodiscover response"
msgstr "在自動探索回應中找不到 ASUrl 與 OABUrl"
@@ -86,12 +69,10 @@ msgid "Microsoft Exchange"
msgstr "Microsoft Exchange"
#. TODO: more specific
-#: ../src/goabackend/goaexchangeprovider.c:308
-#: ../src/goabackend/goaexchangeprovider.c:1036
-#: ../src/goabackend/goagoogleprovider.c:596
-#: ../src/goabackend/goagoogleprovider.c:783
-#: ../src/goabackend/goaowncloudprovider.c:364
-#: ../src/goabackend/goaowncloudprovider.c:1138
+#: ../src/goabackend/goaexchangeprovider.c:317
+#: ../src/goabackend/goaexchangeprovider.c:1047
+#: ../src/goabackend/goaowncloudprovider.c:376
+#: ../src/goabackend/goaowncloudprovider.c:1168
#, c-format
msgid "Did not find password with identity `%s' in credentials"
msgstr "在證書中找不到身分為「%s」的密碼"
@@ -100,220 +81,234 @@ msgstr "在證書中找不到身分為「%s」的密碼"
#. * (eg., debarshi ray gmail com or rishi), and the
#. * (%s, %d) is the error domain and code.
#.
-#: ../src/goabackend/goaexchangeprovider.c:336
-#: ../src/goabackend/goagoogleprovider.c:619
-#: ../src/goabackend/goaowncloudprovider.c:387
+#: ../src/goabackend/goaexchangeprovider.c:345
+#: ../src/goabackend/goaowncloudprovider.c:399
#, c-format
msgid "Invalid password with username `%s' (%s, %d): "
msgstr "使用者名稱「%s」(%s, %d)的密碼無效："
-#: ../src/goabackend/goaexchangeprovider.c:501
-#: ../src/goabackend/goaimapsmtpprovider.c:635
+#: ../src/goabackend/goaexchangeprovider.c:510
+#: ../src/goabackend/goaimapsmtpprovider.c:697
msgid "_E-mail"
msgstr "電子郵件(_E)"
-#: ../src/goabackend/goaexchangeprovider.c:502
-#: ../src/goabackend/goaimapsmtpprovider.c:655
-#: ../src/goabackend/goaimapsmtpprovider.c:687
-#: ../src/goabackend/goaowncloudprovider.c:613
+#: ../src/goabackend/goaexchangeprovider.c:511
+#: ../src/goabackend/goaimapsmtpprovider.c:717
+#: ../src/goabackend/goaimapsmtpprovider.c:737
+#: ../src/goabackend/goaowncloudprovider.c:639
msgid "_Password"
msgstr "密碼(_P)"
-#: ../src/goabackend/goaexchangeprovider.c:505
+#: ../src/goabackend/goaexchangeprovider.c:514
msgid "_Custom"
msgstr "自選(_C)"
-#: ../src/goabackend/goaexchangeprovider.c:524
-#: ../src/goabackend/goaimapsmtpprovider.c:654
-#: ../src/goabackend/goaimapsmtpprovider.c:686
-#: ../src/goabackend/goakerberosprovider.c:1128
-#: ../src/goabackend/goaowncloudprovider.c:612
+#: ../src/goabackend/goaexchangeprovider.c:533
+#: ../src/goabackend/goaimapsmtpprovider.c:716
+#: ../src/goabackend/goaimapsmtpprovider.c:736
+#: ../src/goabackend/goakerberosprovider.c:1134
+#: ../src/goabackend/goaowncloudprovider.c:638
msgid "User_name"
msgstr "使用者名稱(_N)"
-#: ../src/goabackend/goaexchangeprovider.c:525
-#: ../src/goabackend/goaowncloudprovider.c:611
+#: ../src/goabackend/goaexchangeprovider.c:534
+#: ../src/goabackend/goaowncloudprovider.c:637
msgid "_Server"
msgstr "伺服器(_S)"
-#: ../src/goabackend/goaexchangeprovider.c:555
-#: ../src/goabackend/goaimapsmtpprovider.c:731
-#: ../src/goabackend/goakerberosprovider.c:1153
-#: ../src/goabackend/goaowncloudprovider.c:642
+#: ../src/goabackend/goaexchangeprovider.c:564
+#: ../src/goabackend/goaimapsmtpprovider.c:769
+#: ../src/goabackend/goakerberosprovider.c:1159
+#: ../src/goabackend/goaowncloudprovider.c:668
msgid "Connecting…"
msgstr "連線中…"
-#: ../src/goabackend/goaexchangeprovider.c:660
-#: ../src/goabackend/goaexchangeprovider.c:854
-#: ../src/goabackend/goaimapsmtpprovider.c:890
-#: ../src/goabackend/goaimapsmtpprovider.c:924
-#: ../src/goabackend/goaimapsmtpprovider.c:1012
-#: ../src/goabackend/goaimapsmtpprovider.c:1258
-#: ../src/goabackend/goaimapsmtpprovider.c:1328
-#: ../src/goabackend/goakerberosprovider.c:1544
-#: ../src/goabackend/goaoauth2provider.c:1048
+#: ../src/goabackend/goaexchangeprovider.c:669
+#: ../src/goabackend/goaexchangeprovider.c:864
+#: ../src/goabackend/goaimapsmtpprovider.c:929
+#: ../src/goabackend/goaimapsmtpprovider.c:964
+#: ../src/goabackend/goaimapsmtpprovider.c:1052
+#: ../src/goabackend/goaimapsmtpprovider.c:1308
+#: ../src/goabackend/goaimapsmtpprovider.c:1381
+#: ../src/goabackend/goakerberosprovider.c:1550
+#: ../src/goabackend/goaoauth2provider.c:1133
#: ../src/goabackend/goaoauthprovider.c:1041
-#: ../src/goabackend/goaowncloudprovider.c:753
-#: ../src/goabackend/goaowncloudprovider.c:962
+#: ../src/goabackend/goaowncloudprovider.c:779
+#: ../src/goabackend/goaowncloudprovider.c:991
#, c-format
msgid "Dialog was dismissed"
msgstr "對話盒已放棄"
-#: ../src/goabackend/goaexchangeprovider.c:697
-#: ../src/goabackend/goaexchangeprovider.c:882
-#: ../src/goabackend/goaimapsmtpprovider.c:954
-#: ../src/goabackend/goaimapsmtpprovider.c:1043
-#: ../src/goabackend/goaimapsmtpprovider.c:1282
-#: ../src/goabackend/goaimapsmtpprovider.c:1353
-#: ../src/goabackend/goaowncloudprovider.c:792
-#: ../src/goabackend/goaowncloudprovider.c:983
+#: ../src/goabackend/goaexchangeprovider.c:707
+#: ../src/goabackend/goaexchangeprovider.c:892
+#: ../src/goabackend/goaimapsmtpprovider.c:994
+#: ../src/goabackend/goaimapsmtpprovider.c:1085
+#: ../src/goabackend/goaimapsmtpprovider.c:1332
+#: ../src/goabackend/goaimapsmtpprovider.c:1406
+#: ../src/goabackend/goaowncloudprovider.c:821
+#: ../src/goabackend/goaowncloudprovider.c:1012
#, c-format
msgid "Dialog was dismissed (%s, %d): "
msgstr "對話盒已放棄 (%s, %d)："
-#: ../src/goabackend/goaexchangeprovider.c:710
-#: ../src/goabackend/goaimapsmtpprovider.c:967
-#: ../src/goabackend/goaimapsmtpprovider.c:1056
-#: ../src/goabackend/goaowncloudprovider.c:805
+#: ../src/goabackend/goaexchangeprovider.c:720
+#: ../src/goabackend/goaimapsmtpprovider.c:1007
+#: ../src/goabackend/goaimapsmtpprovider.c:1098
+#: ../src/goabackend/goaowncloudprovider.c:834
msgid "_Ignore"
msgstr "忽略(_I)"
-#: ../src/goabackend/goaexchangeprovider.c:715
-#: ../src/goabackend/goaexchangeprovider.c:901
-#: ../src/goabackend/goaimapsmtpprovider.c:972
-#: ../src/goabackend/goaimapsmtpprovider.c:1061
-#: ../src/goabackend/goaimapsmtpprovider.c:1301
-#: ../src/goabackend/goaimapsmtpprovider.c:1372
-#: ../src/goabackend/goakerberosprovider.c:1653
-#: ../src/goabackend/goaowncloudprovider.c:810
-#: ../src/goabackend/goaowncloudprovider.c:1002
+#: ../src/goabackend/goaexchangeprovider.c:725
+#: ../src/goabackend/goaexchangeprovider.c:911
+#: ../src/goabackend/goaimapsmtpprovider.c:1012
+#: ../src/goabackend/goaimapsmtpprovider.c:1103
+#: ../src/goabackend/goaimapsmtpprovider.c:1351
+#: ../src/goabackend/goaimapsmtpprovider.c:1425
+#: ../src/goabackend/goakerberosprovider.c:1660
+#: ../src/goabackend/goaowncloudprovider.c:839
+#: ../src/goabackend/goaowncloudprovider.c:1031
msgid "_Try Again"
msgstr "重試(_T)"
-#: ../src/goabackend/goaexchangeprovider.c:720
-#: ../src/goabackend/goaexchangeprovider.c:894
+#: ../src/goabackend/goaexchangeprovider.c:730
+#: ../src/goabackend/goaexchangeprovider.c:904
msgid "Error connecting to Microsoft Exchange server"
msgstr "連接至 Microsoft Exchange 伺服器時發生錯誤"
-#: ../src/goabackend/goaexchangeprovider.c:956
-#: ../src/goabackend/goafacebookprovider.c:397
-#: ../src/goabackend/goagoogleprovider.c:664
-#: ../src/goabackend/goakerberosprovider.c:1724
-#: ../src/goabackend/goaowncloudprovider.c:1058
-#: ../src/goabackend/goawindowsliveprovider.c:410
+#: ../src/goabackend/goaexchangeprovider.c:966
+#: ../src/goabackend/goafacebookprovider.c:455
+#: ../src/goabackend/goagoogleprovider.c:546
+#: ../src/goabackend/goakerberosprovider.c:1731
+#: ../src/goabackend/goaowncloudprovider.c:1087
+#: ../src/goabackend/goawindowsliveprovider.c:432
msgid "Use for"
msgstr "使用於"
-#: ../src/goabackend/goaexchangeprovider.c:958
-#: ../src/goabackend/goagoogleprovider.c:666
+#: ../src/goabackend/goaexchangeprovider.c:968
+#: ../src/goabackend/goagoogleprovider.c:548
msgid "_Mail"
msgstr "郵件(_M)"
-#: ../src/goabackend/goaexchangeprovider.c:963
-#: ../src/goabackend/goagoogleprovider.c:671
-#: ../src/goabackend/goaowncloudprovider.c:1060
+#: ../src/goabackend/goaexchangeprovider.c:973
+#: ../src/goabackend/goagoogleprovider.c:553
+#: ../src/goabackend/goaowncloudprovider.c:1089
msgid "Cale_ndar"
msgstr "行事曆(_N)"
-#: ../src/goabackend/goaexchangeprovider.c:968
-#: ../src/goabackend/goagoogleprovider.c:676
-#: ../src/goabackend/goaowncloudprovider.c:1065
+#: ../src/goabackend/goaexchangeprovider.c:978
+#: ../src/goabackend/goagoogleprovider.c:558
+#: ../src/goabackend/goaowncloudprovider.c:1094
msgid "_Contacts"
msgstr "聯絡人(_C)"
-#: ../src/goabackend/goafacebookprovider.c:81
+#: ../src/goabackend/goafacebookprovider.c:82
msgid "Facebook"
msgstr "Facebook"
#. Translators: the %d is a HTTP status code and the %s is a textual description of it
-#: ../src/goabackend/goafacebookprovider.c:201
-#: ../src/goabackend/goagoogleprovider.c:196
-#: ../src/goabackend/goatwitterprovider.c:162
-#: ../src/goabackend/goawindowsliveprovider.c:183
-#: ../src/goabackend/goayahooprovider.c:165
+#: ../src/goabackend/goafacebookprovider.c:218
+#: ../src/goabackend/goagoogleprovider.c:207
+#: ../src/goabackend/goatwitterprovider.c:166
+#: ../src/goabackend/goawindowsliveprovider.c:195
+#: ../src/goabackend/goayahooprovider.c:187
#, c-format
msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
msgstr "請求 guid 時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goafacebookprovider.c:213
-#: ../src/goabackend/goaflickrprovider.c:191
-#: ../src/goabackend/goagoogleprovider.c:208
-#: ../src/goabackend/goaoauth2provider.c:616
-#: ../src/goabackend/goatwitterprovider.c:174
-#: ../src/goabackend/goawindowsliveprovider.c:195
-#: ../src/goabackend/goayahooprovider.c:177
-msgid "Error parsing response as JSON: "
-msgstr "以 JSON 解析回應時發生錯誤："
-
-#: ../src/goabackend/goafacebookprovider.c:224
-#: ../src/goabackend/goawindowsliveprovider.c:206
-#, c-format
-msgid "Didn't find id member in JSON data"
-msgstr "JSON 資料中找不到 id 成員"
-
-#: ../src/goabackend/goafacebookprovider.c:233
-#: ../src/goabackend/goagoogleprovider.c:219
-#, c-format
-msgid "Didn't find email member in JSON data"
-msgstr "JSON 資料中找不到電子郵件成員"
-
-#: ../src/goabackend/goafacebookprovider.c:399
-#: ../src/goabackend/goagoogleprovider.c:681
-#: ../src/goabackend/goawindowsliveprovider.c:412
+#: ../src/goabackend/goafacebookprovider.c:237
+#: ../src/goabackend/goafacebookprovider.c:249
+#: ../src/goabackend/goafacebookprovider.c:259
+#: ../src/goabackend/goaflickrprovider.c:208
+#: ../src/goabackend/goaflickrprovider.c:220
+#: ../src/goabackend/goaflickrprovider.c:230
+#: ../src/goabackend/goaflickrprovider.c:240
+#: ../src/goabackend/goaflickrprovider.c:250
+#: ../src/goabackend/goagoogleprovider.c:226
+#: ../src/goabackend/goagoogleprovider.c:238
+#: ../src/goabackend/goaoauth2provider.c:682
+#: ../src/goabackend/goaoauth2provider.c:712
+#: ../src/goabackend/goaoauth2provider.c:724
+#: ../src/goabackend/goatwitterprovider.c:185
+#: ../src/goabackend/goatwitterprovider.c:197
+#: ../src/goabackend/goatwitterprovider.c:207
+#: ../src/goabackend/goawindowsliveprovider.c:214
+#: ../src/goabackend/goawindowsliveprovider.c:226
+#: ../src/goabackend/goawindowsliveprovider.c:238
+#: ../src/goabackend/goayahooprovider.c:206
+#: ../src/goabackend/goayahooprovider.c:218
+#: ../src/goabackend/goayahooprovider.c:229
+#: ../src/goabackend/goayahooprovider.c:275
+#: ../src/goabackend/goayahooprovider.c:287
+#: ../src/goabackend/goayahooprovider.c:298
+#, c-format
+msgid "Could not parse response"
+msgstr "無法解析回應"
+
+#: ../src/goabackend/goafacebookprovider.c:457
+#: ../src/goabackend/goagoogleprovider.c:563
+#: ../src/goabackend/goawindowsliveprovider.c:434
msgid "C_hat"
msgstr "聊天(_H)"
-#: ../src/goabackend/goaflickrprovider.c:82
+#: ../src/goabackend/goafacebookprovider.c:462
+#: ../src/goabackend/goaflickrprovider.c:430
+msgid "_Photos"
+msgstr "相片(_P)"
+
+#: ../src/goabackend/goaflickrprovider.c:83
msgid "Flickr"
msgstr "Flickr"
-#: ../src/goabackend/goaflickrprovider.c:179
+#: ../src/goabackend/goaflickrprovider.c:189
#, c-format
msgid "Expected status 200 when requesting user id, instead got status %d (%s)"
msgstr "請求使用者 id 時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goaflickrprovider.c:202
-#, c-format
-msgid "Didn't find user member in JSON data"
-msgstr "JSON 資料中找不到使用者成員"
-
-#: ../src/goabackend/goaflickrprovider.c:211
-#, c-format
-msgid "Didn't find user.id member in JSON data"
-msgstr "JSON 資料中找不到 user.id 成員"
-
-#: ../src/goabackend/goaflickrprovider.c:220
-#, c-format
-msgid "Didn't find user.username member in JSON data"
-msgstr "JSON 資料中找不到 user.username 成員"
-
-#: ../src/goabackend/goaflickrprovider.c:229
-#, c-format
-msgid "Didn't find user.username._content member in JSON data"
-msgstr "JSON 資料中找不到 user.username._content 成員"
-
-#: ../src/goabackend/goaflickrprovider.c:306
+#: ../src/goabackend/goaflickrprovider.c:328
+#: ../src/goabackend/goayahooprovider.c:350
msgid "Your system time is invalid. Check your date and time settings."
msgstr "你的系統時間無效。請檢查你的日期與時間設定值。"
-#: ../src/goabackend/goaflickrprovider.c:408
-msgid "_Photos"
-msgstr "相片(_P)"
-
-#: ../src/goabackend/goagoogleprovider.c:85
+#: ../src/goabackend/goagoogleprovider.c:82
msgid "Google"
msgstr "Google"
-#: ../src/goabackend/goagoogleprovider.c:686
-#: ../src/goabackend/goawindowsliveprovider.c:417
+#: ../src/goabackend/goagoogleprovider.c:568
+#: ../src/goabackend/goawindowsliveprovider.c:439
msgid "_Documents"
msgstr "文件(_D)"
+#. TODO: more specific
+#: ../src/goabackend/goaimapauthlogin.c:99
+#: ../src/goabackend/goasmtpauthplain.c:146
+#, c-format
+msgid "Service not available"
+msgstr "服務無法使用"
+
+#. TODO: more specific
+#: ../src/goabackend/goaimapauthlogin.c:120
+#: ../src/goabackend/goasmtpauthplain.c:115
+#, c-format
+msgid "Authentication failed"
+msgstr "驗證失敗"
+
+#: ../src/goabackend/goaimapauthlogin.c:145
+#: ../src/goabackend/goasmtpauthplain.c:646
+#, c-format
+msgid "Server does not support PLAIN"
+msgstr "伺服器不支援 PLAIN"
+
+#: ../src/goabackend/goaimapauthlogin.c:199
+#: ../src/goabackend/goasmtpauthplain.c:751
+#, c-format
+msgid "Server does not support STARTTLS"
+msgstr "伺服器不支援 STARTTLS"
+
#: ../src/goabackend/goaimapsmtpprovider.c:82
msgid "IMAP and SMTP"
msgstr "IMAP 與 SMTP"
-#: ../src/goabackend/goaimapsmtpprovider.c:350
+#: ../src/goabackend/goaimapsmtpprovider.c:362
#, c-format
msgid "Did not find imap-password with identity `%s' in credentials"
msgstr "在證書中找不到識別符為「%s」的 imap 密碼"
@@ -322,12 +317,12 @@ msgstr "在證書中找不到識別符為「%s」的 imap 密碼"
#. * username (eg., rishi), and the (%s, %d)
#. * is the error domain and code.
#.
-#: ../src/goabackend/goaimapsmtpprovider.c:379
+#: ../src/goabackend/goaimapsmtpprovider.c:391
#, c-format
msgid "Invalid imap-password with username `%s' (%s, %d): "
msgstr "使用者名稱「%s」的 imap 密碼無效 (%s, %d)："
-#: ../src/goabackend/goaimapsmtpprovider.c:397
+#: ../src/goabackend/goaimapsmtpprovider.c:415
#, c-format
msgid "Did not find smtp-password with identity `%s' in credentials"
msgstr "在證書中找不到識別符為「%s」的 smtp 密碼"
@@ -336,68 +331,70 @@ msgstr "在證書中找不到識別符為「%s」的 smtp 密碼"
#. * username (eg., rishi), and the (%s, %d)
#. * is the error domain and code.
#.
-#: ../src/goabackend/goaimapsmtpprovider.c:428
+#: ../src/goabackend/goaimapsmtpprovider.c:446
#, c-format
msgid "Invalid smtp-password with username `%s' (%s, %d): "
msgstr "使用者名稱「%s」的 smtp 密碼無效 (%s, %d)："
-#: ../src/goabackend/goaimapsmtpprovider.c:636
-msgid "_Name"
-msgstr "名稱(_N)"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:653
-msgid "IMAP _Server"
-msgstr "IMAP 伺服器(_S)"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:660
-#: ../src/goabackend/goaimapsmtpprovider.c:692
+#. Translators: the following four strings are used to show a
+#. * combo box similar to the one in the evolution module.
+#. * Encryption: None
+#. * STARTTLS after connecting
+#. * SSL on a dedicated port
+#.
+#: ../src/goabackend/goaimapsmtpprovider.c:632
msgid "_Encryption"
msgstr "加密(_E)"
-#: ../src/goabackend/goaimapsmtpprovider.c:663
-#: ../src/goabackend/goaimapsmtpprovider.c:695
+#: ../src/goabackend/goaimapsmtpprovider.c:635
msgid "None"
msgstr "沒有"
-#: ../src/goabackend/goaimapsmtpprovider.c:666
-#: ../src/goabackend/goaimapsmtpprovider.c:698
+#: ../src/goabackend/goaimapsmtpprovider.c:638
msgid "STARTTLS after connecting"
msgstr "連線後使用 STARTTLS"
-#: ../src/goabackend/goaimapsmtpprovider.c:669
-#: ../src/goabackend/goaimapsmtpprovider.c:701
+#: ../src/goabackend/goaimapsmtpprovider.c:641
msgid "SSL on a dedicated port"
msgstr "SSL 於專用的連接埠"
-#: ../src/goabackend/goaimapsmtpprovider.c:685
+#: ../src/goabackend/goaimapsmtpprovider.c:698
+msgid "_Name"
+msgstr "名稱(_N)"
+
+#: ../src/goabackend/goaimapsmtpprovider.c:715
+msgid "IMAP _Server"
+msgstr "IMAP 伺服器(_S)"
+
+#: ../src/goabackend/goaimapsmtpprovider.c:735
msgid "SMTP _Server"
msgstr "SMTP 伺服器(_S)"
-#: ../src/goabackend/goaimapsmtpprovider.c:977
-#: ../src/goabackend/goaimapsmtpprovider.c:1294
+#: ../src/goabackend/goaimapsmtpprovider.c:1017
+#: ../src/goabackend/goaimapsmtpprovider.c:1344
msgid "Error connecting to IMAP server"
msgstr "連接至 IMAP 伺服器時發生錯誤"
-#: ../src/goabackend/goaimapsmtpprovider.c:1066
-#: ../src/goabackend/goaimapsmtpprovider.c:1365
+#: ../src/goabackend/goaimapsmtpprovider.c:1108
+#: ../src/goabackend/goaimapsmtpprovider.c:1418
msgid "Error connecting to SMTP server"
msgstr "連接至 SMTP 伺服器時發生錯誤"
-#: ../src/goabackend/goaimapsmtpprovider.c:1470
+#: ../src/goabackend/goaimapsmtpprovider.c:1526
msgid "E-mail"
msgstr "電子郵件"
-#: ../src/goabackend/goaimapsmtpprovider.c:1474
+#: ../src/goabackend/goaimapsmtpprovider.c:1530
msgid "Name"
msgstr "名稱"
-#: ../src/goabackend/goaimapsmtpprovider.c:1484
-#: ../src/goabackend/goaimapsmtpprovider.c:1487
+#: ../src/goabackend/goaimapsmtpprovider.c:1540
+#: ../src/goabackend/goaimapsmtpprovider.c:1543
msgid "IMAP"
msgstr "IMAP"
-#: ../src/goabackend/goaimapsmtpprovider.c:1498
-#: ../src/goabackend/goaimapsmtpprovider.c:1501
+#: ../src/goabackend/goaimapsmtpprovider.c:1554
+#: ../src/goabackend/goaimapsmtpprovider.c:1557
msgid "SMTP"
msgstr "SMTP"
@@ -405,109 +402,99 @@ msgstr "SMTP"
msgid "Enterprise Login (Kerberos)"
msgstr "企業版登入 (Kerberos)"
-#: ../src/goabackend/goakerberosprovider.c:449
+#: ../src/goabackend/goakerberosprovider.c:455
msgid "Identity service returned invalid key"
msgstr "身分認證服務傳回無效的鍵值"
-#: ../src/goabackend/goakerberosprovider.c:715
+#: ../src/goabackend/goakerberosprovider.c:721
#, c-format
msgid "Could not find saved credentials for principal `%s' in keyring"
msgstr "找不到密碼匙圈中的主要「%s」儲存的證書"
-#: ../src/goabackend/goakerberosprovider.c:725
+#: ../src/goabackend/goakerberosprovider.c:731
#, c-format
msgid "Did not find password for principal `%s' in credentials"
msgstr "在證書中找不到主要「%s」的密碼"
-#: ../src/goabackend/goakerberosprovider.c:1120
+#: ../src/goabackend/goakerberosprovider.c:1126
msgid "_Domain"
msgstr "網域(_D)"
-#: ../src/goabackend/goakerberosprovider.c:1121
+#: ../src/goabackend/goakerberosprovider.c:1127
msgid "Enterprise domain or realm name"
msgstr "企業網域或領域名稱"
-#: ../src/goabackend/goakerberosprovider.c:1353
-#: ../src/goaidentity/goaidentityservice.c:1084
+#: ../src/goabackend/goakerberosprovider.c:1359
+#: ../src/goaidentity/goaidentityservice.c:1085
msgid "Log In to Realm"
msgstr "登入領域"
-#: ../src/goabackend/goakerberosprovider.c:1354
+#: ../src/goabackend/goakerberosprovider.c:1360
msgid "Please enter your password below."
msgstr "請在下面輸入你的密碼。"
-#: ../src/goabackend/goakerberosprovider.c:1355
+#: ../src/goabackend/goakerberosprovider.c:1361
msgid "Remember this password"
msgstr "記住這個密碼"
-#: ../src/goabackend/goakerberosprovider.c:1494
+#: ../src/goabackend/goakerberosprovider.c:1500
#, c-format
msgid "The domain is not valid"
msgstr "網域是無效的"
-#: ../src/goabackend/goakerberosprovider.c:1648
+#: ../src/goabackend/goakerberosprovider.c:1655
msgid "Error connecting to enterprise identity server"
msgstr "連線至企業身分認證伺服器時發生錯誤"
-#: ../src/goabackend/goakerberosprovider.c:1726
+#: ../src/goabackend/goakerberosprovider.c:1733
msgid "Network _Resources"
msgstr "網絡資源(_R)"
#. Translators: the %d is a HTTP status code and the %s is a textual description of it
-#: ../src/goabackend/goaoauth2provider.c:573
+#: ../src/goabackend/goaoauth2provider.c:658
#: ../src/goabackend/goaoauthprovider.c:586
#, c-format
msgid ""
"Expected status 200 when requesting access token, instead got status %d (%s)"
msgstr "請求存取記號時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goaoauth2provider.c:593
-#, c-format
-msgid "Didn't find access_token in non-JSON data"
-msgstr "非 JSON 資料中找不到 access_token"
-
-#: ../src/goabackend/goaoauth2provider.c:627
-#, c-format
-msgid "Didn't find access_token in JSON data"
-msgstr "JSON 資料中找不到 access_token"
-
-#: ../src/goabackend/goaoauth2provider.c:835
-#: ../src/goabackend/goaoauth2provider.c:875
+#: ../src/goabackend/goaoauth2provider.c:916
+#: ../src/goabackend/goaoauth2provider.c:956
#, c-format
msgid "Authorization response was \"%s\""
msgstr "驗證回應為「%s」"
#. Translators: The verb "Paste" is used when asking the user to paste a string from a web browser window
-#: ../src/goabackend/goaoauth2provider.c:981
+#: ../src/goabackend/goaoauth2provider.c:1059
#, c-format
msgid ""
"Paste authorization code obtained from the <a href=\"%s\">authorization "
"page</a>:"
msgstr "貼上從<a href=\"%s\">驗證頁面</a>取得的驗證代碼："
-#: ../src/goabackend/goaoauth2provider.c:1074
+#: ../src/goabackend/goaoauth2provider.c:1159
#: ../src/goabackend/goaoauthprovider.c:1072
msgid "Error getting an Access Token: "
msgstr "取得存取記號時發生錯誤："
-#: ../src/goabackend/goaoauth2provider.c:1089
+#: ../src/goabackend/goaoauth2provider.c:1174
#: ../src/goabackend/goaoauthprovider.c:1085
msgid "Error getting identity: "
msgstr "取得身分時發生錯誤："
-#: ../src/goabackend/goaoauth2provider.c:1378
-#: ../src/goabackend/goaoauthprovider.c:1390
+#: ../src/goabackend/goaoauth2provider.c:1386
+#: ../src/goabackend/goaoauthprovider.c:1391
#, c-format
msgid "Was asked to login as %s, but logged in as %s"
msgstr "有被詢問以 %s 登入，但卻以 %s 登入"
-#: ../src/goabackend/goaoauth2provider.c:1549
+#: ../src/goabackend/goaoauth2provider.c:1542
#, c-format
msgid "Credentials do not contain access_token"
msgstr "證書不包含 access_token"
-#: ../src/goabackend/goaoauth2provider.c:1588
-#: ../src/goabackend/goaoauthprovider.c:1618
+#: ../src/goabackend/goaoauth2provider.c:1581
+#: ../src/goabackend/goaoauthprovider.c:1619
#, c-format
msgid "Failed to refresh access token (%s, %d): "
msgstr "無法重新整理存取符令 (%s，%d)："
@@ -539,158 +526,137 @@ msgstr "回應遺失 request_token 或 request_token_secret 標頭"
msgid "Paste token obtained from the <a href=\"%s\">authorization page</a>:"
msgstr "從<a href=\"%s\">認證頁面</a>取得貼上記號："
-#: ../src/goabackend/goaoauthprovider.c:1574
+#: ../src/goabackend/goaoauthprovider.c:1575
#, c-format
msgid "Credentials do not contain access_token or access_token_secret"
msgstr "證書不包含 access_token 或 access_token_secret"
-#: ../src/goabackend/goaowncloudprovider.c:84
+#: ../src/goabackend/goaowncloudprovider.c:87
msgid "ownCloud"
msgstr "ownCloud"
-#: ../src/goabackend/goaowncloudprovider.c:815
-#: ../src/goabackend/goaowncloudprovider.c:995
+#: ../src/goabackend/goaowncloudprovider.c:844
+#: ../src/goabackend/goaowncloudprovider.c:1024
msgid "Error connecting to ownCloud server"
msgstr "連接至 ownCloud 伺服器時發生錯誤"
-#: ../src/goabackend/goaowncloudprovider.c:1070
+#: ../src/goabackend/goaowncloudprovider.c:1099
msgid "_Files"
msgstr "檔案(_F)"
-#: ../src/goabackend/goaprovider.c:579
+#: ../src/goabackend/goaprovider.c:712
#, c-format
msgid "ensure_credentials_sync is not implemented on type %s"
msgstr "ensure_credentials_sync 並非以 %s 類型實作"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:372
+#: ../src/goabackend/goasmtpauthplain.c:161
#, c-format
-msgid "Did not find smtp-password in credentials"
-msgstr "在證書中找不到 smtp 密碼"
-
-#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:383
-#, c-format
-msgid "Cannot do SMTP PLAIN without a password"
-msgstr "沒有密碼不能進行 SMTP PLAIN"
+msgid "TLS not available"
+msgstr "TLS 無法使用"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:402
+#: ../src/goabackend/goasmtpauthplain.c:227
#, c-format
msgid "org.gnome.OnlineAccounts.Mail is not available"
msgstr "org.gnome.OnlineAccounts.Mail 無法使用"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:412
+#: ../src/goabackend/goasmtpauthplain.c:237
#, c-format
msgid "Failed to parse email address"
msgstr "無法分析電子郵件位址"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:424
+#: ../src/goabackend/goasmtpauthplain.c:249
#, c-format
msgid "Cannot do SMTP PLAIN without a domain"
msgstr "沒有網域不能進行 SMTP PLAIN"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:438
-#, c-format
-msgid "Service not available"
-msgstr "服務無法使用"
-
-#: ../src/goabackend/goasmtpauthplain.c:475
+#: ../src/goabackend/goasmtpauthplain.c:287
#, c-format
-msgid "Server does not support PLAIN"
-msgstr "伺服器不支援 PLAIN"
+msgid "Did not find smtp-password in credentials"
+msgstr "在證書中找不到 smtp 密碼"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:505
+#: ../src/goabackend/goasmtpauthplain.c:298
#, c-format
-msgid "Authentication failed"
-msgstr "驗證失敗"
+msgid "Cannot do SMTP PLAIN without a password"
+msgstr "沒有密碼不能進行 SMTP PLAIN"
-#: ../src/goabackend/goatwitterprovider.c:80
+#: ../src/goabackend/goatwitterprovider.c:81
msgid "Twitter"
msgstr "Twitter"
-#: ../src/goabackend/goatwitterprovider.c:185
-#, c-format
-msgid "Didn't find id_str member in JSON data"
-msgstr "JSON 資料中找不到 id_str 成員"
-
-#: ../src/goabackend/goatwitterprovider.c:194
-#, c-format
-msgid "Didn't find screen_name member in JSON data"
-msgstr "JSON 資料中找不到 screen_name 成員"
-
-#: ../src/goabackend/goautils.c:84
+#: ../src/goabackend/goautils.c:86
#, c-format
msgid "A %s account already exists for %s"
msgstr "%s 帳號已經存在用於 %s"
#. Translators: the %s is the name of the provider. eg., Google.
-#: ../src/goabackend/goautils.c:106
+#: ../src/goabackend/goautils.c:108
#, c-format
msgid "%s account"
msgstr "%s 帳號"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:150
+#: ../src/goabackend/goautils.c:152
msgid "Failed to delete credentials from the keyring"
msgstr "無法從密碼匙圈刪除證書"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:202
+#: ../src/goabackend/goautils.c:204
msgid "Failed to retrieve credentials from the keyring"
msgstr "無法從密碼匙圈取回證書"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:212
+#: ../src/goabackend/goautils.c:214
msgid "No credentials found in the keyring"
msgstr "密碼匙圈找不到證書"
-#: ../src/goabackend/goautils.c:225
+#: ../src/goabackend/goautils.c:227
msgid "Error parsing result obtained from the keyring: "
msgstr "從密碼匙圈取得解析結果時發生錯誤："
#. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo'
-#: ../src/goabackend/goautils.c:268
+#: ../src/goabackend/goautils.c:270
#, c-format
msgid "GOA %s credentials for identity %s"
msgstr "%2$s 身分的 GOA %1$s 證書"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:285
+#: ../src/goabackend/goautils.c:287
msgid "Failed to store credentials in the keyring"
msgstr "無法儲存證書到密碼匙圈"
-#: ../src/goabackend/goautils.c:506
+#: ../src/goabackend/goautils.c:508
msgid "The signing certificate authority is not known."
msgstr "簽署的證書授權中心不明。"
-#: ../src/goabackend/goautils.c:510
+#: ../src/goabackend/goautils.c:512
msgid ""
"The certificate does not match the expected identity of the site that it was "
"retrieved from."
msgstr "證書與取回證書的網站身分比對不符。"
-#: ../src/goabackend/goautils.c:515
+#: ../src/goabackend/goautils.c:517
msgid "The certificate's activation time is still in the future."
msgstr "證書的啟用時刻在未來。"
-#: ../src/goabackend/goautils.c:519
+#: ../src/goabackend/goautils.c:521
msgid "The certificate has expired."
msgstr "證書已逾期。"
-#: ../src/goabackend/goautils.c:523
+#: ../src/goabackend/goautils.c:525
msgid "The certificate has been revoked."
msgstr "證書已撤銷。"
-#: ../src/goabackend/goautils.c:527
+#: ../src/goabackend/goautils.c:529
msgid "The certificate's algorithm is considered insecure."
msgstr "證書的演算法被認為是不安全的。"
-#: ../src/goabackend/goautils.c:531
+#: ../src/goabackend/goautils.c:533
msgid "Invalid certificate."
msgstr "證書無效。"
@@ -700,48 +666,19 @@ msgstr "證書無效。"
msgid "Loading “%s”…"
msgstr "正載入「%s」..."
-#: ../src/goabackend/goawindowsliveprovider.c:83
+#: ../src/goabackend/goawindowsliveprovider.c:84
msgid "Windows Live"
msgstr "Windows Live"
-#: ../src/goabackend/goawindowsliveprovider.c:217
-#, c-format
-msgid "Didn't find account email member in JSON data"
-msgstr "JSON 資料中找不到帳號電子郵件成員"
-
-#: ../src/goabackend/goayahooprovider.c:80
+#: ../src/goabackend/goayahooprovider.c:81
msgid "Yahoo"
msgstr "Yahoo"
-#: ../src/goabackend/goayahooprovider.c:188
-#, c-format
-msgid "Didn't find guid member in JSON data"
-msgstr "JSON 資料中找不到 guid 成員"
-
-#: ../src/goabackend/goayahooprovider.c:198
-#, c-format
-msgid "Didn't find value member in JSON data"
-msgstr "JSON 資料中找不到值成員"
-
-#: ../src/goabackend/goayahooprovider.c:224
+#: ../src/goabackend/goayahooprovider.c:255
#, c-format
msgid "Expected status 200 when requesting name, instead got status %d (%s)"
msgstr "請求名稱時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goayahooprovider.c:237
-msgid "Error parsing usercard response as JSON: "
-msgstr "以 JSON 解析使用者卡片回應時發生錯誤："
-
-#: ../src/goabackend/goayahooprovider.c:248
-#, c-format
-msgid "Didn't find profile member in JSON data"
-msgstr "JSON 資料中找不到個人檔案成員"
-
-#: ../src/goabackend/goayahooprovider.c:258
-#, c-format
-msgid "Didn't find nickname member in JSON data"
-msgstr "JSON 資料中找不到網名成員"
-
#: ../src/goaidentity/goaalarm.c:245
msgid "Time"
msgstr "時間"
@@ -750,15 +687,15 @@ msgstr "時間"
msgid "Time to fire"
msgstr "啟動時間"
-#: ../src/goaidentity/goaidentityservice.c:377
+#: ../src/goaidentity/goaidentityservice.c:378
msgid "initial secret passed before secret key exchange"
msgstr "在私人密碼匙交換前傳送的初始機密"
-#: ../src/goaidentity/goaidentityservice.c:569
+#: ../src/goaidentity/goaidentityservice.c:570
msgid "Initial secret key is invalid"
msgstr "初始密碼匙無效"
-#: ../src/goaidentity/goaidentityservice.c:1089
+#: ../src/goaidentity/goaidentityservice.c:1090
#, c-format
msgid "The network realm %s needs some information to sign you in."
msgstr "網絡領域 %s 需要一些資訊才能讓你登入。"
@@ -823,6 +760,69 @@ msgstr "找不到身分認證"
msgid "Could not create credential cache for identity"
msgstr "無法建立身分認證的證書快取"
+#~ msgid "Online Accounts"
+#~ msgstr "線上帳號"
+
+#~ msgid "Provides the org.gnome.OnlinesAccounts name on the session bus"
+#~ msgstr "在作業階段匯流排提供 org.gnome.OnlinesAccounts 名稱"
+
+#~ msgid "An online account needs attention"
+#~ msgstr "有個線上帳號要求注意"
+
+#~ msgid "Open Online Accounts..."
+#~ msgstr "開啟線上帳號..."
+
+#~ msgid "Error parsing response as JSON: "
+#~ msgstr "以 JSON 解析回應時發生錯誤："
+
+#~ msgid "Didn't find id member in JSON data"
+#~ msgstr "JSON 資料中找不到 id 成員"
+
+#~ msgid "Didn't find email member in JSON data"
+#~ msgstr "JSON 資料中找不到電子郵件成員"
+
+#~ msgid "Didn't find user member in JSON data"
+#~ msgstr "JSON 資料中找不到使用者成員"
+
+#~ msgid "Didn't find user.id member in JSON data"
+#~ msgstr "JSON 資料中找不到 user.id 成員"
+
+#~ msgid "Didn't find user.username member in JSON data"
+#~ msgstr "JSON 資料中找不到 user.username 成員"
+
+#~ msgid "Didn't find user.username._content member in JSON data"
+#~ msgstr "JSON 資料中找不到 user.username._content 成員"
+
+#~ msgid "Didn't find access_token in non-JSON data"
+#~ msgstr "非 JSON 資料中找不到 access_token"
+
+#~ msgid "Didn't find access_token in JSON data"
+#~ msgstr "JSON 資料中找不到 access_token"
+
+#~ msgid "Didn't find id_str member in JSON data"
+#~ msgstr "JSON 資料中找不到 id_str 成員"
+
+#~ msgid "Didn't find screen_name member in JSON data"
+#~ msgstr "JSON 資料中找不到 screen_name 成員"
+
+#~ msgid "Didn't find account email member in JSON data"
+#~ msgstr "JSON 資料中找不到帳號電子郵件成員"
+
+#~ msgid "Didn't find guid member in JSON data"
+#~ msgstr "JSON 資料中找不到 guid 成員"
+
+#~ msgid "Didn't find value member in JSON data"
+#~ msgstr "JSON 資料中找不到值成員"
+
+#~ msgid "Error parsing usercard response as JSON: "
+#~ msgstr "以 JSON 解析使用者名片回應時發生錯誤："
+
+#~ msgid "Didn't find profile member in JSON data"
+#~ msgstr "JSON 資料中找不到個人檔案成員"
+
+#~ msgid "Didn't find nickname member in JSON data"
+#~ msgstr "JSON 資料中找不到暱稱成員"
+
#~ msgid "Credentials not found in keyring (%s, %d): "
#~ msgstr "在鑰匙圈內找不到憑證 (%s，%d)："
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2a8cadf..fb15c89 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-online-accounts 3.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 22:53+0800\n"
-"PO-Revision-Date: 2013-02-27 19:28+0800\n"
+"POT-Creation-Date: 2013-08-02 10:50+0800\n"
+"PO-Revision-Date: 2013-08-02 09:06+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (Taiwan) <chinese-l10n googlegroups com>\n"
"Language: \n"
@@ -17,66 +17,49 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
-#. shut up -Wunused-but-set-variable
-#: ../data/goa-daemon.desktop.in.in.h:1 ../src/daemon/goadaemon.c:212
-msgid "Online Accounts"
-msgstr "線上帳號"
-
-#: ../data/goa-daemon.desktop.in.in.h:2
-msgid "Provides the org.gnome.OnlinesAccounts name on the session bus"
-msgstr "在作業階段匯流排提供 org.gnome.OnlinesAccounts 名稱"
-
#. TODO: more specific
-#: ../src/daemon/goadaemon.c:802 ../src/daemon/goadaemon.c:1150
+#: ../src/daemon/goadaemon.c:775 ../src/daemon/goadaemon.c:985
#, c-format
msgid "Failed to find a provider for: %s"
msgstr "無法尋找到此提供者：%s"
-#: ../src/daemon/goadaemon.c:992
-msgid "An online account needs attention"
-msgstr "有個線上帳號要求注意"
-
-#: ../src/daemon/goadaemon.c:1001
-msgid "Open Online Accounts..."
-msgstr "開啟線上帳號..."
-
#. TODO: more specific
-#: ../src/daemon/goadaemon.c:1138
+#: ../src/daemon/goadaemon.c:973
msgid "ProviderType property is not set for account"
msgstr "帳號沒有設定 ProviderType 屬性"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:214 ../src/goabackend/goahttpclient.c:155
+#: ../src/goabackend/goaewsclient.c:234 ../src/goabackend/goahttpclient.c:175
#, c-format
msgid "Code: %u - Unexpected response from server"
msgstr "代碼：%u - 伺服器有未預期的回應"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:240
+#: ../src/goabackend/goaewsclient.c:250
#, c-format
msgid "Failed to parse autodiscover response XML"
msgstr "無法解析自動探索回應 XML"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:250
+#: ../src/goabackend/goaewsclient.c:260
#, c-format
msgid "Failed to find Autodiscover element"
msgstr "找不到 Autodiscover 元素"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:264
+#: ../src/goabackend/goaewsclient.c:274
#, c-format
msgid "Failed to find Response element"
msgstr "找不到 Response 元素"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:278
+#: ../src/goabackend/goaewsclient.c:288
#, c-format
msgid "Failed to find Account element"
msgstr "找不到 Account 元素"
#. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:295
+#: ../src/goabackend/goaewsclient.c:305
#, c-format
msgid "Failed to find ASUrl and OABUrl in autodiscover response"
msgstr "在自動探索回應中找不到 ASUrl 與 OABUrl"
@@ -86,12 +69,10 @@ msgid "Microsoft Exchange"
msgstr "Microsoft Exchange"
#. TODO: more specific
-#: ../src/goabackend/goaexchangeprovider.c:308
-#: ../src/goabackend/goaexchangeprovider.c:1036
-#: ../src/goabackend/goagoogleprovider.c:596
-#: ../src/goabackend/goagoogleprovider.c:783
-#: ../src/goabackend/goaowncloudprovider.c:364
-#: ../src/goabackend/goaowncloudprovider.c:1138
+#: ../src/goabackend/goaexchangeprovider.c:317
+#: ../src/goabackend/goaexchangeprovider.c:1047
+#: ../src/goabackend/goaowncloudprovider.c:376
+#: ../src/goabackend/goaowncloudprovider.c:1168
#, c-format
msgid "Did not find password with identity `%s' in credentials"
msgstr "在憑證中找不到身分為「%s」的密碼"
@@ -100,220 +81,234 @@ msgstr "在憑證中找不到身分為「%s」的密碼"
#. * (eg., debarshi ray gmail com or rishi), and the
#. * (%s, %d) is the error domain and code.
#.
-#: ../src/goabackend/goaexchangeprovider.c:336
-#: ../src/goabackend/goagoogleprovider.c:619
-#: ../src/goabackend/goaowncloudprovider.c:387
+#: ../src/goabackend/goaexchangeprovider.c:345
+#: ../src/goabackend/goaowncloudprovider.c:399
#, c-format
msgid "Invalid password with username `%s' (%s, %d): "
msgstr "使用者名稱「%s」(%s, %d)的密碼無效："
-#: ../src/goabackend/goaexchangeprovider.c:501
-#: ../src/goabackend/goaimapsmtpprovider.c:635
+#: ../src/goabackend/goaexchangeprovider.c:510
+#: ../src/goabackend/goaimapsmtpprovider.c:697
msgid "_E-mail"
msgstr "電子郵件(_E)"
-#: ../src/goabackend/goaexchangeprovider.c:502
-#: ../src/goabackend/goaimapsmtpprovider.c:655
-#: ../src/goabackend/goaimapsmtpprovider.c:687
-#: ../src/goabackend/goaowncloudprovider.c:613
+#: ../src/goabackend/goaexchangeprovider.c:511
+#: ../src/goabackend/goaimapsmtpprovider.c:717
+#: ../src/goabackend/goaimapsmtpprovider.c:737
+#: ../src/goabackend/goaowncloudprovider.c:639
msgid "_Password"
msgstr "密碼(_P)"
-#: ../src/goabackend/goaexchangeprovider.c:505
+#: ../src/goabackend/goaexchangeprovider.c:514
msgid "_Custom"
msgstr "自訂(_C)"
-#: ../src/goabackend/goaexchangeprovider.c:524
-#: ../src/goabackend/goaimapsmtpprovider.c:654
-#: ../src/goabackend/goaimapsmtpprovider.c:686
-#: ../src/goabackend/goakerberosprovider.c:1128
-#: ../src/goabackend/goaowncloudprovider.c:612
+#: ../src/goabackend/goaexchangeprovider.c:533
+#: ../src/goabackend/goaimapsmtpprovider.c:716
+#: ../src/goabackend/goaimapsmtpprovider.c:736
+#: ../src/goabackend/goakerberosprovider.c:1134
+#: ../src/goabackend/goaowncloudprovider.c:638
msgid "User_name"
msgstr "使用者名稱(_N)"
-#: ../src/goabackend/goaexchangeprovider.c:525
-#: ../src/goabackend/goaowncloudprovider.c:611
+#: ../src/goabackend/goaexchangeprovider.c:534
+#: ../src/goabackend/goaowncloudprovider.c:637
msgid "_Server"
msgstr "伺服器(_S)"
-#: ../src/goabackend/goaexchangeprovider.c:555
-#: ../src/goabackend/goaimapsmtpprovider.c:731
-#: ../src/goabackend/goakerberosprovider.c:1153
-#: ../src/goabackend/goaowncloudprovider.c:642
+#: ../src/goabackend/goaexchangeprovider.c:564
+#: ../src/goabackend/goaimapsmtpprovider.c:769
+#: ../src/goabackend/goakerberosprovider.c:1159
+#: ../src/goabackend/goaowncloudprovider.c:668
msgid "Connecting…"
msgstr "連線中…"
-#: ../src/goabackend/goaexchangeprovider.c:660
-#: ../src/goabackend/goaexchangeprovider.c:854
-#: ../src/goabackend/goaimapsmtpprovider.c:890
-#: ../src/goabackend/goaimapsmtpprovider.c:924
-#: ../src/goabackend/goaimapsmtpprovider.c:1012
-#: ../src/goabackend/goaimapsmtpprovider.c:1258
-#: ../src/goabackend/goaimapsmtpprovider.c:1328
-#: ../src/goabackend/goakerberosprovider.c:1544
-#: ../src/goabackend/goaoauth2provider.c:1048
+#: ../src/goabackend/goaexchangeprovider.c:669
+#: ../src/goabackend/goaexchangeprovider.c:864
+#: ../src/goabackend/goaimapsmtpprovider.c:929
+#: ../src/goabackend/goaimapsmtpprovider.c:964
+#: ../src/goabackend/goaimapsmtpprovider.c:1052
+#: ../src/goabackend/goaimapsmtpprovider.c:1308
+#: ../src/goabackend/goaimapsmtpprovider.c:1381
+#: ../src/goabackend/goakerberosprovider.c:1550
+#: ../src/goabackend/goaoauth2provider.c:1133
#: ../src/goabackend/goaoauthprovider.c:1041
-#: ../src/goabackend/goaowncloudprovider.c:753
-#: ../src/goabackend/goaowncloudprovider.c:962
+#: ../src/goabackend/goaowncloudprovider.c:779
+#: ../src/goabackend/goaowncloudprovider.c:991
#, c-format
msgid "Dialog was dismissed"
msgstr "對話盒已放棄"
-#: ../src/goabackend/goaexchangeprovider.c:697
-#: ../src/goabackend/goaexchangeprovider.c:882
-#: ../src/goabackend/goaimapsmtpprovider.c:954
-#: ../src/goabackend/goaimapsmtpprovider.c:1043
-#: ../src/goabackend/goaimapsmtpprovider.c:1282
-#: ../src/goabackend/goaimapsmtpprovider.c:1353
-#: ../src/goabackend/goaowncloudprovider.c:792
-#: ../src/goabackend/goaowncloudprovider.c:983
+#: ../src/goabackend/goaexchangeprovider.c:707
+#: ../src/goabackend/goaexchangeprovider.c:892
+#: ../src/goabackend/goaimapsmtpprovider.c:994
+#: ../src/goabackend/goaimapsmtpprovider.c:1085
+#: ../src/goabackend/goaimapsmtpprovider.c:1332
+#: ../src/goabackend/goaimapsmtpprovider.c:1406
+#: ../src/goabackend/goaowncloudprovider.c:821
+#: ../src/goabackend/goaowncloudprovider.c:1012
#, c-format
msgid "Dialog was dismissed (%s, %d): "
msgstr "對話盒已放棄 (%s, %d)："
-#: ../src/goabackend/goaexchangeprovider.c:710
-#: ../src/goabackend/goaimapsmtpprovider.c:967
-#: ../src/goabackend/goaimapsmtpprovider.c:1056
-#: ../src/goabackend/goaowncloudprovider.c:805
+#: ../src/goabackend/goaexchangeprovider.c:720
+#: ../src/goabackend/goaimapsmtpprovider.c:1007
+#: ../src/goabackend/goaimapsmtpprovider.c:1098
+#: ../src/goabackend/goaowncloudprovider.c:834
msgid "_Ignore"
msgstr "忽略(_I)"
-#: ../src/goabackend/goaexchangeprovider.c:715
-#: ../src/goabackend/goaexchangeprovider.c:901
-#: ../src/goabackend/goaimapsmtpprovider.c:972
-#: ../src/goabackend/goaimapsmtpprovider.c:1061
-#: ../src/goabackend/goaimapsmtpprovider.c:1301
-#: ../src/goabackend/goaimapsmtpprovider.c:1372
-#: ../src/goabackend/goakerberosprovider.c:1653
-#: ../src/goabackend/goaowncloudprovider.c:810
-#: ../src/goabackend/goaowncloudprovider.c:1002
+#: ../src/goabackend/goaexchangeprovider.c:725
+#: ../src/goabackend/goaexchangeprovider.c:911
+#: ../src/goabackend/goaimapsmtpprovider.c:1012
+#: ../src/goabackend/goaimapsmtpprovider.c:1103
+#: ../src/goabackend/goaimapsmtpprovider.c:1351
+#: ../src/goabackend/goaimapsmtpprovider.c:1425
+#: ../src/goabackend/goakerberosprovider.c:1660
+#: ../src/goabackend/goaowncloudprovider.c:839
+#: ../src/goabackend/goaowncloudprovider.c:1031
msgid "_Try Again"
msgstr "重試(_T)"
-#: ../src/goabackend/goaexchangeprovider.c:720
-#: ../src/goabackend/goaexchangeprovider.c:894
+#: ../src/goabackend/goaexchangeprovider.c:730
+#: ../src/goabackend/goaexchangeprovider.c:904
msgid "Error connecting to Microsoft Exchange server"
msgstr "連接至 Microsoft Exchange 伺服器時發生錯誤"
-#: ../src/goabackend/goaexchangeprovider.c:956
-#: ../src/goabackend/goafacebookprovider.c:397
-#: ../src/goabackend/goagoogleprovider.c:664
-#: ../src/goabackend/goakerberosprovider.c:1724
-#: ../src/goabackend/goaowncloudprovider.c:1058
-#: ../src/goabackend/goawindowsliveprovider.c:410
+#: ../src/goabackend/goaexchangeprovider.c:966
+#: ../src/goabackend/goafacebookprovider.c:455
+#: ../src/goabackend/goagoogleprovider.c:546
+#: ../src/goabackend/goakerberosprovider.c:1731
+#: ../src/goabackend/goaowncloudprovider.c:1087
+#: ../src/goabackend/goawindowsliveprovider.c:432
msgid "Use for"
msgstr "使用於"
-#: ../src/goabackend/goaexchangeprovider.c:958
-#: ../src/goabackend/goagoogleprovider.c:666
+#: ../src/goabackend/goaexchangeprovider.c:968
+#: ../src/goabackend/goagoogleprovider.c:548
msgid "_Mail"
msgstr "郵件(_M)"
-#: ../src/goabackend/goaexchangeprovider.c:963
-#: ../src/goabackend/goagoogleprovider.c:671
-#: ../src/goabackend/goaowncloudprovider.c:1060
+#: ../src/goabackend/goaexchangeprovider.c:973
+#: ../src/goabackend/goagoogleprovider.c:553
+#: ../src/goabackend/goaowncloudprovider.c:1089
msgid "Cale_ndar"
msgstr "行事曆(_N)"
-#: ../src/goabackend/goaexchangeprovider.c:968
-#: ../src/goabackend/goagoogleprovider.c:676
-#: ../src/goabackend/goaowncloudprovider.c:1065
+#: ../src/goabackend/goaexchangeprovider.c:978
+#: ../src/goabackend/goagoogleprovider.c:558
+#: ../src/goabackend/goaowncloudprovider.c:1094
msgid "_Contacts"
msgstr "聯絡人(_C)"
-#: ../src/goabackend/goafacebookprovider.c:81
+#: ../src/goabackend/goafacebookprovider.c:82
msgid "Facebook"
msgstr "Facebook"
#. Translators: the %d is a HTTP status code and the %s is a textual description of it
-#: ../src/goabackend/goafacebookprovider.c:201
-#: ../src/goabackend/goagoogleprovider.c:196
-#: ../src/goabackend/goatwitterprovider.c:162
-#: ../src/goabackend/goawindowsliveprovider.c:183
-#: ../src/goabackend/goayahooprovider.c:165
+#: ../src/goabackend/goafacebookprovider.c:218
+#: ../src/goabackend/goagoogleprovider.c:207
+#: ../src/goabackend/goatwitterprovider.c:166
+#: ../src/goabackend/goawindowsliveprovider.c:195
+#: ../src/goabackend/goayahooprovider.c:187
#, c-format
msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
msgstr "請求 guid 時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goafacebookprovider.c:213
-#: ../src/goabackend/goaflickrprovider.c:191
-#: ../src/goabackend/goagoogleprovider.c:208
-#: ../src/goabackend/goaoauth2provider.c:616
-#: ../src/goabackend/goatwitterprovider.c:174
-#: ../src/goabackend/goawindowsliveprovider.c:195
-#: ../src/goabackend/goayahooprovider.c:177
-msgid "Error parsing response as JSON: "
-msgstr "以 JSON 解析回應時發生錯誤："
-
-#: ../src/goabackend/goafacebookprovider.c:224
-#: ../src/goabackend/goawindowsliveprovider.c:206
-#, c-format
-msgid "Didn't find id member in JSON data"
-msgstr "JSON 資料中找不到 id 成員"
-
-#: ../src/goabackend/goafacebookprovider.c:233
-#: ../src/goabackend/goagoogleprovider.c:219
-#, c-format
-msgid "Didn't find email member in JSON data"
-msgstr "JSON 資料中找不到電子郵件成員"
-
-#: ../src/goabackend/goafacebookprovider.c:399
-#: ../src/goabackend/goagoogleprovider.c:681
-#: ../src/goabackend/goawindowsliveprovider.c:412
+#: ../src/goabackend/goafacebookprovider.c:237
+#: ../src/goabackend/goafacebookprovider.c:249
+#: ../src/goabackend/goafacebookprovider.c:259
+#: ../src/goabackend/goaflickrprovider.c:208
+#: ../src/goabackend/goaflickrprovider.c:220
+#: ../src/goabackend/goaflickrprovider.c:230
+#: ../src/goabackend/goaflickrprovider.c:240
+#: ../src/goabackend/goaflickrprovider.c:250
+#: ../src/goabackend/goagoogleprovider.c:226
+#: ../src/goabackend/goagoogleprovider.c:238
+#: ../src/goabackend/goaoauth2provider.c:682
+#: ../src/goabackend/goaoauth2provider.c:712
+#: ../src/goabackend/goaoauth2provider.c:724
+#: ../src/goabackend/goatwitterprovider.c:185
+#: ../src/goabackend/goatwitterprovider.c:197
+#: ../src/goabackend/goatwitterprovider.c:207
+#: ../src/goabackend/goawindowsliveprovider.c:214
+#: ../src/goabackend/goawindowsliveprovider.c:226
+#: ../src/goabackend/goawindowsliveprovider.c:238
+#: ../src/goabackend/goayahooprovider.c:206
+#: ../src/goabackend/goayahooprovider.c:218
+#: ../src/goabackend/goayahooprovider.c:229
+#: ../src/goabackend/goayahooprovider.c:275
+#: ../src/goabackend/goayahooprovider.c:287
+#: ../src/goabackend/goayahooprovider.c:298
+#, c-format
+msgid "Could not parse response"
+msgstr "無法解析回應"
+
+#: ../src/goabackend/goafacebookprovider.c:457
+#: ../src/goabackend/goagoogleprovider.c:563
+#: ../src/goabackend/goawindowsliveprovider.c:434
msgid "C_hat"
msgstr "聊天(_H)"
-#: ../src/goabackend/goaflickrprovider.c:82
+#: ../src/goabackend/goafacebookprovider.c:462
+#: ../src/goabackend/goaflickrprovider.c:430
+msgid "_Photos"
+msgstr "相片(_P)"
+
+#: ../src/goabackend/goaflickrprovider.c:83
msgid "Flickr"
msgstr "Flickr"
-#: ../src/goabackend/goaflickrprovider.c:179
+#: ../src/goabackend/goaflickrprovider.c:189
#, c-format
msgid "Expected status 200 when requesting user id, instead got status %d (%s)"
msgstr "請求使用者 id 時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goaflickrprovider.c:202
-#, c-format
-msgid "Didn't find user member in JSON data"
-msgstr "JSON 資料中找不到使用者成員"
-
-#: ../src/goabackend/goaflickrprovider.c:211
-#, c-format
-msgid "Didn't find user.id member in JSON data"
-msgstr "JSON 資料中找不到 user.id 成員"
-
-#: ../src/goabackend/goaflickrprovider.c:220
-#, c-format
-msgid "Didn't find user.username member in JSON data"
-msgstr "JSON 資料中找不到 user.username 成員"
-
-#: ../src/goabackend/goaflickrprovider.c:229
-#, c-format
-msgid "Didn't find user.username._content member in JSON data"
-msgstr "JSON 資料中找不到 user.username._content 成員"
-
-#: ../src/goabackend/goaflickrprovider.c:306
+#: ../src/goabackend/goaflickrprovider.c:328
+#: ../src/goabackend/goayahooprovider.c:350
msgid "Your system time is invalid. Check your date and time settings."
msgstr "您的系統時間無效。請檢查您的日期與時間設定值。"
-#: ../src/goabackend/goaflickrprovider.c:408
-msgid "_Photos"
-msgstr "相片(_P)"
-
-#: ../src/goabackend/goagoogleprovider.c:85
+#: ../src/goabackend/goagoogleprovider.c:82
msgid "Google"
msgstr "Google"
-#: ../src/goabackend/goagoogleprovider.c:686
-#: ../src/goabackend/goawindowsliveprovider.c:417
+#: ../src/goabackend/goagoogleprovider.c:568
+#: ../src/goabackend/goawindowsliveprovider.c:439
msgid "_Documents"
msgstr "文件(_D)"
+#. TODO: more specific
+#: ../src/goabackend/goaimapauthlogin.c:99
+#: ../src/goabackend/goasmtpauthplain.c:146
+#, c-format
+msgid "Service not available"
+msgstr "服務無法使用"
+
+#. TODO: more specific
+#: ../src/goabackend/goaimapauthlogin.c:120
+#: ../src/goabackend/goasmtpauthplain.c:115
+#, c-format
+msgid "Authentication failed"
+msgstr "驗證失敗"
+
+#: ../src/goabackend/goaimapauthlogin.c:145
+#: ../src/goabackend/goasmtpauthplain.c:646
+#, c-format
+msgid "Server does not support PLAIN"
+msgstr "伺服器不支援 PLAIN"
+
+#: ../src/goabackend/goaimapauthlogin.c:199
+#: ../src/goabackend/goasmtpauthplain.c:751
+#, c-format
+msgid "Server does not support STARTTLS"
+msgstr "伺服器不支援 STARTTLS"
+
#: ../src/goabackend/goaimapsmtpprovider.c:82
msgid "IMAP and SMTP"
msgstr "IMAP 與 SMTP"
-#: ../src/goabackend/goaimapsmtpprovider.c:350
+#: ../src/goabackend/goaimapsmtpprovider.c:362
#, c-format
msgid "Did not find imap-password with identity `%s' in credentials"
msgstr "在憑證中找不到識別符為「%s」的 imap 密碼"
@@ -322,12 +317,12 @@ msgstr "在憑證中找不到識別符為「%s」的 imap 密碼"
#. * username (eg., rishi), and the (%s, %d)
#. * is the error domain and code.
#.
-#: ../src/goabackend/goaimapsmtpprovider.c:379
+#: ../src/goabackend/goaimapsmtpprovider.c:391
#, c-format
msgid "Invalid imap-password with username `%s' (%s, %d): "
msgstr "使用者名稱「%s」的 imap 密碼無效 (%s, %d)："
-#: ../src/goabackend/goaimapsmtpprovider.c:397
+#: ../src/goabackend/goaimapsmtpprovider.c:415
#, c-format
msgid "Did not find smtp-password with identity `%s' in credentials"
msgstr "在憑證中找不到識別符為「%s」的 smtp 密碼"
@@ -336,68 +331,70 @@ msgstr "在憑證中找不到識別符為「%s」的 smtp 密碼"
#. * username (eg., rishi), and the (%s, %d)
#. * is the error domain and code.
#.
-#: ../src/goabackend/goaimapsmtpprovider.c:428
+#: ../src/goabackend/goaimapsmtpprovider.c:446
#, c-format
msgid "Invalid smtp-password with username `%s' (%s, %d): "
msgstr "使用者名稱「%s」的 smtp 密碼無效 (%s, %d)："
-#: ../src/goabackend/goaimapsmtpprovider.c:636
-msgid "_Name"
-msgstr "名稱(_N)"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:653
-msgid "IMAP _Server"
-msgstr "IMAP 伺服器(_S)"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:660
-#: ../src/goabackend/goaimapsmtpprovider.c:692
+#. Translators: the following four strings are used to show a
+#. * combo box similar to the one in the evolution module.
+#. * Encryption: None
+#. * STARTTLS after connecting
+#. * SSL on a dedicated port
+#.
+#: ../src/goabackend/goaimapsmtpprovider.c:632
msgid "_Encryption"
msgstr "加密(_E)"
-#: ../src/goabackend/goaimapsmtpprovider.c:663
-#: ../src/goabackend/goaimapsmtpprovider.c:695
+#: ../src/goabackend/goaimapsmtpprovider.c:635
msgid "None"
msgstr "沒有"
-#: ../src/goabackend/goaimapsmtpprovider.c:666
-#: ../src/goabackend/goaimapsmtpprovider.c:698
+#: ../src/goabackend/goaimapsmtpprovider.c:638
msgid "STARTTLS after connecting"
msgstr "連線後使用 STARTTLS"
-#: ../src/goabackend/goaimapsmtpprovider.c:669
-#: ../src/goabackend/goaimapsmtpprovider.c:701
+#: ../src/goabackend/goaimapsmtpprovider.c:641
msgid "SSL on a dedicated port"
msgstr "SSL 於專用的連接埠"
-#: ../src/goabackend/goaimapsmtpprovider.c:685
+#: ../src/goabackend/goaimapsmtpprovider.c:698
+msgid "_Name"
+msgstr "名稱(_N)"
+
+#: ../src/goabackend/goaimapsmtpprovider.c:715
+msgid "IMAP _Server"
+msgstr "IMAP 伺服器(_S)"
+
+#: ../src/goabackend/goaimapsmtpprovider.c:735
msgid "SMTP _Server"
msgstr "SMTP 伺服器(_S)"
-#: ../src/goabackend/goaimapsmtpprovider.c:977
-#: ../src/goabackend/goaimapsmtpprovider.c:1294
+#: ../src/goabackend/goaimapsmtpprovider.c:1017
+#: ../src/goabackend/goaimapsmtpprovider.c:1344
msgid "Error connecting to IMAP server"
msgstr "連接至 IMAP 伺服器時發生錯誤"
-#: ../src/goabackend/goaimapsmtpprovider.c:1066
-#: ../src/goabackend/goaimapsmtpprovider.c:1365
+#: ../src/goabackend/goaimapsmtpprovider.c:1108
+#: ../src/goabackend/goaimapsmtpprovider.c:1418
msgid "Error connecting to SMTP server"
msgstr "連接至 SMTP 伺服器時發生錯誤"
-#: ../src/goabackend/goaimapsmtpprovider.c:1470
+#: ../src/goabackend/goaimapsmtpprovider.c:1526
msgid "E-mail"
msgstr "電子郵件"
-#: ../src/goabackend/goaimapsmtpprovider.c:1474
+#: ../src/goabackend/goaimapsmtpprovider.c:1530
msgid "Name"
msgstr "名稱"
-#: ../src/goabackend/goaimapsmtpprovider.c:1484
-#: ../src/goabackend/goaimapsmtpprovider.c:1487
+#: ../src/goabackend/goaimapsmtpprovider.c:1540
+#: ../src/goabackend/goaimapsmtpprovider.c:1543
msgid "IMAP"
msgstr "IMAP"
-#: ../src/goabackend/goaimapsmtpprovider.c:1498
-#: ../src/goabackend/goaimapsmtpprovider.c:1501
+#: ../src/goabackend/goaimapsmtpprovider.c:1554
+#: ../src/goabackend/goaimapsmtpprovider.c:1557
msgid "SMTP"
msgstr "SMTP"
@@ -405,109 +402,99 @@ msgstr "SMTP"
msgid "Enterprise Login (Kerberos)"
msgstr "企業版登入 (Kerberos)"
-#: ../src/goabackend/goakerberosprovider.c:449
+#: ../src/goabackend/goakerberosprovider.c:455
msgid "Identity service returned invalid key"
msgstr "身分認證服務傳回無效的鍵值"
-#: ../src/goabackend/goakerberosprovider.c:715
+#: ../src/goabackend/goakerberosprovider.c:721
#, c-format
msgid "Could not find saved credentials for principal `%s' in keyring"
msgstr "找不到鑰匙圈中的主要「%s」儲存的憑證"
-#: ../src/goabackend/goakerberosprovider.c:725
+#: ../src/goabackend/goakerberosprovider.c:731
#, c-format
msgid "Did not find password for principal `%s' in credentials"
msgstr "在憑證中找不到主要「%s」的密碼"
-#: ../src/goabackend/goakerberosprovider.c:1120
+#: ../src/goabackend/goakerberosprovider.c:1126
msgid "_Domain"
msgstr "網域(_D)"
-#: ../src/goabackend/goakerberosprovider.c:1121
+#: ../src/goabackend/goakerberosprovider.c:1127
msgid "Enterprise domain or realm name"
msgstr "企業網域或領域名稱"
-#: ../src/goabackend/goakerberosprovider.c:1353
-#: ../src/goaidentity/goaidentityservice.c:1084
+#: ../src/goabackend/goakerberosprovider.c:1359
+#: ../src/goaidentity/goaidentityservice.c:1085
msgid "Log In to Realm"
msgstr "登入領域"
-#: ../src/goabackend/goakerberosprovider.c:1354
+#: ../src/goabackend/goakerberosprovider.c:1360
msgid "Please enter your password below."
msgstr "請在下面輸入您的密碼。"
-#: ../src/goabackend/goakerberosprovider.c:1355
+#: ../src/goabackend/goakerberosprovider.c:1361
msgid "Remember this password"
msgstr "記住這個密碼"
-#: ../src/goabackend/goakerberosprovider.c:1494
+#: ../src/goabackend/goakerberosprovider.c:1500
#, c-format
msgid "The domain is not valid"
msgstr "網域是無效的"
-#: ../src/goabackend/goakerberosprovider.c:1648
+#: ../src/goabackend/goakerberosprovider.c:1655
msgid "Error connecting to enterprise identity server"
msgstr "連線至企業身分認證伺服器時發生錯誤"
-#: ../src/goabackend/goakerberosprovider.c:1726
+#: ../src/goabackend/goakerberosprovider.c:1733
msgid "Network _Resources"
msgstr "網路資源(_R)"
#. Translators: the %d is a HTTP status code and the %s is a textual description of it
-#: ../src/goabackend/goaoauth2provider.c:573
+#: ../src/goabackend/goaoauth2provider.c:658
#: ../src/goabackend/goaoauthprovider.c:586
#, c-format
msgid ""
"Expected status 200 when requesting access token, instead got status %d (%s)"
msgstr "請求存取記號時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goaoauth2provider.c:593
-#, c-format
-msgid "Didn't find access_token in non-JSON data"
-msgstr "非 JSON 資料中找不到 access_token"
-
-#: ../src/goabackend/goaoauth2provider.c:627
-#, c-format
-msgid "Didn't find access_token in JSON data"
-msgstr "JSON 資料中找不到 access_token"
-
-#: ../src/goabackend/goaoauth2provider.c:835
-#: ../src/goabackend/goaoauth2provider.c:875
+#: ../src/goabackend/goaoauth2provider.c:916
+#: ../src/goabackend/goaoauth2provider.c:956
#, c-format
msgid "Authorization response was \"%s\""
msgstr "驗證回應為「%s」"
#. Translators: The verb "Paste" is used when asking the user to paste a string from a web browser window
-#: ../src/goabackend/goaoauth2provider.c:981
+#: ../src/goabackend/goaoauth2provider.c:1059
#, c-format
msgid ""
"Paste authorization code obtained from the <a href=\"%s\">authorization "
"page</a>:"
msgstr "貼上從<a href=\"%s\">驗證頁面</a>取得的驗證代碼："
-#: ../src/goabackend/goaoauth2provider.c:1074
+#: ../src/goabackend/goaoauth2provider.c:1159
#: ../src/goabackend/goaoauthprovider.c:1072
msgid "Error getting an Access Token: "
msgstr "取得存取記號時發生錯誤："
-#: ../src/goabackend/goaoauth2provider.c:1089
+#: ../src/goabackend/goaoauth2provider.c:1174
#: ../src/goabackend/goaoauthprovider.c:1085
msgid "Error getting identity: "
msgstr "取得身分時發生錯誤："
-#: ../src/goabackend/goaoauth2provider.c:1378
-#: ../src/goabackend/goaoauthprovider.c:1390
+#: ../src/goabackend/goaoauth2provider.c:1386
+#: ../src/goabackend/goaoauthprovider.c:1391
#, c-format
msgid "Was asked to login as %s, but logged in as %s"
msgstr "有被詢問以 %s 登入，但卻以 %s 登入"
-#: ../src/goabackend/goaoauth2provider.c:1549
+#: ../src/goabackend/goaoauth2provider.c:1542
#, c-format
msgid "Credentials do not contain access_token"
msgstr "憑證不包含 access_token"
-#: ../src/goabackend/goaoauth2provider.c:1588
-#: ../src/goabackend/goaoauthprovider.c:1618
+#: ../src/goabackend/goaoauth2provider.c:1581
+#: ../src/goabackend/goaoauthprovider.c:1619
#, c-format
msgid "Failed to refresh access token (%s, %d): "
msgstr "無法重新整理存取符令 (%s，%d)："
@@ -539,158 +526,137 @@ msgstr "回應遺失 request_token 或 request_token_secret 標頭"
msgid "Paste token obtained from the <a href=\"%s\">authorization page</a>:"
msgstr "從<a href=\"%s\">認證頁面</a>取得貼上記號："
-#: ../src/goabackend/goaoauthprovider.c:1574
+#: ../src/goabackend/goaoauthprovider.c:1575
#, c-format
msgid "Credentials do not contain access_token or access_token_secret"
msgstr "憑證不包含 access_token 或 access_token_secret"
-#: ../src/goabackend/goaowncloudprovider.c:84
+#: ../src/goabackend/goaowncloudprovider.c:87
msgid "ownCloud"
msgstr "ownCloud"
-#: ../src/goabackend/goaowncloudprovider.c:815
-#: ../src/goabackend/goaowncloudprovider.c:995
+#: ../src/goabackend/goaowncloudprovider.c:844
+#: ../src/goabackend/goaowncloudprovider.c:1024
msgid "Error connecting to ownCloud server"
msgstr "連接至 ownCloud 伺服器時發生錯誤"
-#: ../src/goabackend/goaowncloudprovider.c:1070
+#: ../src/goabackend/goaowncloudprovider.c:1099
msgid "_Files"
msgstr "檔案(_F)"
-#: ../src/goabackend/goaprovider.c:579
+#: ../src/goabackend/goaprovider.c:712
#, c-format
msgid "ensure_credentials_sync is not implemented on type %s"
msgstr "ensure_credentials_sync 並非以 %s 類型實作"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:372
+#: ../src/goabackend/goasmtpauthplain.c:161
#, c-format
-msgid "Did not find smtp-password in credentials"
-msgstr "在憑證中找不到 smtp 密碼"
-
-#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:383
-#, c-format
-msgid "Cannot do SMTP PLAIN without a password"
-msgstr "沒有密碼不能進行 SMTP PLAIN"
+msgid "TLS not available"
+msgstr "TLS 無法使用"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:402
+#: ../src/goabackend/goasmtpauthplain.c:227
#, c-format
msgid "org.gnome.OnlineAccounts.Mail is not available"
msgstr "org.gnome.OnlineAccounts.Mail 無法使用"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:412
+#: ../src/goabackend/goasmtpauthplain.c:237
#, c-format
msgid "Failed to parse email address"
msgstr "無法分析電子郵件位址"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:424
+#: ../src/goabackend/goasmtpauthplain.c:249
#, c-format
msgid "Cannot do SMTP PLAIN without a domain"
msgstr "沒有網域不能進行 SMTP PLAIN"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:438
-#, c-format
-msgid "Service not available"
-msgstr "服務無法使用"
-
-#: ../src/goabackend/goasmtpauthplain.c:475
+#: ../src/goabackend/goasmtpauthplain.c:287
#, c-format
-msgid "Server does not support PLAIN"
-msgstr "伺服器不支援 PLAIN"
+msgid "Did not find smtp-password in credentials"
+msgstr "在憑證中找不到 smtp 密碼"
#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:505
+#: ../src/goabackend/goasmtpauthplain.c:298
#, c-format
-msgid "Authentication failed"
-msgstr "驗證失敗"
+msgid "Cannot do SMTP PLAIN without a password"
+msgstr "沒有密碼不能進行 SMTP PLAIN"
-#: ../src/goabackend/goatwitterprovider.c:80
+#: ../src/goabackend/goatwitterprovider.c:81
msgid "Twitter"
msgstr "Twitter"
-#: ../src/goabackend/goatwitterprovider.c:185
-#, c-format
-msgid "Didn't find id_str member in JSON data"
-msgstr "JSON 資料中找不到 id_str 成員"
-
-#: ../src/goabackend/goatwitterprovider.c:194
-#, c-format
-msgid "Didn't find screen_name member in JSON data"
-msgstr "JSON 資料中找不到 screen_name 成員"
-
-#: ../src/goabackend/goautils.c:84
+#: ../src/goabackend/goautils.c:86
#, c-format
msgid "A %s account already exists for %s"
msgstr "%s 帳號已經存在用於 %s"
#. Translators: the %s is the name of the provider. eg., Google.
-#: ../src/goabackend/goautils.c:106
+#: ../src/goabackend/goautils.c:108
#, c-format
msgid "%s account"
msgstr "%s 帳號"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:150
+#: ../src/goabackend/goautils.c:152
msgid "Failed to delete credentials from the keyring"
msgstr "無法從鑰匙圈刪除憑證"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:202
+#: ../src/goabackend/goautils.c:204
msgid "Failed to retrieve credentials from the keyring"
msgstr "無法從鑰匙圈取回憑證"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:212
+#: ../src/goabackend/goautils.c:214
msgid "No credentials found in the keyring"
msgstr "鑰匙圈找不到憑證"
-#: ../src/goabackend/goautils.c:225
+#: ../src/goabackend/goautils.c:227
msgid "Error parsing result obtained from the keyring: "
msgstr "從鑰匙圈取得解析結果時發生錯誤："
#. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo'
-#: ../src/goabackend/goautils.c:268
+#: ../src/goabackend/goautils.c:270
#, c-format
msgid "GOA %s credentials for identity %s"
msgstr "%2$s 身分的 GOA %1$s 憑證"
#. TODO: more specific
-#: ../src/goabackend/goautils.c:285
+#: ../src/goabackend/goautils.c:287
msgid "Failed to store credentials in the keyring"
msgstr "無法儲存憑證到鑰匙圈"
-#: ../src/goabackend/goautils.c:506
+#: ../src/goabackend/goautils.c:508
msgid "The signing certificate authority is not known."
msgstr "簽署的憑證授權中心不明。"
-#: ../src/goabackend/goautils.c:510
+#: ../src/goabackend/goautils.c:512
msgid ""
"The certificate does not match the expected identity of the site that it was "
"retrieved from."
msgstr "憑證與取回憑證的網站身分比對不符。"
-#: ../src/goabackend/goautils.c:515
+#: ../src/goabackend/goautils.c:517
msgid "The certificate's activation time is still in the future."
msgstr "憑證的啟用時刻在未來。"
-#: ../src/goabackend/goautils.c:519
+#: ../src/goabackend/goautils.c:521
msgid "The certificate has expired."
msgstr "憑證已逾期。"
-#: ../src/goabackend/goautils.c:523
+#: ../src/goabackend/goautils.c:525
msgid "The certificate has been revoked."
msgstr "憑證已撤銷。"
-#: ../src/goabackend/goautils.c:527
+#: ../src/goabackend/goautils.c:529
msgid "The certificate's algorithm is considered insecure."
msgstr "憑證的演算法被認為是不安全的。"
-#: ../src/goabackend/goautils.c:531
+#: ../src/goabackend/goautils.c:533
msgid "Invalid certificate."
msgstr "憑證無效。"
@@ -700,48 +666,19 @@ msgstr "憑證無效。"
msgid "Loading “%s”…"
msgstr "正載入「%s」..."
-#: ../src/goabackend/goawindowsliveprovider.c:83
+#: ../src/goabackend/goawindowsliveprovider.c:84
msgid "Windows Live"
msgstr "Windows Live"
-#: ../src/goabackend/goawindowsliveprovider.c:217
-#, c-format
-msgid "Didn't find account email member in JSON data"
-msgstr "JSON 資料中找不到帳號電子郵件成員"
-
-#: ../src/goabackend/goayahooprovider.c:80
+#: ../src/goabackend/goayahooprovider.c:81
msgid "Yahoo"
msgstr "Yahoo"
-#: ../src/goabackend/goayahooprovider.c:188
-#, c-format
-msgid "Didn't find guid member in JSON data"
-msgstr "JSON 資料中找不到 guid 成員"
-
-#: ../src/goabackend/goayahooprovider.c:198
-#, c-format
-msgid "Didn't find value member in JSON data"
-msgstr "JSON 資料中找不到值成員"
-
-#: ../src/goabackend/goayahooprovider.c:224
+#: ../src/goabackend/goayahooprovider.c:255
#, c-format
msgid "Expected status 200 when requesting name, instead got status %d (%s)"
msgstr "請求名稱時預期的狀態為 200，但卻取得狀態 %d (%s)"
-#: ../src/goabackend/goayahooprovider.c:237
-msgid "Error parsing usercard response as JSON: "
-msgstr "以 JSON 解析使用者名片回應時發生錯誤："
-
-#: ../src/goabackend/goayahooprovider.c:248
-#, c-format
-msgid "Didn't find profile member in JSON data"
-msgstr "JSON 資料中找不到個人檔案成員"
-
-#: ../src/goabackend/goayahooprovider.c:258
-#, c-format
-msgid "Didn't find nickname member in JSON data"
-msgstr "JSON 資料中找不到暱稱成員"
-
#: ../src/goaidentity/goaalarm.c:245
msgid "Time"
msgstr "時間"
@@ -750,15 +687,15 @@ msgstr "時間"
msgid "Time to fire"
msgstr "啟動時間"
-#: ../src/goaidentity/goaidentityservice.c:377
+#: ../src/goaidentity/goaidentityservice.c:378
msgid "initial secret passed before secret key exchange"
msgstr "在私鑰交換前傳送的初始機密"
-#: ../src/goaidentity/goaidentityservice.c:569
+#: ../src/goaidentity/goaidentityservice.c:570
msgid "Initial secret key is invalid"
msgstr "初始密鑰無效"
-#: ../src/goaidentity/goaidentityservice.c:1089
+#: ../src/goaidentity/goaidentityservice.c:1090
#, c-format
msgid "The network realm %s needs some information to sign you in."
msgstr "網路領域 %s 需要一些資訊才能讓您登入。"
@@ -823,6 +760,69 @@ msgstr "找不到身分認證"
msgid "Could not create credential cache for identity"
msgstr "無法建立身分認證的憑證快取"
+#~ msgid "Online Accounts"
+#~ msgstr "線上帳號"
+
+#~ msgid "Provides the org.gnome.OnlinesAccounts name on the session bus"
+#~ msgstr "在作業階段匯流排提供 org.gnome.OnlinesAccounts 名稱"
+
+#~ msgid "An online account needs attention"
+#~ msgstr "有個線上帳號要求注意"
+
+#~ msgid "Open Online Accounts..."
+#~ msgstr "開啟線上帳號..."
+
+#~ msgid "Error parsing response as JSON: "
+#~ msgstr "以 JSON 解析回應時發生錯誤："
+
+#~ msgid "Didn't find id member in JSON data"
+#~ msgstr "JSON 資料中找不到 id 成員"
+
+#~ msgid "Didn't find email member in JSON data"
+#~ msgstr "JSON 資料中找不到電子郵件成員"
+
+#~ msgid "Didn't find user member in JSON data"
+#~ msgstr "JSON 資料中找不到使用者成員"
+
+#~ msgid "Didn't find user.id member in JSON data"
+#~ msgstr "JSON 資料中找不到 user.id 成員"
+
+#~ msgid "Didn't find user.username member in JSON data"
+#~ msgstr "JSON 資料中找不到 user.username 成員"
+
+#~ msgid "Didn't find user.username._content member in JSON data"
+#~ msgstr "JSON 資料中找不到 user.username._content 成員"
+
+#~ msgid "Didn't find access_token in non-JSON data"
+#~ msgstr "非 JSON 資料中找不到 access_token"
+
+#~ msgid "Didn't find access_token in JSON data"
+#~ msgstr "JSON 資料中找不到 access_token"
+
+#~ msgid "Didn't find id_str member in JSON data"
+#~ msgstr "JSON 資料中找不到 id_str 成員"
+
+#~ msgid "Didn't find screen_name member in JSON data"
+#~ msgstr "JSON 資料中找不到 screen_name 成員"
+
+#~ msgid "Didn't find account email member in JSON data"
+#~ msgstr "JSON 資料中找不到帳號電子郵件成員"
+
+#~ msgid "Didn't find guid member in JSON data"
+#~ msgstr "JSON 資料中找不到 guid 成員"
+
+#~ msgid "Didn't find value member in JSON data"
+#~ msgstr "JSON 資料中找不到值成員"
+
+#~ msgid "Error parsing usercard response as JSON: "
+#~ msgstr "以 JSON 解析使用者名片回應時發生錯誤："
+
+#~ msgid "Didn't find profile member in JSON data"
+#~ msgstr "JSON 資料中找不到個人檔案成員"
+
+#~ msgid "Didn't find nickname member in JSON data"
+#~ msgstr "JSON 資料中找不到暱稱成員"
+
#~ msgid "Credentials not found in keyring (%s, %d): "
#~ msgstr "在鑰匙圈內找不到憑證 (%s，%d)："
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
