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

t/009bugwords.t

@@ -60,15 +60,6 @@ foreach my $file (@testitems) {
                 next;
             }
         }
-
-        # "Bugzilla"
-        if (grep /(?<!X\-)Bugzilla(?!_|::|-&gt|\.pm)/, $text) {
-            # Exclude JS comments, hyperlinks, USE, and variable assignment.
-            unless (grep /(\/\/.*|org.*>|api\/|USE |= )Bugzilla/, $text) {
-                push(@errors, [$lineno, $text]);
-                next;
-            }
-        }
     }
         
     if (scalar(@errors)) {

template/en/default/account/auth/login.html.tmpl

@@ -97,7 +97,7 @@
       If you don't have a [% terms.Bugzilla %] account, you can
       <a href="createaccount.cgi">create a new account</a>.
       [% IF Param("requirelogin") %]
-        A user account is required because this [% terms.Bugzilla %]
+        A user account is required because this Bugzilla
         installation is only accessible to authenticated users.
       [% ELSIF target.match("_bug\.cgi$") %]
         A user account is required to file a new [% terms.bug %] or to comment

template/en/default/account/cancel-token.txt.tmpl

@@ -81,7 +81,7 @@ Canceled Because: [% PROCESS cancelactionmessage %]
   [% ELSE %]
     [%# Give sensible error if the cancel-token function is used incorrectly.
       #%]
-    You are using [% terms.Bugzilla %]'s cancel-token function incorrectly. You
+    You are using Bugzilla's cancel-token function incorrectly. You
     passed in the string '[% cancelaction %]'. The correct use is to pass
     in a tag, and define that tag in the file cancel-token.txt.tmpl.
 

template/en/default/account/create.html.tmpl

@@ -32,7 +32,7 @@
   You will receive an email at this address to confirm the creation of your
   account. <b>You will not be able to log in until you receive the email.</b>
   If it doesn't arrive within a reasonable amount of time, you may contact
-  the maintainer of this [% terms.Bugzilla %] installation
+  the maintainer of this Bugzilla installation
   at <a href="mailto:[% Param("maintainer") %]">[% Param("maintainer") %]</a>.
 </p>
 

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>

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>
 

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>
 

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">

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>

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">

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." }

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.",

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. " _

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. " _

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 " _

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.",
 } %]

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>

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>",
 } %]

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' " _

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 " _

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).",
 

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 " _

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).",

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"

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." }
 %]

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.",

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>
 

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.

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>
 

template/en/default/attachment/created.html.tmpl

@@ -28,13 +28,13 @@
     [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = attachment.bug_id %]
     [% IF convertedbmp %]
       <p>
-        <b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
+        <b>Note:</b> Bugzilla automatically converted your BMP image file to a
         compressed PNG format.
       </p>
     [% END %]
     [% IF contenttypemethod == 'autodetect' %]
       <p>
-        <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
+        <b>Note:</b> Bugzilla automatically detected the content type
         <em>[% attachment.contenttype FILTER html %]</em> for this attachment.  If this is
         incorrect, correct the value by editing the attachment's
         <a href="attachment.cgi?id=[% attachment.id %]&amp;action=edit">details</a>.

template/en/default/attachment/diff-header.html.tmpl

@@ -133,11 +133,11 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
   Warning:
   [% IF warning == "interdiff1" %]
     this difference between two patches may show things in the wrong places due
-    to a limitation in [% terms.Bugzilla %] when comparing patches with
+    to a limitation in Bugzilla when comparing patches with
     different sets of files.
   [% ELSIF warning == "interdiff2" %]
     this difference between two patches may be inaccurate due to a limitation
-    in [%+ terms.Bugzilla %] when comparing patches made against different
+    in Bugzilla when comparing patches made against different
     revisions.
   [% ELSIF warning == "interdiff3" %]
     interdiff encountered errors while comparing these patches.

template/en/default/bug/field-help.none.tmpl

@@ -23,7 +23,7 @@
 
 alias =>
   "A short, unique name assigned to $terms.abug in order to assist with
-   looking it up and referring to it in other places in ${terms.Bugzilla}.",
+   looking it up and referring to it in other places in Bugzilla.",
 
 assigned_to =>
   "The person in charge of resolving the ${terms.bug}.",
@@ -38,7 +38,7 @@ bug_file_loc =>
 
 bug_id =>
   "The numeric id of $terms.abug, unique within this entire installation"
-  _ " of ${terms.Bugzilla}.",
+  _ " of Bugzilla.",
 
 bug_severity =>
   "How severe the $terms.bug is, or whether it's an enhancement.",
@@ -85,7 +85,7 @@ keywords =>
    _ " to easily identify and group them.",
 
 longdesc =>
-  "$terms.Bugs have comments added to them by $terms.Bugzilla users."
+  "$terms.Bugs have comments added to them by Bugzilla users."
   _ " You can search for some text in those comments.",
 
 op_sys =>
@@ -227,7 +227,7 @@ email1 =>
       [%- END %]
       [% vars.help_html.${help_field} = 
         "A custom $field_type_desc field in this installation"
-        _ " of ${terms.Bugzilla}." %]
+        _ " of Bugzilla." %]
     [% END %]
   [% END %]
 

template/en/default/extensions/config.pm.tmpl

@@ -12,7 +12,7 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %];
+package Bugzilla::Extension::[% name %];
 
 use 5.10.1;
 use strict;

template/en/default/extensions/extension.pm.tmpl

@@ -12,18 +12,18 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %];
+package Bugzilla::Extension::[% name %];
 
 use 5.10.1;
 use strict;
-use parent qw(B[% %]ugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 
 # This code for this is in [% path %]/lib/Util.pm
-use B[% %]ugzilla::Extension::[% name %]::Util;
+use Bugzilla::Extension::[% name %]::Util;
 
 our $VERSION = '0.01';
 
-# See the documentation of B[% %]ugzilla::Hook ("perldoc B[% %]ugzilla::Hook" 
+# See the documentation of Bugzilla::Hook ("perldoc Bugzilla::Hook" 
 # in the bugzilla directory) for a list of all available hooks.
 sub install_update_db {
     my ($self, $args) = @_;

template/en/default/extensions/hook-readme.txt.tmpl

@@ -7,7 +7,7 @@
   #%]
 
 Template hooks go in this directory. Template hooks are called in normal
-[%+ terms.Bugzilla %] templates like [[% '%' %] Hook.process('some-hook') %].
+Bugzilla templates like [[% '%' %] Hook.process('some-hook') %].
 More information about them can be found in the documentation of 
-B[% %]ugzilla::Extension. (Do "perldoc B[% %]ugzilla::Extension" from the main
-[%+ terms.Bugzilla %] directory to see that documentation.)
+Bugzilla::Extension. (Do "perldoc Bugzilla::Extension" from the main
+Bugzilla directory to see that documentation.)

template/en/default/extensions/name-readme.txt.tmpl

@@ -9,8 +9,8 @@
 Normal templates go in this directory. You can load them in your
 code like this:
 
-use B[% %]ugzilla::Error;
-my $template = B[% %]ugzilla->template;
+use Bugzilla::Error;
+my $template = Bugzilla->template;
 $template->process('[% name FILTER lower %]/some-template.html.tmpl')
   or ThrowTemplateError($template->error());
 
@@ -18,7 +18,7 @@ That would be how to load a file called some-template.html.tmpl that
 was in this directory.
 
 Note that you have to be careful that the full path of your template
-never conflicts with a template that exists in [% terms.Bugzilla %] or in 
+never conflicts with a template that exists in Bugzilla or in 
 another extension, or your template might override that template. That's why
 we created this directory called '[% name FILTER lower %]' for you, so you
 can put your templates in here to help avoid conflicts.

template/en/default/extensions/util.pm.tmpl

@@ -12,7 +12,7 @@
 
 [% PROCESS extensions/license.txt.tmpl %]
 
-package B[% %]ugzilla::Extension::[% name %]::Util;
+package Bugzilla::Extension::[% name %]::Util;
 
 use 5.10.1;
 use strict;
@@ -22,7 +22,7 @@ our @EXPORT = qw(
 );
 
 # This file can be loaded by your extension via 
-# "use B[% %]ugzilla::Extension::[% name %]::Util". You can put functions
+# "use Bugzilla::Extension::[% name %]::Util". You can put functions
 # used by your extension in here. (Make sure you also list them in
 # @EXPORT.)
 

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

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

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>

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).
 

template/en/default/index.html.tmpl

@@ -56,12 +56,12 @@ YAHOO.util.Event.onDOMReady(onLoadActions);
   <div id="new_release">
     [% IF release.data %]
       [% IF release.deprecated %]
-        <p>[% terms.Bugzilla %] [%+ release.deprecated FILTER html %] is no longer
+        <p>Bugzilla [%+ release.deprecated FILTER html %] is no longer
         supported. You are highly encouraged to upgrade in order to keep your
         system secure.</p>
       [% END %]
 
-      <p>A new [% terms.Bugzilla %] version ([% release.data.latest_ver FILTER html %])
+      <p>A new Bugzilla version ([% release.data.latest_ver FILTER html %])
       is available at
       <a href="[% release.data.url FILTER html %]">[% release.data.url FILTER html %]</a>.<br>
       Release date: [% release.data.date FILTER html %]</p>

template/en/default/list/list.html.tmpl

@@ -83,7 +83,7 @@
   [% END %]
 
   [% IF user.settings.display_quips.value == 'on' %]
-    [% DEFAULT quip = "$terms.Bugzilla would like to put a random quip here, but no one has entered any." %]
+    [% DEFAULT quip = "Bugzilla would like to put a random quip here, but no one has entered any." %]
     <span class="bz_quip">
       <a href="quips.cgi"><em>[% quip FILTER html %]</em></a>
     </span>
@@ -93,7 +93,7 @@
 
 [% IF toolong %]
   <h2 class="bz_smallminded">
-    This list is too long for [% terms.Bugzilla %]'s little mind; the
+    This list is too long for Bugzilla's little mind; the
     Next/Prev/First/Last buttons won't appear on individual [% terms.bugs %].
   </h2>
 [% END %]

template/en/default/list/quips.html.tmpl

@@ -15,13 +15,13 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
-           title = "$terms.Bugzilla Quip System"
+           title = "Bugzilla Quip System"
            header = "Add your own clever headline"
            style_urls = ['skins/standard/buglist.css']
  %]
 
 <p>
-  [% terms.Bugzilla %] will pick a random quip for the headline on each 
+  Bugzilla will pick a random quip for the headline on each
   [% terms.bug %] list.
 </p>
 

template/en/default/pages/linkify.html.tmpl

@@ -10,7 +10,7 @@
 
 <p>
   If you enter some text, this form will return it marked up like a
-  standard [% terms.Bugzilla %] comment. That is, valid [% terms.bug %] numbers,
+  standard Bugzilla comment. That is, valid [% terms.bug %] numbers,
   URLs, email addresses and so on will be replaced with appropriate HTML links.
 </p>
 

template/en/default/pages/quicksearch.html.tmpl

@@ -38,7 +38,7 @@
 
 <ul class="qs_help">
   <li>If you just put a word or series of words in the search box, 
-    [%+ terms.Bugzilla %] will search the 
+    Bugzilla will search the
     [%+ field_descs.product FILTER html %],
     [%+ field_descs.component FILTER html %], 
     [%+ IF use_keywords %][%+ field_descs.keywords FILTER html %],[% END %]
@@ -53,14 +53,14 @@
   </li>
 
   <li>Adding more terms <strong>narrows down</strong> the search, it does not
-     expand it. (In other words, [% terms.Bugzilla %] searches for 
+     expand it. (In other words, Bugzilla searches for
      [%+ terms.bugs %] that match <em>all</em> your criteria, not
      [%+ terms.bugs %] that match <em>any</em> of your criteria.)</li>
 
   <li>Searching is <strong>case-insensitive</strong>. So <kbd>table</kbd>,
     <kbd>Table</kbd>, and <kbd>TABLE</kbd> are all the same.</li>
 
-  <li>[% terms.Bugzilla %] does not just search for the exact word you put in,
+  <li>Bugzilla does not just search for the exact word you put in,
     but also for any word that <strong>contains</strong> that word.
     So, for example, searching for "cat" would also find [% terms.bugs %]
     that contain it as part of other words&mdash;for example, [% terms.abug %]
@@ -128,7 +128,7 @@
     referred to as 
     <kbd>[% first_field.name.replace('^cf_') FILTER html %]</kbd>,
     also. However, if this causes a conflict between the standard
-    [%+ terms.Bugzilla %] field names and the custom field names, the
+    Bugzilla field names and the custom field names, the
     standard field names always take precedence.</p>
 [% END %]
 

template/en/default/pages/sudo.html.tmpl

@@ -9,13 +9,13 @@
 [% INCLUDE global/header.html.tmpl title = "sudo: User Impersonation" %]
 
 <p>
-  [%+ terms.Bugzilla %] includes the ability to have one user impersonate 
+  Bugzilla includes the ability to have one user impersonate
 another, in something called a <i>sudo session</i>, so long as the person 
 doing the impersonating has the appropriate privileges.
 </p>
 
 <p>
-  While a session is in progress, [% terms.Bugzilla %] will act as if the 
+  While a session is in progress, Bugzilla will act as if the
   impersonated user is doing everything.  This is especially useful for testing,
   and for doing critical work when the impersonated user is unavailable.  The 
   impersonated user will receive an email from [% terms.Bugzilla %] when the 

template/en/default/reports/delete-series.html.tmpl

@@ -24,7 +24,7 @@
     This series has been created by <a href="mailto:[% series.creator.email FILTER html %]">
     [% series.creator.email FILTER html %]</a>
   [% ELSE %]
-    This series has been automatically created by [% terms.Bugzilla %]
+    This series has been automatically created by Bugzilla
   [% END %]
 
   [% IF series.public %]

template/en/default/reports/edit-series.html.tmpl

@@ -36,7 +36,7 @@
     <a href="mailto:[% default.creator.email FILTER html %]">
     [% default.creator.email FILTER html %]</a>
   [% ELSE %]
-    (automatically created by [% terms.Bugzilla %])
+    (automatically created by Bugzilla)
   [% END %]
 </p>
 

template/en/default/reports/menu.html.tmpl

@@ -18,7 +18,7 @@
 %]
 
 <p>
-  [% terms.Bugzilla %] allows you to view and track the state of the [% terms.bug %] database in
+  Bugzilla allows you to view and track the state of the [% terms.bug %] database in
   all manner of exciting ways.
 </p>
 

template/en/default/search/search-specific.html.tmpl

@@ -15,7 +15,7 @@
 
 <p>
 Find a specific [% terms.bug %] by entering words that describe it.  
-[% terms.Bugzilla %] will search [% terms.bug %] descriptions and comments
+Bugzilla will search [% terms.bug %] descriptions and comments
 for those words and return a list of matching [% terms.bugs %] sorted
 by relevance.
 </p>

template/en/default/welcome-admin.html.tmpl

@@ -10,7 +10,7 @@
   # none
   #%]
 
-[% title = BLOCK %]Welcome to [% terms.Bugzilla %][% END %]
+[% title = BLOCK %]Welcome to Bugzilla[% END %]
 
 [% PROCESS global/header.html.tmpl
    title = title
@@ -68,7 +68,7 @@
   </ul>
 
   <p>
-    After having set up all this, we recommend looking at [% terms.Bugzilla %]'s other
+    After having set up all this, we recommend looking at Bugzilla's other
     parameters as well at some time so that you understand what they do and whether you
     want to modify their settings for your installation.
   </p>

template/en/default/whine/schedule.html.tmpl

@@ -27,7 +27,7 @@
 %]
 
 <p>
-  "Whining" is when [% terms.Bugzilla %] executes a saved search at a regular interval
+  "Whining" is when Bugzilla executes a saved search at a regular interval
   and sends the resulting list of [% terms.bugs %] via email.
 </p>
 
@@ -47,7 +47,7 @@
 
 <p>
   Searches come from saved searches, which are created by executing a <a
-  href="query.cgi">search</a>, then telling [% terms.Bugzilla %] to remember
+  href="query.cgi">search</a>, then telling Bugzilla to remember
   the search under a particular name.  Add a search by clicking "Add a 
   search", and select the desired saved search name under "Search" and add a
   title for the [% terms.bug %] table.  The optional number entered under