Disabling Korean.
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Sun, 29 Jun 2014 17:55:48 +0000 (13:55 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Sun, 29 Jun 2014 17:55:48 +0000 (13:55 -0400)
45 files changed:
de/build.sh~ [deleted file]
de/footer.html~ [deleted file]
de/gnu-step.html~ [deleted file]
de/guide.head.html
de/guide.head.html~ [deleted file]
de/head.html~ [deleted file]
de/index.html
de/index.html.pre~ [deleted file]
de/infographic.html.pre~ [deleted file]
de/mac-step.html~ [deleted file]
de/mac.html
de/macos.html.pre~ [deleted file]
de/next_steps.html.pre~ [deleted file]
de/rest.html~ [deleted file]
de/top-bar-gnu.html~ [deleted file]
de/top-bar-mac.html~ [deleted file]
de/windows.html
el/index.html
el/mac.html
el/windows.html
en/index.html
en/mac.html
en/windows.html
es/index.html
fr/index.html
fr/mac.html
fr/windows.html
ja/index.html
ja/mac.html
ja/windows.html
ko/index.html
ml/index.html
pt-br/index.html
pt-br/mac.html
pt-br/windows.html
ro/index.html
ro/mac.html
ro/windows.html
ru/index.html
ru/mac.html
ru/windows.html
static
tr/index.html
tr/mac.html
tr/windows.html

diff --git a/de/build.sh~ b/de/build.sh~
deleted file mode 100755 (executable)
index f2f3ebe..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-#This script glues the pages together.
-
-cat head.html index.html.pre footer.html > index.html
-cat head.html infographic.html.pre footer.html > infographic.html
diff --git a/de/footer.html~ b/de/footer.html~
deleted file mode 100644 (file)
index 77a9a50..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <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>
-                                       <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>
-                                       <p>Download the source packages for <a href="gnupg-guide.zip">this guide</a> and for <a href="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-dev0n/img/jplusplus.png" alt="Journalism++" /></a>
-                               </p><!-- /.credits -->
-                       </div>
-               </footer><!-- End #footer -->
-
-               <script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
-               <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
-
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
-       </body>
-</html>
diff --git a/de/gnu-step.html~ b/de/gnu-step.html~
deleted file mode 100644 (file)
index 4372a15..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1b" 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>
-                                               </ul>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
-                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
-                                               <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</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-1b .step -->
-                       </div>
-               </section><!-- End #section1 -->
index 747667db96eb94ce2ed6935d3b0b5f0d0c5f2012..1bb690026dc72be1543671ac4e9137e0f90e42a0 100644 (file)
@@ -16,7 +16,7 @@
         <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="/ko">한국어</a></li>-->
         <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
       </ul>
diff --git a/de/guide.head.html~ b/de/guide.head.html~
deleted file mode 100644 (file)
index b6f7916..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-       <body>
-
-<!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
-
-               <header class="row"  id="header">
-                       <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</a></li>
-                            <li><a href="/es">español</a></li>
-                            <li><a href="/fr">français</a></li>
-                            <li><a class="current" 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>
diff --git a/de/head.html~ b/de/head.html~
deleted file mode 100644 (file)
index 5f995fe..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-       <head>
-                       <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="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>
-
-<!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
-
-               <header class="row"  id="header">
-                       <div>
-                         <h1>Email Self-Defense</h1>
index 3ecd3d98f452c09a7ed6c264d9020156c0a73370..cd57083f9d25b867ae1f1628788f6c7eda3d8b79 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
diff --git a/de/index.html.pre~ b/de/index.html.pre~
deleted file mode 100644 (file)
index fd97d5a..0000000
+++ /dev/null
@@ -1,459 +0,0 @@
-                          <!-- 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>
-                                  <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 ~~~~~~~~~ -->
-                               <div class="intro">
-                                       <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>
-                                       Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are coded to make sure that a surveillance agent or thief that intercepts your email can't read it. All you need is a computer with an Internet connection, an email account and about half an hour.</p>
-
-<p>Even if you have nothing to hide, using encryption helps protect the privacy of people you communicate with, and makes life difficult for bulk surveillance systems. If you do have something important to hide, you're in good company; these are the same tools that Edward Snowden used to share his famous secrets about the NSA.</p>
-
-<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>
-               </header><!-- End #header -->
-
-<!-- ~~~~~~~~~ Section 1: Get the pieces  ~~~~~~~~~ -->
-               <section class="row" id="section1">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#1</em> Get the pieces</h2>
-<p class="notes">This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows). Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
-
-<p>Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to download it. Before configuring GnuPG though, you'll need a desktop email program installed on your computer. Most GNU/Linux distributions have a free software version of the Thunderbird email program available to install. This guide will work with them, in addition to Thunderbird itself. Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.</p>
-                        <p>If you are already have one of these, you can skip to <a href="#step-1b">Step 1.b</a>.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.a</em> Set your email program up with your email account (if it isn't already)</h3>
-                                               <p>Open your email program and follow the wizard that sets it up with your email account.</p>
-
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>What's a wizard?</dt>
-                                                                       <dd>A wizard is a series of windows that pop up to make it easy to get something done on a computer, like installing a program. You click through it, selecting options as you go.</dd>
-                                                               <dt>My email program can't find my account or isn't downloading my mail</dt>
-                                                                       <dd>Before searching the Web, we recommend you start by asking other people who use your email system, to figure out the correct settings.</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 #step1-a .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1b" 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>
-                                               </ul>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
-                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
-                                               <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</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-1b .step -->
-                       </div>
-               </section><!-- End #section1 -->
-
-<!-- ~~~~~~~~~ Section 2: Make your keys  ~~~~~~~~~ -->
-               <section class="row" id="section2">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                       <h2><em>#2</em> Make your keys</h2>
-                                               <p>To use the GnuPG system, you'll need a public key and a private key (known together as a keypair). Each is a long string of randomly generated numbers and letters that are unique to you. Your public and private keys are linked together by a special mathematical function.</p>
-
-<p>Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as phonebook, where people who want to send you an encrypted email look up your public key.</p>
-
-<p>Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to decode encrypted emails other people send to you.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-2a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step2a-01-make-keypair.png" alt="Step 2.A: Make a Keypair" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 2.a</em> Make a keypair</h3>
-                                               <p>In your email program's menu, select OpenPGP &rarr; Setup Wizard. You don't need to read the text in the window that pops up unless you'd like to, but it's good to read the text on the later screens of the wizard.</p>
-                                               <p>On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."</p>
-                                               <p>Use the default options until you reach the screen titled "Create Key".</p>
-                                               <p>On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!</p>
-                                       <p class="notes">The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.</p>
-                                               <p>When the OpenPGP Confirm screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there. You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
-
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the OpenPGP menu.</dt>
-                                                                       <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>
-
-                                                               <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>
-                                               <p>In your email program's menu, select OpenPGP &rarr; Key Management.</p>
-<p>Right click on your key and select Upload Public Keys to Keyserver. Use the default keyserver in the popup.</p>
-<p class="notes">Now someone who wants to send you an encrypted message can download your public key from the Internet. There are multiple keyservers that you can select from the menu when you upload, but they are all copies of each other, so it doesn't matter which one you use. However, it sometimes takes a few hours for them to match each other when a new key is uploaded.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>The progress bar never finishes</dt>
-                                                                               <dd>Close the upload popup, make sure you are on 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>
-
-                                                               <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="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 -->
-
-<!-- ~~~~~~~~~ Section 3: Try it out  ~~~~~~~~~ -->
-               <section class="row" id="section3">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#3</em> Try it out!</h2>
-                                               <p>Now you'll try a test correspondence with a computer program named Adele, which knows how to use encryption. Except where noted, these are the same steps you'd follow when corresponding with a real, live person.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 3.a</em> Send Adele your public key</h3>
-                                               <p>This is a special step that you won't have to do when corresponding with real people. In your email program's menu, go to OpenPGP &rarr; Key Management. You should see your key in the list that pops up. Right click on your key and select Send Public Keys by Email. This will create a new draft message, as if you had just hit the Write button.</p>
-
-<p>Address the message to adele-en@gnupp.de. Put at least one word (whatever you want) in the subject and body of the email, then hit send.</p>
-
-<p class="notes">It may take two or three minutes for Adele 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 she'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 -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3b" class="step">
-                                       <div class="main">
-                                                       <h3><em>Step 3.b</em> Send a test encrypted email</h3>
-                                                       <p>Write a new email in your email program, addressed to adele-en@gnupp.de. Make the subject "Encryption test" or something similar and write something in the body. Don't send it yet.</p>
-                                                       <p>Click the icon of the key in the bottom right of the composition window (it should turn yellow). This tells Enigmail to encrypt the email with the key you downloaded in the last step.</p>
-                                                       <p class="notes">Next to the key, you'll notice an icon of a pencil. Clicking this tells Enigmail to add a special, uniqe 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 and email to Adele, you need her public key, and 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>Now you are back at the "Recipients not valid, not trusted or not found" screen. Select Adele's key from the list and click Ok. If the message doesn't send automatically, you can hit send now.</p>
-                                       <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                                       <div class="troubleshooting">
-                                                               <h4>Troubleshooting</h4>
-                                                               <dl>
-                                                                       <dt>Enigmail can't find Adele's key</dt>
-                                                                               <dd>Close the pop-ups that have appeared since you clicked. Make sure you are connected to the Internet and try again. If that doesn't work, repeat the process, choosing a different keyserver when it asks you to pick one.</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-3b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <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. 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-->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3c" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.c</em> Receive a response</h3>
-                                               <p>When Adele receives your email, she will use her private key to decrypt it, then fetch your public key from a keyserver and use it to encrypt a response to you.</p>
-                                               <p class="notes">Since you encrypted this email with Adele's public key, Adele's private key is required to decrypt it. Adele is the only one with her private key, so no one except her &mdash; not even you &mdash; can decrypt it.</p>
-                                               <p class="notes">It may take two or three minutes for Adele 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.</p>
-                                               <p>When you receive Adele's email and open it, Enigmail will automatically detect that it is encrypted with your public key, and then it will use your private key to decrypt it.</p>
-                                               <p>Notice the bar that Enigmail shows you above the message, with information about the status of Adele's key.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-3c .step -->
-
-<!-- STEP 3D IS COMMENTED OUT UNTIL WE FIND A WAY TO VALIDATE SIGNATURES
-                               <div id="step-3d" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.d</em> Send a test signed email to a friend</h3>
-                                               <p>Write a new email in your email program, addressed to a friend. If you want, tell them about this guide!</p>
-                                               <p>Before sending the email, click the icon of the pencil in the bottom right of the composition window (it should turn yellow). This tells Enigmail to sign the email with you private key.</p>
-                                               <p>After you click send, Enigmail will ask you for your password. It will do this any time it needs to use your public key.</p>
-                                       </div>
-                               </div>-->
-                       </div>
-               </section><!-- End #section3 -->
-
-
-<!-- ~~~~~~~~~ Section 4: Learn the Web of Trust  ~~~~~~~~~ -->
-               <section class="row" id="section4">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#4</em> Learn the Web of Trust</h2>
-                                               <p>Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.</p>
-
-<p>When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.</p>
-
-<p>People's public keys are usually identified by their key fingerprint, which is a string of digits like DD878C06E8C2BEDDD4A440D3E573346992AB3FF7 (for Adele's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to OpenPGP &rarr; Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that so that people can double-check that they have the correct public key when they download yours from a keyserver.</p>
-
-<p class="notes">You may also see public keys referred to by their key ID, which is simply the last 8 digits of the fingerprint, like 92AB3FF7 for Adele. The key ID is visible directly from the Key Management Window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to are trying to communicate to verify which one to use.</p>
-
-
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-4a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section4-web-of-trust.png" alt="Section 4: Web of Trust" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 4.a</em> Sign a key</h3>
-                                               <p>In your email program's menu, go to OpenPGP &rarr; Key Management.</p>
-                                               <p>Right click on Adele's public key and select Sign Key from the context menu.</p>
-                                               <p>In the window that pops up, select "I will not answer" and click OK.</p>
-                                               <p>In your email program's menu, go to OpenPGP &rarr; Key Management &rarr; Keyserver &rarr; Upload Public Keys and hit OK.</p>
-                                               <p class="notes">You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.</p>
-
-
-                                               <!--<div id="pgp-pathfinder">
-                                                       <form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
-                                                               <p><strong>From:</strong> <input type="text" placeholder="xD41A008"  name="FROM"></p>
-                                                               <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 .main -->
-                               </div><!-- End #step-4a .step -->
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-sign_real_keys" class="step">
-                                       <div class="main">
-                                               <h3><em>Important:</em> check people's identification before signing their keys</h3>
-                                               <p>Before signing a real person's key, always make sure it actually belongs to them, and that they are who they say they are. Ask them to show you their ID (unless you trust them very highly) and their public key fingerprint -- not just the shorter public key ID, which could refer to another key as well. In Enigmail, answer honestly in the window that pops up and asks "How carefully have you verified that the key you are about to sign actually belongs to the person(s) named above?".</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-sign_real_keys .step-->
-
-
-
-                       </div>
-               </section><!-- End #section4 -->
-
-<!-- ~~~~~~~~~ Section 5: Use it well  ~~~~~~~~~ -->
-               <section id="section5" class="row">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#5</em> Use it well</h2>
-<p>Everyone uses GnuPG a little differently, but it's important to follow some basic practices to keep your email secure. Not following them, you risk the privacy of the people you communicate with, as well as your own, and damage the Web of Trust.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3>When should I encrypt?</h3>
-
-                                               <p>The more you can encrypt your messages, the better. This is because, if you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.</p>
-
-<p>That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5a .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5b" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Important:</em> Be wary of invalid keys</h3>
-                                               <p>GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.</p>
-                                               <p>In your email program, go back to the second email that Adele sent you. Because Adele encrypted it with your public key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."</p>
-<p><b>When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.</b></p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5c" class="step">
-                                       <div class="main">
-                                               <h3>Copy your revocation certificate to somewhere safe</h3>
-                                               <p>Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk or hard drive stored in a safe place in your home.</p>
-<p>If your private key ever gets lost or stolen, you'll need this certificate file.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5c .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-lost_key" class="step">
-                                       <div class="main">
-                                               <h3><em>Important:</em> act swiftly if someone gets your private key</h3>
-                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the <a href="https://www.gnupg.org/gph/en/manual.html#AEN305">instructions on the GnuPG site</a>. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-lost_key .step-->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~
-                               <div id="step-5d" class="step">
-                                       <div class="main">
-                                               <h3>Make your public key part of your online identity</h3>
-                                               <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>
-               </section><!-- End #section5 -->
-
-
-
-<!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
-               <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>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-click_here .step-->
-
-               </section><!-- End #section6 -->
-
-<!-- ~~~~~~~~~ FAQ  ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search
-               for /* Guide Sections Background */ then add #faq to the desired color
-
-               <section class="row" id="faq">
-                       <div>
-                               <div class="sidebar">
-                                       <h2>FAQ</h2>
-                               </div>
-
-                               <div class="main">
-                                       <dl>
-                                               <dt>My key expired</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>Who can read encrypted messages? Who can read signed ones?</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>My email program is opening at times I don't want it to open/is now my default program and I don't want it to be.</dt>
-                                                       <dd>Answer coming soon.</dd>
-                                       </dl>
-                               </div>
-                       </div>
-               </section> --><!-- End #faq -->
-
diff --git a/de/infographic.html.pre~ b/de/infographic.html.pre~
deleted file mode 100644 (file)
index 934368b..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html>
-       <head>
-                       <meta charset="utf-8">
-                       
-                       <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="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>
-
-               <header class="row centered" id="header">
-                       <div>
-                                       <p class="back">&larr; Read the <a href="index.html">full guide</a></p>
-                                       <h3><a href="https://fsf.org/share?u=https://u.fsf.org/zc&amp;t=How public-key encryption works. Infographic via %40fsf %23EmailSelfDefense">Share our infographic</a> with the hashtag #EmailSelfDefense</h3>
-
-                                       <p><img src="//static.fsf.org/nosvn/enc-dev0/img/full-infographic.png" alt="View &amp; share our infographic" /></p>
-
-                                       <p><a href="//static.fsf.org/nosvn/enc-dev0/gnupg-infographic.zip">Download the source files</a> for the infographic</p>
-                                       <p class="back">&larr; Read the <a href="index.html">full guide</a></p>
-                       </div>
-               </header><!-- End #header -->
-
-<!-- ~~~~~~~~~ Footer  ~~~~~~~~~ -->
-               <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>
-                                       <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>
-                                       <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>
-                               </p><!-- /.credits -->
-                       </div>
-               </footer><!-- End #footer -->
-
-               <script src="//static.fsf.org/nosvn/enc-dev0/js/jquery-1.11.0.min.js"></script>
-               <script src="//static.fsf.org/nosvn/enc-dev0/js/scripts.js"></script>
-
-                <!-- Piwik -->
-                <script type="text/javascript">
-                 /*
-                 @licstart The following is the entire license notice for the
-                    JavaScript code in this page.
-
-                 Copyright 2014 Matthieu Aubry
-
-                  This program is free software: you can redistribute it and/or modify
-                 it under the terms of the GNU General Public License as published by
-                 the Free Software Foundation, either version 3 of the License, or
-                 (at your option) any later version.
-
-                  This program is distributed in the hope that it will be useful,
-                 but WITHOUT ANY WARRANTY; without even the implied warranty of
-                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-                 GNU General Public License for more details.
-
-                  You should have received a copy of the GNU General Public License
-                 along with this program.  If not, see http://www.gnu.org/licenses/.
-
-                  @licend The above is the entire license notice
-                     for the JavaScript code in this page.
-                 */
-                 var _paq = _paq || [];
-                 _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-                 _paq.push(["setCookieDomain", "*.www.fsf.org"]);
-                 _paq.push(["setDomains", ["*.www.fsf.org","*.www.fsf.org"]]);
-                 _paq.push(["trackPageView"]);
-                 _paq.push(["enableLinkTracking"]);
-
-                 (function() {
-                   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
-                   _paq.push(["setTrackerUrl", u+"piwik.php"]);
-                   _paq.push(["setSiteId", "5"]);
-                   var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-                   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-                 })();
-                </script>
-                <!-- End Piwik Code -->
-
-       </body>
-</html>
diff --git a/de/mac-step.html~ b/de/mac-step.html~
deleted file mode 100644 (file)
index 5d52f3e..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1b" class="step">
-
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Get GnuPG by downloading GPGTools</h3>
-                                               <p>GPGTools is a software package that includes GnuPG. <a href="https://releases.gpgtools.org/GPG%20Suite%20-%202013.10.22.dmg">Download</a> and install it, choosing default options whenever asked. After it's installed, you can close any windows that it creates.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step1-b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <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>
-                                               </ul>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.c</em> Install the Enigmail plugin for your email program</h3>
-                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
-                                               <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</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-1c .step -->
-                       </div>
-               </section><!-- End #section1 -->
index cfde2439b0b76c2aee17d01e999b44a28b528bf4..60560aed0eac7a8d39c7be5c3caa0e25cfea39fe 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
diff --git a/de/macos.html.pre~ b/de/macos.html.pre~
deleted file mode 100644 (file)
index 15b2bc3..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
-                               <ul class="os">
-                                       <li><a href="index.html">GNU/Linux</a></li>
-                                       <li><a href="mac.html" class="current">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>
-
-                               <!-- ~~~~~~~~~ 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>
-
-                                       <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 ~~~~~~~~~ -->
-                               <div class="intro">
-                                       <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>
-                                       Bulk surveillance violates our fundamental rights and makes free speech risky. This guide will teach you a basic surveillance self-defense skill: email encryption. Once you've finished, you'll be able to send and receive emails that are coded to make sure that a surveillance agent or thief that intercepts your email can't read it. All you need is a computer with an Internet connection, an email account and about half an hour.</p>
-
-<p>Even if you have nothing to hide, using encryption helps protect the privacy of people you communicate with, and makes life difficult for bulk surveillance systems. If you do have something important to hide, you're in good company; these are the same tools that Edward Snowden used to share his famous secrets about the NSA.</p>
-
-<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>
-               </header><!-- End #header -->
-
-<!-- ~~~~~~~~~ Section 1: Get the pieces  ~~~~~~~~~ -->
-               <section class="row" id="section1">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#1</em> Get the pieces</h2>
-                                               <p class="notes">This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows). To defend your freedom as well as protect yourself from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at <a href="https://u.fsf.org/ys">fsf.org</a>.</p>
-                        <p>To get started, you'll need a desktop email program installed on your computer. This guide works with free software versions of the Thunderbird email program, and with Thunderbird itself. Email programs are another way to access the same email accounts you can access in a browser (like GMail), but provide extra features.</p>
-                        <p>If you are already have one of these, you can skip to <a href="#step-1b">Step 1.b</a>.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step1a-install-wizard.png" alt="Step 1.A: Install Wizard" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.a</em> Set your email program up with your email account (if it isn't already)</h3>
-                                               <p>Open your email program and follow the wizard that sets it up with your email account.</p>
-
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>What's a wizard?</dt>
-                                                                       <dd>A wizard is a series of windows that pop up to make it easy to get something done on a computer, like installing a program. You click through it, selecting options as you go.</dd>
-                                                               <dt>My email program can't find my account or isn't downloading my mail</dt>
-                                                                       <dd>Before searching the Web, we recommend you start by asking other people who use your email system, to figure out the correct settings.</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 #step1-a .step -->
-
-
-<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1b" class="step">
-
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Get GnuPG by downloading GPGTools</h3>
-                                               <p>GPGTools is a software package that includes GnuPG. <a href="https://releases.gpgtools.org/GPG%20Suite%20-%202013.10.22.dmg">Download</a> and install it, choosing default options whenever asked. After it's installed, you can close any windows that it creates.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step1-b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <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>
-                                               </ul>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.c</em> Install the Enigmail plugin for your email program</h3>
-                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
-                                               <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</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-1c .step -->
-                       </div>
-               </section><!-- End #section1 -->
-
-<!-- ~~~~~~~~~ Section 2: Make your keys  ~~~~~~~~~ -->
-               <section class="row" id="section2">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                       <h2><em>#2</em> Make your keys</h2>
-                                               <p>To use the GnuPG system, you'll need a public key and a private key (known together as a keypair). Each is a long string of randomly generated numbers and letters that are unique to you. Your public and private keys are linked together by a special mathematical function.</p>
-
-<p>Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as phonebook, where people who want to send you an encrypted email look up your public key.</p>
-
-<p>Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to decode encrypted emails other people send to you.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-2a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step2a-01-make-keypair.png" alt="Step 2.A: Make a Keypair" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 2.a</em> Make a keypair</h3>
-                                               <p>In your email program's menu, select OpenPGP &rarr; Setup Wizard. You don't need to read the text in the window that pops up unless you'd like to, but it's good to read the text on the later screens of the wizard.</p>
-                                               <p>On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."</p>
-                                               <p>Use the default options until you reach the screen titled "Create Key".</p>
-                                               <p>On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!</p>
-                                       <p class="notes">The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.</p>
-                                               <p>When the OpenPGP Confirm screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there. You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
-
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the OpenPGP menu.</dt>
-                                                                       <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 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  -->
-                               <div id="step-2b" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 2.b</em> Upload your public key to a keyserver</h3>
-                                               <p>In your email program's menu, select OpenPGP &rarr; Key Management.</p>
-<p>Right click on your key and select Upload Public Keys to Keyserver. Use the default keyserver in the popup.</p>
-<p class="notes">Now someone who wants to send you an encrypted message can download your public key from the Internet. There are multiple keyservers that you can select from the menu when you upload, but they are all copies of each other, so it doesn't matter which one you use. However, it sometimes takes a few hours for them to match each other when a new key is uploaded.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>The progress bar never finishes</dt>
-                                                                               <dd>Close the upload popup, make sure you are on 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>
-
-                                                               <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="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 -->
-
-<!-- ~~~~~~~~~ Section 3: Try it out  ~~~~~~~~~ -->
-               <section class="row" id="section3">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#3</em> Try it out!</h2>
-                                               <p>Now you'll try a test correspondence with a computer program named Adele, which knows how to use encryption. Except where noted, these are the same steps you'd follow when corresponding with a real, live person.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 3.a</em> Send Adele your public key</h3>
-                                               <p>This is a special step that you won't have to do when corresponding with real people. In your email program's menu, go to OpenPGP &rarr; Key Management. You should see your key in the list that pops up. Right click on your key and select Send Public Keys by Email. This will create a new draft message, as if you had just hit the Write button.</p>
-
-<p>Address the message to adele-en@gnupp.de. Put at least one word (whatever you want) in the subject and body of the email, then hit send.</p>
-
-<p class="notes">It may take two or three minutes for Adele 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 she'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 -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3b" class="step">
-                                       <div class="main">
-                                                       <h3><em>Step 3.b</em> Send a test encrypted email</h3>
-                                                       <p>Write a new email in your email program, addressed to adele-en@gnupp.de. Make the subject "Encryption test" or something similar and write something in the body. Don't send it yet.</p>
-                                                       <p>Click the icon of the key in the bottom right of the composition window (it should turn yellow). This tells Enigmail to encrypt the email with the key you downloaded in the last step.</p>
-                                                       <p class="notes">Next to the key, you'll notice an icon of a pencil. Clicking this tells Enigmail to add a special, uniqe 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 and email to Adele, you need her public key, and 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>Now you are back at the "Recipients not valid, not trusted or not found" screen. Select Adele's key from the list and click Ok. If the message doesn't send automatically, you can hit send now.</p>
-                                       <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                                       <div class="troubleshooting">
-                                                               <h4>Troubleshooting</h4>
-                                                               <dl>
-                                                                       <dt>Enigmail can't find Adele's key</dt>
-                                                                               <dd>Close the pop-ups that have appeared since you clicked. Make sure you are connected to the Internet and try again. If that doesn't work, repeat the process, choosing a different keyserver when it asks you to pick one.</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-3b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <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. 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-->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3c" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.c</em> Receive a response</h3>
-                                               <p>When Adele receives your email, she will use her private key to decrypt it, then fetch your public key from a keyserver and use it to encrypt a response to you.</p>
-                                               <p class="notes">Since you encrypted this email with Adele's public key, Adele's private key is required to decrypt it. Adele is the only one with her private key, so no one except her &mdash; not even you &mdash; can decrypt it.</p>
-                                               <p class="notes">It may take two or three minutes for Adele 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.</p>
-                                               <p>When you receive Adele's email and open it, Enigmail will automatically detect that it is encrypted with your public key, and then it will use your private key to decrypt it.</p>
-                                               <p>Notice the bar that Enigmail shows you above the message, with information about the status of Adele's key.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-3c .step -->
-
-<!-- STEP 3D IS COMMENTED OUT UNTIL WE FIND A WAY TO VALIDATE SIGNATURES
-                               <div id="step-3d" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.d</em> Send a test signed email to a friend</h3>
-                                               <p>Write a new email in your email program, addressed to a friend. If you want, tell them about this guide!</p>
-                                               <p>Before sending the email, click the icon of the pencil in the bottom right of the composition window (it should turn yellow). This tells Enigmail to sign the email with you private key.</p>
-                                               <p>After you click send, Enigmail will ask you for your password. It will do this any time it needs to use your public key.</p>
-                                       </div>
-                               </div>-->
-                       </div>
-               </section><!-- End #section3 -->
-
-
-<!-- ~~~~~~~~~ Section 4: Learn the Web of Trust  ~~~~~~~~~ -->
-               <section class="row" id="section4">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#4</em> Learn the Web of Trust</h2>
-                                               <p>Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.</p>
-
-<p>When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.</p>
-
-<p>People's public keys are usually identified by their key fingerprint, which is a string of digits like DD878C06E8C2BEDDD4A440D3E573346992AB3FF7 (for Adele's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to OpenPGP &rarr; Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that so that people can double-check that they have the correct public key when they download yours from a keyserver.</p>
-
-<p class="notes">You may also see public keys referred to by their key ID, which is simply the last 8 digits of the fingerprint, like 92AB3FF7 for Adele. The key ID is visible directly from the Key Management Window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to are trying to communicate to verify which one to use.</p>
-
-
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-4a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section4-web-of-trust.png" alt="Section 4: Web of Trust" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 4.a</em> Sign a key</h3>
-                                               <p>In your email program's menu, go to OpenPGP &rarr; Key Management.</p>
-                                               <p>Right click on Adele's public key and select Sign Key from the context menu.</p>
-                                               <p>In the window that pops up, select "I will not answer" and click OK.</p>
-                                               <p>In your email program's menu, go to OpenPGP &rarr; Key Management &rarr; Keyserver &rarr; Upload Public Keys and hit OK.</p>
-                                               <p class="notes">You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.</p>
-
-
-                                               <!--<div id="pgp-pathfinder">
-                                                       <form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
-                                                               <p><strong>From:</strong> <input type="text" placeholder="xD41A008"  name="FROM"></p>
-                                                               <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 .main -->
-                               </div><!-- End #step-4a .step -->
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-sign_real_keys" class="step">
-                                       <div class="main">
-                                               <h3><em>Important:</em> check people's identification before signing their keys</h3>
-                                               <p>Before signing a real person's key, always make sure it actually belongs to them, and that they are who they say they are. Ask them to show you their ID (unless you trust them very highly) and their public key fingerprint -- not just the shorter public key ID, which could refer to another key as well. In Enigmail, answer honestly in the window that pops up and asks "How carefully have you verified that the key you are about to sign actually belongs to the person(s) named above?".</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-sign_real_keys .step-->
-
-
-
-                       </div>
-               </section><!-- End #section4 -->
-
-<!-- ~~~~~~~~~ Section 5: Use it well  ~~~~~~~~~ -->
-               <section id="section5" class="row">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#5</em> Use it well</h2>
-<p>Everyone uses GnuPG a little differently, but it's important to follow some basic practices to keep your email secure. Not following them, you risk the privacy of the people you communicate with, as well as your own, and damage the Web of Trust.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3>When should I encrypt?</h3>
-
-                                               <p>The more you can encrypt your messages, the better. This is because, if you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.</p>
-
-<p>That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5a .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5b" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Important:</em> Be wary of invalid keys</h3>
-                                               <p>GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.</p>
-                                               <p>In your email program, go back to the second email that Adele sent you. Because Adele encrypted it with your public key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."</p>
-<p><b>When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.</b></p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5c" class="step">
-                                       <div class="main">
-                                               <h3>Copy your revocation certificate to somewhere safe</h3>
-                                               <p>Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk or hard drive stored in a safe place in your home.</p>
-<p>If your private key ever gets lost or stolen, you'll need this certificate file.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5c .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-lost_key" class="step">
-                                       <div class="main">
-                                               <h3><em>Important:</em> act swiftly if someone gets your private key</h3>
-                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the <a href="https://www.gnupg.org/gph/en/manual.html#AEN305">instructions on the GnuPG site</a>. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-lost_key .step-->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~
-                               <div id="step-5d" class="step">
-                                       <div class="main">
-                                               <h3>Make your public key part of your online identity</h3>
-                                               <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>
-               </section><!-- End #section5 -->
-
-<!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
-               <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>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-click_here .step-->
-
-               </section><!-- End #section6 -->
-
-<!-- ~~~~~~~~~ FAQ  ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search
-               for /* Guide Sections Background */ then add #faq to the desired color
-
-               <section class="row" id="faq">
-                       <div>
-                               <div class="sidebar">
-                                       <h2>FAQ</h2>
-                               </div>
-
-                               <div class="main">
-                                       <dl>
-                                               <dt>My key expired</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>Who can read encrypted messages? Who can read signed ones?</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>My email program is opening at times I don't want it to open/is now my default program and I don't want it to be.</dt>
-                                                       <dd>Answer coming soon.</dd>
-                                       </dl>
-                               </div>
-                       </div>
-               </section> --><!-- End #faq -->
diff --git a/de/next_steps.html.pre~ b/de/next_steps.html.pre~
deleted file mode 100644 (file)
index f8c7aed..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-       <body>
-
-<!-- ~~~~~~~~~ GnuPG Header and introduction text  ~~~~~~~~~ -->
-
-               <header class="row"  id="header">
-                       <div>
-                         <h1>Great job!</h1>
-
-                       </div>
-               </header><!-- End #header -->
-
-
-<!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
-               <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! These next steps will help make the most of the work you did today.</p>
-                               </div><!-- End .section-intro -->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-political" 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>Join the movement</h3>
-
-<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://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="Add me" name="_qf_Edit_next">
-                                                 <input type="hidden" value="https://emailselfdefense.fsf.org/confirmation.html" 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">
-                                               </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>
-<p>Join us on microblogging services for day-to-day updates:</p>
-<p style="font-size:150%"><a href="https://status.fsf.org/fsf">GNU Social</a> | <a href="http://microca.st/fsf">Pump.io</a> | <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>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-political .step -->
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-friends" class="step">
-<div class="main">
-
-                       <h3>Get your friends involved</h3>
-<p>Before you close this guide, use <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Encrypt with me using Email Self-Defense %40fsf">our sharing page</a> to compose a message to a few friends and ask them to join you in using encrypted email. Remember to include your <a href="#section4">GnuPG public key ID</a> so they can easily download your key.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-friends .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-more_technologies" class="step">
-
-
-
-<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>                       <p>If you are using Windows, Mac OS or any other proprietary operating system, the biggest single step you can make is to switch to a free software operating system like GNU/Linux. This will make it much harder for attackers to enter your computer through hidden back doors. Check out the Free Software Foundation's <a href="http://www.gnu.org/distros/free-distros.html">endorsed versions of GNU/Linux.</a></p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-more_technologies .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>
-                                       </div><!-- /.sidebar -->
-                                       <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>. We welcome translations, but we ask that you contact us at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> before you start, so that we can connect you with other translators working in your language.</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>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=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>
-
-<br>
-
-                                       </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>
-               </section><!-- End #section6 -->
-
-<!-- ~~~~~~~~~ FAQ  ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search
-               for /* Guide Sections Background */ then add #faq to the desired color
-
-               <section class="row" id="faq">
-                       <div>
-                               <div class="sidebar">
-                                       <h2>FAQ</h2>
-                               </div>
-
-                               <div class="main">
-                                       <dl>
-                                               <dt>My key expired</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>Who can read encrypted messages? Who can read signed ones?</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>My email program is opening at times I don't want it to open/is now my default program and I don't want it to be.</dt>
-                                                       <dd>Answer coming soon.</dd>
-                                       </dl>
-                               </div>
-                       </div>
-               </section> --><!-- End #faq -->
diff --git a/de/rest.html~ b/de/rest.html~
deleted file mode 100644 (file)
index 5333249..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-1b" 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>
-                                               </ul>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 1.b</em> Install the Enigmail plugin for your email program</h3>
-                                               <p>In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? if so, skip this step.</p>
-                                               <p>If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the menu.</dt>
-                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</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-1b .step -->
-                       </div>
-               </section><!-- End #section1 -->
-
-<!-- ~~~~~~~~~ Section 2: Make your keys  ~~~~~~~~~ -->
-               <section class="row" id="section2">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                       <h2><em>#2</em> Make your keys</h2>
-                                               <p>To use the GnuPG system, you'll need a public key and a private key (known together as a keypair). Each is a long string of randomly generated numbers and letters that are unique to you. Your public and private keys are linked together by a special mathematical function.</p>
-
-<p>Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as phonebook, where people who want to send you an encrypted email look up your public key.</p>
-
-<p>Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to decode encrypted emails other people send to you.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-2a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/step2a-01-make-keypair.png" alt="Step 2.A: Make a Keypair" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 2.a</em> Make a keypair</h3>
-                                               <p>In your email program's menu, select OpenPGP &rarr; Setup Wizard. You don't need to read the text in the window that pops up unless you'd like to, but it's good to read the text on the later screens of the wizard.</p>
-                                               <p>On the second screen, titled "Signing," select "No, I want to create per-recipient rules for emails that need to be signed."</p>
-                                               <p>Use the default options until you reach the screen titled "Create Key".</p>
-                                               <p>On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!</p>
-                                       <p class="notes">The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.</p>
-                                               <p>When the OpenPGP Confirm screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there. You'll learn more about the revocation certificate in <a href="#section5">Section 5</a>. The setup wizard will ask you to move it onto an external device, but that isn't necessary at this moment.</p>
-
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>I can't find the OpenPGP menu.</dt>
-                                                                       <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>
-
-                                                               <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>
-                                               <p>In your email program's menu, select OpenPGP &rarr; Key Management.</p>
-<p>Right click on your key and select Upload Public Keys to Keyserver. Use the default keyserver in the popup.</p>
-<p class="notes">Now someone who wants to send you an encrypted message can download your public key from the Internet. There are multiple keyservers that you can select from the menu when you upload, but they are all copies of each other, so it doesn't matter which one you use. However, it sometimes takes a few hours for them to match each other when a new key is uploaded.</p>
-                                               <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                               <div class="troubleshooting">
-                                                       <h4>Troubleshooting</h4>
-                                                       <dl>
-                                                               <dt>The progress bar never finishes</dt>
-                                                                               <dd>Close the upload popup, make sure you are on 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>
-
-                                                               <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="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 -->
-
-<!-- ~~~~~~~~~ Section 3: Try it out  ~~~~~~~~~ -->
-               <section class="row" id="section3">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#3</em> Try it out!</h2>
-                                               <p>Now you'll try a test correspondence with a computer program named Adele, which knows how to use encryption. Except where noted, these are the same steps you'd follow when corresponding with a real, live person.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section3-try-it-out.png" alt="Try it out." /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 3.a</em> Send Adele your public key</h3>
-                                               <p>This is a special step that you won't have to do when corresponding with real people. In your email program's menu, go to OpenPGP &rarr; Key Management. You should see your key in the list that pops up. Right click on your key and select Send Public Keys by Email. This will create a new draft message, as if you had just hit the Write button.</p>
-
-<p>Address the message to adele-en@gnupp.de. Put at least one word (whatever you want) in the subject and body of the email, then hit send.</p>
-
-<p class="notes">It may take two or three minutes for Adele 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 she'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 -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3b" class="step">
-                                       <div class="main">
-                                                       <h3><em>Step 3.b</em> Send a test encrypted email</h3>
-                                                       <p>Write a new email in your email program, addressed to adele-en@gnupp.de. Make the subject "Encryption test" or something similar and write something in the body. Don't send it yet.</p>
-                                                       <p>Click the icon of the key in the bottom right of the composition window (it should turn yellow). This tells Enigmail to encrypt the email with the key you downloaded in the last step.</p>
-                                                       <p class="notes">Next to the key, you'll notice an icon of a pencil. Clicking this tells Enigmail to add a special, uniqe 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 and email to Adele, you need her public key, and 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>Now you are back at the "Recipients not valid, not trusted or not found" screen. Select Adele's key from the list and click Ok. If the message doesn't send automatically, you can hit send now.</p>
-                                       <!-- ~~~~~~~~~ Troubleshooting  ~~~~~~~~~ -->
-                                                       <div class="troubleshooting">
-                                                               <h4>Troubleshooting</h4>
-                                                               <dl>
-                                                                       <dt>Enigmail can't find Adele's key</dt>
-                                                                               <dd>Close the pop-ups that have appeared since you clicked. Make sure you are connected to the Internet and try again. If that doesn't work, repeat the process, choosing a different keyserver when it asks you to pick one.</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-3b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <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. 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-->
-
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-3c" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.c</em> Receive a response</h3>
-                                               <p>When Adele receives your email, she will use her private key to decrypt it, then fetch your public key from a keyserver and use it to encrypt a response to you.</p>
-                                               <p class="notes">Since you encrypted this email with Adele's public key, Adele's private key is required to decrypt it. Adele is the only one with her private key, so no one except her &mdash; not even you &mdash; can decrypt it.</p>
-                                               <p class="notes">It may take two or three minutes for Adele 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.</p>
-                                               <p>When you receive Adele's email and open it, Enigmail will automatically detect that it is encrypted with your public key, and then it will use your private key to decrypt it.</p>
-                                               <p>Notice the bar that Enigmail shows you above the message, with information about the status of Adele's key.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-3c .step -->
-
-<!-- STEP 3D IS COMMENTED OUT UNTIL WE FIND A WAY TO VALIDATE SIGNATURES
-                               <div id="step-3d" class="step">
-                                       <div class="main">
-                                               <h3><em>Step 3.d</em> Send a test signed email to a friend</h3>
-                                               <p>Write a new email in your email program, addressed to a friend. If you want, tell them about this guide!</p>
-                                               <p>Before sending the email, click the icon of the pencil in the bottom right of the composition window (it should turn yellow). This tells Enigmail to sign the email with you private key.</p>
-                                               <p>After you click send, Enigmail will ask you for your password. It will do this any time it needs to use your public key.</p>
-                                       </div>
-                               </div>-->
-                       </div>
-               </section><!-- End #section3 -->
-
-
-<!-- ~~~~~~~~~ Section 4: Learn the Web of Trust  ~~~~~~~~~ -->
-               <section class="row" id="section4">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#4</em> Learn the Web of Trust</h2>
-                                               <p>Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.</p>
-
-<p>When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, into a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.</p>
-
-<p>People's public keys are usually identified by their key fingerprint, which is a string of digits like DD878C06E8C2BEDDD4A440D3E573346992AB3FF7 (for Adele's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to OpenPGP &rarr; Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that so that people can double-check that they have the correct public key when they download yours from a keyserver.</p>
-
-<p class="notes">You may also see public keys referred to by their key ID, which is simply the last 8 digits of the fingerprint, like 92AB3FF7 for Adele. The key ID is visible directly from the Key Management Window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to are trying to communicate to verify which one to use.</p>
-
-
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-4a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section4-web-of-trust.png" alt="Section 4: Web of Trust" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Step 4.a</em> Sign a key</h3>
-                                               <p>In your email program's menu, go to OpenPGP &rarr; Key Management.</p>
-                                               <p>Right click on Adele's public key and select Sign Key from the context menu.</p>
-                                               <p>In the window that pops up, select "I will not answer" and click OK.</p>
-                                               <p>In your email program's menu, go to OpenPGP &rarr; Key Management &rarr; Keyserver &rarr; Upload Public Keys and hit OK.</p>
-                                               <p class="notes">You've just effectively said "I trust that Adele's public key actually belongs to Adele." This doesn't mean much because Adele isn't a real person, but it's good practice.</p>
-
-
-                                               <!--<div id="pgp-pathfinder">
-                                                       <form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
-                                                               <p><strong>From:</strong> <input type="text" placeholder="xD41A008"  name="FROM"></p>
-                                                               <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 .main -->
-                               </div><!-- End #step-4a .step -->
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-sign_real_keys" class="step">
-                                       <div class="main">
-                                               <h3><em>Important:</em> check people's identification before signing their keys</h3>
-                                               <p>Before signing a real person's key, always make sure it actually belongs to them, and that they are who they say they are. Ask them to show you their ID (unless you trust them very highly) and their public key fingerprint -- not just the shorter public key ID, which could refer to another key as well. In Enigmail, answer honestly in the window that pops up and asks "How carefully have you verified that the key you are about to sign actually belongs to the person(s) named above?".</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-sign_real_keys .step-->
-
-
-
-                       </div>
-               </section><!-- End #section4 -->
-
-<!-- ~~~~~~~~~ Section 5: Use it well  ~~~~~~~~~ -->
-               <section id="section5" class="row">
-                       <div>
-                                       <!-- ~~~~~~~~~ section introduction: interspersed text  ~~~~~~~~~ -->
-                               <div class="section-intro">
-                                               <h2><em>#5</em> Use it well</h2>
-<p>Everyone uses GnuPG a little differently, but it's important to follow some basic practices to keep your email secure. Not following them, you risk the privacy of the people you communicate with, as well as your own, and damage the Web of Trust.</p>
-                               </div><!-- End .section-intro -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5a" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-01-use-it-well.png" alt="Section 5: Use it Well" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3>When should I encrypt?</h3>
-
-                                               <p>The more you can encrypt your messages, the better. This is because, if you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.</p>
-
-<p>That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.</p>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5a .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5b" class="step">
-                                       <div class="sidebar">
-                                               <p><img src="//static.fsf.org/nosvn/enc-dev0/img/screenshots/section5-02-use-it-well.png" alt="Section 5: Use it Well" /></p>
-                                       </div><!-- /.sidebar -->
-                                       <div class="main">
-                                               <h3><em>Important:</em> Be wary of invalid keys</h3>
-                                               <p>GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.</p>
-                                               <p>In your email program, go back to the second email that Adele sent you. Because Adele encrypted it with your public key, it will have a message from OpenPGP at the top, which most likely says "OpenPGP: Part of this message encrypted."</p>
-<p><b>When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.</b></p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5b .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-5c" class="step">
-                                       <div class="main">
-                                               <h3>Copy your revocation certificate to somewhere safe</h3>
-                                               <p>Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk or hard drive stored in a safe place in your home.</p>
-<p>If your private key ever gets lost or stolen, you'll need this certificate file.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-5c .step -->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
-                               <div id="step-lost_key" class="step">
-                                       <div class="main">
-                                               <h3><em>Important:</em> act swiftly if someone gets your private key</h3>
-                                               <p>If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the <a href="https://www.gnupg.org/gph/en/manual.html#AEN305">instructions on the GnuPG site</a>. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.</p>
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-lost_key .step-->
-
-                               <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~
-                               <div id="step-5d" class="step">
-                                       <div class="main">
-                                               <h3>Make your public key part of your online identity</h3>
-                                               <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>
-               </section><!-- End #section5 -->
-
-
-
-<!-- ~~~~~~~~~ Section 6: Next steps  ~~~~~~~~~ -->
-               <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>
-
-                                       </div><!-- End .main -->
-                               </div><!-- End #step-click_here .step-->
-
-               </section><!-- End #section6 -->
-
-<!-- ~~~~~~~~~ FAQ  ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search
-               for /* Guide Sections Background */ then add #faq to the desired color
-
-               <section class="row" id="faq">
-                       <div>
-                               <div class="sidebar">
-                                       <h2>FAQ</h2>
-                               </div>
-
-                               <div class="main">
-                                       <dl>
-                                               <dt>My key expired</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>Who can read encrypted messages? Who can read signed ones?</dt>
-                                                       <dd>Answer coming soon.</dd>
-
-                                               <dt>My email program is opening at times I don't want it to open/is now my default program and I don't want it to be.</dt>
-                                                       <dd>Answer coming soon.</dd>
-                                       </dl>
-                               </div>
-                       </div>
-               </section> --><!-- End #faq -->
-
diff --git a/de/top-bar-gnu.html~ b/de/top-bar-gnu.html~
deleted file mode 100644 (file)
index d7e28db..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<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>
diff --git a/de/top-bar-mac.html~ b/de/top-bar-mac.html~
deleted file mode 100644 (file)
index 3fe7c69..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul id="menu" class="os">
-  <li class="spacer">
-    <a href="index.html" >GNU/Linux</a>
-  </li>
-  <li>
-    <a href="mac.html" class="current" >Mac OS</a>
-  </li>
-  <li>
-    <a href="windows.html">Windows</a>
-  </li>
index 9542d5a78bea5e86ddc7807b585070c2f5fd4794..2cc64c8bdbfaa940caea67093ae97d9ec2e8f22a 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 6e3667c95aa9aa70380b63b790ca8b0bf76ecc8c..1a83ccbfd5db5bd8730983429493c1f623cb3468 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a class="current" href="/el">ελληνικά</a></li>
                           </ul>
index 16464e8353e8c0012e406e5a266956987f06ceb7..25ebca101ac4118ce98199e7dc3b7930997a08ff 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a class="current" href="/el">ελληνικά</a></li>
                           </ul>
index 4d12dba4274512290a5a831e4d3d9a3494ae4691..bc6b8fd898ce836c63fadf9961676d776c1779f1 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a class="current" href="/el">ελληνικά</a></li>
                           </ul>
index 3519df36fd4701b25cc83ecb72ffc03b84fe6bcc..3b24973a0607a14d4f6a7d89885a3ddbab34ca7a 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 14c20051f2bcfe323a0897d6865ebc661c14325a..26d37b33664f646e6403a3c3591773dcc6d66f95 100644 (file)
@@ -39,7 +39,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 4dd01a640cbc0f44032367b21109a34af6cb8ddb..4befa3d4698ec93ed82d621ed3754360930eb0e4 100644 (file)
@@ -40,7 +40,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 925e107995a472d7e304388d49157954aa69838a..993869c83be51153835c525db576f83732cfaf6e 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 2e39d2a291d43abb15ac5f43c0dcfb5d3e9deb57..414993b999259e9004aee6b7fdf58d9660913d4e 100644 (file)
@@ -35,7 +35,7 @@ ce guide vous apprendra à vous autodéfendre avec GnuPG." />
                                        <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="/ko">한국어</a></li>-->
                                        <li><a href="/ja">日本語</a></li>
                                        <li><a href="/el">ελληνικά</a></li>
                                </ul>
index cda6e6e7a903fc321928efd926f093b6833b576e..997a27f679052b8b4658f9ceaf6cfc0c9e0cbba4 100644 (file)
@@ -53,7 +53,7 @@ ce guide vous apprendra à vous autodéfendre avec GnuPG." />
                                        <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="/ko">한국어</a></li>-->
                                        <li><a href="/ja">日本語</a></li>
                                        <li><a href="/el">ελληνικά</a></li>
                                </ul>
index ac55f7969a4d1b868a5ad3ec9ffb3f68f3f89875..faeded79cc0dba297521998469823fb1ce45606b 100644 (file)
@@ -54,7 +54,7 @@ ce guide vous apprendra à vous autodéfendre avec GnuPG." />
                                        <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="/ko">한국어</a></li>-->
                                        <li><a href="/ja">日本語</a></li>
                                        <li><a href="/el">ελληνικά</a></li>
                                </ul>
index 43914a4e3ed3f4d8edffaf7f389342674453b4f0..3d41d76b8d28d6cef16ce49dfda488a99a611c5b 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a class="current" href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 51e419b7182f4ff7cc615e0bda0098871c88840e..a07c1573115a5c630c09fdb16f4c3984abc27bb8 100644 (file)
@@ -39,7 +39,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a class="current" href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 5c0141aa64161481cf7bf73e685f8a64e421903d..c28116c2d4c184e143c4616ddd3807dfab8809ee 100644 (file)
@@ -44,7 +44,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a class="current" href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 3c7d2be0ce53befd04c664a176a1e3cd8e5f6d8f..eeb1481d8b4f5cf55c4f54448e48b46983c5b166 100644 (file)
@@ -31,7 +31,7 @@
                             <li><a href="/ro">română</a></li>
                             <li><a href="/ru">русский</a></li>
                             <li><a href="/ml">മലയാളം</a></li>
-                            <li><a class="current" href="/ko">한국어</a></li>
+                            <!--<li><a class="current" href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 235032abc995b9b80e92c32877a834f15aec5e7e..74b39b789f21f35137388ef337a4ff3f029d5600 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index d26844c5e55a3943c302e56f2791c105ef2f0059..3dfb63699c972706aa836b411ad4172cd1fe606e 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 23aa1f710cd7b2dce20fd7738b89a4130091e121..6e135632073e62d51ba77e9603f4d35bc6074cb1 100644 (file)
@@ -45,7 +45,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 510b82ac511b23c65224328310362a8f3a17fd7a..32a24bf8b9f66f0509759462ea0cfb46fc5a9c37 100644 (file)
@@ -44,7 +44,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index bfaf451fcec412fca2cab3733f6413e2cf69132a..67a9a94f31c15436aec7d9a2a166998620650deb 100644 (file)
@@ -32,7 +32,7 @@
                             <li><a class="current" 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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 880c403d9f9d9c9f62060b3e42264de2404ccf06..61fad6fb771874e32aeae043473905013193dbfa 100644 (file)
@@ -45,7 +45,7 @@
                             <li><a class="current" 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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 571a2a89aca4a8f7da1b36a84fb607c52e50320d..662083c9721baff76905e441963d62d8dcfe7080 100644 (file)
@@ -45,7 +45,7 @@
                             <li><a class="current" 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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 151e0a1fbf29422238d618674f218df91e244f58..7d84652b659edbb3b921aabb7a3af70681126f14 100644 (file)
@@ -31,7 +31,7 @@
                             <li><a href="/tr">türkçe</a></li>
                             <li><a href="/ro">română</a></li>
                             <li><a href="/ml">മലയാളം</a></li>
-                            <li><a href="/ko">한국어</a></li>
+                            <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 2301ab54dfa6f47d8cc9f9038a1550045b6f7c37..9154054034aeb4fa0be3d92bf6ff867945fdb712 100644 (file)
@@ -31,7 +31,7 @@
                             <li><a href="/tr">türkçe</a></li>
                             <li><a href="/ro">română</a></li>
                             <li><a href="/ml">മലയാളം</a></li>
-                            <li><a href="/ko">한국어</a></li>
+                            <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 74461ad65708e3b344ba2c9a23e658c1c4f27d46..813875cb15b1249f5bd6335a84f9457ffca486db 100644 (file)
@@ -31,7 +31,7 @@
                             <li><a href="/tr">türkçe</a></li>
                             <li><a href="/ro">română</a></li>
                             <li><a href="/ml">മലയാളം</a></li>
-                            <li><a href="/ko">한국어</a></li>
+                            <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
diff --git a/static b/static
index f3c29873decee305f08dc593e04114d174a77ccd..a2ac9044283bc9471f2d9515647e1bce18ca092e 160000 (submodule)
--- a/static
+++ b/static
@@ -1 +1 @@
-Subproject commit f3c29873decee305f08dc593e04114d174a77ccd
+Subproject commit a2ac9044283bc9471f2d9515647e1bce18ca092e
index b7ee1219e4ebe56c9de2ce13b05d013051727b91..054deb95058ae9414a92145dcdd3b681c488ee70 100644 (file)
@@ -31,7 +31,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 551ac1094b152a9a1668fb7fa5951cc4df4892e4..a7d2244f4033849418f8f8ffba9914f7fcebf10c 100644 (file)
@@ -43,7 +43,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>
index 45a6ae53ab7e9f79554461b0b186e859300d1d38..71ad6090ad3bc154943a347b3f841be360817f68 100644 (file)
@@ -44,7 +44,7 @@
                             <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="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <li><a href="/el">ελληνικά</a></li>
                           </ul>