From 402928d85573365657eac591fe067286600d7071 Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Thu, 23 Nov 2023 15:18:29 -0800 Subject: [PATCH 01/12] updated lookup.html annotation --- securedrop/source_templates/lookup.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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')) }}

From ac1ba8d1c51bad0369d90abeac5de73c1882ac2d Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 11:29:54 -0800 Subject: [PATCH 02/12] updated logout page --- securedrop/source_templates/logout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securedrop/source_templates/logout.html b/securedrop/source_templates/logout.html index d706ad82a2..491a8fe0f0 100644 --- a/securedrop/source_templates/logout.html +++ b/securedrop/source_templates/logout.html @@ -10,7 +10,7 @@

{{ 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 %} From 30df379ea3a3ed7761a2cfca24beba472718b646 Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 11:37:41 -0800 Subject: [PATCH 03/12] updated index.html annotations --- securedrop/source_templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html index 48d10a15af..beb2fb71da 100644 --- a/securedrop/source_templates/index.html +++ b/securedrop/source_templates/index.html @@ -22,7 +22,7 @@ - {# 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. #} Date: Sat, 25 Nov 2023 11:40:32 -0800 Subject: [PATCH 04/12] updated footer --- securedrop/source_templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }}.

{{ 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 }} From 88bc3651cb0c6d5ba0b8cc0c5ddc7a8c5d2edf64 Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 11:49:21 -0800 Subject: [PATCH 06/12] updated tor2web-warning annotations --- securedrop/source_templates/tor2web-warning.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.') }}

    From e9f49ca0fedb4972704a3f1bfb2be4979b25eab9 Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 11:55:24 -0800 Subject: [PATCH 07/12] updated annotations on account_new_two_factor.html --- securedrop/journalist_templates/account_new_two_factor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securedrop/journalist_templates/account_new_two_factor.html b/securedrop/journalist_templates/account_new_two_factor.html index 508aedeb36..d2e25eebf1 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.") }}

    From 3a2cbd3b52b06d250386800abce87f2d83994646 Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 11:56:57 -0800 Subject: [PATCH 08/12] updated annotations --- securedrop/journalist_templates/account_new_two_factor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securedrop/journalist_templates/account_new_two_factor.html b/securedrop/journalist_templates/account_new_two_factor.html index d2e25eebf1..89652e367e 100644 --- a/securedrop/journalist_templates/account_new_two_factor.html +++ b/securedrop/journalist_templates/account_new_two_factor.html @@ -12,7 +12,7 @@

    {{ gettext('Enable FreeO
    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:') }}
    From ea8789eed7de847371f047627854b8ca0fb56a7c Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 12:09:11 -0800 Subject: [PATCH 09/12] updated annotations --- securedrop/journalist_templates/account_new_two_factor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securedrop/journalist_templates/account_new_two_factor.html b/securedrop/journalist_templates/account_new_two_factor.html index 89652e367e..c116f0f677 100644 --- a/securedrop/journalist_templates/account_new_two_factor.html +++ b/securedrop/journalist_templates/account_new_two_factor.html @@ -23,7 +23,7 @@

    {{ gettext('Enable FreeO {{ 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 %}
    From ef8222b347d72b5be152600c34206158b13e7ea2 Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 12:16:01 -0800 Subject: [PATCH 10/12] updated config annotations --- securedrop/journalist_templates/config.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securedrop/journalist_templates/config.html b/securedrop/journalist_templates/config.html index d4b20fcef0..1f274b7173 100644 --- a/securedrop/journalist_templates/config.html +++ b/securedrop/journalist_templates/config.html @@ -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:') }}

    From 2788b856eb5d5b89b14c47ee82cd698ebdfb268b Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 12:19:12 -0800 Subject: [PATCH 11/12] updated config annotations --- securedrop/journalist_templates/config.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/securedrop/journalist_templates/config.html b/securedrop/journalist_templates/config.html index 1f274b7173..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:') }}

    From fdb1be3cdb19304a21580dde3c82d2ff0830e9e0 Mon Sep 17 00:00:00 2001 From: Amna Khan Date: Sat, 25 Nov 2023 12:22:33 -0800 Subject: [PATCH 12/12] updated annotations --- securedrop/journalist_templates/admin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %}