Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
	en/index.html

diff --cc en/index.html
index c916875680cdb9587e6d081a22e4700cf901c69a,6ded51ee7967ee674985d5250f7fa684a3d6e05b..b2e9b94d950de83924014541d499e20504e1d1ee
--- 1/en/index.html
--- 2/en/index.html
+++ b/en/index.html
@@@ -157,10 -157,10 +157,16 @@@
                                                <div class="troubleshooting">
                                                        <h4>Troubleshooting</h4>
                                                        <dl>
+ 
                                                                <dt>I can't find the menu.</dt>
++<<<<<<< HEAD
 +                                                                      <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</dd>
 +                                                              <dt>My email looks weird</dt>
 +                                                                      <dd>Enigmail doesn't tend to play nice with HTML, which is used to format emails. To send an HTML-formatted email without encryption and or a signature, hold down the Shift key when you select compose. You can then write an email as if Enigmail wasn't there.</dd>
++=======
+                                                                       <dd>In many new email programs, the main menu is represented by an image of three stacked horizontal bars.</dd>         
+       
++>>>>>>> 9a00aa77a11cf9a9e6bb7cc459a30aa7c075885d
  
                                                                <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>
@@@ -533,6 -540,15 +546,18 @@@ default). Once encryption is off, hit S
                                        </div><!-- End .main -->
                                </div><!-- End #step-lost_key .step-->
  
++<<<<<<< HEAD
++=======
+                                 <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
+                                 <!---<div id="transfer-key" class="step">
+                                         <div class="main">
+                                                 <h3>Transferring you key</h3>
+                                                 <p>You can use Enigmail's <a href="https://www.enigmail.net/documentation/keyman.php">key management window</a> to import and export keys. If you want to be able to read your encrypted email on a different computer, you will need to export your secret key from here. Be warned, if you transfer the key without <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">encrypting</a> the drive it's on the transfer will be dramatically less secure.</p>
+                                         </div><!-- End .main -->
+                                 </div><!-- End #step-lost_key .step-->-->
+ 
+ 
++>>>>>>> 9a00aa77a11cf9a9e6bb7cc459a30aa7c075885d
  
                                  <!-- ~~~~~~~~~ a div for each step  ~~~~~~~~~ -->
                                  <div id="webmail-and-GnuPG" class="step">