more porting work

1 files changed, 11 insertions, 11 deletions

diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
index e7cea5d2b..fdc4b5f0c 100644
--- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
@@ -62,9 +62,9 @@ the <a href="https://bugzilla.mozilla.org/enter_bug.cgi">full product list</a>.
 
 <p>
 <b>The product you have chosen is for [% terms.bug %] reports and enhancement requests for the 
-<a href="http://www.bugzilla.org/">Bugzilla [% terms.bug %] tracking software</a> only.</b>
-If your [% terms.bug %] is not reporting that Bugzilla is broken or that you'd like
-a new feature in Bugzilla, your [% terms.bug %] report does not belong in this product.
+<a href="http://www.bugzilla.org/">[% terms.Bugzilla +%] [%+ terms.bug %] tracking software</a> only.</b>
+If your [% terms.bug %] is not reporting that [% terms.Bugzilla %] is broken or that you'd like
+a new feature in [% terms.Bugzilla %], your [% terms.bug %] report does not belong in this product.
 [% IF format == "guided" %]
    See the instructions next to the stop sign above.
 [% ELSE %]
@@ -72,22 +72,22 @@ a new feature in Bugzilla, your [% terms.bug %] report does not belong in this p
 [% END %]
 </p>
 
-<p><b>We WILL NOT accept [% terms.bug %] reports for Bugzilla
-installed via the Debian packaging system.  If you obtained Bugzilla from Debian,
+<p><b>We WILL NOT accept [% terms.bug %] reports for [% terms.Bugzilla %]
+installed via the Debian packaging system.  If you obtained [% terms.Bugzilla %] from Debian,
 please visit the <a href="http://www.debian.org/support">Debian Support page</a>,
-or file a bug on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian
-Bug Tracker</a>.</b>  The Debian package maintainer will then determine whether the bug
-is specific to the package or not, and can move the bug "upstream" if needed.</p>
+or file a [% terms.bug %] on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian
+[% terms.Bug %] Tracker</a>.</b>  The Debian package maintainer will then determine whether the [% terms.bug %]
+is specific to the package or not, and can move the [% terms.bug %] "upstream" if needed.</p>
 
 <p>
-Bugs specific to bugzilla.mozilla.org, rather than the Bugzilla software in
+[% terms.Bugs %] specific to bugzilla.mozilla.org, rather than the [% terms.Bugzilla %] software in
 general (which is used by many sites), should be filed in the
 <a href="enter_bug.cgi?product=mozilla.org">mozilla.org product</a>.
 </p>
 
 <p>
 Please do not file test [% terms.bugs %] or support requests here!  You 
-can test Bugzilla at 
+can test [% terms.Bugzilla %] at 
 <a href="http://landfill.bugzilla.org/">landfill.bugzilla.org</a> and ask
 for support in the 
 <a href="news://news.mozilla.org/mozilla.support.bugzilla">
@@ -106,7 +106,7 @@ support-bugzilla&#64;lists.mozilla.org mailing list</a>, or
 [% UNLESS cloned_bug_id %]
 Consider using the
 <a href="enter_bug.cgi?product=[% product.name FILTER html %]&amp;format=guided">
-Bugzilla Helper</a> instead of this form.
+[% terms.Bugzilla %] Helper</a> instead of this form.
 [% END +%]
 Before reporting a [% terms.bug %], make sure you've read our
 <a href="http://www.mozilla.org/quality/bug-writing-guidelines.html">