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

r=dkl,a=justdave


git-svn-id: svn://10.0.0.236/trunk@265169 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/webtools/bugzilla/.bzrrev

@@ -1 +1 @@
-8853
+8854

mozilla/webtools/bugzilla/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)) {

mozilla/webtools/bugzilla/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

mozilla/webtools/bugzilla/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.
 

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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>

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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
+  Adding custom fields can make the interface of Bugzilla very
-  complicated. Many admins who are new to [% terms.Bugzilla %] start off
+  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>
 

mozilla/webtools/bugzilla/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">

mozilla/webtools/bugzilla/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>

mozilla/webtools/bugzilla/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">

mozilla/webtools/bugzilla/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." }

mozilla/webtools/bugzilla/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,"
+    "When inbound traffic to Bugzilla goes through a proxy,"
-    _ " $terms.Bugzilla thinks that the IP address of every single"
+    _ " 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.",

mozilla/webtools/bugzilla/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. " _

mozilla/webtools/bugzilla/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. " _

mozilla/webtools/bugzilla/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 " _

mozilla/webtools/bugzilla/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.",
 } %]

mozilla/webtools/bugzilla/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.
+      Bugzilla is developed entirely by volunteers.
-      The best way to give back to the B[% %]ugzilla project is to
+      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>

mozilla/webtools/bugzilla/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>",
 } %]

mozilla/webtools/bugzilla/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' " _

mozilla/webtools/bugzilla/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 " _
+                       "used as Bugzilla username. If this parameter " _
-                       "is empty, $terms.Bugzilla will use the LDAP username"_
+                       "is empty, Bugzilla will use the LDAP username"_
-                       " as the $terms.Bugzilla username. You may also want" _
+                       " 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 " _

mozilla/webtools/bugzilla/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).",
 

mozilla/webtools/bugzilla/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"
+  use_mailer_queue => "In a large Bugzilla installation, updating"
-    _ " $terms.bugs can be very slow, because $terms.Bugzilla sends all"
+    _ " $terms.bugs can be very slow, because Bugzilla sends all"
-    _ " email at once. If you enable this parameter, $terms.Bugzilla will"
+    _ " 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 " _

mozilla/webtools/bugzilla/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).",

mozilla/webtools/bugzilla/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"

mozilla/webtools/bugzilla/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." }
 %]

mozilla/webtools/bugzilla/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.",

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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.

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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>.

mozilla/webtools/bugzilla/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.

mozilla/webtools/bugzilla/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 %]
 

mozilla/webtools/bugzilla/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;

mozilla/webtools/bugzilla/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) = @_;

mozilla/webtools/bugzilla/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
+Bugzilla::Extension. (Do "perldoc Bugzilla::Extension" from the main
-[%+ terms.Bugzilla %] directory to see that documentation.)
+Bugzilla directory to see that documentation.)

mozilla/webtools/bugzilla/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;
+use Bugzilla::Error;
-my $template = B[% %]ugzilla->template;
+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.

mozilla/webtools/bugzilla/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.)
 

mozilla/webtools/bugzilla/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

mozilla/webtools/bugzilla/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

mozilla/webtools/bugzilla/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>

mozilla/webtools/bugzilla/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).
 

mozilla/webtools/bugzilla/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>

mozilla/webtools/bugzilla/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 %]

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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 %]
 

mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl

@@ -6,7 +6,7 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% SET title = "$terms.Bugzilla 4.4 Release Notes" %]
+[% SET title = "Bugzilla 4.4 Release Notes" %]
 [% INCLUDE global/header.html.tmpl 
   title = title
   style_urls = ['skins/standard/page.css'] 
@@ -28,8 +28,8 @@
 
 <h2 id="v44_introduction">Introduction</h2>
 
-<p>Welcome to [% terms.Bugzilla %] 4.4! It has been over a year since we
+<p>Welcome to Bugzilla 4.4! It has been over a year since we
-  released [% terms.Bugzilla %] 4.2 on February 2012, and this new major
+  released Bugzilla 4.2 on February 2012, and this new major
   release comes with several new features and improvements. This release
   contains major improvements to WebServices, which were our main target in
   this release, a rewritten tagging system, a real MIME type auto-detection for
@@ -110,7 +110,7 @@
 <p>Perl v5.8.1</p>
 
 <p><strong>IMPORTANT:</strong> This is the last major release to support
-  Perl 5.8.x! The next major release, [% terms.Bugzilla %] 5.0, will require
+  Perl 5.8.x! The next major release, Bugzilla 5.0, will require
   Perl 5.10.1 as a minimum.</p>
 
 [% INCLUDE db_req db='mysql' %]
@@ -129,7 +129,7 @@
 <h3 id="v44_req_optional_mod">Optional Perl Modules</h3>
 
 <p>The following perl modules, if installed, enable various
-  features of [% terms.Bugzilla %]:</p>
+  features of Bugzilla:</p>
 
 [% INCLUDE req_table reqs = OPTIONAL_MODULES
                      new  = ['Net-SMTP-SSL', 'HTML-FormatText-WithLinks',
@@ -139,10 +139,10 @@
 
 <h3 id="v44_req_apache">Optional Apache Modules</h3>
 
-<p>If you are using Apache as your webserver, [% terms.Bugzilla %] can
+<p>If you are using Apache as your webserver, Bugzilla can
   take advantage of some Apache features if you have the below Apache
   modules installed and enabled. Currently,
-  <a href="#v40_feat_js_css_update">certain [% terms.Bugzilla %] features</a>
+  <a href="#v40_feat_js_css_update">certain Bugzilla features</a>
   are enabled only if you have all of the following modules installed
   and enabled:</p>
 
@@ -175,14 +175,14 @@
 
 <p>
   In the "Advanced Search" page, it is now possible to build queries using
-  multiple custom search criteria against the same field. In [% terms.Bugzilla %]
+  multiple custom search criteria against the same field. In Bugzilla
   4.2 and older, queries of the form
   <br><br>
   <kbd>"Status changed to VERIFIED" AND "Status changed by foo@bar.com"</kbd>
   <br><br>
   were returning all [% terms.bugs %] which had their status changed to VERIFIED
   by some user and which were edited by foo@bar.com once, but both actions could
-  be independent. In [% terms.Bugzilla %] 4.4, you can now decide if both
+  be independent. In Bugzilla 4.4, you can now decide if both
   criteria must match the exact same action or not, i.e. if you want
   [%+ terms.bugs %] whose status has been set to VERIFIED by foo@bar.com himself.
   In the same way, queries of the form
@@ -243,10 +243,10 @@
 
 <p>
   When a user uploads a new attachment and lets the "Content Type" field set to
-  "auto-detect", [% terms.Bugzilla %] now does its own MIME type detection
+  "auto-detect", Bugzilla now does its own MIME type detection
   if the web browser tells him that the attachment is of type
   "application/octet-stream", in an attempt to make a better guess than the web
-  browser. In all other cases, [% terms.Bugzilla %] still trusts what the browser
+  browser. In all other cases, Bugzilla still trusts what the browser
   tells him.
 </p>
 <p>
@@ -285,7 +285,7 @@
 <p>
   This release got major improvements in its WebServices interface. Many new
   methods have been implemented to let third-party applications interact with
-  [%+ terms.Bugzilla %] even more closely. For instance, it is now possible to
+  Bugzilla even more closely. For instance, it is now possible to
   know what parameters are set to using <kbd>B[%%]ugzilla.parameters</kbd>.
   It is now also possible to update tags, products, groups or user accounts
   using our API.
@@ -302,10 +302,10 @@
 <h3 id="v44_feat_apache_config">New Apache Configuration</h3>
 
 <p>
-  For improved security, [% terms.Bugzilla %] now prevents directory browsing
+  For improved security, Bugzilla now prevents directory browsing
-  by default. If you run [% terms.Bugzilla %] under Apache (as most people do),
+  by default. If you run Bugzilla under Apache (as most people do),
   you most likely require a <strong>new Apache configuration</strong> for this
-  version of [% terms.Bugzilla %]. See the
+  version of Bugzilla. See the
   <a href="#v44_upgrading">Notes On Upgrading From a Previous Version</a>
   section for details.
 </p>
@@ -385,7 +385,7 @@
     <em>X-Priority</em> email headers to increase or decrease the initial
     priority of the [% terms.bug %], unless the priority is already explicitly
     set in the email itself.</li>
-  <li><strong>Skins:</strong> [% terms.Bugzilla %] no longer fetches all skins
+  <li><strong>Skins:</strong> Bugzilla no longer fetches all skins
     available when viewing a page. It only loads the skin selected by the user
     in his preferences, which results in less requests to the server.</li>
 </ul>
@@ -393,7 +393,7 @@
 <h4>Enhancements for Administrators and Developers</h4>
 
 <ul>
-  <li><strong>License:</strong> The [% terms.Bugzilla %] code is now released
+  <li><strong>License:</strong> The Bugzilla code is now released
     under the MPL 2.0 license (previously was MPL 1.1).</li>
   <li><strong>Installation:</strong> On mod_perl, templates now remain in
     memory for one hour, which can cause an increase in memory requirements.
@@ -510,7 +510,7 @@
 <h3>IMPORTANT: Apache Configuration Change</h3>
 
 <p>
-  For improved security, [% terms.Bugzilla %] now prevents directory browsing
+  For improved security, Bugzilla now prevents directory browsing
   by default. In order to do that, the root <kbd>bugzilla/.htaccess</kbd> file
   now contains the <kbd>Options -Indexes</kbd> directive. By default, this
   directive is not allowed in <kbd>.htaccess</kbd> and so you must configure
@@ -542,7 +542,7 @@
   <li>There is a new code hook <kbd>bug_url_sub_classes</kbd> to support
     additional URLs in the See Also field.</li>
   <li>There is a new code hook <kbd>error_catch</kbd> to catch errors thrown
-    by [% terms.Bugzilla %] and to take the appropriate actions.</li>
+    by Bugzilla and to take the appropriate actions.</li>
   <li>There is a new code hook <kbd>path_info_whitelist</kbd> to whitelist
     scripts which should still get the Path-Info information from URLs. By
     default, Path-Info is now removed before being passed to CGI scripts.</li>
@@ -589,7 +589,7 @@
 </ul>
 
 
-<h1 id="v44_previous">[% terms.Bugzilla %] 4.2 Release Notes</h1>
+<h1 id="v44_previous">Bugzilla 4.2 Release Notes</h1>
 
 <ul class="bz_toc">
   <li><a href="#v42_introduction">Introduction</a></li>
@@ -604,8 +604,8 @@
 
 <h2 id="v42_introduction">Introduction</h2>
 
-<p>Welcome to [% terms.Bugzilla %] 4.2! It has been almost a year since we
+<p>Welcome to Bugzilla 4.2! It has been almost a year since we
-  released [% terms.Bugzilla %] 4.0 on February 2011, and this new major
+  released Bugzilla 4.0 on February 2011, and this new major
   release comes with several new features and improvements. This release
   contains major improvements to search, support for SQLite, improved
   WebServices, and lots of other enhancements.</p>
@@ -630,7 +630,7 @@
   <li>Attaching a file to [% terms.abug %] was broken due to a change in
     Perl 5.16.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=771100">[% terms.Bug %] 771100</a>)</li>
-  <li>A regression in [% terms.Bugzilla %] 4.2.2 made Oracle crash when
+  <li>A regression in Bugzilla 4.2.2 made Oracle crash when
     displaying a buglist.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=780028">[% terms.Bug %] 780028</a>)</li>
   <li>It was possible to search on history for comments and attachments you
@@ -665,7 +665,7 @@
   release:</p>
 
 <ul>
-  <li>A regression introduced in [% terms.Bugzilla %] 4.0 caused some login
+  <li>A regression introduced in Bugzilla 4.0 caused some login
     names to be ignored when entered in the CC list of [% terms.bugs %].
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=756314">[% terms.Bug %] 756314</a>)</li>
   <li>Some queries could trigger an invalid SQL query if strings entered by
@@ -674,7 +674,7 @@
   <li>The auto-completion form for keywords no longer automatically selects
     the first keyword in the list when the field is empty.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=764517">[% terms.Bug %] 764517</a>)</li>
-  <li>A regression in [% terms.Bugzilla %] 4.2 prevented classifications
+  <li>A regression in Bugzilla 4.2 prevented classifications
     from being used in graphical and tabular reports in the "Multiple Tables"
     field.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=753688">[% terms.Bug %] 753688</a>)</li>
@@ -686,7 +686,7 @@
   <li>Keywords are now correctly escaped in the auto-completion form to prevent
     any XSS abuse.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=754561">[% terms.Bug %] 754561</a>)</li>
-  <li>A regression introduced in [% terms.Bugzilla %] 4.0rc2 when fixing
+  <li>A regression introduced in Bugzilla 4.0rc2 when fixing
     CVE-2011-0046 caused the "Un-forget the search" link to not work correctly
     anymore when restoring a deleted saved search, because this link was
     lacking a valid token.
@@ -854,7 +854,7 @@
 <h3 id="v42_req_optional_mod">Optional Perl Modules</h3>
 
 <p>The following perl modules, if installed, enable various
-  features of [% terms.Bugzilla %]:</p>
+  features of Bugzilla:</p>
 
 
 <table class="req_table">
@@ -999,10 +999,10 @@
 
 <h3 id="v42_req_apache">Optional Apache Modules</h3>
 
-<p>If you are using Apache as your webserver, [% terms.Bugzilla %] can
+<p>If you are using Apache as your webserver, Bugzilla can
   take advantage of some Apache features if you have the below Apache
   modules installed and enabled. Currently,
-  <a href="#v40_feat_js_css_update">certain [% terms.Bugzilla %] features</a>
+  <a href="#v40_feat_js_css_update">certain Bugzilla features</a>
   are enabled only if you have all of the following modules installed
   and enabled:</p>
 
@@ -1028,14 +1028,14 @@
   <li><a href="#v42_feat_product">Disabling Old Components, Versions and Milestones</a></li>
   <li><a href="#v42_feat_custom">Displaying a Custom Field Value Based on Multiple
     Values of Another Field</a></li>
-  <li><a href="#v42_feat_audit">Auditing of All Changes Within [% terms.Bugzilla %]</a></li>
+  <li><a href="#v42_feat_audit">Auditing of All Changes Within Bugzilla</a></li>
   <li><a href="#v42_feat_wai">Accessibility Improvements</a></li>
   <li><a href="#v42_feat_other">Other Enhancements and Changes</a></li>
 </ul>
 
 <h3 id="v42_feat_sqlite">Experimental SQLite Support</h3>
 
-<p>SQLite is now supported by [% terms.Bugzilla %] and becomes the 4th supported
+<p>SQLite is now supported by Bugzilla and becomes the 4th supported
   database besides MySQL, PostgreSQL and Oracle. SQLite support must be considered
   as experimental, at least till the next major release.</p>
 
@@ -1076,7 +1076,7 @@
   Previously, you could only display a custom field based on a single value of
   another field.</p>
 
-<h3 id="v42_feat_audit">Auditing of All Changes Within [% terms.Bugzilla %]</h3>
+<h3 id="v42_feat_audit">Auditing of All Changes Within Bugzilla</h3>
 
 <p>Most changes made through the admin interface are now logged to the database,
   in the <kbd>audit_log</kbd> table. There is no UI to access this table yet,
@@ -1087,7 +1087,7 @@
 <h3 id="v42_feat_wai">Accessibility Improvements</h3>
 
 <p>A project has started thanks to Francisco Donalisio from IBM to make
-  [%+ terms.Bugzilla %] compliant with the W3C Web Accessibility Initiative
+  Bugzilla compliant with the W3C Web Accessibility Initiative
   standards. A lot more work still needs to be done, but we expect a much
   better compatibility for the next major release.</p>
 
@@ -1162,12 +1162,12 @@
 <ul>
   <li><strong>Installation:</strong> <kbd>checksetup.pl</kbd> is now much quieter
     when creating a new database.</li>
-  <li><strong>Security:</strong> [% terms.Bugzilla %] 4.0 is using
+  <li><strong>Security:</strong> Bugzilla 4.0 is using
     <kbd>Math::Random::Secure</kbd> to generate cryptographically secure
     pseudorandom numbers, but it appeared that installing this Perl module from
     CPAN caused a lot of trouble for some people due to its numerous dependencies.
     So the RNG code has been rewritten to only depend on <kbd>Math::Random::ISAAC</kbd>,
-    which was already in use in previous versions of [% terms.Bugzilla %].</li>
+    which was already in use in previous versions of Bugzilla.</li>
   <li><strong>Security:</strong> <kbd>X-Frame-Options = SAMEORIGIN</kbd> is now
     passed to all page headers (except when viewing attachments, as they can be
     on a different host) to protect users from framing and subsequent possible
@@ -1260,23 +1260,23 @@
   <li>YUI has been upgraded to 2.9.0.</li>
   <li>Due to the major code refactor of <kbd>B[%%]ugzilla/Search.pm</kbd>, any
     customization made against this file will probably need to be rewritten.</li>
-  <li>The [% terms.Bugzilla %]-specific <kbd>url_quote</kbd> filter used in templates
+  <li>The Bugzilla-specific <kbd>url_quote</kbd> filter used in templates
     has been removed and replaced by the <kbd>uri</kbd> filter from Template::Toolkit
     as they are now similar.</li>
   <li><kbd>long_list.cgi</kbd>, <kbd>showattachment.cgi</kbd> and <kbd>xml.cgi</kbd>
     have been removed from the codebase. As <a href="#v40_code_changes">announced</a>
-    in the release notes of [% terms.Bugzilla %] 4.0, these scripts were deprecated
+    in the release notes of Bugzilla 4.0, these scripts were deprecated
-    since [% terms.Bugzilla %] 2.19.</li>
+    since Bugzilla 2.19.</li>
   <li><kbd>sidebar.cgi</kbd> has been removed, because Gecko-based browsers no
     longer support remote XUL, and its popularity is very low.</li>
   <li><kbd>contrib/yp_nomail.sh</kbd> has been removed. This script is no longer
-    useful since [% terms.Bugzilla %] 3.0.</li>
+    useful since Bugzilla 3.0.</li>
   <li><kbd>contrib/bugzilla_ldapsync.rb</kbd> has been removed. This script didn't
     work for a long time.</li>
 </ul>
 
 
-<h1 id="v42_previous">[% terms.Bugzilla %] 4.0 Release Notes</h1>
+<h1 id="v42_previous">Bugzilla 4.0 Release Notes</h1>
 
 <ul class="bz_toc">
   <li><a href="#v40_introduction">Introduction</a></li>
@@ -1292,20 +1292,20 @@
 
 <h2 id="v40_introduction">Introduction</h2>
 
-<p>This is [% terms.Bugzilla %] 4.0! Since 3.6 (our previous major
+<p>This is Bugzilla 4.0! Since 3.6 (our previous major
   release) we've come a long way, and we've come even further compared to
-  3.0 in 2007! Since [% terms.Bugzilla %] 3.0, almost every major user
+  3.0 in 2007! Since Bugzilla 3.0, almost every major user
-  interface in [% terms.Bugzilla %] has been redesigned, the WebServices have
+  interface in Bugzilla has been redesigned, the WebServices have
   evolved enormously, there's a great new Extensions system, and there
   are hundreds of other new features. With the major redesigns that come
   particularly in this release compared to 3.6, we felt that it was time to
   call this release 4.0.</p>
 
 <p>It's not just major WebService and UI enhancements that are new in
-  [%+ terms.Bugzilla %] 4.0&mdash;there are many other exciting new features,
+  Bugzilla 4.0&mdash;there are many other exciting new features,
   including automatic duplicate detection, enhanced custom field
   functionality, autocomplete for users, search improvements, and much
-  more. Overall, 4.0 is far and away the best version of [% terms.Bugzilla %]
+  more. Overall, 4.0 is far and away the best version of Bugzilla
   we've ever released.</p>
 
 <p>If you're upgrading, make sure to read <a href="#v40_upgrading">Notes
@@ -1320,7 +1320,7 @@
   the <a href="http://www.ibm.com/linux/ltc/">IBM Linux Technology Center</a>,
   and <a href="http://www.redhat.com/">Red Hat</a> for funding the development
   of certain features and improvements in this release of
-  [%+ terms.Bugzilla %].</p>
+  Bugzilla.</p>
 
 <h2 id="v40_point">Updates in this 4.0.x Release</h2>
 
@@ -1335,7 +1335,7 @@
 
 <ul>
   <li>The <kbd>B[% %]ug.create</kbd> WebService method now throws an error if you
-    pass a group name which doesn't exist. In [% terms.Bugzilla %] 4.0 and 4.0.1,
+    pass a group name which doesn't exist. In Bugzilla 4.0 and 4.0.1,
     this group name was silently ignored, leaving your [% terms.bug %] unsecure
     if no other group applied.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=653341">[% terms.Bug %] 653341</a>)</li>
@@ -1353,7 +1353,7 @@
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=652427">[% terms.Bug %] 652427</a>)</li>
   <li>WebServices methods will return undefined [% terms.bug %] fields as undefined
     instead of as an empty string. This change is consistent with how
-    [%+ terms.Bugzilla %] 4.2 behaves.
+    Bugzilla 4.2 behaves.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=657561">[% terms.Bug %] 657561</a>)</li>
   <li>The XML-RPC interface now works with SOAP::Lite 0.711 and 0.712 under mod_perl.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=600810">[% terms.Bug %] 600810</a>)</li>
@@ -1499,7 +1499,7 @@
 <h3 id="v40_req_optional_mod">Optional Perl Modules</h3>
 
 <p>The following perl modules, if installed, enable various
-  features of [% terms.Bugzilla %]:</p>
+  features of Bugzilla:</p>
 
   <table class="req_table">
     <tbody>
@@ -1637,10 +1637,10 @@
 
 <h3 id="v40_req_apache">Optional Apache Modules</h3>
 
-<p>If you are using Apache as your webserver, [% terms.Bugzilla %] can
+<p>If you are using Apache as your webserver, Bugzilla can
   now take advantage of some Apache features if you have the below Apache
   modules installed and enabled. Currently,
-  <a href="#v40_feat_js_css_update">certain [% terms.Bugzilla %] features</a>
+  <a href="#v40_feat_js_css_update">certain Bugzilla features</a>
   are enabled only if you have all of the following modules installed
   and enabled:</p>
 
@@ -1682,11 +1682,11 @@
   [%+ terms.Bugs %]</h3>
 
 <p>When filing [% terms.abug %], as soon as you start typing in the summary
-  field, [% terms.Bugzilla %] will suggest possible duplicates of the
+  field, Bugzilla will suggest possible duplicates of the
   [%+ terms.bug %] you are filing.</p>
 
 <p>In order for this feature to work, all pre-requisites for JSON-RPC
-  support must be installed on your [% terms.Bugzilla %]. It will be
+  support must be installed on your Bugzilla. It will be
   much faster on installations that run under mod_perl than it will
   be on other installations.</p>
 
@@ -1715,7 +1715,7 @@
   [%+ field_descs.qa_contact FILTER html %], or
   [%+ field_descs.assigned_to FILTER html %] fields), a list will appear
   containing all of the users whose real names or usernames match what you are
-  typing. Your [% terms.Bugzilla %] must have all of the optional Perl
+  typing. Your Bugzilla must have all of the optional Perl
   modules required for JSON-RPC support installed, though, in order for
   this feature to work. Also, this feature will be <strong>much</strong>
   faster on installations that run under mod_perl than it will be on
@@ -1727,14 +1727,14 @@
 <h3 id="v40_feat_ui">General Usability Improvements</h3>
 
 <p>In addition to the enhancements listed above, there have been
-  <strong>many</strong> improvements made across the [% terms.Bugzilla %]
+  <strong>many</strong> improvements made across the Bugzilla
   user interface. For a list of specific enhancements that were significant,
   see the <a href="#v40_feat_other">Other Enhancements and Changes</a>
   section.</p>
 
 <h3 id="v40_feat_workflow">New Default Status Workflow</h3>
 
-<p>For new installations of [% terms.Bugzilla %], the default set of
+<p>For new installations of Bugzilla, the default set of
   statuses will now be:</p>
 
 <ul>
@@ -1754,7 +1754,7 @@
   can run after you use <kbd>checksetup.pl</kbd> to upgrade. The
   <kbd>whineatnews.pl</kbd> and <kbd>bugzilla-submit</kbd> scripts
   will probably not work properly if you continue to use the old workflow
-  (though most other parts of [% terms.Bugzilla %] will still function
+  (though most other parts of Bugzilla will still function
   normally).</p>
 
 <p>For more information about the workflow and our rationale for changing
@@ -1766,25 +1766,25 @@
 
 <h3 id="v40_feat_lists">"Last Search" Now Remembers Multiple Searches</h3>
 
-<p>At the top of every [% terms.bug %] in [% terms.Bugzilla %], there are
+<p>At the top of every [% terms.bug %] in Bugzilla, there are
   links that look like: "First", "Last", "Prev", "Next", and
-  "Show last search results". In earlier versions of [% terms.Bugzilla %],
+  "Show last search results". In earlier versions of Bugzilla,
   if you did two separate searches in separate windows, these links would
-  only work for the <em>last</em> search you did. Now, [% terms.Bugzilla %]
+  only work for the <em>last</em> search you did. Now, Bugzilla
   will "remember" which search result you came from and give you the right
   "last search results" or "next [% terms.bug %]" from <em>that</em> list,
   instead of always using your most recent search.</p>
 
-<p>There are still some situations where [% terms.Bugzilla %] will have to
+<p>There are still some situations where Bugzilla will have to
   "guess" which search you are trying to navigate through, but it does its
   best to get it right.</p>
 
 <h3 id="v40_feat_jsonp">Cross-Domain WebServices with JSONP</h3>
 
-<p>[% terms.Bugzilla %] now supports making WebService calls from
+<p>Bugzilla now supports making WebService calls from
   another domain, inside of a web browser, thanks to support for
   <a href="http://bob.pythonmac.org/archives/2005/12/05/remote-json-jsonp/">JSONP</a>.
-  This will allow for web "mash-ups" to use [% terms.Bugzilla %] data.
+  This will allow for web "mash-ups" to use Bugzilla data.
   When using JSONP, you may only call functions that <em>get</em> data, 
   you may not call functions that <em>change</em> data.</p>
 
@@ -1809,46 +1809,46 @@
 
 <h3 id="v40_feat_vot_ext">Voting Is Now An Extension</h3>
 
-<p>All of the code for voting in [% terms.Bugzilla %] has been moved
+<p>All of the code for voting in Bugzilla has been moved
   into an extension, called "Voting", in the <kbd>extensions/Voting/</kbd>
   directory. To enable it, you must remove the <kbd>disabled</kbd> file
   from that directory, and run <kbd>checksetup.pl</kbd>.</p>
 
-<p>In a future version of [% terms.Bugzilla %], the Voting extension will
+<p>In a future version of Bugzilla, the Voting extension will
-  be moved outside of the [% terms.Bugzilla %] core code, so we are looking
+  be moved outside of the Bugzilla core code, so we are looking
   for somebody who has an interest in the Voting system and would like to
   maintain it as a separate extension. There are many enhancement requests
   that have been made against the Voting system, and the best way for those
   to get addressed is for somebody to step up and offer to maintain the
-  system outside of [% terms.Bugzilla %]'s core code.</p>
+  system outside of Bugzilla's core code.</p>
 
 <h3 id="v40_feat_js_css_update">Users Get New CSS and Javascript
   Automatically</h3>
   
-<p>In past versions of [% terms.Bugzilla %], if you changed
+<p>In past versions of Bugzilla, if you changed
-  [%+ terms.Bugzilla %]'s CSS or Javascript files, then every user of
+  Bugzilla's CSS or Javascript files, then every user of
-  [%+ terms.Bugzilla %] would have to clear their cache in order to get
+  Bugzilla would have to clear their cache in order to get
   the updated files. Now, if you are using Apache as your webserver and
   you have the <a href="#v40_req_apache">optional Apache modules</a>
   installed and enabled, users will automatically get every new version of
-  [%+ terms.Bugzilla %]'s Javascript and CSS without having to clear
+  Bugzilla's Javascript and CSS without having to clear
   their caches.</p>
 
 <p>This feature also gives a slight performance speedup to
-  [%+ terms.Bugzilla %] in some cases, and so we recommend that all
+  Bugzilla in some cases, and so we recommend that all
   administrators install and enable the optional Apache modules if possible.</p>
 
 <h3 id="v40_feat_hooks">Many New Hooks</h3>
 
 <p>Many new code hooks have been added for use by Extensions,
-  in [% terms.Bugzilla %] 4.0. Now Extensions can access and modify
+  in Bugzilla 4.0. Now Extensions can access and modify
-  nearly every part of [% terms.Bugzilla %].</p>
+  nearly every part of Bugzilla.</p>
 
 <h3 id="v40_feat_apache_config">New Apache Configuration</h3>
 
-<p>If you run [% terms.Bugzilla %] under Apache (as most people do),
+<p>If you run Bugzilla under Apache (as most people do),
   you most likely require a <strong>new Apache configuration</strong> 
-  for this version of [% terms.Bugzilla %]. See the 
+  for this version of Bugzilla. See the
   <a href="#v40_upgrading">Notes On Upgrading From a Previous Version</a>
   section for details.</p>
 
@@ -1857,7 +1857,7 @@
 <h4>Enhancements for Users</h4>
 
 <ul>
-  <li>Now, everywhere in [% terms.Bugzilla %] where you can enter a date,
+  <li>Now, everywhere in Bugzilla where you can enter a date,
     there is a Calendar widget where you can select the date on a
     calendar.</li>
   <li>The big icons on the front page have been replaced with much nicer
@@ -1874,9 +1874,9 @@
   <li><strong>[% terms.Bugs %]:</strong> There is now a user preference
     for whether the comment box appears above or below the existing
     comments.</li>
-  <li><strong>[% terms.Bugs %]:</strong> [% terms.Bugzilla %] will now
+  <li><strong>[% terms.Bugs %]:</strong> Bugzilla will now
     send an email for every comment that you mark or un-mark as being
-    private. (Previous versions of [% terms.Bugzilla %] did not send emails
+    private. (Previous versions of Bugzilla did not send emails
     to users about this change.) The state of comments being made private
     is also now stored in [% terms.abug %]'s history.</li>
   <li><strong>[% terms.Bugs %]:</strong> The box to "Add [% terms.Bug %] URLs"
@@ -1922,14 +1922,14 @@
   
   <li>When using the Reports interface, you can now choose many more fields
     as the X, Y, or Z axis of a report, including custom fields.</li>
-  <li>[% terms.Bugzilla %] now prevents
+  <li>Bugzilla now prevents
     Internet Explorer 8 and later from attempting to render
     <kbd>text/plain</kbd> attachments as HTML.</li>
   <li>If you receive a Whine mail that is empty, there will now be a brief
     message explaining that your search found no results.</li>
   <li>The <a href="page.cgi?id=fields.html">Field Help Page</a> now
     contains a description of every single field that can be on
-    [%+ terms.abug %] in [% terms.Bugzilla %].</li>
+    [%+ terms.abug %] in Bugzilla.</li>
 </ul>
 
 <h4>Enhancements for Administrators and Developers</h4>
@@ -1937,11 +1937,11 @@
 <ul>
   <li>The system for moving [% terms.bugs %] between installations has been
     moved into an extension called <kbd>OldBugMove</kbd>. This system was used
-    by very few [% terms.Bugzilla %] installations--if you aren't certain
+    by very few Bugzilla installations--if you aren't certain
     whether or not you are using it, you're not using it. To enable the system,
     you have to remove the file <kbd>extensions/OldBugMove/disabled</kbd>
-    and then run <kbd>checksetup.pl</kbd>. In a future version of [% terms.Bugzilla %],
+    and then run <kbd>checksetup.pl</kbd>. In a future version of Bugzilla,
-    this extension may be moved outside of the core [% terms.Bugzilla %] code,
+    this extension may be moved outside of the core Bugzilla code,
     so if you are interested in maintaining it, please let us know.</li>
   <li><strong>Custom Fields: </strong> "[% terms.Bug %] ID" custom fields can
     now represent relationships between [% terms.bugs %], similarly to how the
@@ -1961,15 +1961,15 @@
     defaults for everything so that people do not have to specify any field
     values when filing [% terms.abug %] via email.)</li>
   <li><strong>Installation:</strong> If you are using a localized version of
-    [%+ terms.Bugzilla %] and your terminal does not understand Unicode,
+    Bugzilla and your terminal does not understand Unicode,
     <kbd>checksetup.pl</kbd> will now attempt to output its messages in your
     terminal's character set.</li>
-  <li><strong>Installation:</strong> [% terms.Bugzilla %] no longer needs empty
+  <li><strong>Installation:</strong> Bugzilla no longer needs empty
     "placeholder" CSS in the <kbd>skins/custom</kbd> directory and other
     directories. When you update, <kbd>checksetup.pl</kbd> will remove these.
     This also significantly reduces the number of HTTP requests required to
-    load a page for the first time in [% terms.Bugzilla %].</li>
+    load a page for the first time in Bugzilla.</li>
-  <li><strong>Installation:</strong> For Windows users, [% terms.Bugzilla %]
+  <li><strong>Installation:</strong> For Windows users, Bugzilla
     now supports Strawberry Perl fully.</li>
   <li><strong>Installation:</strong> Now, whenever <kbd>checksetup.pl</kbd>
     throws an error, it will be printed in the color red, to make it
@@ -1979,25 +1979,25 @@
     almost anything it does.</li>
   <li><strong>Installation:</strong> The process of adding foreign keys
     to a table is now much faster. This will particularly improve the speed
-    of upgrading from [% terms.Bugzilla %] 3.4 or earlier.</li>
+    of upgrading from Bugzilla 3.4 or earlier.</li>
   <li>If you are using <kbd>jobqueue.pl</kbd> and email gets heavily delayed
     for some reason, those emails will now have a Date header reflecting the
     time they were <em>supposed</em> to be sent, instead of when they actually
     <em>were</em> sent.</li>
   <li><kbd>./jobqueue.pl install</kbd> now works on SuSE Linux.</li>
-  <li>[% terms.Bugzilla %] now runs much better in Apache's suexec mode
+  <li>Bugzilla now runs much better in Apache's suexec mode
     than it used to. As part of this, <kbd>checksetup.pl</kbd> sets
-    much stricter permissions on all the files in [% terms.Bugzilla %]
+    much stricter permissions on all the files in Bugzilla
-    than it used to. In particular, any files that [% terms.Bugzilla %]
+    than it used to. In particular, any files that Bugzilla
     does not know about will not be readable by the webserver.</li>
   <li>The <kbd>sendmailnow</kbd> parameter has been removed, as it was
     not necessary for any modern version of Sendmail or other Mail Transfer
     Agent.</li>
   <li>When editing a user via the Users administration panel, you can now
     see if they are a Default CC on any component.</li>
-  <li>For new installations of [% terms.Bugzilla %], all users will be
+  <li>For new installations of Bugzilla, all users will be
     able to see and use the Whining system by default.</li>
-  <li>When you are using SSL with [% terms.Bugzilla %], you can now
+  <li>When you are using SSL with Bugzilla, you can now
     turn on the <kbd>strict_transport_security</kbd> parameter to
     send the
     <a href="https://developer.mozilla.org/en/Security/HTTP_Strict_Transport_Security">Strict-Transport-Security</a>
@@ -2009,19 +2009,19 @@
     and object_validators. The colchange_columns hook has been removed,
     as it is no longer necessary (buglist_columns will be used for data
     about which columns can be on the [% terms.bug %] list).</li>
-  <li>When [% terms.Bugzilla %] throws certain types of errors, it will
+  <li>When Bugzilla throws certain types of errors, it will
     now include a "traceback" of where exactly the error occurred in the
     code, to help administrators and developers debug problems.</li>
   <li>There is now a test, <kbd>xt/search.t</kbd>, that assures that all
     of the functionality of <kbd>Bugzilla::Search</kbd> is working properly.
-    If you customize the search functionality of [% terms.Bugzilla %],
+    If you customize the search functionality of Bugzilla,
     you may wish to run this test to assure that your changes are correct.
     You can see more information about running this test by doing
     <kbd>perldoc xt/search.t</kbd> at the command line.</li>
-  <li>[% terms.Bugzilla %] now sends the
+  <li>Bugzilla now sends the
     <a href="https://developer.mozilla.org/en/the_x-frame-options_response_header"><code>X-Frame-Options: SAMEORIGIN</code></a> header
     with every page request in order to prevent "clickjacking" attacks. Note
-    that this prevents other domains from displaying [% terms.Bugzilla %]
+    that this prevents other domains from displaying Bugzilla
     in an HTML frame.</li> 
 </ul>
 
@@ -2047,7 +2047,7 @@
     and <kbd>exclude_fields</kbd> arguments: <kbd>B[% %]ug.get</kbd>,
     <kbd>B[% %]ug.search</kbd>, and <kbd>B[% %]ug.attachments</kbd>. Also,
     server-side performance of the WebService is actually increased when
-    using these arguments, now, as [% terms.Bugzilla %] will no longer
+    using these arguments, now, as Bugzilla will no longer
     get data from the database for fields you haven't asked for.</li>
   <li>You can now mark the initial description of [% terms.abug %] as
     private when filing [% terms.abug %] via the <kbd>B[% %]ug.create</kbd>
@@ -2062,7 +2062,7 @@
   <li>There is a new, undocumented B[% %]ug.possible_duplicates
     function that helps implement the automatic duplicate detection
     system. Because this function is not documented, its API may change
-    between releases of [% terms.Bugzilla %].</li>
+    between releases of Bugzilla.</li>
   <li>You can no longer search using the <kbd>votes</kbd> argument in
     <kbd>B[% %]ug.search</kbd>.</li>
   <li><kbd>B[% %]ug.attachments</kbd> now returns the attachment's description
@@ -2070,12 +2070,12 @@
     consistent with the fact that [% terms.bug %] summaries are called
     "summary". The value is still <em>also</em> returned as "description",
     for backwards compatibility, but this backwards compatibility will go
-    away in [% terms.Bugzilla %] 5.0.</li>
+    away in Bugzilla 5.0.</li>
   <li>In the return values of various <kbd>B[% %]ug</kbd> functions, the author
     of comments, [% terms.bugs %], and attachments is now called "creator",
     instead of sometimes being called "reporter", "author", or "attacher".
     The old names are retained for backwards-compatibility, and will stay
-    around until [% terms.Bugzilla %] 5.0.</li>
+    around until Bugzilla 5.0.</li>
 </ul>
 
 <h2 id="v40_issues">Outstanding Issues</h2>
@@ -2104,10 +2104,10 @@
 
 <h4>mod_cgi</h4>
 
-<p>If you run [% terms.Bugzilla %] under mod_cgi (this is the most common
+<p>If you run Bugzilla under mod_cgi (this is the most common
   configuration, involving a &lt;Directory&gt; block in your Apache config
   file), you will need to update the configuration of Apache for 
-  [%+ terms.Bugzilla %]. In particular, this line in the [% terms.Bugzilla %]
+  Bugzilla. In particular, this line in the Bugzilla
   <kbd>&lt;Directory&gt;</kbd> block:</p>
 
 <blockquote><code>AllowOverride Limit</code></blockquote>
@@ -2116,14 +2116,14 @@
 
 <blockquote><code>AllowOverride Limit FileInfo Indexes</code></blockquote>
  
-<p>For full details on how to configure Apache for [% terms.Bugzilla %],
+<p>For full details on how to configure Apache for Bugzilla,
   see the
   <a href="[% docs_urlbase FILTER html %]configuration.html#http-apache">Configuration</a>
-  section of the [% terms.Bugzilla %] Guide.</p>
+  section of the Bugzilla Guide.</p>
 
 <h4>mod_perl</h4>
 
-<p>If your [% terms.Bugzilla %] runs under mod_perl, the required Apache
+<p>If your Bugzilla runs under mod_perl, the required Apache
   configuration is now simpler. The line that used to look like:</p>
 
 <blockquote><code>PerlSwitches -w -T -I/var/www/html/bugzilla 
@@ -2137,16 +2137,16 @@
 
 <h3>New .htaccess file</h3>
 
-<p>In previous versions of [% terms.Bugzilla %], there was a file
+<p>In previous versions of Bugzilla, there was a file
-  in [% terms.Bugzilla %]'s root directory called ".htaccess" that was
+  in Bugzilla's root directory called ".htaccess" that was
   generated by <kbd>checksetup.pl</kbd>. This file is now shipped with
-  [%+ terms.Bugzilla %] instead of being generated during installation.</p>
+  Bugzilla instead of being generated during installation.</p>
 
 <p>If you update via CVS or bzr, you will get a message that your existing
   .htaccess file conflicts with the new one. You must
   <strong>remove your existing .htaccess file</strong> and use the new one
   instead. Continuing to use your old .htaccess file will cause certain new
-  features of [% terms.Bugzilla %] to not work properly, and may also lead
+  features of Bugzilla to not work properly, and may also lead
   to security issues for your system in the future.</p>
 
 <h2 id="v40_code_changes">Code Changes Which May Affect Customizations and
@@ -2158,9 +2158,9 @@
     (For example, <kbd>extensions/Foo/web/</kbd>). <kbd>checksetup.pl</kbd>
     sets permissions on extensions much more strictly now, and files in
     other locations (such as your base <kbd>extensions/Foo/</kbd> directory)
-    will no longer be available to [% terms.Bugzilla %] users via the web
+    will no longer be available to Bugzilla users via the web
     under certain configurations.</li>
-  <li>Previous versions of [% terms.Bugzilla %] used to allow putting a
+  <li>Previous versions of Bugzilla used to allow putting a
     single file into the "skins" directory and having that be an entire
     skin. That is no longer allowed, and on upgrade, <kbd>checksetup.pl</kbd>
     will convert any such skins into a directory with a single
@@ -2193,7 +2193,7 @@
     that were passed in, while an object is being created. For an example of
     how to use <kbd>VALIDATOR_DEPENDENCIES</kbd>, see
     <kbd>Bugzilla/Field.pm</kbd>.</li>
-  <li>In previous versions of [% terms.Bugzilla %], you had to call
+  <li>In previous versions of Bugzilla, you had to call
     <code>Bugzilla-&gt;template_inner("")</code> after any time
     that you called <kbd>template_inner</kbd> for a specific language.
     It is no longer necessary to do this second <kbd>template_inner</kbd>
@@ -2209,17 +2209,17 @@
     now be easier to customize.</li>
   <li>The <kbd>Bugzilla::Util::lsearch</kbd> function is gone. Use
     <kbd>firstidx</kbd> from <kbd>List::MoreUtils</kbd>, instead.</li>
-  <li>[% terms.Bugzilla %] now includes YUI 2.8.2.</li>
+  <li>Bugzilla now includes YUI 2.8.2.</li>
   <li><kbd>long_list.cgi</kbd>, <kbd>showattachment.cgi</kbd> and
     <kbd>xml.cgi</kbd> are deprecated scripts which are no longer actively
-    used since [% terms.Bugzilla %] 2.19. These scripts will be removed in
+    used since Bugzilla 2.19. These scripts will be removed in
-    [%+ terms.Bugzilla %] 4.2.</li>
+    Bugzilla 4.2.</li>
 </ul>
 
 <h2 id="v40_previous">Release Notes For Previous Versions</h2>
 
 <p><a href="page.cgi?id=release-notes3.html">Release Notes for
-  [%+ terms.Bugzilla %] 3.x and Earlier</a></p>
+  Bugzilla 3.x and Earlier</a></p>
 
 [% INCLUDE global/footer.html.tmpl %]
 

mozilla/webtools/bugzilla/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 

mozilla/webtools/bugzilla/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 %]

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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>
 

mozilla/webtools/bugzilla/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>

mozilla/webtools/bugzilla/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>

mozilla/webtools/bugzilla/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