X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=en%2Fnext_steps.html;h=c8f49bc8914cedac323c9195d61a795d0f363bec;hb=c241e6ebe7fd19384bc8d55862d0f2fcdcd6eed9;hp=63f22f93ccde00cf609c4eca7ac0af4f974ea1b1;hpb=24196b8fa2244f3cca1d12bf862db1978b31d83e;p=enc-live.git

diff --git a/en/next_steps.html b/en/next_steps.html
index 63f22f9..c8f49bc 100644
--- a/en/next_steps.html
+++ b/en/next_steps.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 	<head>
-			<meta charset="utf-8">
+			<meta http-equiv="content-type" content="text/html; 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="description" content="Email surveillance violates our fundamental rights and makes free speech risky. This guide will teach you email self-defense in 30 minutes with GnuPG." />
 
-      <meta name="viewport" content="width=device-width, initial-scale=1">
-			<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css">
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
+			<link rel="stylesheet" href="//static.fsf.org/nosvn/enc-dev0/css/main.css" />
   		<link rel="shortcut icon" href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
 
 	</head>
@@ -37,27 +37,41 @@
 				<!-- ~~~~~~~~~ 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>
+						<p><a id="infographic" href="infographic.html"><img src="//static.fsf.org/nosvn/enc-dev0/img/en/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>
+<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>
+
+<p style="font-size:150%">
+  <a href="https://status.fsf.org/fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+         class="share-logo" alt="[GNU Social]">
+    &nbsp;GNU Social
+  </a> |&nbsp;
+  <a href="http://microca.st/fsf">
+    <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+         class="share-logo" alt="[Pump.io]">
+    &nbsp;Pump.io
+  </a> |&nbsp;
+  <a href="https://www.twitter.com/fsf">Twitter</a>
+</p>
+<p><a href="https://www.fsf.org/twitter"><small>Read why GNU Social and Pump.io are better than Twitter.</small></a></p>
+<br />
 <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">
+<p style="font-size:150%">Low-volume mailing list</p>
+
+						<form method="post" action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31">
+						  <input type="text" placeholder="Type your email..." name="email-Primary" id="frmEmail" />
+                                                  <input type="submit" value="Add me" name="_qf_Edit_next" />
+							  <input type="hidden" value="https://emailselfdefense.fsf.org/en/confirmation.html" name="postURL" />
+                                                  <input type="hidden" value="1" name="group[25]" />
+                                                  <input type="hidden" value="https://my.fsf.org/civicrm/profile?reset=1&amp;id=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>
+<p><small>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 -->
@@ -66,9 +80,11 @@
 <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>
+<p><strong>This is the single biggest thing you can do to promote email encryption.</strong></p>
 
-<p>Add you public key fingerprint to your email signature so that people you are corresponding with know you accep encrypted mail.</p>
+<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="index.html#section4">GnuPG public key ID</a> so they can easily download your key.</p>
+
+<p>It's also great to add your public key fingerprint to your email signature so that people you are corresponding with know you accept encrypted email.</p>
 
 <p class="notes">We recommend you even go a step further and add it to 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>
 
@@ -86,14 +102,14 @@
 
 			<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>
+						<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, we recommend you 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>
+						<p><img src="//static.fsf.org/nosvn/enc-dev0/img/en/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>
@@ -101,9 +117,9 @@
 
 						<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>
+<p>To go the extra mile, support the Free Software Foundation so we can keep improving Email Self-Defense, and make more tools like it.</p><p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png" /></a> </p>
 
-<br>
+<br />
 
 					</div><!-- End .main -->
 				</div><!-- End #step-better .step -->
@@ -149,11 +165,11 @@
 		<footer class="row" id="footer">
 			<div>
 				<div id="copyright">
-					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"></a></h4>
+					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0, launched 6/18/2014. <!--LANGUAGE translation by NAME, NAME and NAME.--></em></p>
+                                        <p><em>Version 3.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></p>
 <p>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>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347; <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>
                                           <a href="//weblabels.fsf.org/emailselfdefense.fsf.org/"
                                              rel="jslicense">
