#
msgid ""
msgstr ""
-"Project-Id-Version: emailselfdefense ersion\n"
-"POT-Creation-Date: 2019-08-10 22:30+0800\n"
-"PO-Revision-Date: 2019-08-10 23:23+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"
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 ""
-"简体中文由 Tom <hexuxin@foxmail.com> 完成翻译。</p><p>此页面上的图片采"
-"用 <a href=\"https://creativecommons.org/licenses/by/4.0/\">知识共享 署名 "
-"
4.0 许可协议（或较新版本）</a> 进行许可，其余部分以 <a href=\"https://"
+"简体中文由 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 <"
-"
sudoman@ninthfloor.org> 和 Josh Drake <zamnedix@gnu.org> 编写的 <a "
+"
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."
"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\">čeština - v4.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>"
"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>
"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"
"\"https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-"
"cant-guess/\"> this article</a> by Micah Lee."
msgstr ""
-"å\9c¨â\80\9cç\94\9fæ\88\90å¯\86é\92¥â\80\9dç\95\8cé\9d¢ã\80\82å\8f\96ä¸\80个强å\81¥的密码吧！你可以自行取密码，也可以使用 Diceware "
+"å\9c¨â\80\9cç\94\9fæ\88\90å¯\86é\92¥â\80\9dç\95\8cé\9d¢ã\80\82å\8f\96ä¸\80个强壮的密码吧！你可以自行取密码，也可以使用 Diceware "
"模式。自己取密码虽然快捷，但不安全。使用 Diceware 需要更长时间，并要求掷骰"
"子，但它能生成攻击者难以辨识出的密码。要使用它，请阅读 Micah Lee 写的 <a "
"href=\"https://theintercept.com/2015/03/26/passphrases-can-memorize-"
"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 ""
#. 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 "<em>Step 3.c</em> Receive a response"
msgstr "<em>Step 3.c</em> 接收回信"
-# || No change detected. The change might only be in amounts of spaces.
#. 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 reply to you."
-msgstr "当爱德华收到你的邮件，他会使用他的私钥解密消息，并给你回复。"
+msgstr "当爱德华收到你的邮件，他会使用他的私钥去解密消息，并给你回复。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
msgid "<em>Step 3.e</em> Receive a response"
msgstr "<em>Step 3.e</em> 接收回信"
-# || No change detected. The change might only be in amounts of spaces.
#. 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 "
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."
+"如果你丢失了私钥或是有人得到了它（比如你的计算机被偷或者被入侵）。在其他人使"
+"用你私钥阅读你的加密邮件或是伪造签名前，立即吊销它显得格外重要。本指南不包含"
+"如何吊销密钥，但你可以遵循这些 <a href=\"https://www.hackdiary."
"com/2004/01/18/revoking-a-gpg-key/\">指示（英文）</a>。在你吊销完成后，生成新"
"的密钥对，并给所有使用你的密钥的人发送邮件，并附上新密钥的拷贝，确保他们知道"
"发生了什么。"
"在 Enigmail 2.0.7 前的版本存在重大安全漏洞。请确保安装的是 Enigmail 2.0.7 及"
"其之后的版本。"
-#. 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 "
-"any circumstances.</span>"
-msgstr ""
-"你的私钥更像是现实中的钥匙，你需要自行保管它（在你的计算机中）。你使用 GnuPG "
-"和你的私钥来解密他人发给你的加密邮件。<span style=\"font-weight: bold;\">无论"
-"如何，你都不应该向他人分享你的私钥。</span>"
-
#. 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: 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> 发给他了）加密他给你的回复。"
-
-#. 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."
-msgstr ""
-"当爱德华收到你的邮件，他将会使用你的公钥（你在 <a href=\"#step-3a\">Step 3."
-"A</a> 发给他了）去验证你签名的真实性，以及你发送的消息未经篡改。"
-
#. type: Content of: <html><body><header><div><h1>
msgid "Great job!"
msgstr "很不错！"
#. 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/"
+"
Mastodon 要胜于 Twitter（英文）</a>，以及 <a href=\"http://www.fsf.org/"
"facebook\">为什么我们不使用 Facebook（英文）</a>。</small>"
#. type: Content of: <html><body><section><div><div><div><div><p>
"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=\"https://www.gnu.org/distros/free-distros.zh-cn.html\">推"
"荐的 GNU/Linux 发行版</a>。"
"在 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>"
"如果你有任何对本指南的建议，请来信 <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 ""
-"简体中文由 何旭鑫 <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 <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 "
projects / enc.git / blobdiff