i18n: fix up english translations from untranslated templates, too

This commit is contained in:
Vincent Breitmoser 2019-11-09 12:12:04 +01:00
parent 555c895065
commit 10b177be8e
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
4 changed files with 28 additions and 23 deletions

View File

@ -54,9 +54,9 @@
The <strong>identity information</strong> in an OpenPGP key
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 email address, the key can
be found by everyone via search by address.
a key to be used for encryption or signature verification.
Once the owner gives consent by verifying their email address,
the key can be found via search by address.
</p>
<h3 id="community">Community and platform</h3>
@ -74,13 +74,12 @@
</p>
<p>
Technically, <tt>keys.openpgp.org</tt> runs on the
<a href="https://gitlab.com/hagrid-keyserver/hagrid" target="_blank">Hagrid</a>
keyserver software, which is based on
<a href="https://sequoia-pgp.org">Sequoia-PGP</a>. We are hosted on the
<a href="https://eclips.is" target="_blank">eclips.is</a> platform,
a hosting provider focused on Internet Freedom projects, run by
<a href="https://greenhost.net/" target="_blank">Greenhost</a>.
Technically,
<tt>keys.openpgp.org</tt> runs on the <a href="https://gitlab.com/hagrid-keyserver/hagrid" target="_blank">Hagrid</a> keyserver software,
which is based on <a href="https://sequoia-pgp.org">Sequoia-PGP</a>.
We are running on <a href="https://eclips.is" target="_blank">eclips.is</a>,
a hosting platform focused on Internet Freedom projects,
which is managed by <a href="https://greenhost.net/" target="_blank">Greenhost</a>.
</p>
</div>
{{/layout}}

View File

@ -148,9 +148,9 @@
<p>
The <span class="brand">keys.openpgp.org</span> service is meant for key
distribution and discovery, not as a de-facto CA. Client implementations
that want to offer verified communication should rely on their own trust
model.
distribution and discovery, not as a de facto certification authority.
Client implementations that want to offer verified communication should
rely on their own trust model.
</p>
<h3 id="revoked-uids"><a href="#revoked-uids">Why are revoked identities not
@ -158,7 +158,7 @@
<p>
When an OpenPGP key marks one of its identities as revoked, this
identity should no longer be considered valid for the key. And this
identity should no longer be considered valid for the key, and this
information should ideally be distributed to all OpenPGP clients that
already know about the newly revoked identity.
</p>
@ -184,7 +184,7 @@
If you have Tor installed,
you can reach <span class="brand">keys.openpgp.org</span> anonymously
as an
<a href="https://en.wikipedia.org/wiki/Tor_(anonymity_network)#Onion_services" target="_blank">onion service</a>:
<a href="https://support.torproject.org/onionservices/#onionservices-2" target="_blank">onion service</a>:
<br />
<a href="http://zkaan2xfbuxia2wpf7ofnkbz6r5zdbbvxbunvp5g2iebopbfc4iqmbad.onion">zkaan2xfbuxia2wpf7ofnkbz6r5zdbbvxbunvp5g2iebopbfc4iqmbad.onion</a>
</p>

View File

@ -23,7 +23,7 @@
(for <a href="https://www.thunderbird.net/en-US/thunderbird/68.0beta/releasenotes/" target="_blank">Thunderbird 68</a> or newer):
<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>During key creation, you can upload and verify your key.</li>
<li>Keys can be discovered by email address.</li>
</ul>
</p>
@ -53,7 +53,7 @@
</p>
<p>
Note that there is no built-in support for upload and email verification so far.
Note that there is no built-in support for upload and email address verification so far.
</p>
<h2>
@ -85,7 +85,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 email address (<a href="/about">what's that?</a>).
searchable by email address (<a href="/about">what does this mean?</a>).
</p>
<ul>
@ -97,8 +97,9 @@
</blockquote>
</li>
<li>
Alternatively, you can export them to a file and enter that into the
<a href="/upload" target="_blank">upload</a> page:
Alternatively, you can export them to a file
and select that file in the <a href="/upload" target="_blank">upload</a> page:
<blockquote>
gpg --export your_address@example.net &gt; my_key.pub
</blockquote>
@ -128,9 +129,9 @@
<h4 id="gnupg-tor"><a href="#gnupg-tor">Usage via Tor</a></h4>
<p>
For users who want to be extra-careful,
For users who want to be extra careful,
<span class="brand">keys.openpgp.org</span> can be reached anonymously as an
<a href="https://en.wikipedia.org/wiki/Tor_(anonymity_network)#Onion_services" target="_blank">onion service</a>.
<a href="https://support.torproject.org/onionservices/#onionservices-2" target="_blank">onion service</a>.
If you have
<a href="https://www.torproject.org/" target="_blank">Tor</a>
installed, use the following configuration:
@ -150,7 +151,7 @@
<p>
Missing a guide for your favorite implementation? This site is
a work-in-progress, and we are looking to improve. Drop us a line at
a work-in-progress, and we are looking to improve it. Drop us a line at
<span class="email">support at keys dot openpgp dot org</span> if you
want to help out!
</p>

View File

@ -6,6 +6,11 @@ for i in templates-untranslated/**/*.hbs; do
local suffix_file=${i:h}/template-suffix
echo -n "$template: "
echo -n "en "
local dist_path=dist/templates/$template
cat $prefix_file $i $suffix_file >! $dist_path
for translated in templates-translated/*/$template(N); do
local locale=${${translated#templates-translated/}%%/*}
local dist_path=dist/templates/localized/$locale/$template