# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the emailselfdefense package.
+# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: emailselfdefense ersion\n"
-"POT-Creation-Date: 2016-04-02 23:41+0100\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2021-07-30 22:20+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. type: Attribute 'lang' of: <html>
+msgid "en"
+msgstr ""
+
#. type: Attribute 'content' of: <html><head><meta>
msgid "text/html; charset=utf-8"
msgstr ""
msgstr ""
#. type: Attribute 'content' of: <html><head><meta>
-msgid "GnuPG, GPG, privacy, email, Enigmail"
+msgid ""
+"GnuPG, GPG, openpgp, surveillance, privacy, email, security, GnuPG2, "
+"encryption"
msgstr ""
#. type: Attribute 'content' of: <html><head><meta>
"to be added manually."
msgstr ""
-#. 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 ""
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p><a>
-msgid " GNU Social </a> | <a href=\"http://microca.st/fsf\">"
+msgid " GNU Social</a> | <a href=\"https://hostux.social/@fsf\">"
msgstr ""
#. type: Attribute 'alt' of: <html><body><header><div><ul><li><a><img>
-msgid "[Pump.io]"
+msgid "[Mastodon]"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"
Pump.io </a> | <a "
+"
Mastodon</a> | <a "
"href=\"https://www.twitter.com/fsf\">Twitter</a>"
msgstr ""
#. 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>"
+"Mastodon are better than Twitter.</a></small>"
msgstr ""
#. type: Content of: <html><body><header><div><p>
#. type: Content of: <html><body><footer><div><div><p>
msgid ""
-"Copyright © 2014-20
16 <a href=\"https://u.fsf.org/ys\">Free Software "
+"Copyright © 2014-20
21 <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 "
"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>, "
+"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://www.gnu.org/licenses/license-list.html#OtherLicenses\">Why "
+"href=\"https://www.gnu.org/licenses/license-list.html#OtherLicenses\">Why "
"these licenses?</a>"
msgstr ""
"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 "
+"href=\"https://www.google.com/fonts/specimen/Signika\">Signika</a> by Anna "
"Giedryś, <a "
-"href=\"http://www.google.com/fonts/specimen/Archivo+Narrow\">Archivo "
+"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."
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/\" "
+"JavaScript <a href=\"https://weblabels.fsf.org/emailselfdefense.fsf.org/\" "
"rel=\"jslicense\">source code and license information</a>."
msgstr ""
#. type: Content of: <html><body><footer><div><p><a>
msgid ""
"Infographic and guide design by <a rel=\"external\" "
-"href=\"http://jplusplus.org\"><strong>Journalism++</strong>"
+"href=\"https://jplusplus.org\"><strong>Journalism++</strong>"
msgstr ""
#. type: Attribute 'alt' of: <html><body><footer><div><p><a><img>
msgid "Journalism++"
msgstr ""
-#. type: Attribute 'content' of: <html><head><meta>
-msgid "GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail"
-msgstr ""
-
#. 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 ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/de\">Deutsch - v3.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/el\">ελληνικά - v3.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/es\">español - v3.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/fr\">français - v4.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/it\">italiano - v3.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ja\">日本語 - v4.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/pt-br\">português do Brasil - v3.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ro\">română - v3.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/ru\">русский - v4.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/sq\">Shqip - v4.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/sv\">svenska - v4.0</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"/tr\">Türkçe - v4.0</a>"
+msgid "<a class=\"current\" href=\"/en\">English - v5.0</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>"
+"<strong><a "
+"href=\"https://libreplanet.org/wiki/GPG_guide/Translation_Guide\"> "
+"Translate!</a></strong>"
msgstr ""
#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"index.html\" class=\"current\">GNU/Linux</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"mac.html\">Mac OS</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"windows.html\">Windows</a>"
+msgid "<a href=\"index.html\" class=\"current\">Set up guide</a>"
msgstr ""
#. type: Content of: <html><body><header><div><ul><li>
#. 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%20encryption%20for%20everyone%20via%20%40fsf\"> "
+"Share "
msgstr ""
#. type: Content of: <html><body><header><div><ul><li><a>
msgid "[Hacker News]"
msgstr ""
-#. type: Content of: <html><body><header><div><div><h3><a>
-msgid "<a href=\"http://u.fsf.org/ys\">"
-msgstr ""
-
#. type: Content of: <html><body><header><div><div><div><p>
msgid ""
"We fight for computer users' rights, and promote the development of free (as "
#. type: Content of: <html><body><header><div><div><div><p>
msgid ""
-"<strong> Please donate to support Email Self-Defense. We need to keep "
+"<strong>Please donate to support Email Self-Defense. We need to keep "
"improving it, and making more materials, for the benefit of people around "
-"the world taking the first step towards protecting their privacy. </strong>"
+"the world taking the first step towards protecting their privacy.</strong>"
msgstr ""
-#. type: Content of: <html><body><
header><div><div><p><a>
+#. type: Content of: <html><body><
section><div><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\">"
+"href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&mtm_campaign=email_self_defense&mtm_kwd=guide_donate\">"
msgstr ""
#. type: Attribute 'alt' of: <html><body><header><div><div><p><a><img>
msgid "<a id=\"infographic\" href=\"infographic.html\">"
msgstr ""
-#. 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>
msgid ""
-"</a>Bulk surveillance violates our fundamental rights and makes free speech "
+"</a> Bulk surveillance violates our fundamental rights and makes free speech "
"risky. This guide will teach you a basic surveillance self-defense skill: "
"email encryption. Once you've finished, you'll be able to send and receive "
"emails that are scrambled to make sure a surveillance agent or thief "
"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 ""
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 "
+"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. It is designed for beginners, but "
"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 "
+"(like Windows
or macOS). Learn more about free software at <a "
"href=\"https://u.fsf.org/ys\">fsf.org</a>."
msgstr ""
#. 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 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 ""
#. type: Content of: <html><body><section><div><div><p>
msgid ""
"If you already have an email program, you can skip to <a "
-"href=\"#step-1b\">Step 1.b</a>."
+"href=\"#section2\">Step 2</a>."
msgstr ""
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
#. 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."
+"Open your email program and follow the wizard (step-by-step walkthrough) "
+"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 ""
#. type: Content of: <html><body><section><div><div><div><div><h4>
"use your email system, to figure out the correct settings."
msgstr ""
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+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 ""
"page</a>."
msgstr ""
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.B: Tools -> Add-ons"
+#. type: Content of: <html><body><section><div><div><div><h3>
+msgid "<em>Step 1.b</em> Get your terminal ready and install GnuPG"
msgstr ""
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.B: Search Add-ons"
+#. type: Content of: <html><body><section><div><div><div><p>
+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>."
msgstr ""
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.B: Install Add-ons"
+#. type: Content of: <html><body><section><div><div><div><p>
+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."
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 1.b</em> Install the Enigmail plugin for your email program"
+#. type: Content of: <html><body><section><div><div><div><div><h4>
+msgid "macOS"
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><p>
+#. 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>
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? "
-"If so, skip this step."
+"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><p>
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
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."
+"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><dt>
-msgid "I can't find the menu."
+#. 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 ""
-"In many new email programs, the main menu is represented by an image of "
-"three stacked horizontal bars."
+"<code>brew install gnupg gnupg2</code>. 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"
+msgid "Get GnuPG by downloading GPG4Win"
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 ""
-"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."
+"<a href=\"https://www.gpg4win.org/\">GPG4Win</a> is an 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 ""
+
+#. 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 ""
+
+#. 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. Most email programs provide an "
+"interface for GnuPG. There is also a newer version of GnuPG, called GnuPG2."
msgstr ""
#. type: Content of: <html><body><section><div><div><h2>
msgid "<em>#2</em> Make your keys"
msgstr ""
+#. 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 "
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>"
+"descramble encrypted emails other people send to you. <strong>You should "
+"never share your private key with anyone, under any circumstances.</strong>"
msgstr ""
#. type: Content of: <html><body><section><div><div><p>
msgstr ""
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Step 2.A: Make a Keypair"
+msgid "Step 2.A: Make your Keypair"
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
+msgid "Step 2.A: Set your passphrase"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
msgid "<em>Step 2.a</em> Make a keypair"
msgstr ""
+#. type: Content of: <html><body><section><div><div><div><h4>
+msgid "Make your keypair"
+msgstr ""
+
#. 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. You should be able to find it in your applications (some "
+"GNU/Linux systems respond to the the <kbd>ctrl + alt + t</kbd> "
+"shortcut). Use the following code to create your keypair in the terminal:"
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 \"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 ""
-#. type: Content of: <html><body><section><div><div><div><ul><li>
-msgid ""
-"On the screen titled \"Signing,\" select \"Don't sign my messages by "
-"default.\""
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid "# <code>gpg --full-generate-key</code> to start the process."
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.\""
+"# To answer what kind of key you would like to create, select the default "
+"option: <samp>1 RSA and RSA</samp>."
msgstr ""
-#. type: Content of: <html><body><section><div><div><div><ul><li>
+#. type: Content of: <html><body><section><div><div><div><p>
+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 <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><h4>
+msgid "Set your passphrase"
+msgstr ""
+
+#. 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 "
+"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 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."
+"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."
msgstr ""
#. 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 "
+"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 "
"song lyrics, quotes from books, and so on."
msgstr ""
-#. 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."
-msgstr ""
-
-#. type: Content of: <html><body><section><div><div><div><p>
-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>"
-msgstr ""
-
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "I can't find the Enigmail menu."
+msgid "GnuPG is not installed"
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."
+"GPG is not installed. You can check if this is the case with the command "
+"<code>gpg --version</code>. If GnuPG is not installed, it would 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>
-msgid "The wizard says that it cannot find GnuPG."
+msgid "I took too long to create my passphrase"
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."
+"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 ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "More resources"
+msgid "How can I see my key?"
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 ""
-
-#. type: Content of: <html><body><section><div><div><div><div><h4>
-msgid "Advanced"
+"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>). If you want to see only "
+"your key, you can use <code>gpg --list-key [your@email]</code>. 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>
-msgid "Command line key generation"
+msgid "More resources"
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 "
+"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 2048 bits, or 4096 if you "
-"want to be extra secure."
+"recommends. Also make sure your key is at least 4096 bits if you want to be "
+"secure."
+msgstr ""
+
+#. 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>
"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 "
+"carefully, you can keep your GnuPG 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=\"http://keyring.debian.org/creating-key.html\">the "
+"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 ""
+#. 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"
+msgid "<em>Step 2.b</em> Some important steps following creation"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h4>
+msgid "Upload your key to a keyserver"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
-msgid "In your email program's menu, select Enigmail → Key Management."
+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: <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: <code>gpg --send-key [keyID]</code>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h4>
+msgid "Export your key to a file"
msgstr ""
#. 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."
+"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 "The progress bar never finishes"
+#. 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><div><dl><dd>
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid "$ gpg --export -a [keyID] > my_public_key.asc </code>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h4>
+msgid "Generate a revocation certificate"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+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 ""
+
+#. 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."
+"# 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 "
+"<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."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "My key doesn't appear in the list"
+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 "Try checking \"Display All Keys by Default.\""
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+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><p>
+msgid "# Check your permissions: <code>ls -l ~/.gnupg/*</code>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd><p>
+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><p>
+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>
+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><p>
+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>
+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 documentation"
+msgid "More about keyservers"
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://www.enigmail.net/documentation/quickstart-ch2.php#id2533620\">Enigmail's "
-"documentation</a>."
+"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 ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "Uploading a key from the command line"
+msgid "Transferring your keys"
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 ""
-"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."
+"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><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><code>
+msgid "$ gpg --export -a [keyID] > my_public_key.asc"
+msgstr ""
+
+#. 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 </code>"
+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><p>
+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 <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 "
+"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>
+msgid "<em>#3</em> Set up email encryption"
+msgstr ""
+
+#. 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>
+msgid "Step 3.A: Troubleshoot"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "GnuPG, OpenPGP, what?"
+msgid "<em>Step 3.a</em> Set up your email with encryption"
msgstr ""
#. 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."
+"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\" → <i>OpenPGP Key Manager</i>"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><p>
+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 <a "
+"href=\"#step-2b\">step 2.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 \"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>
+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.\" 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>
-msgid "<em>#3</em> Try it out!"
+msgid "<em>#4</em> Try it out!"
+msgstr ""
+
+#. 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>
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."
+"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 ""
+
+#. 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>
-msgid "<em>Step 3.a</em> Send Edward your public key"
+msgid "<em>Step 4.a</em> Send Edward your public key"
msgstr ""
#. 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."
+"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 <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 ""
#. type: Content of: <html><body><section><div><div><div><p>
#. 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 <i>Do Not "
+"Encrypt</i>. Once encryption is off, hit Send."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
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 "
+"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 ""
#. type: Content of: <html><body><section><div><div><div><p>
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 ""
+
+#. 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"
+msgid "<em>Step 4.b</em> Send a test encrypted email"
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h4>
+msgid "Get Edward's key"
msgstr ""
#. 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."
+"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 ""
-"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."
+"<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 "
+"<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 ""
-"Next to the lock, you'll notice an icon of a pencil. We'll get to this in a "
-"moment."
+"<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 ""
-"Click Send. Enigmail will pop up a window that says \"Recipients not valid, "
-"not trusted or not found.\""
+"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>
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."
+"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>
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."
+"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 its private key, "
+"so no one except Edward can decrypt it."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><h4>
+msgid "Send Edward an encrypted email"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
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."
+"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 ""
+
+#. 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 <i>Require Encryption</i>. Once encryption is on, "
+"hit Send."
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
+msgid "\"Recipients not valid, not trusted or not found\""
+msgstr ""
+
+#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
+msgid ""
+"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."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
-msgid "Enigmail can't find Edward's key"
+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 <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>
+msgid "I can't find Edward's key"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
"is normal, and it doesn't mean that your email was not sent encrypted."
msgstr ""
-#. 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 ""
-
#. type: Content of: <html><body><section><div><div><div><div><dl><dt>
msgid "Encrypt messages from the command line"
msgstr ""
"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>
+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\" "
+"→ <i>Plain Text</i>."
+msgstr ""
+
+#. 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"
+msgid "<em>Step 4.c</em> Receive a response"
msgstr ""
#. 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."
+"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>
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 decrypted. Your email client will automatically decrypt Edward's "
+"message."
msgstr ""
#. 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."
+"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"
+msgid "<em>Step 4.d</em> Send a signed test email"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
#. type: Content of: <html><body><section><div><div><div><p>
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 ""
#. 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."
+"In \"Account Settings\" → \"End-To-End-Encryption\" you can opt to "
+"<i>add digital signature by default</i>."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 3.e</em> Receive a response"
+msgid "<em>Step 4.e</em> Receive a response"
msgstr ""
#. 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 a reply to you."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
"encrypted, he will mention that first."
msgstr ""
+#. type: Content of: <html><body><section><div><div><div><p>
+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 ""
+
#. type: Content of: <html><body><section><div><div><h2>
-msgid "<em>#4</em> Learn the Web of Trust"
+msgid "<em>#5</em> Learn about the Web of Trust"
+msgstr ""
+
+#. 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 "
+"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."
msgstr ""
"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><p>
msgstr ""
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 4: Web of Trust"
+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"
-msgstr ""
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid "In your email program's menu, go to Enigmail → Key Management."
+msgid "<em>Step 5.a</em> Sign a key"
msgstr ""
#. 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."
+"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 ""
-"Now you should be back at the Key Management menu. Select Keyserver → "
-"Upload Public Keys and hit ok."
+"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>
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>
"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 ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"You may also see public keys referred to by their key ID, which is simply "
-"the last eight digits of the fingerprint, like C09A61E8 for Edward. The key "
-"ID is visible directly from the Key Management window. This key ID is like a "
-"person's first name (it is a useful shorthand but may not be unique to a "
-"given key), whereas the fingerprint actually identifies the key uniquely "
-"without the possibility of confusion. If you only have the key ID, you can "
-"still look up the key (as well as its fingerprint), like you did in Step 3, "
-"but if multiple options appear, you'll need the fingerprint of the person to "
-"whom you are trying to communicate to verify which one to use."
+"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 ""
#. type: Content of: <html><body><section><div><div><div><h3>
"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?\""
+"sure the name on the ID matches the name on the public key."
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 ""
"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://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 "
"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 ""
-#. 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 ""
-
#. type: Content of: <html><body><section><div><div><h2>
-msgid "<em>#5</em> Use it well"
+msgid "<em>#6</em> Use it well"
msgstr ""
#. type: Content of: <html><body><section><div><div><p>
msgstr ""
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 5: Use it Well (1)"
+msgid "Section 6: Use it Well (1)"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
msgstr ""
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 5: Use it Well (2)"
+msgid "Section 6: Use it Well (2)"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
#. type: Content of: <html><body><section><div><div><div><p>
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 ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
-"<b>When using GnuPG, make a habit of glancing at that bar. The program will "
-"warn you there if you get an email encrypted 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 ""
#. type: Content of: <html><body><section><div><div><div><h3>
#. type: Content of: <html><body><section><div><div><div><p>
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 ""
#. type: Content of: <html><body><section><div><div><div><p>
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
-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 ""
#. 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>. "
+"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."
msgstr ""
-#. type: Content of: <html><body><section><div><div><h3>
+#. type: Content of: <html><body><section><div><div><div><h3>
msgid "Webmail and GnuPG"
msgstr ""
-#. type: Content of: <html><body><section><div><div><p>
+#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"When you use a web browser to access your email, you're using webmail, an "
"email program stored on a distant website. Unlike webmail, your desktop "
"receive a scrambled email."
msgstr ""
+#. 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>
+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 ""
+
#. type: Content of: <html><body><section><div><div><h2>
msgid "<a href=\"next_steps.html\">Great job! Check out the next steps.</a>"
msgstr ""
#. 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\">"
+"href=\"https://fsf.org/share?u=https://u.fsf.org/zc&t=How%20public-key%20encryption%20works.%20Infographic%20via%20%40fsf\">"
msgstr ""
#. type: Content of: <html><body><header><div><h3>
msgid "View & share our infographic"
msgstr ""
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"index.html\">GNU/Linux</a>"
-msgstr ""
-
-#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"mac.html\" class=\"current\">Mac OS</a>"
-msgstr ""
-
-#. 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 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 ""
-
-#. 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 ""
-
-#. type: Content of: <html><body><section><div><div><div><div><dl><dd>
-msgid ""
-"You can launch the wizard yourself, but the menu option for doing so is "
-"named differently in each email programs. The button to launch it will be in "
-"the program's main menu, under \"New\" or something similar, titled "
-"something like \"Add account\" or \"New/Existing email account.\""
-msgstr ""
-
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 1.b</em> Get GnuPG by downloading GPGTools"
-msgstr ""
-
-#. 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 ""
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.C: Tools -> Add-ons"
-msgstr ""
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.C: Search Add-ons"
-msgstr ""
-
-#. type: Attribute 'alt' of: <html><body><section><div><div><div><ul><li><img>
-msgid "Step 1.C: Install Add-ons"
-msgstr ""
-
-#. 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 ""
-
-#. type: Content of: <html><body><section><div><div><div><p>
-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? "
-"if so, skip this step."
-msgstr ""
-
#. 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"
+msgid "<em>#7</em> Next steps"
msgstr ""
#. type: Content of: <html><body><section><div><div><p>
"of the work you've done."
msgstr ""
+#. type: Content of: <html><body><section><div><div><div><p>
+msgid "← <a href=\"index.html\">Return to the guide</a>"
+msgstr ""
+
#. 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>
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>"
+"
Mastodon are better than Twitter</a>, and <a "
+"href=\"https://www.fsf.org/facebook\">why we don't use Facebook</a>.</small>"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><div><p>
#. type: Content of: <html><body><section><div><div><div><div><form>
msgid ""
-"<input type=\"text\" placeholder=\"Type your email...\" "
-"name=\"email-Primary\" id=\"frmEmail\" /> <input type=\"submit\" value=\"Add "
-"me\" name=\"_qf_Edit_next\" /> <input type=\"hidden\" "
+"<input type=\"text\" value=\"Type your email...\" name=\"email-Primary\" "
+"id=\"frmEmail\" /> <input type=\"submit\" value=\"Add me\" "
+"name=\"_qf_Edit_next\" /> <input type=\"hidden\" "
"value=\"https://emailselfdefense.fsf.org/en/confirmation.html\" "
"name=\"postURL\" /> <input type=\"hidden\" value=\"1\" name=\"group[25]\" /> "
"<input type=\"hidden\" "
#. 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>."
msgstr ""
#. 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%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 ""
#. 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, 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 ""
#. type: Content of: <html><body><section><div><div><div><p>
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=\"http://www.gnu.org/distros/free-distros.html\">endorsed versions "
+"<a href=\"https://www.gnu.org/distros/free-distros.html\">endorsed versions "
"of GNU/Linux.</a>"
msgstr ""
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."
+"plugin</a> by searching for it through Add-ons."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgid ""
"Before beginning to check your email over Tor, make sure you understand <a "
-"href=\"https://www.torproject.org/docs/faq.html.en#WhatProtectionsDoesTorProvide\">the "
-"security tradeoffs involved</a>. This <a "
+"href=\"https://www.torproject.org/docs/faq.html.en#WhatProtectionsDoesTorProvide\"> "
+"
the security tradeoffs involved</a>. This <a "
"href=\"https://www.eff.org/pages/tor-and-https\">infographic</a> from our "
"friends at the Electronic Frontier Foundation demonstrates how Tor keeps you "
"secure."
msgstr ""
#. type: Attribute 'alt' of: <html><body><section><div><div><div><p><img>
-msgid "Section 6: Next Steps"
-msgstr ""
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid "← <a href=\"index.html\">Return to the guide</a>"
+msgid "Section 7: Next Steps"
msgstr ""
#. type: Content of: <html><body><section><div><div><div><h3>
#. type: Content of: <html><body><section><div><div><div><p>
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>."
+"href=\"https://www.gnupg.org/\">GnuPG</a>."
msgstr ""
#. type: Content of: <html><body><section><div><div><div><p>
msgstr ""
#. type: Content of: <html><body><header><div><ul><li>
-msgid "<a href=\"windows.html\" class=\"current\">Windows</a>"
-msgstr ""
-
-#. 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). 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 ""
-
-#. type: Content of: <html><body><section><div><div><div><h3>
-msgid "<em>Step 1.b</em> Get GnuPG by downloading GPG4Win"
-msgstr ""
-
-#. type: Content of: <html><body><section><div><div><div><p>
-msgid ""
-"GPG4Win is a software package that includes GnuPG. <a "
-"href=\"http://files.gpg4win.org/gpg4win-2.2.1.exe\">Download</a> and install "
-"it, choosing default options whenever asked. After it's installed, you can "
-"close any windows that it creates."
-msgstr ""
-
-#. type: Content of: <html><head><title>
-msgid "Email Self-Defense - Teach your friends!"
+msgid "<a href=\"index.html\">Set up guide</a>"
msgstr ""
#. type: Content of: <html><body><header><div><ul><li>
#. type: Content of: <html><body><header><div><div><p><a>
msgid ""
-"<a id=\"infographic\" "
-"href=\"https://emailselfdefense.fsf.org/en/infographic.html\">"
+"<a "
+"href=\"https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&pk_kwd=guide_donate\">"
msgstr ""
#. type: Attribute 'alt' of: <html><body><header><div><div><p><a><img>
"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 ""
#. type: Content of: <html><body><section><div><div><p>
"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."
+"href=\"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 ""
#. type: Content of: <html><body><section><div><div><h2>
projects / enc.git / blobdiff