all: Fix donate link URL to use the correct piwik campagn.
[enc.git] / en / index.html
index 2ad3612f0180e4dc81b7699ed397fdba5f1c26f2..4b432de1a553d26e9e25786e5e4a9c03626e3ca2 100644 (file)
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
        <head>
-                       <meta charset="utf-8">
+                       <meta charset="utf-8" />
 
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
                        <meta name="keywords" content="GnuPG, GPG, openpgp, surveillance, privacy, email, Enigmail" />
-      <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG.">
+      <meta name="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
 
-      <meta name="viewport" content="width=device-width, initial-scale=1">
-                       <link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css">
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
+                       <link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
                <link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 
        </head>
@@ -26,6 +26,7 @@
                             <!--<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="/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>-->
@@ -34,6 +35,7 @@
                             <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <!--<li><a href="/el">ελληνικά</a></li>-->
+                            <!--<li><a href="/ar">العربية</a></li>-->
                           </ul>
 
                           <ul id="menu" class="os">
                            <li>
                               <a href="windows.html">Windows</a>
                             </li>
+
                            <li class="spacer">
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
-                                #EmailSelfDefense
+                                 Share&nbsp;
+                                <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+                                     class="share-logo" alt="[GNU Social]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+                                      class="share-logo" alt="[Pump.io]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+                                      class="share-logo" alt="[Reddit]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
+                                      class="share-logo" alt="[Hacker News]">
                               </a>
                             </li>
                          </ul>
@@ -58,7 +69,7 @@
                                  <h3>
                                     <a href="http://u.fsf.org/ys">
                                       <img alt="Free Software Foundation"
-                                           src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png">
+                                           src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" />
                                     </a>
                                   </h3>
                                   <div class="fsf-emphasis">
                                     </p>
                                     <p>
                                       <strong>
-                                        We want to heavily promote tools like this in-person and online, to help as many people as possible take the first step towards using free software to protect their privacy. Can you make a donation or become a member to help us achieve this goal?
+                                        We want to translate this guide into more languages, and make a version for encryption on mobile devices. Please donate, and help people around the world take the first step towards protecting their privacy with free software.
                                       </strong>
                                     </p>
                                   </div>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=esd&pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png"></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/en/join.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 -->
 
@@ -86,7 +97,7 @@
 
 <p>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 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. Let's get started!</p>
 
-                               </div>
+                               </div><!-- End .intro -->
 
                        </div>
                </header><!-- End #header -->
                                                                        <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars. OpenPGP may be inside a section called Tools.</dd>
     <dt>The wizard says that it cannot find GnuPG.</dt>
 
-                                         <dd>Open whatever program you usually use for installing software, and search for GnuPG, then install it. Then restart the  Engimail setup wizard by going to OpenPGP &rarr; Setup Wizard.</dd>
+                                         <dd>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 OpenPGP &rarr; Setup Wizard.</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>
                                                <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>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
-                               </div><!-- End #step-2a .step  -->
+                               </div><!-- End #step-2b .step  -->
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="terminology" class="step">
                                        <div class="main">
 
 <p class="notes">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 corresponding with a real person.</p>
                                        </div><!-- End .main -->
-                               </div><!-- End #step-3b .step -->
+                               </div><!-- End #step-3a .step -->
 
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-3b" class="step">
                                                        <p class="notes">Next to the key, you'll notice an icon of a pencil. Clicking this tells Enigmail to add a special, unique signature to your message, generated using your private key. This is a separate feature from encryption, and you don't have to use it for this guide.</p>
                                                        <p>Click Send. Enigmail will pop up a window that says "Recipients not valid, not trusted or not found."</p>
 
-                                                       <p>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 9), then select ok. Select ok in the next pop-up.</p>
+                                                       <p>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.</p>
 
                                                        <p>Now you are back at the "Recipients not valid, not trusted or not found" screen. Select Edward's key from the list and click Ok. If the message doesn't send automatically, you can hit send now.</p>
                                        <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-4a .step -->
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-sign_real_keys" class="step">
                                        <div class="main">
                <section class="row" id="section6">
                        <div id="step-click_here" class="step">
                                        <div class="main">
-                                         <h2><a href="next_steps.html">Click here when you're done</a></h2>
+                                         <h2><a href="next_steps.html">Great job! Check out the next steps.</a></h2>
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-click_here .step-->
                <footer class="row" id="footer">
                        <div>
                                <div id="copyright">
-                                       <h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
+                                       <h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h4>
                                        <p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em><a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Version 2.0. Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></p>
+                                        <p><em>Version 2.1. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
                                        <p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; 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 Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
                                         </p>
                                </div><!-- /#copyright -->
                                <p class="credits">
-                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0n/img/jplusplus.png" alt="Journalism++" /></a>
+                                       Infographic and guide design by <a rel="external" href="http://jplusplus.org"><strong>Journalism++</strong> <img src="//static.fsf.org/nosvn/enc-dev0/img/jplusplus.png" alt="Journalism++" /></a>
                                </p><!-- /.credits -->
                        </div>
                </footer><!-- End #footer -->