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/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
-  released [% terms.Bugzilla %] 4.2 on February 2012, and this new major
+<p>Welcome to Bugzilla 4.4! It has been over a year since we
+  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
-  by default. If you run [% terms.Bugzilla %] under Apache (as most people do),
+  For improved security, Bugzilla now prevents directory browsing
+  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
-  released [% terms.Bugzilla %] 4.0 on February 2011, and this new major
+<p>Welcome to Bugzilla 4.2! It has been almost a year since we
+  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
-    since [% terms.Bugzilla %] 2.19.</li>
+    in the release notes of Bugzilla 4.0, these scripts were deprecated
+    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
-  interface in [% terms.Bugzilla %] has been redesigned, the WebServices have
+  3.0 in 2007! Since Bugzilla 3.0, almost every major user
+  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
-  be moved outside of the [% terms.Bugzilla %] core code, so we are looking
+<p>In a future version of Bugzilla, the Voting extension will
+  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
-  [%+ terms.Bugzilla %]'s CSS or Javascript files, then every user of
-  [%+ terms.Bugzilla %] would have to clear their cache in order to get
+<p>In past versions of Bugzilla, if you changed
+  Bugzilla's CSS or Javascript files, then every user of
+  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
-  nearly every part of [% terms.Bugzilla %].</p>
+  in Bugzilla 4.0. Now Extensions can access and modify
+  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 %],
-    this extension may be moved outside of the core [% terms.Bugzilla %] code,
+    and then run <kbd>checksetup.pl</kbd>. In a future version of Bugzilla,
+    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>
-  <li><strong>Installation:</strong> For Windows users, [% terms.Bugzilla %]
+    load a page for the first time in Bugzilla.</li>
+  <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 %]
-    than it used to. In particular, any files that [% terms.Bugzilla %]
+    much stricter permissions on all the files in 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
-  in [% terms.Bugzilla %]'s root directory called ".htaccess" that was
+<p>In previous versions of Bugzilla, there was a file
+  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
-    [%+ terms.Bugzilla %] 4.2.</li>
+    used since Bugzilla 2.19. These scripts will be removed in
+    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 %]
 

template/en/default/pages/release-notes3.html.tmpl

@@ -6,7 +6,7 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% SET title = "$terms.Bugzilla 3.6 Release Notes" %]
+[% SET title = "Bugzilla 3.6 Release Notes" %]
 [% INCLUDE global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/page.css']
@@ -14,7 +14,7 @@
 
 <h3>Release Notes For Newer Versions</h3>
 
-<p>Release notes for versions of [% terms.Bugzilla %] of the 4.x series are
+<p>Release notes for versions of Bugzilla of the 4.x series are
   available <a href="page.cgi?id=release-notes.html">here</a>.</p>
 
 <h1>[% title FILTER html %]</h1>
@@ -33,7 +33,7 @@
 
 <h2 id="v36_introduction">Introduction</h2>
 
-<p>Welcome to [% terms.Bugzilla %] 3.6! The focus of the 3.6 release is
+<p>Welcome to Bugzilla 3.6! The focus of the 3.6 release is
   on improving usability and "polishing up" all our features (by adding
   some pieces that were "missing" or always wanted), although we
   also have a few great new features for you, as well!</p>
@@ -51,7 +51,7 @@
   <a href="http://www.redhat.com/">Red Hat</a>, and 
   <a href="http://www.novell.com/">Novell</a> for funding the development
   of various features and improvements in this release of
-  [%+ terms.Bugzilla %].</p>
+  Bugzilla.</p>
 
 <h2 id="v36_point">Updates in this 3.6.x Release</h2>
 
@@ -65,7 +65,7 @@
   this release:</p>
 
 <ul>
-  <li>[% terms.Bugzilla %] installations running on older versions of IIS
+  <li>Bugzilla installations running on older versions of IIS
     will no longer experience the "Undef to trick_taint" errors that would
     sometimes occur.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=521416">[% terms.Bug %] 521416</a>)
@@ -151,7 +151,7 @@
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=565314">[% terms.Bug %] 565314</a>)
   </li>
   <li>Some minor issues with Perl 5.12 were fixed (mostly warnings that Perl
-    5.12 was throwing). [% terms.Bugzilla %] now supports Perl 5.12.</li>
+    5.12 was throwing). Bugzilla now supports Perl 5.12.</li>
 </ul>
 
 <h2 id="v36_req">Minimum Requirements</h2>
@@ -274,7 +274,7 @@
 <h3 id="v36_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">
     <tr> 
@@ -449,29 +449,29 @@
 <h3 id="v36_feat_usability">General Usability Improvements</h3>
 
 <p>A <a href="https://wiki.mozilla.org/Bugzilla:CMU_HCI_Research_2008">scientific
-  usability study</a> was done on [% terms.Bugzilla %] by researchers
+  usability study</a> was done on Bugzilla by researchers
   from Carnegie-Mellon University. As a result of this study,
   <a href="https://bugzilla.mozilla.org/showdependencytree.cgi?id=490786&amp;hide_resolved=0">several
   usability issues</a> were prioritized to be fixed, based on specific data
   from the study.</p>
 
-<p>As a result, you will see many small improvements in [% terms.Bugzilla %]'s
+<p>As a result, you will see many small improvements in Bugzilla's
   usability, such as using Javascript to validate certain forms before
   they are submitted, standardizing the words that we use in the user interface,
-  being clearer about what [% terms.Bugzilla %] needs from the user,
+  being clearer about what Bugzilla needs from the user,
   and other changes, all of which are also listed individually in this New
   Features section.</p>
 
 <p>Work continues on improving usability for the next release of
-  [%+ terms.Bugzilla %], but the results of the research have already
+  Bugzilla, but the results of the research have already
   had an impact on this 3.6 release.</p>
 
 <h3 id="v36_feat_extensions">New Extensions System</h3>
 
-<p>[% terms.Bugzilla %] has a brand-new Extensions system. The system is
+<p>Bugzilla has a brand-new Extensions system. The system is
   consistent, fast, and
   <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Extension.html">fully
-  documented</a>. It makes it possible to easily extend [% terms.Bugzilla %]'s
+  documented</a>. It makes it possible to easily extend Bugzilla's
   code and user interface to add new features or change existing features.
   There's even
   <a href="[% docs_urlbase FILTER html %]api/extensions/create.html">a
@@ -480,7 +480,7 @@
   <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Extension.html">Extensions
   documentation</a>.</p>
 
-<p>If you had written any extensions using [% terms.Bugzilla %]'s previous
+<p>If you had written any extensions using Bugzilla's previous
   extensions system, there is
   <a href="[% docs_urlbase FILTER html %]api/contrib/extension-convert.html">a
   script to help convert old extensions into the new format</a>.</p>
@@ -488,7 +488,7 @@
 <h3 id="v36_feat_qs">Improved Quicksearch</h3>
 
 <p>The "quicksearch" box that appears on the front page of
-  [%+ terms.Bugzilla %] and in the header/footer of every page
+  Bugzilla and in the header/footer of every page
   is now simplified and made more powerful. There is a
   <kbd>[?]</kbd> link next to the box that will take you to
   the simplified <a href="page.cgi?id=quicksearch.html">Quicksearch Help</a>,
@@ -523,21 +523,21 @@
 
 <h3 id="v36_feat_browse">Simple "Browse" Interface</h3>
 
-<p>There is now a "Browse" link in the header of each [% terms.Bugzilla %]
+<p>There is now a "Browse" link in the header of each Bugzilla
   page that presents a very basic interface that allows users to simply
   browse through all open [% terms.bugs %] in particular components.</p>
 
 <h3 id="v36_feat_suexec">SUExec Support</h3>
 
-<p>[% terms.Bugzilla %] can now be run in Apache's "SUExec" mode,
+<p>Bugzilla can now be run in Apache's "SUExec" mode,
   which is what control panel software like cPanel and Plesk use
-  (so [% terms.Bugzilla %] should now be much easier to install
+  (so Bugzilla should now be much easier to install
   on shared hosting). SUExec support shows up as an option
   in the <kbd>localconfig</kbd> file during installation.</p>
 
 <h3 id="v36_feat_mpwindows">Experimental mod_perl Support on Windows</h3>
 
-<p>There is now experimental support for running [% terms.Bugzilla %]
+<p>There is now experimental support for running Bugzilla
   under mod_perl on Windows, for a significant performance enhancement
   (in exchange for using more memory).</p>
 
@@ -549,24 +549,24 @@
 
 <h3 id="v36_feat_jsonrpc">JSON-RPC Interface</h3>
 
-<p>[% terms.Bugzilla %] now has support for the
+<p>Bugzilla now has support for the
   <a href="http://json-rpc.org/">JSON-RPC</a> WebServices protocol via
   <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Server/JSONRPC.html">jsonrpc.cgi</a>.
   The JSON-RPC interface is experimental in this release--if you want any
   fundamental changes in how it works,
   <a href="http://www.bugzilla.org/developers/reporting_bugs.html">let us
-  know</a>, for the next release of [% terms.Bugzilla %].</p>
+  know</a>, for the next release of Bugzilla.</p>
 
 <h3 id="v36_feat_migrate">Migration From Other [% terms.Bug %]-Trackers</h3>
 
-<p>[% terms.Bugzilla %] 3.6 comes with a new script,
+<p>Bugzilla 3.6 comes with a new script,
   <a href="[% docs_urlbase FILTER html %]api/migrate.html">migrate.pl</a>,
   which allows migration from other [% terms.bug %]-tracking systems.
   Among the various features of the migration system are:</p>
 
 <ul>
   <li>It is non-destructive--you can migrate into an existing
-    [%+ terms.Bugzilla %] installation without destroying any data
+    Bugzilla installation without destroying any data
     in the installation.</li>
   <li>It has a "dry-run" mode so you can test your migration
     before actually running it.</li>
@@ -584,7 +584,7 @@
   [%+ terms.bug %]-tracking system. We'd love to see migrators for
   other systems! If you want to contribute a new migrator, see our
   <a href="http://wiki.mozilla.org/Bugzilla:Developers">development
-  process</a> for details on how to get code into [% terms.Bugzilla %].</p>
+  process</a> for details on how to get code into Bugzilla.</p>
 
 <p>Thanks to <a href="http://lambdares.com/">Lambda Research</a> for
   funding the initial development of this feature.</p>
@@ -595,13 +595,13 @@
 
 <ul>
   <li><b>[% terms.Bug %] Filing:</b> When filing [% terms.abug %],
-    [%+ terms.Bugzilla %] now visually indicates which fields are
+    Bugzilla now visually indicates which fields are
     mandatory.</li>
   <li><b>[% terms.Bug %] Filing:</b> "Bookmarkable templates" now
     support the "alias" and "estimated hours" fields.</li>
   
   <li><b>[% terms.Bug %] Editing:</b> In previous versions of
-    [%+ terms.Bugzilla %], if you added a private comment to [% terms.abug %],
+    Bugzilla, if you added a private comment to [% terms.abug %],
     then <em>none</em> of the changes that you made at that time were
     sent to users who couldn't see the private comment. Now, for users
     who can't see private comments, public changes are sent, but the private
@@ -644,14 +644,14 @@
   <li><b>Search:</b> The iCalendar format of search results now includes
     a PRIORITY field.</li>
   <li><b>Search:</b> It is no longer an error to enter an invalid search
-    order in a search URL--[% terms.Bugzilla %] will simply warn you that
+    order in a search URL--Bugzilla will simply warn you that
     some of your order options are invalid.</li>
   <li><b>Search:</b> When there are no search results, some helpful
     links are displayed, offering actions you might want to take.</li>
   <li><b>Search:</b> For those who like to make their own
     <kbd>buglist.cgi</kbd> URLs (and for people working on customizations),
     <kbd>buglist.cgi</kbd> now accepts nearly every valid field in
-    [%+ terms.Bugzilla %] as a direct URL parameter, like
+    Bugzilla as a direct URL parameter, like
     <kbd>&amp;field=value</kbd>.</li>
   
   <li><b>Requests:</b> When viewing the "My Requests" page, you can now
@@ -674,8 +674,8 @@
     backwards-compatibility.</li>
 
   <li>If there are multiple languages available for your
-    [%+ terms.Bugzilla %], you can now select what language you want
-    [%+ terms.Bugzilla %] displayed in using links at the top of every
+    Bugzilla, you can now select what language you want
+    Bugzilla displayed in using links at the top of every
     page.</li>
   <li>When creating a new account, you will be automatically logged in
     after setting your password.</li>
@@ -719,7 +719,7 @@
     of being stored in the <kbd>data/</kbd> directory. On large installations
     this could save several hundred megabytes of disk space.</li>
 
-  <li><b>Installation:</b> When installing [% terms.Bugzilla %], the
+  <li><b>Installation:</b> When installing Bugzilla, the
     "maintainer" parameter will be automatically set to the administrator
     that was created by <kbd>checksetup.pl</kbd>.</li>
   <li><b>Installation:</b> <kbd>checksetup.pl</kbd> now prints out
@@ -729,7 +729,7 @@
     faster at upgrading installations, particularly older installations.
     Also, it's been made faster to run for the case where it's not
     doing an upgrade.</li>
-  <li><b>Installation:</b> If you install [% terms.Bugzilla %] using the
+  <li><b>Installation:</b> If you install Bugzilla using the
     tarball, the <kbd>CGI.pm</kbd> module from CPAN is now included in
     the <kbd>lib/</kbd> dir. If you would rather use the CGI.pm from your
     global Perl installation, you can delete <kbd>CGI.pm</kbd> and the
@@ -758,20 +758,20 @@
   <li><b>Parameters:</b> The old <kbd>ssl</kbd> parameter has been
     changed to <kbd>ssl_redirect</kbd>, and can only be turned "on" or "off".
     If "on", then all users will be forcibly redirected to SSL whenever
-    they access [% terms.Bugzilla %]. When the parameter is off,
+    they access Bugzilla. When the parameter is off,
     no SSL-related redirects will occur (even if the user directly
-    accesses [% terms.Bugzilla %] via SSL, they will <em>not</em> be
+    accesses Bugzilla via SSL, they will <em>not</em> be
     redirected to a non-SSL page).</li>
   <li><b>Parameters:</b> In the Advanced parameters, there is a new parameter,
-    <kbd>inbound_proxies</kbd>. If your [% terms.Bugzilla %] is behind a
+    <kbd>inbound_proxies</kbd>. If your Bugzilla is behind a
     proxy, you should set this parameter to the IP address of that proxy.
-    Then, [% terms.Bugzilla %] will "believe" any "X-Forwarded-For"
+    Then, Bugzilla will "believe" any "X-Forwarded-For"
     header sent from that proxy, and correctly use the X-Forwarded-For
     as the end user's IP, instead of believing that all traffic is coming
     from the proxy.</li>
     
   <li><b>Removed Parameter:</b> The <kbd>loginnetmask</kbd> parameter has
-    been removed. Since [% terms.Bugzilla %] sends secure cookies, it's no
+    been removed. Since Bugzilla sends secure cookies, it's no
     longer necessary to always restrict logins to a specific IP or block
     of addresses.</li>
   <li><b>Removed Parameter:</b> The <kbd>quicksearch_comment_cutoff</kbd>
@@ -780,12 +780,12 @@
   <li><b>Removed Parameter:</b> The <kbd>usermatchmode</kbd> parameter has
     been removed. User-matching is now <em>always</em> done.</li>
   <li><b>Removed Parameter:</b> The <kbd>useentrygroupdefault</kbd> parameter
-    has been removed. [% terms.Bugzilla %] now always behaves as though
+    has been removed. Bugzilla now always behaves as though
     that parameter were off.</li>
   <li>The <kbd>t/001compile.t</kbd> test should now always pass, no matter
     what configuration of optional modules you do or don't have installed.</li>
   <li>New script: <kbd>contrib/console.pl</kbd>, which allows you to have
-    a "command line" into [% terms.Bugzilla %] by inputting Perl code
+    a "command line" into Bugzilla by inputting Perl code
     or using a few custom commands.</li>
 </ul>
 
@@ -793,11 +793,11 @@
 
 <ul>
   <li>The WebService now returns all dates and times in the UTC timezone.
-    <kbd>B[% %]ugzilla.time</kbd> now acts as though the [% terms.Bugzilla %]
+    <kbd>Bugzilla.time</kbd> now acts as though the Bugzilla
     server were in the UTC timezone, always. If you want to write clients
-    that are compatible across all [% terms.Bugzilla %] versions,
-    check the timezone from <kbd>B[% %]ugzilla.timezone</kbd> or
-    <kbd>B[% %]ugzilla.time</kbd>, and always input times in that timezone
+    that are compatible across all Bugzilla versions,
+    check the timezone from <kbd>Bugzilla.timezone</kbd> or
+    <kbd>Bugzilla.time</kbd>, and always input times in that timezone
     and expect times to be returned in that format.</li>
   <li>You can now log in by passing <kbd>Bugzilla_login</kbd> and
     <kbd>Bugzilla_password</kbd> as arguments to any WebService function.
@@ -810,7 +810,7 @@
   <li>New Method:
     <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Bug.html#fields">B[% %]ug.fields</a>,
     which gets information about all the fields that [% terms.abug %] can have
-    in [% terms.Bugzilla %], include custom fields and legal values for
+    in Bugzilla, include custom fields and legal values for
     all fields. The <kbd>B[% %]ug.legal_values</kbd> method is now deprecated.</li>
   <li>In the <kbd>B[% %]ug.add_comment</kbd> method, the "private" parameter
     has been renamed to "is_private" (for consistency with other methods).
@@ -820,9 +820,9 @@
     Also, all parameter names are validated, and if you pass in a parameter
     whose name contains anything other than letters, numbers, or underscores,
     that parameter will be ignored. Mostly this just affects
-    customizers--[% terms.Bugzilla %]'s WebService is not functionally
+    customizers--Bugzilla's WebService is not functionally
     affected by these changes.</li>
-  <li>In previous versions of [% terms.Bugzilla %], error messages were
+  <li>In previous versions of Bugzilla, error messages were
     sent word-wrapped to the client, from the WebService. Error messages
     are now sent as one unbroken line.</li>
 </ul>
@@ -882,7 +882,7 @@
   <li>Comments are now represented as a
     <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Comment.html">Bugzilla::Comment</a>
     object instead of just being hashes.</li>
-  <li>In previous versions of [% terms.Bugzilla %], the template for displaying
+  <li>In previous versions of Bugzilla, the template for displaying
     [%+ terms.abug %] required a lot of extra variables that are now global
     template variables instead.</li>
   <li>You can now check if optional modules are installed by using
@@ -898,7 +898,7 @@
 </ul>
 
 
-<h1 id="v36_previous">[% terms.Bugzilla %] 3.4 Release Notes</h1>
+<h1 id="v36_previous">Bugzilla 3.4 Release Notes</h1>
 
 <ul class="bz_toc">
   <li><a href="#v34_introduction">Introduction</a></li>
@@ -914,8 +914,8 @@
 
 <h2 id="v34_introduction">Introduction</h2>
 
-<p>This is [% terms.Bugzilla %] 3.4! [% terms.Bugzilla %] 3.4 brings a lot
-  of great enhancements for [% terms.Bugzilla %] over previous versions,
+<p>This is Bugzilla 3.4! Bugzilla 3.4 brings a lot
+  of great enhancements for Bugzilla over previous versions,
   with various improvements to the user interface, lots of interesting new
   features, and many long-standing requests finally being addressed.</p>
 
@@ -970,7 +970,7 @@
     500 error instead of your search results.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=513989">[% terms.Bug %] 513989</a>)
   </li>
-  <li>[% terms.Bugzilla %] would sometimes lose fields from your sort order
+  <li>Bugzilla would sometimes lose fields from your sort order
     when you added new fields to your sort order.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=470214">[% terms.Bug %] 470214</a>)
   </li>
@@ -1026,7 +1026,7 @@
 <h3>3.4.3</h3>
 
 <ul>
-  <li>[% terms.Bugzilla %] installations running under mod_perl were leaking
+  <li>Bugzilla installations running under mod_perl were leaking
     about 512K of RAM per page load.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=517793">[% terms.Bug %] 517793</a>)
   </li>
@@ -1035,7 +1035,7 @@
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=328628">[% terms.Bug %] 328628</a>)
   </li>
   <li>Creating custom fields with Unicode in their database column name
-    is now no longer allowed, as it would break [% terms.Bugzilla %]. If you
+    is now no longer allowed, as it would break Bugzilla. If you
     created such a custom field, you should delete it by first marking it 
     obsolete and then clicking "Delete" in the custom field list, using
     <a href="editfields.cgi">editfields.cgi</a>.
@@ -1213,7 +1213,7 @@
 <h3 id="v34_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">
   <tr> 
@@ -1356,21 +1356,21 @@
 <p>When entering a new [% terms.bug %], the vast majority of fields are
   now hidden by default, which enormously simplifies the bug-filing form. 
   You can click "Show Advanced Fields" to show all the fields, if you want
-  them. [%+ terms.Bugzilla %] remembers whether you last used the "Advanced"
+  them. Bugzilla remembers whether you last used the "Advanced"
   or "Simple" version of the [% terms.bug %]-entry form, and will display the
   same version to you again next time you file [% terms.abug %].</p>
 
 <h3 id="v34_feat_index">New Home Page</h3>
 
-<p>[% terms.Bugzilla %]'s front page has been redesigned to be better at
+<p>Bugzilla's front page has been redesigned to be better at
   guiding new users into the activities that they most commonly want to
   do. Further enhancements to the home page are coming in future versions
-  of [% terms.Bugzilla %].</p>
+  of Bugzilla.</p>
 
 <h3 id="v34_feat_spam">Email Addresses Hidden From Logged-Out Users</h3>
 
-<p>To help prevent spam to [% terms.Bugzilla %] users, all email addresses
-  stored in [% terms.Bugzilla %] are now displayed only if you are logged in.
+<p>To help prevent spam to Bugzilla users, all email addresses
+  stored in Bugzilla are now displayed only if you are logged in.
   If you are logged out, only the part before the "@" of the email address is
   displayed. This includes [% terms.bug %] lists, viewing [% terms.bugs %], the
   XML format of [% terms.abug %], and any other place in the web interface that
@@ -1387,15 +1387,15 @@
 
 <h3 id="v34_feat_async">Asynchronous Email Sending</h3>
 
-<p>The largest performance problem in former versions of [% terms.Bugzilla %]
+<p>The largest performance problem in former versions of Bugzilla
   was that when updating [% terms.bugs %], email would be sent immediately
   to every user who needed to be notified, and <kbd>process_bug.cgi</kbd>
   would wait for the emails to be sent before continuing.</p>
 
-<p>Now [% terms.Bugzilla %] is capable of queueing emails to be sent
+<p>Now Bugzilla is capable of queueing emails to be sent
   while [% terms.abug %] is being updated, and sending them in the
   background. This requires the administrator to run a daemon
-  that comes with [% terms.Bugzilla %], named
+  that comes with Bugzilla, named
   <a href="[% docs_urlbase FILTER html %]api/jobqueue.html">jobqueue.pl</a>,
   and to enable the <a href="editparams.cgi?section=mta#use_mailer_queue">
   use_mailer_queue</a> parameter.</p>
@@ -1406,9 +1406,9 @@
 
 <h3 id="v34_feat_tz">Dates and Times Displayed In User's Time Zone</h3>
 
-<p>Users can now select what time zone they are in and [% terms.Bugzilla %]
+<p>Users can now select what time zone they are in and Bugzilla
   will adjust displayed times to be correct for their time zone. However,
-  times the user inputs are unfortunately still in [% terms.Bugzilla %]'s
+  times the user inputs are unfortunately still in Bugzilla's
   time zone.</p>
 
 <h3 id="v34_feat_vis">Custom Fields That Only Appear When Another Field
@@ -1443,7 +1443,7 @@
   appears.</p>
 
 <p>One thing to note is that this feature only controls what values appear in
-  the <em>user interface</em>. [% terms.Bugzilla %] itself will still accept
+  the <em>user interface</em>. Bugzilla itself will still accept
   any combination of values as valid, in the backend.</p>
 
 <h3 id="v34_feat_bugid">New Custom Field Type: [% terms.Bug %] ID</h3>
@@ -1455,8 +1455,8 @@
 <h3 id="v34_feat_see">"See Also" Field</h3>
 
 <p>We have added a new standard field called "See Also" to 
-  [%+ terms.Bugzilla %]. In this field, you can put URLs to multiple 
-  [%+ terms.bugs %] in any [% terms.Bugzilla %] installation, to indicate
+  Bugzilla. In this field, you can put URLs to multiple
+  [%+ terms.bugs %] in any Bugzilla installation, to indicate
   that those [% terms.bugs %] are related to this one. It also supports
   adding URLs to [% terms.bugs %] in 
   <a href="http://launchpad.net/">Launchpad</a>.</p>
@@ -1478,7 +1478,7 @@
 
 <h3 id="v34_feat_desc">Search Descriptions</h3>
 
-<p>When displaying search results, [% terms.Bugzilla %] will now show
+<p>When displaying search results, Bugzilla will now show
   a brief description of what you searched for, at the top of the
   [%+ terms.bug %] list.</p>
 
@@ -1505,14 +1505,14 @@
   <li>When viewing a search result, you can now hover over any abbreviated
     field to see its full value.</li>
   <li>When logging out, users are now redirected to the main page of
-    [%+ terms.Bugzilla %] instead of an empty page.</li>
+    Bugzilla instead of an empty page.</li>
   <li>When editing [% terms.abug %], text fields (except the comment box) now
     grow longer when you widen your browser window.</li>
   <li>When viewing [% terms.abug %], the Depends On and Blocks list will
     display [% terms.abug %]'s alias if it has one, instead of its id.
     Also, closed [% terms.bugs %] will be sorted to the end of the list.</li>
 
-  <li>If you use the time-tracking features of [% terms.Bugzilla %], and
+  <li>If you use the time-tracking features of Bugzilla, and
     you enable the time-tracking related columns in a search result,
     then you will see a summary of the time-tracking data at the
     bottom of the search result.</li>
@@ -1528,15 +1528,15 @@
   <li>You can now use any custom drop-down field as an axis for a tabular
     or graphical report.</li>
   <li>The <kbd>X-Bugzilla-Type</kbd> header in emails sent by 
-    [%+ terms.Bugzilla %] is now "new" for [% terms.bug %]mail sent for
+    Bugzilla is now "new" for [% terms.bug %]mail sent for
     newly-filed [% terms.bugs %], and "changed" for emails having to do
     with updated [% terms.bugs %].</li>
   <li>Mails sent by the "Whining" system now contain the header
     <kbd>X-Bugzilla-Type: whine</kbd>.</li>
   <li>[% terms.bug %]mail now contains a X-Bugzilla-URL header to uniquely
-    identify which [% terms.Bugzilla %] installation the email came from.</li>
+    identify which Bugzilla installation the email came from.</li>
   <li>If you input an invalid regular expression anywhere in
-    [%+ terms.Bugzilla %], it will now tell you explicitly instead of failing
+    Bugzilla, it will now tell you explicitly instead of failing
     cryptically.</li>
   <li>The <kbd>duplicates.xul</kbd> page (which wasn't used by very many
     people) is now gone.</li>
@@ -1545,28 +1545,28 @@
 <h4>Enhancements for Administrators and Developers</h4>
 
 <ul>
-  <li>[% terms.Bugzilla %] now uses the SHA-256 algorithm (a variant of 
+  <li>Bugzilla now uses the SHA-256 algorithm (a variant of
     SHA-2) to encrypt passwords in the database, instead of using Unix's
     "crypt" function. This allows passwords longer than eight characters
     to actually be effective. Each user's password will be converted to
     SHA-256 the first time they log in after you upgrade to 
-    [%+ terms.Bugzilla %] 3.4 or later.</li>
-  <li>If you are using database replication with [% terms.Bugzilla %],
+    Bugzilla 3.4 or later.</li>
+  <li>If you are using database replication with Bugzilla,
     many more scripts now take advantage of the read-only slave (the 
     "shadowdb"). It may be safe to open up <kbd>show_bug.cgi</kbd>
     to search-engine indexing by editing your <kbd>robots.txt</kbd> file,
-    now, if your [% terms.Bugzilla %] is on fast-enough hardware.</li>
+    now, if your Bugzilla is on fast-enough hardware.</li>
   <li>The database now uses foreign keys to enforce the validity of
     relationships between tables. Not every single table has all its 
     foreign keys yet, but most do.</li>
   <li>Various parameters have been removed, in an effort to de-clutter
-    the parameter interface and simplify [% terms.Bugzilla %]'s code.
+    the parameter interface and simplify Bugzilla's code.
     The parameters that were removed were: timezone, supportwatchers,
     maxpatchsize, commentonclearresolution, commentonreassignbycomponent,
     showallproducts. They have all been replaced with sensible default
     behaviors. (For example, user watching is now always enabled.)</li>
   <li>When adding <code>&amp;debug=1</code> to the end of a 
-    <kbd>buglist.cgi</kbd> URL, [% terms.Bugzilla %] will now also do an
+    <kbd>buglist.cgi</kbd> URL, Bugzilla will now also do an
     EXPLAIN on the query, to help debug performance issues.</li>
   <li>When editing flag types in the administrative interface, you can now
     see how many flags of each type have been set.</li>
@@ -1581,8 +1581,8 @@
     <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Bug.html#comments">B[% %]ug.comments</a>,
     <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Bug.html#update_see_also">B[% %]ug.update_see_also</a>,
     <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/User.html#get">User.get</a>,
-    and <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Bugzilla.html#time">B[% %]ugzilla.time</a>
-    (<kbd>B[% %]ugzilla.timezone</kbd> is now deprecated).
+    and <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService/Bugzilla.html#time">Bugzilla.time</a>
+    (<kbd>Bugzilla.timezone</kbd> is now deprecated).
   </li>
   <li>For network efficiency, you can now limit which fields are returned 
     from certain WebService functions, like <kbd>User.get</kbd>.</li>
@@ -1685,7 +1685,7 @@
     <kbd>Bugzilla::User</kbd> now return an arrayref of 
     <kbd>Bugzilla::Group</kbd> objects instead of a hashref with
     group ids and group names.</li>
-  <li>Standard [% terms.Bugzilla %] drop-down fields now have their type
+  <li>Standard Bugzilla drop-down fields now have their type
     set to <kbd>FIELD_TYPE_SINGLE_SELECT</kbd> in the fielddefs table.</li>
   <li><kbd>Bugzilla-&gt;usage_mode</kbd> now defaults to 
     <kbd>USAGE_MODE_CMDLINE</kbd> if we are not running inside a web
@@ -1704,7 +1704,7 @@
 
 
 
-<h1 id="v34_previous">[% terms.Bugzilla %] 3.2 Release Notes</h1>
+<h1 id="v34_previous">Bugzilla 3.2 Release Notes</h1>
 
 <h2>Table of Contents</h2>
 
@@ -1723,9 +1723,9 @@
 
 <h2 id="v32_introduction">Introduction</h2>
 
-<p>Welcome to [% terms.Bugzilla %] 3.2! This is our first major feature
-  release since [% terms.Bugzilla %] 3.0, and it brings a lot of great
-  improvements and polish to the [% terms.Bugzilla %] experience.</p>
+<p>Welcome to Bugzilla 3.2! This is our first major feature
+  release since Bugzilla 3.0, and it brings a lot of great
+  improvements and polish to the Bugzilla experience.</p>
 
 <p>If you're upgrading, make sure to read <a href="#v32_upgrading">How to
   Upgrade From An Older Version</a>. If you are upgrading from a release
@@ -1737,7 +1737,7 @@
 <h2 id="v32_point">Updates in this 3.2.x Release</h2>
 
 <p>This section describes what's changed in the most recent b<!-- -->ug-fix
-  releases of [% terms.Bugzilla %] after 3.2. We only list the
+  releases of Bugzilla after 3.2. We only list the
   most important fixes in each release. If you want a detailed list of
   <em>everything</em> that's changed in each version, you should use our
   <a href="http://www.bugzilla.org/status/changes.html">Change Log 
@@ -1746,24 +1746,24 @@
 <h3>3.2.3</h3>
 
 <ul>
-  <li>[% terms.Bugzilla %] is now compatible with MySQL 5.1.x versions 5.1.31
+  <li>Bugzilla is now compatible with MySQL 5.1.x versions 5.1.31
     and greater.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=480001">[% terms.Bug %] 480001</a>)</li>
-  <li>On Windows, [% terms.Bugzilla %] sometimes would send mangled emails 
+  <li>On Windows, Bugzilla sometimes would send mangled emails
     (that would often fail to send).
   (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=467920">[% terms.Bug %] 467920</a>)</li>
   <li><code>recode.pl</code> would sometimes crash when trying to convert
-    databases from older versions of [% terms.Bugzilla %].
+    databases from older versions of Bugzilla.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=431201">[% terms.Bug %] 431201</a>)</li>
   <li>Running a saved search with Unicode characters in its name would
-    cause [% terms.Bugzilla %] to crash.
+    cause Bugzilla to crash.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=477513">[% terms.Bug %] 477513</a>)</li>
-  <li>[% terms.Bugzilla %] clients like Mylyn can now update [% terms.bugs %]
+  <li>Bugzilla clients like Mylyn can now update [% terms.bugs %]
     again (the [% terms.bug %] XML format now contains a "token" element that
     can be used when updating [% terms.abug %]).
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=476678">[% terms.Bug %] 476678</a>)</li>
   <li>For installations using the <code>shadowdb</code> parameter, 
-    [%+ terms.Bugzilla %] was accidentally writing to the "tokens" table
+    Bugzilla was accidentally writing to the "tokens" table
     in the shadow database (instead of the master database) when using the
     "Change Several [% terms.Bugs %] at Once" page.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=476943">[% terms.Bug  %] 476943</a>)</li>
@@ -1787,7 +1787,7 @@
 
   <li>Saving changes to parameters would sometimes fail silently (particularly
     on Windows when the web server didn't have the right permissions to
-    update the <code>params</code> file). [% terms.Bugzilla %] will now
+    update the <code>params</code> file). Bugzilla will now
     throw an error in this case, telling you what is wrong.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=347707">[% terms.Bug %] 347707</a>)</li>
 
@@ -1798,12 +1798,12 @@
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=465589">[% terms.Bug %] 465589</a>)</li>
 
   <li>If you were using the <code>PROJECT</code> environment variable
-    to have multiple [% terms.Bugzilla %] installations using one codebase,
+    to have multiple Bugzilla installations using one codebase,
     project-specific templates were being ignored. 
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=467324">[% terms.Bug %] 467324</a>)</li>
 
   <li>Some versions of the SOAP::Lite Perl module had a b[% %]ug that caused
-    [%+ terms.Bugzilla %]'s XML-RPC service to break. 
+    Bugzilla's XML-RPC service to break.
     <kbd>checksetup.pl</kbd> now checks for these bad versions and 
     will reject them.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=468009">[% terms.Bug %] 468009</a>)</li>
@@ -1926,7 +1926,7 @@
 <h3 id="v32_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">
 <tr> 
@@ -2047,9 +2047,9 @@
 
 <h3 id="v32_feat_ui">Major UI Improvements</h3>
 
-<p>[% terms.Bugzilla %] 3.2 has had some UI assistance from the NASA
+<p>Bugzilla 3.2 has had some UI assistance from the NASA
   Human-Computer Interaction department and the new 
-  <a href="http://wiki.mozilla.org/Bugzilla:UE">[% terms.Bugzilla %]
+  <a href="http://wiki.mozilla.org/Bugzilla:UE">Bugzilla
   User Interface Team</a>.</p>
 
 <p>In particular, you will notice a massively redesigned [% terms.bug %]
@@ -2057,7 +2057,7 @@
 
 <h3 id="v32_feat_skin">New Default Skin: Dusk</h3>
 
-<p>[% terms.Bugzilla %] 3.2 now ships with a skin called "Dusk" that is
+<p>Bugzilla 3.2 now ships with a skin called "Dusk" that is
   a bit more colorful than old default "Classic" skin.</p>
 
 <p>Upgrading installations will still default to the "Classic" 
@@ -2065,21 +2065,21 @@
   control panel. Users can also choose to use the old skin in their
   Preferences (or using the View :: Page Style menu in Firefox).</p>
 
-<p>The changes that [% terms.Bugzilla %] required for Dusk made
-  [%+ terms.Bugzilla %] much easier to skin. See the
+<p>The changes that Bugzilla required for Dusk made
+  Bugzilla much easier to skin. See the
   <a href="http://wiki.mozilla.org/Bugzilla:Addons#Skins">Addons page</a>
   for additional skins, or try making your own!</p>
 
 <h3 id="v32_feat_status">Custom Status Workflow</h3>
 
-<p>You can now customize the list of statuses in [% terms.Bugzilla %],
+<p>You can now customize the list of statuses in Bugzilla,
   and transitions between them.</p>
 
 <p>You can also specify that a comment must be made on certain transitions.</p>
 
 <h3 id="v32_feat_fields">New Custom Field Types</h3>
 
-<p>[% terms.Bugzilla %] 3.2 has support for three new types of
+<p>Bugzilla 3.2 has support for three new types of
   custom fields:</p>
 
 <ul>
@@ -2092,10 +2092,10 @@
 
 <h3 id="v32_feat_install">Easier Installation</h3>
 
-<p>[% terms.Bugzilla %] now comes with a script called 
+<p>Bugzilla now comes with a script called
   <kbd>install-module.pl</kbd> that can automatically download
-  and install all of the required Perl modules for [% terms.Bugzilla %].
-  It stores them in a directory inside your [% terms.Bugzilla %]
+  and install all of the required Perl modules for Bugzilla.
+  It stores them in a directory inside your Bugzilla
   installation, so you can use it even if you don't have administrator-level
   access to your machine, and without modifying your main Perl install.</p>
 
@@ -2105,26 +2105,26 @@
 
 <h3 id="v32_feat_oracle">Experimental Oracle Support</h3>
 
-<p>[% terms.Bugzilla %] 3.2 contains experimental support for using 
-  Oracle as its database. Some features of [% terms.Bugzilla %] are known 
+<p>Bugzilla 3.2 contains experimental support for using
+  Oracle as its database. Some features of Bugzilla are known
   to be broken on Oracle, but hopefully will be working by our next major
   release.</p>
 
-<p>The [% terms.Bugzilla %] Project, as an open-source project, of course
+<p>The Bugzilla Project, as an open-source project, of course
   does not recommend the use of proprietary database solutions. However,
   if your organization requires that you use Oracle, this will allow
-  you to use [% terms.Bugzilla %]!</p>
+  you to use Bugzilla!</p>
 
-<p>The [% terms.Bugzilla %] Project thanks Oracle Corp. for their extensive
-  development contributions to [% terms.Bugzilla %] which allowed this to 
+<p>The Bugzilla Project thanks Oracle Corp. for their extensive
+  development contributions to Bugzilla which allowed this to
   happen!</p>
 
 <h3 id="v32_feat_utf8">Improved UTF-8 Support</h3>
 
-<p>[% terms.Bugzilla %] 3.2 now has advanced UTF-8 support in its code,
+<p>Bugzilla 3.2 now has advanced UTF-8 support in its code,
   including correct handling for truncating and wrapping multi-byte
   languages. Major issues with multi-byte or unusual languages
-  are now resolved, and [% terms.Bugzilla %] should now be usable
+  are now resolved, and Bugzilla should now be usable
   by users in every country with little (or at least much less)
   customization.</p>
 
@@ -2177,7 +2177,7 @@
     for Internet Explorer and other non-Firefox browsers. (It always
     could appear for Firefox.)</li>
 
-  <li>[% terms.Bugzilla %] now ships with an icon that will show
+  <li>Bugzilla now ships with an icon that will show
     up next to the URL in most browsers. If you want to replace it,
     it's in <kbd>images/favicon.ico</kbd>.</li>
 
@@ -2204,7 +2204,7 @@
   <li>When using <kbd>email_in.pl</kbd>, you can now add users to the CC
     list by just using <kbd>@cc</kbd> as the field name.</li>
   <li>Many pages (particularly administrative pages) now contain links to
-    the relevant section of the [% terms.Bugzilla %] Guide, so you can read 
+    the relevant section of the Bugzilla Guide, so you can read
     the documentation for that page.</li>
   <li>Dependency Graphs should render more quickly, as they now (by default)
     only include the same [% terms.bugs %] that you'd see in the dependency
@@ -2217,7 +2217,7 @@
   <li><strong>Admin UI</strong>: Instead of having the Administration 
     Control Panel links in the footer, there is now just one link called 
    "Administration" that takes you to a page that links to all the
-    administrative controls for [% terms.Bugzilla %].</li>
+    administrative controls for Bugzilla.</li>
   <li><strong>Admin UI</strong>: Administrative pages no longer display
     confirmation pages, instead they redirect you to some useful page 
     and display a message about what changed.</li>
@@ -2228,21 +2228,21 @@
     QA Contact.</li>
 
   <li><strong>Email</strong>: For installations that use SMTP to send 
-    mail (as opposed to Sendmail), [%+ terms.Bugzilla %] now supports
+    mail (as opposed to Sendmail), Bugzilla now supports
     SMTP Authentication, so that it can log in to your mail server 
     before sending messages.</li>
   <li><strong>Email</strong>: Using the "Test" mail delivery method now
      creates a valid mbox file to make testing easier.</li>
 
-  <li><strong>Authentication</strong>: [% terms.Bugzilla %] now correctly 
+  <li><strong>Authentication</strong>: Bugzilla now correctly
     handles LDAP records which contain multiple email addresses. (The first
-    email address in the list that is a valid [% terms.Bugzilla %] account 
+    email address in the list that is a valid Bugzilla account
     will be used, or if this is a new user, the first email address in 
     the list will be used.)</li>
-  <li><strong>Authentication</strong>: [% terms.Bugzilla %] can now take 
+  <li><strong>Authentication</strong>: Bugzilla can now take
     a list of LDAP servers to try in order until it gets a successful
     connection.</li>
-  <li><strong>Authentication</strong>: [% terms.Bugzilla %] now supports 
+  <li><strong>Authentication</strong>: Bugzilla now supports
     RADIUS authentication.</li>
 
   <li><strong>Security</strong>: The login cookie is now created as 
@@ -2254,7 +2254,7 @@
     Also, SSL is now enforced appropriately in the WebServices interface when
     the parameter is set.</li>
 
-  <li><strong>Database</strong>: [% terms.Bugzilla %] now uses transactions in 
+  <li><strong>Database</strong>: Bugzilla now uses transactions in
     the database instead of table locks. This should generally improve
     performance with many concurrent users. It also means if there is
     an unexpected error in the middle of a page, all database changes made
@@ -2284,7 +2284,7 @@
   <li>Extensions can now add their own headers to the HTML &lt;head&gt;
     for things like custom CSS and so on.</li>
   <li><kbd>sanitycheck.cgi</kbd> has been templatized, meaning that the
-    entire [% terms.Bugzilla %] UI is now contained in templates.</li>
+    entire Bugzilla UI is now contained in templates.</li>
   <li>When setting the <kbd>sslbase</kbd> parameter, you can now specify
     a port number in the URL.</li>
   <li>When importing [% terms.bugs %] using <kbd>importxml.pl</kbd>,
@@ -2295,7 +2295,7 @@
     prepare for the fact that it will be moved into an extension at
     some point in the future.</li>
   <li>The <code>shutdownhtml</code> parameter now works even when 
-    [%+ terms.Bugzilla %]'s database server is down.</li>
+    Bugzilla's database server is down.</li>
 </ul>
 
 <h3>Enhancements for Localizers (or Localized Installations)</h3>
@@ -2303,9 +2303,9 @@
 <ul>
   <li>The documentation can now be localized--in other words, you can have
     documentation installed for multiple languages at once and
-    [%+ terms.Bugzilla %] will link to the correct language in its internal
+    Bugzilla will link to the correct language in its internal
     documentation links.</li>
-  <li>[% terms.Bugzilla %] no longer uses the <kbd>languages</kbd> parameter.
+  <li>Bugzilla no longer uses the <kbd>languages</kbd> parameter.
     Instead it reads the <kbd>template/</kbd> directory to see which
     languages are available.</li>
   <li>Some of the messages printed by <kbd>checksetup.pl</kbd> can now
@@ -2355,14 +2355,14 @@
     and after you <kbd>cvs update</kbd> you can delete the <kbd>docs/html</kbd>,
     <kbd>docs/pdf</kbd>, <kbd>docs/txt</kbd>, and <kbd>docs/xml</kbd>
     directories.</li>
-  <li>If you are using MySQL, you should know that [% terms.Bugzilla %]
+  <li>If you are using MySQL, you should know that Bugzilla
     now uses InnoDB for all tables. <kbd>checksetup.pl</kbd> will convert
     your tables automatically, but if you have InnoDB disabled,
     the upgrade will not be able to complete (and <kbd>checksetup.pl</kbd>
     will tell you so).</li>
 
   <li><strong>You should also read the 
-    <a href="#v30_upgrading_notes">[% terms.Bugzilla %] 3.0 Notes For Upgraders
+    <a href="#v30_upgrading_notes">Bugzilla 3.0 Notes For Upgraders
     section</a> of the 
     <a href="#v32_previous">previous release notes</a> if you are upgrading
     from a version before 3.0.</strong></li>
@@ -2398,10 +2398,10 @@
 <h3 id="v32_code_lib">lib Directory</h3>
 
 <p>As part of implementing <a href="#v32_feat_install">install-module.pl</a>,
-  [%+ terms.Bugzilla %] was given a local <kbd>lib</kbd> directory which
+  Bugzilla was given a local <kbd>lib</kbd> directory which
   it searches for modules, in addition to the standard system path.</p>
 
-<p>This means that all [% terms.Bugzilla %] scripts now start with
+<p>This means that all Bugzilla scripts now start with
   <code>use lib qw(. lib);</code> as one of the first lines.</p>
 
 <h3 id="v32_code_other">Other Changes</h3>
@@ -2413,7 +2413,7 @@
     template file has been removed.</li>
 </ul>
 
-<h1 id="v32_previous">[% terms.Bugzilla %] 3.0.x Release Notes</h1>
+<h1 id="v32_previous">Bugzilla 3.0.x Release Notes</h1>
 
 <h2>Table of Contents</h2>
 
@@ -2432,9 +2432,9 @@
 
 <h2 id="v30_introduction">Introduction</h2>
 
-<p>Welcome to [% terms.Bugzilla %] 3.0! It's been over eight years since
-  we released [% terms.Bugzilla %] 2.0, and everything has changed since
-  then. Even just since our previous release, [% terms.Bugzilla %] 2.22,
+<p>Welcome to Bugzilla 3.0! It's been over eight years since
+  we released Bugzilla 2.0, and everything has changed since
+  then. Even just since our previous release, Bugzilla 2.22,
   we've added a <em>lot</em> of new features. So enjoy the release, we're
   happy to bring it to you.</p>
 
@@ -2447,7 +2447,7 @@
 <h2 id="v30_point">Updates in this 3.0.x Release</h2>
 
 <p>This section describes what's changed in the most recent b<!-- -->ug-fix
-  releases of [% terms.Bugzilla %] after 3.0. We only list the
+  releases of Bugzilla after 3.0. We only list the
   most important fixes in each release. If you want a detailed list of
   <em>everything</em> that's changed in each version, you should use our
   <a href="http://www.bugzilla.org/status/changes.html">Change Log Page</a>.</p>
@@ -2472,7 +2472,7 @@
   <li>If you don't have permission to set a flag, it will now appear
     unchangeable in the UI.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=433851">[% terms.Bug %] 433851</a>)</li>
-  <li>If you were running mod_perl, [% terms.Bugzilla %] was not correctly
+  <li>If you were running mod_perl, Bugzilla was not correctly
     closing its connections to the database since 3.0.3, and so sometimes
     the DB would run out of connections.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=441592">[% terms.Bug %] 441592</a>)</li>
@@ -2492,7 +2492,7 @@
 <h3>3.0.4</h3>
 
 <ul>
-  <li>[% terms.Bugzilla %] administrators were not being correctly notified
+  <li>Bugzilla administrators were not being correctly notified
     about new releases.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=414726">[% terms.Bug %] 414726</a>)</li>
 
@@ -2540,7 +2540,7 @@
 <h3>3.0.3</h3>
 
 <ul>
-  <li>mod_perl no longer compiles [% terms.Bugzilla %]'s code for each Apache
+  <li>mod_perl no longer compiles Bugzilla's code for each Apache
     process individually. It now compiles code only once and shares it among
     each Apache process. This greatly improves performance and highly 
     decreases the memory footprint.
@@ -2549,7 +2549,7 @@
   <li>You can now search for '---' (without quotes) in versions and milestones.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=362436">[% terms.Bug %] 362436</a>)</li>
 
-  <li>[% terms.Bugzilla %] should no longer break lines unnecessarily in 
+  <li>Bugzilla should no longer break lines unnecessarily in
     email subjects. This was causing trouble with some email clients.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=374424">[% terms.Bug %] 374424</a>)</li>
 
@@ -2567,7 +2567,7 @@
     fields when merging two user accounts.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=400160">[% terms.Bug %] 400160</a>)</li>
 
-  <li>[% terms.Bugzilla %] no longer requires Apache::DBI to run under 
+  <li>Bugzilla no longer requires Apache::DBI to run under
     mod_perl. It caused troubles such as lost connections with the DB and
     didn't give any important performance gain.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=408766">[% terms.Bug %] 408766</a>)</li>
@@ -2576,7 +2576,7 @@
 <h3>3.0.2</h3>
 
 <ul>
-  <li>[% terms.Bugzilla %] should now work on Perl 5.9.5 (and thus the
+  <li>Bugzilla should now work on Perl 5.9.5 (and thus the
     upcoming Perl 5.10.0).
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=390442">[% terms.Bug %] 390442</a>)</li>
 </ul>
@@ -2602,16 +2602,16 @@
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=385910">[% terms.Bug %] 385910</a>)</li>
   <li>If you attach a file that has a MIME-type of <code>text/x-patch</code>
     or <code>text/x-diff</code>, it will automatically be treated as a 
-    patch by [% terms.Bugzilla %].
+    patch by Bugzilla.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=365756">[% terms.Bug %] 365756</a>)</li>
   <li>Dependency Graphs now work correctly on all mod_perl installations.
     There should now be no remaining signficant problems with running
-    [%+ terms.Bugzilla %] under mod_perl.
+    Bugzilla under mod_perl.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=370398">[% terms.Bug %] 370398</a>)</li>
   <li>If moving [% terms.abug %] between products would remove groups
     from the [% terms.bug %], you are now warned.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=303183">[% terms.Bug %] 303183</a>)</li>
-  <li>On IIS, whenever [% terms.Bugzilla %] threw a warning, it would
+  <li>On IIS, whenever Bugzilla threw a warning, it would
     actually appear on the web page. Now warnings are suppressed,
     unless you have a file in the <code>data</code> directory called
     <code>errorlog</code>, in which case warnings will be printed there.
@@ -2627,7 +2627,7 @@
   <li>Instead of throwing real errors, <kbd>collectstats.pl</kbd> would
     just say that it couldn't find <code>ThrowUserError</code>.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=380709">[% terms.Bug %] 380709</a>)</li>
-  <li>Logging into [% terms.Bugzilla %] from the home page works again
+  <li>Logging into Bugzilla from the home page works again
     with IIS5. 
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=364008">[% terms.Bug %] 364008</a>)</li>
   <li>If you were using SMTP for sending email, sometimes emails would
@@ -2658,7 +2658,7 @@
     non-Latin characters.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=387860">[% terms.Bug %] 387860</a>)</li>
   <li>Editing the "languages" parameter using <kbd>editparams.cgi</kbd> would
-    sometimes fail, causing [% terms.Bugzilla %] to throw an error.
+    sometimes fail, causing Bugzilla to throw an error.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=335354">[% terms.Bug %] 335354</a>)</li>
 </ul>
 
@@ -2743,7 +2743,7 @@
 <h3 id="v30_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">
   <tr>
@@ -2873,30 +2873,30 @@
 
 <h3 id="v30_feat_cf">Custom Fields</h3>
 
-<p>[% terms.Bugzilla %] now includes very basic support for custom fields.</p>
+<p>Bugzilla now includes very basic support for custom fields.</p>
 
 <p>Users in the <kbd>admin</kbd> group can add plain-text or drop-down
   custom fields. You can edit the values available for drop-down fields
   using the &quot;Field Values&quot; control panel.</p>
 
-<p>Don't add too many custom fields! It can make [% terms.Bugzilla %]
+<p>Don't add too many custom fields! It can make Bugzilla
   very difficult to use. Try your best to get along with the default
   fields, and then if you find that you can't live without custom fields
-  after a few weeks of using [% terms.Bugzilla %], only then should you
+  after a few weeks of using Bugzilla, only then should you
   start your custom fields.</p>
 
 <h3 id="v30_feat_mp">mod_perl Support</h3>
 
-<p>[% terms.Bugzilla %] 3.0 supports mod_perl, which allows for extremely
+<p>Bugzilla 3.0 supports mod_perl, which allows for extremely
   enhanced page-load performance. mod_perl trades memory usage for performance,
   allowing near-instantaneous page loads, but using much more memory.</p>
 
-<p>If you want to enable mod_perl for your [% terms.Bugzilla %], we recommend
+<p>If you want to enable mod_perl for your Bugzilla, we recommend
   a minimum of 1.5GB of RAM, and for a site with heavy traffic, 4GB to 8GB.</p>
 
 <p>If performance isn't that critical on your installation, you don't
   have the memory, or you are running some other web server than
-  Apache, [% terms.Bugzilla %] still runs perfectly as a normal CGI
+  Apache, Bugzilla still runs perfectly as a normal CGI
   application, as well.</p>
 
 <h3 id="v30_feat_sq">Shared Saved Searches</h3>
@@ -2930,10 +2930,10 @@
 <h3 id="v30_feat_cr">Custom Resolutions</h3>
 
 <p>You can now customize the list of resolutions available
-  in [% terms.Bugzilla %], including renaming the default resolutions.</p>
+  in Bugzilla, including renaming the default resolutions.</p>
 
 <p>The resolutions <code>FIXED</code>, <code>DUPLICATE</code>
-  and <code>MOVED</code> have a special meaning to [% terms.Bugzilla %],
+  and <code>MOVED</code> have a special meaning to Bugzilla,
   though, and cannot be renamed or deleted.</p>
 
 <h3 id="v30_feat_ppp">Per-Product Permissions</h3>
@@ -2946,7 +2946,7 @@
 
 <h3 id="v30_feat_ui">User Interface Improvements</h3>
 
-<p>There has been some work on the user interface for [% terms.Bugzilla %] 3.0,
+<p>There has been some work on the user interface for Bugzilla 3.0,
   including:</p>
 
 <ul>
@@ -2960,23 +2960,23 @@
 
 <h3 id="v30_feat_xml">XML-RPC Interface</h3>
 
-<p>[% terms.Bugzilla %] now has a Web Services interface using the XML-RPC
+<p>Bugzilla now has a Web Services interface using the XML-RPC
   protocol. It can be accessed by external applications by going
   to the <kbd>xmlrpc.cgi</kbd> on your installation.</p>
 
 <p>Documentation can be found in the 
-  <a href="[% docs_urlbase FILTER html %]api/">[% terms.Bugzilla %] 
+  <a href="[% docs_urlbase FILTER html %]api/">Bugzilla
   API Docs</a>, in the various <kbd>Bugzilla::WebService</kbd> modules.</p>
 
 <h3 id="v30_feat_skin">Skins</h3>
 
-<p>[% terms.Bugzilla %] can have multiple &quot;skins&quot; installed,
+<p>Bugzilla can have multiple &quot;skins&quot; installed,
   and users can pick between them. To write a skin, you just have to
   write several CSS files. See the <a href="[% docs_urlbase FILTER html %]cust-skins.html">Custom
   Skins Documentation</a> for more details.</p>
 
 <p>We currently don't have any alternate skins shipping with
-  [%+ terms.Bugzilla %]. If you write an alternate skin, please
+  Bugzilla. If you write an alternate skin, please
   let us know!</p>
 
 <h3 id="v30_feat_sbu">Unchangeable Fields Appear Unchangeable</h3>
@@ -2998,18 +2998,18 @@
 
 <p>We also added a <code>mailfrom</code> parameter to let you set
   who shows up in the <code>From</code> field on all emails that
-  [%+ terms.Bugzilla %] sends.</p>
+  Bugzilla sends.</p>
 
 <h3 id="v30_feat_df">No More Double-Filed [% terms.Bugs %]</h3>
 
-<p>Users of [% terms.Bugzilla %] will sometimes accidentally submit 
+<p>Users of Bugzilla will sometimes accidentally submit
   [%+ terms.abug %] twice, either by going back in their web browser, 
   or just by refreshing a page. In the past, this could file the same 
   [%+ terms.bug %] twice (or even three times) in a row, irritating 
   developers and confusing users.</p>
 
 <p>Now, if you try to submit [% terms.abug %] twice from the same screen 
-  (by going back or by refreshing the page), [% terms.Bugzilla %] will warn 
+  (by going back or by refreshing the page), Bugzilla will warn
   you about what you're doing, before it actually submits the duplicate
   [%+ terms.bug %].</p>
 
@@ -3021,9 +3021,9 @@
 <h3 id="v30_feat_emi">File/Modify [% terms.Bugs %] By Email</h3>
 
 <p>You can now file or modify [% terms.bugs %] via email. Previous versions
-  of [% terms.Bugzilla %] included this feature only as an
+  of Bugzilla included this feature only as an
   unsupported add-on, but it is now an official interface to
-  [%+ terms.Bugzilla %].</p>
+  Bugzilla.</p>
 
 <p>For more details see the <a href="[% docs_urlbase FILTER html %]api/email_in.html">documentation
   for email_in.pl</a>.</p>
@@ -3031,43 +3031,43 @@
 <h3 id="v30_feat_gw">Users Who Get All [% terms.Bug %] Notifications</h3>
 
 <p>There is now a parameter called <kbd>globalwatchers</kbd>. This
-  is a comma-separated list of [% terms.Bugzilla %] users who will
-  get all [% terms.bug %] notifications generated by [% terms.Bugzilla %].</p>
+  is a comma-separated list of Bugzilla users who will
+  get all [% terms.bug %] notifications generated by Bugzilla.</p>
 
 <p>Group controls still apply, though, so users who can't see [% terms.abug %]
   still won't get notifications about that [% terms.bug %].</p>
 
 <h3 id="v30_feat_utf8">Improved UTF-8 Support</h3>
 
-<p>[% terms.Bugzilla %] users running MySQL should now have excellent
+<p>Bugzilla users running MySQL should now have excellent
   UTF-8 support if they turn on the <kbd>utf8</kbd> parameter. (New
-  installs have this parameter on by default.) [% terms.Bugzilla %]
+  installs have this parameter on by default.) Bugzilla
   now correctly supports searching and sorting in non-English languages,
   including multi-bytes languages such as Chinese.</p>
 
 <h3 id="v30_feat_upda">Automatic Update Notification</h3>
 
 <p>If you belong to the <kbd>admin</kbd> group, you will be notified
-  when you log in if there is a new release of [% terms.Bugzilla %]
+  when you log in if there is a new release of Bugzilla
   available to download.</p>
 
 <p>You can control these notifications by changing the 
   <kbd>upgrade_notification</kbd> parameter.</p>
 
-<p>If your [% terms.Bugzilla %] installation is on a machine that needs to go
+<p>If your Bugzilla installation is on a machine that needs to go
   through a proxy to access the web, you may also have to set the
   <kbd>proxy_url</kbd> parameter.</p>
 
 <h3 id="v30_feat_welc">Welcome Page for New Installs</h3>
 
-<p>When you log in for the first time on a brand-new [% terms.Bugzilla %]
+<p>When you log in for the first time on a brand-new Bugzilla
   installation, you will be presented with a page that describes
   where you should go from here, and what parameters you should set.</p>
 
 <h3 id="v30_feat_qs">QuickSearch Plugin for IE7 and Firefox 2</h3>
 
 <p>Firefox 2 users and Internet Explorer 7 users will be presented
-  with the option to add [% terms.Bugzilla %] to their search bar.
+  with the option to add Bugzilla to their search bar.
   This uses the 
   <a href="page.cgi?id=quicksearch.html">QuickSearch syntax</a>.</p>
 
@@ -3076,7 +3076,7 @@
 <p>These are either minor enhancements, or enhancements that have
   very short descriptions. Some of these are very useful, though!</p>
 
-<h4>Enhancements That Affect [% terms.Bugzilla %] Users</h4>
+<h4>Enhancements That Affect Bugzilla Users</h4>
 
 <ul>
   <li>In comments, quoted text (lines that start with <kbd>&gt;</kbd>)
@@ -3095,8 +3095,8 @@
     product that has flags with the same name, the flags will be 
     preserved.</li>
   <li>You now can't request a flag to be set by somebody who can't set it
-    ([% terms.Bugzilla %] will throw an error if you try).</li>
-  <li>Many new headers have been added to outbound [% terms.Bugzilla %]
+    (Bugzilla will throw an error if you try).</li>
+  <li>Many new headers have been added to outbound Bugzilla
     [%+ terms.bug %] emails: <code>X-Bugzilla-Status</code>,
     <code>X-Bugzilla-Priority</code>, <code>X-Bugzilla-Assigned-To</code>,
     <code>X-Bugzilla-Target-Milestone</code>, and 
@@ -3111,12 +3111,12 @@
     <code>http://bugs.mycompany.com/show_bug.cgi?id=1212</code>) that 
     links to [% terms.abug %], you will see the title of the 
     [%+ terms.bug %]. Of course, this only works for [% terms.bugs %] in your
-    [%+ terms.Bugzilla %] installation.</li>
+    Bugzilla installation.</li>
   <li>If your installation has user watching enabled, you will now see
     the users that you can remove from your watch-list as a multi-select
     box, much like the current CC list. (Previously it was just a text
     box.)</li>
-  <li>When a user creates their own account in [% terms.Bugzilla %], the 
+  <li>When a user creates their own account in Bugzilla, the
     account is now not actually created until they verify their email
     address by clicking on a link that is emailed to them.</li>
   <li>You can change [% terms.abug %]'s resolution without reopening it.</li>
@@ -3146,7 +3146,7 @@
 
 <ul>
   <li>Administrators can now delete attachments, making them disappear
-    entirely from [% terms.Bugzilla %].</li>
+    entirely from Bugzilla.</li>
   <li><kbd>sanitycheck.cgi</kbd> can now only be accessed by users
     in the <kbd>editcomponents</kbd> group.</li>
   <li>The &quot;Field Values&quot; control panel can now only be accessed
@@ -3211,8 +3211,8 @@
     get a lot of warnings in your Apache error_log about "deprecated
     pseudo-hashes." These are harmless--they are a b[%# fool test %]ug in 
     Perl 5.8.0. Perl 5.8.1 and later do not have this problem.</li>
-  <li>[% terms.Bugzilla %] 3.0rc1 allowed custom field column names in 
-    the database to be mixed-case. [% terms.Bugzilla %] 3.0 only allows
+  <li>Bugzilla 3.0rc1 allowed custom field column names in
+    the database to be mixed-case. Bugzilla 3.0 only allows
     lowercase column names. It will fix any column names that you have
     made mixed-case, but if you have custom fields that previously were
     mixed-case in any Saved Search, you will have to re-create that Saved
@@ -3223,19 +3223,19 @@
 
 <h3>3.0.6</h3>
 
-<p>[% terms.Bugzilla %] contains a minor security fix. For details, see the
+<p>Bugzilla contains a minor security fix. For details, see the
   <a href="http://www.bugzilla.org/security/2.20.6/">Security Advisory</a>.</p>
 
 <h3>3.0.5</h3>
 
-<p>[% terms.Bugzilla %] contains one security fix for 
+<p>Bugzilla contains one security fix for
   <a href="[% docs_urlbase FILTER html %]api/importxml.html">importxml.pl</a>.
   For details, see the 
   <a href="http://www.bugzilla.org/security/2.22.4/">Security Advisory</a>.</p>
 
 <h3>3.0.4</h3>
 
-<p>[% terms.Bugzilla %] 3.0.4 contains three security fixes.
+<p>Bugzilla 3.0.4 contains three security fixes.
   For details, see the
   <a href="http://www.bugzilla.org/security/2.20.5/">Security Advisory</a>.</p>
 
@@ -3245,14 +3245,14 @@
 
 <h3>3.0.2</h3>
 
-<p>[% terms.Bugzilla %] 3.0.1 had an important security fix that is
+<p>Bugzilla 3.0.1 had an important security fix that is
   critical for public installations with "requirelogin" turned on.
   For details, see the
   <a href="http://www.bugzilla.org/security/3.0.1/">Security Advisory</a></p>
 
 <h3>3.0.1</h3>
 
-<p>[% terms.Bugzilla %] 3.0 had three security issues that have been
+<p>Bugzilla 3.0 had three security issues that have been
   fixed in this release: one minor information leak, one hole only
   exploitable by an admin or using <code>email_in.pl</code>, and one in an
   uncommonly-used template. For details, see the 
@@ -3268,7 +3268,7 @@
     <kbd>checksetup.pl</kbd>. This means that you will have to
     delete those files when CVS tells you there's a conflict, and
     then run <kbd>cvs update</kbd> again.</li>
-  <li>In this version of [% terms.Bugzilla %], the Summary field
+  <li>In this version of Bugzilla, the Summary field
     is now limited to 255 characters. When you upgrade, any Summary
     longer than that will be truncated, and the old summary will be
     preserved in a comment.</li>
@@ -3312,7 +3312,7 @@
 <h3 id="v30_code_loc"><strong>Packagers:</strong> Location Variables
     Have Moved</h3>
 
-<p>In previous versions of [% terms.Bugzilla %], <kbd>Bugzilla::Config</kbd>
+<p>In previous versions of Bugzilla, <kbd>Bugzilla::Config</kbd>
   held all the paths for different things, such as the path to localconfig
   and the path to the <kbd>data/</kbd> directory.</p>
 
@@ -3325,14 +3325,14 @@
 
 <h3 id="v30_code_hooks">Hooks!</h3>
 
-<p>[% terms.Bugzilla %] now supports a code hook mechanism. See the 
+<p>Bugzilla now supports a code hook mechanism. See the
   documentation for
   <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Hook.html">Bugzilla::Hook</a>
   for more details.</p>
 
-<p>This gives [% terms.Bugzilla %] very advanced plugin support. You can
+<p>This gives Bugzilla very advanced plugin support. You can
   hook templates, hook code, add new parameters, and use the XML-RPC
-  interface. So we'd like to see some [% terms.Bugzilla %] plugins
+  interface. So we'd like to see some Bugzilla plugins
   written! Let us know on the <a href="http://bugzilla.org/cgi-bin/mj_wwwusr?func=lists-long-full&amp;extra=developers">developers&#64;bugzilla.org</a>
   mailing list if you write a plugin.</p>
 
@@ -3341,10 +3341,10 @@
 
 <h3 id="v30_code_api">API Documentation</h3>
 
-<p>[% terms.Bugzilla %] now ships with all of its perldoc built
+<p>Bugzilla now ships with all of its perldoc built
   as HTML. Go ahead and read the
   <a href="[% docs_urlbase FILTER html %]api/">API Documentation</a>
-  for all of the [% terms.Bugzilla %] modules now! Even scripts like
+  for all of the Bugzilla modules now! Even scripts like
   <kbd>checksetup.pl</kbd> have HTML documentation.</p>
 
 <h3 id="v30_code_globals">Elimination of globals.pl</h3>
@@ -3377,7 +3377,7 @@ sub y { $var++ }</pre>
 
 <p>For more information about how to use
   <a href="http://search.cpan.org/perldoc?DBI">DBI</a> with
-  [%+ terms.Bugzilla %], see the 
+  Bugzilla, see the
   <a href="http://www.bugzilla.org/docs/developer.html#sql-sendreceive">Developer's
   Guide Section About DBI</a></p>
 
@@ -3420,9 +3420,9 @@ sub y { $var++ }</pre>
     of its code moved into modules in the <kbd>Bugzilla::Install</kbd>
     namespace. See the
     <a href="[% docs_urlbase FILTER html %]api/checksetup.html">checksetup
-    documentation</a> and <a href="https://bugzilla.mozilla.org/showdependencytree.cgi?id=277502&amp;hide_resolved=0">[% terms.Bugzilla %]
+    documentation</a> and <a href="https://bugzilla.mozilla.org/showdependencytree.cgi?id=277502&amp;hide_resolved=0">Bugzilla
    [%+ terms.bug %] 277502</a> for details.</li>
-  <li>Instead of <kbd>UserInGroup()</kbd>, all of [% terms.Bugzilla %] now 
+  <li>Instead of <kbd>UserInGroup()</kbd>, all of Bugzilla now 
     uses <kbd>Bugzilla-&gt;user-&gt;in_group</kbd></li>
   <li>mod_perl doesn't like dependency loops in modules, so we now have
     a test for that detects dependency loops in modules when you run
@@ -3451,9 +3451,9 @@ sub y { $var++ }</pre>
 
 <h2 id="v30_previous">Release Notes For Previous Versions</h2>
 
-<p>Release notes for versions of [% terms.Bugzilla %] for versions
+<p>Release notes for versions of Bugzilla for versions
   prior to 3.0 are only available in text format: 
-  <a href="[% docs_urlbase FILTER remove('html/$') FILTER html %]rel_notes.txt">Release Notes for [% terms.Bugzilla %] 2.22
+  <a href="[% docs_urlbase FILTER remove('html/$') FILTER html %]rel_notes.txt">Release Notes for Bugzilla 2.22
   and Earlier</a>.</p>
 
 [% INCLUDE global/footer.html.tmpl %]

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