From b91750372fe0963e3df3c89528d10182d22e2c18 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sat, 2 Nov 2019 11:56:59 +0100
Subject: [PATCH] i18n: e-mail -> email, in about files

---
 templates-untranslated/about/about.html.hbs   |  6 ++---
 templates-untranslated/about/faq.html.hbs     | 26 +++++++++----------
 templates-untranslated/about/news.html.hbs    | 22 ++++++++--------
 templates-untranslated/about/privacy.html.hbs | 12 ++++-----
 templates-untranslated/about/stats.html.hbs   |  4 +--
 templates-untranslated/about/usage.html.hbs   |  8 +++---
 6 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/templates-untranslated/about/about.html.hbs b/templates-untranslated/about/about.html.hbs
index fd06434..d06a866 100644
--- a/templates-untranslated/about/about.html.hbs
+++ b/templates-untranslated/about/about.html.hbs
@@ -20,7 +20,7 @@
     <ul>
         <li><strong>Identity information</strong> describes the parts of
             a key that identify its owner, also known as "User IDs".
-            A User ID typically includes a name and an e-mail address.
+            A User ID typically includes a name and an email address.
         </li>
         <li><strong>Non-identity information</strong> is all the technical
             information about the key itself. This includes the large numbers
@@ -54,7 +54,7 @@
         is only distributed with consent.
         It contains personal data, and is not strictly necessary for
         a key to be used for encryption or signature verification. Once the
-        owner gives consent by verifying their e-mail address, the key can
+        owner gives consent by verifying their email address, the key can
         be found by everyone via search by address.
     </p>
 
@@ -65,7 +65,7 @@
         You can talk to us in
         #hagrid on Freenode IRC,
         also reachable as #hagrid:stratum0.org on Matrix.
-        Of course you can also reach us via e-mail,
+        Of course you can also reach us via email,
         at <tt>support at keys dot openpgp dot org</tt>.
         The folks who are running this come
         from various projects in the OpenPGP ecosystem,
diff --git a/templates-untranslated/about/faq.html.hbs b/templates-untranslated/about/faq.html.hbs
index 33c52f4..a2579ab 100644
--- a/templates-untranslated/about/faq.html.hbs
+++ b/templates-untranslated/about/faq.html.hbs
@@ -34,7 +34,7 @@
         <li>
             Federation with open participation requires all data to be public.
             This significantly impacts the privacy of our users, because it
-            allows anyone to scrape a list of all e-mail addresses.
+            allows anyone to scrape a list of all email addresses.
         </li>
         <li>
             Servers run as a hobby by casual administrators do not meet our
@@ -43,25 +43,25 @@
     </ol>
 
     <h3 id="non-email-uids"><a href="#non-email-uids">Why is there no support
-            for identities that aren't e-mail addresses?</a></h3>
+            for identities that aren't email addresses?</a></h3>
 
     <p>
         We require explicit consent to distribute identity information.
-        Identities that aren't e-mail addresses, such as pictures or website
+        Identities that aren't email addresses, such as pictures or website
         URLs, offer no simple way for us to acquire this consent.
     </p>
 
     <p>
         Note: Some OpenPGP software creates keys with incorrectly formatted
-        e-mail addresses.  These addresses might not be recognized correctly on
+        email addresses.  These addresses might not be recognized correctly on
         <span class="brand">keys.openpgp.org</span>.
     </p>
 
     <h3 id="verify-multiple"><a href="#verify-multiple">Can I verify more than
-            one key for some e-mail address?</a></h3>
+            one key for some email address?</a></h3>
 
     <p>
-        An e-mail address can only be associated with a single key.
+        An email address can only be associated with a single key.
         When an address is verified for a new key,
         it will no longer appear in any key
         for which it was previously verified.
@@ -70,16 +70,16 @@
     </p>
 
     <p>
-        This means a search by e-mail address
+        This means a search by email address
         will only return a single key,
         not multiple candidates.
         This eliminates an impossible choice for the user
         ("Which key is the right one?"),
-        and makes key discovery by e-mail much more convenient.
+        and makes key discovery by email much more convenient.
     </p>
 
     <h3 id="email-protection"><a href="#email-protection">What do you do to
-            protect outgoing verification e-mails?</a></h3>
+            protect outgoing verification emails?</a></h3>
 
     <p>
         We use a modern standard called
@@ -87,14 +87,14 @@
         combined with
         <a href="https://starttls-everywhere.org/" target="_blank">STARTTLS Everywhere</a>
         by the EFF,
-        to make sure verification e-mails are sent out securely.
+        to make sure verification emails are sent out securely.
         This protects against eavesdropping and interception during delivery.
     </p>
 
     <p>
-        The MTA-STS mechanism depends on correctly configured e-mail servers.
+        The MTA-STS mechanism depends on correctly configured email servers.
         You can <a href="https://www.hardenize.com/">run this test</a>
-        to see if your e-mail provider supports it.
+        to see if your email provider supports it.
         If the "MTA-STS" entry on the left isn't a green checkmark,
         please ask your provider to update their configuration.
     </p>
@@ -189,7 +189,7 @@
     </p>
 
     <h3 id="encrypt-verification-emails"><a href="#encrypt-verification-emails">
-            Why not encrypt verification e-mails?</a></h3>
+            Why not encrypt verification emails?</a></h3>
 
     Various reasons:
     <ol>
diff --git a/templates-untranslated/about/news.html.hbs b/templates-untranslated/about/news.html.hbs
index 5666de3..aa03bf7 100644
--- a/templates-untranslated/about/news.html.hbs
+++ b/templates-untranslated/about/news.html.hbs
@@ -34,7 +34,7 @@
 
     <p>
         At the time of writing,
-        more than 70.000 e-mail addresses
+        more than 70.000 email addresses
         have been verified.
 
     <center style="margin-top: 2em; margin-bottom: 2em;">
@@ -87,11 +87,11 @@
     <p>
         One improvement that deserves special mention is
         <a href="https://www.hardenize.com/blog/mta-sts">MTA-STS</a>,
-        which improves the security of outgoing e-mails.
+        which improves the security of outgoing emails.
 
     <p>
         While HTTPS is deployed fairly universally these days,
-        that sadly isn't the case for E-Mail.
+        that sadly isn't the case for email.
         Many servers don't do encryption at all,
         or use a self-signed certificate
         instead of a proper one (e.g. from Let's Encrypt).
@@ -121,7 +121,7 @@
 
     <p>
         You can <a href="https://aykevl.nl/apps/mta-sts/" target="_blank">run a check</a>
-        to find out whether your e-mail provider
+        to find out whether your email provider
         supports MTA-STS.
         If they don't,
         please drop them a message and tell them
@@ -139,7 +139,7 @@
         To make this service more accessible,
         we are working with the OTF's
         <a href="https://www.opentech.fund/labs/localization-lab/" target="_blank">Localization Lab</a>
-        to make the website and outgoing e-mails
+        to make the website and outgoing emails
         available in several more languages.
 
     <p>
@@ -199,7 +199,7 @@
       <li>Precise. Searches return only a single key, which allows for easy key discovery.</li>
       <li>Validating. Identities are only published with consent,
         while non-identity information is freely distributed.</li>
-      <li>Deletable. Users can delete personal information with a simple e-mail confirmation.</li>
+      <li>Deletable. Users can delete personal information with a simple email confirmation.</li>
       <li>Built on Rust, powered by <a href="https://sequoia-pgp.org" target="_blank">Sequoia PGP</a> - free and open source, running AGPLv3.</li>
     </ul>
 
@@ -239,16 +239,16 @@
     that can also be revoked at any time.
 
     <p>
-    If a new key is verified for some e-mail address,
+    If a new key is verified for some email address,
     it will replace the previous one.
     This way,
-    every e-mail address is only associated with a single key at most.
+    every email address is only associated with a single key at most.
     It can also be removed from the listing
     at any time by the owner of the address.
     This is very useful for key discovery:
-    if a search by e-mail address returns a key,
+    if a search by email address returns a key,
     it means this is the single key
-    that is currently valid for the searched e-mail address.
+    that is currently valid for the searched email address.
 
     <h4>Support in Enigmail and OpenKeychain</h4>
 
@@ -260,7 +260,7 @@
     <a href="https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain&hl=en">OpenKeychain</a> on Android.
     This means users of those implementations will
     benefit from the faster response times,
-    and improved key discovery by e-mail address.
+    and improved key discovery by email address.
     We hope that this will also give us some momentum
     to build this project into a bigger community effort.
 
diff --git a/templates-untranslated/about/privacy.html.hbs b/templates-untranslated/about/privacy.html.hbs
index 88ad5e7..3cf5ff3 100644
--- a/templates-untranslated/about/privacy.html.hbs
+++ b/templates-untranslated/about/privacy.html.hbs
@@ -6,8 +6,8 @@
         distributes OpenPGP key data. The specific way in which data is processed
         differs by type as follows:
         <ul>
-          <li><b>E-Mail Addresses</b>
-              <p>E-Mail addresses contained in <abbr title="Packet Tag 13">User
+          <li><b>Email Addresses</b>
+              <p>Email addresses contained in <abbr title="Packet Tag 13">User
                       IDs</abbr> are personally identifiable information (PII).
                   Special care is taken to make sure they are used only with
                   consent:
@@ -16,9 +16,9 @@
                           Publishing requires <a target="_blank"
                               href="https://en.wikipedia.org/wiki/Opt-in_email#Confirmed_opt-in_(COI)_/_Double_opt-in_(DOI)">double
                               opt-in</a> validation, to prove ownership of the
-                          e-mail address in question.
+                          email address in question.
                       </li>
-                      <li>Addresses are searchable by exact E-Mail address,
+                      <li>Addresses are searchable by exact email address,
                           but not by associated name.</li>
                       <li>Enumeration of addresses is not possible.</li>
                       <li>Deletion of addresses is possible via simple proof
@@ -46,9 +46,9 @@
               </p>
           </li>
           <li><b>Other User ID data</b>
-              <p>An OpenPGP key may contain personal data other than E-Mail
+              <p>An OpenPGP key may contain personal data other than email
                   addresses, such as <abbr title="Packet Tag 13">User IDs</abbr>
-                  that do not contain E-Mail addresses, or <abbr
+                  that do not contain email addresses, or <abbr
                   title="Packet Tag 17">image attributes</abbr>. This data is stripped
               during upload and never stored, processed, or distributed in
               any way.
diff --git a/templates-untranslated/about/stats.html.hbs b/templates-untranslated/about/stats.html.hbs
index 0b8a9b3..d860e80 100644
--- a/templates-untranslated/about/stats.html.hbs
+++ b/templates-untranslated/about/stats.html.hbs
@@ -1,10 +1,10 @@
 <div class="about">
     <center><h2><a href="/about">About</a> | <a href="/about/news">News</a> | <a href="/about/usage">Usage</a> | <a href="/about/faq">FAQ</a> | Stats | <a href="/about/privacy">Privacy</a></h2></center>
 
-    <h3>Verified e-mail addresses</h3>
+    <h3>Verified email addresses</h3>
 
     <p>
-      A simple statistic of the total number of e-mail addresses that are currently verified. 📈
+      A simple statistic of the total number of email addresses that are currently verified. 📈
     </p>
 
     <p>
diff --git a/templates-untranslated/about/usage.html.hbs b/templates-untranslated/about/usage.html.hbs
index 4a7cbdb..798b28a 100644
--- a/templates-untranslated/about/usage.html.hbs
+++ b/templates-untranslated/about/usage.html.hbs
@@ -23,7 +23,7 @@
         <ul>
             <li>Keys will be kept up to date automatically.</li>
             <li>During key creation, you can optionally upload and verify your key.</li>
-            <li>Keys can be discovered by e-mail address.</li>
+            <li>Keys can be discovered by email address.</li>
         </ul>
     </p>
 
@@ -47,12 +47,12 @@
         since July 2019.
         <ul>
             <li>Keys will be kept up to date automatically.</li>
-            <li>Keys can be discovered by e-mail address.</li>
+            <li>Keys can be discovered by email address.</li>
         </ul>
     </p>
 
     <p>
-        Note that there is no built-in support for upload and e-mail verification so far.
+        Note that there is no built-in support for upload and email verification so far.
     </p>
 
     <h2>
@@ -84,7 +84,7 @@
     <p>
         Keys can be uploaded with GnuPG's <tt>--send-keys</tt> command, but
         identity information can't be verified that way to make the key
-        searchable by e-mail address (<a href="/about">what's that?</a>).
+        searchable by email address (<a href="/about">what's that?</a>).
     </p>
 
     <ul>