en: replace & in link with HTML entity.
[enc-live.git] / en / windows.html
index ae477c50c822b8dffe562f98248f4ca0ae7f644f..3faa6829abb4b2719349f4f2c67042430421f397 100644 (file)
@@ -35,6 +35,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>-->
@@ -43,6 +44,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">
@@ -57,7 +59,7 @@
                             </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
                               </a>
                             </li>
                          </ul>
@@ -65,9 +67,9 @@
                                <!-- ~~~~~~~~~ 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 users' 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>
+                                       <span  style="font-size:125%"><p>We fight for computer users' 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 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></span>
 
-                                       <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=esd&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 -->
 
@@ -81,7 +83,8 @@
 
 <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 -->
 
                                                </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>
 
 
                                        </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">
 
                                        </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! Now take 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>Version 2.0. <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><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>