Bug 770073 - Hardcode "Bugzilla" in templates when it's not related to a specific Bugzilla installation

r=dkl,a=justdave

4 files changed, 17 insertions, 17 deletions

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index eef5d27a0..8a0b459b3 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -112,7 +112,7 @@
     Every cookie must have a value.
 
   [% ELSIF error == "env_no_email" %]
-    [% terms.Bugzilla %] did not receive an email address from the 
+    Bugzilla did not receive an email address from the
     environment.
     [% IF Param("auth_env_email") %]
       This means that the '[% Param("auth_env_email") FILTER html %]'
@@ -384,7 +384,7 @@
     Invalid setting for post_bug_submit_action
 
   [% ELSIF error == "search_field_operator_unsupported" %]
-    [% terms.Bugzilla %] does not support the search type
+    Bugzilla does not support the search type
     "[% operator FILTER html %]".
 
   [% ELSE %]
@@ -392,7 +392,7 @@
     [% error_message = Hook.process("errors") %]
     [% IF NOT error_message %]
       [% title = "Internal error" %]
-      An internal error has occurred, but [% terms.Bugzilla %] doesn't know
+      An internal error has occurred, but Bugzilla doesn't know
       what <code>[% error FILTER html %]</code> means.
 
       If you are a [% terms.Bugzilla %] end-user seeing this message, please save
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 9db0bc923..a3534b72a 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -54,7 +54,7 @@
 
   <p>
     [% IF matchmultiple %]
-      [% terms.Bugzilla %] cannot make a conclusive match for one or more
+      Bugzilla cannot make a conclusive match for one or more
       of the names and/or email addresses you entered on the previous page.
       <br>Please examine the lists of potential matches below and select the
       ones you want,
@@ -69,7 +69,7 @@
 [% ELSE %]
   [% PROCESS global/header.html.tmpl title="Match Failed" %]
   <p>
-    [% terms.Bugzilla %] was unable to make any match at all for one or more of
+    Bugzilla was unable to make any match at all for one or more of
     the names and/or email addresses you entered on the previous page.
     [% IF !user.id %]
       <b>Note: You are currently logged out. Only exact matches against e-mail
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index b8e2c7906..32c5b548a 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -736,7 +736,7 @@
     Renaming the '[% old FILTER html %]' table to '[% new FILTER html %]'...
 
   [% ELSIF message_tag == "install_urlbase_default" %]
-    Now that you have installed [% terms.Bugzilla %], you should visit the
+    Now that you have installed Bugzilla, you should visit the
     'Parameters' page (linked in the footer of the Administrator
     account) to ensure it is set up as you wish - this includes
     setting the 'urlbase' option to the correct URL.
@@ -755,7 +755,7 @@
     other files (including the localconfig file which stores your database
     password) must be world readable. This means that _anyone_ who can obtain
     local access to this machine can do whatever they want to your 
-    [%+ terms.Bugzilla %] installation, and is probably also able to run 
+    Bugzilla installation, and is probably also able to run
     arbitrary Perl code as the user that the web server runs as.
 
     You really, really, really need to change this setting.
@@ -765,7 +765,7 @@
     Warning: you have entered a value for the "webservergroup" parameter in
     localconfig, but you are not either a) running this script as [% constants.ROOT_USER FILTER html %]; 
     or b) a member of this group. This can cause permissions problems and 
-    decreased security.  If you experience problems running [% terms.Bugzilla %]
+    decreased security.  If you experience problems running Bugzilla
     scripts, log in as [% constants.ROOT_USER FILTER html %] and re-run this script, become a 
     member of the group, or remove the value of the "webservergroup" parameter.
 
@@ -773,7 +773,7 @@
     Warning: You have set webservergroup in [% constants.bz_locations.localconfig FILTER html %]
     Please understand that this does not bring you any security when
     running under Windows.
-    Verify that the file permissions in your [% terms.Bugzilla %] directory are
+    Verify that the file permissions in your Bugzilla directory are
     suitable for your system. Avoid unnecessary write access.
 
   [% ELSIF message_tag == "install_workflow_init" %]
@@ -950,7 +950,7 @@
 [%# Give sensible error if the message function is used incorrectly. #%]
 [% IF !message %]
   [% message = BLOCK %]
-    You are using [% terms.Bugzilla %]'s messaging functions incorrectly. You
+    You are using Bugzilla's messaging functions incorrectly. You
     passed in the string '[% message_tag %]'. The correct use is to pass
     in a tag, and define that tag in the file messages.html.tmpl.<br>
     <br>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 56545adbb..29e3bf83f 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -258,7 +258,7 @@
     [% ELSE %]
       [%+ field_descs.see_also FILTER html %] URLs should point to one of:
       <ul>
-        <li><code>show_bug.cgi</code> in a [% terms.Bugzilla %]
+        <li><code>show_bug.cgi</code> in a Bugzilla
           installation.</li>
         <li>A b[% %]ug on launchpad.net</li>
         <li>An issue on code.google.com.</li>
@@ -493,7 +493,7 @@
 
   [% ELSIF error == "feature_disabled" %]
     The [% install_string("feature_$feature") FILTER html %] feature is not
-    available in this [% terms.Bugzilla %].
+    available in this Bugzilla.
     [% IF user.in_group('admin') %]
       If you would like to enable this feature, please run
       <kbd>checksetup.pl</kbd> to see how to install the necessary
@@ -1164,7 +1164,7 @@
 
   [% ELSIF error == "migrate_from_invalid" %]
     '[% from FILTER html %]' is not a valid type of [% terms.bug %]-tracker
-    to migrate from. See the contents of the <kbd>B[% %]ugzilla/Migrate/</kbd>
+    to migrate from. See the contents of the <kbd>Bugzilla/Migrate/</kbd>
     directory for a list of valid [% terms.bug %]-trackers.
 
   [% ELSIF error == "milestone_already_exists" %]
@@ -1567,7 +1567,7 @@
 
   [% ELSIF error == "quicksearch_unbalanced_quotes" %]
     [% title = "Badly Formatted Query" %]
-    [% terms.Bugzilla %] is unable to parse your query correctly:
+    Bugzilla is unable to parse your query correctly:
     <em>[% string FILTER html %]</em>.<br>
     If you use quotes to enclose strings, make sure both quotes are present.
     If you really want to look for a quote in a string, type \" instead of ".
@@ -1666,7 +1666,7 @@
     field.
 
   [% ELSIF error == "search_grouped_field_invalid" %]
-    [% terms.Bugzilla %] does not support using the 
+    Bugzilla does not support using the
     "[%+ field_descs.$field FILTER html %]" ([% field FILTER html %])
     field with grouped search conditions.
 
@@ -1677,7 +1677,7 @@
     All conditions under a groups search must use the same field.
 
   [% ELSIF error == "search_field_operator_invalid" %]
-    [% terms.Bugzilla %] does not support using the 
+    Bugzilla does not support using the
     "[%+ field_descs.$field FILTER html %]" ([% field FILTER html %])
     field with the "[% search_descs.$operator FILTER html %]" 
     ([% operator FILTER html %]) search type.
@@ -1847,7 +1847,7 @@
 
   [% ELSIF error == "user_match_too_many" %]
     [% title = "No Conclusive Match" %]
-    [% terms.Bugzilla %] cannot make a conclusive match for one or more
+    Bugzilla cannot make a conclusive match for one or more
     of the names and/or email addresses you entered for
     the [% fields.join(', ') FILTER html %] field(s).