#
msgid ""
msgstr ""
-"Project-Id-Version: emailselfdefense ersion\n"
-"POT-Creation-Date: 2019-03-19 23:41+0800\n"
-"PO-Revision-Date: 2019-03-19 23:47+0800\n"
+"Project-Id-Version: emailselfdefense 4.0\n"
+"POT-Creation-Date: 2021-07-21 10:01+0200\n"
+"PO-Revision-Date: 2020-05-20 15:02+0800\n"
"Last-Translator: Tom <hexuxin@foxmail.com>\n"
"Language-Team: \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.2.1\n"
#. type: Attribute 'lang' of: <html>
msgid "en"
#. type: Content of: <html><head><title>
msgid ""
"Email Self-Defense - a guide to fighting surveillance with GnuPG encryption"
-msgstr ""
-"Email Self-Defense - a guide to fighting surveillance with GnuPG encryption"
+msgstr "电子邮件加密指南 - 使用 GnuPG 加密对抗大规模监控"
#. type: Attribute 'content' of: <html><head><meta>
-msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+# | GnuPG, GPG, openpgp, {+encryption,+} surveillance, privacy, email, Enigmail
+#, fuzzy
+#| msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+msgid "GnuPG, GPG, openpgp, encryption, surveillance, privacy, email, Enigmail"
msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
#. type: Attribute 'content' of: <html><head><meta>
"Email surveillance violates our fundamental rights and makes free speech "
"risky. This guide will teach you email self-defense in 40 minutes with GnuPG."
msgstr ""
-"电子邮件监控侵犯了我们的基本权利，并损害了言论自由。本指南将在 40 分钟里，教"
+"电子邮件监控侵犯了我们的基本权利，并危及了言论自由。本指南将在四十分钟里，教"
"会你使用 GnuPG 进行电子邮件加密。"
#. type: Attribute 'content' of: <html><head><meta>
msgid "width=device-width, initial-scale=1"
msgstr "width=device-width, initial-scale=1"
+#. type: Content of: <html><body><div><p>
+msgid ""
+"Due to Enigmail's PGP functionality being migrated into Icedove and "
+"Thunderbird, steps 2 and 3 of the guide are currently out of date."
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+msgid ""
+"Thank you for your patience while we're working on a new round of updates."
+msgstr ""
+
#. type: Content of: <html><body><header><div><p>
msgid ""
"<strong>Please check your email for a confirmation link now. Thanks for "
"to be added manually."
msgstr "如果你没有收到确认链接，请给我们 info@fsf.org 发邮件，我们将手动添加。"
-#. type: Attribute 'alt' of: <html><body><
section><div><div><div><p><img>
+#. type: Attribute 'alt' of: <html><body><
header><div><p><img>
msgid "Try it out."
msgstr "来试试"
#. type: Content of: <html><body><header><div><p>
msgid "Join us on microblogging services for day-to-day updates:"
-msgstr "关注我们每日更新的微博客。"
+msgstr "关注我们每日更新的微博客："
#. type: Content of: <html><body><section><div><div><div><p><a>
msgid "<a href=\"https://status.fsf.org/fsf\">"
msgstr "[GNU Social]"
#. type: Content of: <html><body><section><div><div><div><p><a>
-msgid " GNU Social</a> | <a href=\"http://microca.st/fsf\">"
-msgstr " GNU Social</a> | <a href=\"http://microca.st/fsf\">"
+msgid ""
+" GNU Social</a> | <a href=\"https://hostux.social/@fsf\">"
+msgstr ""
+" GNU Social</a> | <a href=\"https://hostux.social/@fsf\">"
#. type: Attribute 'alt' of: <html><body><header><div><ul><li><a><img>
-msgid "[Pump.io]"
-msgstr "[Pump.io]"
+msgid "[Mastodon]"
+msgstr "[Mastodon]"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"
Pump.io</a> | <a href=\"https://www.twitter.com/fsf"
+"
Mastodon</a> | <a href=\"https://www.twitter.com/fsf"
"\">Twitter</a>"
msgstr ""
-"
Pump.io</a> | <a href=\"https://www.twitter.com/fsf"
+"
Mastodon</a> | <a href=\"https://www.twitter.com/fsf"
"\">Twitter</a>"
#. type: Content of: <html><body><header><div><p>
msgid ""
-"<small><a href=\"https://www.fsf.org/twitter\">Read why GNU Social and Pump."
-"io are better than Twitter.</a></small>"
+"<small><a href=\"https://www.fsf.org/twitter\">Read why GNU Social and "
+"Mastodon are better than Twitter.</a></small>"
msgstr ""
-"<small><a href=\"https://www.fsf.org/twitter\">阅读为什么 GNU Social 和 Pump."
-"io 要比 Twitter 好。</a></small>"
+"<small><a href=\"https://www.fsf.org/twitter\">阅读为什么 GNU Social 和 "
+"Mastodon 要比 Twitter 好。</a></small>"
#. type: Content of: <html><body><header><div><p>
msgid "← Return to <a href=\"index.html\">Email Self-Defense</a>"
-msgstr "← 返回 <a href=\"index.html\">指南</a>"
+msgstr "← 返回 <a href=\"index.html\">电子邮件加密指南</a>"
#. type: Content of: <html><body><footer><div><div><h4><a>
msgid "<a href=\"https://u.fsf.org/ys\">"
msgstr "</a>"
#. type: Content of: <html><body><footer><div><div><p>
-msgid ""
-"Copyright © 2014-2016 <a href=\"https://u.fsf.org/ys\">Free Software "
+# | Copyright © [-2014-2016-] {+2014-2021+} <a
+# | href=\"https://u.fsf.org/ys\">Free Software Foundation</a>, Inc. <a
+# | href=\"https://my.fsf.org/donate/privacypolicy.html\">Privacy Policy</a>.
+# | Please support our work by <a href=\"https://u.fsf.org/yr\">joining us as
+# | an associate member.</a>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2014-2016 <a href=\"https://u.fsf.org/ys\">Free Software "
+#| "Foundation</a>, Inc. <a href=\"https://my.fsf.org/donate/privacypolicy."
+#| "html\">Privacy Policy</a>. Please support our work by <a href=\"https://u."
+#| "fsf.org/yr\">joining us as an associate member.</a>"
+msgid ""
+"Copyright © 2014-2021 <a href=\"https://u.fsf.org/ys\">Free Software "
"Foundation</a>, Inc. <a href=\"https://my.fsf.org/donate/privacypolicy.html"
"\">Privacy Policy</a>. Please support our work by <a href=\"https://u.fsf."
"org/yr\">joining us as an associate member.</a>"
"作。"
#. type: Content of: <html><body><footer><div><div><p>
+# | The images on this page are under a <a
+# | href=\"https://creativecommons.org/licenses/by/4.0/\">Creative Commons
+# | Attribution 4.0 license (or later version)</a>, and the rest of it is
+# | under a <a
+# | href=\"https://creativecommons.org/licenses/by-sa/4.0\">Creative Commons
+# | Attribution-ShareAlike 4.0 license (or later version)</a>. Download the <a
+# | [-href=\"http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz\">source-]
+# | {+href=\"https://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz\">
+# | source+} code of Edward reply bot</a> by Andrew Engelbrecht
+# | <andrew@engelbrecht.io> and Josh Drake <zamnedix@gnu.org>,
+# | available under the GNU Affero General Public License. <a
+# | href=\"http{+s+}://www.gnu.org/licenses/license-list.html#OtherLicenses\">Why
+# | these licenses?</a>
+#, fuzzy
+#| msgid ""
+#| "The images on this page are under a <a href=\"https://creativecommons.org/"
+#| "licenses/by/4.0/\">Creative Commons Attribution 4.0 license (or later "
+#| "version)</a>, and the rest of it is under a <a href=\"https://"
+#| "creativecommons.org/licenses/by-sa/4.0\">Creative Commons Attribution-"
+#| "ShareAlike 4.0 license (or later version)</a>. Download the <a href="
+#| "\"http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar."
+#| "gz\">source code of Edward reply bot</a> by Andrew Engelbrecht <"
+#| "andrew@engelbrecht.io> and Josh Drake <zamnedix@gnu.org>, "
+#| "available under the GNU Affero General Public License. <a href=\"http://"
+#| "www.gnu.org/licenses/license-list.html#OtherLicenses\">Why these licenses?"
+#| "</a>"
msgid ""
"The images on this page are under a <a href=\"https://creativecommons.org/"
"licenses/by/4.0/\">Creative Commons Attribution 4.0 license (or later "
"version)</a>, and the rest of it is under a <a href=\"https://"
"creativecommons.org/licenses/by-sa/4.0\">Creative Commons Attribution-"
-"ShareAlike 4.0 license (or later version)</a>. Download the <a href=\"http://"
-"agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz\"> source "
-"code of Edward reply bot</a> by Andrew Engelbrecht <sudoman@ninthfloor."
-"org> and Josh Drake <zamnedix@gnu.org>, available under the GNU "
-"Affero General Public License. <a href=\"http://www.gnu.org/licenses/license-"
-"list.html#OtherLicenses\">Why these licenses?</a>"
-msgstr ""
-"此页面上的图片采用 <a href=\"https://creativecommons.org/licenses/by/4.0/\">"
-"知识共享 署名 4.0 许可协议（或较新版本）</a> 进行许可，其余部分以 <a href="
-"\"https://creativecommons.org/licenses/by-sa/4.0\">知识共享 署名-相同方式 "
-"4.0 许可协议 （或较新版本）</a> 进行许可。下载由 Andrew Engelbrecht <"
-"sudoman@ninthfloor.org> 和 Josh Drake <zamnedix@gnu.org> 编写的 <a "
-"href=\"http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward."
-"tar.gz\">爱德华自动回复机器人源代码</a>，采用 GNU Affero General Public "
-"License 许可证进行许可。<a href=\"http://www.gnu.org/licenses/license-list."
-"html#OtherLicenses\">为什么要这些许可证？</a>"
+"ShareAlike 4.0 license (or later version)</a>. Download the <a href="
+"\"https://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz"
+"\"> source code of Edward reply bot</a> by Andrew Engelbrecht <"
+"andrew@engelbrecht.io> and Josh Drake <zamnedix@gnu.org>, available "
+"under the GNU Affero General Public License. <a href=\"https://www.gnu.org/"
+"licenses/license-list.html#OtherLicenses\">Why these licenses?</a>"
+msgstr ""
+"简体中文由 Tom <hexuxin@foxmail.com> 完成翻译。</p><p>此页面上的图片采"
+"用 <a href=\"https://creativecommons.org/licenses/by/4.0/\">知识共享 署名 "
+"4.0 许可协议（或较新版本）</a> 进行许可，其余部分以 <a href=\"https://"
+"creativecommons.org/licenses/by-sa/4.0\">知识共享 署名-相同方式 4.0 许可协议"
+"（或较新版本）</a> 进行许可。下载 <a href=\"http://agpl.fsf.org/"
+"emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz\">爱德华自动回复机器人"
+"的源代码</a> 由 Andrew Engelbrecht <andrew@engelbrecht.io> 和 Josh "
+"Drake <zamnedix@gnu.org> 编写，采用 GNU Affero General Public License "
+"许可证进行许可。<a href=\"http://www.gnu.org/licenses/license-list."
+"html#OtherLicenses\">为什么要这些许可协议？</a>"
#. type: Content of: <html><body><footer><div><div><p>
+# | Fonts used in the guide & infographic: <a
+# | href=\"https://www.google.com/fonts/specimen/Dosis\">Dosis</a> by Pablo
+# | Impallari, <a
+# | href=\"http{+s+}://www.google.com/fonts/specimen/Signika\">Signika</a> by
+# | Anna Giedryś, <a
+# | href=\"http{+s+}://www.google.com/fonts/specimen/Archivo+Narrow\">Archivo
+# | Narrow</a> by Omnibus-Type, <a
+# | href=\"https://libreplanet.org/wiki/GPG_guide/Graphics_Howto#Pitfalls\">PXL-2000</a>
+# | by Florian Cramer.
+#, fuzzy
+#| msgid ""
+#| "Fonts used in the guide & infographic: <a href=\"https://www.google."
+#| "com/fonts/specimen/Dosis\">Dosis</a> by Pablo Impallari, <a href=\"http://"
+#| "www.google.com/fonts/specimen/Signika\">Signika</a> by Anna Giedryś, "
+#| "<a href=\"http://www.google.com/fonts/specimen/Archivo+Narrow\">Archivo "
+#| "Narrow</a> by Omnibus-Type, <a href=\"https://libreplanet.org/wiki/"
+#| "GPG_guide/Graphics_Howto#Pitfalls\">PXL-2000</a> by Florian Cramer."
msgid ""
"Fonts used in the guide & infographic: <a href=\"https://www.google.com/"
-"fonts/specimen/Dosis\">Dosis</a> by Pablo Impallari, <a href=\"http://www."
+"fonts/specimen/Dosis\">Dosis</a> by Pablo Impallari, <a href=\"https://www."
"google.com/fonts/specimen/Signika\">Signika</a> by Anna Giedryś, <a "
-"href=\"http://www.google.com/fonts/specimen/Archivo+Narrow\">Archivo Narrow</"
-"a> by Omnibus-Type, <a href=\"https://libreplanet.org/wiki/GPG_guide/"
+"href=\"https://www.google.com/fonts/specimen/Archivo+Narrow\">Archivo "
+"
Narrow</a> by Omnibus-Type, <a href=\"https://libreplanet.org/wiki/GPG_guide/"
"Graphics_Howto#Pitfalls\">PXL-2000</a> by Florian Cramer."
msgstr ""
"本指南和信息图所使用的字体：<a href=\"https://www.google.com/fonts/specimen/"
"fonts/specimen/Signika\">Signika</a> 由 Anna Giedryś 设计，<a href="
"\"http://www.google.com/fonts/specimen/Archivo+Narrow\">Archivo Narrow</a> "
"由 Omnibus-Type 设计，<a href=\"https://libreplanet.org/wiki/GPG_guide/"
-"Graphics_Howto#Pitfalls\">PXL-2000</a> 由 Florian Cramer 设计。"
+"Graphics_Howto#Pitfalls\">PXL-2000</a> 由 Florian Cramer 设计，<a href="
+"\"https://github.com/adobe-fonts/source-han-sans\">思源黑体</a> 由 Adobe 等设"
+"计。"
#. type: Content of: <html><body><footer><div><div><p>
msgid ""
"\"emailselfdefense_source.zip\">源码包</a>。"
#. type: Content of: <html><body><footer><div><div><p>
+# | This site uses the Weblabels standard for labeling <a
+# | href=\"https://www.fsf.org/campaigns/freejs\">free JavaScript</a>. View
+# | the JavaScript <a
+# | [-href=\"//weblabels.fsf.org/emailselfdefense.fsf.org/\"-]
+# | {+href=\"https://weblabels.fsf.org/emailselfdefense.fsf.org/\"+}
+# | rel=\"jslicense\">source code and license information</a>.
+#, fuzzy
+#| msgid ""
+#| "This site uses the Weblabels standard for labeling <a href=\"https://www."
+#| "fsf.org/campaigns/freejs\">free JavaScript</a>. View the JavaScript <a "
+#| "href=\"//weblabels.fsf.org/emailselfdefense.fsf.org/\" rel=\"jslicense"
+#| "\">source code and license information</a>."
msgid ""
"This site uses the Weblabels standard for labeling <a href=\"https://www.fsf."
-"org/campaigns/freejs\">free JavaScript</a>. View the JavaScript <a href=\"//"
-"weblabels.fsf.org/emailselfdefense.fsf.org/\" rel=\"jslicense\">source code "
-"and license information</a>."
+"org/campaigns/freejs\">free JavaScript</a>. View the JavaScript <a href="
+"\"https://weblabels.fsf.org/emailselfdefense.fsf.org/\" rel=\"jslicense"
+"\">source code and license information</a>."
msgstr ""
"本站使用 Weblabels 标准标记 <a href=\"https://www.fsf.org/campaigns/freejs"
"\">自由的 JavaScript</a>。 查看 JavaScript <a href=\"//weblabels.fsf.org/"
"emailselfdefense.fsf.org/\" rel=\"jslicense\">源代码和许可证信息</a>。"
#. type: Content of: <html><body><footer><div><p><a>
-msgid ""
-"Infographic and guide design by <a rel=\"external\" href=\"http://jplusplus."
+# | Infographic and guide design by <a rel=\"external\"
+# | href=\"http{+s+}://jplusplus.org\"><strong>Journalism++</strong>
+#, fuzzy
+#| msgid ""
+#| "Infographic and guide design by <a rel=\"external\" href=\"http://"
+#| "jplusplus.org\"><strong>Journalism++</strong>"
+msgid ""
+"Infographic and guide design by <a rel=\"external\" href=\"https://jplusplus."
"org\"><strong>Journalism++</strong>"
msgstr ""
-"信息图和指南
设计由 <a rel=\"external\" href=\"http://jplusplus.org"
-"\"><strong>Journalism++</strong> "
+"信息图和指南由 <a rel=\"external\" href=\"http://jplusplus.org"
+"\"><strong>Journalism++</strong> 设计"
#. type: Attribute 'alt' of: <html><body><footer><div><p><a><img>
msgid "Journalism++"
msgstr "Journalism++"
+#. type: Attribute 'content' of: <html><head><meta>
+# | GnuPG, GPG, openpgp, surveillance, privacy, email, [-Enigmail-]
+# | {+security, GnuPG2+}
+#, fuzzy
+#| msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, security, GnuPG2"
+msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
+
#. type: Content of: <html><body><header><div><h1>
msgid "Email Self-Defense"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a class=\"current\" href=\"/en\">English - v4.0</a>"
-msgstr "<a href=\"/en\">English - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ar\">العربية <span class=\"tip\">tip</span></a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/cs\">Čeština - v4.0</a>"
-msgstr "<a href=\"/cs\">Čeština - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/de\">Deutsch - v3.0</a>"
-msgstr "<a href=\"/de\">Deutsch - v3.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/el\">ελληνικά - v3.0</a>"
-msgstr "<a href=\"/el\">ελληνικά - v3.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/es\">español - v4.0</a>"
-msgstr "<a href=\"/es\">español - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/fa\">فارسی - v4.0</a>"
-msgstr "<a href=\"/fa\">فارسی - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/fr\">français - v4.0</a>"
-msgstr "<a href=\"/fr\">français - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/it\">italiano - v3.0</a>"
-msgstr "<a href=\"/it\">italiano - v3.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ja\">日本語 - v4.0</a>"
-msgstr "<a href=\"/ja\">日本語 - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ko\">한국어 <span class=\"tip\">tip</span></a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ml\">മലയാളം <span class=\"tip\">tip</span></a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/pt-br\">português do Brasil - v3.0</a>"
-msgstr "<a href=\"/pt-br\">português do Brasil - v3.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ro\">română - v3.0</a>"
-msgstr "<a href=\"/ro\">română - v3.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ru\">русский - v4.0</a>"
-msgstr "<a href=\"/ru\">русский - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/sq\">Shqip - v4.0</a>"
-msgstr "<a href=\"/sq\">Shqip - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/sv\">svenska - v4.0</a>"
-msgstr "<a href=\"/sv\">svenska - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/tr\">Türkçe - v4.0</a>"
-msgstr "<a href=\"/tr\">Türkçe - v4.0</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/zh-hans\">简体中文 <span class=\"tip\">tip</span></a>"
-msgstr ""
-"<a class=\"current\" href=\"/zh-hans\">简体中文 <span class=\"tip\">tip</"
-"span></a>"
+msgstr "电子邮件加密指南"
#. type: Content of: <html><body><header><div><ul><li>
msgid ""
-"<a href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide"
-"\"><strong><span style=\"color: #2F5FAA;\">Translate!</span></strong></a>"
+"<a href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide\"> "
+"<strong><span style=\"color: #2F5FAA;\">Translate!</span></strong></a>"
msgstr ""
-"<a href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide"
-"\"><strong><span style=\"color: #2F5FAA;\">Translate!</span></strong></a>"
+"<a href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide\"> "
+"<strong><span style=\"color: #2F5FAA;\">Translate!</span></strong></a>"
#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"index.html\" class=\"current\">GNU/Linux</a>"
+# | <a href=\"index.html\" [-class=\"current\">GNU/Linux</a>-]
+# | {+class=\"current\">Set up guide</a>+}
+#, fuzzy
+#| msgid "<a href=\"index.html\" class=\"current\">GNU/Linux</a>"
+msgid "<a href=\"index.html\" class=\"current\">Set up guide</a>"
msgstr "<a href=\"index.html\" class=\"current\">GNU/Linux</a>"
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"mac.html\">Mac OS</a>"
-msgstr "<a href=\"mac.html\">Mac OS</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"windows.html\">Windows</a>"
-msgstr "<a href=\"windows.html\">Windows</a>"
-
#. type: Content of: <html><body><header><div><ul><li>
msgid "<a href=\"workshops.html\">Teach your friends</a>"
msgstr "<a href=\"workshops.html\">研讨会</a>"
#. type: Content of: <html><body><header><div><ul><li><a>
-msgid ""
-"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email "
-"encryption for everyone via %40fsf\"> Share "
+# | <a [-href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email
+# | encryption for everyone via %40fsf\">-]
+# | {+href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email%20encryption%20for%20everyone%20via%20%40fsf\">+}
+# | Share
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email "
+#| "encryption for everyone via %40fsf\"> Share "
+msgid ""
+"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email"
+"%20encryption%20for%20everyone%20via%20%40fsf\"> Share "
msgstr ""
"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email "
"encryption for everyone via %40fsf\">分享 "
msgid "[Hacker News]"
msgstr "[Hacker News]"
-#. type: Content of: <html><body><header><div><div><h3><a>
-msgid "<a href=\"http://u.fsf.org/ys\">"
-msgstr "<a href=\"http://u.fsf.org/ys\">"
-
#. type: Content of: <html><body><header><div><div><div><p>
msgid ""
"We fight for computer users' rights, and promote the development of free (as "
"<strong>请捐款支持电子邮件加密指南。我们会一直改进它，使其充实，迈出保护自己"
"隐私的第一步是人人受益的。</strong>"
-#. type: Content of: <html><body><header><div><div><p><a>
+#. type: Content of: <html><body><section><div><div><div><p><a>
+# | <a
+# | [-href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate\">-]
+# | {+href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&
+# | amp;mtm_campaign=email_self_defense&mtm_kwd=guide_donate\">+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&"
+#| "id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate\">"
msgid ""
"<a href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&"
-"id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate\">"
+"id=14&mtm_campaign=email_self_defense&mtm_kwd=guide_donate\">"
msgstr ""
"<a href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&"
"id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate\">"
msgid "Donate"
msgstr "捐款"
-#. type: Content of: <html><body><
header><div><div><p><a>
+#. type: Content of: <html><body><
section><div><div><div><p><a>
msgid "<a id=\"infographic\" href=\"infographic.html\">"
msgstr "<a id=\"infographic\" href=\"infographic.html\">"
-#. type: Attribute 'alt' of: <html><body><
header><div><div><p><a><img>
+#. type: Attribute 'alt' of: <html><body><
section><div><div><div><p><a><img>
msgid "View & share our infographic →"
msgstr "查看并分享我们的信息图"
"计算机，一个电子邮箱账号和大约四十分钟时间。"
#. type: Content of: <html><body><header><div><div><p>
+# | Even if you have nothing to hide, using encryption helps protect the
+# | privacy of people you communicate with, and makes life difficult for bulk
+# | surveillance systems. If you do have something important to hide, you're
+# | in good company; these are the same tools that whistleblowers use to
+# | protect their identities while shining light on human rights abuses,
+# | corruption{+,+} and other crimes.
+#, fuzzy
+#| msgid ""
+#| "Even if you have nothing to hide, using encryption helps protect the "
+#| "privacy of people you communicate with, and makes life difficult for bulk "
+#| "surveillance systems. If you do have something important to hide, you're "
+#| "in good company; these are the same tools that whistleblowers use to "
+#| "protect their identities while shining light on human rights abuses, "
+#| "corruption and other crimes."
msgid ""
"Even if you have nothing to hide, using encryption helps protect the privacy "
"of people you communicate with, and makes life difficult for bulk "
"surveillance systems. If you do have something important to hide, you're in "
"good company; these are the same tools that whistleblowers use to protect "
-"their identities while shining light on human rights abuses, corruption and "
+"their identities while shining light on human rights abuses, corruption, and "
"other crimes."
msgstr ""
"即使你没有什么见不得人的事情，使用加密可以保护通信对方的隐私，并使大规模监控"
"发人权侵犯、腐败以及其他犯罪问题时，也是使用同样的工具保护他们身份的。"
#. type: Content of: <html><body><header><div><div><p>
+# | In addition to using encryption, standing up to surveillance requires
+# | fighting politically for a <a
+# | href=\"http{+s+}://gnu.org/philosophy/surveillance-vs-democracy.html\">reduction
+# | in the amount of data collected on us</a>, but the essential first step is
+# | to protect yourself and make surveillance of your communication as
+# | difficult as possible. This guide helps you do that. It is designed for
+# | beginners, but if you already know the basics of GnuPG or are an
+# | experienced free software user, you'll enjoy the advanced tips and the <a
+# | href=\"workshops.html\">guide to teaching your friends</a>.
+#, fuzzy
+#| msgid ""
+#| "In addition to using encryption, standing up to surveillance requires "
+#| "fighting politically for a <a href=\"http://gnu.org/philosophy/"
+#| "surveillance-vs-democracy.html\">reduction in the amount of data "
+#| "collected on us</a>, but the essential first step is to protect yourself "
+#| "and make surveillance of your communication as difficult as possible. "
+#| "This guide helps you do that. It is designed for beginners, but if you "
+#| "already know the basics of GnuPG or are an experienced free software "
+#| "user, you'll enjoy the advanced tips and the <a href=\"workshops.html"
+#| "\">guide to teaching your friends</a>."
msgid ""
"In addition to using encryption, standing up to surveillance requires "
-"fighting politically for a <a href=\"http://gnu.org/philosophy/surveillance-"
+"fighting politically for a <a href=\"https://gnu.org/philosophy/surveillance-"
"vs-democracy.html\">reduction in the amount of data collected on us</a>, but "
"the essential first step is to protect yourself and make surveillance of "
"your communication as difficult as possible. This guide helps you do that. "
"are an experienced free software user, you'll enjoy the advanced tips and "
"the <a href=\"workshops.html\">guide to teaching your friends</a>."
msgstr ""
-"除了使用加密技术，对抗监控还需要我们作政治斗争，以减少政府 <a href=\"http://"
-"gnu.org/philosophy/surveillance-vs-democracy.html\">对我们的大量数据收集</"
-"a>。但重中之重是保护好你自己，使得监控你的通讯尽可能的困难。本指南将帮助你做"
-"到。它是为初学者设计的，但如果你已经掌握了 GnuPG 的基本知识，或你是一位资深自"
-"由软件用户，你会喜欢进阶提示与 <a href=\"workshops.html\">加密探讨会指南</"
-"a>。"
+"除了使用加密技术，对抗监控还需要我们作政治斗争，以减少政府 <a href=\"https://"
+"www.gnu.org/philosophy/surveillance-vs-democracy.zh-cn.html\">对我们的大量数"
+"据收集</a>。但重中之重是保护好你自己，使得政府难以监控你的通讯。本指南将帮助"
+"你做到这一点。它是为初学者设计的，但如果你已经掌握了 GnuPG 的基本知识，或你是"
+"一位资深自由软件用户，你会喜欢进阶提示与 <a href=\"workshops.html\">加密探讨"
+"会指南</a>。"
#. type: Content of: <html><body><section><div><div><h2>
msgid "<em>#1</em> Get the pieces"
msgstr "<em>#1</em> 获取部件"
#. type: Content of: <html><body><section><div><div><p>
+# | This guide relies on software which is <a
+# | href=\"https://www.gnu.org/philosophy/free-sw.html\">freely licensed</a>;
+# | it's completely transparent and anyone can copy it or make their own
+# | version. This makes it safer from surveillance than proprietary software
+# | (like [-Windows).-] {+Windows or macOS).+} Learn more about free software
+# | at <a href=\"https://u.fsf.org/ys\">fsf.org</a>.
+#, fuzzy
+#| msgid ""
+#| "This guide relies on software which is <a href=\"https://www.gnu.org/"
+#| "philosophy/free-sw.html\">freely licensed</a>; it's completely "
+#| "transparent and anyone can copy it or make their own version. This makes "
+#| "it safer from surveillance than proprietary software (like Windows). "
+#| "Learn more about free software at <a href=\"https://u.fsf.org/ys\">fsf."
+#| "org</a>."
msgid ""
"This guide relies on software which is <a href=\"https://www.gnu.org/"
"philosophy/free-sw.html\">freely licensed</a>; it's completely transparent "
"and anyone can copy it or make their own version. This makes it safer from "
-"surveillance than proprietary software (like Windows). Learn more about free "
-"software at <a href=\"https://u.fsf.org/ys\">fsf.org</a>."
+"surveillance than proprietary software (like Windows or macOS). Learn more "
+"
about free software at <a href=\"https://u.fsf.org/ys\">fsf.org</a>."
msgstr ""
-"本指南依赖于 <a href=\"https://www.gnu.org/philosophy/free-sw.html\">自由许可"
-"</a> 的软件；它是完全透明的，任何人都可以复制它，制作自己的版本。这使得它比专"
-"有软件（比如 Windows）来的更安全。你可以在 <a href=\"https://u.fsf.org/ys"
-"\">fsf.org</a> 上了解更多有关自由软件的信息。"
+"本指南依赖于 <a href=\"https://www.gnu.org/philosophy/free-sw.zh-cn.html\">自"
+"由许可</a> 的软件；它是完全透明的，任何人都可以复制它，制作自己的版本。这使得"
+"它比专有软件（比如 Windows）更难受到监控。你可以在 <a href=\"https://u.fsf."
+"org/ys\">fsf.org</a> 上了解更多有关自由软件的信息。"
#. type: Content of: <html><body><section><div><div><p>
-msgid ""
-"Most GNU/Linux operating systems come with GnuPG installed on them, so you "
-"don't have to download it. Before configuring GnuPG though, you'll need the "
-"IceDove desktop email program installed on your computer. Most GNU/Linux "
-"distributions have IceDove installed already, though it may be under the "
-"alternate name \"Thunderbird.\" Email programs are another way to access the "
-"same email accounts you can access in a browser (like Gmail), but provide "
-"extra features."
+# | Most GNU/Linux operating systems come with GnuPG installed on them, so
+# | {+if you're running one of these systems,+} you don't have to download it.
+# | {+If you're running macOS or Windows, steps to download GnuPG are below.+}
+# | Before configuring [-GnuPG-] {+your encryption setup with this guide,+}
+# | though, you'll need [-the IceDove-] {+a+} desktop email program installed
+# | on your computer. [-Most-] {+Many+} GNU/Linux distributions have
+# | [-IceDove-] {+one+} installed already, [-though it-] {+such as Icedove,
+# | which+} may be under the alternate name \"Thunderbird.\" [-Email
+# | programs-] {+Programs like these+} are another way to access the same
+# | email accounts you can access in a browser (like Gmail), but provide extra
+# | features.
+#, fuzzy
+#| msgid ""
+#| "Most GNU/Linux operating systems come with GnuPG installed on them, so "
+#| "you don't have to download it. Before configuring GnuPG though, you'll "
+#| "need the IceDove desktop email program installed on your computer. Most "
+#| "GNU/Linux distributions have IceDove installed already, though it may be "
+#| "under the alternate name \"Thunderbird.\" Email programs are another way "
+#| "to access the same email accounts you can access in a browser (like "
+#| "Gmail), but provide extra features."
+msgid ""
+"Most GNU/Linux operating systems come with GnuPG installed on them, so if "
+"you're running one of these systems, you don't have to download it. If "
+"you're running macOS or Windows, steps to download GnuPG are below. Before "
+"configuring your encryption setup with this guide, though, you'll need a "
+"desktop email program installed on your computer. Many GNU/Linux "
+"distributions have one installed already, such as Icedove, which may be "
+"under the alternate name \"Thunderbird.\" Programs like these are another "
+"way to access the same email accounts you can access in a browser (like "
+"Gmail), but provide extra features."
msgstr ""
"大多数 GNU/Linux 操作系统自带 GnuPG，所以你不必下载它。在配置 GnuPG 前，你需"
"要安装 IceDove 桌面电子邮件程序。大多数 GNU/Linux 发行版已经安装好 IceDove "
"箱账号的途径（你也可以像 Gmail 那样通过浏览器访问），但它提供了更多的功能。"
#. type: Content of: <html><body><section><div><div><p>
+# | If you already have an email program, you can skip to <a
+# | [-href=\"#step-1b\">Step 1.b</a>.-] {+href=\"#section2\">Step 2</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If you already have an email program, you can skip to <a href=\"#step-1b"
+#| "\">Step 1.b</a>."
msgid ""
-"If you already have an email program, you can skip to <a href=\"#step-1b"
-"\">Step 1.b</a>."
+"If you already have an email program, you can skip to <a href="
+"\"#section2\">Step 2</a>."
msgstr ""
"如果你已经有了电子邮件程序，你可以跳至 <a href=\"#step-1b\">Step 1.b</a>。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"Open your email program and follow the wizard (step-by-step walkthrough) "
-"that sets it up with your email account."
-msgstr "打开你的邮件程序，按照向导程序的提示逐步设置好你的邮箱账号。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"Look for the letters SSL, TLS, or STARTTLS to the right of the servers when "
-"you're setting up your account. If you don't see them, you will still be "
-"able to use encryption, but this means that the people running your email "
-"system are running behind the industry standard in protecting your security "
-"and privacy. We recommend that you send them a friendly email asking them to "
-"enable SSL, TLS, or STARTTLS for your email server. They will know what "
-"you're talking about, so it's worth making the request even if you aren't an "
-"expert on these security systems."
+"that sets it up with your email account. This usually starts from \"Account "
+"Settings\" → \"Add Mail Account\". You should get the email server "
+"settings from your systems administrator or the help section of your email "
+"account."
msgstr ""
-"在配置你的账号时，留意服务器右侧的 SSL, TLS 或 STARTTLS 字样。如果你没有看到"
-"他们，你仍将有能力使用加密，但这意味着运行邮件系统的人以低于行业标准的规范保"
-"护着你的安全与隐私。我们建议你，向他们发送一份友好的邮件，要求他们为邮件服务"
-"器启用 SSL, TLS 或 STARTTLS。他们会知道你说的是什么，如果你不是系统安全的专"
-"家，这是一个值得的请求。"
#. type: Content of: <html><body><section><div><div><div><div><h4>
msgid "Troubleshooting"
"something like \"Add account\" or \"New/Existing email account.\""
msgstr ""
"你可以自行启动它，但不同邮件程序的菜单选项不尽相同。启动它的按钮在程序的主菜"
-"单里，“新建”或者类似的，标题类似于“添加账号”（Add account）或者“新建/已存在的"
-"邮箱账å\8f·â\80\9dï¼\88New/Existing email accountï¼\89ã\80\82"
+"单里，“新建”或者类似的，标题类似于“添加账号”（Add account）或者“新建/已有电子"
+"邮件å¸\90æ\88·â\80\9dï¼\88New/Existing email accountï¼\89ã\80\82"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "The wizard can't find my account or isn't downloading my mail"
"在网上搜索解决方案之前，我们建议你问问你身边使用相同邮件系统的人，以检查设置"
"是否正确。"
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+# | I can't find the menu[-.-]
+#, fuzzy
+#| msgid "I can't find the menu."
+msgid "I can't find the menu"
+msgstr "我找不到菜单。"
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"In many new email programs, the main menu is represented by an image of "
+"three stacked horizontal bars."
+msgstr "在许多新型电子邮件程序中，主菜单是用三横杠图标表示的。"
+
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "Don't see a solution to your problem?"
msgstr "没有找到解决方案？"
"请在 <a href=\"https://libreplanet.org/wiki/GPG_guide/Public_Review\">反馈页"
"</a> 上告诉我们。"
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.B: Tools -> Add-ons"
-msgstr "Step 1.B: 工具 -> 附加组件"
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.B: Search Add-ons"
-msgstr "Step 1.B: 搜索附加组件"
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.B: Install Add-ons"
-msgstr "Step 1.B: 安装附加组件"
-
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 1.b</em> Install the Enigmail plugin for your email program"
-msgstr "<em>Step 1.b</em> 安装 ENIGMAIL 扩展"
+# | <em>Step 1.b</em> Get {+your terminal ready and install+} GnuPG [-by
+# | downloading GPG4Win-]
+#, fuzzy
+#| msgid "<em>Step 1.b</em> Get GnuPG by downloading GPG4Win"
+msgid "<em>Step 1.b</em> Get your terminal ready and install GnuPG"
+msgstr "<em>Step 1.b</em> 下载 GPG4Win 获取 GnuPG"
#. type: Content of: <html><body><section><div><div><div><p>
+# | If you {+are using a GNU/Linux machine, you should+} already have [-an
+# | email program,-] {+GnuPG installed, and+} you can skip to <a
+# | [-href=\"#step-1b\">Step 1.b</a>.-] {+href=\"#section2\">Step 2</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If you already have an email program, you can skip to <a href=\"#step-1b"
+#| "\">Step 1.b</a>."
msgid ""
-"In your email program's menu, select Add-ons (it may be in the Tools "
-"section). Make sure Extensions is selected on the left. Do you see Enigmail? "
-"Make sure it's the latest version. If so, skip this step."
+"If you are using a GNU/Linux machine, you should already have GnuPG "
+"installed, and you can skip to <a href=\"#section2\">Step 2</a>."
msgstr ""
-"在邮件程序的菜单栏里，选择“附加组件”（Add-ons，它可能在工具选项里）。确认选上"
-"了左侧的“扩展”（Extensions）。看到了 Enigmail 吗？确保安装的是最新版本。如果"
-"是，请跳过此步。"
+"如果你已经有了电子邮件程序，你可以跳至 <a href=\"#step-1b\">Step 1.b</a>。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"If not, search \"Enigmail\" with the search bar in the upper right. You can "
-"take it from here. Restart your email program when you're done."
+"If you are using a macOS or Windows machine, however, you need to first "
+"install the GnuPG program. Select your operating system below and follow the "
+"steps. For the rest of the steps in this guide, the steps are the same for "
+"all operating systems."
msgstr ""
-"如果没有，在右上方的搜索框里搜索“Enigmail”。你可以在这里获取到它。安装完成后"
-"重启邮件程序。"
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"There are major security flaws in versions of GnuPG prior to 2.2.8, and "
-"Enigmail prior to 2.0.7. Make sure you have GnuPG 2.2.8 and Enigmail 2.0.7, "
-"or later versions."
+#. type: Content of: <html><body><section><div><div><div><div><h4>
+msgid "MacOS"
msgstr ""
-"在 GnuPG 2.2.8 和 Engmail 2.0.7 前的版本存在重大安全漏洞。请确保安装的是 "
-"GnuPG 2.2.8 和 Engmail 2.0.7 及其之后的版本。"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "I can't find the menu."
-msgstr "我找不到菜单。"
+msgid "Use a third-party package manager to install GnuPG"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
msgid ""
-"In many new email programs, the main menu is represented by an image of "
-"three stacked horizontal bars."
-msgstr "在许多新型电子邮件程序中，主菜单是用三横杠图标表示的。"
+"Your macOS comes with a program called \"Terminal\" pre-installed, which "
+"we'll use to set up your encryption with GnuPG, using the command line. "
+"However, the default macOS package manager makes it difficult to install "
+"GnuPG and other pieces of free software (like Emacs, GIMP, or Inkscape)."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"To make things easier, we recommend setting up the third-party package "
+"manager \"Homebrew\" to install GnuPG. Copy the link on the home page of <a "
+"href=\"https://brew.sh/\">Homebrew</a> and paste it in Terminal. Click "
+"\"Enter\" and wait for it to finalize."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"When it is done, install the program by entering the following code in "
+"Terminal:"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"<span style=\"color:#2f5faa; font-family: monospace;\">brew install gnupg "
+"gnupg2</span>. After installation is done, you can follow the steps of the "
+"rest of this guide."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><h4>
+msgid "Windows"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "My email looks weird"
-msgstr "我的电子邮件看起来很奇怪"
+# | [-<em>Step 1.b</em>-]Get GnuPG by downloading GPG4Win
+#, fuzzy
+#| msgid "<em>Step 1.b</em> Get GnuPG by downloading GPG4Win"
+msgid "Get GnuPG by downloading GPG4Win"
+msgstr "<em>Step 1.b</em> 下载 GPG4Win 获取 GnuPG"
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+# | [-GPG4Win-]{+<a href=\"https://www.gpg4win.org/\">GPG4Win</a>+} is a
+# | {+email and file encryption+} software package that includes GnuPG. [-<a
+# | href=\"https://www.gpg4win.org/\">Download</a>-] {+Download+} and install
+# | [-it,-] {+the latest version,+} choosing default options whenever asked.
+# | After it's installed, you can close any windows that it creates.
+#, fuzzy
+#| msgid ""
+#| "GPG4Win is a software package that includes GnuPG. <a href=\"https://www."
+#| "gpg4win.org/\">Download</a> and install it, choosing default options "
+#| "whenever asked. After it's installed, you can close any windows that it "
+#| "creates."
+msgid ""
+"<a href=\"https://www.gpg4win.org/\">GPG4Win</a> is a email and file "
+"encryption software package that includes GnuPG. Download and install the "
+"latest version, choosing default options whenever asked. After it's "
+"installed, you can close any windows that it creates."
+msgstr ""
+"GPG4Win 是一个包含 GnuPG 的软件包。<a href=\"https://www.gpg4win.org/\">下载"
+"</a> 并安装它，无论提示什么都选择默认选项。安装后，你可以关闭程序创建的窗口。"
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+msgid ""
+"To follow the rest of the steps in this guide, you'll use the program called "
+"\"PowerShell\", which is a program you'll see elsewhere referred to as a "
+"\"terminal.\" This allows you to operate your computer using the command "
+"line."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h3>
+msgid "GnuPG, OpenPGP, what?"
+msgstr "什么是 GnuPG，OpenPGP？"
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are
+# | used interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the
+# | encryption standard, and GNU Privacy Guard (often shortened to GPG or
+# | GnuPG) is the program that implements the standard. [-Enigmail is a
+# | plug-in program for your-] {+Most+} email [-program that provides-]
+# | {+programs provide+} an interface for GnuPG. {+There is also a newer
+# | version of GnuPG, called GnuPG2.+}
+#, fuzzy
+#| msgid ""
+#| "In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are "
+#| "used interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the "
+#| "encryption standard, and GNU Privacy Guard (often shortened to GPG or "
+#| "GnuPG) is the program that implements the standard. Enigmail is a plug-"
+#| "in program for your email program that provides an interface for GnuPG."
msgid ""
-"Enigmail doesn't tend to play nice with HTML, which is used to format "
-"emails, so it may disable your HTML formatting automatically. To send an "
-"HTML-formatted email without encryption or a signature, hold down the Shift "
-"key when you select compose. You can then write an email as if Enigmail "
-"wasn't there."
+"In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are "
+"used interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the "
+"encryption standard, and GNU Privacy Guard (often shortened to GPG or "
+"GnuPG) is the program that implements the standard. Most email programs "
+"provide an interface for GnuPG. There is also a newer version of GnuPG, "
+"called GnuPG2."
msgstr ""
-"Enigmail 往往不能在 HTML 格式（它是一种常见的邮件格式）里表现的很好，所以它会"
-"自动禁用 HTML 格式。要想发送不加密或不带签名的 HTML 格式邮件，单击“新建消"
-"息”（compose）时按住 Shift 键，你就可以撰写邮件，仿佛 Enigmail 不存在一样。"
+"通常，术语 GnuPG, GPG, GNU Privacy Guard, OpenPGP 和 PGP 可以互换其称呼。技术"
+"上说，OpenPGP（Pretty Good Privacy）是一种加密标准， GNU Privacy Guard（常被"
+"缩写为 GPG 或 GnuPG）是实现该标准的程序。Enigmail 是一个电子邮件程序的插件，"
+"它提供了 GnuPG 的界面。"
#. type: Content of: <html><body><section><div><div><h2>
msgid "<em>#2</em> Make your keys"
msgstr "<em>#2</em> 生成密钥"
+#. type: Attribute 'alt' of: <html><body><section><div><div><p><img>
+msgid ""
+"A robot with a head shaped like a key holding a private and a public key"
+msgstr ""
+
#. type: Content of: <html><body><section><div><div><p>
msgid ""
"To use the GnuPG system, you'll need a public key and a private key (known "
"keyserver as a phonebook; people who want to send you encrypted email can "
"look up your public key."
msgstr ""
-"ä½ ç\9a\84å\85¬é\92¥ä¸\8d太å\83\8fç\8e°å®\9eä¸ç\9a\84é\92¥å\8c\99ï¼\8cå®\83å\85¬å¼\80å\82¨å\98å\9c¨è¢«ç§°ä¹\8b为å¯\86é\92¥æ\9c\8då\8a¡å\99¨ï¼\88keyserverï¼\89ç\9a\84å\9c¨çº¿"
-"目录上。人们可以下载使用它，借助 GnuPG，人们向你发送加密邮件。你可以把密钥服"
-"å\8a¡å\99¨æ\83³è±¡æ\88\90ä¸\80æ\9c¬ç\94µè¯\9dç°¿ï¼\9bæ\83³è¦\81ç»\99ä½ å\8f\91é\80\81å\8a å¯\86é\82®ä»¶ç\9a\84人è\83½å¤\9fæ\89¾å\88°ä½ ç\9a\84å\85¬é\92¥ã\80\82"
+"ä½ ç\9a\84å\85¬é\92¥ä¸\8då\83\8fç\8e°å®\9eä¸ç\9a\84é\92¥å\8c\99ï¼\8cå®\83å\85¬å¼\80å\82¨å\98å\9c¨è¢«ç§°ä¹\8b为å¯\86é\92¥æ\9c\8då\8a¡å\99¨ï¼\88keyserverï¼\89ç\9a\84å\9c¨çº¿ç\9b®"
+"录上。人们可以下载使用它，借助 GnuPG，人们向你发送加密邮件。你可以把密钥服务"
+"器想象成一本电话簿；想要给你发送加密邮件的人能够找到你的公钥。"
#. type: Content of: <html><body><section><div><div><p>
msgid ""
"Your private key is more like a physical key, because you keep it to "
"yourself (on your computer). You use GnuPG and your private key together to "
"descramble encrypted emails other people send to you. <span style=\"font-"
-"weight: bold;\">You should never share you private key with anyone, under "
+"weight: bold;\">You should never share your private key with anyone, under "
"any circumstances.</span>"
msgstr ""
-"你的私钥更像是现实中的钥匙，你需要自行保管它（在你的计算机中）。你可以使用 "
-"GnuPG 和你的私钥来解密他人发给你的加密邮件。<span style=\"font-weight: bold;"
-"\">无论如何，你都不应该改向他人分享你的私钥。</span>"
+"你的私钥更像是现实中的钥匙，你需要自行保管它（在你的计算机中）。你使用 GnuPG "
+"和你的私钥来解密他人发给你的加密邮件。<span style=\"font-weight: bold;\">无论"
+"如何，你都不应该向他人分享你的私钥。</span>"
#. type: Content of: <html><body><section><div><div><p>
msgid ""
"我们将在下一节里详细探讨它。"
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Step 2.A: Make a Keypair"
+# | Step 2.A: Make [-a-] {+your+} Keypair
+#, fuzzy
+#| msgid "Step 2.A: Make a Keypair"
+msgid "Step 2.A: Make your Keypair"
+msgstr "Step 2.A: 生成密钥对"
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+# | Step 2.A: [-Make a Keypair-] {+Set your passphrase+}
+#, fuzzy
+#| msgid "Step 2.A: Make a Keypair"
+msgid "Step 2.A: Set your passphrase"
msgstr "Step 2.A: 生成密钥对"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "<em>Step 2.a</em> Make a keypair"
msgstr "<em>Step 2.a</em> 生成密钥对"
+#. type: Content of: <html><body><section><div><div><div><h6>
+# | [-<em>#2</em>-]Make your [-keys-] {+keypair+}
+#, fuzzy
+#| msgid "<em>#2</em> Make your keys"
+msgid "Make your keypair"
+msgstr "<em>#2</em> 生成密钥"
+
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"The Enigmail Setup wizard may start automatically. If it doesn't, select "
-"Enigmail → Setup Wizard from your email program's menu. You don't need "
-"to read the text in the window that pops up unless you'd like to, but it's "
-"good to read the text on the later screens of the wizard. Click Next with "
-"the default options selected, except in these instances, which are listed in "
-"the order they appear:"
+"Open a terminal using <span style=\"color:#2f5faa; font-family: monospace;"
+"\">ctrl + alt + t</span> (on GNU/linux), or find it in your applications, "
+"and use the following code to create your keypair:"
msgstr ""
-"Enigmail 安装向导可能会自动运行。如果没有，在你的邮件程序你选择 Enigmail → "
-"Setup Wizard。如果你不愿意，你不必去阅读弹出窗口中的文字，但读一读总归是好"
-"的。点击下一步而不对默认选项作修改，但除了下列情况以外："
-#. type: Content of: <html><body><section><div><div><div><ul><li>
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"On the screen titled \"Encryption,\" select \"Encrypt all of my messages by "
-"default, because privacy is critical to me.\""
+"We will use the command line in a terminal to create a keypair using the "
+"GnuPG program. A terminal should be installed on your GNU/Linux operating "
+"system, if you are using a macOS or Windows OS system, use the programs "
+"\"Terminal\" (macOS) or \"PowerShell\" (Windows) that were also used in "
+"section 1."
msgstr ""
-"在“加密”（Encryption）界面，选中“默认加密我的所有消息，因为隐私对我很重要”。"
-#. type: Content of: <html><body><section><div><div><div><ul><li>
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"# <span style=\"color:#2f5faa; font-family: monospace;\">gpg --full-generate-"
+"key</span> to start the process."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"On the screen titled \"Signing,\" select \"Don't sign my messages by default."
-"\""
-msgstr "在“签名”（Signing）界面，选中“默认不对我的消息签名”。"
+"# To answer what kind of key you would like to create, select the default "
+"option <span style=\"color:#2f5faa; font-family: monospace;\"> 1 RSA and "
+"RSA</span>."
+msgstr ""
-#. type: Content of: <html><body><section><div><div><div><ul><li>
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"On the screen titled \"Key Selection,\" select \"I want to create a new key "
-"pair for signing and encrypting my email.\""
+"# Enter the following keysize: <span style=\"color:#2f5faa; font-family: "
+"monospace;\">4096</span> for a strong key."
msgstr ""
-"在“密钥选择”（Key Selection）界面，选择“我想为数字签名和加密邮件创建新密钥"
-"对”。"
-#. type: Content of: <html><body><section><div><div><div><ul><li>
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"On the screen titled \"Create Key,\" pick a strong password! You can do it "
+"# Choose the expiration date, we suggest <span style=\"color:#2f5faa; font-"
+"family: monospace;\">2y</span> (2 years)."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid "Follow the prompts to continue setting up with your personal details."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h6>
+msgid "Set your passphrase"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | On the screen titled [-\"Create Key,\"-] {+\"Passphrase,\"+} pick a strong
+# | password! You can do it manually, or you can use the Diceware method.
+# | Doing it manually is faster but not as secure. Using Diceware takes longer
+# | and requires dice, but creates a password that is much harder for
+# | attackers to figure out. To use it, read the section \"Make a secure
+# | passphrase with Diceware\" in <a
+# | href=\"https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/\">
+# | this article</a> by Micah Lee.
+#, fuzzy
+#| msgid ""
+#| "On the screen titled \"Create Key,\" pick a strong password! You can do "
+#| "it manually, or you can use the Diceware method. Doing it manually is "
+#| "faster but not as secure. Using Diceware takes longer and requires dice, "
+#| "but creates a password that is much harder for attackers to figure out. "
+#| "To use it, read the section \"Make a secure passphrase with Diceware\" in "
+#| "<a href=\"https://theintercept.com/2015/03/26/passphrases-can-memorize-"
+#| "attackers-cant-guess/\"> this article</a> by Micah Lee."
+msgid ""
+"On the screen titled \"Passphrase,\" pick a strong password! You can do it "
"manually, or you can use the Diceware method. Doing it manually is faster "
"but not as secure. Using Diceware takes longer and requires dice, but "
"creates a password that is much harder for attackers to figure out. To use "
"\"https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-"
"cant-guess/\"> this article</a> by Micah Lee."
msgstr ""
-"在“生成密钥”（Create Key）界面。取一个强壮的密码吧！你可以自行取密码，也可以"
-"使用 Diceware 模式。自己取密码虽然快捷，但不安全。使用 Diceware 需要更长时"
-"间，并要求掷骰子，但它能生成攻击者难以辨识出的密码。要使用它，请阅读 Micah "
-"Lee 写的 <a href=\"https://theintercept.com/2015/03/26/passphrases-can-"
-"memorize-attackers-cant-guess/\">这篇文章</a> 的《使用 Diceware 生成安全密"
-"码 》（Make a secure passphrase with Diceware）一节。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"If you'd like to pick a password manually, come up with something you can "
+"在“生成密钥”界面。取一个强壮的密码吧！你可以自行取密码，也可以使用 Diceware "
+"模式。自己取密码虽然快捷，但不安全。使用 Diceware 需要更长时间，并要求掷骰"
+"子，但它能生成攻击者难以辨识出的密码。要使用它，请阅读 Micah Lee 写的 <a "
+"href=\"https://theintercept.com/2015/03/26/passphrases-can-memorize-"
+"attackers-cant-guess/\">这篇文章</a> 的“使用 Diceware 生成安全密码 ”（Make a "
+"secure passphrase with Diceware）一节。"
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | If you'd like to pick a [-password-] {+passphrase+} manually, come up with
+# | something you can remember which is at least twelve characters long, and
+# | includes at least one lower case and upper case letter and at least one
+# | number or punctuation symbol. Never pick a password you've used elsewhere.
+# | Don't use any recognizable patterns, such as birthdays, telephone numbers,
+# | pets' names, song lyrics, quotes from books, and so on.
+#, fuzzy
+#| msgid ""
+#| "If you'd like to pick a password manually, come up with something you can "
+#| "remember which is at least twelve characters long, and includes at least "
+#| "one lower case and upper case letter and at least one number or "
+#| "punctuation symbol. Never pick a password you've used elsewhere. Don't "
+#| "use any recognizable patterns, such as birthdays, telephone numbers, "
+#| "pets' names, song lyrics, quotes from books, and so on."
+msgid ""
+"If you'd like to pick a passphrase manually, come up with something you can "
"remember which is at least twelve characters long, and includes at least one "
"lower case and upper case letter and at least one number or punctuation "
"symbol. Never pick a password you've used elsewhere. Don't use any "
"recognizable patterns, such as birthdays, telephone numbers, pets' names, "
"song lyrics, quotes from books, and so on."
msgstr ""
-"如果你喜欢自己取密码，想一个你记得起的至少十二字符长的东西，至少包含一个小写"
-"和大写字母，和一个数字或标点符号。永远不要使用你其他地方使用过的密码。不用使"
-"ç\94¨ä»»ä½\95å\8f¯è¾¨è®¤ç\9a\84è§\84å¾\8bï¼\8c诸å¦\82ç\94\9fæ\97¥ã\80\81ç\94µè¯\9då\8f·ç \81ã\80\81å® ç\89©å\90\8då\97ã\80\81æ\8cè¯\8dæ\88\96书ä¸ç\9a\84å¼\95言。"
+"如果你喜欢自己取密码，想一个能记住的至少十二字符长的东西，至少包含一个小写和"
+"一个大写字母，和一个数字或标点符号。永远不要使用你在其他地方使用过的密码。不"
+"ç\94¨ä½¿ç\94¨ä»»ä½\95å\8f¯è¾¨è®¤ç\9a\84è§\84å¾\8bï¼\8c诸å¦\82ç\94\9fæ\97¥ã\80\81ç\94µè¯\9då\8f·ç \81ã\80\81å® ç\89©å\90\8då\97ã\80\81æ\8cè¯\8dæ\88\96书ä¸ç\9a\84å\90\8d言。"
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"The program will take a little while to finish the next step, the \"Key "
-"Creation\" screen. While you wait, do something else with your computer, "
-"like watching a movie or browsing the Web. The more you use the computer at "
-"this point, the faster the key creation will go."
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+msgid "GnuPG is not installed"
msgstr ""
-"在“生成密钥”（Key Creation）界面，程序需要花费小会儿完成下一步。等待时，你可"
-"以在计算机上做一些其他事情，比如看电影或浏览网页。此时你计算机使用的越频繁，"
-"密钥生成的速度越快。"
-#. type: Content of: <html><body><section><div><div><div><p>
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
msgid ""
-"<span style=\"font-weight: bold;\">When the \"Key Generation Completed\" "
-"screen pops up, select Generate Certificate and choose to save it in a safe "
-"place on your computer (we recommend making a folder called \"Revocation "
-"Certificate\" in your home folder and keeping it there). This step is "
-"essential for your email self-defense, as you'll learn more about in <a href="
-"\"#section5\">Section 5</a>.</span>"
+"GPG is not installed. You can check if this is the case with the command "
+"<span style=\"color:#2f5faa; font-family: monospace;\">gpg --version</"
+"span>. If GnuPG is not installed, it would bring up the following result on "
+"most GNU/Linux operating systems, or something like it: <span style=\"color:"
+"#2f5faa; font-family: monospace;\">Command 'gpg' not found, but can be "
+"installed with: sudo apt install gnupg</span>. Follow that command and "
+"install the program."
msgstr ""
-"<span style=\"font-weight: bold;\">当 “密钥已生成”（Key Generation "
-"Completed）窗口弹出，选中“生成证书”（Generate Certificate）并选择把它储存在计"
-"算机上安全的地方（我们推荐新建一个名为“吊销证书”的目录在你的家目录下，并将它"
-"保存在那里）。这是本指南重要的一步，你将会在 <a href=\"#section5\">Section "
-"5</a> 了解到更多信息。</span>"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "I can't find the Enigmail menu."
-msgstr "我找不到 Enigmail 菜单。"
+msgid "I took too long to create my passphrase"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
msgid ""
-"In many new email programs, the main menu is represented by an image of "
-"three stacked horizontal bars. Enigmail may be inside a section called Tools."
+"That's okay. It's important to think about your passphrase. When you're "
+"ready, just follow the steps from the beginning again to create your key."
msgstr ""
-"在许多新型电子邮件程序中，主菜单是用三横杠图标表示的。Enigmail 可能在“工具”选"
-"项里。"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "The wizard says that it cannot find GnuPG."
-msgstr "向导程序无法找到 GnuPG"
+msgid "How can I see my key?"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
msgid ""
-"Open whatever program you usually use for installing software, and search "
-"for GnuPG, then install it. Then restart the Enigmail setup wizard by going "
-"to Enigmail → Setup Wizard."
+"Use the following command to see all keys <span style=\"color:#2f5faa; font-"
+"family: monospace;\">gpg --list-keys</span>. Yours should be listed in "
+"there, and later, so will Edward's (<a href=\"#section3\">section 3</a>). If "
+"you want to see only your key, you can use <span style=\"color:#2f5faa; font-"
+"family: monospace;\">gpg --list-key [your@email]</span>. You can also use "
+"<span style=\"color:#2f5faa; font-family: monospace;\">gpg --list-secret-"
+"key</span> to see your own private key."
msgstr ""
-"打开你常用来安装软件的程序，搜索 GnuPG，并安装它。通过 Enigmail → Setup "
-"Wizard 来重启 Enigmail 安装向导。"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "More resources"
msgstr "更多资源"
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid ""
-"If you're having trouble with our instructions or just want to learn more, "
-"check out <a href=\"https://enigmail.wiki/"
-"Key_Management#Generating_your_own_key_pair\"> Enigmail's wiki instructions "
-"for key generation</a>."
-msgstr ""
-"如果你对我们的说明有问题或是想了解更多，请访问 <a href=\"https://enigmail."
-"wiki/Key_Management#Generating_your_own_key_pair\">Enigmain 对于生成密钥说明"
-"的维基页面</a>。"
-
-#. type: Content of: <html><body><section><div><div><div><div><h4>
-msgid "Advanced"
-msgstr "进阶指南"
-
-#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "Command line key generation"
-msgstr "使用命令行生成密钥"
-
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid ""
-"If you prefer using the command line for a higher degree of control, you can "
-"follow the documentation from <a href=\"https://www.gnupg.org/gph/en/manual/"
-"c14.html#AEN25\">The GNU Privacy Handbook</a>. Make sure you stick with "
-"\"RSA and RSA\" (the default), because it's newer and more secure than the "
-"algorithms the documentation recommends. Also make sure your key is at least "
-"2048 bits, or 4096 if you want to be extra secure."
+# | [-If you prefer using the command line for a higher degree of
+# | control,-]{+For more information about this process,+} you can [-follow
+# | the documentation from-] {+also refer to+} <a
+# | href=\"https://www.gnupg.org/gph/en/manual/c14.html#AEN25\">The GNU
+# | Privacy Handbook</a>. Make sure you stick with \"RSA and RSA\" (the
+# | default), because it's newer and more secure than the algorithms the
+# | documentation recommends. Also make sure your key is at least [-2048 bits,
+# | or-] 4096 {+bits+} if you want to be [-extra-] secure.
+#, fuzzy
+#| msgid ""
+#| "If you prefer using the command line for a higher degree of control, you "
+#| "can follow the documentation from <a href=\"https://www.gnupg.org/gph/en/"
+#| "manual/c14.html#AEN25\">The GNU Privacy Handbook</a>. Make sure you stick "
+#| "with \"RSA and RSA\" (the default), because it's newer and more secure "
+#| "than the algorithms the documentation recommends. Also make sure your key "
+#| "is at least 2048 bits, or 4096 if you want to be extra secure."
+msgid ""
+"For more information about this process, you can also refer to <a href="
+"\"https://www.gnupg.org/gph/en/manual/c14.html#AEN25\">The GNU Privacy "
+"Handbook</a>. Make sure you stick with \"RSA and RSA\" (the default), "
+"because it's newer and more secure than the algorithms the documentation "
+"recommends. Also make sure your key is at least 4096 bits if you want to be "
+"secure."
msgstr ""
"如果你偏爱使用命令行，以获得更高级别的控制，你可以参考文档 <a href="
"\"https://www.gnupg.org/gph/en/manual/c14.html#AEN25\">The GNU Privacy "
"的算法更新更安全。同时确保你的密钥至少 2048 bits，如果你想更安全的话 4096 "
"bits 也是可以的。"
+#. type: Content of: <html><body><section><div><div><div><div><h4>
+msgid "Advanced"
+msgstr "进阶指南"
+
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "Advanced key pairs"
-msgstr ""
+msgstr "高级密钥对"
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+# | When GnuPG creates a new keypair, it compartmentalizes the encryption
+# | function from the signing function through <a
+# | href=\"https://wiki.debian.org/Subkeys\">subkeys</a>. If you use subkeys
+# | carefully, you can keep your GnuPG identity [-much-] more secure and
+# | recover from a compromised key much more quickly. <a
+# | href=\"https://alexcabal.com/creating-the-perfect-gpg-keypair/\">Alex
+# | Cabal</a> and <a
+# | href=\"http{+s+}://keyring.debian.org/creating-key.html\">the Debian
+# | wiki</a> provide good guides for setting up a secure subkey configuration.
+#, fuzzy
+#| msgid ""
+#| "When GnuPG creates a new keypair, it compartmentalizes the encryption "
+#| "function from the signing function through <a href=\"https://wiki.debian."
+#| "org/Subkeys\">subkeys</a>. If you use subkeys carefully, you can keep "
+#| "your GnuPG identity much more secure and recover from a compromised key "
+#| "much more quickly. <a href=\"https://alexcabal.com/creating-the-perfect-"
+#| "gpg-keypair/\">Alex Cabal</a> and <a href=\"http://keyring.debian.org/"
+#| "creating-key.html\">the Debian wiki</a> provide good guides for setting "
+#| "up a secure subkey configuration."
msgid ""
"When GnuPG creates a new keypair, it compartmentalizes the encryption "
"function from the signing function through <a href=\"https://wiki.debian.org/"
"Subkeys\">subkeys</a>. If you use subkeys carefully, you can keep your GnuPG "
-"identity much more secure and recover from a compromised key much more "
-"quickly. <a href=\"https://alexcabal.com/creating-the-perfect-gpg-keypair/"
-"\">Alex Cabal</a> and <a href=\"http://keyring.debian.org/creating-key.html"
-"\">the Debian wiki</a> provide good guides for setting up a secure subkey "
+"identity more secure and recover from a compromised key much more quickly. "
+"<a href=\"https://alexcabal.com/creating-the-perfect-gpg-keypair/\">Alex "
+"Cabal</a> and <a href=\"https://keyring.debian.org/creating-key.html\">the "
+"Debian wiki</a> provide good guides for setting up a secure subkey "
"configuration."
msgstr ""
+"当 GnuPG 创建一个新的密钥对时，加密函数和签名函数会通过 <a href=\"https://"
+"wiki.debian.org/Subkeys\">子密钥</a>（subkeys）分离开来。如果你谨慎地使用子密"
+"钥，你能够更加安全地保证 GnuPG 身份，并迅速从密钥泄漏中恢复回来。<a href="
+"\"https://alexcabal.com/creating-the-perfect-gpg-keypair/\">Alex Cabal</a> "
+"和 <a href=\"http://keyring.debian.org/creating-key.html\">Debian wiki</a> 提"
+"供了对设置一支安全子密钥的配置说明。"
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 2.B: Send to server and generate a certificate"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 2.b</em> Upload your public key to a keyserver"
+# | <em>Step [-3.b</em> Send a test encrypted email-] {+2.b</em> Some
+# | important steps following creation+}
+#, fuzzy
+#| msgid "<em>Step 3.b</em> Send a test encrypted email"
+msgid "<em>Step 2.b</em> Some important steps following creation"
+msgstr "<em>Step 3.b</em> 发送一封测试加密邮件"
+
+#. type: Content of: <html><body><section><div><div><div><h6>
+# | [-<em>Step 2.b</em>-]Upload your [-public-] key to a keyserver
+#, fuzzy
+#| msgid "<em>Step 2.b</em> Upload your public key to a keyserver"
+msgid "Upload your key to a keyserver"
msgstr "<em>Step 2.b</em> 上传公钥到密钥服务器"
#. type: Content of: <html><body><section><div><div><div><p>
-msgid "In your email program's menu, select Enigmail → Key Management."
-msgstr "在你的电子邮件程序菜单里，选中 Enigmail → Key Management。"
+# | [-Now-]{+We will upload your key to a keyserver, so if+} someone [-who-]
+# | wants to send you an encrypted [-message-] {+message, they+} can download
+# | your public key from the Internet. There are multiple keyservers that you
+# | can select from the menu when you upload, but they are all copies of each
+# | other, so it doesn't matter which one you use. However, it sometimes takes
+# | a few hours for them to match each other when a new key is uploaded.
+#, fuzzy
+#| msgid ""
+#| "Now someone who wants to send you an encrypted message can download your "
+#| "public key from the Internet. There are multiple keyservers that you can "
+#| "select from the menu when you upload, but they are all copies of each "
+#| "other, so it doesn't matter which one you use. However, it sometimes "
+#| "takes a few hours for them to match each other when a new key is uploaded."
+msgid ""
+"We will upload your key to a keyserver, so if someone wants to send you an "
+"encrypted message, they can download your public key from the Internet. "
+"There are multiple keyservers that you can select from the menu when you "
+"upload, but they are all copies of each other, so it doesn't matter which "
+"one you use. However, it sometimes takes a few hours for them to match each "
+"other when a new key is uploaded."
+msgstr ""
+"现在，想给你发送加密信息的人可以从因特网上下载到你的公钥了。上传时，菜单中有"
+"多个密钥服务器可供选择，他们拥有彼此的完整副本，所以你选择哪一个无关紧要。然"
+"而，新密钥上传后，服务器间可能要数小时才能完成同步。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Right click on your key and select Upload Public Keys to Keyserver. Use the "
-"default keyserver in the popup."
+"# Copy your keyID <span style=\"color:#2f5faa; font-family: monospace;"
+"\">gnupg --list-key [your@email]</span> will list your public (\"pub\") key "
+"information, including your keyID, which is a unique list of numbers and "
+"letters. Copy this keyID, so you can use it in the following command."
msgstr ""
-"在你的密钥那里右键，选择“上传公钥到密钥服务器”（Upload Public Keys to "
-"Keyserver）。使用弹窗中默认的密钥服务器。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Now someone who wants to send you an encrypted message can download your "
-"public key from the Internet. There are multiple keyservers that you can "
-"select from the menu when you upload, but they are all copies of each other, "
-"so it doesn't matter which one you use. However, it sometimes takes a few "
-"hours for them to match each other when a new key is uploaded."
+"# Upload your key to a server: <span style=\"color:#2f5faa; font-family: "
+"monospace;\">gpg --send-key [keyID]</span>"
msgstr ""
-"现在，想给你发送加密信息的人可以从因特网上下载到你的公钥了。上传时，菜单中有"
-"多个密钥服务器可供选择，他们拥有彼此完成的副本，所以你选择哪一个无关紧要。然"
-"而，新密钥上传后，服务器间可能要数小时才能完成同步。"
-#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "The progress bar never finishes"
-msgstr "进度条一直没有结束"
+#. type: Content of: <html><body><section><div><div><div><h6>
+msgid "Export your key to a file"
+msgstr ""
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Close the upload popup, make sure you are connected to the Internet, and try "
-"again. If that doesn't work, try again, selecting a different keyserver."
+"Use the following command to export your secret key so you can import it "
+"into your email client at the next <a href=\"#section3\">step</a>. To avoid "
+"getting your key compromised, store this in a safe place, and make sure that "
+"if it is transferred, it is done so in a trusted way. Exporting your keys "
+"can be done with the following commands:"
msgstr ""
-"关闭上传窗口，确保你已连接上网络，再试一次。如果还不行，则选择其他密钥服务"
-"器。"
-#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "My key doesn't appear in the list"
-msgstr "我的密钥没有显示在列表中"
-
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid "Try checking \"Display All Keys by Default.\""
-msgstr "尝试选中“默认显示全部密钥”（Display All Keys by Default.）。"
-
-#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "More documentation"
-msgstr "更多文档"
-
-# || No change detected. The change might only be in amounts of spaces.
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+#. type: Content of: <html><body><section><div><div><div><span>
msgid ""
-"If you're having trouble with our instructions or just want to learn more, "
-"check out <a href=\"https://www.enigmail.net/index.php/en/documentation\"> "
-"Enigmail's documentation</a>."
+"<span style=\"color:#2f5faa; font-family: monospace;\"> $ gpg --export-"
+"secret-keys -a [keyid] > my_secret_key.asc"
msgstr ""
-"如果你对我们的指南有困难，或仅仅是想了解更多，请查看 <a href=\"https://www."
-"enigmail.net/index.php/en/documentation\">Enigmail's documentation</a>。"
-#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "Uploading a key from the command line"
-msgstr "使用命令行上传公钥"
+#. type: Content of: <html><body><section><div><div><div><span>
+msgid "$ gpg --export -a [keyid] > my_public_key.asc"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid ""
-"You can also upload your keys to a keyserver through the <a href=\"https://"
-"www.gnupg.org/gph/en/manual/x457.html\">command line</a>. <a href=\"https://"
-"sks-keyservers.net/overview-of-pools.php\">The sks Web site</a> maintains a "
-"list of highly interconnected keyservers. You can also <a href=\"https://www."
-"gnupg.org/gph/en/manual/x56.html#AEN64\">directly export your key</a> as a "
-"file on your computer."
+msgid "</span>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h6>
+msgid "Generate a revocation certificate"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | [-<span style=\"font-weight: bold;\">When the \"Key Generation Completed\"
+# | screen pops up, select Generate Certificate-]{+Just in case you lose your
+# | key, or it gets compromised, you want to generate a certificate+} and
+# | choose to save it in a safe place on your computer [-(we recommend making
+# | a folder called \"Revocation Certificate\" in-] {+for now (please refer to
+# | <a href=\"#step-6c\"> step 6.C</a> for how to best store+} your [-home
+# | folder and keeping it there).-] {+revocation cerficate safely).+} This
+# | step is essential for your email self-defense, as you'll learn more about
+# | in <a href=\"#section5\">Section [-5</a>.</span>-] {+5</a>.+}
+#, fuzzy
+#| msgid ""
+#| "<span style=\"font-weight: bold;\">When the \"Key Generation Completed\" "
+#| "screen pops up, select Generate Certificate and choose to save it in a "
+#| "safe place on your computer (we recommend making a folder called "
+#| "\"Revocation Certificate\" in your home folder and keeping it there). "
+#| "This step is essential for your email self-defense, as you'll learn more "
+#| "about in <a href=\"#section5\">Section 5</a>.</span>"
+msgid ""
+"Just in case you lose your key, or it gets compromised, you want to generate "
+"a certificate and choose to save it in a safe place on your computer for now "
+"(please refer to <a href=\"#step-6c\"> step 6.C</a> for how to best store "
+"your revocation cerficate safely). This step is essential for your email "
+"self-defense, as you'll learn more about in <a href=\"#section5\">Section 5</"
+"a>."
msgstr ""
-"你也可以通过 <a href=\"https://www.gnupg.org/gph/en/manual/x457.html\">命令行"
-"</a> 上传公钥到密钥服务器。<a href=\"https://sks-keyservers.net/overview-of-"
-"pools.php\">The sks Web site</a> 维护着一个高度相互连接的密钥服务器列表。你也"
-"可以 <a href=\"https://www.gnupg.org/gph/en/manual/x56.html#AEN64\">直接导出"
-"公钥</a> 文件到你的计算机中。"
-
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "GnuPG, OpenPGP, what?"
-msgstr "什么是 GnuPG，OpenPGP？"
+"<span style=\"font-weight: bold;\">当 “密钥已生成”（Key Generation "
+"Completed）窗口弹出，选中“生成证书”（Generate Certificate）并选择把它储存在计"
+"算机上安全的地方（我们推荐新建一个名为“吊销证书”的目录在你的家目录下，并将它"
+"保存在那里）。这是本指南重要的一步，你将会在 <a href=\"#section5\">Section "
+"5</a> 了解到更多信息。</span>"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are "
-"used interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the "
-"encryption standard, and GNU Privacy Guard (often shortened to GPG or "
-"GnuPG) is the program that implements the standard. Enigmail is a plug-in "
-"program for your email program that provides an interface for GnuPG."
+"# Generate a revocation certificate: <span style=\"color:#2f5faa; font-"
+"family: monospace;\">gpg --gen-revoke --output revoke.asc [keyID]</span>"
msgstr ""
-"通常，术语 GnuPG, GPG, GNU Privacy Guard, OpenPGP 和 PGP 可以交换其称呼。技术"
-"上说，OpenPGP （Pretty Good Privacy） 是一种加密标准， GNU Privacy Guard （常"
-"被缩写为 GPG 或 GnuPG）是实现该标准的程序。Enigmail 是一个电子邮件程序的插"
-"件，它提供了 GnuPG 的界面。"
-
-#. type: Content of: <html><body><section><div><div><h2>
-msgid "<em>#3</em> Try it out!"
-msgstr "<em>#3</em> 试一试"
-#. type: Content of: <html><body><section><div><div><p>
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Now you'll try a test correspondence with a computer program named Edward, "
-"who knows how to use encryption. Except where noted, these are the same "
-"steps you'd follow when corresponding with a real, live person."
+"# It will prompt you to give a reason for revocation, we recommend to use "
+"<span style=\"color:#2f5faa; font-family: monospace;\">1 \"key has been "
+"compromised\"</span>"
msgstr ""
-"现在你将要尝试与名为 Edward 的计算机程序进行通信，它掌握了如何加密。除非另有"
-"说明，你与真人通信时也遵循同样的步骤。"
-
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 3.a</em> Send Edward your public key"
-msgstr "<em>Step 3.a</em> 发送你的公钥"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"This is a special step that you won't have to do when corresponding with "
-"real people. In your email program's menu, go to Enigmail → Key "
-"Management. You should see your key in the list that pops up. Right click on "
-"your key and select Send Public Keys by Email. This will create a new draft "
-"message, as if you had just hit the Write button."
+"# You don't have to fill in a reason, but you can, then press enter for an "
+"empty line, and comfirm your selection."
msgstr ""
-"这一步很特别，因为你和真人通信时不需要做。在你的邮件程序菜单中，找到 "
-"Enigmail → Key Management。你应当看到你的密钥在弹窗的列表中。在你的密钥"
-"处右键，选择“通过邮件发送公钥”（Send Public Keys by Email）。这会创建一封草稿"
-"消息，就好像你点击了“撰写”按钮。"
-#. type: Content of: <html><body><section><div><div><div><p>
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+msgid "My key doesn't seem to be working or I get a \"permission denied.\""
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"Like every other file or folder, gpg keys are subject to permissions. If "
+"these are not set correctly, your system may not be accepting your keys. You "
+"can follow the next steps to check, and update to the right permissions."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"# Check your permissions: <span style=\"color:#2f5faa; font-family: "
+"monospace;\">ls -l ~/.gnupg/*</span>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"# Set permissions to read, write, execute for only yourself, no others. "
+"These are the recommended permissions for your folder."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"You can use the code <span style=\"color:#2f5faa; font-family: monospace;"
+"\">chmod 700 ~/.gnupg</span>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"# Set permissions to read and write for yourself only, no others. These are "
+"the recommended permissions for the keys inside your folder."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"You can use the code: <span style=\"color:#2f5faa; font-family: monospace;"
+"\">chmod 600 ~/.gnupg/*</span>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+msgid ""
+"If you have (for any reason) created your own folders inside ~/.gnupg, you "
+"must also additionally apply execute permissions to that folder. Folders "
+"require execution privileges to be opened. For more information on "
+"permissions, you can check out <a href=\"https://helpdeskgeek.com/linux-tips/"
+"understanding-linux-permissions-chmod-usage/\">this detailed information "
+"guide</a>."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+msgid "More about keyservers"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+# | You can [-also upload your keys to a-] {+find some more+} keyserver
+# | [-through the <a
+# | href=\"https://www.gnupg.org/gph/en/manual/x457.html\">command line</a>.-]
+# | {+information<a href=\"https://www.gnupg.org/gph/en/manual/x457.html\"> in
+# | this manual</a>.+} <a
+# | href=\"https://sks-keyservers.net/overview-of-pools.php\">The sks Web
+# | site</a> maintains a list of highly interconnected keyservers. You can
+# | also <a
+# | href=\"https://www.gnupg.org/gph/en/manual/x56.html#AEN64\">directly
+# | export your key</a> as a file on your computer.
+#, fuzzy
+#| msgid ""
+#| "You can also upload your keys to a keyserver through the <a href="
+#| "\"https://www.gnupg.org/gph/en/manual/x457.html\">command line</a>. <a "
+#| "href=\"https://sks-keyservers.net/overview-of-pools.php\">The sks Web "
+#| "site</a> maintains a list of highly interconnected keyservers. You can "
+#| "also <a href=\"https://www.gnupg.org/gph/en/manual/x56."
+#| "html#AEN64\">directly export your key</a> as a file on your computer."
+msgid ""
+"You can find some more keyserver information<a href=\"https://www.gnupg.org/"
+"gph/en/manual/x457.html\"> in this manual</a>. <a href=\"https://sks-"
+"keyservers.net/overview-of-pools.php\">The sks Web site</a> maintains a list "
+"of highly interconnected keyservers. You can also <a href=\"https://www."
+"gnupg.org/gph/en/manual/x56.html#AEN64\">directly export your key</a> as a "
+"file on your computer."
+msgstr ""
+"你也可以通过 <a href=\"https://www.gnupg.org/gph/en/manual/x457.html\">命令行"
+"</a> 上传公钥到密钥服务器。<a href=\"https://sks-keyservers.net/overview-of-"
+"pools.php\">The sks Web site</a> 维护着一个高度相互连接的密钥服务器列表。你也"
+"可以 <a href=\"https://www.gnupg.org/gph/en/manual/x56.html#AEN64\">直接导出"
+"公钥</a> 文件到你的计算机中。"
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+msgid "Transferring your keys"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"Use the following commands to transfer your keys. To avoid getting your key "
+"compromised, store it in a safe place, and make sure that if it is "
+"transferred, it is done so in a trusted way. Importing and exporting a key "
+"can be done with the following commands:"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><span>
+msgid ""
+"<span style=\"color:#2f5faa; font-family: monospace;\"> $ gpg --export-"
+"secret-keys -a keyid > my_private_key.asc"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><span>
+msgid "$ gpg --export -a keyid > my_public_key.asc"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><span>
+msgid "$ gpg --import my_private_key.asc"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><span>
+msgid "$ gpg --import my_public_key.asc"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+msgid ""
+"Ensure that the keyID printed is the correct one, and if so, then go ahead "
+"and add ultimate trust for it:"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"<span style=\"color:#2f5faa; font-family: monospace;\"> $ gpg --edit-key "
+"[your@email] </span>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"Because this is your key, you should choose <span style=\"color:#2f5faa; "
+"font-family: monospace;\">ultimate</span>. You shouldn't trust anyone else's "
+"key ultimately."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+msgid ""
+"Refer to <a href=\"#step-2b\">troubleshoot in step 2.B</a> for more "
+"information on permissions. When transferring keys, your permissions may get "
+"mixed, and errors may be prompted. These are easily avoided when your "
+"folders and files have the right permissions"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><h2>
+# | [-<em>Step 3.b</em> Send a test encrypted-]{+<em>#3</em> Set up+} email
+# | {+encryption+}
+#, fuzzy
+#| msgid "<em>Step 3.b</em> Send a test encrypted email"
+msgid "<em>#3</em> Set up email encryption"
+msgstr "<em>Step 3.b</em> 发送一封测试加密邮件"
+
+#. type: Content of: <html><body><section><div><div><p>
+msgid ""
+"The Icedove (or Thunderbird) email program has PGP functionality integrated, "
+"which makes it pretty easy to work with. We'll take you through the steps of "
+"integrating and using your key in these email clients."
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 3.A: Email Menu"
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 3.A: Import From File"
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 3.A: Success"
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+# | [-Troubleshooting-]{+Step 3.A: Troubleshoot+}
+#, fuzzy
+#| msgid "Troubleshooting"
+msgid "Step 3.A: Troubleshoot"
+msgstr "疑难解答"
+
+#. type: Content of: <html><body><section><div><div><div><h3>
+# | <em>Step [-1-]{+3+}.a</em> Set up your email [-program-] with [-your email
+# | account-] {+encryption+}
+#, fuzzy
+#| msgid "<em>Step 1.a</em> Set up your email program with your email account"
+msgid "<em>Step 3.a</em> Set up your email with encryption"
+msgstr "<em>Step 1.a</em> 配置电子邮件帐号"
+
+#. type: Content of: <html><body><section><div><div><div>
+msgid ""
+"Once you have set up your email with encryption, you can start contributing "
+"to encrypted traffic on the Internet. First we'll get your email client to "
+"import your secret key, and we will also learn how to get other people's "
+"public keys from servers so you can send and receive encrypted email."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"# Open your email client and use \"Tools\" → <span style=\"color:"
+"#2f5faa;\">OpenPGP Manager</span>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"# Under \"File\" → <span style=\"color:#2f5faa;\">Import Secret Key(s) "
+"From File</span>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"# Select the file you saved under the name [my_secret_key.asc] in step <a "
+"href=\"#step-3b\">step 3.b</a> when you exported your key"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid "# Unlock with your passphrase"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"# You will receive a \"OpenPGP keys successfully imported\" window to "
+"confirm success"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"# Go to \"Edit\" (in Icedove) or \"Tools\" (in Thunderbird) → \"Account "
+"settings\" → \"End-To-End Encryption,\" and make sure your key is "
+"imported and select <span style=\"color:#2f5faa;\">Treat this key as a "
+"Personal Key</span>."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+msgid "I'm not sure the import worked correctly"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"Look for \"Account settings\" → \"End-To-End Encryption\" (Under \"Edit"
+"\" (in Icedove) or \"Tools\" (in Thunderbird)). Here you can see if your "
+"personal key associated with this email is found. If it is not, you can try "
+"again via the <span style=\"color:#2f5faa;\">Add key</span> option. Make "
+"sure you have the correct, active, secret key file."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><h2>
+# | <em>#[-3-]{+4+}</em> Try it out!
+#, fuzzy
+#| msgid "<em>#3</em> Try it out!"
+msgid "<em>#4</em> Try it out!"
+msgstr "<em>#3</em> 试一试"
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><p><img>
+msgid "Illustration of a person in a house with a cat connected to a server"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><p>
+# | Now you'll try a test correspondence with [-a-] {+an FSF+} computer
+# | program named Edward, who knows how to use encryption. Except where noted,
+# | these are the same steps you'd follow when corresponding with a real, live
+# | person.
+#, fuzzy
+#| msgid ""
+#| "Now you'll try a test correspondence with a computer program named "
+#| "Edward, who knows how to use encryption. Except where noted, these are "
+#| "the same steps you'd follow when corresponding with a real, live person."
+msgid ""
+"Now you'll try a test correspondence with an FSF computer program named "
+"Edward, who knows how to use encryption. Except where noted, these are the "
+"same steps you'd follow when corresponding with a real, live person."
+msgstr ""
+"现在你将要尝试与名为爱德华（Edward）的计算机程序进行通信，它掌握了如何加密。"
+"除非另有说明，你与真人通信时也遵循同样的步骤。"
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 4.A Send key to Edward."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h3>
+# | <em>Step [-3-]{+4+}.a</em> Send Edward your public key
+#, fuzzy
+#| msgid "<em>Step 3.a</em> Send Edward your public key"
+msgid "<em>Step 4.a</em> Send Edward your public key"
+msgstr "<em>Step 3.a</em> 发送你的公钥"
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | This is a special step that you won't have to do when corresponding with
+# | real people. In your email program's menu, go to [-Enigmail-]
+# | {+\"Tools\"+} → {+\"OpenPGP+} Key [-Management.-] {+Manager.\"+} You
+# | should see your key in the list that pops up. Right click on your key and
+# | select [-Send-] {+<span style=\"color:#2f5faa;\">Send+} Public Keys by
+# | [-Email.-] {+Email</span>.+} This will create a new draft message, as if
+# | you had just hit the [-Write button.-] {+\"Write\" button, but in the
+# | attachment you will find your public keyfile.+}
+#, fuzzy
+#| msgid ""
+#| "This is a special step that you won't have to do when corresponding with "
+#| "real people. In your email program's menu, go to Enigmail → Key "
+#| "Management. You should see your key in the list that pops up. Right click "
+#| "on your key and select Send Public Keys by Email. This will create a new "
+#| "draft message, as if you had just hit the Write button."
+msgid ""
+"This is a special step that you won't have to do when corresponding with "
+"real people. In your email program's menu, go to \"Tools\" → \"OpenPGP "
+"Key Manager.\" You should see your key in the list that pops up. Right click "
+"on your key and select <span style=\"color:#2f5faa;\">Send Public Keys by "
+"Email</span>. This will create a new draft message, as if you had just hit "
+"the \"Write\" button, but in the attachment you will find your public "
+"keyfile."
+msgstr ""
+"这一步很特别，因为你和真人通信时不需要做。在你的邮件程序菜单中，找到 "
+"Enigmail → 密钥管理。你应当看到你的密钥在弹窗的列表中。在你的密钥处右"
+"键，选择“通过邮件发送公钥”（Send Public Keys by Email）。这会创建一封草稿消"
+"息，就好像你点击了“撰写”按钮。"
+
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"Address the message to <a href=\"mailto:edward-en@fsf.org\">edward-en@fsf."
"org</a>. Put at least one word (whatever you want) in the subject and body "
"of the email. Don't send yet."
msgstr ""
-"收信人地址填写 <a href=\"mailto:edward-en@fsf.org\">edward-en@fsf.org</a>。在"
+"收信人地址填写 <a href=\"mailto:edward-zh@fsf.org\">edward-zh@fsf.org</a>。在"
"邮件主题栏和正文里任意撰写内容。先别发送。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"The lock icon in the top left should be yellow, meaning encryption is turned "
-"on. We want this first special message to be unencrypted, so click the icon "
-"once to turn it off. The lock should become grey, with a blue dot on it (to "
-"alert you that the setting has been changed from the default). Once "
-"encryption is off, hit Send."
+"We want Edward to be able to open the email with your keyfile, so we want "
+"this first special message to be unencrypted. Make sure encryption is turned "
+"off by using the dropdown menu \"Security\" and select <span style=\"color:"
+"#2f5faa\">Do Not Encrypt</span>. Once encryption is off, hit Send."
msgstr ""
-"左上方的锁形图标应当是黄色的，这意味着加密已经启用。我们需要这第一封特别的邮"
-"件是未经加密的，因此需要单击图标让它关闭。此时锁形图标会变成灰色，并带有小蓝"
-"点（以提醒你默认设置已发生改变）。加密关闭后，点击发送。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | It may take two or three minutes for Edward to respond. In the meantime,
+# | you might want to skip ahead and check out the <a
+# | href=\"#section[-5-]{+6+}\">Use it Well</a> section of this guide. Once
+# | [-he's responded,-] {+you have received a response,+} head to the next
+# | step. From here on, you'll be doing just the same thing as when
+# | corresponding with a real person.
+#, fuzzy
+#| msgid ""
+#| "It may take two or three minutes for Edward to respond. In the meantime, "
+#| "you might want to skip ahead and check out the <a href=\"#section5\">Use "
+#| "it Well</a> section of this guide. Once he's responded, head to the next "
+#| "step. From here on, you'll be doing just the same thing as when "
+#| "corresponding with a real person."
msgid ""
"It may take two or three minutes for Edward to respond. In the meantime, you "
-"might want to skip ahead and check out the <a href=\"#section5\">Use it "
-"Well</a> section of this guide. Once he's responded, head to the next step. "
-"From here on, you'll be doing just the same thing as when corresponding with "
-"a real person."
+"might want to skip ahead and check out the <a href=\"#section6\">Use it "
+"Well</a> section of this guide. Once you have received a response, head to "
+"the next step. From here on, you'll be doing just the same thing as when "
+"corresponding with a real person."
msgstr ""
"爱德华可能需要两三分钟回复邮件。在这期间，你可以跳过前面的部分并查阅本指南 "
"<a href=\"#section5\">善用加密</a> 章节。爱德华回复后，继续下面的步骤。从这里"
"开始，你所要做的与真人通信时相同。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | When you open Edward's reply, GnuPG may prompt you for your [-password-]
+# | {+passphrase+} before using your private key to decrypt it.
+#, fuzzy
+#| msgid ""
+#| "When you open Edward's reply, GnuPG may prompt you for your password "
+#| "before using your private key to decrypt it."
msgid ""
-"When you open Edward's reply, GnuPG may prompt you for your password before "
-"using your private key to decrypt it."
+"When you open Edward's reply, GnuPG may prompt you for your passphrase "
+"before using your private key to decrypt it."
msgstr ""
"你打开爱德华回复的邮件，在使用私钥解密消息时，GnuPG 可能会弹窗要求输入密码。"
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 4.B Option 1. Verify key"
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 4.B Option 2. Import key"
+msgstr ""
+
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 3.b</em> Send a test encrypted email"
+# | <em>Step [-3-]{+4+}.b</em> Send a test encrypted email
+#, fuzzy
+#| msgid "<em>Step 3.b</em> Send a test encrypted email"
+msgid "<em>Step 4.b</em> Send a test encrypted email"
msgstr "<em>Step 3.b</em> 发送一封测试加密邮件"
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"Write a new email in your email program, addressed to <a href=\"mailto:"
-"edward-en@fsf.org\">edward-en@fsf.org</a>. Make the subject \"Encryption test"
-"\" or something similar and write something in the body."
+#. type: Content of: <html><body><section><div><div><div><h6>
+msgid "Get Edward's key"
msgstr ""
-"在你的邮件程序中写一封新的邮件，收信人地址填写 <a href=\"mailto:edward-"
-"en@fsf.org\">edward-en@fsf.org</a>。在主题中填写“加密测试”或类似的词语，并在"
-"正文中写一些内容。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"The lock icon in the top left of the window should be yellow, meaning "
-"encryption is on. This will be your default from now on."
+"To encrypt an email to Edward, you need its public key, so now you'll have "
+"to download it from a keyserver. You can do this in two different ways:"
msgstr ""
-"窗口左上放的锁形图标应当是黄色的，这意味着加密已启用。这会是你今后的默认设"
-"置。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Next to the lock, you'll notice an icon of a pencil. We'll get to this in a "
-"moment."
-msgstr "你会注意紧挨着锁形的铅笔图标。我们马上就会用到它。"
+"<strong>Option 1.</strong> In the email answer you received from Edward as a "
+"response to your first email, Edward's public key was included. On the right "
+"of the email, just above the writing area, you will find an \"OpenPGP\" "
+"button that has a lock and a little wheel next to it. Click that, and select "
+"<span style=\"color:#2f5faa\">Discover</span> next to the text: \"This "
+"message was sent with a key that you don't have yet.\" A popup with Edward's "
+"key details will follow."
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Click Send. Enigmail will pop up a window that says \"Recipients not valid, "
-"not trusted or not found.\""
-msgstr "点击发送。Enigmail 会弹出窗口提示“收件人不合法，不受信任或未找到”。"
+"<strong>Option 2.</strong> Open your OpenPGP manager and under \"Keyserver\" "
+"choose <span style=\"color:#2f5faa\">Discover Keys Online</span>. Here, fill "
+"in Edward's email address, and import Edward's key."
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"To encrypt an email to Edward, you need his public key, so now you'll have "
-"Enigmail download it from a keyserver. Click Download Missing Keys and use "
-"the default in the pop-up that asks you to choose a keyserver. Once it finds "
-"keys, check the first one (Key ID starting with C), then select ok. Select "
-"ok in the next pop-up."
+"The option <span style=\"color:#2f5faa\">Accepted (unverified)</span> will "
+"add this key to your key manager, and now it can be used to send encrypted "
+"emails and to verify digital signatures from Edward."
msgstr ""
-"要给爱德华发送加密邮件，你需要他的公钥，接下来你要 Enigmail 从密钥服务器下载"
-"它。点击“下载缺失的密钥”，并使用默认的密钥服务器。一旦它找到公钥后，选择第一"
-"支密钥（以 C 开头的 Key ID），并确定。在下一个弹窗中选择确定。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Now you are back at the \"Recipients not valid, not trusted or not found\" "
-"screen. Check the box in front of Edward's key and click Send."
+"In the popup window confirming if you want to import Edward's key, you'll "
+"see many different emails that are all associated with its key. This is "
+"correct; you can safely import the key."
msgstr ""
-"现在你返回“收件人不合法，不受信任或未找到”界面，查看爱德华公钥的窗口，点击发"
-"送。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | Since you encrypted this email with Edward's public key, Edward's private
+# | key is required to decrypt it. Edward is the only one with [-his-] {+its+}
+# | private key, so no one except [-him-] {+Edward+} can decrypt it.
+#, fuzzy
+#| msgid ""
+#| "Since you encrypted this email with Edward's public key, Edward's private "
+#| "key is required to decrypt it. Edward is the only one with his private "
+#| "key, so no one except him can decrypt it."
msgid ""
"Since you encrypted this email with Edward's public key, Edward's private "
-"key is required to decrypt it. Edward is the only one with his private key, "
-"so no one except him can decrypt it."
+"key is required to decrypt it. Edward is the only one with its private key, "
+"so no one except Edward can decrypt it."
msgstr ""
"因为你使用了爱德华的公钥加密邮件，解密则就要求爱德华的私钥。只有爱德华自己有"
"它的私钥，因此除了他，没人能解密消息。"
+#. type: Content of: <html><body><section><div><div><div><h6>
+# | [-<em>Step 3.b</em>-]Send [-a test-] {+Edward an+} encrypted email
+#, fuzzy
+#| msgid "<em>Step 3.b</em> Send a test encrypted email"
+msgid "Send Edward an encrypted email"
+msgstr "<em>Step 3.b</em> 发送一封测试加密邮件"
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"Write a new email in your email program, addressed to <a href=\"mailto:"
+"edward-en@fsf.org\">edward-en@fsf.org</a>. Make the subject \"Encryption test"
+"\" or something similar and write something in the body."
+msgstr ""
+"在你的邮件程序中写一封新的邮件，收信人地址填写 <a href=\"mailto:edward-"
+"zh@fsf.org\">edward-zh@fsf.org</a>。在主题中填写“加密测试”或类似的词语，并在"
+"正文中写一些内容。"
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"This time, make sure encryption is turned on by using the dropdown menu "
+"\"Security\" and select <span style=\"color:#2f5faa\">Require Encryption</"
+"span>. Once encryption is on, hit Send."
+msgstr ""
+
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "Enigmail can't find Edward's key"
+# | [-Click Send. Enigmail will pop up a window that says-]\"Recipients not
+# | valid, not trusted or not [-found.\"-] {+found\+}
+#, fuzzy
+#| msgid ""
+#| "Click Send. Enigmail will pop up a window that says \"Recipients not "
+#| "valid, not trusted or not found.\""
+msgid "\"Recipients not valid, not trusted or not found\""
+msgstr "点击发送。Enigmail 会弹出窗口提示“收件人不合法，不受信任或未找到”。"
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"You may be trying to send an encrypted email to someone when you do not have "
+"their public key yet. Make sure you follow the steps above to import the key "
+"to your key manager. Open OpenPGP Key Manager to make sure the recipient is "
+"listed there."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+msgid "Unable to send message"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"You could get the following message when trying to send your encrypted "
+"email: \"Unable to send this message with end-to-end encryption, because "
+"there are problems with the keys of the following recipients: edward-en@fsf."
+"org.\" This usually means you imported the key with the \"unaccepted "
+"(unverified) option.\" Go to the \"key properties\" of this key by right "
+"clicking on the key in the OpenPGP Key Manager, and select the option <span "
+"style=\"color:#2f5faa\">Yes, but I have not verified that this is the "
+"correct key</span> in the \"Acceptance\" option at the bottom of this "
+"window. Resend the email."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+# | [-Enigmail-]{+I+} can't find Edward's key
+#, fuzzy
+#| msgid "Enigmail can't find Edward's key"
+msgid "I can't find Edward's key"
msgstr "Enigmail 无法找到爱德华的公钥"
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
"副本，这就使得你能够在已发送文件夹像查看普通邮件一样查看它。这是正常的，它并"
"不代表你已发的邮件没有被加密。"
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid ""
-"If you're still having trouble with our instructions or just want to learn "
-"more, check out <a href=\"https://enigmail.wiki/"
-"Signature_and_Encryption#Encrypting_a_message\"> Enigmail's wiki</a>."
-msgstr ""
-"如果你仍对我们的说明感到困惑，或想了解更多，请查阅 <a href=\"https://"
-"enigmail.wiki/Signature_and_Encryption#Encrypting_a_message\">Enigmail's "
-"wiki</a>。"
-
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "Encrypt messages from the command line"
msgstr "使用命令行加密消息"
msgstr "<em>重要：</em> 安全提示"
#. type: Content of: <html><body><section><div><div><div><p>
+# | Even if you encrypt your email, the subject line is not encrypted, so
+# | don't put private information there. The sending and receiving addresses
+# | aren't encrypted either, so a surveillance system can still figure out who
+# | you're communicating with. Also, surveillance agents will know that you're
+# | using GnuPG, even if they can't figure out what you're saying. When you
+# | send attachments, [-Enigmail will give-] you [-the choice-] {+can choose+}
+# | to encrypt them or not, independent of the actual email.
+#, fuzzy
+#| msgid ""
+#| "Even if you encrypt your email, the subject line is not encrypted, so "
+#| "don't put private information there. The sending and receiving addresses "
+#| "aren't encrypted either, so a surveillance system can still figure out "
+#| "who you're communicating with. Also, surveillance agents will know that "
+#| "you're using GnuPG, even if they can't figure out what you're saying. "
+#| "When you send attachments, Enigmail will give you the choice to encrypt "
+#| "them or not, independent of the actual email."
msgid ""
"Even if you encrypt your email, the subject line is not encrypted, so don't "
"put private information there. The sending and receiving addresses aren't "
"encrypted either, so a surveillance system can still figure out who you're "
"communicating with. Also, surveillance agents will know that you're using "
"GnuPG, even if they can't figure out what you're saying. When you send "
-"attachments, Enigmail will give you the choice to encrypt them or not, "
-"independent of the actual email."
+"attachments, you can choose to encrypt them or not, independent of the "
+"actual email."
msgstr ""
"即便你加密了邮件，主题行是不受加密的，因此不要在那里填写私人信息。发送人和接"
"收人的邮件地址也是不经过加密的，因此监控系统可以识别出你在和谁通信。同时，监"
"会让你选择加密与否，它是独立于真实邮件的。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | For greater security against potential attacks, you can turn off HTML.
+# | Instead, you can render the message body as plain text. In order to do
+# | this in {+Icedove or+} Thunderbird, go to View > Message Body As >
+# | Plain Text.
+#, fuzzy
+#| msgid ""
+#| "For greater security against potential attacks, you can turn off HTML. "
+#| "Instead, you can render the message body as plain text. In order to do "
+#| "this in Thunderbird, go to View > Message Body As > Plain Text."
msgid ""
"For greater security against potential attacks, you can turn off HTML. "
"Instead, you can render the message body as plain text. In order to do this "
-"in Thunderbird, go to View > Message Body As > Plain Text."
+"in Icedove or Thunderbird, go to View > Message Body As > Plain Text."
msgstr ""
"为了防范潜在的攻击，你可以关闭 HTML 格式，转而使用纯文本作为正文。在 "
-"Thunderbird 中，到 View > Message Body As > Plain Text 可以做到这一点。"
+"Thunderbird 中，到 查看 > 消息体为 > 纯文本 可以做到这一点。"
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 4.C Edward's response"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 3.c</em> Receive a response"
+# | <em>Step [-3-]{+4+}.c</em> Receive a response
+#, fuzzy
+#| msgid "<em>Step 3.c</em> Receive a response"
+msgid "<em>Step 4.c</em> Receive a response"
msgstr "<em>Step 3.c</em> 接收回信"
#. type: Content of: <html><body><section><div><div><div><p>
+# | When Edward receives your email, [-he-] {+it+} will use [-his-] {+its+}
+# | private key to decrypt it, then reply to you.
+#, fuzzy
+#| msgid ""
+#| "When Edward receives your email, he will use his private key to decrypt "
+#| "it, then reply to you."
msgid ""
-"When Edward receives your email, he will use his private key to decrypt it, "
-"then use your public key (which you sent him in <a href=\"#step-3a\">Step 3."
-"A</a>) to encrypt his reply to you."
-msgstr ""
-"当爱德华收到你的邮件，他会使用他的私钥去解密消息，下面使用你的公钥（你在 <a "
-"href=\"#step-3a\">Step 3.A</a> 发给他了）加密他给你的回复。"
+"When Edward receives your email, it will use its private key to decrypt it, "
+"then reply to you."
+msgstr "当爱德华收到你的邮件，他会使用他的私钥去解密消息，并给你回复。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | It may take two or three minutes for Edward to respond. In the meantime,
+# | you might want to skip ahead and check out the <a
+# | href=\"#section[-5-]{+6+}\">Use it Well</a> section of this guide.
+#, fuzzy
+#| msgid ""
+#| "It may take two or three minutes for Edward to respond. In the meantime, "
+#| "you might want to skip ahead and check out the <a href=\"#section5\">Use "
+#| "it Well</a> section of this guide."
msgid ""
"It may take two or three minutes for Edward to respond. In the meantime, you "
-"might want to skip ahead and check out the <a href=\"#section5\">Use it "
+"might want to skip ahead and check out the <a href=\"#section6\">Use it "
"Well</a> section of this guide."
msgstr ""
"爱德华可能需要两三分钟回复邮件。在这期间，你可以跳过前面的部分并查阅本指南 "
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"When you receive Edward's email and open it, Enigmail will automatically "
-"detect that it is encrypted with your public key, and then it will use your "
-"private key to decrypt it."
+"Edward will send you an encrypted email back saying your email was received "
+"and decypted. Your email client will automatically decrypt Edward's message."
msgstr ""
-"当你接收爱德华的邮件并打开它时，Enigmail 会自动检测它是否使用你的公钥加密的，"
-"接下来使用你的私钥解密消息。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Notice the bar that Enigmail shows you above the message, with information "
-"about the status of Edward's key."
-msgstr "留意消息上方的通知条，它会显示爱德华公钥状态的信息。"
+"The OpenPGP button in the email will show a little green checkmark over the "
+"lock symbol to show the message is encrypted, and a little orange warning "
+"sign which means that you have accepted the key, but not verified it. When "
+"you have not yet accepted the key, you will see a little question mark "
+"there. Clicking the prompts in this button will lead you to key properties "
+"as well."
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 3.d</em> Send a test signed email"
+# | <em>Step [-3-]{+4+}.d</em> Send a [-test-] signed {+test+} email
+#, fuzzy
+#| msgid "<em>Step 3.d</em> Send a test signed email"
+msgid "<em>Step 4.d</em> Send a signed test email"
msgstr "<em>Step 3.d</em> 发送一封测试签名邮件"
#. type: Content of: <html><body><section><div><div><div><p>
"signature. If they do have GnuPG, they'll also be able to verify that your "
"signature is authentic."
msgstr ""
-"你可以向任何人签名消息，因此让对方意识到你在使用 GnuPG，他们可以和你安全的通"
-"信，是个不错的主意。如果他们没有 GnuPG，他们仍将有能力阅读你的消息并查看你的"
+"你可以向任何人签名消息，因此让对方意识到你在使用 GnuPG——他们可以和你安全的通"
+"信——是个不错的主意。如果他们没有 GnuPG，他们仍将有能力阅读你的消息并查看你的"
"签名。如果他们有，他们将有能力验证你签名的真实性。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | To sign an email to Edward, compose any message to [-him-] {+the email
+# | address+} and click the pencil icon next to the lock icon so that it turns
+# | gold. If you sign a message, GnuPG may ask you for your password before it
+# | sends the message, because it needs to unlock your private key for signing.
+#, fuzzy
+#| msgid ""
+#| "To sign an email to Edward, compose any message to him and click the "
+#| "pencil icon next to the lock icon so that it turns gold. If you sign a "
+#| "message, GnuPG may ask you for your password before it sends the message, "
+#| "because it needs to unlock your private key for signing."
msgid ""
-"To sign an email to Edward, compose any message to him and click the pencil "
-"icon next to the lock icon so that it turns gold. If you sign a message, "
-"GnuPG may ask you for your password before it sends the message, because it "
-"needs to unlock your private key for signing."
+"To sign an email to Edward, compose any message to the email address and "
+"click the pencil icon next to the lock icon so that it turns gold. If you "
+"sign a message, GnuPG may ask you for your password before it sends the "
+"message, because it needs to unlock your private key for signing."
msgstr ""
"要想对发给爱德华的邮件签名，并撰写一些消息给他，点击紧邻锁形图标的铅笔图标，"
"它会变成金黄色。你要是对消息签名，GnuPG 可能会在你点击发送消息前询问你密码，"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"With the lock and pencil icons, you can choose whether each message will be "
-"encrypted, signed, both, or neither."
-msgstr "锁形和铅笔图标能够让你对每封消息选择加密、签名、两者都要或者都不要。"
+"In \"Account Settings\" → \"End-To-End-Encryption\" you can opt to "
+"<span style=\"color:#2f5faa\">add digital signature by default</span>."
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 3.e</em> Receive a response"
+# | <em>Step [-3-]{+4+}.e</em> Receive a response
+#, fuzzy
+#| msgid "<em>Step 3.e</em> Receive a response"
+msgid "<em>Step 4.e</em> Receive a response"
msgstr "<em>Step 3.e</em> 接收回信"
#. type: Content of: <html><body><section><div><div><div><p>
+# | When Edward receives your email, he will use your public key (which you
+# | sent him in <a href=\"#step-3a\">Step 3.A</a>) to verify the message you
+# | sent has not been tampered with and to encrypt [-his-] {+a+} reply to you.
+#, fuzzy
+#| msgid ""
+#| "When Edward receives your email, he will use your public key (which you "
+#| "sent him in <a href=\"#step-3a\">Step 3.A</a>) to verify the message you "
+#| "sent has not been tampered with and to encrypt his reply to you."
msgid ""
"When Edward receives your email, he will use your public key (which you sent "
-"him in <a href=\"#step-3a\">Step 3.A</a>) to verify that your signature is "
-"authentic and the message you sent has not been tampered with."
+"him in <a href=\"#step-3a\">Step 3.A</a>) to verify the message you sent has "
+"not been tampered with and to encrypt a reply to you."
msgstr ""
"当爱德华收到你的邮件，他将会使用你的公钥（你在 <a href=\"#step-3a\">Step 3."
-"A</a> 发给他了）去验证你签名的真实性，以及你发送的消息未经篡改。"
+"A</a> 发给他了）验证你发送的消息未经篡改，并以加密形式给你回复。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"爱德华的回复会是加密的，因为他能加密就加密。如果一切顺利，他会回复“你的签名已"
"被验证”。如果你的测试签名邮件也是加密的，他会优先提及。"
+#. type: Content of: <html><body><section><div><div><div><p>
+# | When you receive Edward's email and open it, [-Enigmail-] {+your email
+# | client+} will automatically detect that it is encrypted with your public
+# | key, and then it will use your private key to decrypt it.
+#, fuzzy
+#| msgid ""
+#| "When you receive Edward's email and open it, Enigmail will automatically "
+#| "detect that it is encrypted with your public key, and then it will use "
+#| "your private key to decrypt it."
+msgid ""
+"When you receive Edward's email and open it, your email client will "
+"automatically detect that it is encrypted with your public key, and then it "
+"will use your private key to decrypt it."
+msgstr ""
+"当你接收爱德华的邮件并打开它时，Enigmail 会自动检测它是否使用你的公钥加密的，"
+"接下来使用你的私钥解密消息。"
+
#. type: Content of: <html><body><section><div><div><h2>
-msgid "<em>#4</em> Learn the Web of Trust"
+# | <em>#[-4-]{+5+}</em> Learn {+about+} the Web of Trust
+#, fuzzy
+#| msgid "<em>#4</em> Learn the Web of Trust"
+msgid "<em>#5</em> Learn about the Web of Trust"
msgstr "<em>#4</em> 了解信任网"
+#. type: Attribute 'alt' of: <html><body><section><div><div><p><img>
+msgid "Illustration of keys all interconnected with a web of lines"
+msgstr ""
+
#. type: Content of: <html><body><section><div><div><p>
-msgid ""
-"Email encryption is a powerful technology, but it has a weakness; it "
+# | Email encryption is a powerful technology, but it has a weakness[-;-]{+:+}
+# | it requires a way to verify that a person's public key is actually theirs.
+# | Otherwise, there would be no way to stop an attacker from making an email
+# | address with your friend's name, creating keys to go with it{+,+} and
+# | impersonating your friend. That's why the free software programmers that
+# | developed email encryption created keysigning and the Web of Trust.
+#, fuzzy
+#| msgid ""
+#| "Email encryption is a powerful technology, but it has a weakness; it "
+#| "requires a way to verify that a person's public key is actually theirs. "
+#| "Otherwise, there would be no way to stop an attacker from making an email "
+#| "address with your friend's name, creating keys to go with it and "
+#| "impersonating your friend. That's why the free software programmers that "
+#| "developed email encryption created keysigning and the Web of Trust."
+msgid ""
+"Email encryption is a powerful technology, but it has a weakness: it "
"requires a way to verify that a person's public key is actually theirs. "
"Otherwise, there would be no way to stop an attacker from making an email "
-"address with your friend's name, creating keys to go with it and "
+"address with your friend's name, creating keys to go with it, and "
"impersonating your friend. That's why the free software programmers that "
"developed email encryption created keysigning and the Web of Trust."
msgstr ""
"connected to each other by chains of trust expressed through signatures."
msgstr ""
"使用你的公钥的人可以看到谁签署了此公钥。长期使用 GnuPG 后，你的密钥可能有数百"
-"支签名。你可以认为，公钥上你信任的人的签名越多，那么这只公钥越可信。信任网是 "
-"GnuPG 用户的聚集地，他们用签名传递着信任链，连接彼此。"
+"支签名。你可以认为，公钥上你信任的人的签名数量越多，那么这支公钥越可信。信任"
+"网是 GnuPG 用户的聚集地，他们用签名传递着信任链，连接彼此。"
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 4: Web of Trust"
-msgstr "Section 4: 信任网"
+msgid "Section 5: trusting a key"
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 4.a</em> Sign a key"
+# | <em>Step [-4-]{+5+}.a</em> Sign a key
+#, fuzzy
+#| msgid "<em>Step 4.a</em> Sign a key"
+msgid "<em>Step 5.a</em> Sign a key"
msgstr "<em>Step 4.a</em> 签署密钥"
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid "In your email program's menu, go to Enigmail → Key Management."
-msgstr "在邮件程序菜单中，选择 Enigmail → Key Management。"
-
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Right click on Edward's public key and select Sign Key from the context menu."
-msgstr "爱德华公钥处右键，在上下文菜单中选中“签署密钥”。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid "In the window that pops up, select \"I will not answer\" and click ok."
-msgstr "在弹窗中，选中“我不会回应”并点击确定。"
+"In your email program's menu, go to OpenPGP Key Manager and select <span "
+"style=\"color:#2f5faa\">Key properties</span> by right clicking on Edward's "
+"key."
+msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Now you should be back at the Key Management menu. Select Keyserver → "
-"Upload Public Keys and hit ok."
+"Under \"Your Acceptance,\" you can select <span style=\"color:#2f5faa\">Yes, "
+"I've verified in person this key has the correct fingerprint\"</span>."
msgstr ""
-"现在你返回 Key Management 菜单。选择 Keyserver → Upload Public Keys 并点"
-"击确定。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | You've just effectively said \"I trust that Edward's public key actually
+# | belongs to Edward.\" This doesn't mean much because Edward isn't a real
+# | person, but it's good [-practice.-] {+practice, and for real people it is
+# | important. You can read more about signing a person's key in the <a
+# | href=\"#check-ids-before-signing\">check IDs before signing</a> section.+}
+#, fuzzy
+#| msgid ""
+#| "You've just effectively said \"I trust that Edward's public key actually "
+#| "belongs to Edward.\" This doesn't mean much because Edward isn't a real "
+#| "person, but it's good practice."
msgid ""
"You've just effectively said \"I trust that Edward's public key actually "
"belongs to Edward.\" This doesn't mean much because Edward isn't a real "
-"person, but it's good practice."
+"person, but it's good practice, and for real people it is important. You can "
+"read more about signing a person's key in the <a href=\"#check-ids-before-"
+"signing\">check IDs before signing</a> section."
msgstr ""
"你刚刚有力地表达了“我信任爱德华的公钥，它的确属于爱德华”。由于爱德华是一个机"
-"器人，这对它并不意味着什么，但这是一个好的实践。"
+"器人，这对它并不意味着什么，但这是一个良好的实践。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Identifying keys: Fingerprints and IDs"
msgstr "验证密钥：指纹和 ID"
#. type: Content of: <html><body><section><div><div><div><p>
+# | People's public keys are usually identified by their key fingerprint,
+# | which is a string of digits like F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8
+# | (for Edward's key). You can see the fingerprint for your public key, and
+# | other public keys saved on your computer, by going to [-Enigmail →-]
+# | {+OpenPGP+} Key Management in your email program's menu, then right
+# | clicking on the key and choosing Key Properties. It's good practice to
+# | share your fingerprint wherever you share your email address, so that
+# | people can double-check that they have the correct public key when they
+# | download yours from a keyserver.
+#, fuzzy
+#| msgid ""
+#| "People's public keys are usually identified by their key fingerprint, "
+#| "which is a string of digits like F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 "
+#| "(for Edward's key). You can see the fingerprint for your public key, and "
+#| "other public keys saved on your computer, by going to Enigmail → Key "
+#| "Management in your email program's menu, then right clicking on the key "
+#| "and choosing Key Properties. It's good practice to share your fingerprint "
+#| "wherever you share your email address, so that people can double-check "
+#| "that they have the correct public key when they download yours from a "
+#| "keyserver."
msgid ""
"People's public keys are usually identified by their key fingerprint, which "
"is a string of digits like F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 (for "
"Edward's key). You can see the fingerprint for your public key, and other "
-"public keys saved on your computer, by going to Enigmail → Key "
-"Management in your email program's menu, then right clicking on the key and "
-"choosing Key Properties. It's good practice to share your fingerprint "
-"wherever you share your email address, so that people can double-check that "
-"they have the correct public key when they download yours from a keyserver."
+"public keys saved on your computer, by going to OpenPGP Key Management in "
+"your email program's menu, then right clicking on the key and choosing Key "
+"Properties. It's good practice to share your fingerprint wherever you share "
+"your email address, so that people can double-check that they have the "
+"correct public key when they download yours from a keyserver."
msgstr ""
"人们的公钥通常是由他们密钥指纹确定的，它是像 "
"F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 （爱德华的密钥）的数字串。通过在你邮"
-"件程序菜单 Enigmail → Key Management ，在密钥上右键密钥属性，你能看到你"
-"的公钥以及计算机上其他公钥的指纹。在告诉他人你邮箱地址的同时，分享你的指纹是"
-"一个不错的实践，这样人们可以在从服务器下载你公钥的时候，再次检查下载的公钥是"
-"否正确。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"You may also see public keys referred to by a shorter key ID. This key ID is "
-"visible directly from the Key Management window. These eight character key "
-"IDs were previously used for identification, which used to be safe, but is "
-"no longer reliable. You need to check the full fingerprint as part of "
+"件程序菜单 Enigmail → 密钥管理 ，在密钥上右键密钥属性，你能看到你的公钥"
+"以及计算机上其他公钥的指纹。在告诉他人你邮箱地址的同时，分享你的指纹是一个不"
+"错的实践，这样人们可以在从服务器下载你公钥的时候，再次检查下载的公钥是否正"
+"确。"
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | You may also see public keys referred to by a shorter key[- -]ID. This
+# | key[- -]ID is visible directly from the Key Management window. These eight
+# | character key[- -]IDs were previously used for identification, which used
+# | to be safe, but is no longer reliable. You need to check the full
+# | fingerprint as part of verifying you have the correct key for the person
+# | you are trying to contact. Spoofing, in which someone intentionally
+# | generates a key with a fingerprint whose final eight characters are the
+# | same as another, is unfortunately common.
+#, fuzzy
+#| msgid ""
+#| "You may also see public keys referred to by a shorter key ID. This key ID "
+#| "is visible directly from the Key Management window. These eight character "
+#| "key IDs were previously used for identification, which used to be safe, "
+#| "but is no longer reliable. You need to check the full fingerprint as part "
+#| "of verifying you have the correct key for the person you are trying to "
+#| "contact. Spoofing, in which someone intentionally generates a key with a "
+#| "fingerprint whose final eight characters are the same as another, is "
+#| "unfortunately common."
+msgid ""
+"You may also see public keys referred to by a shorter keyID. This keyID is "
+"visible directly from the Key Management window. These eight character "
+"keyIDs were previously used for identification, which used to be safe, but "
+"is no longer reliable. You need to check the full fingerprint as part of "
"verifying you have the correct key for the person you are trying to contact. "
"Spoofing, in which someone intentionally generates a key with a fingerprint "
"whose final eight characters are the same as another, is unfortunately "
"common."
msgstr ""
-"你可能已经看到有人使用短 key ID 表示公钥。Key Management 窗口中，你可以直接看"
-"到 key ID。这八位字符曾经用于表示身份，现已经不再安全可靠。你需要检查完整的指"
-"纹，以验证你确实拥有通信对方正确的密钥。不幸的是，被有意生成两个指纹后八位字"
-"符相同的密钥，这种冒充是很常见的。"
+"你可能已经看到有人使用短 key ID 表示公钥。密钥管理 窗口中，你可以直接看到 "
+"key ID。这八位字符曾经用于表示身份，现已经不再安全可靠。你需要检查完整的指"
+"纹，以验证你拥有通信对方正确的密钥。不幸的是，有人故意生成的后六位指纹与另一"
+"支密钥相同的密钥，这种伪造是很常见的。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "<em>Important:</em> What to consider when signing keys"
msgstr "<em>重要：</em> 签署密钥时需要考虑什么"
#. type: Content of: <html><body><section><div><div><div><p>
+# | Before signing a person's key, you need to be confident that it actually
+# | belongs to them, and that they are who they say they are. Ideally, this
+# | confidence comes from having interactions and conversations with them over
+# | time, and witnessing interactions between them and others. Whenever
+# | signing a key, ask to see the full public key fingerprint, and not just
+# | the shorter key[- -]ID. If you feel it's important to sign the key of
+# | someone you've just met, also ask them to show you their government
+# | identification, and make sure the name on the ID matches the name on the
+# | public key. [-In Enigmail, answer honestly in the window that pops up and
+# | asks \"How carefully have you verified that the key you are about to sign
+# | actually belongs to the person(s) named above?\"-]
+#, fuzzy
+#| msgid ""
+#| "Before signing a person's key, you need to be confident that it actually "
+#| "belongs to them, and that they are who they say they are. Ideally, this "
+#| "confidence comes from having interactions and conversations with them "
+#| "over time, and witnessing interactions between them and others. Whenever "
+#| "signing a key, ask to see the full public key fingerprint, and not just "
+#| "the shorter key ID. If you feel it's important to sign the key of someone "
+#| "you've just met, also ask them to show you their government "
+#| "identification, and make sure the name on the ID matches the name on the "
+#| "public key. In Enigmail, answer honestly in the window that pops up and "
+#| "asks \"How carefully have you verified that the key you are about to sign "
+#| "actually belongs to the person(s) named above?\""
msgid ""
"Before signing a person's key, you need to be confident that it actually "
"belongs to them, and that they are who they say they are. Ideally, this "
"confidence comes from having interactions and conversations with them over "
"time, and witnessing interactions between them and others. Whenever signing "
"a key, ask to see the full public key fingerprint, and not just the shorter "
-"key ID. If you feel it's important to sign the key of someone you've just "
+"keyID. If you feel it's important to sign the key of someone you've just "
"met, also ask them to show you their government identification, and make "
-"sure the name on the ID matches the name on the public key. In Enigmail, "
-"answer honestly in the window that pops up and asks \"How carefully have you "
-"verified that the key you are about to sign actually belongs to the "
-"person(s) named above?\""
-msgstr ""
-"在签署密钥前，你需要严格确认密钥是属于他的，的确是自己所声称的那个人。这种确"
-"信来自逐步地沟通交流，以及目睹了他与其他人的交流过程。任何时候签署密钥都应该"
-"要求查看完整的公钥指纹，而不只是短 key ID。如果你认为，所要签署人的公钥相当重"
-"要，可以要求他出示身份证明，确保身份证上的姓名与公钥的姓名相符。在 Enigmail "
-"里，诚实地回答弹出窗口问题“你对所签署的公钥确实属于那个名字的人，验证的严格程"
-"度？”"
+"sure the name on the ID matches the name on the public key."
+msgstr ""
+"在签署密钥前，你需要严格确认密钥是属于他的，的确是他自己所声称的那个人。这种"
+"确信来自逐步地沟通交流，以及目睹了他与其他人的交流过程。任何时候签署密钥都应"
+"该要求查看完整的公钥指纹，而不只是短 key ID。如果你认为，所要签署人的公钥相当"
+"重要，可以要求他出示身份证明，确保身份证上的姓名与公钥的姓名相符。在 "
+"Enigmail 里，诚实地回答弹出窗口问题“你对所签署的公钥确实属于那个名字的人验证"
+"的严格程度？”"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "Master the Web of Trust"
msgstr "精通信任网"
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid ""
-"Unfortunately, trust does not spread between users the way <a href=\"http://"
+# | Unfortunately, trust does not spread between users the way <a
+# | href=\"http{+s+}://fennetic.net/irc/finney.org/~hal/web_of_trust.html\">many
+# | people think</a>. One of {+the+} best ways to strengthen the GnuPG
+# | community is to deeply <a
+# | href=\"https://www.gnupg.org/gph/en/manual/x334.html\">understand</a> the
+# | Web of Trust and to carefully sign as many people's keys as circumstances
+# | permit.
+#, fuzzy
+#| msgid ""
+#| "Unfortunately, trust does not spread between users the way <a href="
+#| "\"http://fennetic.net/irc/finney.org/~hal/web_of_trust.html\">many people "
+#| "think</a>. One of best ways to strengthen the GnuPG community is to "
+#| "deeply <a href=\"https://www.gnupg.org/gph/en/manual/x334.html"
+#| "\">understand</a> the Web of Trust and to carefully sign as many people's "
+#| "keys as circumstances permit."
+msgid ""
+"Unfortunately, trust does not spread between users the way <a href=\"https://"
"fennetic.net/irc/finney.org/~hal/web_of_trust.html\">many people think</a>. "
-"One of best ways to strengthen the GnuPG community is to deeply <a href="
+"One of
the best ways to strengthen the GnuPG community is to deeply <a href="
"\"https://www.gnupg.org/gph/en/manual/x334.html\">understand</a> the Web of "
"Trust and to carefully sign as many people's keys as circumstances permit."
msgstr ""
"的，并在条件允许的情况下，谨慎地对尽可能多的人的密钥进行签名，是增强 GnuPG 社"
"区的最佳方式。"
-#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "Set ownertrust"
-msgstr "设置信任级"
-
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid ""
-"If you trust someone enough to validate other people's keys, you can assign "
-"them an ownertrust level through Enigmails's key management window. Right "
-"click on the other person's key, go to the \"Select Owner Trust\" menu "
-"option, select the trustlevel and click OK. Only do this once you feel you "
-"have a deep understanding of the Web of Trust."
-msgstr ""
-"如果你对某人的信任足够验证其他人的密钥，你可以在 Enigmail 的 Key management "
-"窗口中，为他们指派一个信任级（ownertrust）级别。在其他人密钥处右键，选中“选择"
-"信任级”（Select Owner Trust）菜单选项，选择信任级，并点击确定。在充分理解信任"
-"网的前提下，完成这一步。"
-
#. type: Content of: <html><body><section><div><div><h2>
-msgid "<em>#5</em> Use it well"
+# | <em>#[-5-]{+6+}</em> Use it well
+#, fuzzy
+#| msgid "<em>#5</em> Use it well"
+msgid "<em>#6</em> Use it well"
msgstr "<em>#5</em> 善用加密"
#. type: Content of: <html><body><section><div><div><p>
"不遵守，你便是拿着通信双方的隐私做冒险，并且危及信任网。"
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 5: Use it Well (1)"
+# | Section [-5-]{+6+}: Use it Well (1)
+#, fuzzy
+#| msgid "Section 5: Use it Well (1)"
+msgid "Section 6: Use it Well (1)"
msgstr "Section 5: 善用加密（1）"
#. type: Content of: <html><body><section><div><div><div><h3>
"encrypting some of your email isn't helpful -- it's a great start and it "
"makes bulk surveillance more difficult."
msgstr ""
-"加密消息是多多益善的。如果你只是偶然加密邮件，每封的加密消息就像是为监控系统"
-"竖红旗。如果全部邮件都是加密的，做监控的人会不知道从何处开始——这不是说加密部"
-"分邮件毫无帮助——它使大规模监控变得困难是重要的开头。"
+"加密消息是多多益善的。如果你只是偶然加密邮件，每封的加密消息就像向监控系统发"
+"送警报。如果全部邮件都是加密的，做监控的人会不知道从何处开始——这不是说加密部"
+"分邮件毫无帮助——它使大规模监控变得困难，这是重要的开始。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
msgstr ""
"除非你不想暴露身份（这还要求其他保护措施），没有理由不对每封信签名，无论是否"
"加密。除了允许 GnuPG 验证消息确实来自于你，签名是一种非侵入性的方式，提醒别人"
-"你在使用 GnuPG，并对支持安全的通信表示支持。如果你经常给不熟悉 GnuPG 的人发送"
-"签名消息，在你的标准邮件签名（这里的签名指的是文字，而非密码学签名）中附上本"
-"指南的链接将会不错。"
+"你在使用 GnuPG，并表示对安全通信的支持。如果你经常给不熟悉 GnuPG 的人发送签名"
+"消息，在你的标准邮件签名（这里的签名指的是文字，而非密码学签名）中附上本指南"
+"的链接将会不错。"
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 5: Use it Well (2)"
+# | Section [-5-]{+6+}: Use it Well (2)
+#, fuzzy
+#| msgid "Section 5: Use it Well (2)"
+msgid "Section 6: Use it Well (2)"
msgstr "Section 5: 善用加密（2）"
#. type: Content of: <html><body><section><div><div><div><h3>
"非法密钥加密的邮件可能能被监控程序读取。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | In your email program, go back to the first encrypted email that Edward
+# | sent you. Because Edward encrypted it with your public key, it will have a
+# | [-message from Enigmail-] {+green checkmark a+} at the [-top, which most
+# | likely says \"Enigmail: Part of this message encrypted.\"-] {+top
+# | \"OpenPGP\" button.+}
+#, fuzzy
+#| msgid ""
+#| "In your email program, go back to the first encrypted email that Edward "
+#| "sent you. Because Edward encrypted it with your public key, it will have "
+#| "a message from Enigmail at the top, which most likely says \"Enigmail: "
+#| "Part of this message encrypted.\""
msgid ""
"In your email program, go back to the first encrypted email that Edward sent "
-"you. Because Edward encrypted it with your public key, it will have a "
-"message from Enigmail at the top, which most likely says \"Enigmail: Part of "
-"this message encrypted.\""
+"you. Because Edward encrypted it with your public key, it will have a green "
+"checkmark a at the top \"OpenPGP\" button."
msgstr ""
"在你的邮件程序里，回到爱德华发给你的第一封加密邮件。因为爱德华用你的公钥加密"
"了它，Enigmail 的上方会有一条消息，它可能是这样写的：“Enigmail：消息部分已加"
"密”。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | <b>When using GnuPG, make a habit of glancing at that [-bar.-] {+button.+}
+# | The program will warn you there if you get an email signed with a key that
+# | can't be trusted.</b>
+#, fuzzy
+#| msgid ""
+#| "<b>When using GnuPG, make a habit of glancing at that bar. The program "
+#| "will warn you there if you get an email signed with a key that can't be "
+#| "trusted.</b>"
msgid ""
-"<b>When using GnuPG, make a habit of glancing at that bar. The program will "
-"warn you there if you get an email signed with a key that can't be trusted.</"
-"b>"
+"<b>When using GnuPG, make a habit of glancing at that button. The program "
+"will warn you there if you get an email signed with a key that can't be "
+"trusted.</b>"
msgstr ""
"<b>使用 GnuPG 时，要养成看通知条的习惯。如果你收到的邮件是用不受信任的密钥签"
"名的，程序会提醒你。</b>"
msgstr "备份吊销证书到安全的地方"
#. type: Content of: <html><body><section><div><div><div><p>
+# | Remember when you created your keys and saved the revocation certificate
+# | that GnuPG made? It's time to copy that certificate onto the safest
+# | [-digital-] storage that you have -- [-the ideal thing is-] a flash drive,
+# | disk, or hard drive stored in a safe place in your [-home,-] {+home could
+# | work,+} not on a device you carry with you regularly. {+The safest way we
+# | know is actually to print the revocation certificate and store it in a
+# | safe place.+}
+#, fuzzy
+#| msgid ""
+#| "Remember when you created your keys and saved the revocation certificate "
+#| "that GnuPG made? It's time to copy that certificate onto the safest "
+#| "digital storage that you have -- the ideal thing is a flash drive, disk, "
+#| "or hard drive stored in a safe place in your home, not on a device you "
+#| "carry with you regularly."
msgid ""
"Remember when you created your keys and saved the revocation certificate "
-"that GnuPG made? It's time to copy that certificate onto the safest digital "
-"storage that you have -- the ideal thing is a flash drive, disk, or hard "
-"drive stored in a safe place in your home, not on a device you carry with "
-"you regularly."
+"that GnuPG made? It's time to copy that certificate onto the safest storage "
+"that you have -- a flash drive, disk, or hard drive stored in a safe place "
+"in your home could work, not on a device you carry with you regularly. The "
+"safest way we know is actually to print the revocation certificate and store "
+"it in a safe place."
msgstr ""
-"还记得你是何时生成密钥和保存 GnuPG 生成的吊销证书的吗？是时候将证书复制到安全"
-"的数字储存设备上——理想的地方是闪存盘，磁盘或者硬盘，他们存放在家中安全的地方"
-"——而不是你随身携带的设备。"
+"还记得你何时生成密钥和保存 GnuPG 生成的吊销证书的吗？是时候将证书备份到安全的"
+"数字储存设备上——理想的地方是闪存盘，磁盘或者硬盘，他们存放在家中安全的地方——"
+"而不是你随身携带的设备。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"了。"
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Important:</em> act swiftly if someone gets your private key"
+# | [-<em>Important:</em> act swiftly-]{+<em>IMPORTANT:</em> ACT SWIFTLY+} if
+# | someone gets your private key
+#, fuzzy
+#| msgid "<em>Important:</em> act swiftly if someone gets your private key"
+msgid "<em>IMPORTANT:</em> ACT SWIFTLY if someone gets your private key"
msgstr "<em>重要：</em> 如果有人得到了你的私钥，要迅速行动"
#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"If you lose your private key or someone else gets ahold of it (say, by "
+# | If you lose your private key or someone else gets a{+ +}hold of it (say,
+# | by stealing or cracking your computer), it's important to revoke it
+# | immediately before someone else uses it to read your encrypted email or
+# | forge your signature. This guide doesn't cover how to revoke a key, but
+# | you can follow these <a
+# | href=\"https://www.hackdiary.com/2004/01/18/revoking-a-gpg-key/\">instructions</a>.
+# | After you're done revoking, make a new key and send an email to everyone
+# | with whom you usually use your key to make sure they know, including a
+# | copy of your new key.
+#, fuzzy
+#| msgid ""
+#| "If you lose your private key or someone else gets ahold of it (say, by "
+#| "stealing or cracking your computer), it's important to revoke it "
+#| "immediately before someone else uses it to read your encrypted email or "
+#| "forge your signature. This guide doesn't cover how to revoke a key, but "
+#| "you can follow these <a href=\"https://www.hackdiary.com/2004/01/18/"
+#| "revoking-a-gpg-key/\">instructions</a>. After you're done revoking, make "
+#| "a new key and send an email to everyone with whom you usually use your "
+#| "key to make sure they know, including a copy of your new key."
+msgid ""
+"If you lose your private key or someone else gets a hold of it (say, by "
"stealing or cracking your computer), it's important to revoke it immediately "
"before someone else uses it to read your encrypted email or forge your "
"signature. This guide doesn't cover how to revoke a key, but you can follow "
"email to everyone with whom you usually use your key to make sure they know, "
"including a copy of your new key."
msgstr ""
-"要是你丢失了私钥或是有人得到了它（这是说，你的计算机被偷或者被黑）。在其他人"
-"使用你私钥阅读你的加密邮件或是伪造签名前，立即吊销它显得格外重要。本指南不包"
-"å
\90«å¦
\82ä½
\95å
\90\8aé
\94\80å¯
\86é
\92¥ï¼
\8cä½
\86ä½ å
\8f¯ä»¥é
\81µå¾ªè¿
\99äº
\9b <a href=\"https://www.hackdiary."
-"com/2004/01/18/revoking-a-gpg-key/\">指示</a>。在你吊销完成后，生成新的密钥"
-"对，并给所有使用你的密钥的人发送邮件，并附上新密钥的拷贝，确保他们知道发生了"
-"什么。"
+"如果你丢失了私钥或是有人得到了它（比如你的计算机被偷或者被入侵）。在其他人使"
+"用你私钥阅读你的加密邮件或是伪造签名前，立即吊销它显得格外重要。本指南不包含"
+"如何吊销密钥，但你可以遵循这些 <a href=\"https://www.hackdiary."
+"com/2004/01/18/revoking-a-gpg-key/\">指示（英文）</a>。在你吊销完成后，生成新"
+"的密钥对，并给所有使用你的密钥的人发送邮件，并附上新密钥的拷贝，确保他们知道"
+"发生了什么。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Webmail and GnuPG"
"receive a scrambled email."
msgstr ""
"当你使用网页浏览器获取你的邮件，那么你使用的是网页邮箱（webmail），它是一个直"
-"接存放在网站的电子邮件程序。和网页邮箱不同，你的桌面邮件程序是运行在你自己的"
-"计算机上。即使网页邮箱无法解密加密过的邮件，它仍然会以加密形式显示出来。如果"
-"你常用的是网页邮箱，当你收到一封混乱的电子邮件时，你应当知道去打开你的电子邮"
-"件客户端。"
+"接储存在网站里的电子邮件程序。和网页邮箱不同，你的桌面邮件程序是运行在你自己"
+"的计算机上。即使网页邮箱无法解密加密过的邮件，它仍然会以加密形式显示出来。如"
+"果你常用的是网页邮箱，当你收到一封混乱的电子邮件时，你应当知道去打开你的电子"
+"邮件客户端。"
+
+#. type: Content of: <html><body><section><div><div><div><h3>
+msgid "Make your public key part of your online identity"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid ""
+"First add your public key fingerprint to your email signature, then compose "
+"an email to at least five of your friends, telling them you just set up "
+"GnuPG and mentioning your public key fingerprint. Link to this guide and ask "
+"them to join you. Don't forget that there's also an awesome <a href="
+"\"infographic.html\">infographic to share.</a>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | [-Add-]{+Start writing+} your public key fingerprint anywhere [-that you
+# | normally display-] {+someone would see+} your email [-address. Some good
+# | places are:-] {+address:+} your [-email signature (the text kind, not the
+# | cryptographic kind),-] social media profiles, [-blogs, Websites,-] {+blog,
+# | Website,+} or business [-cards. At-] {+card. (At+} the Free Software
+# | Foundation, we put ours on our <a
+# | href=\"https://fsf.org/about/staff\">staff [-page</a>.-] {+page</a>.) We
+# | need to get our culture to the point that we feel like something is
+# | missing when we see an email address without a public key fingerprint.+}
+#, fuzzy
+#| msgid ""
+#| "Add your public key fingerprint anywhere that you normally display your "
+#| "email address. Some good places are: your email signature (the text kind, "
+#| "not the cryptographic kind), social media profiles, blogs, Websites, or "
+#| "business cards. At the Free Software Foundation, we put ours on our <a "
+#| "href=\"https://fsf.org/about/staff\">staff page</a>."
+msgid ""
+"Start writing your public key fingerprint anywhere someone would see your "
+"email address: your social media profiles, blog, Website, or business card. "
+"(At the Free Software Foundation, we put ours on our <a href=\"https://fsf."
+"org/about/staff\">staff page</a>.) We need to get our culture to the point "
+"that we feel like something is missing when we see an email address without "
+"a public key fingerprint."
+msgstr ""
+"在所有显示你邮箱地址的地方，附上公钥指纹。一些好地方有：你的电子邮件签名（这"
+"里的签名指的是文字，而非密码学签名），社交媒体简历，博客，网站，商业名片。在"
+"自由软件基金会，我们把把它放在了我们的 <a href=\"https://fsf.org/about/staff"
+"\">雇员页面</a>。"
#. type: Content of: <html><body><section><div><div><h2>
msgid "<a href=\"next_steps.html\">Great job! Check out the next steps.</a>"
msgstr "<a href=\"next_steps.html\">很不错！继续查看下一步。</a>"
+#. type: Attribute 'content' of: <html><head><meta>
+msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
+
#. type: Content of: <html><body><header><div><p>
msgid "← Read the <a href=\"index.html\">full guide</a>"
msgstr "← 阅读 <a href=\"index.html\">完整指南</a>"
#. type: Content of: <html><body><header><div><h3><a>
-msgid ""
-"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zc&t=How public-"
-"key encryption works. Infographic via %40fsf\">"
+# | <a
+# | [-href=\"https://fsf.org/share?u=https://u.fsf.org/zc&t=How public-key
+# | encryption works. Infographic via %40fsf\">-]
+# | {+href=\"https://fsf.org/share?u=https://u.fsf.org/zc&t=How%20public-ke
+# | y%20encryption%20works.%20Infographic%20via%20%40fsf\">+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://fsf.org/share?u=https://u.fsf.org/zc&t=How "
+#| "public-key encryption works. Infographic via %40fsf\">"
+msgid ""
+"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zc&t=How%20public-key"
+"%20encryption%20works.%20Infographic%20via%20%40fsf\">"
msgstr ""
"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zc&t=How public-"
"key encryption works. Infographic via %40fsf\">"
msgid "View & share our infographic"
msgstr "查看并分享信息图"
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"index.html\">GNU/Linux</a>"
-msgstr "<a href=\"index.html\">GNU/Linux</a>"
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"mac.html\" class=\"current\">Mac OS</a>"
-msgstr "<a href=\"mac.html\" class=\"current\">Mac OS</a>"
-
-#. type: Content of: <html><body><section><div><div><p>
-msgid ""
-"This guide relies on software which is <a href=\"https://www.gnu.org/"
-"philosophy/free-sw.html\">freely licensed</a>; it's completely transparent "
-"and anyone can copy it or make their own version. This makes it safer from "
-"surveillance than proprietary software (like Windows or Mac OS). To defend "
-"your freedom as well as protect yourself from surveillance, we recommend you "
-"switch to a free software operating system like GNU/Linux. Learn more about "
-"free software at <a href=\"https://u.fsf.org/ys\">fsf.org</a>."
-msgstr ""
-"本指南需要安装 <a href=\"https://www.gnu.org/philosophy/free-sw.html\">自由许"
-"可的</a> 软件；它是完全透明的，任何人都可以复制它，并制作自己的版本。这使得它"
-"比专有软件（比如 Windows 和 Mac OS）更难受到监控。为了你免受监控，我们推荐你"
-"换用像 GNU/Linux 这样的自由软件操作系统。你可以在 <a href=\"https://u.fsf."
-"org/ys\">fsf.org</a> 上了解更多有关自由软件的信息。"
-
-#. type: Content of: <html><body><section><div><div><p>
-msgid ""
-"To get started, you'll need the IceDove desktop email program installed on "
-"your computer. For your system, IceDove may be known by the alternate name "
-"\"Thunderbird.\" Email programs are another way to access the same email "
-"accounts you can access in a browser (like Gmail), but provide extra "
-"features."
-msgstr ""
-"在开始之前，你需要安装 IceDove 邮件程序。对于你的操作系统来说，IceDove 可能以"
-"其别名 Thunderbird 存在于你的系统。电子邮件程序是另一种访问邮箱账号的途径（你"
-"也可以像 Gmail 那样通过浏览器访问），但它提供了更多的功能。"
-
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 1.b</em> Get GnuPG by downloading GPGTools"
-msgstr "<em>Step 1.b</em> 下载 GPGTools 来使用 GnuPG"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"GPGTools is a software package that includes GnuPG. <a href=\"https://"
-"gpgtools.org/#gpgsuite\">Download</a> and install it, choosing default "
-"options whenever asked. After it's installed, you can close any windows that "
-"it creates."
-msgstr ""
-"GPGTools 是一个包含了 GnuPG 的软件包。<a href=\"https://gpgtools.org/"
-"#gpgsuite\">下载</a> 并安装它，无论提示什么都选择默认选项。安装完成后关闭窗"
-"口。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"There are major security flaws in versions of GnuPG provided by GPGTools "
-"prior to 2018.3. Make sure you have GPGTools 2018.3 or later."
-msgstr ""
-"在 GPGTools 2018.3 前的版本存在重大安全漏洞。请确保安装的是 GPGTools 2018.3 "
-"及其之后的版本。"
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.C: Tools -> Add-ons"
-msgstr "Step 1.C: 工具 -> 附加组件"
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.C: Search Add-ons"
-msgstr "Step 1.C: 搜索附加组件"
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.C: Install Add-ons"
-msgstr "Step 1.C: 安装附加组件"
-
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 1.c</em> Install the Enigmail plugin for your email program"
-msgstr "<em>Step 1.c</em> 给电子邮件程序安装 ENIGMAIL 插件"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"There are major security flaws in Enigmail prior to version 2.0.7. Make sure "
-"you have Enigmail 2.0.7 or later."
-msgstr ""
-"在 Enigmail 2.0.7 前的版本存在重大安全漏洞。请确保安装的是 Enigmail 2.0.7 及"
-"其之后的版本。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"For greater security against potential attacks, you can turn off HTML. "
-"Instead, you can render the message body as plain text."
-msgstr "处于潜在的安全原因，你可以关闭 HTML 格式，而使用纯文本渲染消息主题。"
+#. type: Attribute 'content' of: <html><head><meta>
+# | GnuPG, GPG, openpgp, surveillance, privacy, email, [-Enigmail-]
+# | {+encryption+}
+#, fuzzy
+#| msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, encryption"
+msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
#. type: Content of: <html><body><header><div><h1>
msgid "Great job!"
msgstr "很不错！"
#. type: Content of: <html><body><section><div><div><h2>
-msgid "<em>#6</em> Next steps"
+# | <em>#[-6-]{+7+}</em> Next steps
+#, fuzzy
+#| msgid "<em>#6</em> Next steps"
+msgid "<em>#7</em> Next steps"
msgstr "<em>#6</em> 下一步"
#. type: Content of: <html><body><section><div><div><p>
"你已经掌握了使用 GnuPG 加密电子邮件的基本知识，采取行动反对大规模监控。以下的"
"步骤会充分利用你已经掌握的知识。"
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid "← <a href=\"index.html\">Return to the guide</a>"
+msgstr "← <a href=\"index.html\">返回指南</a>"
+
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Join the movement"
msgstr "加入运动"
"会见志同道合的朋友，一起见证改变。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | <small>Read <a href=\"https://www.fsf.org/twitter\">why GNU Social and
+# | Mastodon are better than Twitter</a>, and <a
+# | href=\"http{+s+}://www.fsf.org/facebook\">why we don't use
+# | Facebook</a>.</small>
+#, fuzzy
+#| msgid ""
+#| "<small>Read <a href=\"https://www.fsf.org/twitter\">why GNU Social and "
+#| "Mastodon are better than Twitter</a>, and <a href=\"http://www.fsf.org/"
+#| "facebook\">why we don't use Facebook</a>.</small>"
msgid ""
-"<small>Read <a href=\"https://www.fsf.org/twitter\">why GNU Social and Pump."
-"io are better than Twitter</a>, and <a href=\"http://www.fsf.org/facebook"
-"\">why we don't use Facebook</a>.</small>"
+"<small>Read <a href=\"https://www.fsf.org/twitter\">why GNU Social and "
+"Mastodon are better than Twitter</a>, and <a href=\"https://www.fsf.org/"
+"facebook\">why we don't use Facebook</a>.</small>"
msgstr ""
"<small>阅读 <a href=\"https://www.fsf.org/twitter\">为什么 GNU Social 和 "
-"Pump.io 要胜于 Twitter</a>, 以及 <a href=\"http://www.fsf.org/facebook\">为什"
-"么我们不使用 Facebook</a>。</small>"
+"Mastodon 要胜于 Twitter（英文）</a>，以及 <a href=\"http://www.fsf.org/"
+"facebook\">为什么我们不使用 Facebook（英文）</a>。</small>"
#. type: Content of: <html><body><section><div><div><div><div><p>
msgid "Low-volume mailing list"
"To welcome them, make it easy to find your public key and offer to help with "
"encryption. Here are some suggestions:"
msgstr ""
-"理解并设置电子邮件加密对多数人是一项令人生畏的任务。为了欢迎他们，你要让你的"
-"公钥容易被找到，并提供加密上的帮助。以下是一些建议："
+"理解并设置电子邮件加密对多数人而言是一项令人生畏的任务。为了欢迎他们，你要让"
+"你的公钥容易被找到，并提供加密上的帮助。以下是一些建议："
#. type: Content of: <html><body><section><div><div><div><ul><li>
-msgid ""
-"Lead an Email Self-Defense workshop for your friends and community, using "
+# | {+#+} Lead an Email Self-Defense workshop for your friends and community,
+# | using our <a href=\"workshops.html\">teaching guide</a>.
+#, fuzzy
+#| msgid ""
+#| "Lead an Email Self-Defense workshop for your friends and community, using "
+#| "our <a href=\"workshops.html\">teaching guide</a>."
+msgid ""
+"# Lead an Email Self-Defense workshop for your friends and community, using "
"our <a href=\"workshops.html\">teaching guide</a>."
msgstr ""
"使用我们的 <a href=\"workshops.html\">教学指南</a>，为你的朋友和社区举办一场"
"电子邮件加密研讨会。"
#. type: Content of: <html><body><section><div><div><div><ul><li>
-msgid ""
-"Use <a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Encrypt "
-"with me using Email Self-Defense %40fsf\">our sharing page</a> to compose a "
-"message to a few friends and ask them to join you in using encrypted email. "
-"Remember to include your GnuPG public key fingerprint so they can easily "
-"download your key."
+# | {+#+} Use <a
+# | [-href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Encrypt with
+# | me using Email Self-Defense %40fsf\">our-]
+# | {+href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Encrypt%20with%20me%20using%20Email%20Self-Defense%20%40fsf\">
+# | our+} sharing page</a> to compose a message to a few friends and ask them
+# | to join you in using encrypted email. Remember to include your GnuPG
+# | public key fingerprint so they can easily download your key.
+#, fuzzy
+#| msgid ""
+#| "Use <a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Encrypt "
+#| "with me using Email Self-Defense %40fsf\">our sharing page</a> to compose "
+#| "a message to a few friends and ask them to join you in using encrypted "
+#| "email. Remember to include your GnuPG public key fingerprint so they can "
+#| "easily download your key."
+msgid ""
+"# Use <a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Encrypt"
+"%20with%20me%20using%20Email%20Self-Defense%20%40fsf\"> our sharing page</a> "
+"to compose a message to a few friends and ask them to join you in using "
+"encrypted email. Remember to include your GnuPG public key fingerprint so "
+"they can easily download your key."
msgstr ""
"使用 <a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Encrypt "
"with me using Email Self-Defense %40fsf\">我们的分享页面</a>，给几个朋友撰写"
"易地下载你的公钥。"
#. type: Content of: <html><body><section><div><div><div><ul><li>
-msgid ""
-"Add your public key fingerprint anywhere that you normally display your "
+# | {+#+} Add your public key fingerprint anywhere that you normally display
+# | your email address. Some good places are: your email signature (the text
+# | kind, not the cryptographic kind), social media profiles, blogs, Web{+
+# | +}sites, or business cards. At the Free Software Foundation, we put ours
+# | on our <a href=\"https://fsf.org/about/staff\">staff page</a>.
+#, fuzzy
+#| msgid ""
+#| "Add your public key fingerprint anywhere that you normally display your "
+#| "email address. Some good places are: your email signature (the text kind, "
+#| "not the cryptographic kind), social media profiles, blogs, Websites, or "
+#| "business cards. At the Free Software Foundation, we put ours on our <a "
+#| "href=\"https://fsf.org/about/staff\">staff page</a>."
+msgid ""
+"# Add your public key fingerprint anywhere that you normally display your "
"email address. Some good places are: your email signature (the text kind, "
-"not the cryptographic kind), social media profiles, blogs, Websites, or "
+"not the cryptographic kind), social media profiles, blogs, Web sites, or "
"business cards. At the Free Software Foundation, we put ours on our <a href="
"\"https://fsf.org/about/staff\">staff page</a>."
msgstr ""
"a> and <a href=\"https://prism-break.org\">prism-break.org</a>."
msgstr ""
"学习更多有关即时通讯、硬盘储存、在线分享的反监控技术，尽在 <a href=\"https://"
-"directory.fsf.org/wiki/Collection:Privacy_pack\">自由软件基金会隐私包</a> 和 "
-"<a href=\"https://prism-break.org\">prism-break.org</a>。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
+"directory.fsf.org/wiki/Collection:Privacy_pack\">自由软件基金会隐私包（英文）"
+"</a> 和 <a href=\"https://prism-break.org/zh-CN/\">prism-break.org</a>。"
+
+#. type: Content of: <html><body><section><div><div><div><p>
+# | If you are using Windows, Mac OS or any other proprietary operating
+# | system, we recommend you switch to a free software operating system like
+# | GNU/Linux. This will make it much harder for attackers to enter your
+# | computer through hidden back doors. Check out the Free Software
+# | Foundation's <a
+# | href=\"http{+s+}://www.gnu.org/distros/free-distros.html\">endorsed
+# | versions of GNU/Linux.</a>
+#, fuzzy
+#| msgid ""
+#| "If you are using Windows, Mac OS or any other proprietary operating "
+#| "system, we recommend you switch to a free software operating system like "
+#| "GNU/Linux. This will make it much harder for attackers to enter your "
+#| "computer through hidden back doors. Check out the Free Software "
+#| "Foundation's <a href=\"http://www.gnu.org/distros/free-distros.html"
+#| "\">endorsed versions of GNU/Linux.</a>"
msgid ""
"If you are using Windows, Mac OS or any other proprietary operating system, "
"we recommend you switch to a free software operating system like GNU/Linux. "
"This will make it much harder for attackers to enter your computer through "
-"hidden back doors. Check out the Free Software Foundation's <a href=\"http://"
-"www.gnu.org/distros/free-distros.html\">endorsed versions of GNU/Linux.</a>"
+"hidden back doors. Check out the Free Software Foundation's <a href="
+"\"https://www.gnu.org/distros/free-distros.html\">endorsed versions of GNU/"
+"Linux.</a>"
msgstr ""
-"如果你正在使用 Windows， Mac OS 或 其他专有操作系统，我们建议你换用自由邮件操"
+"如果你正在使用 Windows， Mac OS 或其他专有操作系统，我们建议你换用自由邮件操"
"作系统，诸如 GNU/Linux。攻击者通过隐藏后门入侵你的计算机会愈加困难。查看自由"
-"软件基金会 <a href=\"http://www.gnu.org/distros/free-distros.html\">推荐的 "
-"GNU/Linux 发行版</a>。"
+"软件基金会 <a href=\"https://www.gnu.org/distros/free-distros.zh-cn.html\">推"
+"荐的 GNU/Linux 发行版</a>。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Optional: Add more email protection with Tor"
"you the best results."
msgstr ""
"洋葱路由（Tor）网络以多重加密封装网络通讯，并在全球多次传递。如果使用得当，"
-"Tor 能够迷惑监控代理和全球监控设备。和 GnuPG 加密同时使用能够带给你最佳的安"
+"Tor 能够迷惑监控代理和全球监控设备。和 GnuPG 加密配合使用能够带给你最佳的安"
"全。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | To have your email program send and receive email over Tor, install the <a
+# | href=\"https://addons.mozilla.org/en-us/thunderbird/addon/torbirdy/\">Torbirdy
+# | plugin</a> [-the same way you installed Enigmail,-] by searching for it
+# | through Add-ons.
+#, fuzzy
+#| msgid ""
+#| "To have your email program send and receive email over Tor, install the "
+#| "<a href=\"https://addons.mozilla.org/en-us/thunderbird/addon/torbirdy/"
+#| "\">Torbirdy plugin</a> the same way you installed Enigmail, by searching "
+#| "for it through Add-ons."
msgid ""
"To have your email program send and receive email over Tor, install the <a "
"href=\"https://addons.mozilla.org/en-us/thunderbird/addon/torbirdy/"
-"\">Torbirdy plugin</a> the same way you installed Enigmail, by searching for "
-"it through Add-ons."
+"\">Torbirdy plugin</a> by searching for it through Add-ons."
msgstr ""
"要通过 Tor 在电子邮件程序收发邮件，需要安装 <a href=\"https://addons.mozilla."
"org/en-us/thunderbird/addon/torbirdy/\">Torbirdy 插件</a>，其步骤与安装 "
-"Enigmail 相同，在附加组建搜索即可。"
+"Enigmail 相同，在附加组件搜索即可。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"keeps you secure."
msgstr ""
"在通过 Tor 检查邮件前，确保你了解 <a href=\"https://www.torproject.org/docs/"
-"faq.html.en#WhatProtectionsDoesTorProvide\">权衡所涉及的安全问题</a>。我们在"
-"电子前哨基金会的朋友制作了 Tor 如何保证安全的 <a href=\"https://www.eff.org/"
-"pages/tor-and-https\">信息图</a>。"
+"faq.html.en#WhatProtectionsDoesTorProvide\">权衡所涉及的安全问题（英文）</"
+"a>。我们在电子前哨基金会的朋友制作了 Tor 如何保证安全的 <a href=\"https://"
+"www.eff.org/pages/tor-and-https\">信息图</a>。"
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 6: Next Steps"
+# | Section [-6-]{+7+}: Next Steps
+#, fuzzy
+#| msgid "Section 6: Next Steps"
+msgid "Section 7: Next Steps"
msgstr "Section 6: 下一步"
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid "← <a href=\"index.html\">Return to the guide</a>"
-msgstr "← <a href=\"index.html\">返回指南</a>"
-
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Make Email Self-Defense tools even better"
msgstr "完善本指南"
"系其他译员，和你一起将它翻译成你的语言。"
#. type: Content of: <html><body><section><div><div><div><p>
+# | If you like programming, you can contribute code to <a
+# | [-href=\"https://www.gnupg.org/\">GnuPG</a> or <a
+# | href=\"https://www.enigmail.net/home/index.php\">Enigmail</a>.-]
+# | {+href=\"https://www.gnupg.org/\">GnuPG</a>.+}
+#, fuzzy
+#| msgid ""
+#| "If you like programming, you can contribute code to <a href=\"https://www."
+#| "gnupg.org/\">GnuPG</a> or <a href=\"https://www.enigmail.net/home/index."
+#| "php\">Enigmail</a>."
msgid ""
"If you like programming, you can contribute code to <a href=\"https://www."
-"gnupg.org/\">GnuPG</a> or <a href=\"https://www.enigmail.net/home/index.php"
-"\">Enigmail</a>."
+"gnupg.org/\">GnuPG</a>."
msgstr ""
"如果你喜欢编程，你可以为 <a href=\"https://www.gnupg.org/\">GnuPG</a> 或 <a "
"href=\"https://www.enigmail.net/home/index.php\">Enigmail</a> 贡献代码。"
"具。"
#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"windows.html\" class=\"current\">Windows</a>"
-msgstr "<a href=\"windows.html\" class=\"current\">Windows</a>"
-
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 1.b</em> Get GnuPG by downloading GPG4Win"
-msgstr "<em>Step 1.b</em> 下载 GPG4Win 获取 GnuPG"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"GPG4Win is a software package that includes GnuPG. <a href=\"https://www."
-"gpg4win.org/\">Download</a> and install it, choosing default options "
-"whenever asked. After it's installed, you can close any windows that it "
-"creates."
-msgstr ""
-"GPG4Win 是一个包含 GnuPG 的软件包。<a href=\"https://www.gpg4win.org/\">下载"
-"</a> 并安装它，无论提示什么都选择默认选项。安装后，你可以关闭程序创建的窗口。"
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"There are major security flaws in versions of GnuPG provided by GPG4Win "
-"prior to 3.1.2. Make sure you have GPG4Win 3.1.2 or later."
-msgstr ""
-"在 GPG4Win 3.1.2 前的版本存在重大安全漏洞。请确保安装的是 GPG4Win 3.1.2 及其"
-"之后的版本。"
-
-#. type: Content of: <html><head><title>
-msgid "Email Self-Defense - Teach your friends!"
-msgstr "Email Self-Defense - Teach your friends!"
+# | [-←-]<a [-href=\"index.html\">Return to the-]
+# | {+href=\"index.html\">Set up+} guide</a>
+#, fuzzy
+#| msgid "← <a href=\"index.html\">Return to the guide</a>"
+msgid "<a href=\"index.html\">Set up guide</a>"
+msgstr "← <a href=\"index.html\">返回指南</a>"
#. type: Content of: <html><body><header><div><ul><li>
msgid "<a href=\"workshops.html\" class=\"current\">Teach your friends</a>"
msgstr "<a href=\"workshops.html\" class=\"current\">研讨会</a>"
#. type: Content of: <html><body><header><div><ul><li><a>
-msgid ""
-"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email "
-"encryption for everyone via %40fsf\">Share "
+# | <a [-href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email
+# | encryption for everyone via %40fsf\">Share -]
+# | {+href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email%20encrypt
+# | ion%20for%20everyone%20via%20%40fsf\">Share +}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email "
+#| "encryption for everyone via %40fsf\">Share "
+msgid ""
+"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email"
+"%20encryption%20for%20everyone%20via%20%40fsf\">Share "
msgstr ""
"<a href=\"https://fsf.org/share?u=https://u.fsf.org/zb&t=Email "
"encryption for everyone via %40fsf\">分享 "
"world take the first step towards protecting their privacy with free "
"software."
msgstr ""
-"我们想让本指南翻译成多国语言，并制作移动设备版本的加密版本。请捐款，帮助全世"
-"界的人们用自由软件保护他们隐私的第一步。"
+"我们想让本指南翻译成多国语言，并制作手机设备使用加密的版本。请捐款，帮助全世"
+"界的人们使用自由软件，迈出保护他们隐私的第一步。"
+
+#. type: Content of: <html><body><header><div><div><p><a>
+msgid ""
+"<a href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&"
+"id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate\">"
+msgstr ""
+"<a href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&"
+"id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate\">"
#. type: Content of: <html><body><header><div><div><p><a>
msgid ""
"GnuPG to send and receive encrypted email, you're a perfect candidate for "
"leading a workshop!"
msgstr ""
-"</a> 理解并设置电子邮件加密对多数人是一项令人畏惧的任务。这就是为什么在帮助朋"
-"å\8f\8b使ç\94¨ GnuPG å\8a å¯\86æ\97¶ï¼\8cä½ ç\9a\84å\98å\9c¨è\87³å\85³é\87\8dè¦\81ã\80\82å\8d³ä¾¿å\8fªæ\9c\89ä¸\80个人å\88°å\9cºï¼\8cé\82£ä¹\88ä¹\9fè\87³å°\91æ\9c\89ä¸\80个人"
-"开始使用加密了。你有能力帮助你的好友保护他们电子情书的隐私，告诉他们自由软件"
-"的重要性。如果你使用 GnuPG 收发加密邮件，那么你是举办研讨会的最佳人选。"
+"</a> 理解并设置电子邮件加密对多数人而言是一项令人生畏的任务。这就是为什么在帮"
+"å\8a©æ\9c\8bå\8f\8b使ç\94¨ GnuPG å\8a å¯\86æ\97¶ï¼\8cä½ ç\9a\84å\98å\9c¨è\87³å\85³é\87\8dè¦\81ã\80\82å\8d³ä¾¿å\8fªæ\9c\89ä¸\80个人å\88°å\9cºï¼\8cé\82£ä¹\88ä¹\9fè\87³å°\91æ\9c\89ä¸\80"
+"个人开始使用加密了。你有能力帮助你的好友保护他们电子情书的隐私，告诉他们自由"
+"软件的重要性。如果你使用 GnuPG 收发加密邮件，那么你是举办研讨会的最佳人选。"
#. type: Attribute 'alt' of: <html><body><section><div><div><p><img>
msgid "A small workshop among friends"
"might even hear the classic \"if you've got nothing to hide, you've got "
"nothing to fear\" argument against using encryption."
msgstr ""
-"如果你听过朋友抱怨他们缺乏隐私，询问他们是否愿意出席 Email Self-Defense 研讨"
-"ä¼\9aã\80\82å¦\82æ\9e\9cä½ ç\9a\84æ\9c\8bå\8f\8b并æ\9cªæ\8a±æ\80¨è¿\87ï¼\8cä½ å\8f¯è\83½é\9c\80è¦\81说æ\9c\8dä»\96们ã\80\82ä½ ç\94\9aè\87³å\8f¯è\83½ä¼\9aå\90¬å\88°ç»\8få\85¸ç\9a\84â\80\9cå\85\89æ\98\8eç£\8a"
-"落的人无可畏惧”的论据来反对使用加密。"
+"如果你听过朋友抱怨他们缺乏隐私，询问他们是否愿意出席电子邮件加密研讨会。如果"
+"ä½ ç\9a\84æ\9c\8bå\8f\8b并æ\9cªæ\8a±æ\80¨è¿\87ï¼\8cä½ å\8f¯è\83½é\9c\80è¦\81说æ\9c\8dä»\96们ã\80\82ä½ ç\94\9aè\87³å\8f¯è\83½ä¼\9aå\90¬å\88°ç»\8få\85¸ç\9a\84â\80\9cå\85\89æ\98\8eç£\8aè\90½ç\9a\84人æ\97 "
+"可畏惧”论据来反对使用加密。"
#. type: Content of: <html><body><section><div><div><p>
msgid ""
"to learn GnuPG. Mix and match whichever you think will make sense to your "
"community:"
msgstr ""
-"下面是你可以用来解释的为什么值得学习 GnuPG 要点。并结合自己的观点，为什么它对"
-"你的社区有意义："
+"下面是你可以用来解释的为什么值得学习 GnuPG 要点。并结合自己的观点，解释为什么"
+"它对你的社区有意义："
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Strength in numbers"
-msgstr "ä¼\97人æ\8b¾æ\9f´ç\81«ç\84°é«\98"
+msgstr "人å¤\9aå\8a\9bé\87\8f大"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"makes it harder for surveillance systems to single out those that can't "
"afford to be found, and shows solidarity with those people."
msgstr ""
-"每个使用加密反抗大规模监控的人，同时让对方更容易反抗。普遍使用强加密有着多种"
-"强大的效果：这意味着那些最需要隐私的人，潜在的告密者和活动认识更有可能接触到"
-"加密。越多的人对越多的事物使用加密的同时，监控系统查找信息的成本会无法负担。"
+"每个使用加密反抗大规模监控的人，同时也让他人更容易反抗。普遍使用强加密有着多"
+"种强大的效果：这意味着那些最需要隐私的人，潜在的告密者和活动人士更有可能接触"
+"到加密。越多的人对越多的事物使用加密的同时，监控系统查找信息的成本会大到无法"
+"负担。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "People you respect may already be using encryption"
"make a list of people and organizations who use GnuPG whom your community "
"will likely recognize."
msgstr ""
-"许多记者，告密者，活动人士以及研究者在使用 GnuPG，因此你的喷有可能不知不觉中"
+"许多记者，告密者，活动人士以及研究者在使用 GnuPG，因此你的朋友可能不知不觉中"
"听说过几位在使用它的人了。你可以搜索 \"BEGIN PUBLIC KEY BLOCK\" 加上关键词，"
-"å\88¶ä½\9cå\87ºä¸\80个å\9c¨ä½¿ç\94¨ GnuPG 人ç\89©å\92\8cç»\84ç»\87å\88\97表ï¼\8cå\85¶ä¸ä½ ç\9a\84社å\8cºè\83½å¤\9f认å\87ºä»\96们。"
+"å\88¶ä½\9cå\87ºä¸\80个å\9c¨ä½¿ç\94¨ GnuPG 人ç\89©å\92\8cç»\84ç»\87å\88\97表ï¼\8cå®\83å\8c\85æ\8b¬ä¼\97æ\89\80å\91¨ç\9f¥ç\9a\84ç»\84ç»\87。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Respect your friends' privacy"
"agent, for that matter!) feels the same way. Show your friends respect by "
"encrypting your correspondence with them."
msgstr ""
-"没有办法判断是否存在隐私敏感的通信。因此，不要因为你觉得发给发给朋友的信件无"
-"关紧要而假定它不隐私敏感。"
+"没有方法判断是否存在隐私敏感的通信。因此，不要因为你觉得发给发给朋友的信件无"
+"关紧要（你的朋友也可能是这么想的），而假定它不隐私敏感。通过加密消息，向你的"
+"好友表示尊重。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Privacy technology is normal in the physical world"
"for granted as ways of protecting our privacy. Why should the digital realm "
"be any different?"
msgstr ""
-"在现实世界，我们拉上百叶窗，信封包装以及关闭房门来作为保护我们隐私的手段。为"
-"什么数字世界要有不同？"
+"在现实世界中，我们拉上百叶窗，密封信封以及关闭房门来作为保护我们隐私的手段。"
+"为ä»\80ä¹\88æ\95°å\97ä¸\96ç\95\8cè¦\81æ\9c\89ä¸\8då\90\8cï¼\9f"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "We shouldn't have to trust our email providers with our privacy"
msgstr "<em>#2</em> 筹划"
#. type: Content of: <html><body><section><div><div><p>
+# | Once you've got at least one interested friend, pick a date and start
+# | planning out the workshop. Tell participants to bring their computer and
+# | ID (for signing each other's keys). If you'd like to make it easy for the
+# | participants to use [-Diceware-] {+<a
+# | href=\"https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/\">Diceware</a>+}
+# | for choosing passwords, get a pack of dice beforehand. Make sure the
+# | location you select has an easily accessible Internet connection, and make
+# | backup plans in case the connection stops working on the day of the
+# | workshop. Libraries, coffee shops, and community centers make great
+# | locations. Try to get all the participants to set up an
+# | [-Enigmail-compatible-] email client {+based on Thunderbird+} before the
+# | event. Direct them to their email provider's IT department or help page if
+# | they run into errors.
+#, fuzzy
+#| msgid ""
+#| "Once you've got at least one interested friend, pick a date and start "
+#| "planning out the workshop. Tell participants to bring their computer and "
+#| "ID (for signing each other's keys). If you'd like to make it easy for the "
+#| "participants to use Diceware for choosing passwords, get a pack of dice "
+#| "beforehand. Make sure the location you select has an easily accessible "
+#| "Internet connection, and make backup plans in case the connection stops "
+#| "working on the day of the workshop. Libraries, coffee shops, and "
+#| "community centers make great locations. Try to get all the participants "
+#| "to set up an Enigmail-compatible email client before the event. Direct "
+#| "them to their email provider's IT department or help page if they run "
+#| "into errors."
msgid ""
"Once you've got at least one interested friend, pick a date and start "
"planning out the workshop. Tell participants to bring their computer and ID "
"(for signing each other's keys). If you'd like to make it easy for the "
-"participants to use Diceware for choosing passwords, get a pack of dice "
-"beforehand. Make sure the location you select has an easily accessible "
-"Internet connection, and make backup plans in case the connection stops "
-"working on the day of the workshop. Libraries, coffee shops, and community "
-"centers make great locations. Try to get all the participants to set up an "
-"Enigmail-compatible email client before the event. Direct them to their "
-"email provider's IT department or help page if they run into errors."
+"participants to use <a href=\"https://theintercept.com/2015/03/26/"
+"passphrases-can-memorize-attackers-cant-guess/\">Diceware</a> for choosing "
+"passwords, get a pack of dice beforehand. Make sure the location you select "
+"has an easily accessible Internet connection, and make backup plans in case "
+"the connection stops working on the day of the workshop. Libraries, coffee "
+"shops, and community centers make great locations. Try to get all the "
+"participants to set up an email client based on Thunderbird before the "
+"event. Direct them to their email provider's IT department or help page if "
+"they run into errors."
msgstr ""
"你和至少一位感兴趣的朋友约好时间，便可以筹备研讨会了。告诉与会者带上他们的计"
-"算机和 ID（用于相互签名）。预先准备好骰子，这样你的朋友用 Diceware 方法生成密"
-"码会方便很多。确保你定的地点能方便上网，并做好研讨会当天断网的预案。图书馆，"
-"咖啡店以及社区中心都是合适地点之选。试着让与会者在会前安装 Enigmail 兼容的邮"
-"件客户端。如果他们遇到问题，直接联系邮件提供商的 IT 部门。"
+"算机和 ID（用于相互签名）。预先准备好骰子，这样你的朋友能够很方便地用 "
+"Diceware 方法生成密码。确保你选定的地点能方便上网，并做好研讨会当天断网的预"
+"案。图书馆，咖啡店以及社区中心都是合适地点之选。试着让与会者在会前安装 "
+"Enigmail 兼容的邮件客户端。如果他们遇到问题，直接联系邮件提供商的信息技术部"
+"门。"
#. type: Content of: <html><body><section><div><div><p>
msgid ""
"Estimate that the workshop will take at least forty minutes plus ten minutes "
"for each participant. Plan extra time for questions and technical glitches."
msgstr ""
-"预计研讨会将持续四十分钟，每多一位与会者将额外花费十分钟。请准备好额外的时间"
+"研讨会预计会持续四十分钟，每多一位与会者将额外花费十分钟。请准备好额外的时间"
"应对问题和技术故障。"
#. type: Content of: <html><body><section><div><div><p>
msgstr ""
"研讨会的成功取决于了解每一位与会者的背景并满足他们的需求。研讨会应当尽可能的"
"小，每位与会者都能受到个性化的指导。如果想要参与的人超出了你所能应付的范围，"
-"那么保持较高的主持者与与会者之比，或者举办多场研讨会。小型的研讨会往往效果更"
+"那么保持较高的主持者与与会者之比，或者举办多场研讨会——小型的研讨会往往效果更"
"好。"
#. type: Content of: <html><body><section><div><div><h2>
"afterwards for people that had trouble grasping the concepts, or those that "
"grasped them quickly and want to learn more."
msgstr ""
-"分小组完成 Email Self-Defense 指南中的步骤。具体而微地解释步骤，但确保不要超"
-"è¿\87ä¸\8eä¼\9aè\80\85ç\90\86解ç\9a\84ä¸\8aé\99\90ã\80\82对äº\8eæ\8a\80æ\9c¯å¨´ç\86\9fç\9a\84ä¸\8eä¼\9aè\80\85ï¼\8cå\8f¯ä»¥å¤§å¤§æ\8f\90é«\98æ\8c\87示ç\9a\84é\9a¾åº¦ã\80\82ç¡®ä¿\9dç»\84å\86\85æ\88\90"
-"å\91\98å®\8cæ\88\90äº\86ä¸\80æ¥å\90\8eå\86\8dè¿\9bè¡\8cä¸\8bä¸\80æ¥ã\80\82è\80\83è\99\91å\90\8eç»ä¸ºç\90\86解æ¦\82念æ\9c\89å\9b°é\9a¾ç\9a\84人ï¼\8cè¿\85é\80\9fæ\8e\8cæ\8f¡å\8f\88æ\83³å¦å\88°æ\9b´"
-"多新知识的人提供第二次辅导研讨会。"
+"分组完成电子邮件加密指南中的步骤。具体而微地解释步骤，但确保不要超过与会者理"
+"解ç\9a\84ä¸\8aé\99\90ã\80\82对äº\8eæ\8a\80æ\9c¯å¨´ç\86\9fç\9a\84ä¸\8eä¼\9aè\80\85ï¼\8cå\8f¯ä»¥æ\8f\90é«\98æ\8c\87示ç\9a\84é\9a¾åº¦ã\80\82ç¡®ä¿\9dç»\84å\86\85æ\88\90å\91\98å®\8cæ\88\90äº\86ä¸\80æ¥å\90\8e"
+"å\86\8dè¿\9bè¡\8cä¸\8bä¸\80æ¥ã\80\82è\80\83è\99\91为ç\90\86解æ¦\82念æ\9c\89å\9b°é\9a¾ç\9a\84人ï¼\8cæ\88\96è¿\85é\80\9fæ\8e\8cæ\8f¡å\8f\88æ\83³å¦å\88°æ\9b´å¤\9aæ\96°ç\9f¥è¯\86ç\9a\84人æ\8f\90ä¾\9b"
+"第二次辅导研讨会。"
#. type: Content of: <html><body><section><div><div><p>
msgid ""
"back up their revocation certificates."
msgstr ""
"在本指南的 <a href=\"index.html#section2\">Section 2</a> ，确保每一位与会者都"
-"上传公钥到相同服务器（æ\9c\89æ\97¶å¯\86é\92¥æ\9c\8då\8a¡å\99¨ä¹\8bé\97´å\90\8cæ¥æ\9c\89延è¿\9fï¼\89ï¼\8cä»\96们å\8f¯ä»¥ç«\8bå\8d³ä¸\8bè½½å\90\84è\87ªç\9a\84"
-"公钥。在 <a href=\"index.html#section3\">Section 3</a>，让与会者有时间相互发"
-"送测试邮件，而不是给爱德华发邮件。相似地，在 <a href=\"index."
+"上传公钥到相同服务器（å\9b 为æ\9c\89æ\97¶å¯\86é\92¥æ\9c\8då\8a¡å\99¨ä¹\8bé\97´å\90\8cæ¥æ\9c\89延è¿\9fï¼\89ï¼\8cä»\96们å\8f¯ä»¥ç«\8bå\8d³ä¸\8bè½½å\90\84"
+"自的公钥。在 <a href=\"index.html#section3\">Section 3</a>，让与会者有时间相"
+"
互发送测试邮件，而不是给爱德华发邮件。相似地，在 <a href=\"index."
"html#section4\">Section 4</a>，鼓励与会者相互对彼此公钥签名。最后，提醒他们将"
-"吊销证书确保保存在安全的地方。"
+"吊销证书保存在安全的地方。"
#. type: Content of: <html><body><section><div><div><h2>
msgid "<em>#4</em> Explain the pitfalls"
"\">meaningfully resist invasions of our digital privacy and autonomy</a>."
msgstr ""
"解释 <a href=\"https://www.gnu.org/proprietary/proprietary.html\">运行专有操"
-"作系统的危险</a>，并倡导自由软件，因为没有后者，我们就无法 <a href=\"https://"
-"www.fsf.org/bulletin/2013/fall/how-can-free-software-protect-us-from-"
-"surveillance\">行之有效地对抗对我们数字隐私和自治的侵犯</a>。"
+"作系统的危险（英文）</a>，并倡导自由软件，因为没有后者，我们就无法 <a href="
+"\"https://www.fsf.org/bulletin/2013/fall/how-can-free-software-protect-us-"
+"from-surveillance\">行之有效地对抗对我们数字隐私和自治的侵犯（英文）</a>。"
#. type: Content of: <html><body><section><div><div><h2>
msgid "<em>#5</em> Share additional resources"
msgstr "<em>#5</em> 附加资源"
#. type: Content of: <html><body><section><div><div><p>
+# | GnuPG's advanced options are far too complex to teach in a single
+# | workshop. If participants want to know more, point out the advanced
+# | subsections in the guide and consider organizing another workshop. You can
+# | also share <a
+# | href=\"https://www.gnupg.org/documentation/index.html\">GnuPG's</a> [-and
+# | <a
+# | href=\"https://www.enigmail.net/index.php/documentation\">Enigmail's</a>-]
+# | official documentation and mailing [-lists.-] {+lists, and the <a
+# | href=\"https://libreplanet.org/wiki/GPG_guide/Public_Review\">Email
+# | Self-Defense feedback</a> page.+} Many GNU/Linux distribution's Web sites
+# | also contain a page explaining some of GnuPG's advanced features.
+#, fuzzy
+#| msgid ""
+#| "GnuPG's advanced options are far too complex to teach in a single "
+#| "workshop. If participants want to know more, point out the advanced "
+#| "subsections in the guide and consider organizing another workshop. You "
+#| "can also share <a href=\"https://www.gnupg.org/documentation/index.html"
+#| "\">GnuPG's</a> and <a href=\"https://www.enigmail.net/index.php/"
+#| "documentation\">Enigmail's</a> official documentation and mailing lists. "
+#| "Many GNU/Linux distribution's Web sites also contain a page explaining "
+#| "some of GnuPG's advanced features."
msgid ""
"GnuPG's advanced options are far too complex to teach in a single workshop. "
"If participants want to know more, point out the advanced subsections in the "
"guide and consider organizing another workshop. You can also share <a href="
-"\"https://www.gnupg.org/documentation/index.html\">GnuPG's</a> and <a href="
-"\"https://www.enigmail.net/documentation/index.php\">Enigmail's</a> official "
-"documentation and mailing lists. Many GNU/Linux distribution's Web sites "
-"also contain a page explaining some of GnuPG's advanced features."
+"\"https://www.gnupg.org/documentation/index.html\">GnuPG's</a> official "
+"documentation and mailing lists, and the <a href=\"https://libreplanet.org/"
+"wiki/GPG_guide/Public_Review\">Email Self-Defense feedback</a> page. Many "
+"GNU/Linux distribution's Web sites also contain a page explaining some of "
+"GnuPG's advanced features."
msgstr ""
"GnuPG 的高级操作太复杂以至于无法在一场研讨会上教授完毕。如果与会者想了解更"
"多，告诉他们本指南中有进阶章节，或者考虑参加下一场研讨会。你也可以分享 <a "
"href=\"https://www.gnupg.org/documentation/index.html\">GnuPG</a> 和 <a href="
-"\"https://www.enigmail.net/documentation/index.php\">Enigmail</a> 的官方文档"
+"\"https://www.enigmail.net/index.php/documentation\">Enigmail</a> 的官方文档"
"和邮件列表。许多 GNU/Linux 发行版也提供了一些对 GnuPG 高级功能的说明页面。"
#. type: Content of: <html><body><section><div><div><h2>
"如果你有任何对本指南的建议，请来信 <a href=\"mailto:campaigns@fsf.org"
"\">campaigns@fsf.org</a> 告知我们。"
-#. type: Content of: <html><body><footer><div><div><p>
-msgid ""
-"The images on this page are under a <a href=\"https://creativecommons.org/"
-"licenses/by/4.0/\">Creative Commons Attribution 4.0 license (or later "
-"version)</a>, and the rest of it is under a <a href=\"https://"
-"creativecommons.org/licenses/by-sa/4.0\">Creative Commons Attribution-"
-"ShareAlike 4.0 license (or later version)</a>. Download the <a href=\"http://"
-"agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz\">source "
-"code of Edward reply bot</a> by Andrew Engelbrecht <sudoman@ninthfloor."
-"org> and Josh Drake <zamnedix@gnu.org>, available under the GNU "
-"Affero General Public License. <a href=\"http://www.gnu.org/licenses/license-"
-"list.html#OtherLicenses\">Why these licenses?</a>"
-msgstr ""
-"此页面上的图片采用 <a href=\"https://creativecommons.org/licenses/by/4.0/\">"
-"知识共享 署名 4.0 许可协议（或较新版本）</a> 进行许可，其余部分以 <a href="
-"\"https://creativecommons.org/licenses/by-sa/4.0\">知识共享 署名-相同方式 "
-"4.0 许可协议（或较新版本）</a> 进行许可。下载 <a href=\"http://agpl.fsf.org/"
-"emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz\">爱德华自动回复机器人"
-"的源代码</a> 由 Andrew Engelbrecht <sudoman@ninthfloor.org> 和 Josh "
-"Drake <zamnedix@gnu.org> 编写，采用 GNU Affero General Public License "
-"许可证进行许可。<a href=\"http://www.gnu.org/licenses/license-list."
-"html#OtherLicenses\">为什么要这些许可协议？</a>"
+#~ msgid ""
+#~ "The images on this page are under a <a href=\"https://creativecommons.org/"
+#~ "licenses/by/4.0/\">Creative Commons Attribution 4.0 license (or later "
+#~ "version)</a>, and the rest of it is under a <a href=\"https://"
+#~ "creativecommons.org/licenses/by-sa/4.0\">Creative Commons Attribution-"
+#~ "ShareAlike 4.0 license (or later version)</a>. Download the <a href="
+#~ "\"http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar."
+#~ "gz\"> source code of Edward reply bot</a> by Andrew Engelbrecht <"
+#~ "sudoman@ninthfloor.org> and Josh Drake <zamnedix@gnu.org>, "
+#~ "available under the GNU Affero General Public License. <a href=\"http://"
+#~ "www.gnu.org/licenses/license-list.html#OtherLicenses\">Why these licenses?"
+#~ "</a>"
+#~ msgstr ""
+#~ "简体中文由 Tom <hxxtom@gmail.com> 完成翻译。</p><p>此页面上的图片采"
+#~ "用 <a href=\"https://creativecommons.org/licenses/by/4.0/\">知识共享 署名 "
+#~ "4.0 许可协议（或较新版本）</a> 进行许可，其余部分以 <a href=\"https://"
+#~ "creativecommons.org/licenses/by-sa/4.0\">知识共享 署名-相同方式 4.0 许可协"
+#~ "议 （或较新版本）</a> 进行许可。下载由 Andrew Engelbrecht <"
+#~ "andrew@engelbrecht.io> 和 Josh Drake <zamnedix@gnu.org> 编写的 "
+#~ "<a href=\"http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/"
+#~ "edward.tar.gz\">爱德华自动回复机器人源代码</a>，采用 GNU Affero General "
+#~ "Public License 许可证进行许可。<a href=\"http://www.gnu.org/licenses/"
+#~ "license-list.html#OtherLicenses\">为什么要这些许可证？</a>"
+
+#~ msgid "<a class=\"current\" href=\"/en\">English - v4.0</a>"
+#~ msgstr "<a href=\"/en\">English - v4.0</a>"
+
+#~ msgid "<a href=\"/ar\">العربية <span class=\"tip\">tip</span></a>"
+#~ msgstr "<a href=\"/ar\">العربية <span class=\"tip\">tip</span></a>"
+
+#~ msgid "<a href=\"/cs\">čeština - v4.0</a>"
+#~ msgstr "<a href=\"/cs\">čeština - v4.0</a>"
+
+#~ msgid "<a href=\"/de\">Deutsch - v4.0</a>"
+#~ msgstr "<a href=\"/de\">Deutsch - v4.0</a>"
+
+#~ msgid "<a href=\"/el\">ελληνικά - v3.0</a>"
+#~ msgstr "<a href=\"/el\">ελληνικά - v3.0</a>"
+
+#~ msgid "<a href=\"/es\">español - v4.0</a>"
+#~ msgstr "<a href=\"/es\">español - v4.0</a>"
+
+#~ msgid "<a href=\"/fa\">فارسی - v4.0</a>"
+#~ msgstr "<a href=\"/fa\">فارسی - v4.0</a>"
+
+#~ msgid "<a href=\"/fr\">français - v4.0</a>"
+#~ msgstr "<a href=\"/fr\">français - v4.0</a>"
+
+#~ msgid "<a href=\"/it\">italiano - v3.0</a>"
+#~ msgstr "<a href=\"/it\">italiano - v3.0</a>"
+
+#~ msgid "<a href=\"/ja\">日本語 - v4.0</a>"
+#~ msgstr "<a href=\"/ja\">日本語 - v4.0</a>"
+
+#~ msgid "<a href=\"/ko\">한국어 <span class=\"tip\">tip</span></a>"
+#~ msgstr "<a href=\"/ko\">한국어 <span class=\"tip\">tip</span></a>"
+
+#~ msgid "<a href=\"/ml\">മലയാളം <span class=\"tip\">tip</span></a>"
+#~ msgstr "<a href=\"/ml\">മലയാളം <span class=\"tip\">tip</span></a>"
+
+#~ msgid "<a href=\"/pt-br\">português do Brasil - v3.0</a>"
+#~ msgstr "<a href=\"/pt-br\">português do Brasil - v3.0</a>"
+
+#~ msgid "<a href=\"/ro\">română - v3.0</a>"
+#~ msgstr "<a href=\"/ro\">română - v3.0</a>"
+
+#~ msgid "<a href=\"/ru\">русский - v4.0</a>"
+#~ msgstr "<a href=\"/ru\">русский - v4.0</a>"
+
+#~ msgid "<a href=\"/sq\">Shqip - v4.0</a>"
+#~ msgstr "<a href=\"/sq\">Shqip - v4.0</a>"
+
+#~ msgid "<a href=\"/sv\">svenska - v4.0</a>"
+#~ msgstr "<a href=\"/sv\">svenska - v4.0</a>"
+
+#~ msgid "<a href=\"/tr\">Türkçe - v4.0</a>"
+#~ msgstr "<a href=\"/tr\">Türkçe - v4.0</a>"
+
+#~ msgid "<a href=\"/zh-hans\">简体中文 - v4.0</a>"
+#~ msgstr "<a class=\"current\" href=\"/zh-hans\">简体中文 - v4.0</a>"
+
+#~ msgid "<a href=\"mac.html\">Mac OS</a>"
+#~ msgstr "<a href=\"mac.html\">Mac OS</a>"
+
+#~ msgid "<a href=\"windows.html\">Windows</a>"
+#~ msgstr "<a href=\"windows.html\">Windows</a>"
+
+#~ msgid "<a href=\"http://u.fsf.org/ys\">"
+#~ msgstr "<a href=\"http://u.fsf.org/ys\">"
+
+#~ msgid ""
+#~ "Open your email program and follow the wizard (step-by-step walkthrough) "
+#~ "that sets it up with your email account."
+#~ msgstr "打开你的邮件程序，按照向导程序的提示逐步设置好你的邮箱账号。"
+
+#~ msgid ""
+#~ "Look for the letters SSL, TLS, or STARTTLS to the right of the servers "
+#~ "when you're setting up your account. If you don't see them, you will "
+#~ "still be able to use encryption, but this means that the people running "
+#~ "your email system are running behind the industry standard in protecting "
+#~ "your security and privacy. We recommend that you send them a friendly "
+#~ "email asking them to enable SSL, TLS, or STARTTLS for your email server. "
+#~ "They will know what you're talking about, so it's worth making the "
+#~ "request even if you aren't an expert on these security systems."
+#~ msgstr ""
+#~ "在配置你的账号时，留意服务器右侧的 SSL, TLS 或 STARTTLS 字样。如果你没有看"
+#~ "到他们，你仍有能力使用加密，但这意味着运行邮件系统的人以低于行业标准的规范"
+#~ "保护着你的安全与隐私。我们建议你向他们发送一封友好的邮件，要求他们为邮件服"
+#~ "务器启用 SSL, TLS 或 STARTTLS。他们会明白你说的是什么；如果你不是系统安全"
+#~ "领域的专家，这是一个值得的请求。"
+
+#~ msgid "Step 1.B: Tools -> Add-ons"
+#~ msgstr "Step 1.B: 工具 -> 附加组件"
+
+#~ msgid "Step 1.B: Search Add-ons"
+#~ msgstr "Step 1.B: 搜索附加组件"
+
+#~ msgid "Step 1.B: Install Add-ons"
+#~ msgstr "Step 1.B: 安装附加组件"
+
+#~ msgid "<em>Step 1.b</em> Install the Enigmail plugin for your email program"
+#~ msgstr "<em>Step 1.b</em> 安装 ENIGMAIL 扩展"
+
+#~ msgid ""
+#~ "In your email program's menu, select Add-ons (it may be in the Tools "
+#~ "section). Make sure Extensions is selected on the left. Do you see "
+#~ "Enigmail? Make sure it's the latest version. If so, skip this step."
+#~ msgstr ""
+#~ "在邮件程序的菜单栏里，选择“附加组件”（Add-ons，它可能在工具选项里）。确认"
+#~ "选上了左侧的“扩展”（Extensions）。看到了 Enigmail 吗？确保安装的是最新版"
+#~ "本。如果是，请跳过此步。"
+
+#~ msgid ""
+#~ "If not, search \"Enigmail\" with the search bar in the upper right. You "
+#~ "can take it from here. Restart your email program when you're done."
+#~ msgstr ""
+#~ "如果没有，在右上方的搜索框里搜索“Enigmail”。你可以在这里获取到它。安装完成"
+#~ "后重启程序。"
+
+#~ msgid ""
+#~ "There are major security flaws in versions of GnuPG prior to 2.2.8, and "
+#~ "Enigmail prior to 2.0.7. Make sure you have GnuPG 2.2.8 and Enigmail "
+#~ "2.0.7, or later versions."
+#~ msgstr ""
+#~ "由于 GnuPG 2.2.8 和 Engmail 2.0.7 前的版本存在重大安全漏洞，请确保安装的"
+#~ "是 GnuPG 2.2.8 和 Engmail 2.0.7 及其之后的版本。"
+
+#~ msgid "My email looks weird"
+#~ msgstr "我的电子邮件看起来很奇怪"
+
+#~ msgid ""
+#~ "Enigmail doesn't tend to play nice with HTML, which is used to format "
+#~ "emails, so it may disable your HTML formatting automatically. To send an "
+#~ "HTML-formatted email without encryption or a signature, hold down the "
+#~ "Shift key when you select compose. You can then write an email as if "
+#~ "Enigmail wasn't there."
+#~ msgstr ""
+#~ "Enigmail 往往不能在 HTML 格式（它是一种常见的邮件格式）里显示的很好，所以"
+#~ "它会自动禁用 HTML 格式。要想发送不加密或不带签名的 HTML 格式邮件，单击“撰"
+#~ "写消息”（compose）时按住 Shift 键，现在你可以像 Enigmail 不存在一样撰写邮"
+#~ "件了 。"
+
+#~ msgid ""
+#~ "The Enigmail Setup wizard may start automatically. If it doesn't, select "
+#~ "Enigmail → Setup Wizard from your email program's menu. You don't "
+#~ "need to read the text in the window that pops up unless you'd like to, "
+#~ "but it's good to read the text on the later screens of the wizard. Click "
+#~ "Next with the default options selected, except in these instances, which "
+#~ "are listed in the order they appear:"
+#~ msgstr ""
+#~ "Enigmail 安装向导可能会自动运行。如果没有，在你的邮件程序你选择 Enigmail "
+#~ "→ 安装向导。如果你不愿意，你不必去阅读弹出窗口中的文字，但读一读总归是好"
+#~ "的。点击下一步而不对默认选项作修改，但除了下列情况以外："
+
+#~ msgid ""
+#~ "On the screen titled \"Encryption,\" select \"Encrypt all of my messages "
+#~ "by default, because privacy is critical to me.\""
+#~ msgstr "在“加密”界面，选中“默认加密我的所有消息，因为隐私对我很重要”。"
+
+#~ msgid ""
+#~ "On the screen titled \"Signing,\" select \"Don't sign my messages by "
+#~ "default.\""
+#~ msgstr "在“签名”界面，选中“默认不对我的消息签名”。"
+
+#~ msgid ""
+#~ "On the screen titled \"Key Selection,\" select \"I want to create a new "
+#~ "key pair for signing and encrypting my email.\""
+#~ msgstr "在“密钥选择”界面，选择“我想为数字签名和加密邮件创建新密钥对”。"
+
+#~ msgid ""
+#~ "The program will take a little while to finish the next step, the \"Key "
+#~ "Creation\" screen. While you wait, do something else with your computer, "
+#~ "like watching a movie or browsing the Web. The more you use the computer "
+#~ "at this point, the faster the key creation will go."
+#~ msgstr ""
+#~ "在“生成密钥”界面，程序需要花费小会儿完成下一步。等待时，你可以在计算机上做"
+#~ "一些其他事情，比如看电影或浏览网页。此时你计算机使用的越频繁，密钥生成的速"
+#~ "度越快。"
+
+#~ msgid "I can't find the Enigmail menu."
+#~ msgstr "我找不到 Enigmail 菜单。"
+
+#~ msgid ""
+#~ "In many new email programs, the main menu is represented by an image of "
+#~ "three stacked horizontal bars. Enigmail may be inside a section called "
+#~ "Tools."
+#~ msgstr ""
+#~ "在许多新型电子邮件程序中，主菜单是用三横杠图标表示的。Enigmail 可能在“工"
+#~ "具”选项里。"
+
+#~ msgid "The wizard says that it cannot find GnuPG."
+#~ msgstr "向导程序无法找到 GnuPG"
+
+#~ msgid ""
+#~ "Open whatever program you usually use for installing software, and search "
+#~ "for GnuPG, then install it. Then restart the Enigmail setup wizard by "
+#~ "going to Enigmail → Setup Wizard."
+#~ msgstr ""
+#~ "打开你常用来安装软件的程序，搜索 GnuPG，并安装它。通过 Enigmail → 安装向"
+#~ "导 来重启 Enigmail 安装向导。"
+
+#~ msgid ""
+#~ "If you're having trouble with our instructions or just want to learn "
+#~ "more, check out <a href=\"https://www.enigmail.net/documentation/"
+#~ "Key_Management#Generating_your_own_key_pair\"> Enigmail's wiki "
+#~ "instructions for key generation</a>."
+#~ msgstr ""
+#~ "如果你对我们的说明有问题或是想了解更多，请访问 <a href=\"https://www."
+#~ "enigmail.net/documentation/Key_Management#Generating_your_own_key_pair"
+#~ "\">Enigmail 对于生成密钥说明的维基页面（英文）</a>。"
+
+#~ msgid "Command line key generation"
+#~ msgstr "使用命令行生成密钥"
+
+#~ msgid "In your email program's menu, select Enigmail → Key Management."
+#~ msgstr "在你的电子邮件程序菜单里，选中 Enigmail → 密钥管理。"
+
+#~ msgid ""
+#~ "Right click on your key and select Upload Public Keys to Keyserver. You "
+#~ "don't have to use the default keyserver. If, after research, you would "
+#~ "like to change to a different default keyserver, you can change that "
+#~ "setting manually in the Enigmail preferences."
+#~ msgstr ""
+#~ "在你的密钥那里右键，选择“上传公钥到密钥服务器”（Upload Public Keys to "
+#~ "Keyserver）。你不必使用默认密钥服务器。如果你对此有研究，想要切换到其他密"
+#~ "钥服务器作为默认选项，你可以在 Enigmail preferences 偏好选项中手动修改设"
+#~ "置。"
+
+#~ msgid "The progress bar never finishes"
+#~ msgstr "进度条一直没有结束"
+
+#~ msgid ""
+#~ "Close the upload popup, make sure you are connected to the Internet, and "
+#~ "try again. If that doesn't work, try again, selecting a different "
+#~ "keyserver."
+#~ msgstr ""
+#~ "关闭上传窗口，确保你已连接上网络，再试一次。如果还不行，则选择其他密钥服务"
+#~ "器。"
+
+#~ msgid "My key doesn't appear in the list"
+#~ msgstr "我的密钥没有显示在列表中"
+
+#~ msgid "Try checking \"Display All Keys by Default.\""
+#~ msgstr "尝试选中“默认显示全部密钥”（Display All Keys by Default）。"
+
+#~ msgid "More documentation"
+#~ msgstr "更多文档"
+
+#~ msgid ""
+#~ "If you're having trouble with our instructions or just want to learn "
+#~ "more, check out <a href=\"https://www.enigmail.net/documentation/"
+#~ "Key_Management#Distributing_your_public_key\"> Enigmail's documentation</"
+#~ "a>."
+#~ msgstr ""
+#~ "如果你对我们的指南有困难，或仅仅是想了解更多，请查看 <a href=\"https://"
+#~ "www.enigmail.net/documentation/Key_Management#Distributing_your_public_key"
+#~ "\">Enigmail 文档（英文）</a>。"
+
+#~ msgid "Uploading a key from the command line"
+#~ msgstr "使用命令行上传公钥"
+
+#~ msgid ""
+#~ "The lock icon in the top left should be yellow, meaning encryption is "
+#~ "turned on. We want this first special message to be unencrypted, so click "
+#~ "the icon once to turn it off. The lock should become grey, with a blue "
+#~ "dot on it (to alert you that the setting has been changed from the "
+#~ "default). Once encryption is off, hit Send."
+#~ msgstr ""
+#~ "左上方的锁形图标应当是黄色的，这意味着加密已经启用。我们需要这第一封特别的"
+#~ "邮件是未经加密的，因此需要单击图标让它关闭。此时锁形图标会变成灰色，并带有"
+#~ "小蓝点（以提醒你默认设置已发生改变）。加密关闭后，点击发送。"
+
+#~ msgid ""
+#~ "The lock icon in the top left of the window should be yellow, meaning "
+#~ "encryption is on. This will be your default from now on."
+#~ msgstr ""
+#~ "窗口左上放的锁形图标应当是黄色的，这意味着加密已启用。这会是你今后的默认设"
+#~ "置。"
+
+#~ msgid ""
+#~ "Next to the lock, you'll notice an icon of a pencil. We'll get to this in "
+#~ "a moment."
+#~ msgstr "你会注意紧挨着锁形的铅笔图标。我们马上就会用到它。"
+
+#~ msgid ""
+#~ "To encrypt an email to Edward, you need his public key, so now you'll "
+#~ "have Enigmail download it from a keyserver. Click Download Missing Keys "
+#~ "and use the default in the pop-up that asks you to choose a keyserver. "
+#~ "Once it finds keys, check the first one (Key ID starting with C), then "
+#~ "select ok. Select ok in the next pop-up."
+#~ msgstr ""
+#~ "要给爱德华发送加密邮件，你需要他的公钥，接下来你要 Enigmail 从密钥服务器"
+#~ "下载它。点击“下载缺失的密钥”，并使用默认的密钥服务器。一旦它找到公钥后，选"
+#~ "择第一支密钥（以 C 开头的 Key ID），并确定。在下一个弹窗中选择确定。"
+
+#~ msgid ""
+#~ "Now you are back at the \"Recipients not valid, not trusted or not found"
+#~ "\" screen. Check the box in front of Edward's key and click Send."
+#~ msgstr ""
+#~ "现在你返回“收件人不合法，不受信任或未找到”界面，查看爱德华公钥的窗口，点击"
+#~ "发送。"
+
+#~ msgid ""
+#~ "If you're still having trouble with our instructions or just want to "
+#~ "learn more, check out <a href=\"https://www.enigmail.net/documentation/"
+#~ "Signature_and_Encryption#Encrypting_a_message\"> Enigmail's wiki</a>."
+#~ msgstr ""
+#~ "如果你仍对我们的说明感到困惑，或想了解更多，请查阅 <a href=\"https://www."
+#~ "enigmail.net/documentation/Signature_and_Encryption#Encrypting_a_message"
+#~ "\">Enigmail's wiki（英文）</a>。"
+
+#~ msgid ""
+#~ "With the lock and pencil icons, you can choose whether each message will "
+#~ "be encrypted, signed, both, or neither."
+#~ msgstr ""
+#~ "锁形和铅笔图标能够让你对每封消息选择加密、签名、两者都要或者都不要。"
+
+#~ msgid ""
+#~ "Notice the bar that Enigmail shows you above the message, with "
+#~ "information about the status of Edward's key."
+#~ msgstr "留意消息上方的通知条，它会显示爱德华公钥状态的信息。"
+
+#~ msgid "Section 4: Web of Trust"
+#~ msgstr "Section 4: 信任网"
+
+#~ msgid "In your email program's menu, go to Enigmail → Key Management."
+#~ msgstr "在邮件程序菜单中，选择 Enigmail → 密钥管理。"
+
+#~ msgid ""
+#~ "Right click on Edward's public key and select Sign Key from the context "
+#~ "menu."
+#~ msgstr "爱德华公钥处右键，在上下文菜单中选中“签署密钥”。"
+
+#~ msgid ""
+#~ "In the window that pops up, select \"I will not answer\" and click ok."
+#~ msgstr "在弹窗中，选中“我不会回应”并点击确定。"
+
+#~ msgid ""
+#~ "Now you should be back at the Key Management menu. Select Keyserver "
+#~ "→ Upload Public Keys and hit ok."
+#~ msgstr ""
+#~ "现在你返回 密钥管理 菜单。选择 密钥服务器 → 上传公钥 并点击确定。"
+
+#~ msgid "Set ownertrust"
+#~ msgstr "设置信任级"
+
+#~ msgid ""
+#~ "If you trust someone enough to validate other people's keys, you can "
+#~ "assign them an ownertrust level through Enigmails's key management "
+#~ "window. Right click on the other person's key, go to the \"Select Owner "
+#~ "Trust\" menu option, select the trustlevel and click OK. Only do this "
+#~ "once you feel you have a deep understanding of the Web of Trust."
+#~ msgstr ""
+#~ "如果你对某人的信任足够验证其他人的密钥，你可以在 Enigmail 的 密钥管理 窗口"
+#~ "中，为他们指派一个信任级（ownertrust）级别。在其他人密钥处右键，选中“选择"
+#~ "信任级”（Select Owner Trust）菜单选项，选择信任级，并点击确定。在充分理解"
+#~ "信任网的前提下，完成这一步。"
+
+#~ msgid "<a href=\"index.html\">GNU/Linux</a>"
+#~ msgstr "<a href=\"index.html\">GNU/Linux</a>"
+
+#~ msgid "<a href=\"mac.html\" class=\"current\">Mac OS</a>"
+#~ msgstr "<a href=\"mac.html\" class=\"current\">Mac OS</a>"
+
+#~ msgid ""
+#~ "This guide relies on software which is <a href=\"https://www.gnu.org/"
+#~ "philosophy/free-sw.html\">freely licensed</a>; it's completely "
+#~ "transparent and anyone can copy it or make their own version. This makes "
+#~ "it safer from surveillance than proprietary software (like Windows or Mac "
+#~ "OS). To defend your freedom as well as protect yourself from "
+#~ "surveillance, we recommend you switch to a free software operating system "
+#~ "like GNU/Linux. Learn more about free software at <a href=\"https://u.fsf."
+#~ "org/ys\">fsf.org</a>."
+#~ msgstr ""
+#~ "本指南需要安装 <a href=\"https://www.gnu.org/philosophy/free-sw.zh-cn.html"
+#~ "\">自由许可的</a> 软件；它是完全透明的，任何人都可以复制它，并制作自己的版"
+#~ "本。这使得它比专有软件（比如 Windows 和 Mac OS）更难受到监控。为了你免受监"
+#~ "控，我们推荐你换用像 GNU/Linux 这样的自由软件操作系统。你可以在 <a href="
+#~ "\"https://u.fsf.org/ys\">fsf.org</a> 上了解更多有关自由软件的信息。"
+
+#~ msgid ""
+#~ "To get started, you'll need the IceDove desktop email program installed "
+#~ "on your computer. For your system, IceDove may be known by the alternate "
+#~ "name \"Thunderbird.\" Email programs are another way to access the same "
+#~ "email accounts you can access in a browser (like Gmail), but provide "
+#~ "extra features."
+#~ msgstr ""
+#~ "在开始之前，你需要安装 IceDove 邮件程序。对于你的操作系统来说，IceDove 可"
+#~ "能以其别名 Thunderbird 存在于你的系统。电子邮件程序是另一种访问邮箱账号的"
+#~ "途径（你也可以像 Gmail 那样通过浏览器访问），但它提供了更多的功能。"
+
+#~ msgid "<em>Step 1.b</em> Get GnuPG by downloading GPGTools"
+#~ msgstr "<em>Step 1.b</em> 下载 GPGTools 来使用 GnuPG"
+
+#~ msgid ""
+#~ "GPGTools is a software package that includes GnuPG. <a href=\"https://"
+#~ "gpgtools.org/#gpgsuite\">Download</a> and install it, choosing default "
+#~ "options whenever asked. After it's installed, you can close any windows "
+#~ "that it creates."
+#~ msgstr ""
+#~ "GPGTools 是一个包含了 GnuPG 的软件包。<a href=\"https://gpgtools.org/"
+#~ "#gpgsuite\">下载</a> 并安装它，无论提示什么都选择默认选项。安装完成后关闭"
+#~ "窗口。"
+
+#~ msgid ""
+#~ "There are major security flaws in versions of GnuPG provided by GPGTools "
+#~ "prior to 2018.3. Make sure you have GPGTools 2018.3 or later."
+#~ msgstr ""
+#~ "由于 GPGTools 2018.3 前的版本存在重大安全漏洞，请确保安装的是 GPGTools "
+#~ "2018.3 及其之后的版本。"
+
+#~ msgid "Step 1.C: Tools -> Add-ons"
+#~ msgstr "Step 1.C: 工具 -> 附加组件"
+
+#~ msgid "Step 1.C: Search Add-ons"
+#~ msgstr "Step 1.C: 搜索附加组件"
+
+#~ msgid "Step 1.C: Install Add-ons"
+#~ msgstr "Step 1.C: 安装附加组件"
+
+#~ msgid "<em>Step 1.c</em> Install the Enigmail plugin for your email program"
+#~ msgstr "<em>Step 1.c</em> 给电子邮件程序安装 ENIGMAIL 插件"
+
+#~ msgid ""
+#~ "There are major security flaws in Enigmail prior to version 2.0.7. Make "
+#~ "sure you have Enigmail 2.0.7 or later."
+#~ msgstr ""
+#~ "在 Enigmail 2.0.7 前的版本存在重大安全漏洞。请确保安装的是 Enigmail 2.0.7 "
+#~ "及其之后的版本。"
+
+#~ msgid ""
+#~ "For greater security against potential attacks, you can turn off HTML. "
+#~ "Instead, you can render the message body as plain text."
+#~ msgstr "出于安全原因，你可以关闭 HTML 格式，而使用纯文本渲染消息主题。"
+
+#~ msgid "<a href=\"windows.html\" class=\"current\">Windows</a>"
+#~ msgstr "<a href=\"windows.html\" class=\"current\">Windows</a>"
+
+#~ msgid ""
+#~ "There are major security flaws in versions of GnuPG provided by GPG4Win "
+#~ "prior to 3.1.2. Make sure you have GPG4Win 3.1.2 or later."
+#~ msgstr ""
+#~ "在 GPG4Win 3.1.2 前的版本存在重大安全漏洞。请确保安装的是 GPG4Win 3.1.2 及"
+#~ "其之后的版本。"
+
+#~ msgid "Email Self-Defense - Teach your friends!"
+#~ msgstr "电子邮件加密指南 - 研讨会"
+
+#~ msgid ""
+#~ "Right click on your key and select Upload Public Keys to Keyserver. Use "
+#~ "the default keyserver in the popup."
+#~ msgstr ""
+#~ "在你的密钥那里右键，选择“上传公钥到密钥服务器”（Upload Public Keys to "
+#~ "Keyserver）。使用弹窗中默认的密钥服务器。"
+
+#~ msgid ""
+#~ "If you're having trouble with our instructions or just want to learn "
+#~ "more, check out <a href=\"https://www.enigmail.net/index.php/en/"
+#~ "documentation\"> Enigmail's documentation</a>."
+#~ msgstr ""
+#~ "如果你对我们的指南有困难，或仅仅是想了解更多，请查看 <a href=\"https://"
+#~ "www.enigmail.net/index.php/en/documentation\">Enigmail 文档（英文）</a>。"
#~ msgid ""
#~ "Note: As of June 18, 2018, GnuPG 2.2.8 is unavailable for Debian stable "
projects / enc.git / blobdiff