[gnome-online-accounts/gnome-3-24] Update zh_CN translation

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-online-accounts/gnome-3-24] Update zh_CN translation
Date: Mon, 19 Mar 2018 09:09:58 +0000 (UTC)
commit 864c49b2e42637d9d169f37a7f699c80246c9c3e
Author: Tong Hui <tonghuix gnome org>
Date:   Mon Mar 19 17:09:36 2018 +0800

    Update zh_CN translation

 po/zh_CN.po |  399 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 207 insertions(+), 192 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e20bdaf..0c56a40 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,56 +8,57 @@
 # Tong Hui <tonghuix gmail com>, 2013.
 # Eleanor Chen <chenyueg gmail com>, 2015.
 # Aron Xu <happyaron xu gmail com>, 2015.
-# Jeff Bai <jeffbai@aosc,xyz>, 2015, 2016.
 # Boyuan Yang <073plan gmail com>, 2016.
+# Dingzhong Chen <wsxy162 gmail com>, 2017.
+# Mingcong Bai <jeffbai@aosc,xyz>, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-online-accounts master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "online-accounts&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-24 10:18+0000\n"
-"PO-Revision-Date: 2016-09-30 21:45+0800\n"
-"Last-Translator: Boyuan Yang <073plan gmail com>\n"
+"POT-Creation-Date: 2017-11-08 19:20+0000\n"
+"PO-Revision-Date: 2017-07-08 19:27+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai aosc xyz>\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.8.9\n"
+"X-Generator: Poedit 2.0.2\n"
 
 #. TODO: more specific
-#: ../src/daemon/goadaemon.c:1134 ../src/daemon/goadaemon.c:1418
+#: ../src/daemon/goadaemon.c:1132 ../src/daemon/goadaemon.c:1416
 #, c-format
 msgid "Failed to find a provider for: %s"
 msgstr "找不到 %s 的供应商"
 
-#: ../src/daemon/goadaemon.c:1361
+#: ../src/daemon/goadaemon.c:1359
 msgid "IsLocked property is set for account"
-msgstr "账号属性被设置为锁定(IsLocked)"
+msgstr "帐号属性被设置为锁定 (IsLocked)"
 
 #. TODO: more specific
-#: ../src/daemon/goadaemon.c:1406
+#: ../src/daemon/goadaemon.c:1404
 msgid "ProviderType property is not set for account"
-msgstr "账号的供应商类型 (ProviderType) 属性未设置"
+msgstr "帐号的供应商类型 (ProviderType) 属性未设置"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:250
+#: ../src/goabackend/goaewsclient.c:238
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "无法解析自动发现响应 XML"
 
 #. TODO: more specific
 #. Translators: the parameter is an XML element name.
-#: ../src/goabackend/goaewsclient.c:261 ../src/goabackend/goaewsclient.c:276
-#: ../src/goabackend/goaewsclient.c:291
+#: ../src/goabackend/goaewsclient.c:249 ../src/goabackend/goaewsclient.c:264
+#: ../src/goabackend/goaewsclient.c:279
 #, c-format
-msgid "Failed to find ‘%s’ element"
-msgstr "没有找到元素 %s"
+msgid "Failed to find “%s” element"
+msgstr "查找元素“%s”失败"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:312
+#: ../src/goabackend/goaewsclient.c:300
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
@@ -70,19 +71,19 @@ msgstr "Microsoft Exchange"
 #. * (eg., debarshi ray gmail com or rishi), and the
 #. * (%s, %d) is the error domain and code.
 #.
-#: ../src/goabackend/goaexchangeprovider.c:283
+#: ../src/goabackend/goaexchangeprovider.c:271
 #: ../src/goabackend/goalastfmprovider.c:281
 #: ../src/goabackend/goaowncloudprovider.c:314
 #, c-format
-msgid "Invalid password with username ‘%s’ (%s, %d): "
-msgstr "用户“%s”的密码无效 (%s, %d)"
+msgid "Invalid password with username “%s” (%s, %d): "
+msgstr "用户名“%s”的密码无效 (%s, %d)："
 
-#: ../src/goabackend/goaexchangeprovider.c:436
+#: ../src/goabackend/goaexchangeprovider.c:419
 #: ../src/goabackend/goaimapsmtpprovider.c:686
 msgid "_E-mail"
 msgstr "电子邮箱(_E)"
 
-#: ../src/goabackend/goaexchangeprovider.c:437
+#: ../src/goabackend/goaexchangeprovider.c:420
 #: ../src/goabackend/goaimapsmtpprovider.c:706
 #: ../src/goabackend/goaimapsmtpprovider.c:726
 #: ../src/goabackend/goalastfmprovider.c:423
@@ -90,64 +91,63 @@ msgstr "电子邮箱(_E)"
 msgid "_Password"
 msgstr "密码(_P)"
 
-#: ../src/goabackend/goaexchangeprovider.c:440
+#: ../src/goabackend/goaexchangeprovider.c:423
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../src/goabackend/goaexchangeprovider.c:451
+#: ../src/goabackend/goaexchangeprovider.c:434
 #: ../src/goabackend/goaimapsmtpprovider.c:705
 #: ../src/goabackend/goaimapsmtpprovider.c:725
-#: ../src/goabackend/goakerberosprovider.c:738
 #: ../src/goabackend/goalastfmprovider.c:422
 #: ../src/goabackend/goaowncloudprovider.c:560
 msgid "User_name"
 msgstr "用户名(_N)"
 
-#: ../src/goabackend/goaexchangeprovider.c:452
+#: ../src/goabackend/goaexchangeprovider.c:435
 #: ../src/goabackend/goaowncloudprovider.c:559
 msgid "_Server"
 msgstr "服务器(_S)"
 
 #. --
-#: ../src/goabackend/goaexchangeprovider.c:462
+#: ../src/goabackend/goaexchangeprovider.c:445
 #: ../src/goabackend/goaimapsmtpprovider.c:738
-#: ../src/goabackend/goakerberosprovider.c:743
+#: ../src/goabackend/goakerberosprovider.c:574
 #: ../src/goabackend/goalastfmprovider.c:431
 #: ../src/goabackend/goaowncloudprovider.c:575
 #: ../src/goabackend/goatelepathyprovider.c:666
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/goabackend/goaexchangeprovider.c:463
-#: ../src/goabackend/goakerberosprovider.c:744
+#: ../src/goabackend/goaexchangeprovider.c:446
+#: ../src/goabackend/goakerberosprovider.c:575
 #: ../src/goabackend/goalastfmprovider.c:432
 #: ../src/goabackend/goaowncloudprovider.c:576
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../src/goabackend/goaexchangeprovider.c:479
+#: ../src/goabackend/goaexchangeprovider.c:462
 #: ../src/goabackend/goaimapsmtpprovider.c:754
-#: ../src/goabackend/goakerberosprovider.c:760
+#: ../src/goabackend/goakerberosprovider.c:590
 #: ../src/goabackend/goalastfmprovider.c:448
 #: ../src/goabackend/goaowncloudprovider.c:591
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/goabackend/goaexchangeprovider.c:584
-#: ../src/goabackend/goaexchangeprovider.c:779
+#: ../src/goabackend/goaexchangeprovider.c:562
+#: ../src/goabackend/goaexchangeprovider.c:756
 #: ../src/goabackend/goaimapsmtpprovider.c:916
 #: ../src/goabackend/goaimapsmtpprovider.c:951
 #: ../src/goabackend/goaimapsmtpprovider.c:1043
-#: ../src/goabackend/goaimapsmtpprovider.c:1310
-#: ../src/goabackend/goaimapsmtpprovider.c:1386
-#: ../src/goabackend/goakerberosprovider.c:1157
+#: ../src/goabackend/goaimapsmtpprovider.c:1312
+#: ../src/goabackend/goaimapsmtpprovider.c:1388
+#: ../src/goabackend/goakerberosprovider.c:884
 #: ../src/goabackend/goalastfmprovider.c:643
-#: ../src/goabackend/goalastfmprovider.c:809
+#: ../src/goabackend/goalastfmprovider.c:811
 #: ../src/goabackend/goamediaserverprovider.c:434
-#: ../src/goabackend/goaoauth2provider.c:1086
-#: ../src/goabackend/goaoauthprovider.c:862
+#: ../src/goabackend/goaoauth2provider.c:1091
+#: ../src/goabackend/goaoauthprovider.c:878
 #: ../src/goabackend/goaowncloudprovider.c:702
-#: ../src/goabackend/goaowncloudprovider.c:924
+#: ../src/goabackend/goaowncloudprovider.c:926
 #: ../src/goabackend/goatelepathyprovider.c:490
 #: ../src/goabackend/goatelepathyprovider.c:529
 #: ../src/goabackend/goatelepathyprovider.c:697
@@ -155,43 +155,43 @@ msgstr "正在连接..."
 msgid "Dialog was dismissed"
 msgstr "对话框被关闭"
 
-#: ../src/goabackend/goaexchangeprovider.c:622
-#: ../src/goabackend/goaexchangeprovider.c:807
+#: ../src/goabackend/goaexchangeprovider.c:600
+#: ../src/goabackend/goaexchangeprovider.c:784
 #: ../src/goabackend/goaimapsmtpprovider.c:984
 #: ../src/goabackend/goaimapsmtpprovider.c:1081
-#: ../src/goabackend/goaimapsmtpprovider.c:1337
-#: ../src/goabackend/goaimapsmtpprovider.c:1414
+#: ../src/goabackend/goaimapsmtpprovider.c:1339
+#: ../src/goabackend/goaimapsmtpprovider.c:1416
 #: ../src/goabackend/goalastfmprovider.c:677
-#: ../src/goabackend/goalastfmprovider.c:828
+#: ../src/goabackend/goalastfmprovider.c:830
 #: ../src/goabackend/goaowncloudprovider.c:744
-#: ../src/goabackend/goaowncloudprovider.c:948
+#: ../src/goabackend/goaowncloudprovider.c:950
 #, c-format
 msgid "Dialog was dismissed (%s, %d): "
 msgstr "对话框已关闭 (%s, %d)："
 
-#: ../src/goabackend/goaexchangeprovider.c:635
+#: ../src/goabackend/goaexchangeprovider.c:613
 #: ../src/goabackend/goaimapsmtpprovider.c:997
 #: ../src/goabackend/goaimapsmtpprovider.c:1094
 #: ../src/goabackend/goaowncloudprovider.c:757
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../src/goabackend/goaexchangeprovider.c:640
-#: ../src/goabackend/goaexchangeprovider.c:826
+#: ../src/goabackend/goaexchangeprovider.c:618
+#: ../src/goabackend/goaexchangeprovider.c:803
 #: ../src/goabackend/goaimapsmtpprovider.c:1002
 #: ../src/goabackend/goaimapsmtpprovider.c:1099
-#: ../src/goabackend/goaimapsmtpprovider.c:1356
-#: ../src/goabackend/goaimapsmtpprovider.c:1433
-#: ../src/goabackend/goakerberosprovider.c:1264
+#: ../src/goabackend/goaimapsmtpprovider.c:1358
+#: ../src/goabackend/goaimapsmtpprovider.c:1435
+#: ../src/goabackend/goakerberosprovider.c:964
 #: ../src/goabackend/goalastfmprovider.c:689
-#: ../src/goabackend/goalastfmprovider.c:845
+#: ../src/goabackend/goalastfmprovider.c:847
 #: ../src/goabackend/goaowncloudprovider.c:762
-#: ../src/goabackend/goaowncloudprovider.c:967
+#: ../src/goabackend/goaowncloudprovider.c:969
 msgid "_Try Again"
 msgstr "重试(_T)"
 
-#: ../src/goabackend/goaexchangeprovider.c:645
-#: ../src/goabackend/goaexchangeprovider.c:819
+#: ../src/goabackend/goaexchangeprovider.c:623
+#: ../src/goabackend/goaexchangeprovider.c:796
 msgid "Error connecting to Microsoft Exchange server"
 msgstr "连接 Microsoft Exchange 服务器出错"
 
@@ -199,31 +199,31 @@ msgstr "连接 Microsoft Exchange 服务器出错"
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../src/goabackend/goafacebookprovider.c:208
-#: ../src/goabackend/goaflickrprovider.c:184
-#: ../src/goabackend/goafoursquareprovider.c:191
+#: ../src/goabackend/goafacebookprovider.c:211
+#: ../src/goabackend/goaflickrprovider.c:179
+#: ../src/goabackend/goafoursquareprovider.c:182
 #: ../src/goabackend/goagoogleprovider.c:219
-#: ../src/goabackend/goawindowsliveprovider.c:188
+#: ../src/goabackend/goawindowsliveprovider.c:179
 #, c-format
 msgid ""
 "Expected status 200 when requesting your identity, instead got status %d (%s)"
 msgstr "在请求您的身份时应得到的状态 200，但却得到了状态 %d (%s)"
 
 #. TODO: more specific
-#: ../src/goabackend/goafacebookprovider.c:227
-#: ../src/goabackend/goafacebookprovider.c:239
-#: ../src/goabackend/goafacebookprovider.c:252
-#: ../src/goabackend/goaflickrprovider.c:203
-#: ../src/goabackend/goaflickrprovider.c:215
-#: ../src/goabackend/goaflickrprovider.c:225
-#: ../src/goabackend/goaflickrprovider.c:235
-#: ../src/goabackend/goaflickrprovider.c:245
-#: ../src/goabackend/goafoursquareprovider.c:210
-#: ../src/goabackend/goafoursquareprovider.c:222
-#: ../src/goabackend/goafoursquareprovider.c:233
-#: ../src/goabackend/goafoursquareprovider.c:244
-#: ../src/goabackend/goafoursquareprovider.c:255
-#: ../src/goabackend/goafoursquareprovider.c:266
+#: ../src/goabackend/goafacebookprovider.c:230
+#: ../src/goabackend/goafacebookprovider.c:241
+#: ../src/goabackend/goafacebookprovider.c:247
+#: ../src/goabackend/goaflickrprovider.c:198
+#: ../src/goabackend/goaflickrprovider.c:210
+#: ../src/goabackend/goaflickrprovider.c:220
+#: ../src/goabackend/goaflickrprovider.c:230
+#: ../src/goabackend/goaflickrprovider.c:240
+#: ../src/goabackend/goafoursquareprovider.c:201
+#: ../src/goabackend/goafoursquareprovider.c:213
+#: ../src/goabackend/goafoursquareprovider.c:224
+#: ../src/goabackend/goafoursquareprovider.c:235
+#: ../src/goabackend/goafoursquareprovider.c:246
+#: ../src/goabackend/goafoursquareprovider.c:257
 #: ../src/goabackend/goagoogleprovider.c:238
 #: ../src/goabackend/goagoogleprovider.c:250
 #: ../src/goabackend/goalastfmprovider.c:212
@@ -234,12 +234,12 @@ msgstr "在请求您的身份时应得到的状态 200，但却得到了状态 %
 #: ../src/goabackend/goalastfmprovider.c:515
 #: ../src/goabackend/goalastfmprovider.c:530
 #: ../src/goabackend/goalastfmprovider.c:537
-#: ../src/goabackend/goaoauth2provider.c:743
-#: ../src/goabackend/goaoauth2provider.c:773
-#: ../src/goabackend/goaoauth2provider.c:785 ../src/goabackend/goautils.c:311
-#: ../src/goabackend/goawindowsliveprovider.c:207
-#: ../src/goabackend/goawindowsliveprovider.c:219
-#: ../src/goabackend/goawindowsliveprovider.c:231
+#: ../src/goabackend/goaoauth2provider.c:742
+#: ../src/goabackend/goaoauth2provider.c:772
+#: ../src/goabackend/goaoauth2provider.c:784 ../src/goabackend/goautils.c:313
+#: ../src/goabackend/goawindowsliveprovider.c:198
+#: ../src/goabackend/goawindowsliveprovider.c:210
+#: ../src/goabackend/goawindowsliveprovider.c:222
 #, c-format
 msgid "Could not parse response"
 msgstr "无法解析响应信息"
@@ -248,7 +248,7 @@ msgstr "无法解析响应信息"
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../src/goabackend/goaflickrprovider.c:322
+#: ../src/goabackend/goaflickrprovider.c:312
 msgid "Your system time is invalid. Check your date and time settings."
 msgstr "您的系统时间无效。请检查日期和时间设置。"
 
@@ -261,25 +261,25 @@ msgid "Google"
 msgstr "Google"
 
 #. TODO: more specific
-#: ../src/goabackend/goaimapauthlogin.c:94 ../src/goabackend/goasmtpauth.c:160
+#: ../src/goabackend/goaimapauthlogin.c:93 ../src/goabackend/goasmtpauth.c:159
 #, c-format
 msgid "Service not available"
 msgstr "服务不可用"
 
 #. TODO: more specific
-#: ../src/goabackend/goaimapauthlogin.c:115
+#: ../src/goabackend/goaimapauthlogin.c:114
 #: ../src/goabackend/goalastfmprovider.c:523
-#: ../src/goabackend/goasmtpauth.c:113 ../src/goabackend/goautils.c:888
+#: ../src/goabackend/goasmtpauth.c:112 ../src/goabackend/goautils.c:888
 #, c-format
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: ../src/goabackend/goaimapauthlogin.c:140
+#: ../src/goabackend/goaimapauthlogin.c:139
 #, c-format
 msgid "Server does not support PLAIN"
 msgstr "服务器不支持 PLAIN 方式"
 
-#: ../src/goabackend/goaimapauthlogin.c:194 ../src/goabackend/goasmtpauth.c:818
+#: ../src/goabackend/goaimapauthlogin.c:193 ../src/goabackend/goasmtpauth.c:817
 #, c-format
 msgid "Server does not support STARTTLS"
 msgstr "服务器不支持 STARTTLS 方式"
@@ -301,8 +301,8 @@ msgstr "IMAP 和 SMTP"
 #: ../src/goabackend/goaimapsmtpprovider.c:364
 #: ../src/goabackend/goaimapsmtpprovider.c:415
 #, c-format
-msgid "Invalid %s with username ‘%s’ (%s, %d): "
-msgstr "用户 %2$s 的 %1$s 无效 (%3$s, %4$d)"
+msgid "Invalid %s with username “%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.
@@ -340,88 +340,79 @@ msgstr "SMTP 服务器(_S)"
 
 #: ../src/goabackend/goaimapsmtpprovider.c:739
 #: ../src/goabackend/goaimapsmtpprovider.c:1023
-#: ../src/goabackend/goaimapsmtpprovider.c:1366
+#: ../src/goabackend/goaimapsmtpprovider.c:1368
 msgid "_Forward"
 msgstr "转发(_F)"
 
 #: ../src/goabackend/goaimapsmtpprovider.c:1007
-#: ../src/goabackend/goaimapsmtpprovider.c:1349
+#: ../src/goabackend/goaimapsmtpprovider.c:1351
 msgid "Error connecting to IMAP server"
 msgstr "连接 IMAP 服务器出错"
 
 #: ../src/goabackend/goaimapsmtpprovider.c:1104
-#: ../src/goabackend/goaimapsmtpprovider.c:1426
+#: ../src/goabackend/goaimapsmtpprovider.c:1428
 msgid "Error connecting to SMTP server"
 msgstr "连接 SMTP 服务器出错"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1534
+#: ../src/goabackend/goaimapsmtpprovider.c:1536
 msgid "E-mail"
 msgstr "电子邮箱"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1538
+#: ../src/goabackend/goaimapsmtpprovider.c:1540
 msgid "Name"
 msgstr "姓名"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1548
-#: ../src/goabackend/goaimapsmtpprovider.c:1552
+#: ../src/goabackend/goaimapsmtpprovider.c:1550
+#: ../src/goabackend/goaimapsmtpprovider.c:1554
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1563
-#: ../src/goabackend/goaimapsmtpprovider.c:1567
+#: ../src/goabackend/goaimapsmtpprovider.c:1565
+#: ../src/goabackend/goaimapsmtpprovider.c:1569
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../src/goabackend/goakerberosprovider.c:101
+#: ../src/goabackend/goakerberosprovider.c:99
 msgid "Enterprise Login (Kerberos)"
 msgstr "企业用户登陆 (Kerberos)"
 
-#: ../src/goabackend/goakerberosprovider.c:296
+#: ../src/goabackend/goakerberosprovider.c:228
 #, c-format
 msgid "Ticketing is disabled for account"
 msgstr "帐号票据已被禁用"
 
-#: ../src/goabackend/goakerberosprovider.c:321
+#: ../src/goabackend/goakerberosprovider.c:253
 #, c-format
-msgid "Could not find saved credentials for principal ‘%s’ in keyring"
-msgstr "无法在密钥环中为主体 %s 找到保存的凭证"
+msgid "Could not find saved credentials for principal “%s” in keyring"
+msgstr "无法在密钥环中为主体“%s”找到保存的凭证"
 
-#: ../src/goabackend/goakerberosprovider.c:334
+#: ../src/goabackend/goakerberosprovider.c:266
 #, c-format
-msgid "Did not find password for principal ‘%s’ in credentials"
-msgstr "未在凭据中找到主体 %s 的密码"
+msgid "Did not find password for principal “%s” in credentials"
+msgstr "未在凭据中找到主体“%s”的密码"
 
-#: ../src/goabackend/goakerberosprovider.c:730
-msgid "_Domain"
-msgstr "域(_D)"
-
-#: ../src/goabackend/goakerberosprovider.c:731
-msgid "Enterprise domain or realm name"
-msgstr "企业域或者 Realm"
+#: ../src/goabackend/goakerberosprovider.c:569
+msgid "_Principal"
+msgstr ""
 
-#: ../src/goabackend/goakerberosprovider.c:973
-#: ../src/goaidentity/goaidentityservice.c:1127
+#: ../src/goabackend/goakerberosprovider.c:803
+#: ../src/goaidentity/goaidentityservice.c:1083
 msgid "Log In to Realm"
 msgstr "登陆到 Realm"
 
-#: ../src/goabackend/goakerberosprovider.c:974
+#: ../src/goabackend/goakerberosprovider.c:804
 msgid "Please enter your password below."
 msgstr "请在下方输入您的密码。"
 
-#: ../src/goabackend/goakerberosprovider.c:975
+#: ../src/goabackend/goakerberosprovider.c:805
 msgid "Remember this password"
 msgstr "记住密码"
 
-#: ../src/goabackend/goakerberosprovider.c:1109
-#, c-format
-msgid "The domain is not valid"
-msgstr "域无效"
-
-#: ../src/goabackend/goakerberosprovider.c:1259
+#: ../src/goabackend/goakerberosprovider.c:959
 msgid "Error connecting to enterprise identity server"
 msgstr "连接企业认证服务器出错"
 
-#: ../src/goabackend/goakerberosprovider.c:1596
+#: ../src/goabackend/goakerberosprovider.c:1296
 #, c-format
 msgid "Identity service returned invalid key"
 msgstr "认证服务返回了无效密钥"
@@ -431,7 +422,7 @@ msgid "Last.fm"
 msgstr "Last.fm"
 
 #: ../src/goabackend/goalastfmprovider.c:691
-#: ../src/goabackend/goalastfmprovider.c:839
+#: ../src/goabackend/goalastfmprovider.c:841
 msgid "Error connecting to Last.fm"
 msgstr "连接到 Last.fm 时出错"
 
@@ -443,7 +434,7 @@ msgstr "媒体服务器"
 msgid ""
 "Personal content can be added to your applications through a media server "
 "account."
-msgstr "可通过媒体服务器账号将个人内容添加到应用。"
+msgstr "可通过媒体服务器帐号将个人内容添加到应用。"
 
 #: ../src/goabackend/goamediaserverprovider.c:343
 msgid "Available Media Servers"
@@ -454,45 +445,45 @@ msgid "No media servers found"
 msgstr "没有找到媒体服务器"
 
 #. Translators: the %d is a HTTP status code and the %s is a textual description of it
-#: ../src/goabackend/goaoauth2provider.c:719
+#: ../src/goabackend/goaoauth2provider.c:718
 #: ../src/goabackend/goaoauthprovider.c:559
 #, c-format
 msgid ""
 "Expected status 200 when requesting access token, instead got status %d (%s)"
 msgstr "在请求访问令牌时应得到状态 200，但却得到了状态 %d (%s)"
 
-#: ../src/goabackend/goaoauth2provider.c:893
+#: ../src/goabackend/goaoauth2provider.c:898
 msgid "Authorization response: "
 msgstr "认证响应为："
 
-#: ../src/goabackend/goaoauth2provider.c:963
+#: ../src/goabackend/goaoauth2provider.c:968
 #, c-format
 msgid "Authorization response: %s"
 msgstr "认证响应为：%s"
 
-#: ../src/goabackend/goaoauth2provider.c:1112
-#: ../src/goabackend/goaoauthprovider.c:893
+#: ../src/goabackend/goaoauth2provider.c:1117
+#: ../src/goabackend/goaoauthprovider.c:909
 msgid "Error getting an Access Token: "
 msgstr "获取访问令牌出错："
 
-#: ../src/goabackend/goaoauth2provider.c:1127
-#: ../src/goabackend/goaoauthprovider.c:906
+#: ../src/goabackend/goaoauth2provider.c:1132
+#: ../src/goabackend/goaoauthprovider.c:922
 msgid "Error getting identity: "
 msgstr "获取身份信息出错："
 
-#: ../src/goabackend/goaoauth2provider.c:1344
-#: ../src/goabackend/goaoauthprovider.c:1210
+#: ../src/goabackend/goaoauth2provider.c:1354
+#: ../src/goabackend/goaoauthprovider.c:1226
 #, c-format
 msgid "Was asked to log in as %s, but logged in as %s"
 msgstr "要求以 %s 身份登录，但却登录为 %s"
 
-#: ../src/goabackend/goaoauth2provider.c:1506
+#: ../src/goabackend/goaoauth2provider.c:1516
 #, c-format
 msgid "Credentials do not contain access_token"
 msgstr "凭据中不包含访问令牌 (access_token)"
 
-#: ../src/goabackend/goaoauth2provider.c:1545
-#: ../src/goabackend/goaoauthprovider.c:1438
+#: ../src/goabackend/goaoauth2provider.c:1555
+#: ../src/goabackend/goaoauthprovider.c:1454
 #, c-format
 msgid "Failed to refresh access token (%s, %d): "
 msgstr "刷新访问令牌(%s，%d)失败："
@@ -502,33 +493,33 @@ msgstr "刷新访问令牌(%s，%d)失败："
 msgid "Missing access_token or access_token_secret headers in response"
 msgstr "响应中缺少 access_token 或 access_token_secret 头"
 
-#: ../src/goabackend/goaoauthprovider.c:774
+#: ../src/goabackend/goaoauthprovider.c:792
 msgid "Error getting a Request Token: "
 msgstr "获取响应令牌出错："
 
 #. Translators: the %d is a HTTP status code and the %s is a textual description of it
-#: ../src/goabackend/goaoauthprovider.c:807
+#: ../src/goabackend/goaoauthprovider.c:823
 #, c-format
 msgid ""
 "Expected status 200 for getting a Request Token, instead got status %d (%s)"
 msgstr "获取响应令牌时应得到状态 200，但却得到了状态 %d (%s)"
 
-#: ../src/goabackend/goaoauthprovider.c:824
+#: ../src/goabackend/goaoauthprovider.c:840
 #, c-format
 msgid "Missing request_token or request_token_secret headers in response"
 msgstr "响应中缺少 request_token 或 request_token_secret 头"
 
-#: ../src/goabackend/goaoauthprovider.c:1394
+#: ../src/goabackend/goaoauthprovider.c:1410
 #, c-format
 msgid "Credentials do not contain access_token or access_token_secret"
 msgstr "凭据中不含 access_token 或 access_token_secret"
 
 #: ../src/goabackend/goaowncloudprovider.c:68
-msgid "ownCloud"
-msgstr "ownCloud"
+msgid "Nextcloud"
+msgstr "Nextcloud"
 
 #: ../src/goabackend/goaowncloudprovider.c:767
-#: ../src/goabackend/goaowncloudprovider.c:960
+#: ../src/goabackend/goaowncloudprovider.c:962
 msgid "Error connecting to ownCloud server"
 msgstr "连接 ownCloud 服务器出错"
 
@@ -542,108 +533,108 @@ msgstr "Pocket"
 msgid "No username or access_token"
 msgstr "没有用户名或访问令牌"
 
-#: ../src/goabackend/goaprovider.c:120
+#: ../src/goabackend/goaprovider.c:118
 msgid "_Mail"
 msgstr "邮件(_M)"
 
-#: ../src/goabackend/goaprovider.c:125
+#: ../src/goabackend/goaprovider.c:123
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../src/goabackend/goaprovider.c:130
+#: ../src/goabackend/goaprovider.c:128
 msgid "_Contacts"
 msgstr "联系人(_C)"
 
-#: ../src/goabackend/goaprovider.c:135
+#: ../src/goabackend/goaprovider.c:133
 #: ../src/goabackend/goatelepathyprovider.c:961
 msgid "C_hat"
 msgstr "聊天(_H)"
 
-#: ../src/goabackend/goaprovider.c:140
+#: ../src/goabackend/goaprovider.c:138
 msgid "_Documents"
 msgstr "文档(_D)"
 
-#: ../src/goabackend/goaprovider.c:145
+#: ../src/goabackend/goaprovider.c:143
 msgid "M_usic"
 msgstr "音乐(_U)"
 
-#: ../src/goabackend/goaprovider.c:150
+#: ../src/goabackend/goaprovider.c:148
 msgid "_Photos"
 msgstr "图片(_P)"
 
-#: ../src/goabackend/goaprovider.c:155
+#: ../src/goabackend/goaprovider.c:153
 msgid "_Files"
 msgstr "文件(_F)"
 
-#: ../src/goabackend/goaprovider.c:160
+#: ../src/goabackend/goaprovider.c:158
 msgid "Network _Resources"
 msgstr "网络资源(_R)"
 
-#: ../src/goabackend/goaprovider.c:165
+#: ../src/goabackend/goaprovider.c:163
 msgid "_Read Later"
 msgstr "稍后阅读(_R)"
 
-#: ../src/goabackend/goaprovider.c:170
+#: ../src/goabackend/goaprovider.c:168
 msgid "Prin_ters"
 msgstr "打印机(_T)"
 
-#: ../src/goabackend/goaprovider.c:175
+#: ../src/goabackend/goaprovider.c:173
 msgid "_Maps"
 msgstr "地图(_M)"
 
 #. Translators: This is a label for a series of
 #. * options switches. For example: “Use for Mail”.
-#: ../src/goabackend/goaprovider.c:601
+#: ../src/goabackend/goaprovider.c:602
 #: ../src/goabackend/goatelepathyprovider.c:959
 msgid "Use for"
 msgstr "用于"
 
-#: ../src/goabackend/goaprovider.c:858
+#: ../src/goabackend/goaprovider.c:859
 msgid "Account is disabled"
 msgstr "帐号已禁用"
 
-#: ../src/goabackend/goaprovider.c:881
+#: ../src/goabackend/goaprovider.c:882
 #, c-format
 msgid "ensure_credentials_sync is not implemented on type %s"
 msgstr "未在 %s 类型上实现 ensure_credentials_sync"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:175
+#: ../src/goabackend/goasmtpauth.c:174
 #, c-format
 msgid "TLS not available"
 msgstr "TLS 不可用"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:242
+#: ../src/goabackend/goasmtpauth.c:241
 #, c-format
 msgid "org.gnome.OnlineAccounts.Mail is not available"
 msgstr "org.gnome.OnlineAccounts.Mail 不可用"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:252
+#: ../src/goabackend/goasmtpauth.c:251
 #, c-format
 msgid "Failed to parse email address"
 msgstr "无法解析电子邮箱地址"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:261
+#: ../src/goabackend/goasmtpauth.c:260
 #, c-format
 msgid "Cannot do SMTP authentication without a domain"
 msgstr "SMTP 认证需要域名"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:301
+#: ../src/goabackend/goasmtpauth.c:300
 #, c-format
 msgid "Did not find smtp-password in credentials"
 msgstr "未在凭据中找到 SMTP 密码项"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:312
+#: ../src/goabackend/goasmtpauth.c:311
 #, c-format
 msgid "Cannot do SMTP authentication without a password"
 msgstr "SMTP 认证需要密码"
 
-#: ../src/goabackend/goasmtpauth.c:674
+#: ../src/goabackend/goasmtpauth.c:673
 #, c-format
 msgid "Unknown authentication mechanism"
 msgstr "未知认证机制"
@@ -651,7 +642,7 @@ msgstr "未知认证机制"
 #: ../src/goabackend/goatelepathyprovider.c:187
 #, c-format
 msgid "Telepathy chat account not found"
-msgstr "未找到 Telepathy 聊天账号"
+msgstr "未找到 Telepathy 聊天帐号"
 
 #: ../src/goabackend/goatelepathyprovider.c:449
 #, c-format
@@ -688,60 +679,63 @@ msgstr "连接设置(_C)"
 msgid "_Personal Details"
 msgstr "个人详情(_P)"
 
-#: ../src/goabackend/goautils.c:93
+#: ../src/goabackend/goautils.c:92
 msgid "Error logging into the account"
 msgstr "登录帐号出错"
 
-#: ../src/goabackend/goautils.c:137
+#: ../src/goabackend/goautils.c:139
 msgid "Credentials have expired."
 msgstr "凭据已过期。"
 
-#: ../src/goabackend/goautils.c:141
+#: ../src/goabackend/goautils.c:143
 msgid "Sign in to enable this account."
 msgstr "登录以启用该帐号。"
 
-#: ../src/goabackend/goautils.c:146
+#: ../src/goabackend/goautils.c:148
 msgid "_Sign In"
 msgstr "登录(_S)"
 
-#: ../src/goabackend/goautils.c:278
+#: ../src/goabackend/goautils.c:280
 #, c-format
 msgid "A %s account already exists for %s"
-msgstr "已存在一个对应 %2$s 的 %1$s 账号"
+msgstr "已存在一个对应 %2$s 的 %1$s 帐号"
 
-#. Translators: the %s is the name of the provider. eg., Google.
-#: ../src/goabackend/goautils.c:328
+#. Translators: this is the title of the "Add Account" and "Refresh
+#. * Account" dialogs. The %s is the name of the provider. eg.,
+#. * 'Google'.
+#.
+#: ../src/goabackend/goautils.c:333
 #, c-format
-msgid "%s account"
-msgstr "%s 账号"
+msgid "%s Account"
+msgstr "%s 帐号"
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:386
+#: ../src/goabackend/goautils.c:391
 msgid "Failed to delete credentials from the keyring"
 msgstr "从密钥环中删除凭据失败："
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:438
+#: ../src/goabackend/goautils.c:443
 msgid "Failed to retrieve credentials from the keyring"
 msgstr "从密钥环中取出凭据失败："
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:448
+#: ../src/goabackend/goautils.c:453
 msgid "No credentials found in the keyring"
 msgstr "在密钥环中未找到凭据"
 
-#: ../src/goabackend/goautils.c:461
+#: ../src/goabackend/goautils.c:466
 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:504
+#: ../src/goabackend/goautils.c:509
 #, c-format
 msgid "GOA %s credentials for identity %s"
 msgstr "实体 %2$s 的 GOA %1$s 凭据"
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:521
+#: ../src/goabackend/goautils.c:526
 msgid "Failed to store credentials in the keyring"
 msgstr "保存凭据至秘钥环失败"
 
@@ -795,8 +789,8 @@ msgstr "无效证书。"
 #. TODO: more specific
 #: ../src/goabackend/goautils.c:969
 #, c-format
-msgid "Did not find %s with identity ‘%s’ in credentials"
-msgstr "未在凭据中找到与身份 %s 匹配的 %s "
+msgid "Did not find %s with identity “%s” in credentials"
+msgstr "未在凭据中找到与身份“%2$s”匹配的 %1$s"
 
 #. translators: %s here is the address of the web page
 #: ../src/goabackend/goawebview.c:95
@@ -804,19 +798,19 @@ msgstr "未在凭据中找到与身份 %s 匹配的 %s "
 msgid "Loading “%s”…"
 msgstr "正在载入“%s”..."
 
-#: ../src/goabackend/goawindowsliveprovider.c:79
-msgid "Microsoft Account"
-msgstr "Microsoft 账户"
+#: ../src/goabackend/goawindowsliveprovider.c:70
+msgid "Microsoft"
+msgstr "Microsoft"
 
-#: ../src/goaidentity/goaidentityservice.c:370
+#: ../src/goaidentity/goaidentityservice.c:366
 msgid "initial secret passed before secret key exchange"
 msgstr "交换私钥之前初始化私钥密码"
 
-#: ../src/goaidentity/goaidentityservice.c:567
+#: ../src/goaidentity/goaidentityservice.c:568
 msgid "Initial secret key is invalid"
 msgstr "初始私钥不合法"
 
-#: ../src/goaidentity/goaidentityservice.c:1132
+#: ../src/goaidentity/goaidentityservice.c:1088
 #, c-format
 msgid "The network realm %s needs some information to sign you in."
 msgstr "网络 realm %s 接纳您之前需要一些信息。"
@@ -881,6 +875,27 @@ msgstr "无法找到身份"
 msgid "Could not create credential cache for identity"
 msgstr "无法为身份创建凭据缓存"
 
+#~ msgid "_Domain"
+#~ msgstr "域(_D)"
+
+#~ msgid "Enterprise domain or realm name"
+#~ msgstr "企业域或者 Realm"
+
+#~ msgid "The domain is not valid"
+#~ msgstr "域无效"
+
+#~ msgid "T_o Do"
+#~ msgstr "待办事宜(_O)"
+
+#~ msgid "Unknown error"
+#~ msgstr "未知错误"
+
+#~ msgid "Todoist"
+#~ msgstr "待办事宜列表"
+
+#~ msgid "ownCloud"
+#~ msgstr "ownCloud"
+
 #~ msgid "Failed to initialize a GOA client"
 #~ msgstr "无法初始化 GOA 客户端"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]