all: Fix donate link URL to use the correct piwik campagn.
[enc.git] / en / index.html
index 35a350543f044ba1c0c86dd082171c575fdf47b3..4b432de1a553d26e9e25786e5e4a9c03626e3ca2 100644 (file)
                            <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>
                                     </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 -->
 
                                                                        <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>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
                                </div><!-- End #step-2b .step  -->
+
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="terminology" class="step">
                                        <div class="main">
 
                                        </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-->
                                <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>
                                        <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>