more porting work

2 files changed, 8 insertions, 10 deletions

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 2b643c961..dadfbb537 100644
--- a/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl
+++ b/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl
@@ -17,14 +17,12 @@
   # Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
-<p>Some [% terms.bugs %] in this [% terms.Bugzilla %] are in groups the administrator has 
-deemed 'secure'. This means emails containing information about those [% terms.bugs %] 
+<p>Some bugs in this [% terms.Bugzilla %] are in groups the administrator has 
+deemed 'secure'. This means emails containing information about those 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 %].</p>
+SMIME certificate here to receive full update emails for such bugs.</p>
 
-<p>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.</p>
+<p>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.</p>
 
 <p><a href="page.cgi?id=securemail/help.html">More help is available</a>.</p>
 
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 4e1a5c577..76525eac2 100644
--- a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl
+++ b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl
@@ -24,12 +24,12 @@
   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 
+Bugzilla considers certain groups as "secure". If a bug is in one of those groups, 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 <a href="[% urlbase FILTER none %]userprefs.cgi?tab=securemail">SecureMail preferences tab</a>.<br>
 <br>
 In addition, if you have uploaded a S/MIME or GPG/PGP key using the <a href="[% urlbase FILTER none %]userprefs.cgi?tab=securemail">
-SecureMail preferences tab</a>, if you request your password to be reset, [% terms.Bugzilla %] will send the reset email encrypted and you will
+SecureMail preferences tab</a>, if you request your password to be reset, Bugzilla will send the reset email encrypted and you will
 be required to decrypt it to view the reset instructions.
 
 <h2>S/MIME</h2>
@@ -86,7 +86,7 @@ You’ll have to answer several questions:</p>
 
 <p><code>gpg --armor --output pubkey.txt --export 'Your Name'</code></p>
 
-<p>Paste the contents of pubkey.txt into the SecureMail text field in [% terms.Bugzilla %]. 
+<p>Paste the contents of pubkey.txt into the SecureMail text field in Bugzilla. 
 
 <li>Configure your email client to use your associated private key to decrypt the encrypted emails. For Thunderbird, you need the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/enigmail/">Enigmail</a> extension.</p>
 </ol>