X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=en%2Fwindows.html;h=c2cef8ef85e36d24518ca94af02aa69a59403954;hb=515fdb60e025b15d7c7b903df0d7362a7f9b545c;hp=131317950430a758c1eff79d54987a3ac6fbc22c;hpb=946f0ee15a1f0e5f127565188da6c496c686d150;p=enc-live.git

diff --git a/en/windows.html b/en/windows.html
index 1313179..c2cef8e 100644
--- a/en/windows.html
+++ b/en/windows.html
@@ -59,7 +59,15 @@
                             </li>
 			    <li class="spacer">
                               <a href="https://fsf.org/share?u=https://u.fsf.org/zb&amp;t=Email encryption for everyone via %40fsf">
-                                #EmailSelfDefense
+                                 Share&nbsp;
+                                <img src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png"
+                                     class="share-logo" alt="[GNU Social]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png"
+                                      class="share-logo" alt="[Pump.io]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/reddit-alien.png"
+                                      class="share-logo" alt="[Reddit]">&nbsp;
+                                 <img src="//static.fsf.org/nosvn/enc-dev0/img/hacker-news.png"
+                                      class="share-logo" alt="[Hacker News]">
                               </a>
                             </li>
 			  </ul>
@@ -67,9 +75,9 @@
 				<!-- ~~~~~~~~~ FSF Introduction ~~~~~~~~~ -->
 				<div id="fsf-intro">
 					<h3><a href="http://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h3>
-					<span  style="font-size:125%"><p>We fight for computer users' rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.</p><p><strong>We want to heavily promote tools like this in-person and online, to help as many people as possible take the first step towards using free software to protect their privacy. Can you make a donation or become a member to help us achieve this goal?</strong></p></span>
+					<span  style="font-size:125%"><p>We fight for computer users' rights, and promote the development of free (as in freedom) software. Resisting bulk surveillance is very important to us.</p><p><strong>We want to translate this guide into more languages, and make a version for encryption on mobile devices. Please donate, and help people around the world take the first step towards protecting their privacy with free software.</strong></p></span>
 
-					<p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=14&pk_campaign=esd&pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/en/donate.png"/></a>      <a href="https://u.fsf.org/yr"><img alt="Join now" src="//static.fsf.org/nosvn/enc-dev0/img/en/join.png"/></a></p>
+					<p><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14&amp;pk_campaign=email_self_defense&amp;pk_kwd=guide_donate"><img alt="Donate" src="//static.fsf.org/nosvn/enc-dev0/img/es/donate.png"/></a>      </p>
 
 				</div><!-- End #fsf-intro -->
 
@@ -203,6 +211,8 @@
 						</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>
@@ -213,7 +223,7 @@
 						<div class="troubleshooting">
 							<h4>Troubleshooting</h4>
 							<dl>
-								<dt>The progress bar never finishes</dt>
+								<dt>The progress bar never finishes.hes</dt>
 										<dd>Close the upload popup, make sure you are connected to 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>
@@ -228,6 +238,7 @@
 
 					</div><!-- End .main -->
 				</div><!-- End #step-2b .step  -->
+
 				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
 				<div id="terminology" class="step">
 					<div class="main">
@@ -364,6 +375,7 @@
 
 					</div><!-- End .main -->
 				</div><!-- End #step-4a .step -->
+
 				<!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
 				<div id="step-sign_real_keys" class="step">
 					<div class="main">
@@ -449,7 +461,7 @@
 		<section class="row" id="section6">
 			<div id="step-click_here" class="step">
 					<div class="main">
-					  <h2><a href="next_steps.html">Click here when you're done</a></h2>
+					  <h2><a href="next_steps.html">Great job! Check out the next steps.</a></h2>
 
 					</div><!-- End .main -->
 				</div><!-- End #step-click_here .step-->
@@ -487,7 +499,7 @@
 				<div id="copyright">
 					<h4><a href="https://u.fsf.org/ys"><img alt="Free Software Foundation" src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png"/></a></h4>
 					<p>Copyright &copy; 2014 <a href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. <a href="https://u.fsf.org/yr">Join.</a></p>
-                                        <p><em>Version 2.0. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></p>
+                                        <p><em>Version 2.1. <a href="http://agpl.fsf.org/emailselfdefense.fsf.org/edward/CURRENT/edward.tar.gz">Source code of Edward reply bot by Josh Drake &lt;zamnedix@gnu.org&gt; available under the GNU General Public License.</a></em></p>
 <p>The images on this page are under a <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 license (or later version)</a>, and the rest of it is under a <a href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 license (or later version)</a>. &mdash; <a href="http://www.gnu.org/licenses/license-list.html#OtherLicenses">Why these licenses?</a></p>
 					<p>Download the source package for <a href="emailselfdefense_source.zip">this guide</a>. Fonts used in the guide &amp; infographic: <a href="https://www.google.com/fonts/specimen/Dosis">Dosis</a> by Pablo Impallari, <a href="http://www.google.com/fonts/specimen/Signika">Signika</a> by Anna Giedry&#347;, <a href="http://www.google.com/fonts/specimen/Archivo+Narrow">Archivo Narrow</a> by Omnibus-Type, <a href="http://www.thegopherarchive.com/gopher-files-hacks-pxl2000-119351.htm">PXL-2000</a> by Florian Cramer.</p>
                                         <p>