[gnome-online-accounts] update zh_CN translation

[YunQiang Su <yqsu src gnome org>]

commit 44fba2de1202189875abb0bbfe4b18c0e675087b
Author: YunQiang Su <yqsu src gnome org>
Date:   Sun Sep 21 14:35:20 2014 +0800

    update zh_CN translation

 po/zh_CN.po |  617 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 315 insertions(+), 302 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca272ca..61d2ae2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,63 +12,63 @@ 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-01-14 12:24+0000\n"
-"PO-Revision-Date: 2014-01-18 16:52+0800\n"
-"Last-Translator: Tong Hui <tonghuix gmail com>\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"
 "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.5.4\n"
+"X-Generator: Poedit 1.6.9\n"
 
 #. TODO: more specific
-#: ../src/daemon/goadaemon.c:788 ../src/daemon/goadaemon.c:1034
+#: ../src/daemon/goadaemon.c:783 ../src/daemon/goadaemon.c:1029
 #, c-format
 msgid "Failed to find a provider for: %s"
 msgstr "找不到 %s 的供应商"
 
 #. TODO: more specific
-#: ../src/daemon/goadaemon.c:1022
+#: ../src/daemon/goadaemon.c:1017
 msgid "ProviderType property is not set for account"
 msgstr "帐户的 ProviderType(供应商类型) 属性未设置"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:234 ../src/goabackend/goahttpclient.c:175
+#: ../src/goabackend/goaewsclient.c:228 ../src/goabackend/goahttpclient.c:170
 #, c-format
 msgid "Code: %u — Unexpected response from server"
 msgstr "ä»£ç ï¼š%u - 服务器响应异常"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:250
+#: ../src/goabackend/goaewsclient.c:244
 #, 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:255 ../src/goabackend/goaewsclient.c:270
+#: ../src/goabackend/goaewsclient.c:285
 #, c-format
 msgid "Failed to find ‘%s’ element"
 msgstr "æ²¡æœ‰æ‰¾åˆ°å…ƒç´ â€œ%s”"
 
 #. TODO: more specific
-#: ../src/goabackend/goaewsclient.c:308
+#: ../src/goabackend/goaewsclient.c:306
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "æ— æ³•åœ¨è‡ªåŠ¨å‘çŽ°å“åº”ä¸­æ‰¾åˆ° ASUrl å’Œ OABUrl"
 
-#: ../src/goabackend/goaexchangeprovider.c:79
+#: ../src/goabackend/goaexchangeprovider.c:73
 msgid "Microsoft Exchange"
 msgstr "Microsoft Exchange"
 
 #. TODO: more specific
-#: ../src/goabackend/goaexchangeprovider.c:317
-#: ../src/goabackend/goaexchangeprovider.c:1028
-#: ../src/goabackend/goaowncloudprovider.c:403
-#: ../src/goabackend/goaowncloudprovider.c:1190
+#: ../src/goabackend/goaexchangeprovider.c:311
+#: ../src/goabackend/goaexchangeprovider.c:1020
+#: ../src/goabackend/goaowncloudprovider.c:398
+#: ../src/goabackend/goaowncloudprovider.c:1183
 #, c-format
 msgid "Did not find password with identity ‘%s’ in credentials"
 msgstr "未能在证书中找到身份“%sâ€çš„å¯†ç "
@@ -77,161 +77,162 @@ msgstr "未能在证书中找到身份“%sâ€çš„å¯†ç "
 #. * (eg., debarshi ray gmail com or rishi), and the
 #. * (%s, %d) is the error domain and code.
 #.
-#: ../src/goabackend/goaexchangeprovider.c:345
-#: ../src/goabackend/goaowncloudprovider.c:426
+#: ../src/goabackend/goaexchangeprovider.c:339
+#: ../src/goabackend/goaowncloudprovider.c:421
 #, c-format
 msgid "Invalid password with username ‘%s’ (%s, %d): "
 msgstr "用户名“%sâ€çš„å¯†ç æ— æ•ˆ (%s, %d)"
 
-#: ../src/goabackend/goaexchangeprovider.c:499
-#: ../src/goabackend/goaimapsmtpprovider.c:707
+#: ../src/goabackend/goaexchangeprovider.c:492
+#: ../src/goabackend/goaimapsmtpprovider.c:715
 msgid "_E-mail"
 msgstr "电子邮箱(_E)"
 
-#: ../src/goabackend/goaexchangeprovider.c:500
-#: ../src/goabackend/goaimapsmtpprovider.c:727
-#: ../src/goabackend/goaimapsmtpprovider.c:747
-#: ../src/goabackend/goaowncloudprovider.c:655
+#: ../src/goabackend/goaexchangeprovider.c:493
+#: ../src/goabackend/goaimapsmtpprovider.c:735
+#: ../src/goabackend/goaimapsmtpprovider.c:755
+#: ../src/goabackend/goaowncloudprovider.c:649
 msgid "_Password"
 msgstr "å¯†ç (_P)"
 
-#: ../src/goabackend/goaexchangeprovider.c:503
+#: ../src/goabackend/goaexchangeprovider.c:496
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../src/goabackend/goaexchangeprovider.c:514
-#: ../src/goabackend/goaimapsmtpprovider.c:726
-#: ../src/goabackend/goaimapsmtpprovider.c:746
-#: ../src/goabackend/goakerberosprovider.c:1132
-#: ../src/goabackend/goaowncloudprovider.c:654
+#: ../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
 msgid "User_name"
 msgstr "用户名(_N)"
 
-#: ../src/goabackend/goaexchangeprovider.c:515
-#: ../src/goabackend/goaowncloudprovider.c:653
+#: ../src/goabackend/goaexchangeprovider.c:508
+#: ../src/goabackend/goaowncloudprovider.c:647
 msgid "_Server"
 msgstr "服务器(_S)"
 
-#: ../src/goabackend/goaexchangeprovider.c:525
-#: ../src/goabackend/goakerberosprovider.c:1137
-#: ../src/goabackend/goaowncloudprovider.c:664
+#. --
+#: ../src/goabackend/goaexchangeprovider.c:518
+#: ../src/goabackend/goaimapsmtpprovider.c:767
+#: ../src/goabackend/goakerberosprovider.c:1128
+#: ../src/goabackend/goaowncloudprovider.c:658
+#: ../src/goabackend/goatelepathyprovider.c:649
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../src/goabackend/goaexchangeprovider.c:519
+#: ../src/goabackend/goakerberosprovider.c:1129
+#: ../src/goabackend/goaowncloudprovider.c:659
 msgid "C_onnect"
 msgstr "连接(_C)"
 
-#: ../src/goabackend/goaexchangeprovider.c:545
-#: ../src/goabackend/goaimapsmtpprovider.c:779
-#: ../src/goabackend/goakerberosprovider.c:1157
-#: ../src/goabackend/goaowncloudprovider.c:684
+#: ../src/goabackend/goaexchangeprovider.c:535
+#: ../src/goabackend/goaimapsmtpprovider.c:784
+#: ../src/goabackend/goakerberosprovider.c:1145
+#: ../src/goabackend/goaowncloudprovider.c:675
 msgid "Connecting…"
 msgstr "正在连接……"
 
-#: ../src/goabackend/goaexchangeprovider.c:650
-#: ../src/goabackend/goaexchangeprovider.c:845
-#: ../src/goabackend/goaimapsmtpprovider.c:939
-#: ../src/goabackend/goaimapsmtpprovider.c:974
-#: ../src/goabackend/goaimapsmtpprovider.c:1062
-#: ../src/goabackend/goaimapsmtpprovider.c:1318
-#: ../src/goabackend/goaimapsmtpprovider.c:1391
-#: ../src/goabackend/goakerberosprovider.c:1548
-#: ../src/goabackend/goaoauth2provider.c:1210
-#: ../src/goabackend/goaoauthprovider.c:1044
-#: ../src/goabackend/goaowncloudprovider.c:795
-#: ../src/goabackend/goaowncloudprovider.c:1008
-#: ../src/goabackend/goatelepathyprovider.c:487
-#: ../src/goabackend/goatelepathyprovider.c:536
-#: ../src/goabackend/goatelepathyprovider.c:710
+#: ../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/goamediaserverprovider.c:473
+#: ../src/goabackend/goaoauth2provider.c:1077
+#: ../src/goabackend/goaoauthprovider.c:908
+#: ../src/goabackend/goaowncloudprovider.c:786
+#: ../src/goabackend/goaowncloudprovider.c:1001
+#: ../src/goabackend/goatelepathyprovider.c:459
+#: ../src/goabackend/goatelepathyprovider.c:508
+#: ../src/goabackend/goatelepathyprovider.c:683
 #, c-format
 msgid "Dialog was dismissed"
 msgstr "对话框被关闭"
 
-#: ../src/goabackend/goaexchangeprovider.c:688
-#: ../src/goabackend/goaexchangeprovider.c:873
-#: ../src/goabackend/goaimapsmtpprovider.c:1004
-#: ../src/goabackend/goaimapsmtpprovider.c:1095
-#: ../src/goabackend/goaimapsmtpprovider.c:1342
-#: ../src/goabackend/goaimapsmtpprovider.c:1416
-#: ../src/goabackend/goaowncloudprovider.c:837
-#: ../src/goabackend/goaowncloudprovider.c:1029
+#: ../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
 #, c-format
 msgid "Dialog was dismissed (%s, %d): "
 msgstr "对话框已关闭 (%s, %d)："
 
-#: ../src/goabackend/goaexchangeprovider.c:701
-#: ../src/goabackend/goaimapsmtpprovider.c:1017
-#: ../src/goabackend/goaimapsmtpprovider.c:1108
-#: ../src/goabackend/goaowncloudprovider.c:850
+#: ../src/goabackend/goaexchangeprovider.c:691
+#: ../src/goabackend/goaimapsmtpprovider.c:1024
+#: ../src/goabackend/goaimapsmtpprovider.c:1117
+#: ../src/goabackend/goaowncloudprovider.c:841
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../src/goabackend/goaexchangeprovider.c:706
-#: ../src/goabackend/goaexchangeprovider.c:892
-#: ../src/goabackend/goaimapsmtpprovider.c:1022
-#: ../src/goabackend/goaimapsmtpprovider.c:1113
-#: ../src/goabackend/goaimapsmtpprovider.c:1361
-#: ../src/goabackend/goaimapsmtpprovider.c:1435
-#: ../src/goabackend/goakerberosprovider.c:1658
-#: ../src/goabackend/goaowncloudprovider.c:855
-#: ../src/goabackend/goaowncloudprovider.c:1048
+#: ../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
 msgid "_Try Again"
 msgstr "再试一次(_T)"
 
-#: ../src/goabackend/goaexchangeprovider.c:711
-#: ../src/goabackend/goaexchangeprovider.c:885
+#: ../src/goabackend/goaexchangeprovider.c:701
+#: ../src/goabackend/goaexchangeprovider.c:877
 msgid "Error connecting to Microsoft Exchange server"
 msgstr "连接 Microsoft Exchange 服务器出错"
 
-#: ../src/goabackend/goaexchangeprovider.c:811
-#: ../src/goabackend/goaimapsmtpprovider.c:1256
-#: ../src/goabackend/goaoauth2provider.c:1433
-#: ../src/goabackend/goaoauthprovider.c:1355
-#: ../src/goabackend/goaowncloudprovider.c:968
-#: ../src/goabackend/goatelepathyprovider.c:675
-msgid "_Cancel"
-msgstr "取消(_C)"
-
 #. Translators: This is a label for a series of
 #. * options switches. For example: “Use for Mail”.
-#: ../src/goabackend/goaexchangeprovider.c:947
-#: ../src/goabackend/goafacebookprovider.c:436
-#: ../src/goabackend/goaflickrprovider.c:427
-#: ../src/goabackend/goagoogleprovider.c:534
-#: ../src/goabackend/goakerberosprovider.c:1731
-#: ../src/goabackend/goaowncloudprovider.c:1104
-#: ../src/goabackend/goapocketprovider.c:428
-#: ../src/goabackend/goatelepathyprovider.c:917
-#: ../src/goabackend/goawindowsliveprovider.c:455
+#: ../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/goamediaserverprovider.c:584
+#: ../src/goabackend/goaowncloudprovider.c:1097
+#: ../src/goabackend/goapocketprovider.c:421
+#: ../src/goabackend/goatelepathyprovider.c:890
+#: ../src/goabackend/goawindowsliveprovider.c:421
 msgid "Use for"
 msgstr "用于"
 
-#: ../src/goabackend/goaexchangeprovider.c:949
-#: ../src/goabackend/goagoogleprovider.c:536
-#: ../src/goabackend/goawindowsliveprovider.c:457
+#: ../src/goabackend/goaexchangeprovider.c:941
+#: ../src/goabackend/goagoogleprovider.c:594
+#: ../src/goabackend/goawindowsliveprovider.c:423
 msgid "_Mail"
 msgstr "邮件(_M)"
 
-#: ../src/goabackend/goaexchangeprovider.c:954
-#: ../src/goabackend/goagoogleprovider.c:541
-#: ../src/goabackend/goaowncloudprovider.c:1106
+#: ../src/goabackend/goaexchangeprovider.c:946
+#: ../src/goabackend/goagoogleprovider.c:599
+#: ../src/goabackend/goaowncloudprovider.c:1099
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../src/goabackend/goaexchangeprovider.c:959
-#: ../src/goabackend/goagoogleprovider.c:546
-#: ../src/goabackend/goaowncloudprovider.c:1111
+#: ../src/goabackend/goaexchangeprovider.c:951
+#: ../src/goabackend/goagoogleprovider.c:604
+#: ../src/goabackend/goaowncloudprovider.c:1104
 msgid "_Contacts"
 msgstr "联系人(_C)"
 
-#: ../src/goabackend/goafacebookprovider.c:82
+#: ../src/goabackend/goafacebookprovider.c:76
 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:218
-#: ../src/goabackend/goaflickrprovider.c:189
-#: ../src/goabackend/goagoogleprovider.c:213
-#: ../src/goabackend/goatwitterprovider.c:166
-#: ../src/goabackend/goawindowsliveprovider.c:197
-#: ../src/goabackend/goayahooprovider.c:187
+#: ../src/goabackend/goaflickrprovider.c:183
+#: ../src/goabackend/goagoogleprovider.c:218
+#: ../src/goabackend/goawindowsliveprovider.c:189
+#: ../src/goabackend/goayahooprovider.c:182
 #, c-format
 msgid ""
 "Expected status 200 when requesting your identity, instead got status %d (%s)"
@@ -240,95 +241,101 @@ msgstr "在请求您的身份时应得到的状态 200，但却得到了状态 %
 #: ../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:232
-#: ../src/goabackend/goagoogleprovider.c:244
-#: ../src/goabackend/goaoauth2provider.c:731
-#: ../src/goabackend/goaoauth2provider.c:761
-#: ../src/goabackend/goaoauth2provider.c:773
-#: ../src/goabackend/goatwitterprovider.c:185
-#: ../src/goabackend/goatwitterprovider.c:197
-#: ../src/goabackend/goatwitterprovider.c:207
-#: ../src/goabackend/goawindowsliveprovider.c:216
-#: ../src/goabackend/goawindowsliveprovider.c:228
-#: ../src/goabackend/goawindowsliveprovider.c:240
-#: ../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
+#: ../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/goaoauth2provider.c:691
+#: ../src/goabackend/goaoauth2provider.c:721
+#: ../src/goabackend/goaoauth2provider.c:733
+#: ../src/goabackend/goawindowsliveprovider.c:208
+#: ../src/goabackend/goawindowsliveprovider.c:220
+#: ../src/goabackend/goawindowsliveprovider.c:232
+#: ../src/goabackend/goayahooprovider.c:201
+#: ../src/goabackend/goayahooprovider.c:213
+#: ../src/goabackend/goayahooprovider.c:224
+#: ../src/goabackend/goayahooprovider.c:270
+#: ../src/goabackend/goayahooprovider.c:282
+#: ../src/goabackend/goayahooprovider.c:293
 #, c-format
 msgid "Could not parse response"
 msgstr "æ— æ³•è§£æžå“åº”"
 
-#: ../src/goabackend/goafacebookprovider.c:438
-#: ../src/goabackend/goagoogleprovider.c:551
-#: ../src/goabackend/goatelepathyprovider.c:919
-#: ../src/goabackend/goawindowsliveprovider.c:462
+#: ../src/goabackend/goafacebookprovider.c:463
+#: ../src/goabackend/goagoogleprovider.c:609
+#: ../src/goabackend/goatelepathyprovider.c:892
 msgid "C_hat"
 msgstr "聊天(_H)"
 
-#: ../src/goabackend/goafacebookprovider.c:443
-#: ../src/goabackend/goaflickrprovider.c:429
+#: ../src/goabackend/goafacebookprovider.c:468
+#: ../src/goabackend/goaflickrprovider.c:413
+#: ../src/goabackend/goagoogleprovider.c:619
+#: ../src/goabackend/goamediaserverprovider.c:586
 msgid "_Photos"
 msgstr "图片(_P)"
 
-#: ../src/goabackend/goaflickrprovider.c:83
+#: ../src/goabackend/goafacebookprovider.c:473
+msgid "_Maps"
+msgstr "地图(_M)"
+
+#: ../src/goabackend/goaflickrprovider.c:77
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../src/goabackend/goaflickrprovider.c:328
-#: ../src/goabackend/goayahooprovider.c:350
+#: ../src/goabackend/goaflickrprovider.c:320
+#: ../src/goabackend/goayahooprovider.c:343
 msgid "Your system time is invalid. Check your date and time settings."
 msgstr "æ‚¨çš„ç³»ç»Ÿæ—¶é—´æ— æ•ˆã€‚è¯·æ£€æŸ¥æ—¥æœŸå’Œæ—¶é—´è®¾ç½®ã€‚"
 
-#: ../src/goabackend/goagoogleprovider.c:82
+#: ../src/goabackend/goagoogleprovider.c:76
 msgid "Google"
 msgstr "Google"
 
-#: ../src/goabackend/goagoogleprovider.c:556
-#: ../src/goabackend/goaowncloudprovider.c:1116
-#: ../src/goabackend/goawindowsliveprovider.c:467
+#: ../src/goabackend/goagoogleprovider.c:614
+#: ../src/goabackend/goaowncloudprovider.c:1109
+#: ../src/goabackend/goawindowsliveprovider.c:428
 msgid "_Documents"
 msgstr "文档(_D)"
 
+#: ../src/goabackend/goagoogleprovider.c:624
+msgid "Prin_ters"
+msgstr "打印机(_T)"
+
 #. TODO: more specific
-#: ../src/goabackend/goaimapauthlogin.c:99 ../src/goabackend/goasmtpauth.c:163
+#: ../src/goabackend/goaimapauthlogin.c:94 ../src/goabackend/goasmtpauth.c:160
 #, c-format
 msgid "Service not available"
 msgstr "服务不可用"
 
 #. TODO: more specific
-#: ../src/goabackend/goaimapauthlogin.c:120
-#: ../src/goabackend/goasmtpauth.c:116
+#: ../src/goabackend/goaimapauthlogin.c:115
+#: ../src/goabackend/goasmtpauth.c:113
 #, c-format
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: ../src/goabackend/goaimapauthlogin.c:145
+#: ../src/goabackend/goaimapauthlogin.c:140
 #, c-format
 msgid "Server does not support PLAIN"
 msgstr "服务器不支持 PLAIN"
 
-#: ../src/goabackend/goaimapauthlogin.c:199
-#: ../src/goabackend/goasmtpauth.c:811
+#: ../src/goabackend/goaimapauthlogin.c:194
+#: ../src/goabackend/goasmtpauth.c:818
 #, c-format
 msgid "Server does not support STARTTLS"
 msgstr "服务器不支持 STARTTLS"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:82
+#: ../src/goabackend/goaimapsmtpprovider.c:76
 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:364
-#: ../src/goabackend/goaimapsmtpprovider.c:422
+#: ../src/goabackend/goaimapsmtpprovider.c:373
+#: ../src/goabackend/goaimapsmtpprovider.c:431
 #, c-format
 msgid "Did not find %s with identity ‘%s’ in credentials"
 msgstr "未能在证书中找到与身份“%s”匹配的“%s”"
@@ -343,8 +350,8 @@ msgstr "未能在证书中找到与身份“%s”匹配的“%s”"
 #. * username (eg., rishi), and the (%s, %d)
 #. * is the error domain and code.
 #.
-#: ../src/goabackend/goaimapsmtpprovider.c:395
-#: ../src/goabackend/goaimapsmtpprovider.c:455
+#: ../src/goabackend/goaimapsmtpprovider.c:404
+#: ../src/goabackend/goaimapsmtpprovider.c:464
 #, c-format
 msgid "Invalid %s with username ‘%s’ (%s, %d): "
 msgstr "用户名“%s”的“%sâ€æ— æ•ˆ (%s, %d)"
@@ -355,500 +362,506 @@ msgstr "用户名“%s”的“%sâ€æ— æ•ˆ (%s, %d)"
 #. *             STARTTLS after connecting
 #. *             SSL on a dedicated port
 #.
-#: ../src/goabackend/goaimapsmtpprovider.c:642
+#: ../src/goabackend/goaimapsmtpprovider.c:651
 msgid "_Encryption"
 msgstr "åŠ å¯†(_E)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:645
+#: ../src/goabackend/goaimapsmtpprovider.c:654
 msgid "None"
 msgstr "æ— "
 
-#: ../src/goabackend/goaimapsmtpprovider.c:648
+#: ../src/goabackend/goaimapsmtpprovider.c:657
 msgid "STARTTLS after connecting"
 msgstr "连接后使用 STARTTLS"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:651
+#: ../src/goabackend/goaimapsmtpprovider.c:660
 msgid "SSL on a dedicated port"
 msgstr "在特定端口上使用 SSL"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:708
+#: ../src/goabackend/goaimapsmtpprovider.c:716
 msgid "_Name"
 msgstr "姓名(_N)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:725
+#: ../src/goabackend/goaimapsmtpprovider.c:733
 msgid "IMAP _Server"
 msgstr "IMAP 服务器(_S)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:745
+#: ../src/goabackend/goaimapsmtpprovider.c:753
 msgid "SMTP _Server"
 msgstr "SMTP 服务器(_S)"
 
-#. --
-#: ../src/goabackend/goaimapsmtpprovider.c:759
-#: ../src/goabackend/goaimapsmtpprovider.c:1043
-#: ../src/goabackend/goaimapsmtpprovider.c:1371
+#: ../src/goabackend/goaimapsmtpprovider.c:768
+#: ../src/goabackend/goaimapsmtpprovider.c:1050
+#: ../src/goabackend/goaimapsmtpprovider.c:1386
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1027
-#: ../src/goabackend/goaimapsmtpprovider.c:1354
+#: ../src/goabackend/goaimapsmtpprovider.c:1034
+#: ../src/goabackend/goaimapsmtpprovider.c:1369
 msgid "Error connecting to IMAP server"
 msgstr "连接 IMAP 服务器出错"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1118
-#: ../src/goabackend/goaimapsmtpprovider.c:1428
+#: ../src/goabackend/goaimapsmtpprovider.c:1127
+#: ../src/goabackend/goaimapsmtpprovider.c:1443
 msgid "Error connecting to SMTP server"
 msgstr "连接 SMTP 服务器出错"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1527
+#: ../src/goabackend/goaimapsmtpprovider.c:1542
 msgid "E-mail"
 msgstr "电子邮箱"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1531
+#: ../src/goabackend/goaimapsmtpprovider.c:1546
 msgid "Name"
 msgstr "姓名"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1541
-#: ../src/goabackend/goaimapsmtpprovider.c:1544
+#: ../src/goabackend/goaimapsmtpprovider.c:1556
+#: ../src/goabackend/goaimapsmtpprovider.c:1559
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../src/goabackend/goaimapsmtpprovider.c:1555
-#: ../src/goabackend/goaimapsmtpprovider.c:1558
+#: ../src/goabackend/goaimapsmtpprovider.c:1570
+#: ../src/goabackend/goaimapsmtpprovider.c:1573
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../src/goabackend/goakerberosprovider.c:87
+#: ../src/goabackend/goakerberosprovider.c:79
 msgid "Enterprise Login (Kerberos)"
 msgstr "企业用户登陆 (Kerberos)"
 
-#: ../src/goabackend/goakerberosprovider.c:455
+#: ../src/goabackend/goakerberosprovider.c:447
 msgid "Identity service returned invalid key"
 msgstr "认证服务返回了非法的密钥"
 
-#: ../src/goabackend/goakerberosprovider.c:727
+#: ../src/goabackend/goakerberosprovider.c:719
 #, c-format
 msgid "Could not find saved credentials for principal ‘%s’ in keyring"
 msgstr "æ— æ³•åœ¨å¯†é’¥çŽ¯ä¸­ä¸ºä¸»ä½“â€œ%s”找到保存的凭证"
 
-#: ../src/goabackend/goakerberosprovider.c:740
+#: ../src/goabackend/goakerberosprovider.c:732
 #, c-format
 msgid "Did not find password for principal ‘%s’ in credentials"
 msgstr "没有在证书中找到主体“%sâ€çš„å¯†ç "
 
-#: ../src/goabackend/goakerberosprovider.c:1124
+#: ../src/goabackend/goakerberosprovider.c:1115
 msgid "_Domain"
 msgstr "域(_D)"
 
-#: ../src/goabackend/goakerberosprovider.c:1125
+#: ../src/goabackend/goakerberosprovider.c:1116
 msgid "Enterprise domain or realm name"
 msgstr "企业域名或者 Realm 名"
 
-#: ../src/goabackend/goakerberosprovider.c:1357
-#: ../src/goaidentity/goaidentityservice.c:1114
+#: ../src/goabackend/goakerberosprovider.c:1345
+#: ../src/goaidentity/goaidentityservice.c:1106
 msgid "Log In to Realm"
 msgstr "登陆到 Realm"
 
-#: ../src/goabackend/goakerberosprovider.c:1358
+#: ../src/goabackend/goakerberosprovider.c:1346
 msgid "Please enter your password below."
 msgstr "è¯·åœ¨ä¸‹æ–¹è¾“å…¥ä½ çš„å¯†ç ã€‚"
 
-#: ../src/goabackend/goakerberosprovider.c:1359
+#: ../src/goabackend/goakerberosprovider.c:1347
 msgid "Remember this password"
 msgstr "è®°ä½è¿™ä¸ªå¯†ç "
 
-#: ../src/goabackend/goakerberosprovider.c:1498
+#: ../src/goabackend/goakerberosprovider.c:1486
 #, c-format
 msgid "The domain is not valid"
 msgstr "此域不存在"
 
-#: ../src/goabackend/goakerberosprovider.c:1653
+#: ../src/goabackend/goakerberosprovider.c:1641
 msgid "Error connecting to enterprise identity server"
 msgstr "连接企业认证服务器出错"
 
-#: ../src/goabackend/goakerberosprovider.c:1733
+#: ../src/goabackend/goakerberosprovider.c:1721
 msgid "Network _Resources"
 msgstr "网络资源(_R)"
 
+#: ../src/goabackend/goamediaserverprovider.c:76
+msgid "Media Server"
+msgstr "媒体服务器"
+
+#: ../src/goabackend/goamediaserverprovider.c:369
+msgid ""
+"Personal content can be added to your applications through a media server "
+"account."
+msgstr "å¯ä»¥é€šè¿‡åª’ä½“æœåŠ¡å™¨è´¦å·å°†ä¸ªäººå†…å®¹æ·»åŠ åˆ°åº”ç”¨ã€‚"
+
+#: ../src/goabackend/goamediaserverprovider.c:383
+msgid "Available Media Servers"
+msgstr "可用的媒体服务器"
+
+#: ../src/goabackend/goamediaserverprovider.c:413
+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:707
-#: ../src/goabackend/goaoauthprovider.c:589
+#: ../src/goabackend/goaoauth2provider.c:667
+#: ../src/goabackend/goaoauthprovider.c:550
 #, c-format
 msgid ""
 "Expected status 200 when requesting access token, instead got status %d (%s)"
 msgstr "在请求访问令牌时应得到状态 200，但却得到了状态 %d (%s)"
 
-#: ../src/goabackend/goaoauth2provider.c:964
+#: ../src/goabackend/goaoauth2provider.c:888
 msgid "Authorization response: "
 msgstr "认证响应为："
 
-#: ../src/goabackend/goaoauth2provider.c:1034
+#: ../src/goabackend/goaoauth2provider.c:958
 #, c-format
 msgid "Authorization response: %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:1136
-#, c-format
-msgid ""
-"Paste authorization code obtained from the <a href=\"%s\">authorization "
-"page</a>:"
-msgstr "请粘贴从<a href=\"%s\">认证页面</a>èŽ·å¾—çš„è®¤è¯ä»£ç ï¼š"
-
-#: ../src/goabackend/goaoauth2provider.c:1150
-#: ../src/goabackend/goaoauthprovider.c:995
-#: ../src/goabackend/goatelepathyprovider.c:676
-msgid "_OK"
-msgstr "确定(_O)"
-
-#: ../src/goabackend/goaoauth2provider.c:1236
-#: ../src/goabackend/goaoauthprovider.c:1075
+#: ../src/goabackend/goaoauth2provider.c:1103
+#: ../src/goabackend/goaoauthprovider.c:939
 msgid "Error getting an Access Token: "
 msgstr "获取访问令牌出错："
 
-#: ../src/goabackend/goaoauth2provider.c:1251
-#: ../src/goabackend/goaoauthprovider.c:1088
+#: ../src/goabackend/goaoauth2provider.c:1118
+#: ../src/goabackend/goaoauthprovider.c:952
 msgid "Error getting identity: "
 msgstr "获身份信息出错："
 
-#: ../src/goabackend/goaoauth2provider.c:1463
-#: ../src/goabackend/goaoauthprovider.c:1394
+#: ../src/goabackend/goaoauth2provider.c:1332
+#: ../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:1622
+#: ../src/goabackend/goaoauth2provider.c:1491
 #, c-format
 msgid "Credentials do not contain access_token"
 msgstr "证书中不包含 access_token(访问令牌)"
 
-#: ../src/goabackend/goaoauth2provider.c:1661
-#: ../src/goabackend/goaoauthprovider.c:1622
+#: ../src/goabackend/goaoauth2provider.c:1530
+#: ../src/goabackend/goaoauthprovider.c:1488
 #, c-format
 msgid "Failed to refresh access token (%s, %d): "
 msgstr "刷新访问令牌(%s，%d)失败："
 
-#: ../src/goabackend/goaoauthprovider.c:612
+#: ../src/goabackend/goaoauthprovider.c:573
 #, c-format
 msgid "Missing access_token or access_token_secret headers in response"
 msgstr "响应中缺少 access_token 或 access_token_secret 头"
 
-#: ../src/goabackend/goaoauthprovider.c:914
+#: ../src/goabackend/goaoauthprovider.c:822
 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:947
+#: ../src/goabackend/goaoauthprovider.c:855
 #, c-format
 msgid ""
 "Expected status 200 for getting a Request Token, instead got status %d (%s)"
 msgstr "获取响应令牌时应得到状态 200，但却得到了状态 %d(%s)"
 
-#: ../src/goabackend/goaoauthprovider.c:964
+#: ../src/goabackend/goaoauthprovider.c:872
 #, c-format
 msgid "Missing request_token or request_token_secret headers in response"
 msgstr "响应中缺少 request_token 或 request_token_secret 头"
 
-#. Translators: The verb "Paste" is used when asking the user to paste a string from a web browser window
-#: ../src/goabackend/goaoauthprovider.c:981
-#, c-format
-msgid "Paste token obtained from the <a href=\"%s\">authorization page</a>:"
-msgstr "请粘贴从 <a href=\"%s\">认证页面</a> 获得的令牌："
-
-#: ../src/goabackend/goaoauthprovider.c:1578
+#: ../src/goabackend/goaoauthprovider.c:1444
 #, c-format
 msgid "Credentials do not contain access_token or access_token_secret"
 msgstr "证书中不含 access_token 或 access_token_secret"
 
-#: ../src/goabackend/goaowncloudprovider.c:87
+#: ../src/goabackend/goaowncloudprovider.c:82
 msgid "ownCloud"
 msgstr "ownCloud"
 
-#: ../src/goabackend/goaowncloudprovider.c:860
-#: ../src/goabackend/goaowncloudprovider.c:1041
+#: ../src/goabackend/goaowncloudprovider.c:851
+#: ../src/goabackend/goaowncloudprovider.c:1034
 msgid "Error connecting to ownCloud server"
 msgstr "连接 ownCloud 云服务器出错"
 
-#: ../src/goabackend/goaowncloudprovider.c:1121
+#: ../src/goabackend/goaowncloudprovider.c:1114
 msgid "_Files"
 msgstr "文件(_F)"
 
-#: ../src/goabackend/goapocketprovider.c:89
+#: ../src/goabackend/goapocketprovider.c:84
 msgid "Pocket"
 msgstr "Pocket"
 
 #. TODO: more specific
-#: ../src/goabackend/goapocketprovider.c:238
+#: ../src/goabackend/goapocketprovider.c:233
 #, c-format
 msgid "No username or access_token"
 msgstr "没有用户名或访问令牌"
 
-#: ../src/goabackend/goapocketprovider.c:430
+#: ../src/goabackend/goapocketprovider.c:423
 msgid "_Read Later"
 msgstr "稍后阅读(_R)"
 
-#: ../src/goabackend/goaprovider.c:689
+#: ../src/goabackend/goaprovider.c:682
 #, c-format
 msgid "ensure_credentials_sync is not implemented on type %s"
 msgstr "ensure_credentials_sync 未在 %s 类型上实现"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:178
+#: ../src/goabackend/goasmtpauth.c:175
 #, c-format
 msgid "TLS not available"
 msgstr "TLS 不可用"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:244
+#: ../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:254
+#: ../src/goabackend/goasmtpauth.c:251
 #, c-format
 msgid "Failed to parse email address"
 msgstr "æ— æ³•è§£æžç”µå­é‚®ç®±åœ°å€"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:266
+#: ../src/goabackend/goasmtpauth.c:263
 #, c-format
 msgid "Cannot do SMTP authentication without a domain"
 msgstr "æ²¡æœ‰åŸŸï¼Œæ— æ³•è¿›è¡Œ SMTP 身份认证"
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:304
+#: ../src/goabackend/goasmtpauth.c:301
 #, c-format
 msgid "Did not find smtp-password in credentials"
 msgstr "未能在证书中找到 smtp å¯†ç "
 
 #. TODO: more specific
-#: ../src/goabackend/goasmtpauth.c:315
+#: ../src/goabackend/goasmtpauth.c:312
 #, c-format
 msgid "Cannot do SMTP authentication without a password"
 msgstr "æ²¡æœ‰å¯†ç ï¼Œæ— æ³•è¿›è¡Œ SMTP 身份认证"
 
-#: ../src/goabackend/goasmtpauth.c:667
+#: ../src/goabackend/goasmtpauth.c:674
 #, c-format
 msgid "Unknown authentication mechanism"
 msgstr "未知的身份认证机制"
 
-#: ../src/goabackend/goatelepathyprovider.c:184
+#: ../src/goabackend/goatelepathyprovider.c:180
 #, c-format
 msgid "Telepathy chat account not found"
 msgstr "未找到 Telepathy 聊天帐号"
 
-#: ../src/goabackend/goatelepathyprovider.c:393
+#: ../src/goabackend/goatelepathyprovider.c:380
 #, c-format
 msgid "Failed to initialize a GOA client"
 msgstr "æ— æ³•åˆå§‹åŒ– GOA 客户端"
 
-#: ../src/goabackend/goatelepathyprovider.c:436
+#: ../src/goabackend/goatelepathyprovider.c:420
 #, c-format
 msgid "Failed to create a user interface for %s"
 msgstr "æ— æ³•ä¸º %s 创建用户界面"
 
-#: ../src/goabackend/goatelepathyprovider.c:563
+#: ../src/goabackend/goatelepathyprovider.c:535
 msgid "Connection Settings"
 msgstr "连接设置"
 
-#: ../src/goabackend/goatelepathyprovider.c:672
+#: ../src/goabackend/goatelepathyprovider.c:644
 msgid "Personal Details"
 msgstr "个人详情"
 
-#: ../src/goabackend/goatelepathyprovider.c:881
+#: ../src/goabackend/goatelepathyprovider.c:650
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: ../src/goabackend/goatelepathyprovider.c:854
 msgid "Cannot save the connection parameters"
 msgstr "æ— æ³•ä¿å­˜è¿žæŽ¥å‚æ•°"
 
-#: ../src/goabackend/goatelepathyprovider.c:893
+#: ../src/goabackend/goatelepathyprovider.c:866
 msgid "Cannot save your personal information on the server"
 msgstr "æ— æ³•åœ¨æœåŠ¡å™¨ä¸Šä¿å­˜æ‚¨çš„ä¸ªäººä¿¡æ¯"
 
 #. Connection Settings button
-#: ../src/goabackend/goatelepathyprovider.c:924
+#: ../src/goabackend/goatelepathyprovider.c:897
 msgid "_Connection Settings"
 msgstr "连接设置(_C)"
 
 #. Edit Personal Information button
-#: ../src/goabackend/goatelepathyprovider.c:928
+#: ../src/goabackend/goatelepathyprovider.c:901
 msgid "_Personal Details"
 msgstr "个人详情(_P)"
 
-#: ../src/goabackend/goatwitterprovider.c:81
-msgid "Twitter"
-msgstr "Twitter"
-
-#: ../src/goabackend/goautils.c:120
+#: ../src/goabackend/goautils.c:114
 #, c-format
 msgid "A %s account already exists for %s"
 msgstr "已存在一个对应 %2$s 的 %1$s 帐号"
 
 #. Translators: the %s is the name of the provider. eg., Google.
-#: ../src/goabackend/goautils.c:142
+#: ../src/goabackend/goautils.c:136
 #, c-format
 msgid "%s account"
 msgstr "%s 账号"
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:186
+#: ../src/goabackend/goautils.c:180
 msgid "Failed to delete credentials from the keyring"
 msgstr "ä»Žå¯†é’¥çŽ¯ä¸­åˆ é™¤è¯ä¹¦å¤±è´¥ï¼š"
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:238
+#: ../src/goabackend/goautils.c:232
 msgid "Failed to retrieve credentials from the keyring"
 msgstr "从密钥环中取出证书失败："
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:248
+#: ../src/goabackend/goautils.c:242
 msgid "No credentials found in the keyring"
 msgstr "在密钥环中未找到证书"
 
-#: ../src/goabackend/goautils.c:261
+#: ../src/goabackend/goautils.c:255
 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:304
+#: ../src/goabackend/goautils.c:298
 #, c-format
 msgid "GOA %s credentials for identity %s"
 msgstr "实体 %2$s 的 GOA %1$s 证书"
 
 #. TODO: more specific
-#: ../src/goabackend/goautils.c:321
+#: ../src/goabackend/goautils.c:315
 msgid "Failed to store credentials in the keyring"
 msgstr "在密钥环中存储证书失败"
 
-#: ../src/goabackend/goautils.c:542
+#: ../src/goabackend/goautils.c:536
 msgid "The signing certificate authority is not known."
 msgstr "证书颁发机构未知。"
 
-#: ../src/goabackend/goautils.c:546
+#: ../src/goabackend/goautils.c:540
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "证书与所取自站点的预期身份不符。"
 
-#: ../src/goabackend/goautils.c:551
+#: ../src/goabackend/goautils.c:545
 msgid "The certificate’s activation time is still in the future."
 msgstr "证书尚未激活。"
 
-#: ../src/goabackend/goautils.c:555
+#: ../src/goabackend/goautils.c:549
 msgid "The certificate has expired."
 msgstr "证书已过期。"
 
-#: ../src/goabackend/goautils.c:559
+#: ../src/goabackend/goautils.c:553
 msgid "The certificate has been revoked."
 msgstr "证书已被废除。"
 
-#: ../src/goabackend/goautils.c:563
+#: ../src/goabackend/goautils.c:557
 msgid "The certificate’s algorithm is considered insecure."
 msgstr "证书的算法不安全。"
 
-#: ../src/goabackend/goautils.c:567
+#: ../src/goabackend/goautils.c:561
 msgid "Invalid certificate."
 msgstr "æ— æ•ˆè¯ä¹¦ã€‚"
 
 #. translators: %s here is the address of the web page
-#: ../src/goabackend/goawebview.c:74
+#: ../src/goabackend/goawebview.c:70
 #, c-format
 msgid "Loading “%s”…"
 msgstr "正在载入“%s”…"
 
-#: ../src/goabackend/goawindowsliveprovider.c:84
+#: ../src/goabackend/goawindowsliveprovider.c:78
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/goabackend/goayahooprovider.c:81
+#: ../src/goabackend/goayahooprovider.c:76
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/goabackend/goayahooprovider.c:255
+#: ../src/goabackend/goayahooprovider.c:250
 #, c-format
 msgid "Expected status 200 when requesting name, instead got status %d (%s)"
 msgstr "在获取姓名时应得到状态 200，但却得到了状态 %d (%s)"
 
-#: ../src/goaidentity/goaalarm.c:216
-msgid "Time"
-msgstr "时间"
-
-#: ../src/goaidentity/goaalarm.c:217
-msgid "Time to fire"
-msgstr "解聘时间"
-
-#: ../src/goaidentity/goaidentityservice.c:379
+#: ../src/goaidentity/goaidentityservice.c:370
 msgid "initial secret passed before secret key exchange"
 msgstr "äº¤æ¢ç§é’¥ä¹‹å‰åˆå§‹åŒ–ç§é’¥å¯†ç "
 
-#: ../src/goaidentity/goaidentityservice.c:571
+#: ../src/goaidentity/goaidentityservice.c:562
 msgid "Initial secret key is invalid"
 msgstr "初始私钥不合法"
 
-#: ../src/goaidentity/goaidentityservice.c:1119
+#: ../src/goaidentity/goaidentityservice.c:1111
 #, c-format
 msgid "The network realm %s needs some information to sign you in."
 msgstr "网络 realm %s 接纳您之前需要一些信息。"
 
-#: ../src/goaidentity/goakerberosidentity.c:264
-#: ../src/goaidentity/goakerberosidentity.c:273
-#: ../src/goaidentity/goakerberosidentity.c:601
+#: ../src/goaidentity/goakerberosidentity.c:252
+#: ../src/goaidentity/goakerberosidentity.c:261
+#: ../src/goaidentity/goakerberosidentity.c:588
 msgid "Could not find identity in credential cache: %k"
 msgstr "在凭证缓存器 %k 中找不到身份"
 
-#: ../src/goaidentity/goakerberosidentity.c:614
+#: ../src/goaidentity/goakerberosidentity.c:601
 msgid "Could not find identity credentials in cache: %k"
 msgstr "在缓存 %k ä¸­æ— æ³•æ‰¾åˆ°èº«ä»½å‡­è¯"
 
-#: ../src/goaidentity/goakerberosidentity.c:652
+#: ../src/goaidentity/goakerberosidentity.c:641
 msgid "Could not sift through identity credentials in cache: %k"
 msgstr "身份凭证在缓存 %k ä¸­æ— æ³•é€šè¿‡å®¡æŸ¥"
 
-#: ../src/goaidentity/goakerberosidentity.c:669
+#: ../src/goaidentity/goakerberosidentity.c:659
 msgid "Could not finish up sifting through identity credentials in cache: %k"
 msgstr "在缓存 %k ä¸­æ— æ³•å®Œæˆèº«ä»½å‡­è¯çš„å®¡æŸ¥å·¥ä½œ"
 
-#: ../src/goaidentity/goakerberosidentity.c:953
+#: ../src/goaidentity/goakerberosidentity.c:949
 #, c-format
 msgid "No associated identification found"
 msgstr "æ‰¾ä¸åˆ°ç›¸å…³çš„èº«ä»½æ ‡è¯†"
 
-#: ../src/goaidentity/goakerberosidentity.c:1034
+#: ../src/goaidentity/goakerberosidentity.c:1030
 msgid "Could not create credential cache: %k"
 msgstr "æ— æ³•åˆ›å»ºå‡­è¯ç¼“å­˜ï¼š%k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1068
+#: ../src/goaidentity/goakerberosidentity.c:1064
 msgid "Could not initialize credentials cache: %k"
 msgstr "æ— æ³•åˆå§‹åŒ–å‡­è¯ç¼“å­˜ï¼š%k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1085
+#: ../src/goaidentity/goakerberosidentity.c:1081
 msgid "Could not store new credentials in credentials cache: %k"
 msgstr "在凭证缓存 %k ä¸­æ— æ³•å­˜å‚¨æ–°çš„å‡­è¯"
 
-#: ../src/goaidentity/goakerberosidentity.c:1360
+#: ../src/goaidentity/goakerberosidentity.c:1356
 #, c-format
 msgid "Could not renew identity: Not signed in"
 msgstr "æ— æ³•é‡å»ºèº«ä»½ï¼šæ²¡æœ‰ç™»å½•"
 
-#: ../src/goaidentity/goakerberosidentity.c:1372
+#: ../src/goaidentity/goakerberosidentity.c:1368
 msgid "Could not renew identity: %k"
 msgstr "æ— æ³•é‡å»ºèº«ä»½ï¼š%k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1389
+#: ../src/goaidentity/goakerberosidentity.c:1385
 msgid "Could not get new credentials to renew identity %s: %k"
 msgstr "æ— æ³•èŽ·å–æ–°è¯ä¹¦ä»¥é‡å»ºèº«ä»½ %s: %k"
 
-#: ../src/goaidentity/goakerberosidentity.c:1429
+#: ../src/goaidentity/goakerberosidentity.c:1427
 msgid "Could not erase identity: %k"
 msgstr "æ— æ³•åˆ é™¤èº«ä»½ï¼š%k"
 
-#: ../src/goaidentity/goakerberosidentitymanager.c:750
+#: ../src/goaidentity/goakerberosidentitymanager.c:745
 msgid "Could not find identity"
 msgstr "æ— æ³•æ‰¾åˆ°èº«ä»½"
 
-#: ../src/goaidentity/goakerberosidentitymanager.c:846
+#: ../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(自动发现) å…ƒç´ "