From 7c7274fdde23d1128ff6cb707cbb51d8fbc34fd6 Mon Sep 17 00:00:00 2001 From: Tom Date: Tue, 13 Aug 2019 06:10:25 +0800 Subject: [PATCH] Revert "zh-hans: update translation." This reverts commit 4a0109afc110b10159f8176fb32032d8263ad9c5. --- esd-zh-hans.po | 31 ++++++++++++++++++++++--------- zh-hans/index.html | 20 +++++++++++--------- zh-hans/mac.html | 9 +++++---- zh-hans/windows.html | 9 +++++---- zh-hans/workshops.html | 7 ++++--- 5 files changed, 47 insertions(+), 29 deletions(-) diff --git a/esd-zh-hans.po b/esd-zh-hans.po index 4e00057b..39b7a8a4 100644 --- a/esd-zh-hans.po +++ b/esd-zh-hans.po @@ -7,7 +7,7 @@ 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" +"PO-Revision-Date: 2019-08-09 23:47+0800\n" "Last-Translator: Tom \n" "Language-Team: \n" "Language: zh_CN\n" @@ -756,8 +756,8 @@ msgid "" "for GnuPG, then install it. Then restart the Enigmail setup wizard by going " "to Enigmail → Setup Wizard." msgstr "" -"打开你常用来安装软件的程序，搜索 GnuPG，并安装它。通过 Enigmail → 安装向导 来" -"重启 Enigmail 安装向导。" +"打开你常用来安装软件的程序，搜索 GnuPG，并安装它。通过 Enigmail → Setup " +"Wizard 来重启 Enigmail 安装向导。" #. type: Content of:
msgid "More resources" @@ -1135,12 +1135,19 @@ msgstr "" msgid "Step 3.c Receive a response" msgstr "Step 3.c 接收回信" -# || No change detected. The change might only be in amounts of spaces. #. type: Content of:

+# || No change detected. The change might only be in amounts of spaces. +#, fuzzy +#| 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 Step 3.A) to encrypt his reply to you." msgid "" "When Edward receives your email, he will use his private key to decrypt it, " "then reply to you." -msgstr "当爱德华收到你的邮件，他会使用他的私钥解密消息，并给你回复。" +msgstr "" +"当爱德华收到你的邮件，他会使用他的私钥去解密消息，下面使用你的公钥（你在 Step 3.A 发给他了）加密他给你的回复。" #. type: Content of:

msgid "" @@ -1200,15 +1207,21 @@ msgstr "锁形和铅笔图标能够让你对每封消息选择加密、签名、 msgid "Step 3.e Receive a response" msgstr "Step 3.e 接收回信" -# || No change detected. The change might only be in amounts of spaces. #. type: Content of:

+# || No change detected. The change might only be in amounts of spaces. +#, fuzzy +#| msgid "" +#| "When Edward receives your email, he will use your public key (which you " +#| "sent him in Step 3.A) to verify that your " +#| "signature is authentic and the message you sent has not been tampered " +#| "with." msgid "" "When Edward receives your email, he will use your public key (which you sent " "him in Step 3.A) to verify the message you sent has " "not been tampered with and to encrypt his reply to you." msgstr "" "当爱德华收到你的邮件，他将会使用你的公钥（你在 Step 3." -"A 发给他了）验证你发送的消息未经篡改，并以加密形式给你回复。" +"A 发给他了）去验证你签名的真实性，以及你发送的消息未经篡改。" #. type: Content of:

msgid "" @@ -2302,8 +2315,8 @@ msgid "" "Affero General Public License. Why these licenses?" msgstr "" -"简体中文由 何旭鑫 <hexuxin@foxmail.com> 完成翻译。

此页面上的图片" -"采用 知识共享 署名 " +"简体中文由 Tom <hexuxin@foxmail.com> 完成翻译。

此页面上的图片采" +"用 知识共享 署名 " "4.0 许可协议（或较新版本） 进行许可，其余部分以 知识共享 署名-相同方式 4.0 许可协议" "（或较新版本） 进行许可。下载

  • svenska - v4.0
  • Türkçe - v4.0
  • 简体中文 - v4.0
    • -
  • -Translate!
    • +
  • Translate!
    • @@ -618,16 +624,12 @@ GnuPG，他们仍将有能力阅读你的消息并查看你的签名。如果他

    Step 3.e 接收回信

    当爱德华收到你的邮件，他将会使用你的公钥（你在 Step 3.A -发给他了）验证你发送的消息未经篡改，并以加密形式给你回复。

    +发给他了）去验证你签名的真实性，以及你发送的消息未经篡改。

    爱德华可能需要两三分钟回复邮件。在这期间，你可以跳过前面的部分并查阅本指南 善用加密 章节。

    爱德华的回复会是加密的，因为他能加密就加密。如果一切顺利，他会回复“你的签名已被验证”。如果你的测试签名邮件也是加密的，他会优先提及。

    -

    当你接收爱德华的邮件并打开它时，Enigmail 会自动检测它是否使用你的公钥加密的，接下来使用你的私钥解密消息。

    - -

    留意消息上方的通知条，它会显示爱德华公钥状态的信息。

    -
    diff --git a/zh-hans/mac.html b/zh-hans/mac.html index 8c57032e..07d931d1 100644 --- a/zh-hans/mac.html +++ b/zh-hans/mac.html @@ -42,8 +42,9 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
  • svenska - v4.0
  • Türkçe - v4.0
  • 简体中文 - v4.0
    • -
  • -Translate!
    • +
  • Translate!