Integrated Mac and Windows

diff --git a/en/index.html b/en/index.html
index 99b4d30709d8032fd57f4bb7deaadd5e22c33184..e212027193b917e97aff8324a1ee9dedfdd25a0d 100644 (file)
--- a/en/index.html
+++ b/en/index.html
@@ -466,9 +466,9 @@ window.addEventListener("keydown",  function  (event)  {
 </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="index.html" class="current">Set up guide</a></li>
+<!--<li><a href="mac.html">Mac OS</a></li>-->
+<!--<li><a href="windows.html">Windows</a></li>-->
 <li class="spacer"><a href="workshops.html">Teach your friends</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">
@@ -578,7 +578,8 @@ alt="Step 1.A: Install Wizard" /></p>
 <h3><em>Step 1.a</em> Set up your email program with your email account</h3>
 
 <p>Open your email program and follow the wizard (step-by-step walkthrough)
-that sets it up with your email account.</p>
+that sets it up with your email account. This usually starts from "Account Settings" &rarr; "Add Mail Account". You should get the email server settings from your systems administrator or the help section of your email account.</p>
+<br />
 
 <!-- ~~~~~~~~~ Troubleshooting ~~~~~~~~~ -->
 <div class="troubleshooting">
@@ -610,6 +611,48 @@ page</a>.</dd>
 </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 your terminal ready and install GnuPG</h3>
+
+<p>If you are working on a GNU/Linux machine, you should already have GnuPG installed, and you can skip to <a href="#section2">Step 2</a>.</p>
+<p>If you are working on a macOS or Windows machine however, you need to first install the GnuPG program. Select your operating system below and follow the steps. For the rest of the steps in this guide, the steps are the same for all operating systems. </p>
+
+<!-- ~~~~~~~~~ MACOS ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>MacOS</h4>
+
+<dl>
+<dt>Use a third-party package manager to install GnuPG</dt>
+<dd>Your macOS comes with a pre-installed terminal which we'll use to setup your encryption using the GnuPG program. However, the default macOS package manager makes it difficult to install GnuPG and other pieces of free software.</p>
+To make things easier, we recommend setting up the third-party package manager "Homebrew" to install GnuPG. Copy the link on the home page of <a href="https://brew.sh/">Homebrew</a> and paste it in your Terminal. Click "Enter" and wait for it to finalize.</p>
+When it is done, install the program by entering the following code:</p>
+<text style="color:#2f5faa; font-family: monospace;">brew install gnupg gnupg2</text>. After installation is done, you can follow the steps of the rest of this guide.</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+
+<!-- ~~~~~~~~~ WINDOWS ~~~~~~~~~ -->
+<div class="troubleshooting">
+
+<h4>Windows</h4>
+
+<dl>
+<dt>Get GnuPG by downloading GPG4Win</dt>
+<dd><a href="https://www.gpg4win.org/">GPG4Win</a> is a email and file encryption software package that includes GnuPG. Download and install the latest version, choosing default options whenever asked. After it's installed, you can close any windows that it creates.</p>
+Open the "Powershell" and follow the steps of the rest of this guide.
+
+<p class="notes">When we refer to the "terminal" in the rest of this guide, for your Windows machine, that is the "Powershell"</p>
+</dd>
+</dl>
+
+</div><!-- /.troubleshooting -->
+</div><!-- End .main -->
+</div><!-- End #step1-b .step -->
+
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="terminology" class="step">
 <div class="main">
@@ -889,9 +932,6 @@ alt="Step 3.A: Thunderbird Menu" /></p>
 <p><img src="//static.fsf.org/nosvn/enc-dev1/img/en/screenshots/step3a-import-from-file.png"
 alt="Step 3.A: Import From File" /></p>
 <br />
-<p><img src="//static.fsf.org/nosvn/enc-dev1/img/en/screenshots/step3a-select-file.png"
-alt="Step 3.A: Select File" /></p>
-<br />
 <p><img src="//static.fsf.org/nosvn/enc-dev1/img/en/screenshots/step3a-success.png"
 alt="Step 3.A: Success" /></p>
 </div><!-- /.sidebar -->
@@ -1514,7 +1554,7 @@ default program and I don't want it to be.</dt>
 alt="Free Software Foundation"
 src="//static.fsf.org/nosvn/enc-dev0/img/fsf-logo.png" /></a></h4>
 
-<p>Copyright &copy; 2021 <a
+<p>Copyright &copy; 2014-2021 <a
 href="https://u.fsf.org/ys">Free Software Foundation</a>, Inc. <a
 href="https://my.fsf.org/donate/privacypolicy.html">Privacy Policy</a>. Please
 support our work by <a href="https://u.fsf.org/yr">joining us as an associate