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

r=dkl,a=justdave

25 files changed, 68 insertions, 68 deletions

diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl
index 5c109dc3f..9f60eb662 100644
--- a/template/en/default/admin/admin.html.tmpl
+++ b/template/en/default/admin/admin.html.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 [% title = BLOCK %]
-  Administer your installation ([% terms.Bugzilla %]
+  Administer your installation (Bugzilla
   [%+ constants.BUGZILLA_VERSION FILTER html %])
 [% END %]
 
@@ -83,7 +83,7 @@
       <dl>
         [% class = user.in_group('admin') ? "" : "forbidden" %]
         <dt id="custom_fields" class="[% class %]"><a href="editfields.cgi">Custom Fields</a></dt>
-        <dd class="[% class %]">[% terms.Bugzilla %] lets you define fields which are
+        <dd class="[% class %]">Bugzilla lets you define fields which are
         not implemented by default, based on your local and specific requirements.
         These fields can then be used as any other field, meaning that you can set
         them in [% terms.bugs %] and run any search involving them.<br>
diff --git a/template/en/default/admin/confirm-action.html.tmpl b/template/en/default/admin/confirm-action.html.tmpl
index ecc162540..b6a21811b 100644
--- a/template/en/default/admin/confirm-action.html.tmpl
+++ b/template/en/default/admin/confirm-action.html.tmpl
@@ -21,10 +21,10 @@
 
 [% IF abuser %]
   <div class="throw_error">
-    <p>When you view an administrative form in [% terms.Bugzilla %], a token string
+    <p>When you view an administrative form in Bugzilla, a token string
     is randomly generated and stored both in the database and in the form you loaded,
     to make sure that the requested changes are being made as a result of submitting
-    a form generated by [% terms.Bugzilla %]. Unfortunately, the token used right now
+    a form generated by Bugzilla. Unfortunately, the token used right now
     is incorrect, meaning that it looks like you didn't come from the right page.
     The following token has been used :</p>
 
diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl
index 185cfffb5..d610a68dc 100644
--- a/template/en/default/admin/custom_fields/create.html.tmpl
+++ b/template/en/default/admin/custom_fields/create.html.tmpl
@@ -28,11 +28,11 @@
 </script>
 
 <p>
-  Adding custom fields can make the interface of [% terms.Bugzilla %] very
-  complicated. Many admins who are new to [% terms.Bugzilla %] start off
+  Adding custom fields can make the interface of Bugzilla very
+  complicated. Many admins who are new to Bugzilla start off
   adding many custom fields, and then their users complain that the interface
   is "too complex". Please think carefully before adding any custom fields.
-  It may be the case that [% terms.Bugzilla %] already does what you need,
+  It may be the case that Bugzilla already does what you need,
   and you just haven't enabled the correct feature yet.
 </p>
 
diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl
index 74ceb2201..72a928b42 100644
--- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl
+++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl
@@ -24,7 +24,7 @@
    <a href="editflagtypes.cgi?action=deactivate&amp;id=[% flag_type.id %]&amp;token=
            [%- token FILTER html %]">deactivate it</a>,
    in which case the type [% IF flag_type.flag_count %] and its flags [% END %] will remain
-   in the database but will not appear in the [% terms.Bugzilla %] UI.
+   in the database but will not appear in the Bugzilla UI.
 </p>
 
 <p class="confirmation">
diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl
index a9aa7e132..bc9698aee 100644
--- a/template/en/default/admin/groups/confirm-remove.html.tmpl
+++ b/template/en/default/admin/groups/confirm-remove.html.tmpl
@@ -32,7 +32,7 @@
 [% END %]
   
 <p>Generally, you will only need to do this when upgrading groups
-  created with [% terms.Bugzilla %] versions 2.16 and earlier. Use
+  created with Bugzilla versions 2.16 and earlier. Use
   this option with <b>extreme care</b> and consult the documentation
   for further information.
 </p>
diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index de243b9a5..a14795be7 100644
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -160,7 +160,7 @@
 <h4>Mass Remove</h4>
 
 <p>You can use this form to do mass-removal of users from groups.
-  This is often very useful if you upgraded from [% terms.Bugzilla %] 
+  This is often very useful if you upgraded from Bugzilla
   2.16.</p>
 
 <form method="post" action="editgroups.cgi">
diff --git a/template/en/default/admin/params/admin.html.tmpl b/template/en/default/admin/params/admin.html.tmpl
index c63329cae..eb023de75 100644
--- a/template/en/default/admin/params/admin.html.tmpl
+++ b/template/en/default/admin/params/admin.html.tmpl
@@ -21,7 +21,7 @@
                       "switching this option on will not let users use an invalid address.",
 
   allowuserdeletion => "The user editing pages are capable of letting you delete user accounts. " _
-                       "$terms.Bugzilla will issue a warning in case you'd run into inconsistencies " _
+                       "Bugzilla will issue a warning in case you'd run into inconsistencies " _
                        "when you're about to do so, but such deletions remain kinda scary. " _
                        "So, you have to turn on this option before any such deletions " _
                        "will ever happen." }
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index d2e38f34e..1f24c7d06 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -18,7 +18,7 @@
   security to your SSL connections by forcing the browser to always
   access your domain over SSL and never accept an invalid certificate. 
   However, it should only be used if you have the <code>ssl_redirect</code>
-  parameter turned on, [% terms.Bugzilla %] is the only thing running
+  parameter turned on, Bugzilla is the only thing running
   on its domain (i.e., your <code>urlbase</code> is something like
   <code>http://bugzilla.example.com/</code>), and you never plan to disable
   the <code>ssl_redirect</code> parameter.
@@ -35,7 +35,7 @@
       with the <code>includeSubDomains</code> flag, which will apply the
       security change to all subdomains. This is especially useful when
       combined with an <code>attachment_base</code> that exists as (a)
-      subdomain(s) under the main [% terms.Bugzilla %] domain.
+      subdomain(s) under the main Bugzilla domain.
     </li>
   </ul>
 [% END %]
@@ -44,22 +44,22 @@
   cookiedomain => 
     "If your website is at 'www.foo.com', setting this to"
     _ " '.foo.com' will also allow 'bar.foo.com' to access"
-    _ " $terms.Bugzilla cookies. This is useful if you have more than"
+    _ " Bugzilla cookies. This is useful if you have more than"
     _ " one hostname pointing at the same web server, and you"
-    _ " want them to share the $terms.Bugzilla cookie.",
+    _ " want them to share the Bugzilla cookie.",
 
   inbound_proxies =>
-    "When inbound traffic to $terms.Bugzilla goes through a proxy,"
-    _ " $terms.Bugzilla thinks that the IP address of every single"
+    "When inbound traffic to Bugzilla goes through a proxy,"
+    _ " Bugzilla thinks that the IP address of every single"
     _ " user is the IP address of the proxy. If you enter a comma-separated"
-    _ " list of IPs in this parameter, then $terms.Bugzilla will trust any"
+    _ " list of IPs in this parameter, then Bugzilla will trust any"
     _ " <code>X-Forwarded-For</code> header sent from those IPs,"
     _ " and use the value of that header as the end user's IP address.",
 
   proxy_url => 
-    "$terms.Bugzilla may have to access the web to get notifications about"
+    "Bugzilla may have to access the web to get notifications about"
     _ " new releases (see the <var>upgrade_notification</var> parameter)."
-    _ " If your $terms.Bugzilla server is behind a proxy, it may be"
+    _ " If your Bugzilla server is behind a proxy, it may be"
     _ " necessary to enter its URL if the web server cannot access the"
     _ " HTTP_PROXY environment variable. If you have to authenticate,"
     _ " use the <code>http://user:pass@proxy_url/</code> syntax.",
diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index e60753d90..5efcc1106 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -25,12 +25,12 @@
   attachment_base => 
     "When the <var>allow_attachment_display</var> parameter is on, it is "
     _ " possible for a malicious attachment to steal your cookies or"
-    _ " perform an attack on $terms.Bugzilla using your credentials."
+    _ " perform an attack on Bugzilla using your credentials."
     _ "<p>If you would like additional security on attachments to avoid"
-    _ " this, set this parameter to an alternate URL for your $terms.Bugzilla"
+    _ " this, set this parameter to an alternate URL for your Bugzilla"
     _ " that is not the same as <var>urlbase</var> or <var>sslbase</var>."
     _ " That is, a different domain name that resolves to this exact"
-    _ " same $terms.Bugzilla installation.</p>"
+    _ " same Bugzilla installation.</p>"
     _ "<p>Note that if you have set the"
     _ " <a href=\"editparams.cgi?section=advanced#cookiedomain_desc\"><var>cookiedomain</var>"
     _" parameter</a>, you should set <var>attachment_base</var> to use a"
@@ -42,14 +42,14 @@
     _ " attachments to accessing only other attachments on the same"
     _ " ${terms.bug}. Remember, though, that all those possible domain names "
     _ " (such as <kbd>1234.your.domain.com</kbd>) must point to this same"
-    _ " $terms.Bugzilla instance.",
+    _ " Bugzilla instance.",
 
   allow_attachment_deletion => "If this option is on, administrators will be able to delete " _
                                "the content of attachments.",
 
   maxattachmentsize => "The maximum size (in kilobytes) of attachments to be stored " _
                        "in the database. If a file larger than this size is attached " _
-                       "to ${terms.abug}, $terms.Bugzilla will look at the " _
+                       "to ${terms.abug}, Bugzilla will look at the " _
                        "<a href=\"#maxlocalattachment\"><var>maxlocalattachment</var> parameter</a> " _
                        "to determine if the file can be stored locally on the web server. " _
                        "If the file size exceeds both limits, then the attachment is rejected. " _
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 88d54ccf3..175e0c08f 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -50,13 +50,13 @@
                         <dl>
                           <dt>DB</dt>
                           <dd>
-                            ${terms.Bugzilla}'s built-in authentication. This is the most common
+                            Bugzilla's built-in authentication. This is the most common
                             choice.
                           </dd>
                           <dt>RADIUS</dt>
                           <dd>
                             RADIUS authentication using a RADIUS server.
-                            Please see the $terms.Bugzilla documentation for
+                            Please see the Bugzilla documentation for
                             more information.
                             Using this method requires
                             <a href=\"?section=radius\">additional
@@ -65,7 +65,7 @@
                           <dt>LDAP</dt>
                           <dd>
                             LDAP authentication using an LDAP server.
-                            Please see the $terms.Bugzilla documentation
+                            Please see the Bugzilla documentation
                             for more information. Using this method requires
                             <a href=\"?section=ldap\">additional
                             parameters</a> to be set.
@@ -84,7 +84,7 @@
                       </li>
                       <li>
                         defaulton/defaultoff - Default behavior as described
-                        above, but user can choose whether $terms.Bugzilla will remember his
+                        above, but user can choose whether Bugzilla will remember his
                         login or not.
                       </li>
                     </ul>",
@@ -98,7 +98,7 @@
     "if the user is logged in or not. This works similarly to how the " _
     "web UI currently filters email addresses. If <var>requirelogin</var> " _
     "is enabled, then this parameter has no effect as users must be logged " _
-    "in to use ${terms.Bugzilla}.",
+    "in to use Bugzilla.",
 
   emailregexp =>
     "This defines the regular expression to use for legal email addresses. " _
diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl
index 961833d89..1f177067a 100644
--- a/template/en/default/admin/params/bugfields.html.tmpl
+++ b/template/en/default/admin/params/bugfields.html.tmpl
@@ -11,7 +11,7 @@
 %]
 
 [% param_descs = {
-  useclassification => "If this is on, $terms.Bugzilla will associate each product with a " _
+  useclassification => "If this is on, Bugzilla will associate each product with a " _
                        "specific classification. But you must have 'editclassification' " _
                        "permissions enabled in order to edit classifications.",
 
@@ -34,13 +34,13 @@
   defaultplatform => "This is the platform that is preselected on the $terms.bug " _
                      "entry form.<br> " _
                      "You can leave this empty: " _
-                     "$terms.Bugzilla will then use the platform that the browser " _
+                     "Bugzilla will then use the platform that the browser " _
                      "reports to be running on as the default.",
 
   defaultopsys => "This is the operating system that is preselected on the $terms.bug " _
                   "entry form.<br> " _
                   "You can leave this empty: " _
-                  "$terms.Bugzilla will then use the operating system that the browser " _
+                  "Bugzilla will then use the operating system that the browser " _
                   "reports to be running on as the default.",
 
   collapsed_comment_tags => "A comma separated list of tags which, when applied " _
diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index cc533fc91..d7703b5b8 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -8,7 +8,7 @@
 
 [% 
    title = "Required Settings"
-   desc = "Settings that are required for proper operation of $terms.Bugzilla" 
+   desc = "Settings that are required for proper operation of Bugzilla"
 %]
 
 [% param_descs = {
@@ -19,17 +19,17 @@
              "(SSL) $terms.Bugzilla URLs.",
 
   ssl_redirect => 
-    "When this is enabled, $terms.Bugzilla will ensure that every page is"
+    "When this is enabled, Bugzilla will ensure that every page is"
     _ " accessed over SSL, by redirecting any plain HTTP requests to HTTPS"
     _ " using the <var>sslbase</var> parameter. Also, when this is enabled,"
-    _ " $terms.Bugzilla will send out links using <var>sslbase</var> in emails"
+    _ " Bugzilla will send out links using <var>sslbase</var> in emails"
     _ " instead of <var>urlbase</var>.",
 
   cookiepath => "Path, relative to your web document root, to which to restrict " _
-                "$terms.Bugzilla cookies. Normally this is the URI portion of your URL " _
+                "Bugzilla cookies. Normally this is the URI portion of your URL " _
                 "base. Begin with a / (single slash mark). For instance, if " _
-                "$terms.Bugzilla serves from 'http://www.somedomain.com/bugzilla/', set " _
+                "Bugzilla serves from 'http://www.somedomain.com/bugzilla/', set " _
                 "this parameter to /bugzilla/. Setting it to / will allow " _
                 "all sites served by this web server or virtual host to read " _
-                "$terms.Bugzilla cookies.",
+                "Bugzilla cookies.",
 } %]
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index 00fb27ba4..2e7d2245a 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -69,8 +69,8 @@
 
   <div class="cell">
     <div class="contribute"><strong>Note:</strong>
-      B[% %]ugzilla is developed entirely by volunteers.
-      The best way to give back to the B[% %]ugzilla project is to
+      Bugzilla is developed entirely by volunteers.
+      The best way to give back to the Bugzilla project is to
       <a href="http://www.bugzilla.org/contribute/">contribute</a> yourself!
       You don't have to be a programmer to contribute, there are lots of
       things that we need.
@@ -80,7 +80,7 @@
       [% PROCESS admin/params/index.html.tmpl panels = panels %]
     [% ELSE %]
         <p>
-          This lets you edit the basic operating parameters of [% terms.Bugzilla %].
+          This lets you edit the basic operating parameters of Bugzilla.
           Be careful!<br>
           Any item you check "Reset" on will get reset to its default value.
         </p>
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
index 9de306d1d..4c94bc747 100644
--- a/template/en/default/admin/params/general.html.tmpl
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -14,7 +14,7 @@
 [% param_descs = {
   maintainer => 
     "The email address of the person who maintains this installation "
-    _ " of ${terms.Bugzilla}.",
+    _ " of Bugzilla.",
 
   docs_urlbase => 
     "The URL that is the common initial leading part of all"
@@ -36,12 +36,12 @@
     _ " afterward.</p>",
 
   shutdownhtml => 
-    "If this field is non-empty, then $terms.Bugzilla will be completely"
+    "If this field is non-empty, then Bugzilla will be completely"
     _ " disabled and this text will be displayed instead of all the"
     _ " $terms.Bugzilla pages.",
 
   announcehtml => 
-    "If this field is non-empty, then $terms.Bugzilla will"
+    "If this field is non-empty, then Bugzilla will"
     _ " display whatever is in this field at the top of every"
     _ " HTML page. The HTML you put in this field is not wrapped or"
     _ " enclosed in anything. You might want to wrap it inside a"
@@ -52,7 +52,7 @@
     _ " will work.  To get centered text, use <em>class=\"center\"</em>.",
 
   upgrade_notification => 
-    "$terms.Bugzilla can inform you when a new release is available."
+    "Bugzilla can inform you when a new release is available."
     _ " The notification will appear on the $terms.Bugzilla homepage,"
     _ " for administrators only."
     _ " <ul><li>'development_snapshot' notifies you about the development "
@@ -66,7 +66,7 @@
     _ " for newer release candidates too.</li>"
     _ " <li>'disabled' will never notify you about new releases and no"
     _ " connection will be established to a remote server.</li></ul>"
-    _ " <p>Note that if your $terms.Bugzilla server requires a proxy to"
+    _ " <p>Note that if your Bugzilla server requires a proxy to"
     _ " access the Internet, you may also need to set the <var>proxy_url</var>"
     _ " parameter in the Advanced section.</p>",
 } %]
diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl
index 52f12e3c5..590f4da02 100644
--- a/template/en/default/admin/params/groupsecurity.html.tmpl
+++ b/template/en/default/admin/params/groupsecurity.html.tmpl
@@ -11,7 +11,7 @@
 %]
 
 [% param_descs = {
-  makeproductgroups => "If this is on, $terms.Bugzilla will associate $terms.abug group " _
+  makeproductgroups => "If this is on, Bugzilla will associate $terms.abug group " _
                        "with each product in the database, and use it for querying ${terms.bugs}.",
 
   chartgroup => "The name of the group of users who can use the 'New Charts' " _
diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl
index 7a10c3f64..ab3521f27 100644
--- a/template/en/default/admin/params/ldap.html.tmpl
+++ b/template/en/default/admin/params/ldap.html.tmpl
@@ -35,9 +35,9 @@
 
   LDAPmailattribute => "The name of the attribute of a user in your " _
                        "directory that contains the email address, to be " _
-                       "used as $terms.Bugzilla username. If this parameter " _
-                       "is empty, $terms.Bugzilla will use the LDAP username"_
-                       " as the $terms.Bugzilla username. You may also want" _
+                       "used as Bugzilla username. If this parameter " _
+                       "is empty, Bugzilla will use the LDAP username"_
+                       " as the Bugzilla username. You may also want" _
                        " to set the \"emailsuffix\" parameter, in this case.",
 
   LDAPfilter => "LDAP filter to AND with the <var>LDAPuidattribute</var> for " _
diff --git a/template/en/default/admin/params/memcached.html.tmpl b/template/en/default/admin/params/memcached.html.tmpl
index eef39860a..997376b49 100644
--- a/template/en/default/admin/params/memcached.html.tmpl
+++ b/template/en/default/admin/params/memcached.html.tmpl
@@ -12,7 +12,7 @@
 
 [% param_descs = {
     memcached_servers =>
-      "If this option is set, $terms.Bugzilla will integrate with Memcached. " _
+      "If this option is set, Bugzilla will integrate with Memcached. " _
       "Specify one of more server, separated by spaces, using hostname:port " _
       "notation (for example: 127.0.0.1:11211).",
 
diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
index f491a3035..4aee7090d 100644
--- a/template/en/default/admin/params/mta.html.tmpl
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -23,7 +23,7 @@
                                in 'data/mailer.testfile' instead of being sent.
                              </li>
                              <li>
-                               'none' will completely disable email. $terms.Bugzilla continues
+                               'none' will completely disable email. Bugzilla continues
                                to act as though it is sending mail, but nothing is sent or
                                stored.
                              </li>
@@ -32,14 +32,14 @@
   mailfrom => "The email address of the $terms.Bugzilla mail daemon.  Some email systems " _
               "require this to be a valid email address.",
 
-  use_mailer_queue => "In a large $terms.Bugzilla installation, updating"
-    _ " $terms.bugs can be very slow, because $terms.Bugzilla sends all"
-    _ " email at once. If you enable this parameter, $terms.Bugzilla will"
+  use_mailer_queue => "In a large Bugzilla installation, updating"
+    _ " $terms.bugs can be very slow, because Bugzilla sends all"
+    _ " email at once. If you enable this parameter, Bugzilla will"
     _ " queue all mail and then send it in the background. This requires"
     _ " that you have installed certain Perl modules (as listed by"
     _ " <kbd>checksetup.pl</kbd> for this feature), and that you are"
     _ " running the <code>jobqueue.pl</code> daemon (otherwise your mail"
-    _ " won't get sent). This affects all mail sent by $terms.Bugzilla,"
+    _ " won't get sent). This affects all mail sent by Bugzilla,"
     _ " not just $terms.bug updates.",
 
   smtpserver => "The SMTP server address (if using SMTP for mail delivery).",
@@ -54,7 +54,7 @@
 
   smtp_debug => "If enabled, this will print detailed information to your" _
                 " web server's error log about the communication between" _
-                " $terms.Bugzilla and your SMTP server. You can use this to" _
+                " Bugzilla and your SMTP server. You can use this to" _
                 " troubleshoot email problems.",
 
   whinedays => "The number of days that we'll let a $terms.bug sit untouched in a CONFIRMED " _
diff --git a/template/en/default/admin/params/patchviewer.html.tmpl b/template/en/default/admin/params/patchviewer.html.tmpl
index 61d32a07b..d8aabd4ba 100644
--- a/template/en/default/admin/params/patchviewer.html.tmpl
+++ b/template/en/default/admin/params/patchviewer.html.tmpl
@@ -23,9 +23,9 @@
              "part of the CVS root</a>.) Leave this blank if you have no " _
              "CVS repository.",
 
-  cvsroot_get => "The CVS root $terms.Bugzilla will be using to get patches from. " _
+  cvsroot_get => "The CVS root Bugzilla will be using to get patches from. " _
                  "Some installations may want to mirror their CVS repository on " _
-                 "the $terms.Bugzilla server or even have it on that same server, and " _
+                 "the Bugzilla server or even have it on that same server, and " _
                  "thus the repository can be the local file system (and much " _
                  "faster). Make this the same as cvsroot if you don't " _
                  "understand what this is (if cvsroot is blank, make this blank too).",
diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl
index b3415cc83..fb26f3471 100644
--- a/template/en/default/admin/params/query.html.tmpl
+++ b/template/en/default/admin/params/query.html.tmpl
@@ -48,7 +48,7 @@
     "installations.",
 
   default_search_limit =>
-    "By default, $terms.Bugzilla limits searches done in the web"
+    "By default, Bugzilla limits searches done in the web"
     _ " interface to returning only this many results, for performance"
     _ " reasons. (This only affects the HTML format of search results--CSV,"
     _ " XML, and other formats are exempted.) Users can click a link on the"
diff --git a/template/en/default/admin/params/shadowdb.html.tmpl b/template/en/default/admin/params/shadowdb.html.tmpl
index 5eb9ceff4..2d5fced3b 100644
--- a/template/en/default/admin/params/shadowdb.html.tmpl
+++ b/template/en/default/admin/params/shadowdb.html.tmpl
@@ -27,10 +27,10 @@
                   "will be ignored.",
 
   shadowdb => "If non-empty, then this is the name of another database in " _
-              "which $terms.Bugzilla will use as a read-only copy of everything. " _
+              "which Bugzilla will use as a read-only copy of everything. " _
               "This is done so that long slow read-only operations can be used " _
               "against this db, and not lock up things for everyone else. This " _
               "database is on the <var>shadowdbhost</var>, and must exist. " _
-              "$terms.Bugzilla does not update it, if you use this parameter, then " _
+              "Bugzilla does not update it, if you use this parameter, then " _
               "you need to set up replication for your database." }
 %]
diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl
index ebbc363b3..ad13f3864 100644
--- a/template/en/default/admin/params/usermatch.html.tmpl
+++ b/template/en/default/admin/params/usermatch.html.tmpl
@@ -11,7 +11,7 @@
 %]
 
 [% param_descs = {
-  usemenuforusers => "If this option is set, $terms.Bugzilla will offer you a list " _
+  usemenuforusers => "If this option is set, Bugzilla will offer you a list " _
                      "to select from (instead of a text entry field) where a user " _
                      "needs to be selected. This option should not be enabled on " _
                      "sites where there are a large number of users.",
diff --git a/template/en/default/admin/sanitycheck/list.html.tmpl b/template/en/default/admin/sanitycheck/list.html.tmpl
index 681466262..5da6b8735 100644
--- a/template/en/default/admin/sanitycheck/list.html.tmpl
+++ b/template/en/default/admin/sanitycheck/list.html.tmpl
@@ -11,7 +11,7 @@
 
 <div>
   <p>
-    [% terms.Bugzilla %] is checking the referential integrity of your database.
+    Bugzilla is checking the referential integrity of your database.
     This may take several minutes to complete.
   </p>
 
diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl
index bacffaeba..9065206d5 100644
--- a/template/en/default/admin/sudo.html.tmpl
+++ b/template/en/default/admin/sudo.html.tmpl
@@ -15,7 +15,7 @@
 [% DEFAULT target_login = "" %]
 
 <p>
-  The <b>sudo</b> feature of [% terms.Bugzilla %] allows you to impersonate a 
+  The <b>sudo</b> feature of Bugzilla allows you to impersonate a
   user for a short time  While an sudo session is in progress, every action you 
   perform will be taking place as if you had logged in as the user whom will be 
   impersonating.
diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl
index 1904b487e..a85db2339 100644
--- a/template/en/default/admin/workflow/edit.html.tmpl
+++ b/template/en/default/admin/workflow/edit.html.tmpl
@@ -24,11 +24,11 @@
 
 <p>
   This page allows you to define which status transitions are valid in your workflow.
-  For compatibility with older versions of [% terms.Bugzilla %], reopening [% terms.abug %]
+  For compatibility with older versions of Bugzilla, reopening [% terms.abug %]
   will only display either [% display_value("bug_status", "UNCONFIRMED") FILTER html %] or
   [%+ display_value("bug_status", "REOPENED") FILTER html %] (if allowed by your workflow) but not
   both. The decision depends on whether the [% terms.bug %] has ever been confirmed or not.
-  So it is a good idea to allow both transitions and let [% terms.Bugzilla %] select the
+  So it is a good idea to allow both transitions and let Bugzilla select the
   correct one.
 </p>