Trying replacing section 6 on main page with click here thing.
[enc-live.git] / index.html
index 994afc7e0072c09ffd1b905e05f11b84dcae9daa..31b4996a3335be0a79710efd9c9c407162452be6 100644 (file)
 
        </head>
        <body>
-<!--
-               <nav class="nav">
-                       <div>
-                               <ul class="lang">
-                                       <li class="help"><a href="http://libreplanet.org/wiki/GPG_guide">Translate this guide!</a></li>
-                               </ul>
-                       </div>
-               </nav>
--->
 
 <!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
 
                <header class="row"  id="header">
-<!--
-               <div class="highlight" style="background: red;">
-                               <h3 style="text-align: center;"><strong style="color: white;">Website Under Construction</strong></h3>
-               </div>-->
-
                        <div>
-                               <h1>Email Self-Defense</h1>
-                               <ul class="os">
-                                       <li><a href="index.html" class="current">GNU/Linux</a></li>
-                                       <li><a href="mac.html">Mac OS</a></li>
-                                       <li><a href="windows.html">Windows</a></li>
-                                       <li class="share"><a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">#EmailSelfDefense</a></li>
-                               </ul>
+                         <h1>Email Self-Defense</h1>
+
+                          <!-- 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="/fr">français</a></li>
+                            <li><a href="/de">deutsch</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="/ru">русский</a></li>
+                            <li><a href="/ml">മലയാളം</a></li>
+                            <li><a href="/ko">한국어</a></li>
+                            <li><a href="/ja">日本語</a></li>
+                          </ul>
+
+                          <ul id="menu" class="os">
+                           <li class="spacer">
+                              <a href="index.html" class="current">GNU/Linux</a>
+                            </li>
+                           <li>
+                              <a href="mac.html">Mac OS</a>
+                            </li>
+                           <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
+                              </a>
+                            </li>
+                         </ul>
 
                                <!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
                                <div id="fsf-intro">
-                                       <h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h3>
-                                       <span  style="font-size:125%"><p>We fight for computer user's rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.</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?</strong></p></span>
+                                 <h3>
+                                    <a href="http://u.fsf.org/ys">
+                                      <img alt="Free Software Foundation"
+                                           src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png">
+                                    </a>
+                                  </h3>
+                                  <div class="fsf-emphasis">
+                                    <p>
+                                      We fight for computer user's rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.
+                                    </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?
+                                      </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/donate.en.png"></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>
-                                       
+
                                </div><!-- End #fsf-intro -->
 
                                <!-- ~~~~~~~~~ Guide Introduction ~~~~~~~~~ -->
     <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>
-    <dt>What does OpenPGP mean?</dt>
-
-                                         <dd>OpenPGP is a protocol that GnuPG uses, just like HTTP is a protocol for the Web. It's a slightly confusing name that Enigmail uses for its menus.</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>
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
                                        </div><!-- End .main -->
                                </div><!-- End #step-2a .step  -->
+
+                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-2b" class="step">
                                        <div class="main">
                                                <h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
 
                                                        </dl>
                                                </div><!-- /.troubleshooting -->
-
-
-
                                        </div><!-- End .main -->
                                </div><!-- End #step-2a .step  -->
+                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                               <div id="terminology" class="step">
+                                       <div class="main">
+                                               <h3>GnuPG, OpenPGP, what?</h3>
+                                               <p>You're using a program called GnuPG, but the menu in your email program is called OpenPGP. Confusing, right? In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used interchangeably, though they all have slightly different meanings.</p>
+                                       </div><!-- End .main -->
+                               </div><!-- End #terminology.step-->
+
 
                        </div>
                </section><!-- End #section2 -->
                                <div id="step-headers_unencrypted" class="step">
                                        <div class="main">
                                                <h3><em>Important:</em> Security tips</h3>
-                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system.</p>
+                                               <p>Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.</p>
 <p>It's also good practice to click the key icon in your email composition window <strong>before</strong> you start to write. Otherwise, your email client could save an unencrypted draft on the mail server, potentially exposing it to snooping.</p>
                                        </div><!-- End .main -->
                                </div><!-- End #step-headers_unencrypted .step-->
                <section class="row" id="section6">
                        <div>
                                <!-- ~~~~~~~~~ section title + graphics  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#6</em> Next steps</h2>
-<p>You've now completed the basics of email encryption with GnuPG, taking action against bulk surveillance. A pat on the back to you! Want to do more to secure privacy for yourself and the people you communicate with?</p>
-                               </div><!-- End .section-intro -->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-keysigning_party" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section6-next-steps.png" alt="Section 6: Next Steps" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3>Go to a keysigning party</h3>
-                                               <p>Keysigning parties are social events designed to build the Web of Trust. Participants match each others' photo IDs and key fingerprints, and then get out their laptops and sign each other's public keys. They're a great way to meet likeminded people and learn about new privacy tools, as well as build up people's trust in your key. Look for keysignings at tech events, hackerspaces and nerdy parties.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #keysigning_party .step -->
-
-<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-political" class="step">
-                                       <div class="main">
-                                               <h3>Work for political change</h3>
-                                               <p>Encrypting our email is a powerful direct action, but to change the system, we also have to go to the root. One of the key things needed is <a href="https://www.gnu.org/philosophy/surveillance-vs-democracy.html">reducing the amount of data collected about us in the first place</a>. To learn more and participate in efforts for change, join the Free Software Foundation's low-traffic mailing list.</a></p>
-<div class="newsletter">
-                                               <form method="post" action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31">
-                                                       <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail"><input type="submit" value="Subscribe me" name="_qf_Edit_next">
-                                                       <div>
-                                                               <input type="hidden" value="" name="postURL"><input type="hidden" value="1" name="group[25]"><input type="hidden" value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31" name="cancelURL"><input type="hidden" value="Edit:cancel" name="_qf_default">
-                                                       </div>
-                                               </form>
-                                               <p><small>Read our <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a></small></p>
-                                       </div><!-- End .newsletter -->
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-political .step -->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-more_technologies" class="step">
-                                       
-
-<div class="sidebar">
-                                               <p><a id="infographic" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/infographic-button.png" alt="View &amp; share our infographic &rarr;" /></a></p>
-                                       </div><!-- /.sidebar -->
-<div class="main">
-
-
-                       <h3>Protect more of your digital life</h3>
-                       
-                                               <p>Learn surveillance-resistant technologies for instant messages, hard drive storage, online sharing and more at <a href="https://directory.fsf.org/wiki/Collection:Privacy_pack"> the Free Software Directory's Privacy Pack</a> and <a href="https://prism-break.org">prism-break.org</a>.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-more_technologies .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-better" class="step">
-                                       <div class="main">
-                                               <h3>Make Email Self-Defense tools even better</h3>
-<p><a href="https://libreplanet.org/wiki/GPG_guide/Public_Review">Leave feedback and suggest improvements to this guide</a>, or email us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> if you'd like to help maintain or translate it.</p>
-
-                                               <p>If you like programming, you can contribute code to <a href="https://www.gnupg.org/">GnuPG</a> or <a href="https://www.enigmail.net/home/index.php">Enigmail</a>.</p>
-
-<p>If you can't do any of these, please support the Free Software Foundation so we can get Email Self-Defense into the hands of as many people as possible, and make more tools like it.</a><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/donate.en.png"></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/join.en.png"></a></p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-better .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ --
-                               <div id="step-learn_more" class="step">
-                                       <div class="main">
-                                               <h3>Learn more about GnuPG</h3>
-                                               <p>There are a lot more features of GnuPG to discover, including encrypting files on your computer. There are a variety of resources accessible via Google, but we recommend starting with the links on the <a href="https://www.gnupg.org/documentation/">GnuPG Web site</a>.</p>
-                                       </div><!-- End .main --
-                               </div><!-- End #step-learn_more .step -->
+                               <!--<div class="section-intro">-->
+                                               <h2 style="text-align:center"><a href="enc-dev0.fsf.org/next-steps.html">Click here when you're done</a></h2>
+                               <!-- </div> End .section-intro -->
 
 
                        </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>
                                        <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>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>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><em>Version 2.0, launched 6/18/2014. <!--LANGUAGE translation by NAME, NAME and NAME.--></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 packages for <a href="https://fixme.com">this guide</a> and for <a href="https://static.fsf.org/nosvn/enc-dev0/gnupg-infographic.zip">the infographic</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>
+                                          <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
+                                             rel="jslicense">
+                                            JavaScript license information
+                                          </a>
+                                        </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-dev0/img/jplusplus.png" alt="Journalism++" /></a>