#
msgid ""
msgstr ""
-"Project-Id-Version: emailselfdefense ersion\n"
-"POT-Creation-Date: 2019-03-19 23:41+0800\n"
-"PO-Revision-Date: 2019-04-17 23:26+0800\n"
+"Project-Id-Version: emailselfdefense 4.0\n"
+"POT-Creation-Date: 2020-06-25 15:47+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"
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>"
"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 "
+"简体中文由 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."
"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 ""
"Infographic and guide design by <a rel=\"external\" href=\"http://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++"
#. type: Content of: <html><body><header><div><ul><li>
msgid "<a href=\"/ar\">العربية <span class=\"tip\">tip</span></a>"
-msgstr ""
+msgstr "<a href=\"/ar\">العربية <span class=\"tip\">tip</span></a>"
#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/cs\">Ä\8ceština - v4.0</a>"
-msgstr "<a href=\"/cs\">Ä\8ceština - v4.0</a>"
+msgid "<a href=\"/cs\">Ä\8deština - v4.0</a>"
+msgstr "<a href=\"/cs\">Ä\8deš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>"
+msgid "<a href=\"/de\">Deutsch - v4.0</a>"
+msgstr "<a href=\"/de\">Deutsch - v4.0</a>"
#. type: Content of: <html><body><header><div><ul><li>
msgid "<a href=\"/el\">ελληνικά - v3.0</a>"
#. type: Content of: <html><body><header><div><ul><li>
msgid "<a href=\"/ko\">한국어 <span class=\"tip\">tip</span></a>"
-msgstr ""
+msgstr "<a href=\"/ko\">한국어 <span class=\"tip\">tip</span></a>"
#. type: Content of: <html><body><header><div><ul><li>
msgid "<a href=\"/ml\">മലയാളം <span class=\"tip\">tip</span></a>"
-msgstr ""
+msgstr "<a href=\"/ml\">മലയാളം <span class=\"tip\">tip</span></a>"
#. type: Content of: <html><body><header><div><ul><li>
msgid "<a href=\"/pt-br\">português do Brasil - v3.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>"
+msgid "<a href=\"/zh-hans\">简体中文 - v4.0</a>"
+msgstr "<a class=\"current\" href=\"/zh-hans\">简体中文 - v4.0</a>"
#. 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>"
"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"
"surveillance than proprietary software (like Windows). 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 ""
"expert on these security systems."
msgstr ""
"在配置你的账号时，留意服务器右侧的 SSL, TLS 或 STARTTLS 字样。如果你没有看到"
-"他们，你仍将有能力使用加密，但这意味着运行邮件系统的人以低于行业标准的规范保"
-"护着你的安全与隐私。我们建议你，向他们发送一份友好的邮件，要求他们为邮件服务"
-"器启用 SSL, TLS 或 STARTTLS。他们会知道你说的是什么，如果你不是系统安全的专"
+"他们，你仍有能力使用加密，但这意味着运行邮件系统的人以低于行业标准的规范保护"
+"着你的安全与隐私。我们建议你向他们发送一封友好的邮件，要求他们为邮件服务器启"
+"用 SSL, TLS 或 STARTTLS。他们会明白你说的是什么；如果你不是系统安全领域的专"
"家，这是一个值得的请求。"
#. type: Content of: <html><body><section><div><div><div><div><h4>
"take it from here. Restart your email program when you're done."
msgstr ""
"如果没有，在右上方的搜索框里搜索“Enigmail”。你可以在这里获取到它。安装完成后"
-"重启邮件程序。"
+"重启程序。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"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 前的版本存在重大安全漏洞，请确保安装的是 "
"GnuPG 2.2.8 和 Engmail 2.0.7 及其之后的版本。"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
"key when you select compose. You can then write an email as if Enigmail "
"wasn't there."
msgstr ""
-"Enigmail 往往不能在 HTML 格式（它是一种常见的邮件格式）里表现的很好，所以它会"
+"Enigmail 往往不能在 HTML 格式（它是一种常见的邮件格式）里显示的很好，所以它会"
"自动禁用 HTML 格式。要想发送不加密或不带签名的 HTML 格式邮件，单击“撰写消"
-"息”（compose）时按住 Shift 键，你就可以撰写邮件，仿佛 Enigmail 不存在一样。"
+"息”（compose）时按住 Shift 键，现在你可以像 Enigmail 不存在一样撰写邮件了 。"
#. type: Content of: <html><body><section><div><div><h2>
msgid "<em>#2</em> Make your keys"
"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 "
"recognizable patterns, such as birthdays, telephone numbers, pets' names, "
"song lyrics, quotes from books, and so on."
msgstr ""
-"如果你喜欢自己取密码，想一个你记得起的至少十二字符长的东西，至少包含一个小写"
-"和一个大写字母，和一个数字或标点符号。永远不要使用你在其他地方使用过的密码。"
-"不用使用任何可辨认的规律，诸如生日、电话号码、宠物名字、歌词或书中的名言。"
+"如果你喜欢自己取密码，想一个能记住的至少十二字符长的东西，至少包含一个小写和"
+"一个大写字母，和一个数字或标点符号。永远不要使用你在其他地方使用过的密码。不"
+"用使用任何可辨认的规律，诸如生日、电话号码、宠物名字、歌词或书中的名言。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"for GnuPG, then install it. Then restart the Enigmail setup wizard by going "
"to Enigmail → Setup Wizard."
msgstr ""
-"打开你常用来安装软件的程序，搜索 GnuPG，并安装它。通过 Enigmail → Setup "
-"Wizard 来重启 Enigmail 安装向导。"
+"打开你常用来安装软件的程序，搜索 GnuPG，并安装它。通过 Enigmail → 安装向导 来"
+"重启 Enigmail 安装向导。"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "More resources"
#. 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/"
+"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://enigmail."
-"wiki/Key_Management#Generating_your_own_key_pair\">Enigmain 对于生成密钥说明"
-"的维基页面</a>。"
+"如果你对我们的说明有问题或是想了解更多，请访问 <a href=\"https://www."
+"enigmail.net/documentation/Key_Management#Generating_your_own_key_pair"
+"\">Enigmail 对于生成密钥说明的维基页面（英文）</a>。"
#. type: Content of: <html><body><section><div><div><div><div><h4>
msgid "Advanced"
#. 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."
+"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）。使用弹窗中默认的密钥服务器。"
+"Keyserver）。你不必使用默认密钥服务器。如果你对此有研究，想要切换到其他密钥服"
+"务器作为默认选项，你可以在 Enigmail preferences 偏好选项中手动修改设置。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
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>
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>."
+"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/index.php/en/documentation\">Enigmail 文档</a>。"
+"enigmail.net/documentation/Key_Management#Distributing_your_public_key"
+"\">Enigmail 文档（英文）</a>。"
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "Uploading a key from the command line"
"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 的计算机程序进行通信，它掌握了如何加密。除非另有"
-"说明，你与真人通信时也遵循同样的步骤。"
+"现在你将要尝试与名为爱德华（Edward）的计算机程序进行通信，它掌握了如何加密。"
+"除非另有说明，你与真人通信时也遵循同样的步骤。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "<em>Step 3.a</em> Send Edward your public key"
"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>
"\" or something similar and write something in the body."
msgstr ""
"在你的邮件程序中写一封新的邮件，收信人地址填写 <a href=\"mailto:edward-"
-"en@fsf.org\">edward-en@fsf.org</a>。在主题中填写“加密测试”或类似的词语，并在"
+"zh@fsf.org\">edward-zh@fsf.org</a>。在主题中填写“加密测试”或类似的词语，并在"
"正文中写一些内容。"
#. type: Content of: <html><body><section><div><div><div><p>
#. 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/"
+"more, check out <a href=\"https://www.enigmail.net/documentation/"
"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>。"
+"如果你仍对我们的说明感到困惑，或想了解更多，请查阅 <a href=\"https://www."
+"enigmail.net/documentation/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"
#. type: Content of: <html><body><section><div><div><div><p>
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> 发给他了）加密他给你的回复。"
+"then reply to you."
+msgstr "当爱德华收到你的邮件，他会使用他的私钥去解密消息，并给你回复。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"爱德华可能需要两三分钟回复邮件。在这期间，你可以跳过前面的部分并查阅本指南 "
"<a href=\"#section5\">善用加密</a> 章节。"
-#. 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."
-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 "留意消息上方的通知条，它会显示爱德华公钥状态的信息。"
-
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "<em>Step 3.d</em> Send a test signed email"
msgstr "<em>Step 3.d</em> 发送一封测试签名邮件"
#. type: Content of: <html><body><section><div><div><div><p>
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 his 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>
+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."
+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 "留意消息上方的通知条，它会显示爱德华公钥状态的信息。"
+
#. type: Content of: <html><body><section><div><div><h2>
msgid "<em>#4</em> Learn the Web of Trust"
msgstr "<em>#4</em> 了解信任网"
msgstr ""
"你可能已经看到有人使用短 key ID 表示公钥。密钥管理 窗口中，你可以直接看到 "
"key ID。这八位字符曾经用于表示身份，现已经不再安全可靠。你需要检查完整的指"
-"纹，以验证你拥有通信对方正确的密钥。不幸的是，被有意生成两个指纹后八位字符相"
-"同的密钥，这种冒充是很常见的。"
+"纹，以验证你拥有通信对方正确的密钥。不幸的是，有人故意生成的后六位指纹与另一"
+"支密钥相同的密钥，这种伪造是很常见的。"
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "<em>Important:</em> What to consider when signing keys"
"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?\""
+"verified that the key you are about to sign actually belongs to the person"
+"(s) named above?\""
msgstr ""
"在签署密钥前，你需要严格确认密钥是属于他的，的确是他自己所声称的那个人。这种"
"确信来自逐步地沟通交流，以及目睹了他与其他人的交流过程。任何时候签署密钥都应"
"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>
"email to everyone with whom you usually use your key to make sure they know, "
"including a copy of your new key."
msgstr ""
-"如果你丢失了私钥或是有人得到了它（这是说，你的计算机被偷或者被入侵）。在其他"
-"人使用你私钥阅读你的加密邮件或是伪造签名前，立即吊销它显得格外重要。本指南不"
-"å
\8c\85å\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"
"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）更难受到监控。为了你免受监控，我们推荐你"
-"æ\8d¢ç\94¨å\83\8f GNU/Linux è¿\99æ ·ç\9a\84è\87ªç\94±è½¯ä»¶æ\93\8dä½\9cç³»ç»\9fã\80\82ä½ å\8f¯ä»¥å\9c¨ <a href=\"https://u.fsf."
-"org/ys\">fsf.org</a> 上了解更多有关自由软件的信息。"
+"本指南需要安装 <a href=\"https://www.gnu.org/philosophy/free-sw.zh-cn.html\">"
+"自由许可的</a> 软件；它是完全透明的，任何人都可以复制它，并制作自己的版本。这"
+"使得它比专有软件（比如 Windows 和 Mac OS）更难受到监控。为了你免受监控，我们"
+"æ\8e¨è\8d\90ä½ æ\8d¢ç\94¨å\83\8f GNU/Linux è¿\99æ ·ç\9a\84è\87ªç\94±è½¯ä»¶æ\93\8dä½\9cç³»ç»\9fã\80\82ä½ å\8f¯ä»¥å\9c¨ <a href=\"https://u."
+"fsf.org/ys\">fsf.org</a> 上了解更多有关自由软件的信息。"
#. type: Content of: <html><body><section><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 "
-"及其之后的版本。"
+"由于 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"
#. type: Content of: <html><body><section><div><div><div><p>
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=\"http://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"
"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>。"
+"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>
msgid ""
"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>"
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"
"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"
"在 GPG4Win 3.1.2 前的版本存在重大安全漏洞。请确保安装的是 GPG4Win 3.1.2 及其"
"之后的版本。"
-#. type: Content of: <html><head><title>
-msgid "Email Self-Defense - Teach your friends!"
-msgstr "电子邮件加密指南 - 研讨会"
-
#. 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>"
"\">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"
"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 "
+"\"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."
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 "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 ""
+#~ "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>"
+#~ 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>"
+
+#~ 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