ml: fix HTML, spaces and comments; move translist up.
authorThérèse Godefroy <godef.th@free.fr>
Mon, 18 Sep 2017 16:41:27 +0000 (18:41 +0200)
committerThérèse Godefroy <godef.th@free.fr>
Fri, 22 Sep 2017 13:58:27 +0000 (15:58 +0200)
ml/confirmation.html
ml/index.html
ml/infographic.html
ml/mac.html
ml/next_steps.html
ml/windows.html

index fecf27d4e782160e4a23d821352a3b510cdd92f0..32848e7f2f7923abb167c63afe117e619b5e5fff 100644 (file)
@@ -5,10 +5,10 @@
 
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
                        <meta name="keywords" content="GnuPG, GPG, 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>
@@ -16,7 +16,6 @@
 
                <header class="row centered" id="header">
                        <div>
-<p>
 
 
 <p><strong>Please check your email for a confirmation link now. Thanks for joining our list!</strong></p>
 <p>If you don't receive the confirmation link, send us an email at info@fsf.org to be added manually.</p>
 
 
-<br><p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Try it out." /></p><br>
+<br /><p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Try it out." /></p><br />
 
 <p>Join us on microblogging services for day-to-day updates:</p>
 <p style="font-size:150%">
   <a href="https://status.fsf.org/fsf">
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-         class="share-logo" alt="[GNU Social]">
-    &nbsp;GNU Social
-  </a> |&nbsp;
+         class="share-logo" alt="[GNU Social]" />
+    &nbsp;GNU Social</a>&nbsp; |&nbsp;
   <a href="http://microca.st/fsf">
     <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]">
-    &nbsp;Pump.io
-  </a> |&nbsp;
+         class="share-logo" alt="[Pump.io]" />
+    &nbsp;Pump.io</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
 <p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></small></p>
-<hr>
+<hr />
                                        <p class="back" style="font-size:150%">&larr; Return to <a href="index.html">Email Self-Defense</a></p>
                        </div>
                </header><!-- End #header -->
@@ -50,7 +47,7 @@
                <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>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>
index 153747047006fc800e79bbc8f1c82c84cf45d6f4..4d8cc5f29177f92fa7197a8d78034385620de957 100644 (file)
@@ -5,10 +5,10 @@
 
                        <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>
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
                                  Share&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-                                     class="share-logo" alt="[GNU Social]">&nbsp;
+                                     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;
+                                      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;
+                                      class="share-logo" alt="[Reddit]" />&nbsp;
                                  <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
-                                      class="share-logo" alt="[Hacker News]">
+                                      class="share-logo" alt="[Hacker News]" />
                               </a>
                             </li>
                          </ul>
@@ -74,7 +74,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">
@@ -88,7 +88,7 @@
                                     </p>
                                   </div>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&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>
+                                       <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/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 -->
 
                                                                <p><strong>To:</strong> <input type="text" placeholder="50BD01x4" name="TO"></p>
                                                                <p class="buttons"><input type="submit" value="trust paths" name="PATHS"> <input type="reset" value="reset" name=".reset"></p>
                                                        </form>
-                                               </div><!-- End #pgp-pathfinder -->
+                                               </div>--><!-- End #pgp-pathfinder -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-4a .step -->
                                                <p> First add your public key fingerprint to your email signature, then compose an email to at least five of your friends, telling them you just set up GnuPG and mentioning your public key fingerprint. Link to this guide and ask them to join you. Don't forget that there's also an awesome <a href="infographic.html">infographic to share.</a></p>
 
 <p class="notes">Start writing your public key fingerprint anywhere someone would see your email address: your social media profiles, blog, Website, or business card. (At the Free Software Foundation, we put ours on our <a href="https://fsf.org/about/staff">staff page</a>.) We need to get our culture to the point that we feel like something is missing when we see an email address without a public key fingerprint.</p>
-                                       </div><!-- End .main
+                                       </div>--><!-- End .main
                                </div> End #step-5d .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>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>
index ccee366a18bbde46f5744b17f85b7cb51f9610c2..f4a25ad409ba2970b245446f528159cc33042732 100644 (file)
@@ -5,10 +5,10 @@
 
                        <title>Email Self-Defense - a guide to fighting surveillance with GnuPG encryption</title>
                        <meta name="keywords" content="GnuPG, GPG, 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>
@@ -30,7 +30,7 @@
                <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>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>
index 8a998473dc871d04af5490cc043344000e2a1106..f57bb1bb589592b0b26ab5ec9a6705830ed79e43 100644 (file)
@@ -5,22 +5,13 @@
 
                        <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="viewport" content="width=device-width, initial-scale=1">
-                       <link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css">
+      <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" />
                <link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 
        </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  ~~~~~~~~~ -->
 <!-- ~~~~~~~~~  Revision as of 18:53, 1 June 2014 by Zakkai ~~~~~~~~~ -->
 
                        <div>
                          <h1>Email Self-Defense</h1>
+
+                          <!-- Language list for browsers that do not have JS enabled -->
+                          <ul id="languages" class="os">
+<li><a href="/en">English - v4.0</a></li>
+<!--<li><a class="current" href="/ar">العربية</a></li>-->
+<li><a href="/cs">Čeština - v4.0</a></li>
+<li><a href="/de">Deutsch - v3.0</a></li>
+<li><a href="/el">ελληνικά - v3.0</a></li>
+<li><a href="/es">español - v4.0</a></li>
+<li><a href="/fa">فارسی - v4.0</a></li>
+<li><a href="/fr">français - v4.0</a></li>
+<li><a href="/it">italiano - v3.0</a></li>
+<li><a href="/ja">日本語 - v4.0</a></li>
+<!--<li><a href="/ko">한국어</a></li>-->
+<!--<li><a href="/ml">മലയാളം</a></li>-->
+<li><a href="/pt-br">português do Brasil - v3.0</a></li>
+<li><a href="/ro">română - v3.0</a></li>
+<li><a href="/ru">русский - v4.0</a></li>
+<li><a href="/sq">Shqip - v4.0</a></li>
+<li><a href="/sv">svenska - v4.0</a></li>
+<li><a href="/tr">Türkçe - v4.0</a></li>
+<li><a href="/zh-hans">简体中文 - v4.0</a></li>
+</ul>
+
                          <ul class="os">
                            <li><a href="index.html">GNU/Linux</a></li>
                            <li><a href="mac.html" class="current">Mac OS</a></li>
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
                                 Share&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-                                     class="share-logo" alt="[GNU Social]">&nbsp;
+                                     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;
+                                     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;
+                                     class="share-logo" alt="[Reddit]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
-                                     class="share-logo" alt="[Hacker News]">
+                                     class="share-logo" alt="[Hacker News]" />
                               </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>
+                                       <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>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&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>
+                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&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 -->
 
                                <div id="step-1c" class="step">
                                        <div class="sidebar">
                                                <ul class="images">
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
+                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.C: Tools -> Add-ons" /></li>
+                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.C: Search Add-ons" /></li>
+                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.C: Install Add-ons" /></li>
                                                </ul>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                                <p><strong>To:</strong> <input type="text" placeholder="50BD01x4" name="TO"></p>
                                                                <p class="buttons"><input type="submit" value="trust paths" name="PATHS"> <input type="reset" value="reset" name=".reset"></p>
                                                        </form>
-                                               </div><!-- End #pgp-pathfinder -->
+                                               </div>--><!-- End #pgp-pathfinder -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-4a .step -->
                                                <p> First add your public key fingerprint to your email signature, then compose an email to at least five of your friends, telling them you just set up GnuPG and mentioning your public key fingerprint. Link to this guide and ask them to join you. Don't forget that there's also an awesome <a href="infographic.html">infographic to share.</a></p>
 
 <p class="notes">Start writing your public key fingerprint anywhere someone would see your email address: your social media profiles, blog, Website, or business card. (At the Free Software Foundation, we put ours on our <a href="https://fsf.org/about/staff">staff page</a>.) We need to get our culture to the point that we feel like something is missing when we see an email address without a public key fingerprint.</p>
-                                       </div><!-- End .main
-                               </div><!-- End #step-5d .step-->
+                                       </div>--><!-- End .main
+                               </div>--><!-- End #step-5d .step-->
 
 
                        </div>
                <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>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>
                 <!-- End Piwik Code -->
        </body>
 </html>
-<li><a href="/en">English - v4.0</a></li>
-<!--<li><a href="/ar">العربية</a></li>-->
-<li><a href="/cs">Čeština - v4.0</a></li>
-<li><a href="/de">Deutsch - v3.0</a></li>
-<li><a href="/el">ελληνικά - v3.0</a></li>
-<li><a href="/es">español - v4.0</a></li>
-<li><a href="/fa">فارسی - v4.0</a></li>
-<li><a href="/fr">français - v4.0</a></li>
-<li><a href="/it">italiano - v3.0</a></li>
-<li><a href="/ja">日本語 - v4.0</a></li>
-<!--<li><a href="/ko">한국어</a></li>-->
-<!--<li><a class="current" href="/ml">മലയാളം</a></li>-->
-<li><a href="/pt-br">português do Brasil - v3.0</a></li>
-<li><a href="/ro">română - v3.0</a></li>
-<li><a href="/ru">русский - v4.0</a></li>
-<li><a href="/sq">Shqip - v4.0</a></li>
-<li><a href="/sv">svenska - v4.0</a></li>
-<li><a href="/tr">Türkçe - v4.0</a></li>
-<li><a href="/zh-hans">简体中文 - v4.0</a></li>
-</ul>
-
index e3968f5cf4c4253d8697c99dfaa60a48ba001456..aaf6936ca9cc6eeff448e84dc5aac90eb905179a 100644 (file)
@@ -5,10 +5,10 @@
 
                        <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>
 <p>You've just taken a huge step towards protecting your privacy online. But each of us acting alone isn't enough. To topple bulk surveillance, we need to build a movement for the autonomy and freedom of all computer users. Join the Free Software Foundation's community  to meet like-minded people and work together for change:</p>
 <div class="newsletter">
                                                <form method="post" action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31">
-                                                 <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail">
-                                                  <input type="submit" value="Add me" name="_qf_Edit_next">
-                                                 <input type="hidden" value="https://emailselfdefense.fsf.org/ml/confirmation.html" name="postURL">
-                                                  <input type="hidden" value="1" name="group[25]">
-                                                  <input type="hidden" value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=31" name="cancelURL">
-                                                  <input type="hidden" value="Edit:cancel" name="_qf_default">
+                                                 <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail" />
+                                                  <input type="submit" value="Add me" name="_qf_Edit_next" />
+                                                 <input type="hidden" value="https://emailselfdefense.fsf.org/ml/confirmation.html" name="postURL" />
+                                                  <input type="hidden" value="1" name="group[25]" />
+                                                  <input type="hidden" value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=31" name="cancelURL" />
+                                                  <input type="hidden" value="Edit:cancel" name="_qf_default" />
                                                </form>
 <p><small>You'll receive action alerts and updates from our low-volume mailing list. Read our <a href="https://my.fsf.org/donate/privacypolicy.html">privacy policy</a>.</small></p>
                                        </div><!-- End .newsletter -->
-</br>
+<br />
 <p>Join us on microblogging services for day-to-day updates:</p>
 <p style="font-size:150%">
   <a href="https://status.fsf.org/fsf">
     <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-         class="share-logo" alt="[GNU Social]">
-    &nbsp;GNU Social
-  </a> |&nbsp;
+         class="share-logo" alt="[GNU Social]" />
+    &nbsp;GNU Social</a>&nbsp; |&nbsp;
   <a href="http://microca.st/fsf">
     <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
-         class="share-logo" alt="[Pump.io]">
-    &nbsp;Pump.io
-  </a> |&nbsp;
+         class="share-logo" alt="[Pump.io]" />
+    &nbsp;Pump.io</a>&nbsp; |&nbsp;
   <a href="https://www.twitter.com/fsf">Twitter</a>
 </p>
-<p><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></small></p>
+<p><small><a href="https://www.fsf.org/twitter">Read why GNU Social and Pump.io are better than Twitter.</a></small></p>
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-political .step -->
                                <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                <div id="step-better" 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>                                        <br><p class="back" style="text-align:center">&larr; <a href="index.html">Return to the guide</a></p>
+                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section6-next-steps.png" alt="Section 6: Next Steps" /></p>                                        <br /><p class="back" style="text-align:center">&larr; <a href="index.html">Return to the guide</a></p>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                <h3>Make Email Self-Defense tools even better</h3>
 
                                                <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>To go the extra mile, support the Free Software Foundation so we can promote Email Self-Defense as heavily 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=email_self_defense&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>
+<p>To go the extra mile, support the Free Software Foundation so we can promote Email Self-Defense as heavily as possible, and make more tools like it.</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/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>
 
-<br>
+<br />
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-better .step -->
 
-                               <!-- ~~~~~~~~~ a div for each 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>--><!-- End .main
+                               </div>--><!-- End #step-learn_more .step -->
 
 
                        </div>
                <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>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>
index 7f9c7a16403c636deb7317fdbbe8148ea9aaa200..5a191dd05148afff484d8aa91b2ed005adebf704 100644 (file)
@@ -5,23 +5,14 @@
 
                        <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>
        <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  ~~~~~~~~~ -->
 <!-- ~~~~~~~~~  Revision as of 18:53, 1 June 2014 by Zakkai ~~~~~~~~~ -->
 
                        <div>
                          <h1>Email Self-Defense</h1>
+
+                          <!-- Language list for browsers that do not have JS enabled -->
+                          <ul id="languages" class="os">
+<li><a href="/en">English - v4.0</a></li>
+<!--<li><a class="current" href="/ar">العربية</a></li>-->
+<li><a href="/cs">Čeština - v4.0</a></li>
+<li><a href="/de">Deutsch - v3.0</a></li>
+<li><a href="/el">ελληνικά - v3.0</a></li>
+<li><a href="/es">español - v4.0</a></li>
+<li><a href="/fa">فارسی - v4.0</a></li>
+<li><a href="/fr">français - v4.0</a></li>
+<li><a href="/it">italiano - v3.0</a></li>
+<li><a href="/ja">日本語 - v4.0</a></li>
+<!--<li><a href="/ko">한국어</a></li>-->
+<!--<li><a href="/ml">മലയാളം</a></li>-->
+<li><a href="/pt-br">português do Brasil - v3.0</a></li>
+<li><a href="/ro">română - v3.0</a></li>
+<li><a href="/ru">русский - v4.0</a></li>
+<li><a href="/sq">Shqip - v4.0</a></li>
+<li><a href="/sv">svenska - v4.0</a></li>
+<li><a href="/tr">Türkçe - v4.0</a></li>
+<li><a href="/zh-hans">简体中文 - v4.0</a></li>
+</ul>
+
                          <ul class="os">
                            <li><a href="index.html">GNU/Linux</a></li>
                            <li><a href="mac.html">Mac OS</a></li>
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
                                 Share&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
-                                     class="share-logo" alt="[GNU Social]">&nbsp;
+                                     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;
+                                     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;
+                                     class="share-logo" alt="[Reddit]" />&nbsp;
                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
-                                     class="share-logo" alt="[Hacker News]">
+                                     class="share-logo" alt="[Hacker News]" />
                               </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>
+                                       <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>
 
-                                       <p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=email_self_defense&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>
+                                       <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/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 -->
 
                                <div id="step-1c" class="step">
                                        <div class="sidebar">
                                                <ul class="images">
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.B: Tools -> Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.B: Search Add-ons" /></li>
-                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.B: Install Add-ons" /></li>
+                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-01-tools-addons.png" alt="Step 1.C: Tools -> Add-ons" /></li>
+                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-02-search.png" alt="Step 1.C: Search Add-ons" /></li>
+                                                       <li><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1b-03-install.png" alt="Step 1.C: Install Add-ons" /></li>
                                                </ul>
                                        </div><!-- /.sidebar -->
                                        <div class="main">
                                                                <p><strong>To:</strong> <input type="text" placeholder="50BD01x4" name="TO"></p>
                                                                <p class="buttons"><input type="submit" value="trust paths" name="PATHS"> <input type="reset" value="reset" name=".reset"></p>
                                                        </form>
-                                               </div><!-- End #pgp-pathfinder -->
+                                               </div>--><!-- End #pgp-pathfinder -->
 
                                        </div><!-- End .main -->
                                </div><!-- End #step-4a .step -->
                                                <p> First add your public key fingerprint to your email signature, then compose an email to at least five of your friends, telling them you just set up GnuPG and mentioning your public key fingerprint. Link to this guide and ask them to join you. Don't forget that there's also an awesome <a href="infographic.html">infographic to share.</a></p>
 
 <p class="notes">Start writing your public key fingerprint anywhere someone would see your email address: your social media profiles, blog, Website, or business card. (At the Free Software Foundation, we put ours on our <a href="https://fsf.org/about/staff">staff page</a>.) We need to get our culture to the point that we feel like something is missing when we see an email address without a public key fingerprint.</p>
-                                       </div><!-- End .main
-                               </div><!-- End #step-5d .step-->
+                                       </div>--><!-- End .main
+                               </div>--><!-- End #step-5d .step-->
 
 
                        </div>
                <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>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>
                 <!-- End Piwik Code -->
        </body>
 </html>
-<li><a href="/en">English - v4.0</a></li>
-<!--<li><a href="/ar">العربية</a></li>-->
-<li><a href="/cs">Čeština - v4.0</a></li>
-<li><a href="/de">Deutsch - v3.0</a></li>
-<li><a href="/el">ελληνικά - v3.0</a></li>
-<li><a href="/es">español - v4.0</a></li>
-<li><a href="/fa">فارسی - v4.0</a></li>
-<li><a href="/fr">français - v4.0</a></li>
-<li><a href="/it">italiano - v3.0</a></li>
-<li><a href="/ja">日本語 - v4.0</a></li>
-<!--<li><a href="/ko">한국어</a></li>-->
-<!--<li><a class="current" href="/ml">മലയാളം</a></li>-->
-<li><a href="/pt-br">português do Brasil - v3.0</a></li>
-<li><a href="/ro">română - v3.0</a></li>
-<li><a href="/ru">русский - v4.0</a></li>
-<li><a href="/sq">Shqip - v4.0</a></li>
-<li><a href="/sv">svenska - v4.0</a></li>
-<li><a href="/tr">Türkçe - v4.0</a></li>
-<li><a href="/zh-hans">简体中文 - v4.0</a></li>
-</ul>
-