Beginning to update index to Enigmail 1.7.

[enc-live.git] / en / index.html

diff --git a/en/index.html b/en/index.html
index b64956c7392a7f14302c20e1dcc47d9c53e7963c..6f9c00c2b001f36a2543d1a82a39670e63049951 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -23,18 +23,18 @@
                           <!-- Language list for browsers that do not have JS enabled -->
                           <ul id="languages" class="os">
                             <li><a class="current" href="/en">english</a></li>
-                            <!--<li><a href="/es">español</a></li>-->
+                            <li><a href="/es">español</a></li>
                             <li><a href="/fr">français</a></li>
                             <li><a href="/de">deutsch</a></li>
-                            <!--<li><a href="/it">italiano</a></li>-->
+                            <li><a href="/it">italiano</a></li>
                             <li><a href="/pt-br">português do Brasil</a></li>
                             <li><a href="/tr">türkçe</a></li>
-                            <!--<li><a href="/ro">română</a></li>-->
+                            <li><a href="/ro">română</a></li>
                             <li><a href="/ru">русский</a></li>
                             <!--<li><a href="/ml">മലയാളം</a></li>-->
                             <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
-                            <!--<li><a href="/el">ελληνικά</a></li>-->
+                            <li><a href="/el">ελληνικά</a></li>
                             <!--<li><a href="/ar">العربية</a></li>-->
                           </ul>
 
@@ -83,7 +83,7 @@
                                     </p>
                                   </div>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=esd&amp;pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a>  </p>
+                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a>  </p>
 
                                </div><!-- End #fsf-intro -->
 
@@ -189,11 +189,12 @@
                                        <div class="main">
                                                <h3><em>Step 2.a</em> Make a keypair</h3>
                                                <p>In your email program's menu, select OpenPGP &rarr; Setup Wizard. 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.</p>
-                                               <p>On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."</p>
+                                               <p>On the second screen, titled "Encryption," select "Encrypt all of my messages by default, because privacy is critical to me."</p>
+                                               <p>On the third screen, titled "Signing," select "Don't sign my messages by default."</p>
                                                <p>Use the default options until you reach the screen titled "Create Key".</p>
                                                <p>On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!</p>
                                        <p class="notes">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.</p>
-                                               <p>When the OpenPGP Confirm 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). You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
+                                               <p>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). You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
 
                                                <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
                                                <div class="troubleshooting">
@@ -223,10 +224,10 @@
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
-                                                               <dt>The progress bar never finis</dt>
+                                                               <dt>The progress bar never finishes.</dt>
                                                                                <dd>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.</dd>
 <dt>My key doesnt appear in the list</dt>
-                                                                               <dd>Try checking Show Default Keys.</dd>
+                                                                               <dd>Try checking "Display All Keys by Default."</dd>
 
                                                                <dt class="feedback">Don't see a solution to your problem?</dt>
                                                                        <dd class="feedback">Please let us know on the <a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">feedback page</a>.</dd>