diff --git a/securedrop/journalist_templates/account_new_two_factor.html b/securedrop/journalist_templates/account_new_two_factor.html index 508aedeb36..c116f0f677 100644 --- a/securedrop/journalist_templates/account_new_two_factor.html +++ b/securedrop/journalist_templates/account_new_two_factor.html @@ -4,7 +4,7 @@ {% block body %} {% if user.is_totp %} -

{{ gettext('Enable FreeOTP') }}

+

{{ gettext('Enable FreeOTP') }}

{{ gettext("You're almost done! To finish resetting your two-factor authentication, follow the instructions below to set up FreeOTP. Once you've added the entry for your account in the app, enter one of the 6-digit codes from the app to confirm that two-factor authentication is set up correctly.") }}

@@ -12,7 +12,7 @@

{{ gettext('Enable FreeOTP') }}

  1. {{ gettext('Install FreeOTP on your phone') }}
  2. {{ gettext('Open the FreeOTP app') }}
    3. -
  3. {{ gettext('Tap the QR code symbol at the top') }}
    4. +
  4. {{ gettext('Tap the QR code symbol at the top') }}
  5. {{ gettext('Your phone will now be in "scanning" mode. When you are in this mode, scan the barcode below:') }}
@@ -23,7 +23,7 @@

{{ gettext('Enable FreeOTP') }}

{{ user.formatted_otp_secret }}

{{ gettext("Once you have paired FreeOTP with this account, enter the 6-digit verification code below:") }}

{% else %} -

{{ gettext('Enable YubiKey (OATH-HOTP)') }}

+

{{ gettext('Enable YubiKey (OATH-HOTP)') }}

{{ gettext('Once you have configured your YubiKey, enter the 6-digit verification code below:') }}

{% endif %}
diff --git a/securedrop/journalist_templates/admin.html b/securedrop/journalist_templates/admin.html index 5b2bb98745..0bbf88d22a 100644 --- a/securedrop/journalist_templates/admin.html +++ b/securedrop/journalist_templates/admin.html @@ -85,7 +85,7 @@ - {{ gettext('INSTANCE CONFIG') }} + {{ gettext('INSTANCE CONFIG') }} {% endblock %} diff --git a/securedrop/journalist_templates/config.html b/securedrop/journalist_templates/config.html index d4b20fcef0..cc3800e2f0 100644 --- a/securedrop/journalist_templates/config.html +++ b/securedrop/journalist_templates/config.html @@ -15,7 +15,7 @@

{{ gettext('Organization Name') }}

+ for="organization_name">{{ gettext('Set the organization name used on the SecureDrop web interfaces:') }}
{{ organization_name_form.organization_name() }}
@@ -32,7 +32,7 @@

{{ gettext('Organization Name') }}

{{ gettext('Logo Image') }}

-

{{ gettext('Here you can update the image displayed on the SecureDrop web interfaces:') }}

+

{{ gettext('Here you can update the image displayed on the SecureDrop web interfaces:') }}

@@ -94,7 +94,7 @@

{{ gettext('Submission Preferences') }}

{{ gettext('Alerts') }}

-

{{ gettext('Send an encrypted email to verify if OSSEC alerts work correctly:') }}

+

{{ gettext('Send an encrypted email to verify if OSSEC alerts work correctly:') }}

diff --git a/securedrop/source_templates/footer.html b/securedrop/source_templates/footer.html index 072ae1bf6b..733943122a 100644 --- a/securedrop/source_templates/footer.html +++ b/securedrop/source_templates/footer.html @@ -3,7 +3,7 @@ {{ gettext('Powered by') }} SecureDrop {{ version }}.

- {# Warning bubble to help TB users disable JavaScript with Tor Browser's Security Levels + {# Warning bubble to help TB users disable JavaScript with Tor Browser's Security Levels Included here so the images can preload while the user is first reading the page. Hidden by default. #}

{{ gettext('One more thing...') }}

- {{ gettext('Click the  New Identity button in your Tor Browser\'s toolbar. This will clear your Tor Browser activity data on this device.').format(icon=url_for('static', filename='i/torbroom.png')) }} + {{ gettext('Click the  New Identity button in your Tor Browser\'s toolbar. This will clear your Tor Browser activity data on this device.').format(icon=url_for('static', filename='i/torbroom.png')) }}

{% endblock %} diff --git a/securedrop/source_templates/lookup.html b/securedrop/source_templates/lookup.html index 43728acd5c..ad64e27056 100644 --- a/securedrop/source_templates/lookup.html +++ b/securedrop/source_templates/lookup.html @@ -26,9 +26,9 @@

{{ gettext('Submit Messages') }}

{% if allow_document_uploads %} - {{ gettext('If you are already familiar with GPG, you can optionally encrypt your files and messages with our public key before submission. Files are encrypted as they are received by SecureDrop.').format(url=url_for('info.download_public_key')) }} + {{ gettext('If you are already familiar with GPG, you can optionally encrypt your files and messages with our public key before submission. Files are encrypted as they are received by SecureDrop.').format(url=url_for('info.download_public_key')) }} {% else %} - {{ gettext('If you are already familiar with GPG, you can optionally encrypt your messages with our public key before submission.').format(url=url_for('info.download_public_key')) }} + {{ gettext('If you are already familiar with GPG, you can optionally encrypt your messages with our public key before submission.').format(url=url_for('info.download_public_key')) }} {% endif %} {{ gettext('Learn more.').format(url=url_for('info.why_download_public_key')) }}

diff --git a/securedrop/source_templates/tor2web-warning.html b/securedrop/source_templates/tor2web-warning.html index c50f3e6c5c..5ed751b8f1 100644 --- a/securedrop/source_templates/tor2web-warning.html +++ b/securedrop/source_templates/tor2web-warning.html @@ -7,7 +7,7 @@

{{ gettext('Proxy Service Detected') }}

{% include 'flashed.html' %}
-

{{ gettext('You appear to be using a Tor proxy service to access SecureDrop. Proxy services do not protect your anonymity.') }} +

{{ gettext('You appear to be using a Tor proxy service to access SecureDrop. Proxy services do not protect your anonymity.') }}

{{ gettext('Anyone monitoring your Internet traffic — including your government, your Internet provider, or the proxy operator — may be able to identify you.') }}

diff --git a/securedrop/source_templates/why-public-key.html b/securedrop/source_templates/why-public-key.html index 3c4014b3c2..b8e3c948e0 100644 --- a/securedrop/source_templates/why-public-key.html +++ b/securedrop/source_templates/why-public-key.html @@ -6,7 +6,7 @@

{{ gettext("Why download the team's public key?") }}

{{ gettext("SecureDrop encrypts files and messages after they are submitted. Encrypting messages and files before submission can provide an extra layer of security before your data reaches the SecureDrop server.") }}

-

{{ gettext("If you are already familiar with the GPG encryption software, you may wish to encrypt your submissions yourself. To do so:") }} +

{{ gettext("If you are already familiar with the GPG encryption software, you may wish to encrypt your submissions yourself. To do so:") }}

  1. {{ gettext('Download the public key. It will be saved to a file called:

    {submission_key_fpr_filename}

    ').format(url=url_for('info.download_public_key'), submission_key_fpr_filename=submission_key_fpr + '.asc')|safe }}