<p>Once you have set up your email with encryption, you can start contributing to encrypted traffic on the Internet. First we'll get your email client to import your secret key, and we will also learn how to get other people's public keys from servers so you can send and receive encrypted email.</p>
-<p># Open your email client and use "Tools" → <i>OpenPGP Manager</i></p>
+<p># Open your email client and use "Tools" → <i>OpenPGP Key Manager</i></p>
<p># Under "File" → <i>Import Secret Key(s) From File</i></p>
-<p># Select the file you saved under the name [my_secret_key.asc] in step <a href="#step-2b">step 2.b</a> when you exported your key</p>
+<p># Select the file you saved under the name [my_secret_key.asc] in <a href="#step-2b">step 2.b</a> when you exported your key</p>
<p># Unlock with your passphrase</p>
<p># You will receive a "OpenPGP keys successfully imported" window to confirm success</p>
-<p># Go to "Edit" (in Icedove) or "Tools" (in Thunderbird) → "Account settings" → "End-To-End Encryption," and make sure your key is imported and select <i>Treat this key as a Personal Key</i>.</p>
+<p># Go to "Account settings" → "End-To-End Encryption," and make sure your key is imported and select <i>Treat this key as a Personal Key</i>.</p>
</div><!-- End .main -->
to download it from a keyserver. You can do this in two different ways:</p>
<p><strong>Option 1.</strong> In the email answer you received from Edward as a response to your first email, Edward's public key was included. On the right of the email, just above the writing area, you will find an "OpenPGP" button that has a lock and a little wheel next to it. Click that, and select <i>Discover</i> next to the text: "This message was signed with a key that you don't yet have." A popup with Edward's key details will follow.</p>
-<p><strong>Option 2.</strong> Open your OpenPGP manager and under "Keyserver" choose <i>Discover Keys Online</i>. Here, fill in Edward's email address, and import Edward's key.</p>
+<p><strong>Option 2.</strong> Open your OpenPGP Key manager, and under "Keyserver" choose <i>Discover Keys Online</i>. Here, fill in Edward's email address, and import Edward's key.</p>
<p>The option <i>Accepted (unverified)</i> will add this key to your key manager, and now it can be used to send encrypted emails and to verify digital signatures from Edward.</p>