en: synchronize with enc 637d334.

diff --git a/en/index.html b/en/index.html
index c1d8a39e335f821f2a5f3f9e2d5ab028aa8b7e4c..45225d3a63774fa861d62cabcf8abe79c9176dc5 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -448,7 +448,9 @@ Translate!</a></strong></li>
 <!--<li><a href="mac.html">Mac OS</a></li>-->
 <!--<li><a href="windows.html">Windows</a></li>-->
 <li class="spacer"><a href="workshops.html">Teach your friends</a></li>
-<li class="spacer"><a href="http://hhldo3tnt5solzj2bwfvh7xm4slk2forpjwjyemhcfrlob5gq75gioid.onion/en" target="_blank">This site's tor onion service</a></li>
+<li class="spacer"><a
+href="http://hhldo3tnt5solzj2bwfvh7xm4slk2forpjwjyemhcfrlob5gq75gioid.onion/en"
+target="_blank">This site's tor onion service</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;
@@ -877,8 +879,8 @@ page</a>.</dd>
 
 <dl>
 <dt>More about keyservers</dt>
-<dd>You can find some more keyserver information<a
-href="https://www.gnupg.org/gph/en/manual/x457.html"> in this manual</a>. <a
+<dd>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://keys.mailvelope.com">The Mailvelope Key Server</a>
 allows automatic public key lookup. You can also <a
 href="https://www.gnupg.org/gph/en/manual/x56.html#AEN64">directly export
@@ -1083,7 +1085,7 @@ href="mailto:edward-en@fsf.org">edward-en@fsf.org</a>. Make the subject
 <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 the 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 <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>
+<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 "Not accepted (undecided)" 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
@@ -1272,7 +1274,7 @@ alt="Section 5: trusting a key" /></p>
 
 <p>In your email program's menu, go to OpenPGP Key Manager and select <i>Key properties</i> by right clicking on Edward's key.</p>
 
-<p>Under "Your Acceptance," you can select <i>Yes, I've verified in person this key has the correct fingerprint"</i>.</p>
+<p>Under "Your Acceptance," you can select <i>Yes, I've verified in person this key has the correct fingerprint</i>.</p>
 
 <p class="notes">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
@@ -1425,7 +1427,7 @@ invalid keys might be readable by surveillance programs.</p>
 
 <p>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
-green checkmark a at the top "OpenPGP" button.</p>
+green checkmark on the "OpenPGP" button.</p>
 
 <p><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

diff --git a/en/next_steps.html b/en/next_steps.html
index 30b14b717dcd9abf7798c4e1b67e4e1e411eb7f4..4510b3ce9d03e688e1a90e5a004d189e003eedee 100644 (file)
--- a/en/next_steps.html
+++ b/en/next_steps.html
@@ -85,7 +85,7 @@ we don't use Facebook</a>.</small></p>
 
 <form method="post"
 action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=391">
-<input type="text" value="Type your email..." name="email-Primary"
+<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"

diff --git a/en/workshops.html b/en/workshops.html
index 98b830e99d01a4e35487da237e035dd4d95afeb2..b0d481ebc41751e77eaca178d04a68fab45cc5f1 100644 (file)
--- a/en/workshops.html
+++ b/en/workshops.html
@@ -204,7 +204,7 @@ margin-bottom: 0px;">
 <p>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 <a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">Diceware</a> for choosing passwords, get a pack of dice
+participants to use <a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">Diceware</a> for choosing passphrases, 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