[balsa] Update Chinese (China) translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Update Chinese (China) translation
- Date: Wed, 9 Feb 2022 02:47:56 +0000 (UTC)
commit 787a732ef50c81e8f905f08cb9fdb0efc25262e6
Author: Boyuan Yang <073plan gmail com>
Date: Wed Feb 9 02:47:53 2022 +0000
Update Chinese (China) translation
po/zh_CN.po | 2039 +++++++++++++++++++++++++++++++----------------------------
1 file changed, 1086 insertions(+), 953 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e30d293e8..a85f6ea1f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: balsa master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/balsa/issues\n";
-"POT-Creation-Date: 2020-07-09 16:48+0000\n"
-"PO-Revision-Date: 2020-09-01 17:44-0400\n"
+"POT-Creation-Date: 2022-01-30 12:02+0000\n"
+"PO-Revision-Date: 2022-02-08 21:47-0500\n"
"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"Language: zh_CN\n"
@@ -18,13 +18,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1;plural=0;\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.3\n"
#: ../balsa.appdata.xml.in.h:1
msgid ""
"Balsa is a graphical mail client. While it is in active development, Balsa "
"has many features such as:"
msgstr ""
+"Balsa 是一个图形化邮件客户端。它正处于活跃开发中，且提供了许多功能，例如："
#: ../balsa.appdata.xml.in.h:2
msgid "IMAP and POP3 support;"
@@ -44,7 +45,7 @@ msgstr ""
#: ../balsa.appdata.xml.in.h:6
msgid "automatic mail checking;"
-msgstr ""
+msgstr "自动邮件检查；"
#: ../balsa.appdata.xml.in.h:7
msgid "mail printing;"
@@ -52,7 +53,7 @@ msgstr "邮件打印："
#: ../balsa.appdata.xml.in.h:8
msgid "inline attachment viewing;"
-msgstr ""
+msgstr "行内附件浏览；"
#: ../balsa.appdata.xml.in.h:9
msgid "and the proverbial much, much more."
@@ -107,8 +108,15 @@ msgstr "无法添加重复的条目"
msgid "Cannot find address in address book"
msgstr "在地址簿中找不到地址"
-#: ../libbalsa/address-book.c:308 ../src/main-window.c:2969
-#: ../src/main-window.c:4092 ../src/sendmsg-window.c:3895
+#: ../libbalsa/address-book.c:308 ../libbalsa/html.c:95 ../src/ab-window.c:439
+#: ../src/balsa-message.c:1820 ../src/balsa-mime-widget.c:223
+#: ../src/balsa-mime-widget-callbacks.c:53
+#: ../src/balsa-mime-widget-callbacks.c:152
+#: ../src/balsa-mime-widget-crypto.c:77 ../src/balsa-mime-widget-crypto.c:83
+#: ../src/balsa-mime-widget-message.c:363 ../src/balsa-mime-widget-text.c:255
+#: ../src/main-window.c:2986 ../src/main-window.c:4142
+#: ../src/sendmsg-window.c:1403 ../src/sendmsg-window.c:2938
+#: ../src/sendmsg-window.c:3891
msgid "Unknown error"
msgstr "未知错误"
@@ -119,10 +127,10 @@ msgstr "无标识"
# src/filter-edit-dialog.c:101
#: ../libbalsa/address-book-extern.c:191 ../libbalsa/address-book-extern.c:349
-#: ../libbalsa/address-book-ldap.c:550 ../libbalsa/address-book-ldif.c:189
+#: ../libbalsa/address-book-ldap.c:552 ../libbalsa/address-book-ldif.c:189
#: ../libbalsa/address-book-ldif.c:227 ../libbalsa/address-book-ldif.c:270
#: ../libbalsa/address-book-ldif.c:274 ../libbalsa/address-book-vcard.c:142
-#: ../libbalsa/address-book-vcard.c:249 ../libbalsa/address.c:409
+#: ../libbalsa/address-book-vcard.c:249 ../libbalsa/address.c:392
#: ../libbalsa/rfc6350.c:112
msgid "No-Name"
msgstr "没有名字"
@@ -141,158 +149,178 @@ msgstr "LDAP 服务器“%s”不支持 LDAPv3，交互可能失败。"
msgid "TLS requested but not compiled in"
msgstr "需要 TLS，但程序编译时未加入"
-#: ../libbalsa/address-book-ldap.c:666
+#: ../libbalsa/address-book-ldap.c:669
msgid "Undefined location of user address book"
msgstr "用户地址簿位置没有定义"
-#: ../libbalsa/address-book-ldap.c:1097
+#: ../libbalsa/address-book-ldap.c:1100
#, c-format
msgid "LDAP server %s down, next attempt will try to reconnect."
-msgstr ""
+msgstr "LDAP 服务器 %s 已下线，下一次尝试将尝试重新连接。"
# src/main-window.c:182
#: ../libbalsa/address-book-osmo.c:155
-#, fuzzy, c-format
-#| msgid "Removing duplicates failed: %s"
+#, c-format
msgid "Reading Osmo contacts failed: %s"
-msgstr "移除重复邮件失败：%s"
+msgstr "读取 Osmo 联系人失败：%s"
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/address.c:974
+#: ../libbalsa/address.c:955
msgid "D_isplayed Name:"
msgstr "显示名(_I)："
# src/filter-edit-dialog.c:456
-#: ../libbalsa/address.c:975
+#: ../libbalsa/address.c:956
msgid "_First Name:"
msgstr "名(_F)："
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/address.c:976
+#: ../libbalsa/address.c:957
msgid "_Last Name:"
msgstr "姓(_L)："
# src/filter-edit-dialog.c:101
-#: ../libbalsa/address.c:977
+#: ../libbalsa/address.c:958
msgid "_Nickname:"
msgstr "昵称(_N)："
-#: ../libbalsa/address.c:978
+#: ../libbalsa/address.c:959
msgid "O_rganization:"
msgstr "组织(_R)："
# src/balsa-init.c:261 src/pref-manager.c:377
-#: ../libbalsa/address.c:979
+#: ../libbalsa/address.c:960
msgid "_Email Address:"
msgstr "电子邮件地址(_E)："
# src/filter-edit-dialog.c:380 src/mailbox-conf.c:281 src/mailbox-conf.c:904
# src/pref-manager.c:461
-#: ../libbalsa/address.c:1000 ../src/filter-edit-callbacks.c:1068
+#: ../libbalsa/address.c:981 ../src/filter-edit-callbacks.c:1068
msgid "A_dd"
msgstr "添加(_D)"
# src/balsa-message.c:526 src/filter-edit-dialog.c:291
# src/sendmsg-window.c:315
-#: ../libbalsa/address-view.c:156 ../src/balsa-mime-widget-message.c:757
-#: ../src/balsa-print-object-header.c:146 ../src/sendmsg-window.c:682
-#: ../src/sendmsg-window.c:3590
+#: ../libbalsa/address-view.c:157 ../src/balsa-mime-widget-message.c:757
+#: ../src/balsa-print-object-header.c:146 ../src/sendmsg-window.c:675
+#: ../src/sendmsg-window.c:3586
msgid "To:"
msgstr "收件人："
# src/balsa-message.c:534
-#: ../libbalsa/address-view.c:157 ../src/balsa-mime-widget-message.c:759
-#: ../src/balsa-print-object-header.c:148 ../src/sendmsg-window.c:682
-#: ../src/sendmsg-window.c:3598
+#: ../libbalsa/address-view.c:158 ../src/balsa-mime-widget-message.c:759
+#: ../src/balsa-print-object-header.c:148 ../src/sendmsg-window.c:675
+#: ../src/sendmsg-window.c:3594
msgid "CC:"
msgstr "抄送："
-#: ../libbalsa/address-view.c:158 ../src/balsa-mime-widget-message.c:761
-#: ../src/balsa-print-object-header.c:150 ../src/sendmsg-window.c:682
+#: ../libbalsa/address-view.c:159 ../src/balsa-mime-widget-message.c:761
+#: ../src/balsa-print-object-header.c:150 ../src/sendmsg-window.c:675
msgid "BCC:"
msgstr "密送："
# src/sendmsg-window.c:513
-#: ../libbalsa/address-view.c:159
+#: ../libbalsa/address-view.c:160
msgid "Reply To:"
msgstr "回复给："
-#: ../libbalsa/autocrypt.c:181
+#: ../libbalsa/autocrypt.c:193
#, c-format
msgid "cannot initialise Autocrypt database “%s”: %s"
-msgstr ""
+msgstr "无法初始化 Autocrypt 数据库“%s”：%s"
-#: ../libbalsa/autocrypt.c:307
+#: ../libbalsa/autocrypt.c:319
#, c-format
msgid ""
"No usable private key for “%s” found! Please create a key or disable "
"Autocrypt."
msgstr ""
-#: ../libbalsa/autocrypt.c:374 ../libbalsa/autocrypt.c:382
-#: ../libbalsa/autocrypt.c:651 ../libbalsa/autocrypt.c:657
+#: ../libbalsa/autocrypt.c:386 ../libbalsa/autocrypt.c:394
+#: ../libbalsa/autocrypt.c:677 ../libbalsa/autocrypt.c:683
#, fuzzy, c-format
#| msgid "Error reading file %s: %s"
msgid "error reading Autocrypt data for “%s”: %s"
msgstr "读取 %s 文件出错：%s"
-#: ../libbalsa/autocrypt.c:435
+#: ../libbalsa/autocrypt.c:447
msgid "Autocrypt database"
msgstr ""
# src/main-window.c:161
-#: ../libbalsa/autocrypt.c:436 ../libbalsa/html.c:424
-#: ../libbalsa/identity.c:1658 ../libbalsa/libbalsa-gpgme-widgets.c:765
-#: ../src/ab-window.c:148 ../src/folder-conf.c:337 ../src/mailbox-node.c:1052
-#: ../src/main-window.c:3784 ../src/toolbar-prefs.c:130
+#: ../libbalsa/autocrypt.c:448 ../libbalsa/html.c:447
+#: ../libbalsa/html-pref-db.c:139 ../libbalsa/identity.c:1658
+#: ../libbalsa/libbalsa-gpgme-widgets.c:765 ../src/ab-window.c:148
+#: ../src/folder-conf.c:337 ../src/mailbox-node.c:1048
+#: ../src/main-window.c:3834 ../src/toolbar-prefs.c:130
#: ../ui/main-window.ui.h:65 ../ui/message-window.ui.h:4
#: ../ui/sendmsg-window.ui.h:12 ../ui/source-viewer.ui.h:2
msgid "_Close"
msgstr "关闭(_C)"
-#: ../libbalsa/autocrypt.c:442 ../libbalsa/libbalsa-gpgme-cb.c:223
-msgid "Double-click key to show details"
-msgstr ""
-
# src/mailbox-conf.c:939
-#: ../libbalsa/autocrypt.c:497 ../src/balsa-mblist.c:326
+#: ../libbalsa/autocrypt.c:517 ../src/balsa-mblist.c:326
msgid "Mailbox"
msgstr "邮件箱"
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/autocrypt.c:502
+#: ../libbalsa/autocrypt.c:523
#, fuzzy
#| msgid "Last Name"
msgid "Last seen"
msgstr "姓"
# src/main-window.c:139
-#: ../libbalsa/autocrypt.c:507
+#: ../libbalsa/autocrypt.c:529
#, fuzzy
#| msgid "Cannot create message"
msgid "Last Autocrypt message"
msgstr "无法创建邮件"
-#: ../libbalsa/autocrypt.c:512
+#: ../libbalsa/autocrypt.c:535
#, fuzzy
#| msgid "Prefere_nces"
msgid "Prefer encryption"
msgstr "参考(_N)"
-#: ../libbalsa/autocrypt.c:745 ../libbalsa/autocrypt.c:765
+#: ../libbalsa/autocrypt.c:785 ../libbalsa/autocrypt.c:805
#, fuzzy, c-format
#| msgid "part %s: %s (file %s)"
msgid "update user “%s” failed: %s"
msgstr "%s 区段：%s (%s 文件)"
-#: ../libbalsa/autocrypt.c:745
+#: ../libbalsa/autocrypt.c:785
#, fuzzy, c-format
#| msgid "Saving sent message to %s failed: %s"
msgid "insert user “%s” failed: %s"
msgstr "将已发送邮件保存到 %s 失败：%s"
+#: ../libbalsa/autocrypt.c:881
+msgid "_Show details…"
+msgstr "显示详情(_S)…"
+
+# src/main-window.c:133 src/main-window.c:168
+#: ../libbalsa/autocrypt.c:884 ../libbalsa/html-pref-db.c:450
+#: ../src/balsa-index.c:2000 ../src/mailbox-node.c:1040
+#: ../src/mailbox-node.c:1056 ../src/pref-manager.c:2002
+#: ../src/pref-manager.c:2087 ../src/pref-manager.c:2810 ../ui/ab-main.ui.h:11
+#: ../ui/main-window.ui.h:61
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: ../libbalsa/autocrypt.c:934
+#, fuzzy, c-format
+#| msgid "The path \"%s\" does not lead to a mailbox."
+msgid "The database entry for “%s” does not contain a key."
+msgstr "“%s”路径没有指向一个邮箱。"
+
+#: ../libbalsa/autocrypt.c:971
+#, c-format
+msgid "Delete the Autocrypt key for “%s” from the database?"
+msgstr ""
+
# src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../libbalsa/body.c:119 ../libbalsa/mailbox_local.c:1878
+#: ../libbalsa/body.c:119 ../libbalsa/mailbox_local.c:1879
#: ../libbalsa/message.c:941 ../libbalsa/message.c:958
msgid "(No subject)"
msgstr "(无主题)"
@@ -366,24 +394,24 @@ msgstr "邮箱 %s 的过滤规则 %s 无效"
# src/balsa-message.c:526 src/filter-edit-dialog.c:291
# src/sendmsg-window.c:315
#. FIXME: this is hack!
-#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1012
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1129
msgid "To"
msgstr "收件人"
# src/balsa-index.c:231
-#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:380
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:410
msgid "From"
msgstr "发件人"
# src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:396
-#: ../src/pref-manager.c:217
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:427
+#: ../src/pref-manager.c:218
msgid "Subject"
msgstr "主题"
#: ../libbalsa/filter-funcs.c:384
msgid "CC"
-msgstr ""
+msgstr "抄送"
# src/filter-edit-dialog.c:279
#: ../libbalsa/filter-funcs.c:385
@@ -477,10 +505,9 @@ msgstr "PGP 签名："
# src/pref-manager.c:397
#: ../libbalsa/gmime-gpgme-signature.c:188
-#, fuzzy, c-format
-#| msgid "PGP signature: "
+#, c-format
msgid " signature: %s"
-msgstr "PGP 签名："
+msgstr "签名：%s"
# src/main-window.c:182
#: ../libbalsa/gmime-gpgme-signature.c:192
@@ -514,10 +541,8 @@ msgstr ""
"密钥指纹：%s"
#: ../libbalsa/gmime-gpgme-signature.c:237 ../libbalsa/imap/imap-handle.c:46
-#: ../libbalsa/libbalsa-gpgme.c:190 ../libbalsa/rfc2445.c:415
-#: ../libbalsa/rfc2445.c:444 ../libbalsa/rfc2445.c:467
-#: ../libbalsa/rfc2445.c:1120 ../libbalsa/rfc3156.c:689
-#: ../src/folder-conf.c:411 ../src/sendmsg-window.c:5316
+#: ../libbalsa/libbalsa-gpgme.c:190 ../libbalsa/rfc3156.c:689
+#: ../src/folder-conf.c:411 ../src/sendmsg-window.c:5312
msgid "unknown"
msgstr "未知"
@@ -567,53 +592,96 @@ msgid ""
"Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
msgstr ""
-#: ../libbalsa/html.c:76
+#: ../libbalsa/html.c:94
#, c-format
msgid "Could not get an HTML part: %s"
msgstr " 无法获取 HTML 区段：%s "
-#: ../libbalsa/html.c:134
+#: ../libbalsa/html.c:152
#, fuzzy, c-format
#| msgid "Could not get an HTML part: %s"
msgid "Could not convert HTML part to text: %s"
msgstr " 无法获取 HTML 区段：%s "
-#: ../libbalsa/html.c:405
+#: ../libbalsa/html.c:440
#, fuzzy
#| msgid ""
#| "This message part contains images from a remote server. To protect your "
#| "privacy, Balsa has not downloaded them. You may choose to download them "
#| "if you trust the server."
msgid ""
-"This message part contains images from a remote server.\n"
-"To protect your privacy, Balsa has not downloaded them.\n"
-"You may choose to download them if you trust the server."
+"This message part references content on one or more external servers. To "
+"protect your privacy, Balsa has not downloaded it. You may choose to "
+"download it if you trust the sender of the message."
msgstr ""
"这个邮件块区段有来自外部服务器的图像。为了保护您的隐私，Balsa 没有下载它们。"
"如果您信任该服务器，可以选择下载它们。"
-#: ../libbalsa/html.c:413
+#: ../libbalsa/html.c:445
+msgid "_Download external content"
+msgstr ""
+
+#: ../libbalsa/html.c:690
+#, c-format
msgid ""
-"This message part contains images from a remote server. To protect your "
-"privacy, Balsa has not downloaded them. You may choose to download them if "
-"you trust the server."
+"Balsa's external HTML resources filter web extension is not available in the "
+"folder “%s”, falling back to simplified image filtering. Please check your "
+"installation. "
msgstr ""
-"这个邮件块区段有来自外部服务器的图像。为了保护您的隐私，Balsa 没有下载它们。"
-"如果您信任该服务器，可以选择下载它们。"
-#: ../libbalsa/html.c:422
-msgid "_Download images"
-msgstr "下载图像(_D)"
+#: ../libbalsa/html-pref-db.c:138
+#, fuzzy
+#| msgid "Prefere_nces"
+msgid "HTML preferences"
+msgstr "参考(_N)"
+
+# src/sendmsg-window.c:88
+#: ../libbalsa/html-pref-db.c:188 ../src/pref-manager.c:221
+msgid "Sender"
+msgstr "发信人"
+
+#: ../libbalsa/html-pref-db.c:196
+msgid "Prefer HTML"
+msgstr "偏好 HTML"
+
+#: ../libbalsa/html-pref-db.c:204
+msgid "Auto-load external content"
+msgstr ""
+
+#: ../libbalsa/html-pref-db.c:270
+#, c-format
+msgid "Cannot initialise HTML preferences database “%s”: %s"
+msgstr ""
+
+# src/main-window.c:139
+#: ../libbalsa/html-pref-db.c:316
+#, fuzzy, c-format
+#| msgid "Cannot read %s: %s"
+msgid "Cannot read HTML preferences for “%s”: %s"
+msgstr "无法读取 %s：%s"
+
+# src/main-window.c:139
+#: ../libbalsa/html-pref-db.c:369
+#, fuzzy, c-format
+#| msgid "Cannot read %s: %s"
+msgid "Cannot save HTML preferences for “%s”: %s"
+msgstr "无法读取 %s：%s"
+
+#: ../libbalsa/html-pref-db.c:477
+#, fuzzy, c-format
+#| msgid "Cannot add duplicate entry"
+msgid "Cannot delete database entry: %s"
+msgstr "无法添加重复的条目"
#. should "re" be localized ?
-#: ../libbalsa/identity.c:109 ../libbalsa/mailbox_local.c:2001
-#: ../libbalsa/mailbox_local.c:2003 ../src/sendmsg-window.c:3843
-#: ../src/sendmsg-window.c:3845
+#: ../libbalsa/identity.c:109 ../libbalsa/mailbox_local.c:2002
+#: ../libbalsa/mailbox_local.c:2004 ../src/sendmsg-window.c:3839
+#: ../src/sendmsg-window.c:3841
msgid "Re:"
msgstr "回复："
-#: ../libbalsa/identity.c:110 ../src/sendmsg-window.c:3782
-#: ../src/sendmsg-window.c:3783 ../src/sendmsg-window.c:3784
+#: ../libbalsa/identity.c:110 ../src/sendmsg-window.c:3778
+#: ../src/sendmsg-window.c:3779 ../src/sendmsg-window.c:3780
msgid "Fwd:"
msgstr "转发："
@@ -649,10 +717,10 @@ msgstr "“%s”中的签名不是 UTF-8 文本。"
# src/sendmsg-window.c:192
#: ../libbalsa/identity.c:368 ../libbalsa/libbalsa-gpgme-cb.c:184
#: ../libbalsa/libbalsa-gpgme-cb.c:363 ../libbalsa/smtp-server.c:327
-#: ../src/ab-main.c:850 ../src/ab-window.c:141 ../src/address-book-config.c:240
+#: ../src/ab-main.c:849 ../src/ab-window.c:141 ../src/address-book-config.c:240
#: ../src/address-book-config.c:346 ../src/address-book-config.c:392
-#: ../src/balsa-app.c:94 ../src/balsa-app.c:163 ../src/balsa-index.c:2674
-#: ../src/balsa-mblist.c:1890 ../src/balsa-message.c:1741
+#: ../src/balsa-app.c:94 ../src/balsa-app.c:163 ../src/balsa-index.c:2793
+#: ../src/balsa-mblist.c:1890 ../src/balsa-message.c:1737
#: ../src/balsa-mime-widget-callbacks.c:85 ../src/filter-edit-callbacks.c:1238
#: ../src/filter-edit-dialog.c:404 ../src/filter-edit-dialog.c:574
#: ../src/filter-export-dialog.c:80 ../src/filter-run-dialog.c:300
@@ -660,10 +728,10 @@ msgstr "“%s”中的签名不是 UTF-8 文本。"
#: ../src/folder-conf.c:1090 ../src/mailbox-conf.c:207
#: ../src/mailbox-conf.c:229 ../src/mailbox-conf.c:245
#: ../src/mailbox-conf.c:733 ../src/mailbox-conf.c:790
-#: ../src/pref-manager.c:3260 ../src/sendmsg-window.c:494
-#: ../src/sendmsg-window.c:1505 ../src/sendmsg-window.c:1964
-#: ../src/sendmsg-window.c:3348 ../src/sendmsg-window.c:4784
-#: ../src/sendmsg-window.c:5085 ../src/sendmsg-window.c:5171
+#: ../src/pref-manager.c:3304 ../src/sendmsg-window.c:494
+#: ../src/sendmsg-window.c:1498 ../src/sendmsg-window.c:1960
+#: ../src/sendmsg-window.c:3344 ../src/sendmsg-window.c:4780
+#: ../src/sendmsg-window.c:5081 ../src/sendmsg-window.c:5167
#: ../src/spell-check.c:395 ../src/store-address.c:208
msgid "_Cancel"
msgstr "取消(_C)"
@@ -671,13 +739,13 @@ msgstr "取消(_C)"
#: ../libbalsa/identity.c:369 ../libbalsa/libbalsa-gpgme-cb.c:183
#: ../libbalsa/libbalsa-gpgme-cb.c:362 ../libbalsa/smtp-server.c:326
#: ../src/ab-window.c:140 ../src/balsa-app.c:95 ../src/balsa-app.c:162
-#: ../src/balsa-message.c:1742 ../src/balsa-mime-widget-callbacks.c:86
+#: ../src/balsa-message.c:1738 ../src/balsa-mime-widget-callbacks.c:86
#: ../src/filter-edit-callbacks.c:1237 ../src/filter-edit-dialog.c:573
#: ../src/filter-export-dialog.c:79 ../src/filter-run-dialog.c:299
-#: ../src/folder-conf.c:344 ../src/main-window.c:3876
-#: ../src/pref-manager.c:3258 ../src/sendmsg-window.c:1504
-#: ../src/sendmsg-window.c:1965 ../src/sendmsg-window.c:3347
-#: ../src/sendmsg-window.c:4785 ../src/store-address.c:209
+#: ../src/folder-conf.c:344 ../src/main-window.c:3926
+#: ../src/pref-manager.c:3302 ../src/sendmsg-window.c:1497
+#: ../src/sendmsg-window.c:1961 ../src/sendmsg-window.c:3343
+#: ../src/sendmsg-window.c:4781 ../src/store-address.c:209
msgid "_OK"
msgstr "确定(_O)"
@@ -875,7 +943,7 @@ msgid "Face header file %s contains binary data."
msgstr "Face 信头文件 %s 包含二进制数据。"
#. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1186 ../src/balsa-message.c:1568
+#: ../libbalsa/identity.c:1186 ../src/balsa-message.c:1564
#, c-format
msgid "Error loading Face: %s"
msgstr "载入 Face 出错：%s"
@@ -908,8 +976,8 @@ msgstr "管理身份"
#: ../src/address-book-config.c:390 ../src/filter-edit-callbacks.c:1239
#: ../src/filter-edit-dialog.c:575 ../src/filter-export-dialog.c:81
#: ../src/filter-run-dialog.c:301 ../src/folder-conf.c:470
-#: ../src/folder-conf.c:843 ../src/main-window.c:3783
-#: ../src/pref-manager.c:3261 ../src/toolbar-prefs.c:131 ../ui/ab-main.ui.h:16
+#: ../src/folder-conf.c:843 ../src/main-window.c:3833
+#: ../src/pref-manager.c:3305 ../src/toolbar-prefs.c:131 ../ui/ab-main.ui.h:16
#: ../ui/main-window.ui.h:89
msgid "_Help"
msgstr "帮助(_H)"
@@ -924,7 +992,7 @@ msgid "_New"
msgstr "新建(_N)"
# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../libbalsa/identity.c:1657 ../src/ab-main.c:845
+#: ../libbalsa/identity.c:1657 ../src/ab-main.c:844
#: ../src/filter-edit-callbacks.c:1072 ../src/filter-edit-dialog.c:320
msgid "_Remove"
msgstr "移除(_R)"
@@ -958,8 +1026,8 @@ msgstr "GnuPG OpenPGP 模式"
msgid "GpgSM S/MIME mode"
msgstr "GpgSM S/MIME 模式"
-#: ../libbalsa/imap/auth-cram.c:47 ../libbalsa/imap/imap-auth.c:90
-#: ../libbalsa/imap/imap-auth.c:141
+#: ../libbalsa/imap/auth-cram.c:47 ../libbalsa/imap/imap-auth.c:91
+#: ../libbalsa/imap/imap-auth.c:142
#, fuzzy
#| msgid "SASL authentication failed."
msgid "Authentication cancelled"
@@ -977,37 +1045,37 @@ msgstr "匿名身份验证失败。"
msgid "GSSAPI authentication failed: %s"
msgstr "GSSAPI 身份验证失败。"
-#: ../libbalsa/imap/imap-auth.c:71
+#: ../libbalsa/imap/imap-auth.c:72
msgid "No way to authenticate is known"
msgstr ""
-#: ../libbalsa/imap/imap-auth.c:97
+#: ../libbalsa/imap/imap-auth.c:98
msgid "Cannot LOGIN with UTF-8 username or password"
msgstr ""
-#: ../libbalsa/imap/imap-commands.c:1217
+#: ../libbalsa/imap/imap-commands.c:1209
msgid "Unordered data received from server"
msgstr ""
-#: ../libbalsa/imap/imap-commands.c:1752
+#: ../libbalsa/imap/imap-commands.c:1744
msgid "Bug in implementation of SORT command on IMAP server exposed."
msgstr ""
# src/balsa-message.c:231 src/balsa-message.c:246
-#: ../libbalsa/imap/imap-handle.c:676
+#: ../libbalsa/imap/imap-handle.c:671
#, fuzzy, c-format
#| msgid "Scanning of %s failed: %s"
msgid "Connecting %s failed: %s"
msgstr "扫描 %s 失败：%s"
# src/main-window.c:182
-#: ../libbalsa/imap/imap-handle.c:689 ../libbalsa/imap/imap-handle.c:709
+#: ../libbalsa/imap/imap-handle.c:684 ../libbalsa/imap/imap-handle.c:704
#, fuzzy, c-format
#| msgid "Send failed: %s"
msgid "TLS negotiation failed: %s"
msgstr "发送失败：%s"
-#: ../libbalsa/imap/imap-handle.c:715
+#: ../libbalsa/imap/imap-handle.c:710
#, fuzzy
#| msgid "TLS requested but not compiled in"
msgid "TLS required but not available"
@@ -1066,6 +1134,10 @@ msgstr "正在退订 %s..."
msgid "unsubscribing from “%s” failed"
msgstr "正在退订 %s..."
+#: ../libbalsa/information.c:179
+msgid "do not show again"
+msgstr ""
+
#: ../libbalsa/libbalsa.c:398
#, fuzzy
#| msgid "SSL/TLS certificate"
@@ -1162,8 +1234,6 @@ msgid "Bad X-Face data"
msgstr "X-Face 数据有误"
#: ../libbalsa/libbalsa-conf.c:139
-#, fuzzy
-#| msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
msgid "Your Balsa configuration is now stored in “~/.balsa/config”."
msgstr "您的 Balsa 配置现在保存在“~/.balsa/config”。"
@@ -1172,7 +1242,7 @@ msgstr "您的 Balsa 配置现在保存在“~/.balsa/config”。"
msgid "OpenPGP"
msgstr "OpenPGP"
-#: ../libbalsa/libbalsa-gpgme.c:188 ../src/balsa-message.c:2931
+#: ../libbalsa/libbalsa-gpgme.c:188 ../src/balsa-message.c:2935
msgid "S/MIME"
msgstr "S/MIME"
@@ -1287,12 +1357,16 @@ msgid ""
"list."
msgstr ""
+#: ../libbalsa/libbalsa-gpgme-cb.c:223
+msgid "Double-click key to show details"
+msgstr ""
+
#: ../libbalsa/libbalsa-gpgme-cb.c:280
msgid "User ID"
msgstr "用户标识"
-#: ../libbalsa/libbalsa-gpgme-cb.c:287 ../src/balsa-index.c:428
-#: ../src/pref-manager.c:219 ../src/sendmsg-window.c:2627
+#: ../libbalsa/libbalsa-gpgme-cb.c:287 ../src/balsa-index.c:460
+#: ../src/pref-manager.c:220 ../src/sendmsg-window.c:2623
msgid "Size"
msgstr "大小"
@@ -1376,12 +1450,12 @@ msgstr ""
msgid "importing key data failed"
msgstr ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:475
+#: ../libbalsa/libbalsa-gpgme-keys.c:473
#, c-format
msgid "Cannot find a key with fingerprint %s on the key server."
msgstr ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:480
+#: ../libbalsa/libbalsa-gpgme-keys.c:481
#, c-format
msgid ""
"Found %u key with fingerprint %s on the key server. Please check and import "
@@ -1391,28 +1465,32 @@ msgid_plural ""
"the proper key manually."
msgstr[0] ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:490
+#: ../libbalsa/libbalsa-gpgme-keys.c:501
#, fuzzy, c-format
msgid "Searching the key server failed: %s"
msgstr "发送外部邮件主体请求失败：%s"
-#: ../libbalsa/libbalsa-gpgme-keys.c:569
+#: ../libbalsa/libbalsa-gpgme-keys.c:540
msgid "error importing key"
msgstr ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:604
+#: ../libbalsa/libbalsa-gpgme-keys.c:575
msgid "No key was imported or updated."
msgstr ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:607
+#: ../libbalsa/libbalsa-gpgme-keys.c:577
+msgid "The key was ignored because it does not have a user ID."
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:580
msgid "The key was imported into the local key ring."
msgstr ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:611
+#: ../libbalsa/libbalsa-gpgme-keys.c:584
msgid "The key was updated in the local key ring:"
msgstr ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:614
+#: ../libbalsa/libbalsa-gpgme-keys.c:587
#, c-format
msgid ""
"\n"
@@ -1422,7 +1500,7 @@ msgid_plural ""
"• %d new user IDs"
msgstr[0] ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:619
+#: ../libbalsa/libbalsa-gpgme-keys.c:592
#, c-format
msgid ""
"\n"
@@ -1432,7 +1510,7 @@ msgid_plural ""
"• %d new subkeys"
msgstr[0] ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:624
+#: ../libbalsa/libbalsa-gpgme-keys.c:597
#, fuzzy, c-format
#| msgid "Incl_ude signature"
msgid ""
@@ -1443,7 +1521,7 @@ msgid_plural ""
"• %d new signatures"
msgstr[0] "包含签名(_U)"
-#: ../libbalsa/libbalsa-gpgme-keys.c:630
+#: ../libbalsa/libbalsa-gpgme-keys.c:603
#, c-format
msgid ""
"\n"
@@ -1453,7 +1531,7 @@ msgid_plural ""
"• %d new revocations"
msgstr[0] ""
-#: ../libbalsa/libbalsa-gpgme-keys.c:636
+#: ../libbalsa/libbalsa-gpgme-keys.c:609
msgid "The existing key in the key ring was not changed."
msgstr ""
@@ -1510,14 +1588,8 @@ msgstr "名称："
#: ../libbalsa/libbalsa-gpgme-widgets.c:162
#: ../libbalsa/libbalsa-gpgme-widgets.c:303
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "Issuer serial number: %s"
msgid "Serial number:"
-msgstr ""
-"\n"
-"颁发者序列号：%s"
+msgstr "序列号："
#: ../libbalsa/libbalsa-gpgme-widgets.c:168
#: ../libbalsa/libbalsa-gpgme-widgets.c:306
@@ -1660,7 +1732,7 @@ msgstr[0] ""
#: ../libbalsa/libbalsa-gpgme-widgets.c:740
#, c-format
msgid " curve “%s”"
-msgstr ""
+msgstr "曲线“%s”"
# src/filter-edit-dialog.c:267
#: ../libbalsa/libbalsa-progress.c:180
@@ -1668,7 +1740,7 @@ msgid "_Hide"
msgstr "隐藏(_H)"
# src/sendmsg-window.c:188
-#: ../libbalsa/libbalsa-vfs.c:495 ../src/sendmsg-window.c:4577
+#: ../libbalsa/libbalsa-vfs.c:495 ../src/sendmsg-window.c:4573
#, c-format
msgid "not a regular file"
msgstr "不是常规文件"
@@ -1702,8 +1774,7 @@ msgstr "没有这种邮箱类型：%s"
# src/mailbox-conf.c:488
#: ../libbalsa/mailbox.c:563
-#, fuzzy, c-format
-#| msgid "Bad local mailbox path \"%s\""
+#, c-format
msgid "Bad local mailbox path “%s”"
msgstr "错误的本地邮箱路径“%s”"
@@ -1718,39 +1789,39 @@ msgstr "无法创建类型为 %s 的邮箱"
msgid "Applying filter rules to %s"
msgstr "正在向 %s 应用过滤规则"
-#: ../libbalsa/mailbox.c:1098
+#: ../libbalsa/mailbox.c:1094
#, c-format
msgid "Copying from %s to %s"
msgstr "正在从 %s 向 %s 复制邮件"
# src/main-window.c:168
-#: ../libbalsa/mailbox.c:2263
+#: ../libbalsa/mailbox.c:2275
#, c-format
msgid "Removing messages from source mailbox failed"
msgstr "从源邮箱中移除邮件失败"
-#: ../libbalsa/mailbox.c:3234
+#: ../libbalsa/mailbox.c:3246
msgid "from unknown"
msgstr "发送方未知"
-#: ../libbalsa/mailbox.c:3236
+#: ../libbalsa/mailbox.c:3248
#, fuzzy
#| msgid "Loading..."
msgid "Loading…"
msgstr "正在登录..."
# src/sendmsg-window.c:523
-#: ../libbalsa/mailbox.c:4287
+#: ../libbalsa/mailbox.c:4270
#, c-format
msgid "Searching %s for partial messages"
msgstr "正在搜索 %s 查找部分邮件"
# src/sendmsg-window.c:523
-#: ../libbalsa/mailbox.c:4377
+#: ../libbalsa/mailbox.c:4360
msgid "Reconstructing message"
msgstr "重组邮件"
-#: ../libbalsa/mailbox.c:4646
+#: ../libbalsa/mailbox.c:4629
#, c-format
msgid "Finding duplicate messages in source mailbox failed"
msgstr "在源邮箱中查找重复邮件失败"
@@ -1763,70 +1834,70 @@ msgstr "*** 错误：邮箱流被关闭：%s ***\n"
#. ImapIssue macro handles reconnecting. We might issue a
#. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
#. login information...
-#: ../libbalsa/mailbox_imap.c:596
+#: ../libbalsa/mailbox_imap.c:609
#, fuzzy
#| msgid "IMAP connection has been severed. Reconnecting..."
msgid "IMAP connection has been severed. Reconnecting…"
msgstr "IMAP 连接已断开。重新连接..."
-#: ../libbalsa/mailbox_imap.c:599
+#: ../libbalsa/mailbox_imap.c:612
msgid "IMAP protocol error. Try enabling bug workarounds."
msgstr ""
-#: ../libbalsa/mailbox_imap.c:602
+#: ../libbalsa/mailbox_imap.c:615
#, fuzzy, c-format
#| msgid "IMAP server has shut the connection: %s Reconnecting..."
msgid "IMAP server has shut the connection: %s Reconnecting…"
msgstr "IMAP 服务器关闭了连接：%s 重新连接..."
-#: ../libbalsa/mailbox_imap.c:614
+#: ../libbalsa/mailbox_imap.c:627
#, fuzzy, c-format
#| msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
msgid "Async IMAP cmd %s could not be executed. Reconnecting…"
msgstr "无法执行异步 IMAP 命令 %s。重新连接..."
-#: ../libbalsa/mailbox_imap.c:1195
+#: ../libbalsa/mailbox_imap.c:1238
#, c-format
msgid "Downloading %ld kB"
msgstr "下载 %ld kB"
-#: ../libbalsa/mailbox_imap.c:1661
+#: ../libbalsa/mailbox_imap.c:1704
#, fuzzy, c-format
#| msgid "No path found for mailbox \"%s\", using \"%s\""
msgid "No path found for mailbox “%s”, using “%s”"
msgstr "没有找到邮箱“%s”的路径，使用“%s”"
-#: ../libbalsa/mailbox_imap.c:1768 ../libbalsa/mailbox_imap.c:1809
+#: ../libbalsa/mailbox_imap.c:1811 ../libbalsa/mailbox_imap.c:1852
#, c-format
msgid "Cannot get IMAP handle"
msgstr "无法获得 IMAP 句柄"
-#: ../libbalsa/mailbox_imap.c:2431 ../libbalsa/mailbox_imap.c:2494
+#: ../libbalsa/mailbox_imap.c:2482 ../libbalsa/mailbox_imap.c:2545
#, c-format
msgid "Error fetching message from IMAP server: %s"
msgstr "从 IMAP 服务器取回邮件出错：%s"
-#: ../libbalsa/mailbox_imap.c:2466
+#: ../libbalsa/mailbox_imap.c:2517
#, c-format
msgid "Downloading %u kB"
msgstr "下载 %u kB"
-#: ../libbalsa/mailbox_imap.c:2507
+#: ../libbalsa/mailbox_imap.c:2558
#, c-format
msgid "Cannot create temporary file"
msgstr "无法创建临时文件"
-#: ../libbalsa/mailbox_imap.c:2531
+#: ../libbalsa/mailbox_imap.c:2582
#, c-format
msgid "Cannot write to temporary file %s"
msgstr "无法写入临时文件 %s"
-#: ../libbalsa/mailbox_imap.c:2758 ../libbalsa/mailbox_imap.c:2875
+#: ../libbalsa/mailbox_imap.c:2809 ../libbalsa/mailbox_imap.c:2926
#, c-format
msgid "Uploading %ld kB"
msgstr "上传 %ld kB"
-#: ../libbalsa/mailbox_imap.c:3178
+#: ../libbalsa/mailbox_imap.c:3235
msgid "Server-side threading not supported."
msgstr ""
@@ -1849,22 +1920,22 @@ msgid "Cache file for mailbox %s will be repaired"
msgstr "将修复邮箱 %s 的缓存文件"
# src/main-window.c:182
-#: ../libbalsa/mailbox_local.c:1295
+#: ../libbalsa/mailbox_local.c:1296
#, c-format
msgid "Filtering %s"
msgstr "正在过滤 %s"
-#: ../libbalsa/mailbox_local.c:1358
+#: ../libbalsa/mailbox_local.c:1359
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: ../libbalsa/mailbox_local.c:2115
+#: ../libbalsa/mailbox_local.c:2116
#, c-format
msgid "Open of %s failed. Errno = %d, "
msgstr "打开 %s 失败。Errno = %d，"
-#: ../libbalsa/mailbox_local.c:2138
+#: ../libbalsa/mailbox_local.c:2139
#, fuzzy, c-format
#| msgid "Failed to sync mailbox \"%s\""
msgid "Failed to sync mailbox “%s”"
@@ -1909,14 +1980,14 @@ msgstr ""
"%s"
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/mailbox_maildir.c:467 ../libbalsa/mailbox_mbox.c:651
+#: ../libbalsa/mailbox_maildir.c:467 ../libbalsa/mailbox_mbox.c:656
#: ../libbalsa/mailbox_mh.c:507
#, c-format
msgid "Mailbox does not exist."
msgstr "邮箱不存在。"
-#: ../libbalsa/mailbox_maildir.c:908 ../libbalsa/mailbox_mbox.c:1931
-#: ../libbalsa/mailbox_mh.c:1086
+#: ../libbalsa/mailbox_maildir.c:908 ../libbalsa/mailbox_mbox.c:1935
+#: ../libbalsa/mailbox_mh.c:1087
#, c-format
msgid "Data copy error"
msgstr "数据复制错误"
@@ -1927,7 +1998,7 @@ msgstr "数据复制错误"
msgid "Mailbox %s does not appear to be an mbox mailbox."
msgstr "邮箱 %s 不是一个 Mbox 邮箱。"
-#: ../libbalsa/mailbox_mbox.c:279 ../libbalsa/mailbox_mh.c:278
+#: ../libbalsa/mailbox_mbox.c:279 ../libbalsa/mailbox_mh.c:280
#, fuzzy, c-format
#| msgid ""
#| "Could not remove %s:\n"
@@ -1959,57 +2030,57 @@ msgid "Could not unlink file %s: %s"
msgstr " 无法取消链接文件 %s ：%s "
# src/mailbox-conf.c:488
-#: ../libbalsa/mailbox_mbox.c:660
+#: ../libbalsa/mailbox_mbox.c:665
#, c-format
msgid "Cannot open mailbox."
msgstr "无法打开邮箱。"
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/mailbox_mbox.c:672
+#: ../libbalsa/mailbox_mbox.c:677
#, c-format
msgid "Mailbox is not in mbox format."
msgstr "邮箱不是 mbox 格式。"
# src/mailbox-conf.c:488
-#: ../libbalsa/mailbox_mbox.c:680
+#: ../libbalsa/mailbox_mbox.c:685
#, c-format
msgid "Cannot lock mailbox."
msgstr "无法锁定邮箱。"
-#: ../libbalsa/mailbox_mbox.c:1887
+#: ../libbalsa/mailbox_mbox.c:1891
#, c-format
msgid "%s: could not open %s."
msgstr "%s：无法打开 %s。"
-#: ../libbalsa/mailbox_mbox.c:1899
+#: ../libbalsa/mailbox_mbox.c:1903
#, fuzzy, c-format
#| msgid "%s: could not get new mime stream."
msgid "%s: could not get new MIME stream."
msgstr "%s：无法获得新的 mime 流。"
# src/mailbox-conf.c:640
-#: ../libbalsa/mailbox_mbox.c:1907
+#: ../libbalsa/mailbox_mbox.c:1911
#, c-format
msgid "%s: %s is not in mbox format."
msgstr "%s：%s 不是 mbox 格式。"
-#: ../libbalsa/mailbox_mh.c:155
+#: ../libbalsa/mailbox_mh.c:157
#, fuzzy, c-format
#| msgid "Mailbox %s does not appear to be a Mh mailbox."
msgid "Mailbox %s does not appear to be an MH mailbox."
msgstr "邮箱 %s 不是一个 Mh 邮箱。"
-#: ../libbalsa/mailbox_mh.c:165
+#: ../libbalsa/mailbox_mh.c:167
#, c-format
msgid "Could not create MH directory at %s (%s)"
msgstr "无法在 %s 创建 MH 目录 (%s)"
-#: ../libbalsa/mailbox_mh.c:177
+#: ../libbalsa/mailbox_mh.c:179
#, c-format
msgid "Could not create MH structure at %s (%s)"
msgstr "无法在 %s 创建 MH 结构 (%s)"
-#: ../libbalsa/mailbox_mh.c:272
+#: ../libbalsa/mailbox_mh.c:274
#, fuzzy, c-format
#| msgid ""
#| "Could not remove contents of %s:\n"
@@ -2020,13 +2091,13 @@ msgstr ""
"%s"
# src/main-window.c:139
-#: ../libbalsa/mailbox_mh.c:1068
+#: ../libbalsa/mailbox_mh.c:1069
#, c-format
msgid "Cannot create message"
msgstr "无法创建邮件"
# src/main-window.c:200
-#: ../libbalsa/mailbox_mh.c:1111
+#: ../libbalsa/mailbox_mh.c:1112
#, c-format
msgid "Message rename error"
msgstr "重命名邮件出错"
@@ -2067,14 +2138,14 @@ msgstr "邮件发自 %s：%s"
msgid "Error appending message %d from %s to %s: %s"
msgstr "将邮件 %d 从 %s 追加到 %s 出错：%s"
-#: ../libbalsa/mailbox_pop3.c:493 ../libbalsa/send.c:806
+#: ../libbalsa/mailbox_pop3.c:493 ../libbalsa/send.c:778
#, fuzzy, c-format
#| msgid "Could not load Face header file %s: %s"
msgid "Cannot load certificate file %s: %s"
msgstr "无法载入 Face 信头文件 %s：%s"
#. connect server
-#: ../libbalsa/mailbox_pop3.c:510 ../libbalsa/send.c:1049
+#: ../libbalsa/mailbox_pop3.c:510 ../libbalsa/send.c:1021
#, fuzzy, c-format
#| msgid "Connecting to %s..."
msgid "Connecting %s…"
@@ -2106,7 +2177,7 @@ msgstr "POP3 邮箱 %s 错误：%s\n"
msgid "POP3 message %d oversized: %s — skipped."
msgstr "POP3 邮件 %d 尺寸过大：%d kB - 已跳过。"
-#: ../libbalsa/mailbox_pop3.c:649 ../libbalsa/send.c:1059
+#: ../libbalsa/mailbox_pop3.c:649 ../libbalsa/send.c:1031
#, c-format
msgid "Connected to %s"
msgstr "已连接到 %s"
@@ -2132,7 +2203,7 @@ msgid "POP3 error: %s"
msgstr "POP3 错误：%s"
# src/balsa-init.c:533
-#: ../libbalsa/mailbox_pop3.c:711 ../libbalsa/send.c:1140
+#: ../libbalsa/mailbox_pop3.c:711 ../libbalsa/send.c:1112
#, fuzzy
msgid "Finished"
msgstr "芬兰语(_F)"
@@ -2144,26 +2215,18 @@ msgid "Mailbox (%s) is read-only: cannot change flags."
msgstr "邮箱(%s) 为只读。无法修改标记。"
#: ../libbalsa/misc.c:384
-#, fuzzy
-#| msgid "west european"
msgid "West European"
msgstr "西欧"
#: ../libbalsa/misc.c:386 ../libbalsa/misc.c:420
-#, fuzzy
-#| msgid "east european"
msgid "East European"
msgstr "东欧"
#: ../libbalsa/misc.c:388
-#, fuzzy
-#| msgid "south european"
msgid "South European"
msgstr "南欧"
#: ../libbalsa/misc.c:390
-#, fuzzy
-#| msgid "north european"
msgid "North European"
msgstr "北欧"
@@ -2222,9 +2285,8 @@ msgid "West European (euro)"
msgstr "西欧(欧元)"
#: ../libbalsa/misc.c:412
-#, fuzzy
msgid "Russian"
-msgstr "俄语 (KOI)(_R)"
+msgstr ""
#: ../libbalsa/misc.c:414
#, fuzzy
@@ -2290,8 +2352,8 @@ msgid "week"
msgid_plural "weeks"
msgstr[0] ""
-#: ../libbalsa/rfc2445.c:371 ../libbalsa/rfc2445.c:696
-#: ../libbalsa/rfc2445.c:700 ../libbalsa/rfc2445.c:743
+#: ../libbalsa/rfc2445.c:371 ../libbalsa/rfc2445.c:714
+#: ../libbalsa/rfc2445.c:718 ../libbalsa/rfc2445.c:773
msgid "day"
msgid_plural "days"
msgstr[0] ""
@@ -2313,322 +2375,434 @@ msgid "second"
msgid_plural "seconds"
msgstr[0] ""
+#: ../libbalsa/rfc2445.c:415
+#, fuzzy
+#| msgid "unknown"
+msgctxt "ical_status"
+msgid "unknown"
+msgstr "未知"
+
#: ../libbalsa/rfc2445.c:416
#, fuzzy
#| msgid "Accept tentatively"
+msgctxt "ical_status"
msgid "event is tentative"
msgstr "临时接受"
#: ../libbalsa/rfc2445.c:417
+#, fuzzy
+#| msgid "Accept tentatively"
+msgctxt "ical_status"
msgid "event is definite"
-msgstr ""
+msgstr "临时接受"
#: ../libbalsa/rfc2445.c:418
+#, fuzzy
+#| msgid "SASL authentication failed."
+msgctxt "ical_status"
msgid "event was cancelled"
-msgstr ""
+msgstr "SASL 身份验证失败。"
+
+#: ../libbalsa/rfc2445.c:444
+#, fuzzy
+#| msgid "unknown"
+msgctxt "ical_method"
+msgid "unknown"
+msgstr "未知"
# src/filter-edit-dialog.c:592
#: ../libbalsa/rfc2445.c:445
+#, fuzzy
+#| msgid "Event Notification"
+msgctxt "ical_method"
msgid "Event Notification"
msgstr "事件通知"
#: ../libbalsa/rfc2445.c:446
+#, fuzzy
+#| msgid "Event Request"
+msgctxt "ical_method"
msgid "Event Request"
msgstr "事件请求"
# src/main-window.c:215
#: ../libbalsa/rfc2445.c:447
+#, fuzzy
+#| msgid "Reply to Event Request"
+msgctxt "ical_method"
msgid "Reply to Event Request"
msgstr "回复事件请求"
#: ../libbalsa/rfc2445.c:448
+#, fuzzy
+#| msgid "Event Cancellation"
+msgctxt "ical_method"
msgid "Event Cancellation"
msgstr "事件取消"
+#: ../libbalsa/rfc2445.c:467
+#, fuzzy
+#| msgid "unknown"
+msgctxt "ical_partstat"
+msgid "unknown"
+msgstr "未知"
+
#: ../libbalsa/rfc2445.c:468
+#, fuzzy
+#| msgid "needs action"
+msgctxt "ical_partstat"
msgid "needs action"
msgstr "需要操作"
#: ../libbalsa/rfc2445.c:469
+#, fuzzy
+#| msgid "accepted"
+msgctxt "ical_partstat"
msgid "accepted"
msgstr "已接受"
#: ../libbalsa/rfc2445.c:470
+#, fuzzy
+#| msgid "declined"
+msgctxt "ical_partstat"
msgid "declined"
msgstr "已拒绝"
#: ../libbalsa/rfc2445.c:471
+#, fuzzy
+#| msgid "tentatively accepted"
+msgctxt "ical_partstat"
msgid "tentatively accepted"
msgstr "暂时接受"
# src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
# src/pref-manager.c:471
#: ../libbalsa/rfc2445.c:472
+#, fuzzy
+#| msgid "delegated"
+msgctxt "ical_partstat"
msgid "delegated"
msgstr "已授权"
#: ../libbalsa/rfc2445.c:515
+msgctxt "day_of_week"
msgid "Sunday"
-msgstr ""
+msgstr "星期日"
-#: ../libbalsa/rfc2445.c:515
+#: ../libbalsa/rfc2445.c:516
+msgctxt "day_of_week"
msgid "Monday"
-msgstr ""
+msgstr "星期一"
-#: ../libbalsa/rfc2445.c:515
+#: ../libbalsa/rfc2445.c:517
+msgctxt "day_of_week"
msgid "Tuesday"
-msgstr ""
+msgstr "星期二"
-#: ../libbalsa/rfc2445.c:515
+#: ../libbalsa/rfc2445.c:518
+msgctxt "day_of_week"
msgid "Wednesday"
-msgstr ""
+msgstr "星期三"
-#: ../libbalsa/rfc2445.c:515
+#: ../libbalsa/rfc2445.c:519
+msgctxt "day_of_week"
msgid "Thursday"
-msgstr ""
+msgstr "星期四"
-#: ../libbalsa/rfc2445.c:515
+#: ../libbalsa/rfc2445.c:520
+msgctxt "day_of_week"
msgid "Friday"
-msgstr ""
+msgstr "星期五"
-#: ../libbalsa/rfc2445.c:515
+#: ../libbalsa/rfc2445.c:521
+msgctxt "day_of_week"
msgid "Saturday"
-msgstr ""
+msgstr "星期六"
-#: ../libbalsa/rfc2445.c:546
+#: ../libbalsa/rfc2445.c:553
msgid "every weekday"
msgstr ""
-#: ../libbalsa/rfc2445.c:548
+#: ../libbalsa/rfc2445.c:555
msgid "every day"
msgstr "每天"
-#: ../libbalsa/rfc2445.c:550
+#. #1: interval
+#: ../libbalsa/rfc2445.c:558
#, c-format
msgid "every %d days"
msgstr ""
# src/filter-edit-dialog.c:721
-#: ../libbalsa/rfc2445.c:565
+#: ../libbalsa/rfc2445.c:573
#, fuzzy
#| msgid "never"
msgid "every "
msgstr "从不"
-#: ../libbalsa/rfc2445.c:567
+#. #1: interval
+#: ../libbalsa/rfc2445.c:576
#, c-format
msgid "every %d weeks on "
msgstr ""
-#: ../libbalsa/rfc2445.c:574 ../libbalsa/rfc2445.c:676
+#. #1: the day of week (defined in the day_of_week context)
+#. #1: recurrence expression
+#: ../libbalsa/rfc2445.c:584 ../libbalsa/rfc2445.c:694
#, c-format
msgid " and %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:579
+#: ../libbalsa/rfc2445.c:589
msgid "every week"
msgstr ""
-#: ../libbalsa/rfc2445.c:581
+#. #1: interval
+#: ../libbalsa/rfc2445.c:592
#, c-format
msgid "every %d weeks"
msgstr ""
-#: ../libbalsa/rfc2445.c:592
+#: ../libbalsa/rfc2445.c:603
msgid "the last"
msgstr ""
-#: ../libbalsa/rfc2445.c:599
+#. #1: the day of month
+#: ../libbalsa/rfc2445.c:611
#, c-format
msgid "%dst"
msgstr ""
-#: ../libbalsa/rfc2445.c:602
+#. #1: the day of month
+#: ../libbalsa/rfc2445.c:615
#, c-format
msgid "%dnd"
msgstr ""
-#: ../libbalsa/rfc2445.c:605
+#. #1: the day of month
+#: ../libbalsa/rfc2445.c:619
#, c-format
msgid "%drd"
msgstr ""
-#: ../libbalsa/rfc2445.c:608
+#. #1: the day of month
+#: ../libbalsa/rfc2445.c:623
#, c-format
msgid "%dth"
msgstr ""
-#: ../libbalsa/rfc2445.c:626
+#: ../libbalsa/rfc2445.c:641
msgid "every day of every month"
msgstr ""
-#: ../libbalsa/rfc2445.c:628
+#. #1: interval
+#: ../libbalsa/rfc2445.c:644
#, c-format
msgid "every day of the month every %d months"
msgstr ""
#. currently we don't support yearly rules with more than one BYDAY element or exactly 7 elements with all
the weekdays
#. * (the "every day" case)
-#: ../libbalsa/rfc2445.c:643 ../libbalsa/rfc2445.c:687
-#: ../libbalsa/rfc2445.c:724 ../libbalsa/rfc2445.c:786
-#: ../libbalsa/rfc2445.c:791 ../libbalsa/rfc2445.c:794
-#, fuzzy
-#| msgid "Auto-complete"
+#: ../libbalsa/rfc2445.c:659 ../libbalsa/rfc2445.c:705
+#: ../libbalsa/rfc2445.c:754 ../libbalsa/rfc2445.c:834
+#: ../libbalsa/rfc2445.c:839 ../libbalsa/rfc2445.c:842
msgid "rule too complex"
-msgstr "自动完成"
+msgstr "规则太复杂"
# src/filter-edit-dialog.c:721
-#: ../libbalsa/rfc2445.c:649
+#. #1: the day of week (defined in the day_of_week context)
+#: ../libbalsa/rfc2445.c:666
#, fuzzy, c-format
#| msgid "never"
msgid "every %s"
msgstr "从不"
-#: ../libbalsa/rfc2445.c:693
+#: ../libbalsa/rfc2445.c:711
msgid " and "
msgstr ""
-#: ../libbalsa/rfc2445.c:704
+#: ../libbalsa/rfc2445.c:722
msgid " of every month"
msgstr ""
-#: ../libbalsa/rfc2445.c:706
+#. #1: interval
+#: ../libbalsa/rfc2445.c:725
#, c-format
msgid " of every %d months"
msgstr ""
-#: ../libbalsa/rfc2445.c:717
+#: ../libbalsa/rfc2445.c:736
+msgctxt "name_of_month"
msgid "January"
msgstr "一月"
-#: ../libbalsa/rfc2445.c:717
+#: ../libbalsa/rfc2445.c:737
+msgctxt "name_of_month"
msgid "February"
msgstr "二月"
-#: ../libbalsa/rfc2445.c:717
+#: ../libbalsa/rfc2445.c:738
+msgctxt "name_of_month"
msgid "March"
msgstr "三月"
-#: ../libbalsa/rfc2445.c:717
+#: ../libbalsa/rfc2445.c:739
+msgctxt "name_of_month"
msgid "April"
msgstr "四月"
-#: ../libbalsa/rfc2445.c:717
+#: ../libbalsa/rfc2445.c:740
+msgctxt "name_of_month"
msgid "May"
msgstr "五月"
-#: ../libbalsa/rfc2445.c:717
+#: ../libbalsa/rfc2445.c:741
+msgctxt "name_of_month"
msgid "June"
msgstr "六月"
-#: ../libbalsa/rfc2445.c:718
+#: ../libbalsa/rfc2445.c:742
+msgctxt "name_of_month"
msgid "July"
msgstr "七月"
-#: ../libbalsa/rfc2445.c:718
+#: ../libbalsa/rfc2445.c:743
+msgctxt "name_of_month"
msgid "August"
msgstr "八月"
-#: ../libbalsa/rfc2445.c:718
+#: ../libbalsa/rfc2445.c:744
+msgctxt "name_of_month"
msgid "September"
msgstr "九月"
-#: ../libbalsa/rfc2445.c:718
+#: ../libbalsa/rfc2445.c:745
+msgctxt "name_of_month"
msgid "October"
msgstr "十月"
-#: ../libbalsa/rfc2445.c:718
+#: ../libbalsa/rfc2445.c:746
+msgctxt "name_of_month"
msgid "November"
msgstr "十一月"
-#: ../libbalsa/rfc2445.c:718
+#: ../libbalsa/rfc2445.c:747
+msgctxt "name_of_month"
msgid "December"
msgstr "十二月"
-#: ../libbalsa/rfc2445.c:746
+#. #1: name of month (defined in the name_of_month context)
+#. #2: day of week (defined in the day_of_week context)
+#: ../libbalsa/rfc2445.c:778
#, c-format
msgid "every %s %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:748
+#. #1: interval
+#. #2: name of month (defined in the name_of_month context)
+#. #3: day of week (defined in the day_of_week context)
+#: ../libbalsa/rfc2445.c:783
#, c-format
msgid "every %d years on %s %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:758
+#. #1: name of month (defined in the name_of_month context)
+#: ../libbalsa/rfc2445.c:794
#, c-format
msgid "every day of %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:760
+#. #1: interval
+#. #2: name of month (defined in the name_of_month context)
+#: ../libbalsa/rfc2445.c:798
#, c-format
msgid "every %d years every day of %s"
msgstr ""
# src/mailbox-conf.c:531
-#: ../libbalsa/rfc2445.c:770
+#. #1: day of week (defined in the day_of_week context)
+#. #2: name of month (defined in the name_of_month context)
+#: ../libbalsa/rfc2445.c:810
#, fuzzy, c-format
#| msgid "%s on %s"
msgid "every %s of %s"
msgstr "%s 在 %s"
-#: ../libbalsa/rfc2445.c:772
+#. #1: interval
+#. #2: day of week (defined in the day_of_week context)
+#. #3: name of month (defined in the name_of_month context)
+#: ../libbalsa/rfc2445.c:815
#, c-format
msgid "every %d years on every %s of %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:780
+#. #1: day of week (defined in the day_of_week context)
+#. #2: name of month (defined in the name_of_month context)
+#: ../libbalsa/rfc2445.c:825
#, c-format
msgid "the %s of every %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:782
+#. #1: interval
+#. #2: day of week (defined in the day_of_week context)
+#. #3: name of month (defined in the name_of_month context)
+#: ../libbalsa/rfc2445.c:830
#, c-format
msgid "every %d years on the %s of %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:813
+#: ../libbalsa/rfc2445.c:861
+msgctxt "ical_recurrence"
msgid "secondly"
msgstr ""
-#: ../libbalsa/rfc2445.c:816
+#: ../libbalsa/rfc2445.c:864
#, fuzzy
#| msgid "minutes"
+msgctxt "ical_recurrence"
msgid "minutely"
msgstr "分钟"
-#: ../libbalsa/rfc2445.c:819
+#: ../libbalsa/rfc2445.c:867
+msgctxt "ical_recurrence"
msgid "hourly"
msgstr ""
-#: ../libbalsa/rfc2445.c:840
-msgid "occurrence"
-msgstr ""
-
-#: ../libbalsa/rfc2445.c:840
-#, fuzzy
+#: ../libbalsa/rfc2445.c:887
+#, fuzzy, c-format
#| msgid "Prefere_nces"
-msgid "occurrences"
-msgstr "参考(_N)"
+msgid ", %d occurrence"
+msgid_plural ", %d occurrences"
+msgstr[0] "参考(_N)"
-#: ../libbalsa/rfc2445.c:845
+#. #1: time string
+#: ../libbalsa/rfc2445.c:893
#, c-format
msgid " until %s"
msgstr ""
-#: ../libbalsa/rfc2445.c:1121
+#: ../libbalsa/rfc2445.c:1168
+msgctxt "ical_role"
+msgid "unknown"
+msgstr "未知"
+
+#: ../libbalsa/rfc2445.c:1169
+msgctxt "ical_role"
msgid "chair"
msgstr ""
-#: ../libbalsa/rfc2445.c:1122
+#: ../libbalsa/rfc2445.c:1170
+msgctxt "ical_role"
msgid "required participant"
msgstr ""
-#: ../libbalsa/rfc2445.c:1123
+#: ../libbalsa/rfc2445.c:1171
+msgctxt "ical_role"
msgid "optional participant"
msgstr ""
-#: ../libbalsa/rfc2445.c:1124
+#: ../libbalsa/rfc2445.c:1172
+msgctxt "ical_role"
msgid "non-participant, information only"
msgstr ""
@@ -2762,43 +2936,43 @@ msgid "malformed line “%s”, empty name or value"
msgstr ""
# src/balsa-init.c:276
-#: ../libbalsa/send.c:214
+#: ../libbalsa/send.c:186
#, c-format
msgid "SMTP server %s"
msgstr "SMTP服务器 %s"
# src/main-window.c:211
-#: ../libbalsa/send.c:627
+#: ../libbalsa/send.c:599
#, fuzzy, c-format
#| msgid "Page %d of %d"
msgid "Message %u of %u"
msgstr "页 %d / %d"
-#: ../libbalsa/send.c:648
+#: ../libbalsa/send.c:620
#, c-format
msgid "Cannot reach SMTP server %s (%s), any queued message will remain in %s."
msgstr ""
# src/sendmsg-window.c:71
-#: ../libbalsa/send.c:859
+#: ../libbalsa/send.c:831
#, fuzzy
#| msgid "Sending Mail..."
msgid "Sending Mail"
msgstr "正在发送邮件..."
# src/sendmsg-window.c:71
-#: ../libbalsa/send.c:969
+#: ../libbalsa/send.c:941
#, fuzzy, c-format
#| msgid "Save this message and close"
msgid "Save message in %s…"
msgstr "发送此邮件并关闭"
-#: ../libbalsa/send.c:977
+#: ../libbalsa/send.c:949
#, c-format
msgid "Saving sent message to %s failed: %s"
msgstr "将已发送邮件保存到 %s 失败：%s"
-#: ../libbalsa/send.c:1013
+#: ../libbalsa/send.c:985
#, fuzzy, c-format
#| msgid ""
#| "Could not send the message to %s:\n"
@@ -2813,14 +2987,14 @@ msgstr ""
"邮件留在了您的发件箱。\n"
# src/balsa-message.c:231 src/balsa-message.c:246
-#: ../libbalsa/send.c:1124
+#: ../libbalsa/send.c:1096
#, fuzzy, c-format
#| msgid "Scanning of %s failed: %s"
msgid "Connecting SMTP server %s (%s) failed: %s"
msgstr "扫描 %s 失败：%s"
# src/sendmsg-window.c:518
-#: ../libbalsa/send.c:1143
+#: ../libbalsa/send.c:1115
#, fuzzy, c-format
#| msgid "Forward message to %s: %s"
msgid "Transmitted %u message to %s"
@@ -2828,18 +3002,18 @@ msgid_plural "Transmitted %u messages to %s"
msgstr[0] "转发邮件给 %s：%s"
# src/main-window.c:139
-#: ../libbalsa/send.c:1308 ../libbalsa/send.c:1376
+#: ../libbalsa/send.c:1265 ../libbalsa/send.c:1333
#, c-format
msgid "Cannot read %s: %s"
msgstr "无法读取 %s：%s"
# src/main-window.c:139
-#: ../libbalsa/send.c:1311 ../libbalsa/send.c:1379
+#: ../libbalsa/send.c:1268 ../libbalsa/send.c:1336
#, c-format
msgid "Cannot read %s"
msgstr "无法读取 %s"
-#: ../libbalsa/send.c:1343
+#: ../libbalsa/send.c:1300
#, fuzzy, c-format
#| msgid ""
#| "Cannot determine charset for text file `%s'; sending as mime type `%s'"
@@ -2847,7 +3021,7 @@ msgid ""
"Cannot determine character set for text file “%s”; sending as MIME type “%s”"
msgstr "无法确定文本文件 `%s' 的字符集；以 mime 类型 `%s' 发送"
-#: ../libbalsa/send.c:1871 ../libbalsa/send.c:1969
+#: ../libbalsa/send.c:1828 ../libbalsa/send.c:1926
msgid "This message will not be encrypted for the BCC: recipient."
msgid_plural "This message will not be encrypted for the BCC: recipients."
msgstr[0] "密送给收件人的消息将不加密。"
@@ -2911,10 +3085,8 @@ msgid "_Server:"
msgstr "服务器(_S)："
#: ../libbalsa/server-config.c:116
-#, fuzzy
-#| msgid "Security"
msgid "Se_curity:"
-msgstr "安全"
+msgstr "安全(_C)："
#: ../libbalsa/server-config.c:123
msgid "Server requires _authentication"
@@ -2944,16 +3116,12 @@ msgid "Choose Client Certificate"
msgstr ""
#: ../libbalsa/server-config.c:153
-#, fuzzy
-#| msgid "Certificate saved"
msgid "Certificate _File:"
-msgstr "证书已保存"
+msgstr "证书文件(_F)："
#: ../libbalsa/server-config.c:161
-#, fuzzy
-#| msgid "C_ertificate Pass Phrase:"
msgid "Certificate _Pass Phrase:"
-msgstr "证书口令(_E)："
+msgstr "证书口令(_P)："
#: ../libbalsa/server-config.c:371
#, fuzzy, c-format
@@ -2962,10 +3130,8 @@ msgid "%s over SSL (%sS)"
msgstr "使用 SSL(IMAPS)"
#: ../libbalsa/server-config.c:375 ../libinit_balsa/assistant_page_user.c:69
-#, fuzzy
-#| msgid "Required"
msgid "TLS required"
-msgstr "需要"
+msgstr "需要 TLS"
#: ../libbalsa/server-config.c:376 ../libinit_balsa/assistant_page_user.c:70
msgid "TLS if possible (not recommended)"
@@ -2990,7 +3156,7 @@ msgstr "SMTP服务器"
msgid "Sp_lit message larger than"
msgstr "分割邮件，若其尺寸大于(_L)"
-#: ../libbalsa/smtp-server.c:352 ../src/pref-manager.c:2168
+#: ../libbalsa/smtp-server.c:352 ../src/pref-manager.c:2169
msgid "MB"
msgstr "MB"
@@ -3000,11 +3166,11 @@ msgid "Mailbox closed"
msgstr "邮箱已关闭"
# src/main-window.c:200
-#: ../libbalsa/source-viewer.c:220
+#: ../libbalsa/source-viewer.c:219
msgid "Message Source"
msgstr "邮件来源"
-#: ../libbalsa/source-viewer.c:230 ../src/message-window.c:856
+#: ../libbalsa/source-viewer.c:229 ../src/message-window.c:852
#, fuzzy, c-format
#| msgid "Error loading %s: %s\n"
msgid "Error adding from %s: %s\n"
@@ -3102,7 +3268,7 @@ msgstr "GnomeCard 地址簿"
msgid "Address Book"
msgstr "地址簿"
-#: ../libinit_balsa/assistant_init.c:137
+#: ../libinit_balsa/assistant_init.c:134
msgid "Configure Balsa"
msgstr "配置 Balsa"
@@ -3361,15 +3527,14 @@ msgid "reply length %lu exceeds the maximum allowed length %lu"
msgstr ""
#: ../libnetclient/net-client.c:292
-#, fuzzy, c-format
-#| msgid "connection error"
+#, c-format
msgid "connection lost"
-msgstr "连接错误"
+msgstr "连接已丢失"
#: ../libnetclient/net-client.c:344
#, c-format
msgid "line too long"
-msgstr ""
+msgstr "行过长"
# src/sendmsg-window.c:71
#: ../libnetclient/net-client.c:415
@@ -3398,10 +3563,9 @@ msgid "error loading key: %s"
msgstr "载入 Face 出错：%s"
#: ../libnetclient/net-client.c:535 ../libnetclient/net-client.c:574
-#, fuzzy, c-format
-#| msgid "Disconnected"
+#, c-format
msgid "not connected"
-msgstr "已断开"
+msgstr "未连接"
#: ../libnetclient/net-client.c:537
#, c-format
@@ -3430,16 +3594,14 @@ msgid "bad server reply"
msgstr ""
#: ../libnetclient/net-client-pop.c:442 ../libnetclient/net-client-pop.c:723
-#, fuzzy, c-format
-#| msgid "POP3 error: %s."
+#, c-format
msgid "error: %s"
-msgstr "POP3 错误：%s。"
+msgstr "错误：%s"
#: ../libnetclient/net-client-pop.c:445
-#, fuzzy, c-format
-#| msgid "No error"
+#, c-format
msgid "error"
-msgstr "没有错误"
+msgstr "错误"
#: ../libnetclient/net-client-pop.c:509 ../libnetclient/net-client-smtp.c:413
#, fuzzy, c-format
@@ -3449,20 +3611,14 @@ msgstr "匿名身份验证失败。"
# src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
#: ../libnetclient/net-client-pop.c:511 ../libnetclient/net-client-smtp.c:415
-#, fuzzy, c-format
-#| msgid "Password needed"
+#, c-format
msgid "password required"
msgstr "需要密码"
#: ../libnetclient/net-client-smtp.c:146
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "the server does not support ACL's"
+#, c-format
msgid "remote server does not support STARTTLS"
-msgstr ""
-"\n"
-"服务器不支持 ACL"
+msgstr "远程服务器不支持 STARTTLS"
#: ../libnetclient/net-client-smtp.c:703
#, fuzzy, c-format
@@ -3510,10 +3666,9 @@ msgid "cannot create GSS login request: %s"
msgstr ""
#: ../libnetclient/net-client-utils.c:330
-#, fuzzy, c-format
-#| msgid "unknown error"
+#, c-format
msgid "unknown error code %u:%u"
-msgstr "未知错误"
+msgstr "未知错误码 %u:%u"
# src/filter-edit-dialog.c:749
#: ../sounds/balsa.soundlist.in.h:1
@@ -3521,8 +3676,6 @@ msgid "Balsa Email Reader"
msgstr "Balsa 电子邮件阅读器"
#: ../sounds/balsa.soundlist.in.h:2
-#, fuzzy
-#| msgid "Program startup"
msgid "Program start-up"
msgstr "程序启动"
@@ -3536,37 +3689,39 @@ msgid " address book: "
msgstr "地址簿："
# src/filter-edit-dialog.c:101
-#: ../src/ab-main.c:736
+#: ../src/ab-main.c:735
msgid "_Name"
msgstr "名字(_N)"
-#: ../src/ab-main.c:752
+#: ../src/ab-main.c:751
msgid "_Address"
msgstr "地址簿(_A)"
-#: ../src/ab-main.c:840 ../src/address-book-config.c:229
+#: ../src/ab-main.c:839 ../src/address-book-config.c:229
#: ../src/address-book-config.c:335 ../src/address-book-config.c:379
-#: ../src/filter-edit-dialog.c:500 ../src/main-window.c:3840
-#: ../src/pref-manager.c:3259
+#: ../src/filter-edit-dialog.c:500 ../src/main-window.c:3890
+#: ../src/pref-manager.c:3303
msgid "_Apply"
-msgstr ""
+msgstr "应用(_A)"
# src/filter-edit-dialog.c:456
-#: ../src/ab-main.c:878
+#: ../src/ab-main.c:877
msgid "F_ilter:"
msgstr "过滤规则(_I)："
-#: ../src/ab-main.c:961
-#, fuzzy
-#| msgid "_Browse..."
+#: ../src/ab-main.c:960
msgid "Browse"
-msgstr "浏览(_B)..."
+msgstr "浏览"
# src/main-window.c:166
-#: ../src/ab-main.c:975 ../src/toolbar-factory.c:155
+#: ../src/ab-main.c:974 ../src/toolbar-factory.c:155
msgid "Edit"
msgstr "编辑"
+#: ../src/ab-main.c:1096
+msgid "Balsa Address Book"
+msgstr "Balsa 地址簿"
+
# src/filter-edit-dialog.c:101
#: ../src/ab-window.c:184 ../src/filter-edit-dialog.c:207
#: ../src/filter-export-dialog.c:91 ../src/filter-run-dialog.c:209
@@ -3660,17 +3815,17 @@ msgstr "添加 %s 地址簿"
# src/pref-manager.c:461
#: ../src/address-book-config.c:233 ../src/address-book-config.c:338
#: ../src/address-book-config.c:383 ../src/mailbox-conf.c:366
-#: ../src/pref-manager.c:1996 ../src/pref-manager.c:2079
-#: ../src/pref-manager.c:2759
+#: ../src/pref-manager.c:1997 ../src/pref-manager.c:2080
+#: ../src/pref-manager.c:2803
msgid "_Add"
msgstr "添加(_A)"
#. mailbox name
#. may be NULL
#. mailbox name
-#: ../src/address-book-config.c:252 ../src/address-book-config.c:404
-#: ../src/address-book-config.c:430 ../src/address-book-config.c:498
-#: ../src/address-book-config.c:567
+#: ../src/address-book-config.c:252 ../src/address-book-config.c:403
+#: ../src/address-book-config.c:429 ../src/address-book-config.c:497
+#: ../src/address-book-config.c:566
msgid "A_ddress Book Name:"
msgstr "地址簿名称(_D)："
@@ -3686,93 +3841,89 @@ msgstr "修改 %s 地址簿"
msgid "Add Osmo Address Book"
msgstr "添加 %s 地址簿"
-#: ../src/address-book-config.c:437
+#: ../src/address-book-config.c:436
msgid "Load program location:"
msgstr "载入程序位置："
-#: ../src/address-book-config.c:442
+#: ../src/address-book-config.c:441
msgid "Select load program for address book"
msgstr "选择地址簿载入程序"
-#: ../src/address-book-config.c:450
+#: ../src/address-book-config.c:449
msgid "Save program location:"
msgstr "保存程序位置："
-#: ../src/address-book-config.c:455
+#: ../src/address-book-config.c:454
msgid "Select save program for address book"
msgstr "选择地址簿保存程序"
# src/balsa-init.c:276
-#: ../src/address-book-config.c:505
-#, fuzzy
-#| msgid "_SMTP Server:"
+#: ../src/address-book-config.c:504
msgid "_LDAP Server URI"
-msgstr "SMTP服务器(_S)："
+msgstr "_LDAP 服务器 URI"
-#: ../src/address-book-config.c:510
+#: ../src/address-book-config.c:509
msgid "Base Domain _Name"
msgstr "基域名(_N)"
-#: ../src/address-book-config.c:515
+#: ../src/address-book-config.c:514
msgid "_User Name (Bind DN)"
msgstr "用户名(绑定域名)(_U)"
# src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
-#: ../src/address-book-config.c:520
+#: ../src/address-book-config.c:519
msgid "_Password"
msgstr "密码(_P)"
-#: ../src/address-book-config.c:526
+#: ../src/address-book-config.c:525
msgid "_User Address Book DN"
msgstr "用户地址簿域名(_U)"
-#: ../src/address-book-config.c:532
+#: ../src/address-book-config.c:531
msgid "Enable _TLS"
msgstr "启用 _TLS"
-#: ../src/address-book-config.c:571 ../src/address-book-config.c:960
+#: ../src/address-book-config.c:570 ../src/address-book-config.c:959
msgid "GPE Address Book"
msgstr "GPE 地址簿"
-#: ../src/address-book-config.c:603 ../src/main-window.c:985
-#: ../src/main-window.c:3947
+#: ../src/address-book-config.c:602 ../src/main-window.c:1040
+#: ../src/main-window.c:3997
#, c-format
msgid "Error displaying help: %s\n"
msgstr "显示帮助出错：%s\n"
-#: ../src/address-book-config.c:680
+#: ../src/address-book-config.c:679
#, fuzzy
#| msgid "No path found. Do you want to give one?"
msgid "No path found. Do you want to give one?"
msgstr "没有找到路径。您想指定一个吗？"
-#: ../src/address-book-config.c:936
+#: ../src/address-book-config.c:935
#, fuzzy
#| msgid "VCard Address Book (GnomeCard)"
msgid "vCard Address Book (GnomeCard)"
msgstr "VCard 地址簿 (GnomeCard)"
-#: ../src/address-book-config.c:942
+#: ../src/address-book-config.c:941
msgid "External query (a program)"
msgstr "外部请求(一个程序)"
-#: ../src/address-book-config.c:947
+#: ../src/address-book-config.c:946
msgid "LDIF Address Book"
msgstr "LDIF 地址簿"
-#: ../src/address-book-config.c:953
+#: ../src/address-book-config.c:952
msgid "LDAP Address Book"
msgstr "LDAP 地址簿"
-#: ../src/address-book-config.c:967
+#: ../src/address-book-config.c:966
msgid "Rubrica2 Address Book"
msgstr "Rubrica2 地址簿"
-#: ../src/address-book-config.c:974
-#, fuzzy
-#| msgid "Address Book"
+#: ../src/address-book-config.c:973
msgid "Osmo Address Book"
-msgstr "地址簿"
+msgstr "Osmo 地址簿"
#: ../src/balsa-app.c:60 ../src/balsa-app.c:142
#, fuzzy
@@ -3819,43 +3970,43 @@ msgid "Couldn’t open mailbox “%s”"
msgstr "无法打开邮箱“%s”"
# src/balsa-index.c:233
-#: ../src/balsa-index.c:413 ../src/pref-manager.c:218
+#: ../src/balsa-index.c:445 ../src/pref-manager.c:219
msgid "Date"
msgstr "时间"
-#: ../src/balsa-index.c:1594
+#: ../src/balsa-index.c:1713
#, c-format
msgid "Reply to Group: %d message is not from a mailing list."
msgid_plural "Reply to Group: %d messages are not from a mailing list."
msgstr[0] ""
-#: ../src/balsa-index.c:1695
+#: ../src/balsa-index.c:1814
#, c-format
msgid "Move to Trash failed: %s"
msgstr "移动到废件箱失败：%s"
# src/main-window.c:214
-#: ../src/balsa-index.c:1855 ../ui/main-window.ui.h:68
+#: ../src/balsa-index.c:1974 ../ui/main-window.ui.h:68
#: ../ui/message-window.ui.h:21
msgid "_Reply…"
msgstr "回复(_R)…"
# src/main-window.c:215
-#: ../src/balsa-index.c:1857
+#: ../src/balsa-index.c:1976
#, fuzzy
#| msgid "Reply To _All..."
msgid "Reply To _All…"
msgstr "全部回复(_A)..."
# src/main-window.c:215
-#: ../src/balsa-index.c:1859
+#: ../src/balsa-index.c:1978
#, fuzzy
#| msgid "Reply To _Group..."
msgid "Reply To _Group…"
msgstr "回复给组(_G)..."
# src/main-window.c:216
-#: ../src/balsa-index.c:1861 ../ui/main-window.ui.h:71
+#: ../src/balsa-index.c:1980 ../ui/main-window.ui.h:71
#: ../ui/message-window.ui.h:24
#, fuzzy
#| msgid "_Forward Attached..."
@@ -3863,66 +4014,58 @@ msgid "_Forward Attached…"
msgstr "作为附件转发(_F)..."
# src/main-window.c:216
-#: ../src/balsa-index.c:1863 ../ui/main-window.ui.h:72
+#: ../src/balsa-index.c:1982 ../ui/main-window.ui.h:72
#: ../ui/message-window.ui.h:25
#, fuzzy
#| msgid "Forward _Inline..."
msgid "Forward _Inline…"
msgstr "内嵌在正文中转发(_I)..."
-#: ../src/balsa-index.c:1865 ../ui/main-window.ui.h:73
+#: ../src/balsa-index.c:1984 ../ui/main-window.ui.h:73
#, fuzzy
#| msgid "_Pipe through..."
msgid "_Pipe through…"
msgstr "通过管道传递..."
# src/pref-manager.c:387
-#: ../src/balsa-index.c:1867 ../ui/main-window.ui.h:83
+#: ../src/balsa-index.c:1986 ../ui/main-window.ui.h:83
#, fuzzy
#| msgid "Store Address"
msgid "_Store Address…"
msgstr "保存地址"
-# src/main-window.c:133 src/main-window.c:168
-#: ../src/balsa-index.c:1881 ../src/mailbox-node.c:1044
-#: ../src/mailbox-node.c:1060 ../src/pref-manager.c:2001
-#: ../src/pref-manager.c:2086 ../src/pref-manager.c:2766 ../ui/ab-main.ui.h:11
-#: ../ui/main-window.ui.h:61
-msgid "_Delete"
-msgstr "删除(_D)"
-
# src/main-window.c:139
-#: ../src/balsa-index.c:1885
+#: ../src/balsa-index.c:2004
msgid "_Undelete"
msgstr "取消删除(_U)"
-#: ../src/balsa-index.c:1889
+#: ../src/balsa-index.c:2008
msgid "Move To _Trash"
msgstr "移到废件箱(_T)"
-#: ../src/balsa-index.c:1893
+#: ../src/balsa-index.c:2012
msgid "T_oggle"
msgstr "切换(_O)"
-#: ../src/balsa-index.c:1896 ../ui/main-window.ui.h:55
+#: ../src/balsa-index.c:2015 ../ui/main-window.ui.h:55
msgid "_Flagged"
msgstr "带标记的(_F)"
# src/index-child.c:422
-#: ../src/balsa-index.c:1899
+#: ../src/balsa-index.c:2018
msgid "_Unread"
msgstr "未读(_U)"
-#: ../src/balsa-index.c:1907
+#: ../src/balsa-index.c:2026
msgid "_Move to"
msgstr "移动到(_M)"
-#: ../src/balsa-index.c:1914
+#: ../src/balsa-index.c:2033
msgid "_View Source"
msgstr "查看源代码(_V)"
# src/main-window.c:168
-#: ../src/balsa-index.c:2141
+#: ../src/balsa-index.c:2260
#, fuzzy, c-format
#| msgid "Failed to copy %d message to mailbox \"%s\": %s"
#| msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
@@ -3930,59 +4073,57 @@ msgid "Failed to copy %d message to mailbox “%s”: %s"
msgid_plural "Failed to copy %d messages to mailbox “%s”: %s"
msgstr[0] "复制 %d 封邮件到邮箱 “%s” 失败：%s"
-#: ../src/balsa-index.c:2153
+#: ../src/balsa-index.c:2272
#, fuzzy, c-format
#| msgid "Copied to \"%s\"."
msgid "Copied to “%s”."
msgstr "已复制到“%s”。"
-#: ../src/balsa-index.c:2154
+#: ../src/balsa-index.c:2273
#, fuzzy, c-format
#| msgid "Moved to \"%s\"."
msgid "Moved to “%s”."
msgstr "已移动到“%s”。"
-#: ../src/balsa-index.c:2245
+#: ../src/balsa-index.c:2364
#, fuzzy, c-format
msgid "Committing mailbox %s failed."
msgstr "指派邮箱 %s 失败。"
# src/main-window.c:139
-#: ../src/balsa-index.c:2354
+#: ../src/balsa-index.c:2473
#, c-format
msgid "Cannot process the message: %s"
msgstr "无法处理邮件：%s"
# src/main-window.c:139
-#: ../src/balsa-index.c:2469
+#: ../src/balsa-index.c:2588
#, c-format
msgid "Cannot access message %u to pass to %s"
msgstr "无法访问邮件 %u 以传递到 %s"
# src/main-window.c:139
-#: ../src/balsa-index.c:2496
+#: ../src/balsa-index.c:2615
#, c-format
msgid "Cannot read message %u to pass to %s"
msgstr "无法读取邮件 %u 以传递到 %s"
-#: ../src/balsa-index.c:2669
+#: ../src/balsa-index.c:2788
msgid "Pipe message through a program"
msgstr "通过程序用管道传递邮件"
-#: ../src/balsa-index.c:2673
+#: ../src/balsa-index.c:2792
msgid "_Run"
msgstr "运行(_R)"
-#: ../src/balsa-index.c:2685
+#: ../src/balsa-index.c:2804
msgid "Specify the program to run:"
msgstr "指定要运行的程序"
# src/main-window.c:182
#: ../src/balsa-mblist.c:1769
-#, fuzzy
-#| msgid "_Other..."
msgid "_Other…"
-msgstr "其他(_O)..."
+msgstr "其他(_O)…"
#: ../src/balsa-mblist.c:1886
msgid "Choose destination folder"
@@ -3990,184 +4131,177 @@ msgstr "选择目标文件夹"
# src/main-window.c:182
#: ../src/balsa-mblist.c:2087
-#, fuzzy
-#| msgid "Other..."
msgid "Other…"
-msgstr "其他..."
+msgstr "其他…"
-#: ../src/balsa-message.c:267
+#: ../src/balsa-message.c:263
msgid "Select message part to display"
msgstr "显示要显示的邮件区段"
-#: ../src/balsa-message.c:319
+#: ../src/balsa-message.c:315
msgid "Wrapped"
msgstr "已换行"
-#: ../src/balsa-message.c:323
+#: ../src/balsa-message.c:319
msgid "Not found"
msgstr "未找到"
-#: ../src/balsa-message.c:564
+#: ../src/balsa-message.c:560
msgid "Find:"
msgstr "查找："
# src/main-window.c:218
-#: ../src/balsa-message.c:576 ../src/toolbar-factory.c:124
+#: ../src/balsa-message.c:572 ../src/toolbar-factory.c:124
msgid "Previous"
msgstr "上一个"
# src/pref-manager.c:66
-#: ../src/balsa-message.c:583 ../src/toolbar-factory.c:125
+#: ../src/balsa-message.c:579 ../src/toolbar-factory.c:125
msgid "Next"
msgstr "下一个"
-#: ../src/balsa-message.c:683
+#: ../src/balsa-message.c:679
msgid "Content"
msgstr "正文"
# src/main-window.c:200
-#: ../src/balsa-message.c:776
+#: ../src/balsa-message.c:772
msgid "Message parts"
msgstr "邮件区段"
# src/main-window.c:133 src/main-window.c:168
-#: ../src/balsa-message.c:953
+#: ../src/balsa-message.c:949
#, fuzzy
#| msgid "Save selected as..."
msgid "Save selected as…"
msgstr "将选择部分保存为..."
# src/main-window.c:133 src/main-window.c:168
-#: ../src/balsa-message.c:960
+#: ../src/balsa-message.c:956
#, fuzzy
#| msgid "Save selected to folder..."
msgid "Save selected to folder…"
msgstr "将选择部分保存到文件夹..."
# src/filter-edit-dialog.c:267
-#: ../src/balsa-message.c:1067
+#: ../src/balsa-message.c:1063
msgid "(No sender)"
msgstr "(没有发信人)"
# src/main-window.c:168
-#: ../src/balsa-message.c:1122 ../src/balsa-message.c:1134
+#: ../src/balsa-message.c:1118 ../src/balsa-message.c:1130
#, fuzzy, c-format
#| msgid "Could not access message %u in mailbox \"%s\"."
msgid "Could not access message %u in mailbox “%s”."
msgstr "无法访问邮箱“%2$s”中的邮件 %1$u。"
-#: ../src/balsa-message.c:1187 ../src/main.c:561
+#: ../src/balsa-message.c:1183 ../src/main.c:528
#, c-format
msgid "Autocrypt error: %s"
msgstr ""
# src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/balsa-message.c:1321
+#: ../src/balsa-message.c:1317
msgid "mixed parts"
msgstr "混合区段"
# src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/balsa-message.c:1323
+#: ../src/balsa-message.c:1319
msgid "alternative parts"
msgstr "可选区段"
-#: ../src/balsa-message.c:1325
+#: ../src/balsa-message.c:1321
msgid "signed parts"
msgstr "签名的区段"
-#: ../src/balsa-message.c:1327
+#: ../src/balsa-message.c:1323
msgid "encrypted parts"
msgstr "加密的区段"
# src/main-window.c:222
-#: ../src/balsa-message.c:1329
+#: ../src/balsa-message.c:1325
msgid "RFC822 message"
msgstr "RFC822 邮件"
-#: ../src/balsa-message.c:1331
+#: ../src/balsa-message.c:1327
#, fuzzy, c-format
#| msgid "\"%s\" parts"
msgid "“%s” parts"
msgstr "“%s” 区段"
-#: ../src/balsa-message.c:1379
+#: ../src/balsa-message.c:1375
msgid "force inline for all parts"
msgstr ""
-#: ../src/balsa-message.c:1422
-#, fuzzy, c-format
-#| msgid "rfc822 message (from %s, subject \"%s\")"
+#: ../src/balsa-message.c:1418
+#, c-format
msgid "RFC822 message (from %s, subject “%s”)"
-msgstr "rfc822 邮件 (来自 %s，主题“%s”)"
+msgstr "RFC822 邮件（来自 %s，主题“%s”）"
# src/main-window.c:107
-#: ../src/balsa-message.c:1434
+#: ../src/balsa-message.c:1430
msgid "complete message"
msgstr "完整邮件"
-#: ../src/balsa-message.c:1451
+#: ../src/balsa-message.c:1447
#, c-format
msgid "part %s: %s (file %s)"
msgstr "%s 区段：%s (%s 文件)"
-#: ../src/balsa-message.c:1462
+#: ../src/balsa-message.c:1458
#, c-format
msgid "part %s: %s"
msgstr "%s 区段：%s"
-#: ../src/balsa-message.c:1476
+#: ../src/balsa-message.c:1472
msgid "encrypted: "
msgstr "已加密："
-#: ../src/balsa-message.c:1612
+#: ../src/balsa-message.c:1608
#, c-format
msgid "Reading embedded message failed: %s"
msgstr "读取嵌入邮件失败：%s"
-#: ../src/balsa-message.c:1620
+#: ../src/balsa-message.c:1616
#, c-format
msgid "Appending message to %s failed: %s"
msgstr "将邮件附加到 %s 失败：%s"
# src/balsa-message.c:160
-#: ../src/balsa-message.c:1649
-#, fuzzy
-#| msgid "_Save"
+#: ../src/balsa-message.c:1645
msgid "_Save…"
-msgstr "保存(_S)"
+msgstr "保存(_S)…"
-#: ../src/balsa-message.c:1658 ../src/balsa-mime-widget-message.c:457
-#, fuzzy
-#| msgid "Copy to folder:"
+#: ../src/balsa-message.c:1654 ../src/balsa-mime-widget-message.c:457
msgid "_Copy to folder…"
-msgstr "复制到文件夹："
+msgstr "复制到文件夹(_C)…"
-#: ../src/balsa-message.c:1738
+#: ../src/balsa-message.c:1734
msgid "Select folder for saving selected parts"
msgstr "选择用于保存选择区段的文件夹"
-#: ../src/balsa-message.c:1763
+#: ../src/balsa-message.c:1759
#, c-format
msgid "Could not create URI for %s"
msgstr "无法为 %s 创建 URI"
# src/main-window.c:200
-#: ../src/balsa-message.c:1788
+#: ../src/balsa-message.c:1784
#, c-format
msgid "%s message part"
msgstr "%s 邮件区段"
-#: ../src/balsa-message.c:1821 ../src/balsa-mime-widget-callbacks.c:164
+#: ../src/balsa-message.c:1817 ../src/balsa-mime-widget-callbacks.c:151
#, c-format
msgid "Could not save %s: %s"
msgstr " 无法保存 %s：%s"
-#: ../src/balsa-message.c:2471 ../src/balsa-message.c:2616
+#: ../src/balsa-message.c:2475 ../src/balsa-message.c:2620
#, fuzzy, c-format
msgid "Sending the disposition notification failed: %s"
msgstr "发送回执失败：%s"
-#: ../src/balsa-message.c:2571
+#: ../src/balsa-message.c:2575
#, fuzzy, c-format
msgid ""
"The sender of this mail, %s, requested \n"
@@ -4179,30 +4313,30 @@ msgstr ""
"您要发送这个通知吗？"
# src/sendmsg-window.c:513
-#: ../src/balsa-message.c:2581
+#: ../src/balsa-message.c:2585
#, fuzzy
msgid "Reply to MDN?"
msgstr "回复 MDN？"
-#: ../src/balsa-message.c:2791
+#: ../src/balsa-message.c:2795
msgid ""
"The decryption cannot be performed because this message is displayed more "
"than once.\n"
"Please close the other instances of this message and try again."
msgstr ""
-#: ../src/balsa-message.c:2812 ../src/balsa-message.c:2897
-#: ../src/balsa-message.c:3023
+#: ../src/balsa-message.c:2816 ../src/balsa-message.c:2901
+#: ../src/balsa-message.c:3027
#, c-format
msgid "Parsing a message part failed: %s"
msgstr "解析邮件区段失败： %s"
-#: ../src/balsa-message.c:2813 ../src/balsa-message.c:2898
-#: ../src/balsa-message.c:3024
+#: ../src/balsa-message.c:2817 ../src/balsa-message.c:2902
+#: ../src/balsa-message.c:3028
msgid "Possible disk space problem."
msgstr "可能是磁盘空间问题。"
-#: ../src/balsa-message.c:2827
+#: ../src/balsa-message.c:2831
#, fuzzy, c-format
#| msgid ""
#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
@@ -4214,7 +4348,7 @@ msgstr ""
"%s 发送的主题为“%s”的邮件包含8位字符，但信头没有描述其使用的编码集(已转换为 "
"%s)"
-#: ../src/balsa-message.c:2835
+#: ../src/balsa-message.c:2839
#, fuzzy, c-format
#| msgid ""
#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
@@ -4226,14 +4360,14 @@ msgstr ""
"%s 发送的主题为“%s”的邮件包含8位字符，但信头没有描述其使用的编码集(已转换为 "
"%s)"
-#: ../src/balsa-message.c:2848
+#: ../src/balsa-message.c:2852
#, c-format
msgid ""
"The message sent by %s with subject “%s” contains a S/MIME encrypted part, "
"but this crypto protocol is not available."
msgstr ""
-#: ../src/balsa-message.c:2915
+#: ../src/balsa-message.c:2919
#, fuzzy, c-format
#| msgid ""
#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
@@ -4245,7 +4379,7 @@ msgstr ""
"%s 发送的主题为“%s”的邮件包含8位字符，但信头没有描述其使用的编码集(已转换为 "
"%s)"
-#: ../src/balsa-message.c:2928
+#: ../src/balsa-message.c:2932
#, fuzzy, c-format
#| msgid ""
#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
@@ -4257,19 +4391,19 @@ msgstr ""
"%s 发送的主题为“%s”的邮件包含8位字符，但信头没有描述其使用的编码集(已转换为 "
"%s)"
-#: ../src/balsa-message.c:2931
+#: ../src/balsa-message.c:2935
msgid "PGP"
msgstr "PGP"
-#: ../src/balsa-message.c:2960
+#: ../src/balsa-message.c:2964
msgid "Detected a good signature with insufficient validity"
msgstr ""
-#: ../src/balsa-message.c:2965 ../src/balsa-message.c:3090
+#: ../src/balsa-message.c:2969 ../src/balsa-message.c:3094
msgid "Detected a good signature with insufficient validity/trust"
msgstr ""
-#: ../src/balsa-message.c:2975 ../src/balsa-message.c:3099
+#: ../src/balsa-message.c:2979 ../src/balsa-message.c:3103
#, c-format
msgid ""
"Checking the signature of the message sent by %s with subject “%s” "
@@ -4277,26 +4411,26 @@ msgid ""
"%s"
msgstr ""
-#: ../src/balsa-message.c:2988
+#: ../src/balsa-message.c:2992
#, c-format
msgid ""
"Checking the signature of the message sent by %s with subject “%s” failed "
"with an error!"
msgstr ""
-#: ../src/balsa-message.c:3050
+#: ../src/balsa-message.c:3054
msgid ""
"The decryption cannot be performed because this message is displayed more "
"than once."
msgstr ""
-#: ../src/balsa-message.c:3052
+#: ../src/balsa-message.c:3056
msgid ""
"The signature check and removal of the OpenPGP armor cannot be performed "
"because this message is displayed more than once."
msgstr ""
-#: ../src/balsa-message.c:3055
+#: ../src/balsa-message.c:3059
msgid "Please close the other instances of this message and try again."
msgstr ""
@@ -4332,7 +4466,7 @@ msgstr "没有定义针对该内容类型的打开或查看操作"
msgid "S_ave part"
msgstr "保存区段(_A)"
-#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1409
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1402
#, c-format
msgid "Could not launch application: %s"
msgstr "无法启动应用程序：%s"
@@ -4344,23 +4478,19 @@ msgid "Save %s MIME Part"
msgstr "保存%s MIME 区段"
# src/main-window.c:171
-#: ../src/balsa-mime-widget-callbacks.c:122
+#: ../src/balsa-mime-widget-callbacks.c:123
#, fuzzy, c-format
#| msgid "Could not construct uri from %s"
msgid "Could not construct URI from %s"
msgstr "无法从 %s 构建 URI"
-#: ../src/balsa-mime-widget-callbacks.c:141
-msgid "File already exists. Overwrite?"
-msgstr "文件已经存在。要覆盖吗？"
-
# src/mailbox-conf.c:531
-#: ../src/balsa-mime-widget-callbacks.c:151
+#: ../src/balsa-mime-widget-callbacks.c:137
#, c-format
msgid "Unlink %s: %s"
msgstr "取消链接 %s：%s"
-#: ../src/balsa-mime-widget-crypto.c:76 ../src/balsa-mime-widget-text.c:253
+#: ../src/balsa-mime-widget-crypto.c:76 ../src/balsa-mime-widget-text.c:254
#, c-format
msgid "Could not save a text part: %s"
msgstr " 无法保存文本区段：%s "
@@ -4375,51 +4505,63 @@ msgstr "无法打开废件箱：%s"
msgid "_Import Autocrypt key"
msgstr ""
-#: ../src/balsa-mime-widget-crypto.c:148
+#: ../src/balsa-mime-widget-crypto.c:149
+msgid ""
+"The message contains an Autocrypt header, but it is either broken or the "
+"signature has been created using a different key."
+msgstr ""
+
+#: ../src/balsa-mime-widget-crypto.c:153
+msgid ""
+"The message contains an Autocrypt header which is ignored as none of your "
+"identities has Autocrypt support enabled."
+msgstr ""
+
+#: ../src/balsa-mime-widget-crypto.c:158
msgid "_Search key server for this key"
msgstr ""
-#: ../src/balsa-mime-widget-crypto.c:150
+#: ../src/balsa-mime-widget-crypto.c:160
#, fuzzy
#| msgid "_Run GnuPG to check for an update of this key"
msgid "_Search key server for updates of this key"
msgstr "运行 GnuPG 来检查该密钥的更新(_R)"
-#: ../src/balsa-mime-widget-crypto.c:194
+#: ../src/balsa-mime-widget-crypto.c:204
#, fuzzy
#| msgid "encrypted: "
msgid "decrypted"
msgstr "已加密："
# src/pref-manager.c:397
-#: ../src/balsa-mime-widget-crypto.c:207
+#: ../src/balsa-mime-widget-crypto.c:217
#, fuzzy
#| msgid "_Execute signature"
msgid "trusted signature"
msgstr "执行签名(_E)"
# src/pref-manager.c:397
-#: ../src/balsa-mime-widget-crypto.c:210
+#: ../src/balsa-mime-widget-crypto.c:220
#, fuzzy
#| msgid "_Execute signature"
msgid "low trust signature"
msgstr "执行签名(_E)"
# src/pref-manager.c:397
-#: ../src/balsa-mime-widget-crypto.c:213
+#: ../src/balsa-mime-widget-crypto.c:223
#, fuzzy
#| msgid "Signature"
msgid "bad signature"
msgstr "签名"
# src/pref-manager.c:397
-#: ../src/balsa-mime-widget-crypto.c:216
+#: ../src/balsa-mime-widget-crypto.c:226
#, fuzzy
#| msgid "No signature found!"
msgid "unknown signature status"
msgstr "未找到签名！"
-#: ../src/balsa-mime-widget-crypto.c:302
+#: ../src/balsa-mime-widget-crypto.c:312
#, c-format
msgid ""
"Import GnuPG key:\n"
@@ -4427,21 +4569,21 @@ msgid ""
msgstr ""
# src/sendmsg-window.c:71
-#: ../src/balsa-mime-widget-crypto.c:309
+#: ../src/balsa-mime-widget-crypto.c:319
#, fuzzy, c-format
#| msgid "Error printing message: %s"
msgid "Error importing key data: %s"
msgstr "打印邮件时发生错误：%s"
-#: ../src/balsa-mime-widget-crypto.c:309 ../src/sendmsg-window.c:1677
+#: ../src/balsa-mime-widget-crypto.c:319 ../src/sendmsg-window.c:1673
msgid "unknown error"
msgstr "未知错误"
-#: ../src/balsa-mime-widget-crypto.c:346
+#: ../src/balsa-mime-widget-crypto.c:356
msgid "(imported)"
msgstr ""
-#: ../src/balsa-mime-widget-crypto.c:354
+#: ../src/balsa-mime-widget-crypto.c:364
msgid "Import key into the local key ring"
msgstr ""
@@ -4514,8 +4656,8 @@ msgstr "主题：%s\n"
msgid "Se_nd message to obtain this part"
msgstr "发送邮件以获取该区段(_N)"
-#: ../src/balsa-mime-widget-message.c:325 ../src/balsa-mime-widget-text.c:885
-#: ../src/sendmsg-window.c:1435
+#: ../src/balsa-mime-widget-message.c:325 ../src/balsa-mime-widget-text.c:886
+#: ../src/sendmsg-window.c:1428
#, c-format
msgid "Error showing %s: %s\n"
msgstr "显示 %s 出错：%s\n"
@@ -4546,15 +4688,15 @@ msgstr ""
# src/balsa-message.c:558 src/sendmsg-window.c:358
#: ../src/balsa-mime-widget-message.c:735
-#: ../src/balsa-print-object-header.c:131 ../src/sendmsg-window.c:711
-#: ../src/sendmsg-window.c:713 ../src/sendmsg-window.c:804
-#: ../src/sendmsg-window.c:3575 ../src/sendmsg-window.c:5117
+#: ../src/balsa-print-object-header.c:131 ../src/sendmsg-window.c:704
+#: ../src/sendmsg-window.c:706 ../src/sendmsg-window.c:797
+#: ../src/sendmsg-window.c:3571 ../src/sendmsg-window.c:5113
msgid "Subject:"
msgstr "主题："
# src/balsa-message.c:519
#: ../src/balsa-mime-widget-message.c:740
-#: ../src/balsa-print-object-header.c:139 ../src/sendmsg-window.c:3571
+#: ../src/balsa-print-object-header.c:139 ../src/sendmsg-window.c:3567
msgid "Date:"
msgstr "时间："
@@ -4562,7 +4704,7 @@ msgstr "时间："
# src/sendmsg-window.c:338
#. addresses
#: ../src/balsa-mime-widget-message.c:746
-#: ../src/balsa-print-object-header.c:144 ../src/sendmsg-window.c:3582
+#: ../src/balsa-print-object-header.c:144 ../src/sendmsg-window.c:3578
msgid "From:"
msgstr "发件人："
@@ -4581,109 +4723,105 @@ msgstr ""
msgid "Disposition-Notification-To:"
msgstr "发送阅读通告至："
-#: ../src/balsa-mime-widget-text.c:583
+#: ../src/balsa-mime-widget-text.c:584 ../src/balsa-mime-widget-text.c:1210
msgid "Copy link"
msgstr "复制链接"
# src/main-window.c:159
-#: ../src/balsa-mime-widget-text.c:588
+#: ../src/balsa-mime-widget-text.c:589 ../src/balsa-mime-widget-text.c:1214
msgid "Open link"
msgstr "打开链接"
# src/sendmsg-window.c:71
-#: ../src/balsa-mime-widget-text.c:593
+#: ../src/balsa-mime-widget-text.c:594 ../src/balsa-mime-widget-text.c:1218
msgid "Send link…"
msgstr "发送链接…"
# src/balsa-message.c:160
-#: ../src/balsa-mime-widget-text.c:625 ../src/balsa-mime-widget-text.c:1147
+#: ../src/balsa-mime-widget-text.c:626 ../src/balsa-mime-widget-text.c:1164
msgid "Save…"
msgstr "保存…"
-#: ../src/balsa-mime-widget-text.c:633
+#: ../src/balsa-mime-widget-text.c:634
msgid "Highlight structured phrases"
msgstr ""
-#: ../src/balsa-mime-widget-text.c:870
+#: ../src/balsa-mime-widget-text.c:871
#, fuzzy, c-format
#| msgid "Calling URL %s..."
msgid "Calling URL %s…"
msgstr "正运行 URL %s..."
-#: ../src/balsa-mime-widget-text.c:1114
-#, fuzzy
-#| msgid "Zoom _In"
+#: ../src/balsa-mime-widget-text.c:1131
msgid "Zoom In"
-msgstr "放大(_I)"
+msgstr "放大"
-#: ../src/balsa-mime-widget-text.c:1119
-#, fuzzy
-#| msgid "Zoom _Out"
+#: ../src/balsa-mime-widget-text.c:1136
msgid "Zoom Out"
-msgstr "缩小(_O)"
+msgstr "缩小"
-#: ../src/balsa-mime-widget-text.c:1124
+#: ../src/balsa-mime-widget-text.c:1141
#, fuzzy
#| msgid "Zoom _100%"
msgid "Zoom 100%"
msgstr "缩放到_100%"
# src/main-window.c:215
-#: ../src/balsa-mime-widget-text.c:1133 ../ui/main-window.ui.h:21
+#: ../src/balsa-mime-widget-text.c:1150 ../ui/main-window.ui.h:21
#: ../ui/message-window.ui.h:7 ../ui/sendmsg-window.ui.h:19
msgid "Select _All"
msgstr "全部选中(_A)"
# src/main-window.c:222 src/sendmsg-window.c:78
-#: ../src/balsa-mime-widget-text.c:1156
+#: ../src/balsa-mime-widget-text.c:1173
msgid "Print…"
msgstr "打印…"
+#: ../src/balsa-mime-widget-text.c:1183
+msgid "Prefer HTML for this sender"
+msgstr ""
+
+#: ../src/balsa-mime-widget-text.c:1190
+msgid "Load external content for this sender"
+msgstr ""
+
# src/pref-manager.c:387
-#: ../src/balsa-mime-widget-text.c:1305
+#: ../src/balsa-mime-widget-text.c:1375
#, fuzzy
#| msgid "Store Address"
msgid "S_tore Address"
msgstr "保存地址"
# src/filter-edit-dialog.c:101
-#: ../src/balsa-mime-widget-text.c:1311
+#: ../src/balsa-mime-widget-text.c:1381
msgid "Full Name:"
msgstr "全名："
# src/filter-edit-dialog.c:101
-#: ../src/balsa-mime-widget-text.c:1312
-#, fuzzy
-#| msgid "Nick Name"
+#: ../src/balsa-mime-widget-text.c:1382
msgid "Nick Name:"
-msgstr "昵称"
+msgstr "昵称："
# src/filter-edit-dialog.c:456
-#: ../src/balsa-mime-widget-text.c:1313
-#, fuzzy
-#| msgid "_First Name:"
+#: ../src/balsa-mime-widget-text.c:1383
msgid "First Name:"
-msgstr "名(_F)："
+msgstr "名称："
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../src/balsa-mime-widget-text.c:1314
-#, fuzzy
-#| msgid "_Last Name:"
+#: ../src/balsa-mime-widget-text.c:1384
msgid "Last Name:"
-msgstr "姓(_L)："
+msgstr "姓氏："
-#: ../src/balsa-mime-widget-text.c:1315
+#: ../src/balsa-mime-widget-text.c:1385
msgid "Organization:"
msgstr "组织："
# src/balsa-init.c:261 src/pref-manager.c:377
-#: ../src/balsa-mime-widget-text.c:1316
-#, fuzzy
-#| msgid "_Email Address:"
+#: ../src/balsa-mime-widget-text.c:1386
msgid "Email Address:"
-msgstr "电子邮件地址(_E)："
+msgstr "电子邮件地址："
-#: ../src/balsa-mime-widget-text.c:1344
+#: ../src/balsa-mime-widget-text.c:1414
#, fuzzy, c-format
#| msgid ""
#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
@@ -4915,19 +5053,19 @@ msgid "C_lear"
msgstr "清除(_L)"
# src/filter-edit-dialog.c:279
-#: ../src/filter-edit-callbacks.c:954 ../src/main-window.c:3824
+#: ../src/filter-edit-callbacks.c:954 ../src/main-window.c:3874
msgid "_Body"
msgstr "信体(_B)"
# src/balsa-message.c:526 src/filter-edit-dialog.c:291
# src/sendmsg-window.c:315
-#: ../src/filter-edit-callbacks.c:955 ../src/main-window.c:3825
+#: ../src/filter-edit-callbacks.c:955 ../src/main-window.c:3875
msgid "_To:"
msgstr "收件人(_T)："
# src/balsa-message.c:544 src/filter-edit-dialog.c:303
# src/sendmsg-window.c:338
-#: ../src/filter-edit-callbacks.c:956 ../src/main-window.c:3826
+#: ../src/filter-edit-callbacks.c:956 ../src/main-window.c:3876
msgid "_From:"
msgstr "发件人(_F)："
@@ -4936,7 +5074,7 @@ msgstr "发件人(_F)："
msgid "_Subject"
msgstr "主题(_S)"
-#: ../src/filter-edit-callbacks.c:958 ../src/main-window.c:3828
+#: ../src/filter-edit-callbacks.c:958 ../src/main-window.c:3878
msgid "_CC:"
msgstr "抄送(_C)："
@@ -4991,7 +5129,7 @@ msgstr "搜索类型(_Y)："
msgid "Edit condition for filter: "
msgstr "编辑过滤条件："
-#: ../src/filter-edit-callbacks.c:1475 ../src/save-restore.c:1944
+#: ../src/filter-edit-callbacks.c:1475 ../src/save-restore.c:1950
msgid "Filter with no condition was omitted"
msgstr "没有条件的过滤规则被忽略"
@@ -5033,7 +5171,7 @@ msgstr "您必须提供要播放的声音"
msgid "(Example: write December 31, 2000, as %s)"
msgstr ""
-#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:225
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:226
msgid "Simple"
msgstr "简单"
@@ -5087,8 +5225,6 @@ msgstr "和"
#. new button
#. Translators: button "New" filter
#: ../src/filter-edit-dialog.c:225
-#, fuzzy
-#| msgid "_New"
msgctxt "filter"
msgid "_New"
msgstr "新建(_N)"
@@ -5148,7 +5284,7 @@ msgid "Use Sound…"
msgstr "使用声音…"
# src/main-window.c:159
-#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1050
+#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1046
msgid "_Open"
msgstr "打开(_O)"
@@ -5610,17 +5746,13 @@ msgstr ""
# src/main-window.c:213
#: ../src/information-dialog.c:231
-#, fuzzy
-#| msgid "Information - Balsa"
msgid "Information — Balsa"
-msgstr "信息 - Balsa"
+msgstr "信息 — Balsa"
# src/main-window.c:161
-#: ../src/information-dialog.c:235 ../src/main-window.c:3845
-#, fuzzy
-#| msgid "C_lear"
+#: ../src/information-dialog.c:235 ../src/main-window.c:3895
msgid "_Clear"
-msgstr "清除(_L)"
+msgstr "清除(_C)"
#: ../src/information-dialog.c:236
msgid "Cl_ose"
@@ -5801,8 +5933,8 @@ msgstr ""
"检查签名(_D)："
# src/filter-edit-dialog.c:721
-#: ../src/mailbox-conf.c:907 ../src/pref-manager.c:211
-#: ../src/pref-manager.c:1150
+#: ../src/mailbox-conf.c:907 ../src/pref-manager.c:212
+#: ../src/pref-manager.c:1151
msgid "Never"
msgstr "从不"
@@ -5810,7 +5942,7 @@ msgstr "从不"
msgid "If Possible"
msgstr "如果可能"
-#: ../src/mailbox-conf.c:909 ../src/pref-manager.c:1152
+#: ../src/mailbox-conf.c:909 ../src/pref-manager.c:1153
msgid "Always"
msgstr "总是"
@@ -5833,18 +5965,18 @@ msgstr "隐藏邮件(_I)"
msgid "_Merge threads with the same subject"
msgstr ""
-#: ../src/mailbox-node.c:278
+#: ../src/mailbox-node.c:275
#, fuzzy
msgid "The folder edition to be written."
msgstr "要写入的文件夹版本。"
-#: ../src/mailbox-node.c:457
+#: ../src/mailbox-node.c:454
#, fuzzy, c-format
#| msgid "Scanning %s. Please wait..."
msgid "Scanning %s. Please wait…"
msgstr "正在扫描 %s。请等待..."
-#: ../src/mailbox-node.c:473
+#: ../src/mailbox-node.c:470
#, c-format
msgid ""
"Scanning of %s failed: %s\n"
@@ -5854,45 +5986,50 @@ msgstr ""
"请检查网络连接。"
# src/balsa-message.c:231 src/balsa-message.c:246
-#: ../src/mailbox-node.c:475
+#: ../src/mailbox-node.c:472
#, c-format
msgid "Scanning of %s failed: %s"
msgstr "扫描 %s 失败：%s"
-#: ../src/mailbox-node.c:967
+#. FIXME : Perhaps should we be able to apply filters on
+#. folders (ie recurse on all mailboxes in it), but there are
+#. problems of infinite recursion (when one mailbox being
+#. filtered is also the destination of the filter action (eg a
+#. copy)). So let's see that later :)
+#: ../src/mailbox-node.c:963
#, fuzzy
#| msgid "You can apply filters only on mailbox\n"
msgid "You can apply filters only on mailbox"
msgstr "您只能对邮箱应用过滤规则\n"
# src/mailbox-conf.c:640
-#: ../src/mailbox-node.c:1001
+#: ../src/mailbox-node.c:997
#, fuzzy
#| msgid "Local _mbox mailbox..."
msgid "Local _mbox mailbox…"
msgstr "本地 _mbox 邮箱..."
# src/mailbox-conf.c:640
-#: ../src/mailbox-node.c:1003
+#: ../src/mailbox-node.c:999
#, fuzzy
#| msgid "Local Mail_dir mailbox..."
msgid "Local Mail_dir mailbox…"
msgstr "本地 Mail_dir 邮箱..."
# src/mailbox-conf.c:640
-#: ../src/mailbox-node.c:1005
+#: ../src/mailbox-node.c:1001
#, fuzzy
#| msgid "Local M_H mailbox..."
msgid "Local M_H mailbox…"
msgstr "本地 M_H 邮箱..."
-#: ../src/mailbox-node.c:1008
+#: ../src/mailbox-node.c:1004
#, fuzzy
#| msgid "Remote IMAP folder"
msgid "Remote IMAP _folder…"
msgstr "远程 IMAP 文件夹"
-#: ../src/mailbox-node.c:1011
+#: ../src/mailbox-node.c:1007
#, fuzzy
#| msgid "Remote IMAP subfolder"
msgid "Remote IMAP _subfolder…"
@@ -5900,7 +6037,7 @@ msgstr "远程 IMAP 子文件夹"
# src/main-window.c:107
#. Translators: popup menu item "New" mailbox or folder
-#: ../src/mailbox-node.c:1017
+#: ../src/mailbox-node.c:1013
#, fuzzy
#| msgid "_New"
msgctxt "mailbox"
@@ -5908,135 +6045,135 @@ msgid "_New"
msgstr "新建(_N)"
#. clicked on the empty space
-#: ../src/mailbox-node.c:1024 ../src/mailbox-node.c:1040
+#: ../src/mailbox-node.c:1020 ../src/mailbox-node.c:1036
msgid "_Rescan"
msgstr "重新扫描(_R)"
-#: ../src/mailbox-node.c:1034
+#: ../src/mailbox-node.c:1030
#, fuzzy
#| msgid "_Properties"
msgid "_Properties…"
msgstr "属性(_P)"
-#: ../src/mailbox-node.c:1064
+#: ../src/mailbox-node.c:1060
msgid "Mark as _Inbox"
msgstr "标记为收件箱(_I)"
-#: ../src/mailbox-node.c:1066
+#: ../src/mailbox-node.c:1062
msgid "_Mark as Sentbox"
msgstr "标记为已发(_M)"
-#: ../src/mailbox-node.c:1068
+#: ../src/mailbox-node.c:1064
msgid "Mark as _Trash"
msgstr "标记为已删除(_T)"
-#: ../src/mailbox-node.c:1070
+#: ../src/mailbox-node.c:1066
msgid "Mark as D_raftbox"
msgstr "标记为草稿(_R)"
-#: ../src/mailbox-node.c:1073
+#: ../src/mailbox-node.c:1069
msgid "_Empty trash"
msgstr "清空废件箱(_E)"
-#: ../src/mailbox-node.c:1078
+#: ../src/mailbox-node.c:1074
msgid "_Edit/Apply filters"
msgstr "编辑/应用过滤规则(_E)"
-#: ../src/mailbox-node.c:1165
+#: ../src/mailbox-node.c:1161
#, fuzzy, c-format
#| msgid "The path \"%s\" does not lead to a mailbox."
msgid "The path “%s” does not lead to a mailbox."
msgstr "“%s”路径没有指向一个邮箱。"
-#: ../src/main.c:117 ../src/main.c:122 ../src/main.c:128 ../src/main.c:134
-#: ../src/main.c:140
+#: ../src/main.c:116 ../src/main.c:121 ../src/main.c:127 ../src/main.c:133
+#: ../src/main.c:139
#, fuzzy, c-format
#| msgid "Balsa cannot open your \"%s\" mailbox."
msgid "Balsa cannot open your “%s” mailbox."
msgstr "Balsa 无法打开您的“%s”邮箱。"
# src/balsa-init.c:590
-#: ../src/main.c:117
+#: ../src/main.c:116
msgid "Inbox"
msgstr "收件箱"
# src/balsa-init.c:598
-#: ../src/main.c:123
+#: ../src/main.c:122
msgid "Outbox"
msgstr "发件箱"
# src/balsa-init.c:590
-#: ../src/main.c:129
+#: ../src/main.c:128
msgid "Sentbox"
msgstr "已发送邮件"
-#: ../src/main.c:135
+#: ../src/main.c:134
msgid "Draftbox"
msgstr "草稿箱"
# src/balsa-init.c:606
-#: ../src/main.c:140
+#: ../src/main.c:139
#, fuzzy
msgid "Trash"
msgstr "已删除邮件"
-#: ../src/main.c:354
+#: ../src/main.c:353
#, fuzzy
#| msgid "Compressing mail folders..."
msgid "Compressing mail folders…"
msgstr "正在压缩邮件文件夹..."
# src/main-window.c:90
-#: ../src/main.c:644
+#: ../src/main.c:597
#, fuzzy
#| msgid "Get new mail on startup"
msgid "Get new mail on start-up"
msgstr "在启动时收取新邮件"
-#: ../src/main.c:646
+#: ../src/main.c:599
msgid "Compose a new email to EMAIL@ADDRESS"
msgstr "撰写给 EMAIL@ADDRESS 的新邮件"
# src/sendmsg-window.c:239
-#: ../src/main.c:648
+#: ../src/main.c:601
#, fuzzy
#| msgid "Attach file at PATH"
msgid "Attach file at URI"
msgstr "在 URI 中附加文件"
-#: ../src/main.c:650
+#: ../src/main.c:603
msgid "Opens MAILBOXNAME"
msgstr "打开 MAILBOXNAME"
-#: ../src/main.c:650
+#: ../src/main.c:603
msgid "MAILBOXNAME"
msgstr "MAILBOXNAME"
# src/main-window.c:159
-#: ../src/main.c:652
+#: ../src/main.c:605
msgid "Opens first unread mailbox"
msgstr "打开第一个未读的邮箱"
# src/main-window.c:90
-#: ../src/main.c:654
+#: ../src/main.c:607
#, fuzzy
#| msgid "Opens default Inbox on startup"
msgid "Opens default Inbox on start-up"
msgstr "启动时打开默认的收件箱"
# src/main-window.c:222
-#: ../src/main.c:656
+#: ../src/main.c:609
#, fuzzy
msgid "Prints number unread and unsent messages"
msgstr "打印未读和未发邮件的数量"
-#: ../src/main.c:658
+#: ../src/main.c:611
#, fuzzy
#| msgid "Show icon"
msgid "Show version"
msgstr "显示图标"
-#: ../src/main-window.c:333
+#: ../src/main-window.c:326
msgid ""
"Balsa is sending a mail now.\n"
"Abort sending?"
@@ -6044,74 +6181,74 @@ msgstr ""
"Balsa 正在发送邮件。\n"
"中止发送？"
-#: ../src/main-window.c:491
+#: ../src/main-window.c:492
msgid "Subject or Sender Contains:"
msgstr "主题或发信人中包含："
-#: ../src/main-window.c:492
+#: ../src/main-window.c:493
msgid "Subject or Recipient Contains:"
msgstr "主题或收信人中包含："
-#: ../src/main-window.c:493
+#: ../src/main-window.c:494
msgid "Subject Contains:"
msgstr "主题包含："
# src/filter-edit-dialog.c:279
-#: ../src/main-window.c:494
+#: ../src/main-window.c:495
msgid "Body Contains:"
msgstr "邮件主体包含："
-#: ../src/main-window.c:495
+#: ../src/main-window.c:496
msgid "Older than (days):"
msgstr "早于(天数)："
-#: ../src/main-window.c:496
+#: ../src/main-window.c:497
msgid "Old at most (days):"
msgstr "最早(天数)："
-#: ../src/main-window.c:1010
+#: ../src/main-window.c:1065
msgid "translator-credits"
msgstr "开源软件国际化简体中文组"
-#: ../src/main-window.c:1021
+#: ../src/main-window.c:1076
msgid "The Balsa email client is part of the GNOME desktop environment."
msgstr "Balsa 电子邮件客户端是 GNOME 桌面环境的组成部分。"
# src/filter-edit-dialog.c:749
#. license ?
-#: ../src/main-window.c:1026
+#: ../src/main-window.c:1081
msgid "About Balsa"
msgstr "关于 Balsa"
-#: ../src/main-window.c:1048
+#: ../src/main-window.c:1102
#, fuzzy
#| msgid "Balsa closes files and connections. Please wait..."
msgid "Balsa closes files and connections. Please wait…"
msgstr "Balsa 正在关闭文件和连接。请等待..."
-#: ../src/main-window.c:1447
+#: ../src/main-window.c:1504
msgid "You can apply filters only on mailbox\n"
msgstr "您只能对邮箱应用过滤规则\n"
# src/main-window.c:182
-#: ../src/main-window.c:1467
+#: ../src/main-window.c:1524
#, c-format
msgid "Removing duplicates failed: %s"
msgstr "移除重复邮件失败：%s"
-#: ../src/main-window.c:1473
+#: ../src/main-window.c:1530
#, c-format
msgid "Removed %d duplicate"
msgid_plural "Removed %d duplicates"
msgstr[0] "移除了 %d 封重复邮件`"
# src/pref-manager.c:397
-#: ../src/main-window.c:1478
+#: ../src/main-window.c:1535
msgid "No duplicates found"
msgstr "未找到重复邮件"
# src/index-child.c:176
-#: ../src/main-window.c:2968
+#: ../src/main-window.c:2985
#, c-format
msgid ""
"Unable to Open Mailbox!\n"
@@ -6120,103 +6257,101 @@ msgstr ""
"无法打开邮箱！\n"
"%s。"
-#: ../src/main-window.c:2996
+#: ../src/main-window.c:3015
#, c-format
msgid "Opening %s"
msgstr "正在打开 %s"
# src/sendmsg-window.c:71
-#: ../src/main-window.c:3259 ../src/main-window.c:3414
-#: ../src/main-window.c:3535 ../src/main-window.c:3545
+#: ../src/main-window.c:3282 ../src/main-window.c:3437
+#: ../src/main-window.c:3558 ../src/main-window.c:3568
msgid "Checking Mail…"
msgstr "正在检查邮件…"
# src/mailbox-conf.c:939
-#: ../src/main-window.c:3497 ../src/main-window.c:3502
-#: ../src/main-window.c:3535 ../src/main-window.c:3540
-#, fuzzy
-#| msgid "Mail_boxes"
+#: ../src/main-window.c:3520 ../src/main-window.c:3525
+#: ../src/main-window.c:3558 ../src/main-window.c:3563
msgid "Mailboxes"
-msgstr "邮箱(_B)"
+msgstr "邮箱"
# src/mailbox-conf.c:640
-#: ../src/main-window.c:3498
+#: ../src/main-window.c:3521
#, c-format
msgid "IMAP mailbox: %s"
msgstr "IMAP 邮箱：%s"
# src/mailbox-conf.c:640
-#: ../src/main-window.c:3503
+#: ../src/main-window.c:3526
#, c-format
msgid "Local mailbox: %s"
msgstr "本地邮箱：%s"
-#: ../src/main-window.c:3576
+#: ../src/main-window.c:3604
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "您已收到 %d 封新邮件。"
-#: ../src/main-window.c:3579
+#: ../src/main-window.c:3609
msgid "You have new mail."
msgstr "您有新邮件。"
# src/mailbox-conf.c:640
-#: ../src/main-window.c:3779
+#: ../src/main-window.c:3829
msgid "Search mailbox"
msgstr "搜索邮箱"
# src/filter-edit-dialog.c:536
-#: ../src/main-window.c:3802
+#: ../src/main-window.c:3852
msgid "_Search for:"
msgstr "搜索内容(_S)："
# src/balsa-init.c:590
#. builds the toggle buttons to specify fields concerned by
#. * the search.
-#: ../src/main-window.c:3815
+#: ../src/main-window.c:3865
msgid "In:"
msgstr "位于："
# src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/main-window.c:3827
+#: ../src/main-window.c:3877
msgid "S_ubject"
msgstr "主题(_U)"
# src/sendmsg-window.c:71
#. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3832
+#: ../src/main-window.c:3882
msgid "Show only matching messages"
msgstr "只显示匹配的邮件"
# src/main-window.c:211
#. Frame with OK button
-#: ../src/main-window.c:3853
+#: ../src/main-window.c:3903
msgid "Open next matching message"
msgstr "打开下一封匹配的邮件"
-#: ../src/main-window.c:3865
+#: ../src/main-window.c:3915
msgid "_Reverse search"
msgstr "反向搜索(_R)"
-#: ../src/main-window.c:3870
+#: ../src/main-window.c:3920
msgid "_Wrap around"
msgstr "自动换行(_W)"
# src/main-window.c:171
-#: ../src/main-window.c:4090
+#: ../src/main-window.c:4140
#, fuzzy, c-format
msgid "Could not open trash: %s"
msgstr "无法打开废件箱：%s"
-#: ../src/main-window.c:4220
+#: ../src/main-window.c:4260
#, fuzzy, c-format
#| msgid "Balsa: %s (readonly)"
msgid "Balsa: %s (read-only)"
msgstr "Balsa：%s (只读)"
# src/filter-edit-dialog.c:749
-#: ../src/main-window.c:4222
+#: ../src/main-window.c:4262
#, c-format
msgid "Balsa: %s"
msgstr "Balsa：%s"
@@ -6224,37 +6359,37 @@ msgstr "Balsa：%s"
# src/mailbox-conf.c:640
#. xgettext: this is the first part of the message
#. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4774
+#: ../src/main-window.c:4814
#, c-format
msgid "Shown mailbox: %s "
msgstr "已显示邮箱：%s"
# src/main-window.c:222
-#: ../src/main-window.c:4779
+#: ../src/main-window.c:4819
#, c-format
msgid "with %d message"
msgid_plural "with %d messages"
msgstr[0] "含 %d 封邮件"
-#: ../src/main-window.c:4786
+#: ../src/main-window.c:4826
#, c-format
msgid ", %d new"
msgid_plural ", %d new"
msgstr[0] "，%d 封新"
-#: ../src/main-window.c:4793
+#: ../src/main-window.c:4833
#, c-format
msgid ", %d hidden"
msgid_plural ", %d hidden"
msgstr[0] "，%d 封隐藏"
# src/main-window.c:211
-#: ../src/main-window.c:4838
+#: ../src/main-window.c:4874
#, c-format
msgid "The next unread message is in %s"
msgstr "下一封未读邮件位于 %s 中"
-#: ../src/main-window.c:4845
+#: ../src/main-window.c:4881
#, c-format
msgid "Do you want to select %s?"
msgstr "您想选择 %s 吗？"
@@ -6271,207 +6406,199 @@ msgid "Message from %s: %s"
msgstr "邮件发自 %s：%s"
# src/main-window.c:211
-#: ../src/pref-manager.c:209
+#: ../src/pref-manager.c:210
msgid "While retrieving messages"
msgstr "在下载邮件时"
-#: ../src/pref-manager.c:210
+#: ../src/pref-manager.c:211
msgid "Until closed"
msgstr "直到关闭时"
# src/main-window.c:200
-#: ../src/pref-manager.c:216
-#, fuzzy
+#: ../src/pref-manager.c:217
msgid "Message number"
-msgstr "邮件数量"
+msgstr "邮件编号"
-# src/sendmsg-window.c:88
-#: ../src/pref-manager.c:220
-msgid "Sender"
-msgstr "发信人"
-
-#: ../src/pref-manager.c:224
+#: ../src/pref-manager.c:225
#, fuzzy
msgid "Flat"
msgstr "平"
-#: ../src/pref-manager.c:226
+#: ../src/pref-manager.c:227
msgid "JWZ"
msgstr "JWZ"
-#: ../src/pref-manager.c:941 ../src/pref-manager.c:3565
+#: ../src/pref-manager.c:942 ../src/pref-manager.c:3609
msgid "Unknown"
msgstr "未知"
-#: ../src/pref-manager.c:944
+#: ../src/pref-manager.c:945
#, c-format
msgid "%s (default)"
msgstr "%s(默认)"
-#: ../src/pref-manager.c:1061
+#: ../src/pref-manager.c:1062
msgid "Default layout"
msgstr "默认布局"
# src/main-window.c:139
-#: ../src/pref-manager.c:1062
+#: ../src/pref-manager.c:1063
msgid "Wide message layout"
msgstr "宽幅邮件布局"
-#: ../src/pref-manager.c:1063
+#: ../src/pref-manager.c:1064
msgid "Wide screen layout"
msgstr "宽屏布局"
# src/main-window.c:211
-#: ../src/pref-manager.c:1071
+#: ../src/pref-manager.c:1072
msgid "Show next unread message"
msgstr "显示下一封未读邮件"
# src/main-window.c:219
-#: ../src/pref-manager.c:1072
+#: ../src/pref-manager.c:1073
msgid "Show next message"
msgstr "显示下一封邮件"
# src/main-window.c:213
-#: ../src/pref-manager.c:1073
+#: ../src/pref-manager.c:1074
msgid "Close message window"
msgstr "关闭邮件窗口"
-#: ../src/pref-manager.c:1118
+#: ../src/pref-manager.c:1119
#, fuzzy, c-format
msgid "Error displaying %s: %s\n"
msgstr "和 %s (%s)协商时发生错误"
-#: ../src/pref-manager.c:1131
+#: ../src/pref-manager.c:1132
msgid "Show nothing"
msgstr "不显示"
-#: ../src/pref-manager.c:1133
+#: ../src/pref-manager.c:1134
msgid "Show dialog"
msgstr "显示对话"
-#: ../src/pref-manager.c:1135
+#: ../src/pref-manager.c:1136
msgid "Show in list"
msgstr "在列表中显示"
-#: ../src/pref-manager.c:1137
+#: ../src/pref-manager.c:1138
msgid "Show in status bar"
msgstr "在状态栏中显示"
-#: ../src/pref-manager.c:1139
+#: ../src/pref-manager.c:1140
msgid "Print to console"
msgstr "打印到控制台"
-#: ../src/pref-manager.c:1151
+#: ../src/pref-manager.c:1152
msgid "Ask me"
msgstr "询问"
-#: ../src/pref-manager.c:1687
-#, fuzzy
-#| msgid "Remote POP3 mailbox..."
+#: ../src/pref-manager.c:1688
msgid "Remote POP3 mailbox…"
-msgstr "远程 POP3 邮箱..."
+msgstr "远程 POP3 邮箱…"
-#: ../src/pref-manager.c:1691 ../ui/main-window.ui.h:7
+#: ../src/pref-manager.c:1692 ../ui/main-window.ui.h:7
msgid "Remote IMAP folder…"
msgstr "远程 IMAP 文件夹…"
# src/pref-manager.c:431
-#: ../src/pref-manager.c:1952
+#: ../src/pref-manager.c:1953
msgid "Remote mailbox servers"
msgstr "远程邮箱服务器"
# src/pref-manager.c:440
-#: ../src/pref-manager.c:1969 ../src/pref-manager.c:2720
-#: ../src/sendmsg-window.c:2609
+#: ../src/pref-manager.c:1970 ../src/pref-manager.c:2764
+#: ../src/sendmsg-window.c:2605
msgid "Type"
msgstr "类型"
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../src/pref-manager.c:1977
+#: ../src/pref-manager.c:1978
msgid "Mailbox name"
msgstr "邮箱名"
# src/pref-manager.c:466
-#: ../src/pref-manager.c:1999 ../src/pref-manager.c:2082
-#: ../src/pref-manager.c:2763
+#: ../src/pref-manager.c:2000 ../src/pref-manager.c:2083
+#: ../src/pref-manager.c:2807
msgid "_Modify"
msgstr "修改(_M)"
# src/pref-manager.c:481
-#: ../src/pref-manager.c:2021
+#: ../src/pref-manager.c:2022
msgid "Local mail directory"
msgstr "本地邮件文件夹"
# src/pref-manager.c:481
-#: ../src/pref-manager.c:2024
+#: ../src/pref-manager.c:2025
msgid "Select your local mail directory"
msgstr "选择本地邮件文件夹"
# src/pref-manager.c:488
-#: ../src/pref-manager.c:2048
+#: ../src/pref-manager.c:2049
msgid "Outgoing mail servers"
msgstr "发送邮件服务器"
# src/filter-edit-dialog.c:536
-#: ../src/pref-manager.c:2066
+#: ../src/pref-manager.c:2067
msgid "Server name"
msgstr "服务器名称"
# src/mailbox-conf.c:774 src/main-window.c:209
-#: ../src/pref-manager.c:2110
+#: ../src/pref-manager.c:2111
msgid "Checking"
msgstr "检查"
-#: ../src/pref-manager.c:2113
+#: ../src/pref-manager.c:2114
msgid "_Check mail automatically every"
msgstr "自动检查邮件间隔(_C)"
-#: ../src/pref-manager.c:2121 ../src/pref-manager.c:2293
-#: ../src/pref-manager.c:2892 ../src/pref-manager.c:2941
+#: ../src/pref-manager.c:2122 ../src/pref-manager.c:2294
+#: ../src/pref-manager.c:2936 ../src/pref-manager.c:2985
msgid "minutes"
msgstr "分钟"
-#: ../src/pref-manager.c:2126
+#: ../src/pref-manager.c:2127
msgid "Check _IMAP mailboxes"
msgstr "检查 _IMAP 邮箱"
-#: ../src/pref-manager.c:2130
+#: ../src/pref-manager.c:2131
#, fuzzy
#| msgid "Check INBOX _only"
msgid "Check Inbox _only"
msgstr "只检查收件箱(_O)"
-#: ../src/pref-manager.c:2135
+#: ../src/pref-manager.c:2136
msgid "When mail arrives:"
msgstr "在邮件到达时："
-#: ../src/pref-manager.c:2140
+#: ../src/pref-manager.c:2141
msgid "Display message"
msgstr "显示邮件"
# src/filter-edit-dialog.c:601
-#: ../src/pref-manager.c:2145
+#: ../src/pref-manager.c:2146
msgid "Play sound"
msgstr "播放声音"
-#: ../src/pref-manager.c:2150
+#: ../src/pref-manager.c:2151
msgid "Show icon"
msgstr "显示图标"
-#: ../src/pref-manager.c:2157
+#: ../src/pref-manager.c:2158
msgid "Do background check quietly (no messages in status bar)"
msgstr "后台检查(状态栏不显示邮件)"
-#: ../src/pref-manager.c:2160
+#: ../src/pref-manager.c:2161
msgid "_POP message size limit:"
msgstr "_POP 邮件大小限制："
-#: ../src/pref-manager.c:2189
+#: ../src/pref-manager.c:2190
#, fuzzy
msgid "Message disposition notification requests"
msgstr "要求邮件阅读通知"
-#: ../src/pref-manager.c:2194
+#: ../src/pref-manager.c:2195
#, fuzzy
#| msgid ""
#| "When I receive a message and its sender requested to return a\n"
@@ -6483,7 +6610,7 @@ msgstr ""
"当收到发送者要求邮件阅读通知(MDN)的邮件时，在下列情况下\n"
"发送通知："
-#: ../src/pref-manager.c:2202
+#: ../src/pref-manager.c:2203
#, fuzzy
#| msgid ""
#| "The message header looks clean\n"
@@ -6497,162 +6624,161 @@ msgstr ""
"(通知地址是回复路径，\n"
"并且我在 “发送到：”或“抄送：”列表中)。"
-#: ../src/pref-manager.c:2216
+#: ../src/pref-manager.c:2217
msgid "The message header looks suspicious."
msgstr "邮件的信头可疑。"
-#: ../src/pref-manager.c:2240
+#: ../src/pref-manager.c:2241
msgid "Word wrap"
msgstr "单词换行"
-#: ../src/pref-manager.c:2243
+#: ../src/pref-manager.c:2244
msgid "Wrap outgoing text at"
msgstr "发出的邮件自动换行于"
-#: ../src/pref-manager.c:2252 ../src/pref-manager.c:2502
+#: ../src/pref-manager.c:2253 ../src/pref-manager.c:2503
msgid "characters"
msgstr "字符"
-#: ../src/pref-manager.c:2271
+#: ../src/pref-manager.c:2272
msgid "Other options"
msgstr "其他选项"
# src/pref-manager.c:601
-#: ../src/pref-manager.c:2273
+#: ../src/pref-manager.c:2274
msgid "Reply prefix:"
msgstr "回复前缀："
-#: ../src/pref-manager.c:2276
+#: ../src/pref-manager.c:2277
msgid "Automatically quote original when replying"
msgstr "回复时自动引用原文"
-#: ../src/pref-manager.c:2279
+#: ../src/pref-manager.c:2280
msgid "Forward a mail as attachment instead of quoting it"
msgstr "将邮件作为附件转发而不是引用它"
-#: ../src/pref-manager.c:2282
+#: ../src/pref-manager.c:2283
msgid "Copy outgoing messages to sentbox"
msgstr "正在将邮件复制到发件箱"
-#: ../src/pref-manager.c:2284
+#: ../src/pref-manager.c:2285
msgid "Send button always queues outgoing mail in outbox"
msgstr "发送按钮总是将发送邮件缓存到发件箱中"
-#: ../src/pref-manager.c:2288
+#: ../src/pref-manager.c:2289
#, fuzzy
#| msgid "_Check mail automatically every"
msgid "_Send queued mail automatically every"
msgstr "自动检查邮件间隔(_C)"
-#: ../src/pref-manager.c:2298
+#: ../src/pref-manager.c:2299
msgid "Edit headers in external editor"
msgstr "在外部编辑器中编辑信头"
-#: ../src/pref-manager.c:2300
+#: ../src/pref-manager.c:2301
msgid "Include HTML parts as text when replying or forwarding"
msgstr "当回复或转发以文本格式包含 HTML 区段"
# src/pref-manager.c:555
-#: ../src/pref-manager.c:2318 ../src/toolbar-prefs.c:158
+#: ../src/pref-manager.c:2319 ../src/toolbar-prefs.c:158
msgid "Main window"
msgstr "主窗口"
# src/pref-manager.c:558
-#: ../src/pref-manager.c:2321
+#: ../src/pref-manager.c:2322
msgid "Use preview pane"
msgstr "使用预览面板"
# src/main-window.c:168
-#: ../src/pref-manager.c:2325
+#: ../src/pref-manager.c:2326
#, fuzzy
#| msgid "Could not access message %u in mailbox \"%s\"."
msgid "Show message counts in mailbox list"
msgstr "无法访问邮箱“%2$s”中的邮件 %1$u。"
-#: ../src/pref-manager.c:2331
+#: ../src/pref-manager.c:2332
msgid "Automatically view message when mailbox opened"
msgstr "当打开邮箱时自动查看邮件"
-#: ../src/pref-manager.c:2334
+#: ../src/pref-manager.c:2335
msgid "Ask me before selecting a different mailbox to show an unread message"
msgstr "在选择另一个邮箱来显示未读邮件时询问我"
-#: ../src/pref-manager.c:2338
+#: ../src/pref-manager.c:2339
#, fuzzy
#| msgid "PageUp/PageDown keys scroll text by"
msgid "Page Up/Page Down keys scroll text by"
msgstr "PageUp/PageDown 键滚动文本的幅度"
-#: ../src/pref-manager.c:2346
+#: ../src/pref-manager.c:2347
msgid "percent"
msgstr "百分比"
# src/pref-manager.c:555
-#: ../src/pref-manager.c:2363 ../src/toolbar-prefs.c:176
+#: ../src/pref-manager.c:2364 ../src/toolbar-prefs.c:176
msgid "Message window"
msgstr "邮件窗口"
# src/main-window.c:200
-#: ../src/pref-manager.c:2365
+#: ../src/pref-manager.c:2366
msgid "After moving a message:"
msgstr "在移动邮件后："
-#: ../src/pref-manager.c:2386
-#, fuzzy
+#: ../src/pref-manager.c:2387
msgid "Sorting and threading"
-msgstr "_JWZ 线索"
+msgstr "排序和线索"
-#: ../src/pref-manager.c:2388
+#: ../src/pref-manager.c:2389
msgid "Default sort column:"
msgstr "默认排序列："
-#: ../src/pref-manager.c:2396
+#: ../src/pref-manager.c:2397
#, fuzzy
#| msgid "sign messages by default"
msgid "Thread messages by default"
msgstr "默认对邮件签名"
-#: ../src/pref-manager.c:2398
+#: ../src/pref-manager.c:2399
#, fuzzy
msgid "Expand threads on open"
msgstr "展开所有线索"
#. fonts
-#: ../src/pref-manager.c:2423 ../src/print-gtk.c:587
+#: ../src/pref-manager.c:2424 ../src/print-gtk.c:590
msgid "Fonts"
msgstr "字体"
# src/main-window.c:200
-#: ../src/pref-manager.c:2426
+#: ../src/pref-manager.c:2427
msgid "Use system fonts"
msgstr "使用系统字体"
-#: ../src/pref-manager.c:2434
+#: ../src/pref-manager.c:2435
msgid "Use default font size"
msgstr "使用默认字体大小"
# src/main-window.c:200
-#: ../src/pref-manager.c:2440
+#: ../src/pref-manager.c:2441
msgid "Message font:"
msgstr "邮件字体："
# src/balsa-message.c:558 src/sendmsg-window.c:358
-#: ../src/pref-manager.c:2447
+#: ../src/pref-manager.c:2448
msgid "Subject font:"
msgstr "主题字体："
#. Quoted text regular expression
#. and RFC2646-style flowed text
-#: ../src/pref-manager.c:2487
+#: ../src/pref-manager.c:2488
#, fuzzy
msgid "Quoted and flowed text"
msgstr "引用文本"
-#: ../src/pref-manager.c:2490
+#: ../src/pref-manager.c:2491
msgid "Mark quoted text"
msgstr "标记引用文本"
-#: ../src/pref-manager.c:2493
+#: ../src/pref-manager.c:2494
#, fuzzy
#| msgid ""
#| "Quoted text\n"
@@ -6662,169 +6788,183 @@ msgstr ""
"引用的文本\n"
"正则表达式："
-#: ../src/pref-manager.c:2496
+#: ../src/pref-manager.c:2497
msgid "Wrap text at"
msgstr "文本自动换行位置"
+#: ../src/pref-manager.c:2516
+#, fuzzy, c-format
+#| msgid "FTP site: %s\n"
+msgid "HTTP cache size: %s"
+msgstr "FTP 站点：%s\n"
+
# src/balsa-message.c:159 src/balsa-message.c:162
#. handling of multipart/alternative
-#: ../src/pref-manager.c:2519
+#: ../src/pref-manager.c:2549
msgid "Display of multipart/alternative parts"
msgstr "显示多个区段/可选区段"
-#: ../src/pref-manager.c:2523 ../src/print-gtk.c:609
+#: ../src/pref-manager.c:2553 ../src/print-gtk.c:612
#, fuzzy
#| msgid "Prefer text/plain over html"
msgid "Prefer text/plain over HTML"
msgstr "偏向于使用纯文本而非 html"
+#: ../src/pref-manager.c:2556
+#, fuzzy
+#| msgid "Manage subscriptions"
+msgid "Manage exceptions…"
+msgstr "管理订阅"
+
+#: ../src/pref-manager.c:2564
+msgid "Clear HTTP cache…"
+msgstr ""
+
# src/main-window.c:200
-#: ../src/pref-manager.c:2539
+#: ../src/pref-manager.c:2583
msgid "Message colors"
msgstr "邮件颜色"
-#: ../src/pref-manager.c:2544
+#: ../src/pref-manager.c:2588
#, c-format
msgid "Quote level %d color"
msgstr "引用级别 %d 颜色"
# src/main-window.c:161
-#: ../src/pref-manager.c:2562
+#: ../src/pref-manager.c:2606
msgid "Link color"
msgstr "链接颜色"
-#: ../src/pref-manager.c:2564
+#: ../src/pref-manager.c:2608
msgid "Hyperlink color"
msgstr "超链接颜色"
-#: ../src/pref-manager.c:2579 ../src/pref-manager.c:3183
+#: ../src/pref-manager.c:2623 ../src/pref-manager.c:3227
msgid "Format"
msgstr "格式"
-#: ../src/pref-manager.c:2582
+#: ../src/pref-manager.c:2626
msgid "Date encoding (for strftime):"
msgstr "日期编码(strftime 使用)："
-#: ../src/pref-manager.c:2584
+#: ../src/pref-manager.c:2628
msgid "Selected headers:"
msgstr "选择的信头："
#. treatment of messages with 8-bit chars, but without proper MIME encoding
-#: ../src/pref-manager.c:2602
+#: ../src/pref-manager.c:2646
msgid "National (8-bit) characters in broken messages without codeset header"
msgstr ""
# src/pref-manager.c:151
-#: ../src/pref-manager.c:2607
+#: ../src/pref-manager.c:2651
msgid "display as “?”"
msgstr "显示为“?”"
-#: ../src/pref-manager.c:2615
+#: ../src/pref-manager.c:2659
msgid "display in codeset"
msgstr "显示在字符集中"
# src/main-window.c:213
-#: ../src/pref-manager.c:2640
+#: ../src/pref-manager.c:2684
msgid "Information messages"
msgstr "通知消息"
# src/main-window.c:213
-#: ../src/pref-manager.c:2644
+#: ../src/pref-manager.c:2688
msgid "Information messages:"
msgstr "通知消息："
-#: ../src/pref-manager.c:2648
+#: ../src/pref-manager.c:2692
msgid "Warning messages:"
msgstr "警告消息："
# src/main-window.c:200
-#: ../src/pref-manager.c:2652
+#: ../src/pref-manager.c:2696
msgid "Error messages:"
msgstr "错误消息："
# src/main-window.c:200
-#: ../src/pref-manager.c:2656
+#: ../src/pref-manager.c:2700
msgid "Fatal error messages:"
msgstr "致命错误消息："
# src/main-window.c:211
-#: ../src/pref-manager.c:2660
+#: ../src/pref-manager.c:2704
msgid "Debug messages:"
msgstr "调试消息："
-#: ../src/pref-manager.c:2676
+#: ../src/pref-manager.c:2720
msgid "Display progress dialog"
msgstr "显示进度对话框"
-#: ../src/pref-manager.c:2677
+#: ../src/pref-manager.c:2721
#, fuzzy
#| msgid "Display progress dialog"
msgid "Display progress dialog when sending messages"
msgstr "显示进度对话框"
-#: ../src/pref-manager.c:2678
+#: ../src/pref-manager.c:2722
#, fuzzy
#| msgid "Display progress dialog"
msgid "Display progress dialog when retrieving messages"
msgstr "显示进度对话框"
-#: ../src/pref-manager.c:2700 ../src/pref-manager.c:3312
+#: ../src/pref-manager.c:2744 ../src/pref-manager.c:3356
msgid "Address books"
msgstr "地址簿"
-#: ../src/pref-manager.c:2728
+#: ../src/pref-manager.c:2772
msgid "Address book name"
msgstr "地址簿名称"
-#: ../src/pref-manager.c:2736
+#: ../src/pref-manager.c:2780
msgid "Auto-complete"
msgstr "自动完成"
-#: ../src/pref-manager.c:2769
+#: ../src/pref-manager.c:2813
msgid "_Set as default"
msgstr "设为默认值(_S)"
-#: ../src/pref-manager.c:2786
+#: ../src/pref-manager.c:2830
msgid "Miscellaneous spelling settings"
msgstr "其他拼写设置"
# src/pref-manager.c:397
-#: ../src/pref-manager.c:2790
+#: ../src/pref-manager.c:2834
msgid "Check signature"
msgstr "检查签名"
-#: ../src/pref-manager.c:2792
+#: ../src/pref-manager.c:2836
msgid "Check quoted"
msgstr "检查引用"
# src/pref-manager.c:538
-#: ../src/pref-manager.c:2808
-#, fuzzy
-#| msgid "Startup options"
+#: ../src/pref-manager.c:2852
msgid "Start-up options"
msgstr "启动选项"
-#: ../src/pref-manager.c:2811
+#: ../src/pref-manager.c:2855
#, fuzzy
#| msgid "Open Inbox upon startup"
msgid "Open Inbox upon start-up"
msgstr "启动时打开收件箱"
-#: ../src/pref-manager.c:2813
+#: ../src/pref-manager.c:2857
#, fuzzy
#| msgid "Check mail upon startup"
msgid "Check mail upon start-up"
msgstr "启动时检查邮件"
-#: ../src/pref-manager.c:2815
+#: ../src/pref-manager.c:2859
msgid "Remember open mailboxes between sessions"
msgstr "在会话中记住打开的邮件箱"
-#: ../src/pref-manager.c:2833
+#: ../src/pref-manager.c:2877
msgid "Folder scanning"
msgstr "文件夹扫描"
-#: ../src/pref-manager.c:2836
+#: ../src/pref-manager.c:2880
#, fuzzy
#| msgid ""
#| "Choose depth 1 for fast startup; this defers scanning some folders. To "
@@ -6836,141 +6976,139 @@ msgstr ""
"要快速启动，选择深度1。这将延迟扫描一些文件夹。想在启动时看到树的更多内容，选"
"择大一些的深度。"
-#: ../src/pref-manager.c:2843
+#: ../src/pref-manager.c:2887
msgid "Scan local folders to depth"
msgstr "搜索本地文件夹的深度"
# src/mailbox-conf.c:648
-#: ../src/pref-manager.c:2852
+#: ../src/pref-manager.c:2896
msgid "Scan IMAP folders to depth"
msgstr "IMAP 文件夹扫描深度"
-#: ../src/pref-manager.c:2874 ../src/pref-manager.c:3326
+#: ../src/pref-manager.c:2918 ../src/pref-manager.c:3370
msgid "Miscellaneous"
msgstr "杂项"
-#: ../src/pref-manager.c:2877
+#: ../src/pref-manager.c:2921
#, fuzzy
#| msgid "Empty Trash on exit"
msgid "Empty trash on exit"
msgstr "退出时清空废件箱"
-#: ../src/pref-manager.c:2881
+#: ../src/pref-manager.c:2925
msgid "Close mailbox if unused more than"
msgstr "自动关闭邮箱，如果未使用时间超过"
# src/main-window.c:211
-#: ../src/pref-manager.c:2909
+#: ../src/pref-manager.c:2953
msgid "Deleting messages"
msgstr "删除邮件"
#. Translators: this used to be "using Mailbox -> Hide messages";
#. * the UTF-8 string for the right-arrow symbol is broken out to
#. * avoid msgconv problems.
-#: ../src/pref-manager.c:2914
+#: ../src/pref-manager.c:2958
#, c-format
msgid ""
"The following setting is global, but may be overridden for the selected "
"mailbox using Mailbox %s Hide messages:"
msgstr ""
-#: ../src/pref-manager.c:2922
+#: ../src/pref-manager.c:2966
msgid "Hide messages marked as deleted"
msgstr "隐藏标记为删除的邮件"
-#: ../src/pref-manager.c:2924
+#: ../src/pref-manager.c:2968
msgid "The following settings are global:"
msgstr "以下设置是全局的："
-#: ../src/pref-manager.c:2927
+#: ../src/pref-manager.c:2971
msgid "Expunge deleted messages when mailbox is closed"
msgstr "在关闭邮箱时清除删除的邮件"
-#: ../src/pref-manager.c:2931
+#: ../src/pref-manager.c:2975
#, fuzzy
#| msgid "...and if unused more than"
msgid "…and if unused more than"
msgstr "...并且如果不使用超过"
-#: ../src/pref-manager.c:3148
+#: ../src/pref-manager.c:3192
msgid "Mail options"
msgstr "邮件选项"
# src/pref-manager.c:67
-#: ../src/pref-manager.c:3152
+#: ../src/pref-manager.c:3196
msgid "Incoming"
msgstr "接收"
# src/pref-manager.c:488
-#: ../src/pref-manager.c:3156
+#: ../src/pref-manager.c:3200
msgid "Outgoing"
msgstr "发送"
-#: ../src/pref-manager.c:3167
+#: ../src/pref-manager.c:3211
msgid "Display options"
msgstr "显示选项"
-#: ../src/pref-manager.c:3171
+#: ../src/pref-manager.c:3215
#, fuzzy
msgid "Sort and thread"
msgstr "_JWZ 线索"
# src/main-window.c:200
-#: ../src/pref-manager.c:3175 ../src/print-gtk.c:579
+#: ../src/pref-manager.c:3219 ../src/print-gtk.c:582
msgid "Message"
msgstr "邮件"
# src/main-window.c:161
-#: ../src/pref-manager.c:3179
+#: ../src/pref-manager.c:3223
msgid "Colors"
msgstr "颜色"
# src/main-window.c:200
-#: ../src/pref-manager.c:3187
+#: ../src/pref-manager.c:3231
msgid "Status messages"
msgstr "状态消息"
# src/pref-manager.c:117
#. must NOT be modal
-#: ../src/pref-manager.c:3254
+#: ../src/pref-manager.c:3298
msgid "Balsa Preferences"
msgstr "Balsa 首选项"
# src/sendmsg-window.c:76
-#: ../src/pref-manager.c:3317 ../src/toolbar-factory.c:141
+#: ../src/pref-manager.c:3361 ../src/toolbar-factory.c:141
msgid "Spelling"
msgstr "拼写"
-#: ../src/pref-manager.c:3322
-#, fuzzy
-#| msgid "Startup"
+#: ../src/pref-manager.c:3366
msgid "Start-up"
msgstr "启动"
# src/main-window.c:211
-#: ../src/print-gtk.c:94 ../src/print-gtk.c:307
+#: ../src/print-gtk.c:97 ../src/print-gtk.c:310
#, c-format
msgid "Page %d of %d"
msgstr "页 %d / %d"
-#: ../src/print-gtk.c:168
+#: ../src/print-gtk.c:171
#, fuzzy
msgid "Signed and encrypted"
-msgstr "POP 命令执行失败"
+msgstr "签名"
-#: ../src/print-gtk.c:170
+#: ../src/print-gtk.c:173
#, fuzzy
#| msgid "Sign"
msgid "Signed"
msgstr "签名"
-#: ../src/print-gtk.c:173
+#: ../src/print-gtk.c:176
#, fuzzy
#| msgid "Encrypt"
msgid "Encrypted"
msgstr "加密"
-#: ../src/print-gtk.c:414
+#: ../src/print-gtk.c:417
#, fuzzy, c-format
#| msgid "Cannot print page %d because the document has only %d pages."
msgid "Cannot print page %d because the document has only %d page."
@@ -6983,76 +7121,76 @@ msgstr[0] "无法打印第 %d 页，因为文档只有 %d 页。"
#. * Do *not* translate it to "predefinito:mm", if it
#. * it isn't default:mm or default:inch it will not work
#.
-#: ../src/print-gtk.c:452
+#: ../src/print-gtk.c:455
msgid "default:mm"
msgstr "default:mm"
-#: ../src/print-gtk.c:508
+#: ../src/print-gtk.c:511
msgid "inch"
msgstr "英寸"
-#: ../src/print-gtk.c:515
+#: ../src/print-gtk.c:518
msgid "mm"
msgstr "毫米"
# src/filter-edit-dialog.c:267
-#: ../src/print-gtk.c:589
+#: ../src/print-gtk.c:592
msgid "_Header Font:"
msgstr "信头字体(_H)："
# src/filter-edit-dialog.c:279
-#: ../src/print-gtk.c:590
+#: ../src/print-gtk.c:593
msgid "B_ody Font:"
msgstr "主体字体(_O)："
# src/filter-edit-dialog.c:456
-#: ../src/print-gtk.c:591
+#: ../src/print-gtk.c:594
msgid "_Footer Font:"
msgstr "页脚字体(_F)："
#. syntax highlighting
#. treatment of HTML messages and parts
-#: ../src/print-gtk.c:594 ../src/print-gtk.c:607
+#: ../src/print-gtk.c:597 ../src/print-gtk.c:610
msgid "Highlighting"
msgstr "高亮"
-#: ../src/print-gtk.c:597
+#: ../src/print-gtk.c:600
msgid "Highlight _cited text"
msgstr "高亮显示引用文本(_C)"
-#: ../src/print-gtk.c:601
+#: ../src/print-gtk.c:604
msgid "Highlight _structured phrases"
msgstr ""
-#: ../src/print-gtk.c:613
-msgid "Download images from remote servers (may be dangerous)"
+#: ../src/print-gtk.c:617
+msgid "Download content from remote servers (may be dangerous)"
msgstr ""
#. margins
-#: ../src/print-gtk.c:624
+#: ../src/print-gtk.c:628
msgid "Margins"
msgstr "页边距"
# src/balsa-message.c:526 src/filter-edit-dialog.c:291
# src/sendmsg-window.c:315
-#: ../src/print-gtk.c:628
+#: ../src/print-gtk.c:632
msgid "_Top"
msgstr "顶部(_T)"
-#: ../src/print-gtk.c:634
+#: ../src/print-gtk.c:638
msgid "_Bottom"
msgstr "底部(_B)"
-#: ../src/print-gtk.c:646
+#: ../src/print-gtk.c:650
msgid "_Left"
msgstr "左侧(_L)"
-#: ../src/print-gtk.c:652
+#: ../src/print-gtk.c:656
msgid "_Right"
msgstr "右侧(_R)"
# src/sendmsg-window.c:71
-#: ../src/print-gtk.c:784
+#: ../src/print-gtk.c:794
#, c-format
msgid "Error printing message: %s"
msgstr "打印邮件时发生错误：%s"
@@ -7070,22 +7208,22 @@ msgstr ""
"在载入过滤规则时出错：%s\n"
"过滤规则可能不正确。"
-#: ../src/save-restore.c:791
+#: ../src/save-restore.c:794
msgid "The option not to recognize “format=flowed” text has been removed."
msgstr ""
-#: ../src/save-restore.c:1060
+#: ../src/save-restore.c:1063
msgid ""
"The option not to send “format=flowed” text is now on the Options menu of "
"the compose window."
msgstr ""
-#: ../src/save-restore.c:1101
+#: ../src/save-restore.c:1104
msgid ""
"The option to request a MDN is now on the Options menu of the compose window."
msgstr ""
-#: ../src/save-restore.c:1176
+#: ../src/save-restore.c:1179
#, fuzzy
#| msgid ""
#| "This version of Balsa uses a new user interface; if you have changed "
@@ -7101,9 +7239,8 @@ msgstr ""
#. * its accelerator; this is a long list, and unique accelerators
#. * cannot be found.
#: ../src/sendmsg-window.c:183
-#, fuzzy
msgid "_Brazilian Portuguese"
-msgstr "西班牙语(_C)"
+msgstr "巴西葡萄牙语(_B)"
#: ../src/sendmsg-window.c:184
#, fuzzy
@@ -7160,23 +7297,20 @@ msgid "_Finnish"
msgstr "芬兰语(_F)"
#: ../src/sendmsg-window.c:195
-#, fuzzy
msgid "_French"
msgstr "法语(_F)"
#: ../src/sendmsg-window.c:196
-#, fuzzy
msgid "_German"
msgstr "德语(_G)"
#: ../src/sendmsg-window.c:197
msgid "_German (Austrian)"
-msgstr "德语(奥地利)(_G)"
+msgstr "德语（奥地利）(_G)"
#: ../src/sendmsg-window.c:198
-#, fuzzy
msgid "_German (Swiss)"
-msgstr "德语(_G)"
+msgstr "德语（瑞士）(_G)"
#: ../src/sendmsg-window.c:199
#, fuzzy
@@ -7321,18 +7455,18 @@ msgstr ""
"发给“%s”的邮件被修改。\n"
"将邮件保存到草稿箱中？"
-#: ../src/sendmsg-window.c:781
+#: ../src/sendmsg-window.c:774
#, fuzzy
#| msgid "Gnome editor is not defined in your preferred applications."
msgid "GNOME editor is not defined in your preferred applications."
msgstr "Gnome 编辑器在您的首选应用程序中没有定义。"
# src/pref-manager.c:137
-#: ../src/sendmsg-window.c:854
+#: ../src/sendmsg-window.c:847
msgid "Select Identity"
msgstr "选择身份"
-#: ../src/sendmsg-window.c:1363
+#: ../src/sendmsg-window.c:1356
#, fuzzy, c-format
#| msgid ""
#| "Saying yes will not send the file `%s' itself, but just a MIME message/"
@@ -7353,19 +7487,19 @@ msgstr ""
"您真的要将该文件附加以作为参考吗？"
# src/pref-manager.c:117
-#: ../src/sendmsg-window.c:1376
+#: ../src/sendmsg-window.c:1369
#, fuzzy
msgid "Attach as Reference?"
msgstr "作为引用附加？"
# src/pref-manager.c:387
-#: ../src/sendmsg-window.c:1500
+#: ../src/sendmsg-window.c:1493
#, fuzzy
#| msgid "Choose charset"
msgid "Choose character set"
msgstr "选择字符集"
-#: ../src/sendmsg-window.c:1508
+#: ../src/sendmsg-window.c:1501
#, fuzzy, c-format
#| msgid ""
#| "File\n"
@@ -7383,60 +7517,60 @@ msgstr ""
"的编码不是 US-ASCII 或 UTF-8。\n"
"请选择编码文件的字符集。"
-#: ../src/sendmsg-window.c:1528
+#: ../src/sendmsg-window.c:1521
msgid "Attach as MIME type:"
msgstr "添加为 MIME 类型的附件："
-#: ../src/sendmsg-window.c:1589
+#: ../src/sendmsg-window.c:1582
#, fuzzy, c-format
#| msgid "Character set for file %s changed from \"%s\" to \"%s\"."
msgid "Character set for file %s changed from “%s” to “%s”."
msgstr "%s 文件的字符集从“%s”更改为“%s”。"
# src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/sendmsg-window.c:1632 ../src/sendmsg-window.c:5121
+#: ../src/sendmsg-window.c:1628 ../src/sendmsg-window.c:5117
msgid "(no subject)"
msgstr "(无主题)"
# src/main-window.c:182
-#: ../src/sendmsg-window.c:1669
+#: ../src/sendmsg-window.c:1665
#, c-format
msgid "Cannot create file URI object for %s"
msgstr "无法为 %s 创建文件 URI"
# src/main-window.c:126
-#: ../src/sendmsg-window.c:1717
+#: ../src/sendmsg-window.c:1713
msgid "forwarded message"
msgstr "已转发邮件"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:1722
+#: ../src/sendmsg-window.c:1718
#, fuzzy, c-format
#| msgid "Message from %s, subject: \"%s\""
msgid "Message from %s, subject: “%s”"
msgstr "邮件来自 %s，主题：“%s”"
# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../src/sendmsg-window.c:1806 ../src/sendmsg-window.c:1882
+#: ../src/sendmsg-window.c:1802 ../src/sendmsg-window.c:1878
msgid "Remove"
msgstr "删除"
# src/main-window.c:159
-#: ../src/sendmsg-window.c:1894
+#: ../src/sendmsg-window.c:1890
msgid "Open…"
msgstr "打开…"
-#: ../src/sendmsg-window.c:1906
+#: ../src/sendmsg-window.c:1902
msgid "(URL)"
msgstr "(URL)"
# src/sendmsg-window.c:239
-#: ../src/sendmsg-window.c:1961
+#: ../src/sendmsg-window.c:1957
msgid "Attach file"
msgstr "粘附文件"
-#: ../src/sendmsg-window.c:2073 ../src/sendmsg-window.c:2149
-#: ../src/sendmsg-window.c:7114
+#: ../src/sendmsg-window.c:2069 ../src/sendmsg-window.c:2145
+#: ../src/sendmsg-window.c:7093
msgid ""
"Attaching message failed.\n"
"Possible reason: not enough temporary space"
@@ -7446,107 +7580,107 @@ msgstr ""
# src/balsa-message.c:544 src/filter-edit-dialog.c:303
# src/sendmsg-window.c:338
-#: ../src/sendmsg-window.c:2364
+#: ../src/sendmsg-window.c:2360
msgid "F_rom:"
msgstr "发件人(_R)："
# src/balsa-message.c:558 src/sendmsg-window.c:358
#. Subject:
-#: ../src/sendmsg-window.c:2514
+#: ../src/sendmsg-window.c:2510
msgid "S_ubject:"
msgstr "主题(_U)："
-#: ../src/sendmsg-window.c:2545
+#: ../src/sendmsg-window.c:2541
msgid "F_CC:"
msgstr ""
# src/sendmsg-window.c:414
#. Attachment list
-#: ../src/sendmsg-window.c:2572
+#: ../src/sendmsg-window.c:2568
msgid "_Attachments:"
msgstr "附件(_A)："
# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../src/sendmsg-window.c:2616
+#: ../src/sendmsg-window.c:2612
msgid "Mode"
msgstr "模式"
-#: ../src/sendmsg-window.c:2639
+#: ../src/sendmsg-window.c:2635
msgid "Description"
msgstr "描述性"
-#: ../src/sendmsg-window.c:2941
+#: ../src/sendmsg-window.c:2937
#, c-format
msgid "Could not save attachment: %s"
msgstr "无法保存附件：%s"
# src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/sendmsg-window.c:3015
+#: ../src/sendmsg-window.c:3011
msgid "No subject"
msgstr "无主题"
-#: ../src/sendmsg-window.c:3064
+#: ../src/sendmsg-window.c:3060
#, fuzzy
#| msgid "encrypted: "
msgid "decrypted: "
msgstr "已加密："
# src/main-window.c:182
-#: ../src/sendmsg-window.c:3072
+#: ../src/sendmsg-window.c:3068
#, fuzzy, c-format
msgid "inlined file “%s” (%s)"
msgstr "无效的过滤规则：%s"
-#: ../src/sendmsg-window.c:3075
+#: ../src/sendmsg-window.c:3071
#, fuzzy, c-format
#| msgid "attached file \"%s\" (%s)"
msgid "attached file “%s” (%s)"
msgstr "附加了文件“%s”(%s)"
# src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/sendmsg-window.c:3080
+#: ../src/sendmsg-window.c:3076
#, fuzzy, c-format
msgid "inlined %s part"
msgstr "保存部分"
# src/sendmsg-window.c:239
-#: ../src/sendmsg-window.c:3082
+#: ../src/sendmsg-window.c:3078
#, c-format
msgid "attached %s part"
msgstr "已附加 %s 区段"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:3163
+#: ../src/sendmsg-window.c:3159
#, fuzzy, c-format
#| msgid "message from %s, subject \"%s\""
msgid "message from %s, subject “%s”"
msgstr "邮件来自 %s，主题“%s”"
-#: ../src/sendmsg-window.c:3291
+#: ../src/sendmsg-window.c:3287
msgid "quoted"
msgstr "引用的"
# src/sendmsg-window.c:414
-#: ../src/sendmsg-window.c:3296 ../src/sendmsg-window.c:3299
+#: ../src/sendmsg-window.c:3292 ../src/sendmsg-window.c:3295
msgid "quoted attachment"
msgstr "引用的附件"
-#: ../src/sendmsg-window.c:3343
+#: ../src/sendmsg-window.c:3339
msgid "Select parts for quotation"
msgstr "选择要引用的区段"
-#: ../src/sendmsg-window.c:3355
+#: ../src/sendmsg-window.c:3351
msgid "Select the parts of the message which shall be quoted in the reply"
msgstr "选择邮件中要在回复中引用的区段"
-#: ../src/sendmsg-window.c:3378
+#: ../src/sendmsg-window.c:3374
msgid ""
"<b>Warning:</b> The original message contains an abnormal mixture of "
"encrypted and unencrypted parts. This <i>might</i> indicate an attack.\n"
"Double-check the contents of the reply before sending."
msgstr ""
-#: ../src/sendmsg-window.c:3385 ../src/sendmsg-window.c:3457
+#: ../src/sendmsg-window.c:3381 ../src/sendmsg-window.c:3453
msgid ""
"You reply to an encrypted message. The reply will contain the decrypted "
"contents of the original message.\n"
@@ -7554,80 +7688,80 @@ msgid ""
"leak sensitive information."
msgstr ""
-#: ../src/sendmsg-window.c:3461
+#: ../src/sendmsg-window.c:3457
msgid "Do not remind me again."
msgstr ""
# src/sendmsg-window.c:685 src/sendmsg-window.c:688
-#: ../src/sendmsg-window.c:3556
+#: ../src/sendmsg-window.c:3552
msgid "you"
msgstr "您"
# src/sendmsg-window.c:518
-#: ../src/sendmsg-window.c:3565
+#: ../src/sendmsg-window.c:3561
#, c-format
msgid "------forwarded message from %s------\n"
msgstr "------转发的邮件，来自 %s------\n"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:3602
+#: ../src/sendmsg-window.c:3598
#, c-format
msgid "Message-ID: %s\n"
msgstr "邮件标识：%s\n"
-#: ../src/sendmsg-window.c:3608
+#: ../src/sendmsg-window.c:3604
#, fuzzy
msgid "References:"
msgstr "引用："
# src/sendmsg-window.c:690
-#: ../src/sendmsg-window.c:3619
+#: ../src/sendmsg-window.c:3615
#, c-format
msgid "On %s, %s wrote:\n"
msgstr "在 %s，%s 写道：\n"
# src/sendmsg-window.c:690
-#: ../src/sendmsg-window.c:3621
+#: ../src/sendmsg-window.c:3617
#, c-format
msgid "%s wrote:\n"
msgstr "%s 写道：\n"
# src/main-window.c:171
-#: ../src/sendmsg-window.c:3887
+#: ../src/sendmsg-window.c:3883
msgid "Could not save message."
msgstr "无法保存邮件。"
# src/main-window.c:171
-#: ../src/sendmsg-window.c:3894
+#: ../src/sendmsg-window.c:3890
#, fuzzy, c-format
msgid "Could not open draftbox: %s"
msgstr "无法打开草稿箱：%s"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:3923
+#: ../src/sendmsg-window.c:3919
msgid "Message saved."
msgstr "邮件已保存。"
-#: ../src/sendmsg-window.c:4561 ../src/sendmsg-window.c:4569
-#: ../src/sendmsg-window.c:4576 ../src/sendmsg-window.c:4600
+#: ../src/sendmsg-window.c:4557 ../src/sendmsg-window.c:4565
+#: ../src/sendmsg-window.c:4572 ../src/sendmsg-window.c:4596
#, c-format
msgid "Could not attach the file %s: %s."
msgstr "无法附加 %s 文件：%s。"
-#: ../src/sendmsg-window.c:4562
+#: ../src/sendmsg-window.c:4558
msgid "not an absolute path"
msgstr "不是一个绝对路径"
# src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../src/sendmsg-window.c:4570
+#: ../src/sendmsg-window.c:4566
msgid "does not exist"
msgstr "不存在"
-#: ../src/sendmsg-window.c:4601
+#: ../src/sendmsg-window.c:4597
msgid "not in current directory"
msgstr "不在当前文件夹中"
-#: ../src/sendmsg-window.c:4653
+#: ../src/sendmsg-window.c:4649
#, fuzzy
#| msgid ""
#| "The link that you selected created\n"
@@ -7644,64 +7778,64 @@ msgstr ""
"地址。请检查该地址是否恰当。"
# src/main-window.c:139
-#: ../src/sendmsg-window.c:4762
+#: ../src/sendmsg-window.c:4758
#, fuzzy, c-format
#| msgid "Cannot read %s: %s"
msgid "Cannot read the file “%s”: %s"
msgstr "无法读取 %s：%s"
-#: ../src/sendmsg-window.c:4781
+#: ../src/sendmsg-window.c:4777
msgid "Include file"
msgstr "包含文件"
#. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4968
+#: ../src/sendmsg-window.c:4964
#, c-format
msgid "Could not load Face header file %s: %s"
msgstr "无法载入 Face 信头文件 %s：%s"
#. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4971
+#: ../src/sendmsg-window.c:4967
#, c-format
msgid "Could not load X-Face header file %s: %s"
msgstr "无法载入 X-Face 信头文件 %s：%s"
# src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/sendmsg-window.c:5081
+#: ../src/sendmsg-window.c:5077
#, fuzzy
#| msgid "No subject"
msgid "No Subject"
msgstr "无主题"
# src/sendmsg-window.c:88
-#: ../src/sendmsg-window.c:5086
+#: ../src/sendmsg-window.c:5082
msgid "_Send"
msgstr "发送(_S)"
-#: ../src/sendmsg-window.c:5107
+#: ../src/sendmsg-window.c:5103
msgid "You did not specify a subject for this message"
msgstr "这封邮件您没有填写主题"
-#: ../src/sendmsg-window.c:5108
+#: ../src/sendmsg-window.c:5104
msgid "If you would like to provide one, enter it below."
msgstr "如果您要提供一个，请在下面输入。"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:5166
+#: ../src/sendmsg-window.c:5162
#, fuzzy
#| msgid "Message could not be encrypted"
msgid "Message could be encrypted"
msgstr "无法加密邮件"
-#: ../src/sendmsg-window.c:5169
+#: ../src/sendmsg-window.c:5165
msgid "Send _encrypted"
msgstr "加密发送(_E)"
-#: ../src/sendmsg-window.c:5170
+#: ../src/sendmsg-window.c:5166
msgid "Send _unencrypted"
msgstr "不加密发送(_U)"
-#: ../src/sendmsg-window.c:5240 ../src/sendmsg-window.c:5328
+#: ../src/sendmsg-window.c:5236 ../src/sendmsg-window.c:5324
#, c-format
msgid ""
"You did not select encryption for this message, although %s public keys are "
@@ -7711,20 +7845,20 @@ msgstr ""
"您没有选择加密此邮件，尽管有针对所有收信人的 %s 个公钥。为了保护您的隐私，建"
"议您用 %s 加密该邮件。"
-#: ../src/sendmsg-window.c:5315
+#: ../src/sendmsg-window.c:5311
#, fuzzy, c-format
#| msgid "Tunnel error talking to %s: %s"
msgid "error checking Autocrypt keys: %s"
msgstr "协商 %s 时发生隧道错误：%s"
-#: ../src/sendmsg-window.c:5346
+#: ../src/sendmsg-window.c:5342
msgid ""
"\n"
"However, encryption is discouraged as the Autocrypt status indicates that "
"some recipients <i>might</i> not be able to read the message."
msgstr ""
-#: ../src/sendmsg-window.c:5359
+#: ../src/sendmsg-window.c:5355
#, c-format
msgid ""
"<i>Note:</i> choosing encryption will import %u key from the Autocrypt "
@@ -7735,70 +7869,70 @@ msgid_plural ""
msgstr[0] ""
# src/main-window.c:139
-#: ../src/sendmsg-window.c:5384
+#: ../src/sendmsg-window.c:5380
#, fuzzy, c-format
#| msgid "Cannot process the message: %s"
msgid "Cannot import Autocrypt keys: %s"
msgstr "无法处理邮件：%s"
-#: ../src/sendmsg-window.c:5444
+#: ../src/sendmsg-window.c:5440
msgid "You selected OpenPGP security for this message.\n"
msgstr "您选择了 OpenPGP 作为此邮件的安全保障。\n"
-#: ../src/sendmsg-window.c:5449
+#: ../src/sendmsg-window.c:5445
msgid ""
"The message text will be sent as plain text and as HTML, but only the plain "
"part can be signed.\n"
msgstr "邮件文字会以纯文本和 HTML 发送，但只有纯文本区段可以签名。\n"
-#: ../src/sendmsg-window.c:5454
+#: ../src/sendmsg-window.c:5450
msgid ""
"The message contains attachments, which cannot be signed or encrypted.\n"
msgstr "邮件包含的附件不能签名或加密。\n"
-#: ../src/sendmsg-window.c:5458
+#: ../src/sendmsg-window.c:5454
msgid ""
"You should select MIME mode if the complete message shall be protected. Do "
"you really want to proceed?"
msgstr "如果想保护整个邮件，您应该选择 MIME 模式。您真的要继续吗？"
-#: ../src/sendmsg-window.c:5481
+#: ../src/sendmsg-window.c:5477
#, fuzzy, c-format
#| msgid "sending message with gpg mode %d"
msgid "sending message with GPG mode %d"
msgstr "用 gpg 模式 %d 发送邮件"
-#: ../src/sendmsg-window.c:5511
+#: ../src/sendmsg-window.c:5507
msgid "Message could not be created"
msgstr "无法创建邮件"
-#: ../src/sendmsg-window.c:5513
+#: ../src/sendmsg-window.c:5509
msgid "Message could not be queued in outbox"
msgstr ""
# src/main-window.c:200
-#: ../src/sendmsg-window.c:5515
+#: ../src/sendmsg-window.c:5511
#, fuzzy
msgid "Message could not be saved in sentbox"
msgstr "无法将邮件保存到已发送邮件箱"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:5517
+#: ../src/sendmsg-window.c:5513
msgid "Message could not be sent"
msgstr "无法发送邮件"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:5519
+#: ../src/sendmsg-window.c:5515
msgid "Message could not be signed"
msgstr "无法签名邮件"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:5521
+#: ../src/sendmsg-window.c:5517
msgid "Message could not be encrypted"
msgstr "无法加密邮件"
# src/main-window.c:182
-#: ../src/sendmsg-window.c:5526
+#: ../src/sendmsg-window.c:5522
#, c-format
msgid ""
"Send failed: %s\n"
@@ -7808,51 +7942,51 @@ msgstr ""
"%s"
# src/main-window.c:182
-#: ../src/sendmsg-window.c:5532
+#: ../src/sendmsg-window.c:5528
#, c-format
msgid "Send failed: %s"
msgstr "发送失败：%s"
# src/main-window.c:171
-#: ../src/sendmsg-window.c:5631
+#: ../src/sendmsg-window.c:5627
#, c-format
msgid "Could not postpone message: %s"
msgstr "无法延期发送邮件：%s"
# src/main-window.c:200
-#: ../src/sendmsg-window.c:5652
+#: ../src/sendmsg-window.c:5648
msgid "Message postponed."
msgstr "邮件已延期。"
# src/main-window.c:171
-#: ../src/sendmsg-window.c:5657
+#: ../src/sendmsg-window.c:5653
msgid "Could not postpone message."
msgstr "无法延期发送邮件。"
-#: ../src/sendmsg-window.c:5869
+#: ../src/sendmsg-window.c:5865
#, c-format
msgid "Error starting spell checker: %s"
msgstr "在启动拼写检查器时出错：%s"
# src/sendmsg-window.c:513
-#: ../src/sendmsg-window.c:6632
+#: ../src/sendmsg-window.c:6628
#, c-format
msgid "Reply to %s: %s"
msgstr "回复给 %s：%s"
# src/sendmsg-window.c:518
-#: ../src/sendmsg-window.c:6637
+#: ../src/sendmsg-window.c:6633
#, c-format
msgid "Forward message to %s: %s"
msgstr "转发邮件给 %s：%s"
# src/sendmsg-window.c:523
-#: ../src/sendmsg-window.c:6641
+#: ../src/sendmsg-window.c:6637
#, c-format
msgid "New message to %s: %s"
msgstr "新建邮件给 %s：%s"
-#: ../src/sendmsg-window.c:6805 ../ui/sendmsg-window.ui.h:33
+#: ../src/sendmsg-window.c:6785 ../ui/sendmsg-window.ui.h:33
msgid "_Language"
msgstr "语言(_L)"
@@ -7861,10 +7995,8 @@ msgid "Spell check"
msgstr "拼写检查"
#: ../src/spell-check.c:352
-#, fuzzy
-#| msgid "_Change"
msgid "C_hange"
-msgstr "修改(_C)"
+msgstr "修改(_H)"
#: ../src/spell-check.c:354
msgid "Replace the current word with the selected suggestion"
@@ -7965,10 +8097,8 @@ msgid "Unexpected address book error. Report it."
msgstr "意外的地址簿错误。请报告给我们。"
#: ../src/store-address.c:290
-#, fuzzy
-#| msgid "Address Book"
msgid "Address Book:"
-msgstr "地址簿"
+msgstr "地址簿："
# src/balsa-message.c:544 src/filter-edit-dialog.c:303
# src/sendmsg-window.c:338
@@ -8220,34 +8350,34 @@ msgid ""
"Trash"
msgstr "清空废件箱(_T)"
-#: ../src/toolbar-factory.c:450
+#: ../src/toolbar-factory.c:476
#, fuzzy
msgid "Queue this message for sending"
msgstr "将此邮件放在发件箱中排队进行发送"
-#: ../src/toolbar-factory.c:462
+#: ../src/toolbar-factory.c:488
msgid "Text Be_low Icons"
msgstr "文字在图标下方(_L)"
-#: ../src/toolbar-factory.c:463
+#: ../src/toolbar-factory.c:489
msgid "Priority Text Be_side Icons"
msgstr "优先将文字显示在图标旁(_S)"
# src/pref-manager.c:67
-#: ../src/toolbar-factory.c:465
+#: ../src/toolbar-factory.c:491
msgid "_Icons Only"
msgstr "仅图标(_I)"
-#: ../src/toolbar-factory.c:466
+#: ../src/toolbar-factory.c:492
msgid "_Text Only"
msgstr "仅文字(_T)"
-#: ../src/toolbar-factory.c:688
+#: ../src/toolbar-factory.c:717
#, c-format
msgid "Use Desktop _Default (%s)"
msgstr "使用桌面默认(%s)(_D)"
-#: ../src/toolbar-factory.c:714
+#: ../src/toolbar-factory.c:743
#, fuzzy
#| msgid "Customize Toolbars"
msgid "_Customize Toolbars…"
@@ -8289,10 +8419,8 @@ msgstr "恢复工具栏默认按钮(_R)"
# src/pref-manager.c:538
#. Style button
#: ../src/toolbar-prefs.c:427
-#, fuzzy
-#| msgid "Toolbar _style..."
msgid "Toolbar _style…"
-msgstr "工具栏样式(_S)..."
+msgstr "工具栏样式(_S)…"
#: ../src/toolbar-prefs.c:444
msgid "Available buttons"
@@ -8355,28 +8483,20 @@ msgid "_External query (a program)"
msgstr "外部请求(一个程序)"
#: ../ui/ab-main.ui.h:6
-#, fuzzy
-#| msgid "LDIF Address Book"
msgid "_LDIF Address Book"
-msgstr "LDIF 地址簿"
+msgstr "_LDIF 地址簿"
#: ../ui/ab-main.ui.h:7
-#, fuzzy
-#| msgid "LDAP Address Book"
msgid "_LDAP Address Book"
-msgstr "LDAP 地址簿"
+msgstr "_LDAP 地址簿"
#: ../ui/ab-main.ui.h:8
-#, fuzzy
-#| msgid "GPE Address Book"
msgid "_GPE Address Book"
-msgstr "GPE 地址簿"
+msgstr "_GPE 地址簿"
#: ../ui/ab-main.ui.h:9
-#, fuzzy
-#| msgid "Rubrica Address Book"
msgid "_Rubrica Address Book"
-msgstr "Rubrica 地址簿"
+msgstr "_Rubrica 地址簿"
#: ../ui/ab-main.ui.h:10 ../ui/main-window.ui.h:60
msgid "_Properties"
@@ -8689,10 +8809,8 @@ msgstr "邮件(_M)"
# src/main-window.c:107
#: ../ui/main-window.ui.h:67
-#, fuzzy
-#| msgid "_New"
msgid "_New…"
-msgstr "新建(_N)"
+msgstr "新建(_N)…"
# src/main-window.c:119 src/message-window.c:60
#: ../ui/main-window.ui.h:69 ../ui/message-window.ui.h:22
@@ -8725,10 +8843,8 @@ msgid "Save Current Part…"
msgstr "保存当前部分..."
#: ../ui/main-window.ui.h:77 ../ui/message-window.ui.h:29
-#, fuzzy
-#| msgid "_View Source"
msgid "_View Source…"
-msgstr "查看源代码(_V)"
+msgstr "查看源代码(_V)…"
#: ../ui/main-window.ui.h:78 ../ui/message-window.ui.h:30
#, fuzzy
@@ -8793,10 +8909,8 @@ msgstr "内容(_C)"
# src/filter-edit-dialog.c:749
#: ../ui/main-window.ui.h:91
-#, fuzzy
-#| msgid "About Balsa"
msgid "_About Balsa"
-msgstr "关于 Balsa"
+msgstr "关于 Balsa(_A)"
#: ../ui/sendmsg-window.ui.h:2
#, fuzzy
@@ -8966,6 +9080,25 @@ msgstr ""
msgid "_Escape Special Characters"
msgstr "忽略特殊字符(_E)"
+#, fuzzy
+#~| msgid ""
+#~| "This message part contains images from a remote server. To protect your "
+#~| "privacy, Balsa has not downloaded them. You may choose to download them "
+#~| "if you trust the server."
+#~ msgid ""
+#~ "This message part contains images from a remote server.\n"
+#~ "To protect your privacy, Balsa has not downloaded them.\n"
+#~ "You may choose to download them if you trust the server."
+#~ msgstr ""
+#~ "这个邮件块区段有来自外部服务器的图像。为了保护您的隐私，Balsa 没有下载它"
+#~ "们。如果您信任该服务器，可以选择下载它们。"
+
+#~ msgid "_Download images"
+#~ msgstr "下载图像(_D)"
+
+#~ msgid "File already exists. Overwrite?"
+#~ msgstr "文件已经存在。要覆盖吗？"
+
#~ msgid "SASL Interaction\n"
#~ msgstr "SASL 交互\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
