Merge branch 'master' of https://vcs.fsf.org/git/enc

diff --cc en/index.html
index 65b06056d6b8b4c0c58e82dda5b63d2a4adffa08,f027ba1b01410f8f99dcc74316d963ea04525189..be65f79ce9b940a98ea7887f0f64fe3ea9b8294e
--- 1/en/index.html
--- 2/en/index.html
+++ b/en/index.html
@@@ -299,8 -297,8 +297,8 @@@ alt="Step 2.A: Set your passphrase" /><
  <div class="main">
  
  <h3><em>Step 2.a</em> Make a keypair</h3>
 -<h4>Make your keypair</h4>
 -<p>Open a terminal using <kbd>ctrl + alt + t</kbd> (on GNU/linux), or find it in your applications, and use the following code to create your keypair:</p>
 +<h6>Make your keypair</h6>
- <p>Open a terminal. Find it in your applications (in some cases of GNU/Linux you can use the <span style="color:#2f5faa; font-family: monospace;">ctrl + alt + t</span> shortcut). Use the following code to create your keypair in the terminal:</p>
++<p>Open a terminal. You should be able to find it in your applications (some GNU/Linux systems respond to the the <span style="color:#2f5faa; font-family: monospace;">ctrl + alt + t</span> shortcut). Use the following code to create your keypair in the terminal:</p>
  
  <p class="notes">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.</p>
  
@@@ -629,14 -619,16 +619,16 @@@ alt="Step 4.B Option 2. Import key" /><
  <div class="main">
  
  <h3><em>Step 4.b</em> Send a test encrypted email</h3>
- <h6>Get Edward's key</h6>
+ 
+ <h4>Get Edward's key</h4>
+ 
  <p>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:</p>
 -<p><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 sent with a key that you don't have yet." A popup with Edward's key details will follow.</p>
 +<p><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 <span style="color:#2f5faa">Discover</span> 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.</p>
  
- <p><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.</p>
+ <p><strong>Option 2.</strong> Open your OpenPGP manager and under "Keyserver" choose <i>Discover Keys Online</i>. Here, fill in Edward's email address, and import Edward's key.</p>
  
- <p>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.</p>
+ <p>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.</p>
  
  <p class="notes">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.</p>
  
@@@ -662,10 -652,10 +652,10 @@@ href="mailto:edward-en@fsf.org">edward-
  
  <dl>
  <dt>"Recipients not valid, not trusted or not found"</dt>
 -<dd>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.</dd>
 +<dd>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.</dd>
  
  <dt>Unable to send message</dt>
- <dd>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 <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.</dd>
+ <dd>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.</dd>
  
  <dt>I can't find Edward's key</dt>
  <dd>Close the pop-ups that have appeared since you clicked Send. Make sure

diff --cc en/workshops.html
index 109d887df8d240330abec32519e2888b7785b780,54b711f7d9555f332193f1025f0c792ea448a3e5..10c1faca9d6a9032e446427ad3f0a58f3942171a
--- 1/en/workshops.html
--- 2/en/workshops.html
+++ b/en/workshops.html
@@@ -47,23 -47,20 +47,20 @@@ Translate!</a></strong></li
  
  <ul id="menu" class="os">
  <li class="spacer"><a href="index.html">Set up guide</a></li>
 -<!--<li><a href="mac.html">Mac OS</a></li>-->
 +<!--<li><a href="mac.html">macOS</a></li>-->
  <!--<li><a href="windows.html">Windows</a></li>-->
- <li><a href="workshops.html" class="current">Teach your friends</a></li>
- <li><a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email%20encryption%20for%20everyone%20via%20%40fsf">Share&nbsp;
- <img
- src="../static/img/gnu-social.png" class="share-logo"
+ <li class="spacer"><a href="workshops.html" class="current">Teach your friends</a></li>
+ <li class="spacer"><a
+ href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email%20encryption%20for%20everyone%20via%20%40fsf">
+ Share&nbsp;
+ <img src="../static/img/gnu-social.png" class="share-logo"
  alt="[GNU Social]" />&nbsp;
- <img
- src="../static/img/mastodon.png" class="share-logo"
+ <img src="../static/img/mastodon.png" class="share-logo"
  alt="[Mastodon]" />&nbsp;
- <img
- src="../static/img/reddit-alien.png" class="share-logo"
+ <img src="../static/img/reddit-alien.png" class="share-logo"
  alt="[Reddit]" />&nbsp;
- <img
- src="../static/img/hacker-news.png" class="share-logo"
- alt="[Hacker News]" />
- </a></li>
+ <img src="../static/img/hacker-news.png" class="share-logo"
+ alt="[Hacker News]" /></a></li>
  </ul>
  
  <!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->