[gnome-online-accounts] Update zh_CN translation



commit 1b234d609feabd7263cc56d9773ff5a795587d57
Author: Aron Xu <aron debian org>
Date:   Sun Feb 22 17:35:53 2015 +0800

    Update zh_CN translation

 po/zh_CN.po |  534 +++++++++++++++++++++++------------------------------------
 1 files changed, 211 insertions(+), 323 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 61d2ae2..b1bf198 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,56 +6,61 @@
 # Cheng Lu <chenglu1990 gmail com>, 2012.
 # 黄世海 <rochester_h 163 com>, 2012.
 # Tong Hui <tonghuix gmail com>, 2013.
+# Eleanor Chen <chenyueg gmail com>, 2015.
+# Aron Xu <happyaron xu gmail com>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-online-accounts master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "online-accounts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-21 04:41+0000\n"
-"PO-Revision-Date: 2014-09-21 14:34+0800\n"
-"Last-Translator: Yunqiang Su <wzssyqa gmail com>\n"
+"POT-Creation-Date: 2015-01-16 15:20+0000\n"
+"PO-Revision-Date: 2015-02-17 04:28+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.9\n"
 
 #. TODO: more specific
-#: ../src/daemon/goadaemon.c:783 ../src/daemon/goadaemon.c:1029
+#: ../src/daemon/goadaemon.c:787 ../src/daemon/goadaemon.c:1048
 #, c-format
 msgid "Failed to find a provider for: %s"
 msgstr "找不到 %s 的供应商"
 
+#: ../src/daemon/goadaemon.c:976
+msgid "IsLocked property is set for account"
+msgstr "帐号属性被设置为锁定(IsLocked)"
+
 #. TODO: more specific
-#: ../src/daemon/goadaemon.c:1017
+#: ../src/daemon/goadaemon.c:1036
 msgid "ProviderType property is not set for account"
-msgstr "帐户的 ProviderType(供应商类型) 属性未设置"
+msgstr "帐号的供应商类型(ProviderType)属性未设置"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:228 ../src/goabackend/goahttpclient.c:170
+#: ../src/goabackend/goaewsclient.c:230 ../src/goabackend/goahttpclient.c:174
 #, c-format
 msgid "Code: %u — Unexpected response from server"
 msgstr "代码:%u - 服务器响应异常"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:244
+#: ../src/goabackend/goaewsclient.c:246
 #, c-format
 msgid "Failed to parse autodiscover response XML"
-msgstr "无法解析 自动发现 响应 XML"
+msgstr "无法解析自动发现响应 XML"
 
 #. TODO: more specific
 #. Translators: the parameter is an XML element name.
-#: ../src/goabackend/goaewsclient.c:255 ../src/goabackend/goaewsclient.c:270
-#: ../src/goabackend/goaewsclient.c:285
+#: ../src/goabackend/goaewsclient.c:257 ../src/goabackend/goaewsclient.c:272
+#: ../src/goabackend/goaewsclient.c:287
 #, c-format
 msgid "Failed to find ‘%s’ element"
-msgstr "没有找到元素“%s”"
+msgstr "没有找到元素 %s"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:306
+#: ../src/goabackend/goaewsclient.c:308
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
@@ -67,31 +72,31 @@ msgstr "Microsoft Exchange"
 #. TODO: more specific
 #: ../src/goabackend/goaexchangeprovider.c:311
 #: ../src/goabackend/goaexchangeprovider.c:1020
-#: ../src/goabackend/goaowncloudprovider.c:398
-#: ../src/goabackend/goaowncloudprovider.c:1183
+#: ../src/goabackend/goaowncloudprovider.c:383
+#: ../src/goabackend/goaowncloudprovider.c:1168
 #, c-format
 msgid "Did not find password with identity ‘%s’ in credentials"
-msgstr "未能在证书中找到身份“%s”的密码"
+msgstr "未在凭据中找到身份 %s 的密码"
 
 #. Translators: the first %s is the username
 #. * (eg., debarshi ray gmail com or rishi), and the
 #. * (%s, %d) is the error domain and code.
 #.
 #: ../src/goabackend/goaexchangeprovider.c:339
-#: ../src/goabackend/goaowncloudprovider.c:421
+#: ../src/goabackend/goaowncloudprovider.c:406
 #, c-format
 msgid "Invalid password with username ‘%s’ (%s, %d): "
-msgstr "用户名“%s”的密码无效 (%s, %d)"
+msgstr "用户 %s 的密码无效(%s, %d)"
 
 #: ../src/goabackend/goaexchangeprovider.c:492
-#: ../src/goabackend/goaimapsmtpprovider.c:715
+#: ../src/goabackend/goaimapsmtpprovider.c:700
 msgid "_E-mail"
 msgstr "电子邮箱(_E)"
 
 #: ../src/goabackend/goaexchangeprovider.c:493
-#: ../src/goabackend/goaimapsmtpprovider.c:735
-#: ../src/goabackend/goaimapsmtpprovider.c:755
-#: ../src/goabackend/goaowncloudprovider.c:649
+#: ../src/goabackend/goaimapsmtpprovider.c:720
+#: ../src/goabackend/goaimapsmtpprovider.c:740
+#: ../src/goabackend/goaowncloudprovider.c:634
 msgid "_Password"
 msgstr "密码(_P)"
 
@@ -100,53 +105,53 @@ msgid "_Custom"
 msgstr "自定义(_C)"
 
 #: ../src/goabackend/goaexchangeprovider.c:507
-#: ../src/goabackend/goaimapsmtpprovider.c:734
-#: ../src/goabackend/goaimapsmtpprovider.c:754
-#: ../src/goabackend/goakerberosprovider.c:1123
-#: ../src/goabackend/goaowncloudprovider.c:648
+#: ../src/goabackend/goaimapsmtpprovider.c:719
+#: ../src/goabackend/goaimapsmtpprovider.c:739
+#: ../src/goabackend/goakerberosprovider.c:1108
+#: ../src/goabackend/goaowncloudprovider.c:633
 msgid "User_name"
 msgstr "用户名(_N)"
 
 #: ../src/goabackend/goaexchangeprovider.c:508
-#: ../src/goabackend/goaowncloudprovider.c:647
+#: ../src/goabackend/goaowncloudprovider.c:632
 msgid "_Server"
 msgstr "服务器(_S)"
 
 #. --
 #: ../src/goabackend/goaexchangeprovider.c:518
-#: ../src/goabackend/goaimapsmtpprovider.c:767
-#: ../src/goabackend/goakerberosprovider.c:1128
-#: ../src/goabackend/goaowncloudprovider.c:658
+#: ../src/goabackend/goaimapsmtpprovider.c:752
+#: ../src/goabackend/goakerberosprovider.c:1113
+#: ../src/goabackend/goaowncloudprovider.c:643
 #: ../src/goabackend/goatelepathyprovider.c:649
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../src/goabackend/goaexchangeprovider.c:519
-#: ../src/goabackend/goakerberosprovider.c:1129
-#: ../src/goabackend/goaowncloudprovider.c:659
+#: ../src/goabackend/goakerberosprovider.c:1114
+#: ../src/goabackend/goaowncloudprovider.c:644
 msgid "C_onnect"
-msgstr "连接(_C)"
+msgstr "连接(_O)"
 
 #: ../src/goabackend/goaexchangeprovider.c:535
-#: ../src/goabackend/goaimapsmtpprovider.c:784
-#: ../src/goabackend/goakerberosprovider.c:1145
-#: ../src/goabackend/goaowncloudprovider.c:675
+#: ../src/goabackend/goaimapsmtpprovider.c:769
+#: ../src/goabackend/goakerberosprovider.c:1130
+#: ../src/goabackend/goaowncloudprovider.c:660
 msgid "Connecting…"
-msgstr "正在连接……"
+msgstr "正在连接..."
 
 #: ../src/goabackend/goaexchangeprovider.c:640
 #: ../src/goabackend/goaexchangeprovider.c:837
-#: ../src/goabackend/goaimapsmtpprovider.c:946
-#: ../src/goabackend/goaimapsmtpprovider.c:981
-#: ../src/goabackend/goaimapsmtpprovider.c:1069
-#: ../src/goabackend/goaimapsmtpprovider.c:1333
-#: ../src/goabackend/goaimapsmtpprovider.c:1406
-#: ../src/goabackend/goakerberosprovider.c:1536
+#: ../src/goabackend/goaimapsmtpprovider.c:931
+#: ../src/goabackend/goaimapsmtpprovider.c:966
+#: ../src/goabackend/goaimapsmtpprovider.c:1054
+#: ../src/goabackend/goaimapsmtpprovider.c:1318
+#: ../src/goabackend/goaimapsmtpprovider.c:1391
+#: ../src/goabackend/goakerberosprovider.c:1521
 #: ../src/goabackend/goamediaserverprovider.c:473
-#: ../src/goabackend/goaoauth2provider.c:1077
+#: ../src/goabackend/goaoauth2provider.c:1078
 #: ../src/goabackend/goaoauthprovider.c:908
-#: ../src/goabackend/goaowncloudprovider.c:786
-#: ../src/goabackend/goaowncloudprovider.c:1001
+#: ../src/goabackend/goaowncloudprovider.c:771
+#: ../src/goabackend/goaowncloudprovider.c:986
 #: ../src/goabackend/goatelepathyprovider.c:459
 #: ../src/goabackend/goatelepathyprovider.c:508
 #: ../src/goabackend/goatelepathyprovider.c:683
@@ -156,34 +161,34 @@ msgstr "对话框被关闭"
 
 #: ../src/goabackend/goaexchangeprovider.c:678
 #: ../src/goabackend/goaexchangeprovider.c:865
-#: ../src/goabackend/goaimapsmtpprovider.c:1011
-#: ../src/goabackend/goaimapsmtpprovider.c:1104
-#: ../src/goabackend/goaimapsmtpprovider.c:1357
-#: ../src/goabackend/goaimapsmtpprovider.c:1431
-#: ../src/goabackend/goaowncloudprovider.c:828
-#: ../src/goabackend/goaowncloudprovider.c:1022
+#: ../src/goabackend/goaimapsmtpprovider.c:996
+#: ../src/goabackend/goaimapsmtpprovider.c:1089
+#: ../src/goabackend/goaimapsmtpprovider.c:1342
+#: ../src/goabackend/goaimapsmtpprovider.c:1416
+#: ../src/goabackend/goaowncloudprovider.c:813
+#: ../src/goabackend/goaowncloudprovider.c:1007
 #, c-format
 msgid "Dialog was dismissed (%s, %d): "
 msgstr "对话框已关闭 (%s, %d):"
 
 #: ../src/goabackend/goaexchangeprovider.c:691
-#: ../src/goabackend/goaimapsmtpprovider.c:1024
-#: ../src/goabackend/goaimapsmtpprovider.c:1117
-#: ../src/goabackend/goaowncloudprovider.c:841
+#: ../src/goabackend/goaimapsmtpprovider.c:1009
+#: ../src/goabackend/goaimapsmtpprovider.c:1102
+#: ../src/goabackend/goaowncloudprovider.c:826
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
 #: ../src/goabackend/goaexchangeprovider.c:696
 #: ../src/goabackend/goaexchangeprovider.c:884
-#: ../src/goabackend/goaimapsmtpprovider.c:1029
-#: ../src/goabackend/goaimapsmtpprovider.c:1122
-#: ../src/goabackend/goaimapsmtpprovider.c:1376
-#: ../src/goabackend/goaimapsmtpprovider.c:1450
-#: ../src/goabackend/goakerberosprovider.c:1646
-#: ../src/goabackend/goaowncloudprovider.c:846
-#: ../src/goabackend/goaowncloudprovider.c:1041
+#: ../src/goabackend/goaimapsmtpprovider.c:1014
+#: ../src/goabackend/goaimapsmtpprovider.c:1107
+#: ../src/goabackend/goaimapsmtpprovider.c:1361
+#: ../src/goabackend/goaimapsmtpprovider.c:1435
+#: ../src/goabackend/goakerberosprovider.c:1631
+#: ../src/goabackend/goaowncloudprovider.c:831
+#: ../src/goabackend/goaowncloudprovider.c:1026
 msgid "_Try Again"
-msgstr "再试一次(_T)"
+msgstr "重试(_T)"
 
 #: ../src/goabackend/goaexchangeprovider.c:701
 #: ../src/goabackend/goaexchangeprovider.c:877
@@ -193,33 +198,34 @@ msgstr "连接 Microsoft Exchange 服务器出错"
 #. Translators: This is a label for a series of
 #. * options switches. For example: “Use for Mail”.
 #: ../src/goabackend/goaexchangeprovider.c:939
-#: ../src/goabackend/goafacebookprovider.c:461
-#: ../src/goabackend/goaflickrprovider.c:411
-#: ../src/goabackend/goagoogleprovider.c:592
-#: ../src/goabackend/goakerberosprovider.c:1719
+#: ../src/goabackend/goafacebookprovider.c:465
+#: ../src/goabackend/goaflickrprovider.c:412
+#: ../src/goabackend/goafoursquareprovider.c:412
+#: ../src/goabackend/goagoogleprovider.c:626
+#: ../src/goabackend/goakerberosprovider.c:1704
 #: ../src/goabackend/goamediaserverprovider.c:584
-#: ../src/goabackend/goaowncloudprovider.c:1097
-#: ../src/goabackend/goapocketprovider.c:421
+#: ../src/goabackend/goaowncloudprovider.c:1082
+#: ../src/goabackend/goapocketprovider.c:406
 #: ../src/goabackend/goatelepathyprovider.c:890
 #: ../src/goabackend/goawindowsliveprovider.c:421
 msgid "Use for"
 msgstr "用于"
 
 #: ../src/goabackend/goaexchangeprovider.c:941
-#: ../src/goabackend/goagoogleprovider.c:594
+#: ../src/goabackend/goagoogleprovider.c:628
 #: ../src/goabackend/goawindowsliveprovider.c:423
 msgid "_Mail"
 msgstr "邮件(_M)"
 
 #: ../src/goabackend/goaexchangeprovider.c:946
-#: ../src/goabackend/goagoogleprovider.c:599
-#: ../src/goabackend/goaowncloudprovider.c:1099
+#: ../src/goabackend/goagoogleprovider.c:633
+#: ../src/goabackend/goaowncloudprovider.c:1084
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
 #: ../src/goabackend/goaexchangeprovider.c:951
-#: ../src/goabackend/goagoogleprovider.c:604
-#: ../src/goabackend/goaowncloudprovider.c:1104
+#: ../src/goabackend/goagoogleprovider.c:638
+#: ../src/goabackend/goaowncloudprovider.c:1089
 msgid "_Contacts"
 msgstr "联系人(_C)"
 
@@ -230,7 +236,8 @@ msgstr "Facebook"
 #. Translators: the %d is a HTTP status code and the %s is a textual description of it
 #: ../src/goabackend/goafacebookprovider.c:218
 #: ../src/goabackend/goaflickrprovider.c:183
-#: ../src/goabackend/goagoogleprovider.c:218
+#: ../src/goabackend/goafoursquareprovider.c:188
+#: ../src/goabackend/goagoogleprovider.c:219
 #: ../src/goabackend/goawindowsliveprovider.c:189
 #: ../src/goabackend/goayahooprovider.c:182
 #, c-format
@@ -240,14 +247,20 @@ msgstr "在请求您的身份时应得到的状态 200,但却得到了状态 %
 
 #: ../src/goabackend/goafacebookprovider.c:237
 #: ../src/goabackend/goafacebookprovider.c:249
-#: ../src/goabackend/goafacebookprovider.c:259
+#: ../src/goabackend/goafacebookprovider.c:262
 #: ../src/goabackend/goaflickrprovider.c:202
 #: ../src/goabackend/goaflickrprovider.c:214
 #: ../src/goabackend/goaflickrprovider.c:224
 #: ../src/goabackend/goaflickrprovider.c:234
 #: ../src/goabackend/goaflickrprovider.c:244
-#: ../src/goabackend/goagoogleprovider.c:237
-#: ../src/goabackend/goagoogleprovider.c:249
+#: ../src/goabackend/goafoursquareprovider.c:207
+#: ../src/goabackend/goafoursquareprovider.c:219
+#: ../src/goabackend/goafoursquareprovider.c:230
+#: ../src/goabackend/goafoursquareprovider.c:241
+#: ../src/goabackend/goafoursquareprovider.c:252
+#: ../src/goabackend/goafoursquareprovider.c:263
+#: ../src/goabackend/goagoogleprovider.c:238
+#: ../src/goabackend/goagoogleprovider.c:250
 #: ../src/goabackend/goaoauth2provider.c:691
 #: ../src/goabackend/goaoauth2provider.c:721
 #: ../src/goabackend/goaoauth2provider.c:733
@@ -262,22 +275,23 @@ msgstr "在请求您的身份时应得到的状态 200,但却得到了状态 %
 #: ../src/goabackend/goayahooprovider.c:293
 #, c-format
 msgid "Could not parse response"
-msgstr "无法解析响应"
+msgstr "无法解析响应信息"
 
-#: ../src/goabackend/goafacebookprovider.c:463
-#: ../src/goabackend/goagoogleprovider.c:609
+#: ../src/goabackend/goafacebookprovider.c:467
+#: ../src/goabackend/goagoogleprovider.c:643
 #: ../src/goabackend/goatelepathyprovider.c:892
 msgid "C_hat"
 msgstr "聊天(_H)"
 
-#: ../src/goabackend/goafacebookprovider.c:468
-#: ../src/goabackend/goaflickrprovider.c:413
-#: ../src/goabackend/goagoogleprovider.c:619
+#: ../src/goabackend/goafacebookprovider.c:472
+#: ../src/goabackend/goaflickrprovider.c:414
+#: ../src/goabackend/goagoogleprovider.c:653
 #: ../src/goabackend/goamediaserverprovider.c:586
 msgid "_Photos"
 msgstr "图片(_P)"
 
-#: ../src/goabackend/goafacebookprovider.c:473
+#: ../src/goabackend/goafacebookprovider.c:477
+#: ../src/goabackend/goafoursquareprovider.c:414
 msgid "_Maps"
 msgstr "地图(_M)"
 
@@ -290,17 +304,26 @@ msgstr "Flickr"
 msgid "Your system time is invalid. Check your date and time settings."
 msgstr "您的系统时间无效。请检查日期和时间设置。"
 
+#: ../src/goabackend/goafoursquareprovider.c:76
+msgid "Foursquare"
+msgstr "Foursquare"
+
 #: ../src/goabackend/goagoogleprovider.c:76
 msgid "Google"
 msgstr "Google"
 
-#: ../src/goabackend/goagoogleprovider.c:614
-#: ../src/goabackend/goaowncloudprovider.c:1109
+#: ../src/goabackend/goagoogleprovider.c:648
+#: ../src/goabackend/goaowncloudprovider.c:1094
 #: ../src/goabackend/goawindowsliveprovider.c:428
 msgid "_Documents"
 msgstr "文档(_D)"
 
-#: ../src/goabackend/goagoogleprovider.c:624
+#: ../src/goabackend/goagoogleprovider.c:658
+#: ../src/goabackend/goaowncloudprovider.c:1099
+msgid "_Files"
+msgstr "文件(_F)"
+
+#: ../src/goabackend/goagoogleprovider.c:663
 msgid "Prin_ters"
 msgstr "打印机(_T)"
 
@@ -320,25 +343,25 @@ msgstr "认证失败"
 #: ../src/goabackend/goaimapauthlogin.c:140
 #, c-format
 msgid "Server does not support PLAIN"
-msgstr "服务器不支持 PLAIN"
+msgstr "服务器不支持 PLAIN 方式"
 
 #: ../src/goabackend/goaimapauthlogin.c:194
 #: ../src/goabackend/goasmtpauth.c:818
 #, c-format
 msgid "Server does not support STARTTLS"
-msgstr "服务器不支持 STARTTLS"
+msgstr "服务器不支持 STARTTLS 方式"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:76
+#: ../src/goabackend/goaimapsmtpprovider.c:61
 msgid "IMAP and SMTP"
 msgstr "IMAP 和 SMTP"
 
 #. Translators: the first parameter is a field name. The second is
 #. * a GOA account identifier.
-#: ../src/goabackend/goaimapsmtpprovider.c:373
-#: ../src/goabackend/goaimapsmtpprovider.c:431
+#: ../src/goabackend/goaimapsmtpprovider.c:358
+#: ../src/goabackend/goaimapsmtpprovider.c:416
 #, c-format
 msgid "Did not find %s with identity ‘%s’ in credentials"
-msgstr "未能在证书中找到与身份“%s”匹配的“%s”"
+msgstr "未在凭据中找到与身份 %s 匹配的 %s "
 
 #. Translators: the first %s is a field name. The
 #. * second %s is the IMAP
@@ -350,11 +373,11 @@ msgstr "未能在证书中找到与身份“%s”匹配的“%s”"
 #. * username (eg., rishi), and the (%s, %d)
 #. * is the error domain and code.
 #.
-#: ../src/goabackend/goaimapsmtpprovider.c:404
-#: ../src/goabackend/goaimapsmtpprovider.c:464
+#: ../src/goabackend/goaimapsmtpprovider.c:389
+#: ../src/goabackend/goaimapsmtpprovider.c:449
 #, c-format
 msgid "Invalid %s with username ‘%s’ (%s, %d): "
-msgstr "用户名“%s”的“%s”无效 (%s, %d)"
+msgstr "用户 %2$s 的 %1$s 无效 (%3$s, %4$d)"
 
 #. Translators: the following four strings are used to show a
 #. * combo box similar to the one in the evolution module.
@@ -362,117 +385,117 @@ msgstr "用户名“%s”的“%s”无效 (%s, %d)"
 #. *             STARTTLS after connecting
 #. *             SSL on a dedicated port
 #.
-#: ../src/goabackend/goaimapsmtpprovider.c:651
+#: ../src/goabackend/goaimapsmtpprovider.c:636
 msgid "_Encryption"
 msgstr "加密(_E)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:654
+#: ../src/goabackend/goaimapsmtpprovider.c:639
 msgid "None"
 msgstr "无"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:657
+#: ../src/goabackend/goaimapsmtpprovider.c:642
 msgid "STARTTLS after connecting"
-msgstr "连接后使用 STARTTLS"
+msgstr "连接后使用 STARTTLS 方式"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:660
+#: ../src/goabackend/goaimapsmtpprovider.c:645
 msgid "SSL on a dedicated port"
 msgstr "在特定端口上使用 SSL"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:716
+#: ../src/goabackend/goaimapsmtpprovider.c:701
 msgid "_Name"
 msgstr "姓名(_N)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:733
+#: ../src/goabackend/goaimapsmtpprovider.c:718
 msgid "IMAP _Server"
 msgstr "IMAP 服务器(_S)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:753
+#: ../src/goabackend/goaimapsmtpprovider.c:738
 msgid "SMTP _Server"
 msgstr "SMTP 服务器(_S)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:768
-#: ../src/goabackend/goaimapsmtpprovider.c:1050
-#: ../src/goabackend/goaimapsmtpprovider.c:1386
+#: ../src/goabackend/goaimapsmtpprovider.c:753
+#: ../src/goabackend/goaimapsmtpprovider.c:1035
+#: ../src/goabackend/goaimapsmtpprovider.c:1371
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1034
-#: ../src/goabackend/goaimapsmtpprovider.c:1369
+#: ../src/goabackend/goaimapsmtpprovider.c:1019
+#: ../src/goabackend/goaimapsmtpprovider.c:1354
 msgid "Error connecting to IMAP server"
 msgstr "连接 IMAP 服务器出错"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1127
-#: ../src/goabackend/goaimapsmtpprovider.c:1443
+#: ../src/goabackend/goaimapsmtpprovider.c:1112
+#: ../src/goabackend/goaimapsmtpprovider.c:1428
 msgid "Error connecting to SMTP server"
 msgstr "连接 SMTP 服务器出错"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1542
+#: ../src/goabackend/goaimapsmtpprovider.c:1527
 msgid "E-mail"
 msgstr "电子邮箱"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1546
+#: ../src/goabackend/goaimapsmtpprovider.c:1531
 msgid "Name"
 msgstr "姓名"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1556
-#: ../src/goabackend/goaimapsmtpprovider.c:1559
+#: ../src/goabackend/goaimapsmtpprovider.c:1541
+#: ../src/goabackend/goaimapsmtpprovider.c:1544
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1570
-#: ../src/goabackend/goaimapsmtpprovider.c:1573
+#: ../src/goabackend/goaimapsmtpprovider.c:1555
+#: ../src/goabackend/goaimapsmtpprovider.c:1558
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../src/goabackend/goakerberosprovider.c:79
+#: ../src/goabackend/goakerberosprovider.c:64
 msgid "Enterprise Login (Kerberos)"
-msgstr "企业用户登陆 (Kerberos)"
+msgstr "企业用户登陆(Kerberos)"
 
-#: ../src/goabackend/goakerberosprovider.c:447
+#: ../src/goabackend/goakerberosprovider.c:432
 msgid "Identity service returned invalid key"
-msgstr "认证服务返回了非法的密钥"
+msgstr "认证服务返回了无效密钥"
 
-#: ../src/goabackend/goakerberosprovider.c:719
+#: ../src/goabackend/goakerberosprovider.c:704
 #, c-format
 msgid "Could not find saved credentials for principal ‘%s’ in keyring"
-msgstr "无法在密钥环中为主体“%s”找到保存的凭证"
+msgstr "无法在密钥环中为主体 %s 找到保存的凭证"
 
-#: ../src/goabackend/goakerberosprovider.c:732
+#: ../src/goabackend/goakerberosprovider.c:717
 #, c-format
 msgid "Did not find password for principal ‘%s’ in credentials"
-msgstr "没有在证书中找到主体“%s”的密码"
+msgstr "未在凭据中找到主体 %s 的密码"
 
-#: ../src/goabackend/goakerberosprovider.c:1115
+#: ../src/goabackend/goakerberosprovider.c:1100
 msgid "_Domain"
 msgstr "域(_D)"
 
-#: ../src/goabackend/goakerberosprovider.c:1116
+#: ../src/goabackend/goakerberosprovider.c:1101
 msgid "Enterprise domain or realm name"
-msgstr "企业域名或者 Realm 名"
+msgstr "企业域或者 Realm"
 
-#: ../src/goabackend/goakerberosprovider.c:1345
+#: ../src/goabackend/goakerberosprovider.c:1330
 #: ../src/goaidentity/goaidentityservice.c:1106
 msgid "Log In to Realm"
 msgstr "登陆到 Realm"
 
-#: ../src/goabackend/goakerberosprovider.c:1346
+#: ../src/goabackend/goakerberosprovider.c:1331
 msgid "Please enter your password below."
-msgstr "请在下方输入你的密码。"
+msgstr "请在下方输入您的密码。"
 
-#: ../src/goabackend/goakerberosprovider.c:1347
+#: ../src/goabackend/goakerberosprovider.c:1332
 msgid "Remember this password"
-msgstr "记住这个密码"
+msgstr "记住密码"
 
-#: ../src/goabackend/goakerberosprovider.c:1486
+#: ../src/goabackend/goakerberosprovider.c:1471
 #, c-format
 msgid "The domain is not valid"
-msgstr "此域不存在"
+msgstr "域无效"
 
-#: ../src/goabackend/goakerberosprovider.c:1641
+#: ../src/goabackend/goakerberosprovider.c:1626
 msgid "Error connecting to enterprise identity server"
 msgstr "连接企业认证服务器出错"
 
-#: ../src/goabackend/goakerberosprovider.c:1721
+#: ../src/goabackend/goakerberosprovider.c:1706
 msgid "Network _Resources"
 msgstr "网络资源(_R)"
 
@@ -484,7 +507,7 @@ msgstr "媒体服务器"
 msgid ""
 "Personal content can be added to your applications through a media server "
 "account."
-msgstr "可以通过媒体服务器账号将个人内容添加到应用。"
+msgstr "可通过媒体服务器帐号将个人内容添加到应用。"
 
 #: ../src/goabackend/goamediaserverprovider.c:383
 msgid "Available Media Servers"
@@ -511,28 +534,28 @@ msgstr "认证响应为:"
 msgid "Authorization response: %s"
 msgstr "认证响应为:%s"
 
-#: ../src/goabackend/goaoauth2provider.c:1103
+#: ../src/goabackend/goaoauth2provider.c:1104
 #: ../src/goabackend/goaoauthprovider.c:939
 msgid "Error getting an Access Token: "
 msgstr "获取访问令牌出错:"
 
-#: ../src/goabackend/goaoauth2provider.c:1118
+#: ../src/goabackend/goaoauth2provider.c:1119
 #: ../src/goabackend/goaoauthprovider.c:952
 msgid "Error getting identity: "
-msgstr "获身份信息出错:"
+msgstr "获取身份信息出错:"
 
-#: ../src/goabackend/goaoauth2provider.c:1332
+#: ../src/goabackend/goaoauth2provider.c:1336
 #: ../src/goabackend/goaoauthprovider.c:1260
 #, c-format
 msgid "Was asked to log in as %s, but logged in as %s"
 msgstr "要求以 %s 身份登录,但却登录为 %s"
 
-#: ../src/goabackend/goaoauth2provider.c:1491
+#: ../src/goabackend/goaoauth2provider.c:1498
 #, c-format
 msgid "Credentials do not contain access_token"
-msgstr "证书中不包含 access_token(访问令牌)"
+msgstr "凭据中不包含访问令牌(access_token)"
 
-#: ../src/goabackend/goaoauth2provider.c:1530
+#: ../src/goabackend/goaoauth2provider.c:1537
 #: ../src/goabackend/goaoauthprovider.c:1488
 #, c-format
 msgid "Failed to refresh access token (%s, %d): "
@@ -552,7 +575,7 @@ msgstr "获取响应令牌出错:"
 #, c-format
 msgid ""
 "Expected status 200 for getting a Request Token, instead got status %d (%s)"
-msgstr "获取响应令牌时应得到状态 200,但却得到了状态 %d(%s)"
+msgstr "获取响应令牌时应得到状态 200,但却得到了状态 %d (%s)"
 
 #: ../src/goabackend/goaoauthprovider.c:872
 #, c-format
@@ -562,39 +585,35 @@ msgstr "响应中缺少 request_token 或 request_token_secret 头"
 #: ../src/goabackend/goaoauthprovider.c:1444
 #, c-format
 msgid "Credentials do not contain access_token or access_token_secret"
-msgstr "证书中不含 access_token 或 access_token_secret"
+msgstr "凭据中不含 access_token 或 access_token_secret"
 
-#: ../src/goabackend/goaowncloudprovider.c:82
+#: ../src/goabackend/goaowncloudprovider.c:67
 msgid "ownCloud"
 msgstr "ownCloud"
 
-#: ../src/goabackend/goaowncloudprovider.c:851
-#: ../src/goabackend/goaowncloudprovider.c:1034
+#: ../src/goabackend/goaowncloudprovider.c:836
+#: ../src/goabackend/goaowncloudprovider.c:1019
 msgid "Error connecting to ownCloud server"
-msgstr "连接 ownCloud 云服务器出错"
+msgstr "连接 ownCloud 服务器出错"
 
-#: ../src/goabackend/goaowncloudprovider.c:1114
-msgid "_Files"
-msgstr "文件(_F)"
-
-#: ../src/goabackend/goapocketprovider.c:84
+#: ../src/goabackend/goapocketprovider.c:69
 msgid "Pocket"
 msgstr "Pocket"
 
 #. TODO: more specific
-#: ../src/goabackend/goapocketprovider.c:233
+#: ../src/goabackend/goapocketprovider.c:218
 #, c-format
 msgid "No username or access_token"
 msgstr "没有用户名或访问令牌"
 
-#: ../src/goabackend/goapocketprovider.c:423
+#: ../src/goabackend/goapocketprovider.c:408
 msgid "_Read Later"
 msgstr "稍后阅读(_R)"
 
-#: ../src/goabackend/goaprovider.c:682
+#: ../src/goabackend/goaprovider.c:683
 #, c-format
 msgid "ensure_credentials_sync is not implemented on type %s"
-msgstr "ensure_credentials_sync 未在 %s 类型上实现"
+msgstr "未在 %s 类型上实现 ensure_credentials_sync"
 
 #. TODO: more specific
 #: ../src/goabackend/goasmtpauth.c:175
@@ -618,24 +637,24 @@ msgstr "无法解析电子邮箱地址"
 #: ../src/goabackend/goasmtpauth.c:263
 #, c-format
 msgid "Cannot do SMTP authentication without a domain"
-msgstr "没有域,无法进行 SMTP 身份认证"
+msgstr "SMTP 认证需要域名"
 
 #. TODO: more specific
 #: ../src/goabackend/goasmtpauth.c:301
 #, c-format
 msgid "Did not find smtp-password in credentials"
-msgstr "未能在证书中找到 smtp 密码"
+msgstr "未在凭据中找到 SMTP 密码项"
 
 #. TODO: more specific
 #: ../src/goabackend/goasmtpauth.c:312
 #, c-format
 msgid "Cannot do SMTP authentication without a password"
-msgstr "没有密码,无法进行 SMTP 身份认证"
+msgstr "SMTP 认证需要密码"
 
 #: ../src/goabackend/goasmtpauth.c:674
 #, c-format
 msgid "Unknown authentication mechanism"
-msgstr "未知的身份认证机制"
+msgstr "未知认证机制"
 
 #: ../src/goabackend/goatelepathyprovider.c:180
 #, c-format
@@ -691,22 +710,22 @@ msgstr "已存在一个对应 %2$s 的 %1$s 帐号"
 #: ../src/goabackend/goautils.c:136
 #, c-format
 msgid "%s account"
-msgstr "%s 账号"
+msgstr "%s 帐号"
 
 #. TODO: more specific
 #: ../src/goabackend/goautils.c:180
 msgid "Failed to delete credentials from the keyring"
-msgstr "从密钥环中删除证书失败:"
+msgstr "从密钥环中删除凭据失败:"
 
 #. TODO: more specific
 #: ../src/goabackend/goautils.c:232
 msgid "Failed to retrieve credentials from the keyring"
-msgstr "从密钥环中取出证书失败:"
+msgstr "从密钥环中取出凭据失败:"
 
 #. TODO: more specific
 #: ../src/goabackend/goautils.c:242
 msgid "No credentials found in the keyring"
-msgstr "在密钥环中未找到证书"
+msgstr "在密钥环中未找到凭据"
 
 #: ../src/goabackend/goautils.c:255
 msgid "Error parsing result obtained from the keyring: "
@@ -716,12 +735,12 @@ msgstr "解析从密钥环获取的结果出错:"
 #: ../src/goabackend/goautils.c:298
 #, c-format
 msgid "GOA %s credentials for identity %s"
-msgstr "实体 %2$s 的 GOA %1$s 证书"
+msgstr "实体 %2$s 的 GOA %1$s 凭据"
 
 #. TODO: more specific
 #: ../src/goabackend/goautils.c:315
 msgid "Failed to store credentials in the keyring"
-msgstr "在密钥环中存储证书失败"
+msgstr "保存凭据至秘钥环失败"
 
 #: ../src/goabackend/goautils.c:536
 msgid "The signing certificate authority is not known."
@@ -743,11 +762,11 @@ msgstr "证书已过期。"
 
 #: ../src/goabackend/goautils.c:553
 msgid "The certificate has been revoked."
-msgstr "证书已被废除。"
+msgstr "证书已被吊销。"
 
 #: ../src/goabackend/goautils.c:557
 msgid "The certificate’s algorithm is considered insecure."
-msgstr "证书的算法不安全。"
+msgstr "证书算法不安全。"
 
 #: ../src/goabackend/goautils.c:561
 msgid "Invalid certificate."
@@ -756,8 +775,8 @@ msgstr "无效证书。"
 #. translators: %s here is the address of the web page
 #: ../src/goabackend/goawebview.c:70
 #, c-format
-msgid "Loading “%s”…"
-msgstr "正在载入“%s”…"
+msgid "Loading  %s …"
+msgstr "正在载入 %s …"
 
 #: ../src/goabackend/goawindowsliveprovider.c:78
 msgid "Windows Live"
@@ -785,55 +804,55 @@ msgstr "初始私钥不合法"
 msgid "The network realm %s needs some information to sign you in."
 msgstr "网络 realm %s 接纳您之前需要一些信息。"
 
-#: ../src/goaidentity/goakerberosidentity.c:252
-#: ../src/goaidentity/goakerberosidentity.c:261
-#: ../src/goaidentity/goakerberosidentity.c:588
+#: ../src/goaidentity/goakerberosidentity.c:250
+#: ../src/goaidentity/goakerberosidentity.c:259
+#: ../src/goaidentity/goakerberosidentity.c:593
 msgid "Could not find identity in credential cache: %k"
 msgstr "在凭证缓存器 %k 中找不到身份"
 
-#: ../src/goaidentity/goakerberosidentity.c:601
+#: ../src/goaidentity/goakerberosidentity.c:607
 msgid "Could not find identity credentials in cache: %k"
 msgstr "在缓存 %k 中无法找到身份凭证"
 
-#: ../src/goaidentity/goakerberosidentity.c:641
+#: ../src/goaidentity/goakerberosidentity.c:647
 msgid "Could not sift through identity credentials in cache: %k"
 msgstr "身份凭证在缓存 %k 中无法通过审查"
 
-#: ../src/goaidentity/goakerberosidentity.c:659
+#: ../src/goaidentity/goakerberosidentity.c:665
 msgid "Could not finish up sifting through identity credentials in cache: %k"
 msgstr "在缓存 %k 中无法完成身份凭证的审查工作"
 
-#: ../src/goaidentity/goakerberosidentity.c:949
+#: ../src/goaidentity/goakerberosidentity.c:960
 #, c-format
 msgid "No associated identification found"
 msgstr "找不到相关的身份标识"
 
-#: ../src/goaidentity/goakerberosidentity.c:1030
+#: ../src/goaidentity/goakerberosidentity.c:1043
 msgid "Could not create credential cache: %k"
 msgstr "无法创建凭证缓存:%k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1064
+#: ../src/goaidentity/goakerberosidentity.c:1077
 msgid "Could not initialize credentials cache: %k"
 msgstr "无法初始化凭证缓存:%k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1081
+#: ../src/goaidentity/goakerberosidentity.c:1094
 msgid "Could not store new credentials in credentials cache: %k"
 msgstr "在凭证缓存 %k 中无法存储新的凭证"
 
-#: ../src/goaidentity/goakerberosidentity.c:1356
+#: ../src/goaidentity/goakerberosidentity.c:1369
 #, c-format
 msgid "Could not renew identity: Not signed in"
 msgstr "无法重建身份:没有登录"
 
-#: ../src/goaidentity/goakerberosidentity.c:1368
+#: ../src/goaidentity/goakerberosidentity.c:1381
 msgid "Could not renew identity: %k"
 msgstr "无法重建身份:%k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1385
+#: ../src/goaidentity/goakerberosidentity.c:1398
 msgid "Could not get new credentials to renew identity %s: %k"
-msgstr "无法获取新证书以重建身份 %s: %k"
+msgstr "无法获取新凭据以更新身份 %s: %k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1427
+#: ../src/goaidentity/goakerberosidentity.c:1440
 msgid "Could not erase identity: %k"
 msgstr "无法删除身份:%k"
 
@@ -843,135 +862,4 @@ msgstr "无法找到身份"
 
 #: ../src/goaidentity/goakerberosidentitymanager.c:836
 msgid "Could not create credential cache for identity"
-msgstr "无法为身份创建证书缓存"
-
-#~ msgid ""
-#~ "Paste authorization code obtained from the <a href=\"%s\">authorization "
-#~ "page</a>:"
-#~ msgstr "请粘贴从<a href=\"%s\">认证页面</a>获得的认证代码:"
-
-#~ msgid "Paste token obtained from the <a href=\"%s\">authorization page</a>:"
-#~ msgstr "请粘贴从 <a href=\"%s\">认证页面</a> 获得的令牌:"
-
-#~ msgid "Twitter"
-#~ msgstr "Twitter"
-
-#~ msgid "Time"
-#~ msgstr "时间"
-
-#~ msgid "Time to fire"
-#~ msgstr "解聘时间"
-
-#~ msgid "Failed to find Autodiscover element"
-#~ msgstr "没有找到 Autodiscover(自动发现) 元素"
-
-#~ msgid "Failed to find Account element"
-#~ msgstr "没有找到 帐号 元素"
-
-#~ msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
-#~ msgstr "在请求 guid 时应得到状态 200,但却得到了状态 %d (%s)"
-
-#~ msgid "Did not find imap-password with identity `%s' in credentials"
-#~ msgstr "未能在证书中找到身份“%s”的 imap 密码"
-
-#~ msgid "Invalid imap-password with username `%s' (%s, %d): "
-#~ msgstr "用户名“%s”的 imap 密码无效(%s, %d):"
-
-#~ msgid "Did not find smtp-password with identity `%s' in credentials"
-#~ msgstr "未能在证书中找到身份“%s”的 smtp 密码"
-
-#~ msgid "Invalid smtp-password with username `%s' (%s, %d): "
-#~ msgstr "用户名“%s”的 smtp 密码非法(%s, %d)"
-
-#~ msgid "Online Accounts"
-#~ msgstr "在线帐号"
-
-#~ msgid "An online account needs attention"
-#~ msgstr "有在线帐号需要关注"
-
-#~ msgid "Open Online Accounts..."
-#~ msgstr "打开在线帐号..."
-
-#~ msgid "Credentials not found in keyring (%s, %d): "
-#~ msgstr "在密钥环(%s,%d)中找不到证书:"
-
-#~ 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 数据中未发现 email(电子邮箱) 成员"
-
-#~ 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 "Error storing credentials in keyring (%s, %d): "
-#~ msgstr "存储密钥环(%s,%d)中的证书出错:"
-
-#~ 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 数据中未发现 account email(账号电子邮箱) 成员"
-
-#~ msgid "Didn't find guid member in JSON data"
-#~ msgstr "在 JSON 数据中未找到 guid(组用户标识) 成员"
-
-#~ msgid "Didn't find value member in JSON data"
-#~ msgstr "在 JSON 数据中未找到 value(值) 成员"
-
-#~ msgid "Error parsing usercard response as JSON: "
-#~ msgstr "将用户卡响应解析为 JSON 出错:"
-
-#~ msgid "Didn't find profile member in JSON data"
-#~ msgstr "在 JSON 数据中未找到 profile(个人资料) 成员"
-
-#~ msgid "Didn't find nickname member in JSON data"
-#~ msgstr "在 JSON 数据中未找到 nickname(昵称) 成员"
-
-#~ msgid "New Microsoft Exchange Account"
-#~ msgstr "新建 Microsoft Exchange 帐号"
-
-#~ msgid "Microsoft Exchange Account"
-#~ msgstr "Microsoft Exchange 帐号"
-
-#~ msgid "Chat"
-#~ msgstr "聊天"
-
-#~ msgid "Didn't find data member in JSON data"
-#~ msgstr "在 JSON 数据中未发现 data(数据) 成员"
-
-#~ msgid "Add %s"
-#~ msgstr "添加 %s"
-
-#~ msgid "Refresh %s"
-#~ msgstr "刷新 %s"
-
-#~ msgid "Didn't find name member in JSON data"
-#~ msgstr "在 JSON 数据中未发现 name(姓名) 成员"
-
-#~ msgid "Email Address"
-#~ msgstr "电子邮件地址"
-
-#~ msgid "There is already an account for the identity %s"
-#~ msgstr "已经有帐号与身份 %s 对应"
+msgstr "无法为身份创建凭据缓存"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]