From 09dd4d3192073ba9ecc7feb8a5dfcd213affd525 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Mon, 24 Sep 2018 17:27:12 -0400 Subject: Bug 1493500 - Remove all trailing whitespaces from all files --- .../en/default/account/email/encryption-required.txt.tmpl | 2 +- .../template/en/default/account/prefs/securemail.html.tmpl | 8 ++++---- .../en/default/hook/account/prefs/prefs-tabs.html.tmpl | 2 +- .../en/default/hook/admin/groups/create-field.html.tmpl | 6 +++--- .../en/default/hook/admin/groups/edit-field.html.tmpl | 2 +- .../en/default/hook/admin/users/userdata-end.html.tmpl | 2 +- .../en/default/hook/global/user-error-errors.html.tmpl | 6 +++--- .../template/en/default/pages/securemail/help.html.tmpl | 14 +++++++------- 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'extensions/SecureMail/template') diff --git a/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl b/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl index 55b716864..872cea30c 100644 --- a/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl +++ b/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl @@ -12,7 +12,7 @@ preferences. [% IF bug_id || email_type == 'whine' %] In order to receive the full text of similar mails in the future, please -go to: +go to: [%+ urlbase %]userprefs.cgi?tab=securemail and provide a key or certificate. diff --git a/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl b/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl index db595a23f..ffe182de8 100644 --- a/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl +++ b/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander @@ -23,9 +23,9 @@ [% END %] -

Some [% terms.bugs %] in this [% terms.Bugzilla %] are in groups the administrator has -deemed 'secure'. This means emails containing information about those [% terms.bugs %] -will only be sent encrypted. Enter your PGP/GPG public key or +

Some [% terms.bugs %] in this [% terms.Bugzilla %] are in groups the administrator has +deemed 'secure'. This means emails containing information about those [% terms.bugs %] +will only be sent encrypted. Enter your PGP/GPG public key or SMIME certificate here to receive full update emails for such [% terms.bugs %].

If you are a member of a secure group, or if you enter a key here, your password reset email will also be sent to you encrypted. If you are a member of a secure group and do not enter a key, you will not be able to reset your password without the assistance of an administrator.

diff --git a/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl b/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl index 70a40e592..1662e28af 100644 --- a/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl @@ -17,7 +17,7 @@ # All Rights Reserved. # # Contributor(s): Max Kanat-Alexander - # Gervase Markham + # Gervase Markham #%] [% tabs = tabs.import([{ diff --git a/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl b/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl index 27c644d02..a3d5069cc 100644 --- a/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander @@ -21,5 +21,5 @@ - - + + diff --git a/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl b/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl index 253fed29e..7aaf35d7d 100644 --- a/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander diff --git a/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl b/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl index e5e299ef9..cf0ec3e03 100644 --- a/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl @@ -14,7 +14,7 @@ [% otheruser.public_key ? "Yes" : "No" %] - + Member of Secure Mail Group: diff --git a/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl index 46b093674..507874fe4 100644 --- a/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander @@ -20,8 +20,8 @@ [% IF error == "securemail_invalid_key" %] [% title = "Invalid Public Key" %] We were unable to read the public key that you entered. Make sure - that you are entering either an ASCII-armored PGP/GPG public key, - including the "BEGIN PGP PUBLIC KEY BLOCK" and "END PGP PUBLIC KEY BLOCK" + that you are entering either an ASCII-armored PGP/GPG public key, + including the "BEGIN PGP PUBLIC KEY BLOCK" and "END PGP PUBLIC KEY BLOCK" lines, or a PEM format (Base64-encoded X.509) S/MIME key, including the BEGIN CERTIFICATE and END CERTIFICATE lines.

[% errstr FILTER html %] [% END %] diff --git a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl index 928c7f1d4..378d007f0 100644 --- a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl +++ b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl @@ -24,8 +24,8 @@ title = "SecureMail Help" %] -[% terms.Bugzilla %] considers certain groups as "secure". If a [% terms.bug %] is in one of those groups, [% terms.Bugzilla %] will not send unencrypted -email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either +[% terms.Bugzilla %] considers certain groups as "secure". If a [% terms.bug %] is in one of those groups, [% terms.Bugzilla %] will not send unencrypted +email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either a S/MIME or a GPG/PGP key on the SecureMail preferences tab.

In addition, if you have uploaded a S/MIME or GPG/PGP key using the @@ -36,9 +36,9 @@ be required to decrypt it to view the reset instructions. S/MIME Keys must be in PEM format - i.e. Base64-encoded text, with the first line containing BEGIN CERTIFICATE.

-

S/MIME certificates can be obtained from a number of providers. -Once you have it, export it from your browser as a .p12 file and import it into your mail client. -You'll need to provide a password when you export - pick a strong one, +

S/MIME certificates can be obtained from a number of providers. +Once you have it, export it from your browser as a .p12 file and import it into your mail client. +You'll need to provide a password when you export - pick a strong one, and then back up the .p12 file somewhere safe.

Import on Thunderbird as follows:

@@ -81,7 +81,7 @@ Then, you need to convert it to a .pem file. Here are two possible ways to do th

Open the .pem file in a text editor. You can recognise the public key because -it starts "BEGIN CERTIFICATE" and ends "END CERTIFICATE" and +it starts "BEGIN CERTIFICATE" and ends "END CERTIFICATE" and has an appropriate friendly name (e.g. "StartCom Free Certificate Member's StartCom Ltd. ID").

Paste the contents of the .pem file into the SecureMail text field in [% terms.Bugzilla %].

@@ -117,7 +117,7 @@ You’ll have to answer several questions:

gpg --armor --output pubkey.txt --export 'Your Name'

-

Paste the contents of pubkey.txt into the SecureMail text field in [% terms.Bugzilla %]. +

Paste the contents of pubkey.txt into the SecureMail text field in [% terms.Bugzilla %].

  • Configure your email client to use your associated private key to decrypt the encrypted emails. For Thunderbird, you need the Enigmail extension.

    -- cgit v1.2.3-24-g4f1b