msgid ""
msgstr ""
"Project-Id-Version: emailselfdefense 4.0\n"
-"POT-Creation-Date: 2021-07-27 17:58+0200\n"
+"POT-Creation-Date: 2021-08-12 17:19+0200\n"
"PO-Revision-Date: 2020-05-20 15:02+0800\n"
"Last-Translator: Tom <hexuxin@foxmail.com>\n"
"Language-Team: \n"
msgstr "电子邮件加密指南 - 使用 GnuPG 加密对抗大规模监控"
#. type: Attribute 'content' of: <html><head><meta>
-# | GnuPG, GPG, openpgp, {+encryption,+} surveillance, privacy, email, Enigmail
+# | GnuPG, GPG, openpgp, surveillance, privacy, email, [-Enigmail-]
+# | {+security, GnuPG2, encryption+}
#, fuzzy
#| msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
-msgid "GnuPG, GPG, openpgp, encryption, surveillance, privacy, email, Enigmail"
+msgid ""
+"GnuPG, GPG, openpgp, surveillance, privacy, email, security, GnuPG2, "
+"encryption"
msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
#. 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 "
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 "电子邮件加密指南"
msgstr "<a href=\"/en\">English - v4.0</a>"
#. type: Content of: <html><body><header><div><ul><li>
-# | <a href=\"/tr\">Türkçe - v[-4-]{+5+}.0</a>
+# | [-<a-]{+<strong><a+}
+# | href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide\">
+# | [-<strong><span style=\"color: #2F5FAA;\">Translate!</span></strong></a>-]
+# | {+Translate!</a></strong>+}
#, fuzzy
-#| msgid "<a href=\"/tr\">Türkçe - v4.0</a>"
-msgid "<a href=\"/tr\">Türkçe - v5.0</a>"
-msgstr "<a href=\"/tr\">Türkçe - 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>"
msgid ""
-"<a href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide\"> "
-"<strong><span style=\"color: #2F5FAA;\">Translate!</span></strong></a>"
+"<strong><a href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide"
+"\"> Translate!</a></strong>"
msgstr ""
"<a href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide\"> "
"<strong><span style=\"color: #2F5FAA;\">Translate!</span></strong></a>"
"了，它可能是以别名 Thunderbird 出现在你的计算机中。电子邮件程序是另一种访问邮"
"箱账号的途径（你也可以像 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="
-"\"#section2\">Step 2</a>."
-msgstr ""
-"如果你已经有了电子邮件程序，你可以跳至 <a href=\"#step-1b\">Step 1.b</a>。"
-
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
msgid "Step 1.A: Install Wizard"
msgstr "Step 1.A: 安装向导"
"</a> 上告诉我们。"
#. type: Content of: <html><body><section><div><div><div><h3>
-# | <em>Step 1.b</em> Get {+your terminal ready and install+} GnuPG [-by
-# | downloading GPG4Win-]
+# | <em>Step 1.b</em> [-Get-] {+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"
+msgid "<em>Step 1.b</em> 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>.+}
+# | [-href=\"#step-1b\">Step 1.b</a>.-] {+href=\"#section2\">Section 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 are using a GNU/Linux machine, you should already have GnuPG "
-"installed, and you can skip to <a href=\"#section2\">Step 2</a>."
+"installed, and you can skip to <a href=\"#section2\">Section 2</a>."
msgstr ""
"如果你已经有了电子邮件程序，你可以跳至 <a href=\"#step-1b\">Step 1.b</a>。"
msgid ""
"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."
+"instructions. For the rest of this guide, the steps are the same for all "
+"operating systems."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><h4>
-msgid "MacOS"
+msgid "macOS"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "Use a third-party package manager to install GnuPG"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
msgid ""
-"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)."
+"The default macOS package manager makes it difficult to install GnuPG and "
+"other pieces of free software (like Emacs, GIMP, or Inkscape). To make "
+"things easier, we recommend setting up the third-party package manager "
+"\"Homebrew\" to install GnuPG. For this, we will use a program called "
+"\"Terminal,\" which is pre-installed on macOS."
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
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."
+"# Copy the first command on the home page of <a href=\"https://brew.sh/"
+"\">Homebrew</a> by clicking on the clipboard icon, and paste it in Terminal. "
+"Click \"Enter\" and wait for the installation 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:"
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+msgid "# Then install GnuPG 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."
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+msgid "<code>brew install gnupg gnupg2</code>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><h4>
"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><p>
+# | 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-] {+<strong>You+} should never share your
+# | private key with anyone, under any [-circumstances.</span>-]
+# | {+circumstances.</strong>+}
+#, fuzzy
+#| 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 your private key with "
+#| "anyone, under any circumstances.</span>"
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 your private key with anyone, under "
-"any circumstances.</span>"
+"descramble encrypted emails other people send to you. <strong>You should "
+"never share your private key with anyone, under any circumstances.</strong>"
msgstr ""
"你的私钥更像是现实中的钥匙，你需要自行保管它（在你的计算机中）。你使用 GnuPG "
"和你的私钥来解密他人发给你的加密邮件。<span style=\"font-weight: bold;\">无论"
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>
+#. type: Content of: <html><body><section><div><div><div><h4>
# | [-<em>#2</em>-]Make your [-keys-] {+keypair+}
#, fuzzy
#| msgid "<em>#2</em> Make your keys"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"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:"
+"We will use the command line in a terminal to create a keypair using the "
+"GnuPG program."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"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."
+"Whether on GNU/Linux, macOS or Windows, you can launch your terminal "
+"(\"Terminal\" in macOS, \"PowerShell\" in Windows) from the Applications "
+"menu (some GNU/Linux systems respond to the <kbd>Ctrl + Alt + T</kbd> "
+"shortcut)."
msgstr ""
#. 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."
+msgid "# Enter <code>gpg --full-generate-key</code> to start the process."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"# 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>."
+"option: <samp>1 RSA and RSA</samp>."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"# Enter the following keysize: <span style=\"color:#2f5faa; font-family: "
-"monospace;\">4096</span> for a strong key."
+msgid "# Enter the following keysize: <code>4096</code> for a strong key."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"# Choose the expiration date, we suggest <span style=\"color:#2f5faa; font-"
-"family: monospace;\">2y</span> (2 years)."
+msgid "# Choose the expiration date; we suggest <code>2y</code> (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>
+#. type: Content of: <html><body><section><div><div><div><h4>
msgid "Set your passphrase"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
msgid ""
-"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."
+"You can check if this is the case with the command <code>gpg --version</"
+"code>. If GnuPG is not installed, it will bring up the following "
+"result on most GNU/Linux operating systems, or something like it: "
+"<samp>Command 'gpg' not found, but can be installed with: sudo apt install "
+"gnupg</samp>. Follow that command and install the program."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
msgid ""
-"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."
+"Use the following command to see all keys: <code>gpg --list-keys</"
+"code>. Yours should be listed in there, and later, so will Edward's "
+"(<a href=\"#section3\">Section 3</a>)."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"If you want to see only your key, you can use <code>gpg --list-key "
+"[your@email]</code>."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"You can also use <code>gpg --list-secret-key</code> to see your own private "
+"key."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
# | 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.
+# | or 4096-] {+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 "
"\"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."
+"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 "
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>
+#. type: Content of: <html><body><section><div><div><div><h4>
# | [-<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"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"# 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."
+"# Copy your keyID: <code>gpg --list-key [your@email]</code> 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 ""
#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"# Upload your key to a server: <span style=\"color:#2f5faa; font-family: "
-"monospace;\">gpg --send-key [keyID]</span>"
+msgid "# Upload your key to a server: <code>gpg --send-key [keyID]</code>"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><h6>
+#. type: Content of: <html><body><section><div><div><div><h4>
msgid "Export your key to a file"
msgstr ""
"can be done with the following commands:"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><p><span>
-msgid ""
-"<span style=\"color:#2f5faa; font-family: monospace;\"> $ gpg --export-"
-"secret-keys -a [keyID] > my_secret_key.asc"
+#. type: Content of: <html><body><section><div><div><div><p><code>
+msgid "<code> $ gpg --export-secret-keys -a [keyID] > my_secret_key.asc"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
-msgid "$ gpg --export -a [keyID] > my_public_key.asc </span>"
+msgid "$ gpg --export -a [keyID] > my_public_key.asc </code>"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><h6>
+#. type: Content of: <html><body><section><div><div><div><h4>
msgid "Generate a revocation certificate"
msgstr ""
# | 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
+# | <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>.+}
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 "
+"(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>."
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"# Generate a revocation certificate: <span style=\"color:#2f5faa; font-"
-"family: monospace;\">gpg --gen-revoke --output revoke.asc [keyID]</span>"
+"# Generate a revocation certificate: <code>gpg --gen-revoke --output revoke."
+"asc [keyID]</code>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"# 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>"
+"<samp>1 = key has been compromised</samp>."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"# You don't have to fill in a reason, but you can, then press enter for an "
-"empty line, and confirm your selection."
+"# You don't have to fill in a reason, but you can; then press \"Enter\" for "
+"an empty line, and confirm your selection."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
-msgid ""
-"# Check your permissions: <span style=\"color:#2f5faa; font-family: "
-"monospace;\">ls -l ~/.gnupg/*</span>"
+msgid "# Check your permissions: <code>ls -l ~/.gnupg/*</code>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
-msgid ""
-"You can use the code <span style=\"color:#2f5faa; font-family: monospace;"
-"\">chmod 700 ~/.gnupg</span>"
+msgid "You can use the code: <code>chmod 700 ~/.gnupg</code>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
-msgid ""
-"You can use the code: <span style=\"color:#2f5faa; font-family: monospace;"
-"\">chmod 600 ~/.gnupg/*</span>"
+msgid "You can use the code: <code>chmod 600 ~/.gnupg/*</code>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
"can be done with the following commands:"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p><span>
-msgid ""
-"<span style=\"color:#2f5faa; font-family: monospace;\"> $ gpg --export-"
-"secret-keys -a [keyID] > my_private_key.asc"
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p><code>
+msgid "<code> $ gpg --export-secret-keys -a [keyID] > my_private_key.asc"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p><span>
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p><code>
msgid "$ gpg --export -a [keyID] > my_public_key.asc"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p><span>
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p><code>
msgid "$ gpg --import my_private_key.asc"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
-msgid "$ gpg --import my_public_key.asc </span>"
+msgid "$ gpg --import my_public_key.asc </code>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
-msgid ""
-"<span style=\"color:#2f5faa; font-family: monospace;\"> $ gpg --edit-key "
-"[your@email] </span>"
+msgid "<code> $ gpg --edit-key [your@email] </code>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
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."
+"Because this is your key, you should choose <code>ultimate</code>. "
+"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 "
+"Refer to <a href=\"#step-2b\">Troubleshooting 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"
#. 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>"
+"# Open your email client and use \"Tools\" → <i>OpenPGP Key Manager</i>"
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>"
+msgid "# Under \"File\" → <i>Import Secret Key(s) From File</i>"
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"
+"# Select the file you saved under the name [my_secret_key.asc] in <a href="
+"\"#step-2b\">Step 2.B</a> when you exported your key"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
#. 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>."
+"# Go to \"Account settings\" → \"End-To-End Encryption,\" and make sure "
+"your key is imported and select <i>Treat this key as a Personal Key</i>."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
#. 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."
+"Look for \"Account settings\" → \"End-To-End Encryption.\" Here you can "
+"see if your personal key associated with this email is found. If it is not, "
+"you can try again via the <i>Add key</i> option. Make sure you have the "
+"correct, active, secret key file."
msgstr ""
#. type: Content of: <html><body><section><div><div><h2>
# | 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.+}
+# | select [-Send-] {+<i>Send+} Public Keys by [-Email.-] {+Email</i>.+} 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 "
"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."
+"on your key and select <i>Send Public Keys by Email</i>. 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 → 密钥管理。你应当看到你的密钥在弹窗的列表中。在你的密钥处右"
msgid ""
"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."
+"off by using the dropdown menu \"Security\" and select <i>Do Not Encrypt</"
+"i>. Once encryption is off, hit Send."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
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><h6>
+#. type: Content of: <html><body><section><div><div><div><h4>
msgid "Get Edward's key"
msgstr ""
"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."
+"<i>Discover</i> next to the text: \"This message was signed with a key that "
+"you don't yet have.\" A popup with Edward's key details will follow."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"<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."
+"<strong>Option 2.</strong> Open your OpenPGP Key manager, and under "
+"\"Keyserver\" choose <i>Discover Keys Online</i>. Here, fill in Edward's "
+"email address, and import Edward's key."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"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."
+"The option <i>Accepted (unverified)</i> 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 ""
#. type: Content of: <html><body><section><div><div><div><p>
"因为你使用了爱德华的公钥加密邮件，解密则就要求爱德华的私钥。只有爱德华自己有"
"它的私钥，因此除了他，没人能解密消息。"
-#. type: Content of: <html><body><section><div><div><div><h6>
+#. type: Content of: <html><body><section><div><div><div><h4>
# | [-<em>Step 3.b</em>-]Send [-a test-] {+Edward an+} encrypted email
#, fuzzy
#| msgid "<em>Step 3.b</em> Send a test encrypted email"
#. 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."
+"\"Security\" and select <i>Require Encryption</i>. Once encryption is on, "
+"hit Send."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
#. 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 "
+"You could get the above error message, or something along these lines: "
+"\"Unable to send this message with end-to-end encryption, because there are "
+"problems with the keys of the following recipients: ...\" In these cases, "
+"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."
"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."
+"clicking on the key in the OpenPGP Key Manager, and select the option "
+"<i>Yes, but I have not verified that this is the correct key</i> 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>
#. 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.
+# | this in {+Icedove or+} Thunderbird, go to [-View > Message-] {+\"View\"
+# | → \"Message+} Body [-As > Plain Text.-] {+As\" → <i>Plain
+# | Text</i>.+}
#, fuzzy
#| msgid ""
#| "For greater security against potential attacks, you can turn off HTML. "
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 Icedove or Thunderbird, go to View > Message Body As > Plain Text."
+"in Icedove or Thunderbird, go to \"View\" → \"Message Body As\" → "
+"<i>Plain Text</i>."
msgstr ""
"为了防范潜在的攻击，你可以关闭 HTML 格式，转而使用纯文本作为正文。在 "
"Thunderbird 中，到 查看 > 消息体为 > 纯文本 可以做到这一点。"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"In \"Account Settings\" → \"End-To-End-Encryption\" you can opt to "
-"<span style=\"color:#2f5faa\">add digital signature by default</span>."
+"<i>add digital signature by default</i>."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
"人。"
#. type: Content of: <html><body><section><div><div><p>
+# | Signing keys and signing messages use the same type of mathematical
+# | operation, but they carry very different implications. It's a good
+# | practice to generally sign your email, but if you casually sign people's
+# | keys, you may [-accidently-] {+accidentally+} end up vouching for the
+# | identity of an imposter.
+#, fuzzy
+#| msgid ""
+#| "Signing keys and signing messages use the same type of mathematical "
+#| "operation, but they carry very different implications. It's a good "
+#| "practice to generally sign your email, but if you casually sign people's "
+#| "keys, you may accidently end up vouching for the identity of an imposter."
msgid ""
"Signing keys and signing messages use the same type of mathematical "
"operation, but they carry very different implications. It's a good practice "
"to generally sign your email, but if you casually sign people's keys, you "
-"may accidently end up vouching for the identity of an imposter."
+"may accidentally end up vouching for the identity of an imposter."
msgstr ""
"签署密钥和消息签名使用了同种类型的数学运算，但有着不同的含义。通常，对自己邮"
"件进行签名是一种良好实践，但随意签署别人的公钥，最终你可能会意外地为冒充者做"
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"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."
+"In your email program's menu, go to OpenPGP Key Manager and select <i>Key "
+"properties</i> by right clicking on Edward's key."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"Under \"Your Acceptance,\" you can select <span style=\"color:#2f5faa\">Yes, "
-"I've verified in person this key has the correct fingerprint\"</span>."
+"Under \"Your Acceptance,\" you can select <i>Yes, I've verified in person "
+"this key has the correct fingerprint\"</i>."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
"密”。"
#. 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>
+# | [-<b>When-]{+<strong>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>-] {+trusted.</strong>+}
#, 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 button. The program "
-"will warn you there if you get an email signed with a key that can't be "
-"trusted.</b>"
+"<strong>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.</strong>"
msgstr ""
"<b>使用 GnuPG 时，要养成看通知条的习惯。如果你收到的邮件是用不受信任的密钥签"
"名的，程序会提醒你。</b>"
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>"
msgid "View & share our infographic"
msgstr "查看并分享信息图"
-#. 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 "很不错！"
"</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
+# | If you are using Windows, [-Mac OS-] {+macOS+} 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>
#| "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, "
+"If you are using Windows, macOS 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="
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>
-# | <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\">分享 "
-
#. type: Content of: <html><body><header><div><div><div><p>
msgid ""
"We want to translate this guide into more languages, and make a version for "
"如果你有任何对本指南的建议，请来信 <a href=\"mailto:campaigns@fsf.org"
"\">campaigns@fsf.org</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="
+#~ "\"#section2\">Step 2</a>."
+#~ msgstr ""
+#~ "如果你已经有了电子邮件程序，你可以跳至 <a href=\"#step-1b\">Step 1.b</a>。"
+
+#, fuzzy
+#~| msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+#~ msgid ""
+#~ "GnuPG, GPG, openpgp, encryption, surveillance, privacy, email, Enigmail"
+#~ msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
+
+#, fuzzy
+#~| msgid "<a href=\"/tr\">Türkçe - v4.0</a>"
+#~ msgid "<a href=\"/tr\">Türkçe - v5.0</a>"
+#~ msgstr "<a href=\"/tr\">Türkçe - v4.0</a>"
+
+#~ msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+#~ msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
+
+#, fuzzy
+#~| msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
+#~ msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, encryption"
+#~ msgstr "GnuPG, GPG, openpgp, 监控, 隐私, 电子邮件, Enigmail"
+
+#, 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 ""
#~ "<a id=\"infographic\" href=\"https://emailselfdefense.fsf.org/en/"
#~ "infographic.html\">"
projects / enc.git / blobdiff