kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

i18n: more feedback from AO

This commit is contained in:
Vincent Breitmoser 2019-11-06 10:52:11 +01:00
parent 2556073a63
commit 9c0e7d6ffe
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/email-templates/manage.htm.hbs vendored
View File

@ -8,7 +8,7 @@
<p>
{{ text "Hi," }}
<p>
{{ text "this is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>." rerender }}
{{ text "This is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>." rerender }}
{{ text "If you didn't request this message, please ignore it." }}
<p>
{{ text "OpenPGP key: <tt>{{primary_fp}}</tt>" rerender }}

2
dist/email-templates/manage.txt.hbs vendored
View File

@ -1,6 +1,6 @@
{{ text "Hi," }}
{{ text "this is an automated message from {{domain}}." rerender }}
{{ text "This is an automated message from {{domain}}." rerender }}
{{ text "If you didn't request this message, please ignore it." }}
{{ text "OpenPGP key: {{primary_fp}}" rerender }}

2
dist/email-templates/verify.htm.hbs vendored
View File

@ -8,7 +8,7 @@
<p>
{{ text "Hi," }}
<p>
{{ text "this is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>." rerender }}
{{ text "This is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>." rerender }}
{{ text "If you didn't request this message, please ignore it." }}
<p>
{{ text "OpenPGP key: <tt>{{primary_fp}}</tt>" rerender }}

2
dist/email-templates/verify.txt.hbs vendored
View File

@ -1,6 +1,6 @@
{{ text "Hi," }}
{{ text "this is an automated message from {{domain}}." rerender }}
{{ text "This is an automated message from {{domain}}." rerender }}
{{ text "If you didn't request this message, please ignore it." }}
{{ text "OpenPGP key: {{primary_fp}}" rerender }}

2
dist/email-templates/welcome.htm.hbs vendored
View File

@ -8,7 +8,7 @@
<p>
Hi,
<p>
this is an automated message from <a href="{{base_uri}}" style="text-decoration:none; color: #333">{{domain}}</a>.
This is an automated message from <a href="{{base_uri}}" style="text-decoration:none; color: #333">{{domain}}</a>.
If you didn't upload your key there, please ignore this message.
<p>
OpenPGP key: <tt>{{primary_fp}}</tt>

2
dist/email-templates/welcome.txt.hbs vendored
View File

@ -1,6 +1,6 @@
Hi,
this is an automated message from {{domain}}.
This is an automated message from {{domain}}.
If you didn't upload your key, please ignore this message.
OpenPGP key: {{primary_fp}}

6
po/hagrid/hagrid.pot
View File

@ -235,7 +235,7 @@ msgid "Hi,"
msgstr ""
#: src/gettext_strings.rs:59
msgid "this is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>."
msgid "This is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>."
msgstr ""
#: src/gettext_strings.rs:60
@ -259,7 +259,7 @@ msgid "distributing OpenPGP keys since 2019"
msgstr ""
#: src/gettext_strings.rs:67
msgid "this is an automated message from {{domain}}."
msgid "This is an automated message from {{domain}}."
msgstr ""
#: src/gettext_strings.rs:69
@ -311,7 +311,7 @@ msgid "No key uploaded."
msgstr ""
#: src/web/vks.rs:178
msgid "Error processing uploaded key"
msgid "Error processing uploaded key."
msgstr ""
#: src/web/vks.rs:248

8
src/gettext_strings.rs
View File

@ -56,7 +56,7 @@ fn _dummy() {
t!("Manage your key on {{domain}}");
t!("Hi,");
t!("this is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>.");
t!("This is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>.");
t!("If you didn't request this message, please ignore it.");
t!("OpenPGP key: <tt>{{primary_fp}}</tt>");
t!("To manage and delete listed addresses on this key, please follow the link below:");
@ -64,7 +64,7 @@ fn _dummy() {
t!("distributing OpenPGP keys since 2019");
t!("Hi,");
t!("this is an automated message from {{domain}}.");
t!("This is an automated message from {{domain}}.");
t!("If you didn't request this message, please ignore it.");
t!("OpenPGP key: {{primary_fp}}");
t!("To manage and delete listed addresses on this key, please follow the link below:");
@ -74,7 +74,7 @@ fn _dummy() {
t!("Verify {{userid}} for your key on {{domain}}");
t!("Hi,");
t!("this is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>.");
t!("This is an automated message from <a href=\"{{base_uri}}\" style=\"text-decoration:none; color: #333\">{{domain}}</a>.");
t!("If you didn't request this message, please ignore it.");
t!("OpenPGP key: <tt>{{primary_fp}}</tt>");
t!("To let others find this key from your email address \"<a rel=\"nofollow\" href=\"#\" style=\"text-decoration:none; color: #333\">{{userid}}</a>\", please click the link below:");
@ -82,7 +82,7 @@ fn _dummy() {
t!("distributing OpenPGP keys since 2019");
t!("Hi,");
t!("this is an automated message from {{domain}}.");
t!("This is an automated message from {{domain}}.");
t!("If you didn't request this message, please ignore it.");
t!("OpenPGP key: {{primary_fp}}");
t!("To let others find this key from your email address \"{{userid}}\",\nplease follow the link below:");

2
src/web/vks.rs
View File

@ -175,7 +175,7 @@ fn process_key_single(
Ok(ImportResult::New(tpk_status)) => (tpk_status, true),
Ok(ImportResult::Updated(tpk_status)) => (tpk_status, false),
Ok(ImportResult::Unchanged(tpk_status)) => (tpk_status, false),
Err(_) => return UploadResponse::err(i18n!(i18n.catalog, "Error processing uploaded key")),
Err(_) => return UploadResponse::err(i18n!(i18n.catalog, "Error processing uploaded key.")),
};
let verify_state = {

19
templates-untranslated/about/about.html.hbs
View File

@ -53,9 +53,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>
@ -73,12 +73,11 @@
</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>

17
templates-untranslated/about/usage.html.hbs
View File

@ -22,7 +22,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>
@ -52,7 +52,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>
@ -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 email address (<a href="/about">what's that?</a>).
searchable by email address (<a href="/about">what does this mean?</a>).
</p>
<ul>
@ -96,8 +96,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>
@ -127,9 +128,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:
@ -149,7 +150,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>