Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without changing all the templates. Patch by jwilmoth@starbucks.com; r=gerv, a=justdave.

13 files changed, 267 insertions, 202 deletions

diff --git a/template/en/default/global/banner.html.tmpl b/template/en/default/global/banner.html.tmpl
index b8bf4e06d..f1a8f14ae 100644
--- a/template/en/default/global/banner.html.tmpl
+++ b/template/en/default/global/banner.html.tmpl
@@ -22,12 +22,14 @@
 
 [%# Migration note: this file corresponds to the old Param 'bannerhtml' %]
 
+[% PROCESS global/variables.none.tmpl %]
+
     <table bgcolor="#000000" width="100%" border="0" cellpadding="0"
            cellspacing="0">
       <tr>
         <td>
           <center><font color="#FFFFFF" size="8">
-            This is Bugzilla
+            This is [% terms.Bugzilla %]
           </font></center>
         </td>
       </tr>
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index e79f7820d..5d6da1fc5 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -24,11 +24,13 @@
   # are their descriptions.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% IF target == "enter_bug.cgi" %]
-  [% title = "Enter Bug" %]
-  [% h2 = "First, you must pick a product on which to enter a bug." %]
+  [% title = "Enter $terms.Bug" %]
+  [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]. [% END %]
 [% ELSIF target == "describecomponents.cgi" %]
-  [% title = "Bugzilla Component Descriptions" %]
+  [% title = "$terms.Bugzilla Component Descriptions" %]
   [% h2 = "Please specify the product whose components you want described." %]
 [% END %]
 
@@ -50,7 +52,7 @@
     [% END %]
   </tr>
 [% END %]
-        
+
 </table>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 84a5e3259..60ae95043 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -25,16 +25,18 @@
   # variables: hash. Useful data about the problem. The keys are the variable
   #  names, and the values the variable values.
   #%]
-  
+
 [%# This is a list of all the possible code errors. Please keep them in
   # alphabetical order by error tag, and leave a blank line between errors.
-  #%]  
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
 
 [% DEFAULT title = "Internal Error" %]
-  
+
 [% error_message = BLOCK %]
   [% IF    error == "aaa_example_error_tag" %]
-    [% title = "Example Error" %]    
+    [% title = "Example Error" %]
     This is an example error. The title is set above. This text is the body
     of the error. It can contain arbitrary <b>HTML</b>, and also references
     to any [% parameters %] which you may have set before calling
@@ -59,11 +61,11 @@
     An authorization handler return value was not handled by the login code.
 
   [% ELSIF error == "bug_error" %]
-    Trying to retrieve bug [% bug.bug_id %] returned the error
+    Trying to retrieve [% terms.bug %] [%+ bug.bug_id %] returned the error
     [% bug.error FILTER html %]
     
   [% ELSIF error == "chart_data_not_generated" %]
-    The tool which gathers bug counts has not been run yet.
+    The tool which gathers [% terms.bug %] counts has not been run yet.
         
   [% ELSIF error == "chart_datafile_corrupt" %]
     The chart data file [% file FILTER html %] is corrupt.
@@ -82,7 +84,7 @@
   [% ELSIF error == "field_type_mismatch" %]
     Cannot seem to handle <code>[% field %]</code>
     and <code>[% type FILTER html %]</code> together.
- 
+
   [% ELSIF error == "gd_not_installed" %]
     Charts will not work without the GD Perl module being installed.
     Run checksetup.pl for installation instructions.
@@ -93,17 +95,17 @@
   [% ELSIF error == "illegal_content_type_method" %]
     Your form submission got corrupted somehow.  The <em>content
     method</em> field, which specifies how the content type gets determined,
-    should have been either <em>autodetect</em>, <em>list</em>, 
-    or <em>manual</em>, but was instead 
+    should have been either <em>autodetect</em>, <em>list</em>,
+    or <em>manual</em>, but was instead
     <em>[% contenttypemethod FILTER html %]</em>.
-        
+
   [% ELSIF error == "illegal_field" %]
     A legal [% field FILTER html %] was not set.
-    
+
   [% ELSIF error == "inactive_group" %]
-    Attempted to add bug to an inactive group, identified by the bit 
+    Attempted to add [% terms.bug %] to an inactive group, identified by the bit
     '[% bit FILTER html %]'.
-    
+
   [% ELSIF error == "bad_arg" %]
     Bad argument <code>[% argument %]</code> sent to
     <code>[% function %]</code> function.
@@ -139,12 +141,12 @@
     
   [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
     Attachment [% attach_id FILTER html %] ([% description FILTER html %]) 
-    is attached to bug [% attach_bug_id FILTER html %], but you tried to 
-    flag it as obsolete while creating a new attachment to bug 
-    [% my_bug_id FILTER html %].
+    is attached to [% terms.bug %] [%+ attach_bug_id FILTER html %], 
+    but you tried to flag it as obsolete while creating a new attachment to 
+    [% terms.bug %] [%+ my_bug_id FILTER html %].
         
   [% ELSIF error == "no_bug_data" %]
-    No data when fetching bug [% bug_id %].
+    No data when fetching [% terms.bug %] [%+ bug_id %].
     
   [% ELSIF error == "flag_nonexistent" %]
     There is no flag with ID #[% variables.id %].
@@ -170,7 +172,7 @@
     The product <em>[% variables.product FILTER html %]</em> does not exist.
   
   [% ELSIF error == "flag_type_target_type_invalid" %]
-    The target type was neither <em>bug</em> nor <em>attachment</em>
+    The target type was neither <em>[% terms.bug %]</em> nor <em>attachment</em>
     but rather <em>[% variables.target_type FILTER html %]</em>.
   
   [% ELSIF error == "invalid_field_name" %]
@@ -181,7 +183,7 @@
     Invalid output type [% type FILTER html %].
     
   [% ELSIF error == "missing_bug_id" %]
-    No bug ID was given.
+    No [% terms.bug %] ID was given.
     
   [% ELSIF error == "missing_series_id" %]
     Having inserted a series into the database, no series_id was returned for
@@ -200,7 +202,7 @@
     The group field <em>[% group FILTER html %]</em> is invalid.
 
   [% ELSIF error == "report_axis_invalid" %]
-    <em>[% variables.val FILTER html %]</em> is not a valid value for 
+    <em>[% variables.val FILTER html %]</em> is not a valid value for
     [%+ IF    variables.fld == "x" %]the horizontal axis
     [%+ ELSIF variables.fld == "y" %]the vertical axis
     [%+ ELSIF variables.fld == "z" %]the multiple tables/images
@@ -214,7 +216,7 @@
 
   [% ELSIF error == "unable_to_retrieve_password" %]
      I was unable to retrieve your old password from the database.
-     
+
   [% ELSIF error == "undefined_field" %]
     [% field FILTER html %] was not defined; [% Param('browserbugmessage') %]
 
@@ -224,7 +226,7 @@
     [% ELSE %]
        I could not figure out what you wanted to do.
     [% END %]
-    
+
   [% ELSIF error == "unknown_component" %]
     [% title = "Unknown Component" %]
     There is no component named <em>[% variables.component FILTER html %]</em>.
@@ -235,12 +237,12 @@
 
   [% ELSE %]
     [%# Give sensible error if error functions are used incorrectly.
-      #%]        
-    You are using Bugzilla's ThrowCodeError() function incorrectly. You
+      #%]
+    You are using [% terms.Bugzilla %]'s ThrowCodeError() function incorrectly. You
     passed in the string '[% error %]'. The correct use is to pass
     in a tag, and define that tag in the file code-error.html.tmpl.<br>
     <br>
-    If you are a Bugzilla end-user seeing this message, please save this
+    If you are a [% terms.Bugzilla %] end-user seeing this message, please save this
     page and send it to [% Param('maintainer') %].
   [% END %]
 [% END %]
@@ -251,8 +253,8 @@
 
 <tt>
   <p>
-    Bugzilla has suffered an internal error. Please save this page and send
-    it to [% Param("maintainer") %] with details of what you were doing at 
+    [% terms.Bugzilla %] has suffered an internal error. Please save this page and send
+    it to [% Param("maintainer") %] with details of what you were doing at
     the time this message appeared.
   </p>
   <script type="text/javascript"> <!--
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 6d8086423..7a21ca056 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -20,12 +20,14 @@
   #%]
 
 [%# Remember to PROCESS rather than INCLUDE this template. %]
-  
-[% field_descs = { "[Bug creation]"       => "[Bug creation]",
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% field_descs = { "[Bug creation]"       => "[$terms.Bug creation]",
                    "alias"                => "Alias",
                    "assigned_to"          => "Assignee",
                    "bug_file_loc"         => "URL",
-                   "bug_id"               => "Bug ID",
+                   "bug_id"               => "$terms.Bug ID",
                    "bug_severity"         => "Severity",
                    "bug_status"           => "Status",
                    "changeddate"          => "Last Changed Date",
@@ -33,7 +35,7 @@
                    "cclist_accessible"    => "CC list accessible?",
                    "component_id"         => "Component ID",
                    "component"            => "Component",
-                   "creation_ts"          => "Bug Creation time",
+                   "creation_ts"          => "$terms.Bug Creation time",
                    "delta_ts"             => "Last Changed time",
                    "estimated_time"       => "Orig. Est.",
                    "everconfirmed"        => "Ever confirmed?",
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 6e7aec377..6e220b49e 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -25,11 +25,11 @@
   #%]
 
 [% INCLUDE "global/help.html.tmpl" %]
-  
+
 [%# Migration note: below this point, this file corresponds to the old Param
-  # 'footerhtml' 
+  # 'footerhtml'
   #%]
-  
+
 <table border="0">
   <tr>
     <td bgcolor="#000000" valign="top">
@@ -37,7 +37,7 @@
              bgcolor="lightyellow">
         <tr>
           <td>
-          
+
 [%# Migration note: the old param 'blurbhtml' goes here %]
 
 [%# Migration note: useful-links.html.tmpl corresponds to %commandmenu% %]
@@ -50,6 +50,5 @@
     </td>
   </tr>
 </table>
-
 </body>
 </html>
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 825f3c333..4d9de8684 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -40,7 +40,7 @@
 
 [% DEFAULT
   h2 = ""
-  h3 = "" 
+  h3 = ""
   bgcolor = "#ffffff"
   onload = ""
 %]
@@ -58,33 +58,33 @@
 <html>
   <head>
     <title>[% title FILTER html %]</title>
-    
+
 [%# Migration note: contents of the old Param 'headerhtml' would go here %]
 
     [% PROCESS "global/site-navigation.html.tmpl" %]
-    
+
     [% IF javascript %]
       <script type="text/javascript" language="JavaScript">
         [% javascript %]
       </script>
     [% END %]
-    
-    [%+ INCLUDE "global/help-header.html.tmpl" %]        
+
+    [%+ INCLUDE "global/help-header.html.tmpl" %]
 
     [% IF style %]
       <style type="text/css">
         [% style %]
       </style>
     [% END %]
-    
+
     [% IF style_urls %]
       [% FOREACH style_url = style_urls %]
         <link href="[% style_url %]" rel="stylesheet" type="text/css">
       [% END %]
     [% END %]
-  
+
   </head>
-  
+
 [%# Migration note: contents of the old Param 'bodyhtml' go in the body tag,
   # but set the bgcolor and onload attributes in the DEFAULT directive above.
   #%]
@@ -94,9 +94,9 @@
 [%# Migration note: the following file corresponds to the old Param
   # 'bannerhtml'
   #%]
-  
+
 [% INCLUDE global/banner.html.tmpl %]
-    
+
 [% IF h1 || h2 %]
     <table border="0" cellspacing="0" width="100%">
       <tr>
diff --git a/template/en/default/global/hidden-fields.html.tmpl b/template/en/default/global/hidden-fields.html.tmpl
index a824c3489..b15232a8d 100644
--- a/template/en/default/global/hidden-fields.html.tmpl
+++ b/template/en/default/global/hidden-fields.html.tmpl
@@ -26,17 +26,17 @@
   # exclude: string; a regular expression matching fields to exclude
   #   from the list of hidden fields generated by this template
   #%]
- 
+
 [%# Generate hidden form fields for non-excluded fields. %]
 [% FOREACH field = form %]
   [% NEXT IF exclude && field.key.search(exclude) %]
   [% IF mform.${field.key}.size > 1 %]
     [% FOREACH mvalue = mform.${field.key} %]
       <input type="hidden" name="[% field.key FILTER html %]"
-             value="[% mvalue | html | html_linebreak %]">
+             value="[% mvalue FILTER html FILTER html_linebreak %]">
     [% END %]
   [% ELSE %]
     <input type="hidden" name="[% field.key FILTER html %]"
-           value="[% field.value | html | html_linebreak %]">
+           value="[% field.value FILTER html FILTER html_linebreak %]">
   [% END %]
 [% END %]
diff --git a/template/en/default/global/message.html.tmpl b/template/en/default/global/message.html.tmpl
index 58cd56908..c411ea351 100644
--- a/template/en/default/global/message.html.tmpl
+++ b/template/en/default/global/message.html.tmpl
@@ -18,13 +18,15 @@
   #
   # Contributor(s):
   #%]
-  
+
 [%# INTERFACE:
   # url: string. An optional URL to go to.
   # link: string. The link text for that URL.
   #%]
 
-[% DEFAULT title = "Bugzilla Message" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% DEFAULT title = "$terms.Bugzilla Message" %]
 
 [% PROCESS global/header.html.tmpl %]
 
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 6b9612f54..6cba576c3 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -18,11 +18,13 @@
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
-  
+
 [%# This is a list of all the possible messages. Please keep them in
   # alphabetical order by message tag, and leave a blank line between messages.
-  #%]  
-  
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% message_tag = message %]
 
 [% message = BLOCK %]
@@ -83,12 +85,12 @@
     [% url = "query.cgi?GoAheadAndLogIn=1" %]
     [% link = "Log in again." %]
     <b>Your login has been forgotten</b>.
-    The cookie that was remembering your login is now gone. You will be 
+    The cookie that was remembering your login is now gone. You will be
     prompted for a login the next time it is required.
 
   [% ELSIF message_tag == "login_changed" %]
-    [% title = "Bugzilla Login Changed" %]
-    Your Bugzilla login has been changed.
+    [% title = "$terms.Bugzilla Login Changed" %]
+    Your [% terms.Bugzilla %] login has been changed.
 
   [% ELSIF message_tag == "password_change_canceled" %]
     [% title = "Cancel Request to Change Password" %]
@@ -155,18 +157,18 @@
       <a href="query.cgi?format=create-series">create another series</a>.
     
   [% ELSIF message_tag == "shutdown" %]
-    [% title = "Bugzilla is Down" %]
+    [% title = "$terms.Bugzilla is Down" %]
     [% Param("shutdownhtml") %]
     
   [% ELSE %]
     [%# Give sensible error if error functions are used incorrectly.
       #%]        
-    You are using Bugzilla's messaging functions incorrectly. You
+    You are using [% terms.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>
-    If you are a Bugzilla end-user seeing this message, please save this
-    page and send it to [% Param('maintainer') %].
+    If you are a [% terms.Bugzilla %] end-user seeing this message, please 
+    save this page and send it to [% Param('maintainer') %].
     
   [% END %]
 [% END %]
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
index af80a65da..be64c2a86 100644
--- a/template/en/default/global/site-navigation.html.tmpl
+++ b/template/en/default/global/site-navigation.html.tmpl
@@ -21,10 +21,12 @@
   #%]
 
 [%# INTERFACE:
-  # bug_list: list of integers. List of bug numbers of current query (if any). 
+  # bug_list: list of integers. List of bug numbers of current query (if any).
   # bug.bug_id: integer. Number of current bug (for navigation purposes)
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
@@ -56,14 +58,14 @@
     <link rel="Show" title="Dependency Tree"
           href="showdependencytree.cgi?id=[% bug.bug_id %]">
     <link rel="Show" title="Dependency Graph"
-          href="showdependencygraph.cgi?id=[% bug.bug_id %]"> 
+          href="showdependencygraph.cgi?id=[% bug.bug_id %]">
 
     [% IF use_votes %]
       <link rel="Show" title="Votes ([% bug.votes %])"
             href="votes.cgi?action=show_bug&amp;bug_id=[% bug.bug_id %]">
     [% END %]
 
-      <link rel="Show" title="Bug Activity"
+      <link rel="Show" title="[% terms.Bug %] Activity"
             href="show_activity.cgi?id=[% bug.bug_id %]">
       <link rel="Show" title="Printer-Friendly Version"
             href="long_list.cgi?buglist=[% bug.bug_id %]">
@@ -73,7 +75,7 @@
   [%# *** Preset Queries *** %]
   [% IF user.showmybugslink %]
     [% user_login = user.login FILTER url_quote %]
-    <link rel="Preset&nbsp;Queries" title="My Bugs"                 
+    <link rel="Preset&nbsp;Queries" title="My [% terms.Bugs %]"                 
           href="[% Param('mybugstemplate').replace('%userid%', user_login) %]">
   [% END %]
 
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index e7588db7d..889a5091a 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -22,6 +22,8 @@
 [%# Migration note: this whole file corresponds to the old %commandmenu% 
     substitution param in 'footerhtml' %]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <form method="get" action="show_bug.cgi">
   <table width="100%">
     <tr>
@@ -33,7 +35,7 @@
         <a href="enter_bug.cgi">New</a> | 
         <a href="query.cgi">Query</a> |
         
-        <input type="submit" value="Find"> bug # 
+        <input type="submit" value="Find"> [% terms.bug %] # 
         <input name="id" size="6"> | 
         
         <a href="report.cgi">Reports</a> 
@@ -97,7 +99,7 @@
       <td colspan="3">
         [% IF user.showmybugslink %]
           [% filtered_username = user.login FILTER url_quote %]
-          <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My&nbsp;Bugs</a>
+          <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">My&nbsp;[% terms.Bugs %]</a>
           [% print_pipe = 1 %]
         [% END %]
 
@@ -106,20 +108,20 @@
             [% " | " IF print_pipe %]
             <a href="buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% q.name FILTER url_quote %]"><nobr>[% q.name FILTER html %]</nobr></a>
             [% print_pipe = 1 %]
-          [% END %]        
+          [% END %]
         [% END %]
       </td>
     </tr>
-      
-    [% ELSE %]    
+
+    [% ELSE %]
       <td valign="middle" align="right">
         [% IF Param('createemailregexp') %]
-          <a href="createaccount.cgi">New&nbsp;Account</a> | 
+          <a href="createaccount.cgi">New&nbsp;Account</a> |
         [% END %]
         <a href="query.cgi?GoAheadAndLogIn=1">Log&nbsp;In</a>
       </td>
     </tr>
     [% END %]
-    
-  </table>                
+
+  </table>
 </form>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index a057ef96b..8aa3842c8 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -27,10 +27,12 @@
 
 [%# This is a list of all the possible user errors. Please keep them in
   # alphabetical order by error tag, and leave a blank line between errors.
-  #%]  
-  
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS "global/field-descs.none.tmpl" %]
-  
+
 [% DEFAULT title = "Error" %]
 
 [% error_message = BLOCK %]
@@ -44,9 +46,9 @@
     [% title = "Account Disabled" %]
     [% disabled_reason %]
     <hr>
-    If you believe your account should be restored, please 
+    If you believe your account should be restored, please
     send email to [% Param("maintainer") %] explaining why.
-            
+
   [% ELSIF error == "account_exists" %]
     [% title = "Account Already Exists" %]
     There is already an account with
@@ -55,10 +57,10 @@
     [% ELSE %]
       that login name.
     [% END %]
-                  
+
   [% ELSIF error == "account_inexistent" %]
     [% title = "Account Does Not Exist" %]
-    There is no Bugzilla account with that login name.
+    There is no [% terms.Bugzilla %] account with that login name.
 
   [% ELSIF error == "alias_has_comma_or_space" %]
     [% title = "Invalid Characters In Alias" %]
@@ -67,22 +69,22 @@
     commas or spaces because those characters are used to separate
     aliases from each other in lists.  Please choose another alias
     that does not contain commas and spaces.
-                  
+
   [% ELSIF error == "alias_in_use" %]
     [% title = "Alias In Use" %]
-    [% bug_link %] has already taken the alias 
+    [% bug_link %] has already taken the alias
     <em>[% alias FILTER html %]</em>.  Please choose another one.
-    
+
   [% ELSIF error == "alias_is_numeric" %]
     [% title = "Alias Is Numeric" %]
-    You tried to give this bug the alias <em>[% alias FILTER html %]</em>,
+    You tried to give this [% terms.bug %] the alias <em>[% alias FILTER html %]</em>,
     but aliases cannot be merely numbers, since they could
-    then be confused with bug IDs.  Please choose another
-    alias containing at least one letter.    
-    
+    then be confused with [% terms.bug %] IDs.  Please choose another
+    alias containing at least one letter.
+
   [% ELSIF error == "alias_too_long" %]
     [% title = "Alias Too Long" %]
-    Bug aliases cannot be longer than 20 characters.
+    [% terms.Bug %] aliases cannot be longer than 20 characters.
     Please choose a shorter alias.
 
   [% ELSIF error == "auth_cant_create_account" %]
@@ -98,34 +100,35 @@
   [% ELSIF error == "attachment_access_denied" %]
     [% title = "Access Denied" %]
     You are not authorized to access this attachment.
-    
+
   [% ELSIF error == "bug_access_denied" %]
     [% title = "Access Denied" %]
-    You are not authorized to access bug #[% bug_id %].
+    You are not authorized to access [% terms.bug %] #[% bug_id %].
 
   [% ELSIF error == "bug_access_query" %]
     [% title = "Access Denied" %]
-    You are not authorized to access bug #[% bug_id %]. To see this bug, you
-    must first <a href="show_bug.cgi?id=[% bug_id %]&amp;GoAheadAndLogIn=1">log
+    You are not authorized to access [% terms.bug %] #[% bug_id %]. To see
+    this [% terms.bug %], you must
+    first <a href="show_bug.cgi?id=[% bug_id %]&amp;GoAheadAndLogIn=1">log
     in to an account</a> with the appropriate permissions.
-    
+
   [% ELSIF error == "buglist_parameters_required" %]
     [% title = "Parameters Required" %]
     [% url   = "query.cgi" %]
     [% link  = "Please use the search form to specify some search criteria." %]
     This script is not meant to be invoked without any search terms.
-   
+
   [% ELSIF error == "bugs_not_changed" %]
-    [% title = "Bugs Not Changed" %]
-    Um, you apparently did not change anything on the selected bugs.
-                        
+    [% title = BLOCK %][% terms.Bugs %] Not Changed[% END %]
+    Um, you apparently did not change anything on the selected [% terms.bugs %].
+
   [% ELSIF error == "chart_too_large" %]
     [% title = "Chart Too Large" %]
     Sorry, but 2000 x 2000 is the maximum size for a chart.
-                        
+
   [% ELSIF error == "comment_required" %]
     [% title = "Comment Required" %]
-    You have to specify a <b>comment</b> on this change.  
+    You have to specify a <b>comment</b> on this change.
     Please give some words on the reason for your change.
 
   [% ELSIF error == "comment_too_long" %]
@@ -134,43 +137,43 @@
 
   [% ELSIF error == "dependency_loop_multi" %]
     [% title = "Dependency Loop Detected" %]
-    The following bug(s) would appear on both the "depends on"
+    The following [% terms.bug %](s) would appear on both the "depends on"
     and "blocks" parts of the dependency tree if these changes
-    are committed: [% both %]. This would create a circular 
+    are committed: [% both %]. This would create a circular
     dependency, which is not allowed.
-                            
+
   [% ELSIF error == "dependency_loop_single" %]
     [% title = "Dependency Loop Detected" %]
-    You can't make a bug blocked or dependent on itself.
+    You can't make [% terms.abug %] blocked or dependent on itself.
 
   [% ELSIF error == "dupe_invalid_bug_id" %]
-    [% title = "Valid Bug Number Required" %]
-    You must specify a valid bug number of which this bug
-    is a duplicate.  The bug has not been changed.
-     
+    [% title = BLOCK %]Valid [% terms.Bug %] Number Required[% END %]
+    You must specify a valid bug number of which this [% terms.bug %]
+    is a duplicate.  The [% terms.bug %] has not been changed.
+
   [% ELSIF error == "dupe_of_self_disallowed" %]
     [% title = "Nice Try..." %]
-    Nice try, [% user.login FILTER html %], but it doesn't 
-    really make sense to mark a bug as a duplicate of itself, 
+    Nice try, [% user.login FILTER html %], but it doesn't
+    really make sense to mark [% terms.abug %] as a duplicate of itself,
     does it?
-    
+
   [% ELSIF error == "email_change_in_progress" %]
     [% title = "Email Change Already In Progress" %]
-    Email change already in progress; please check your email. 
-        
+    Email change already in progress; please check your email.
+
   [% ELSIF error == "email_confirmation_failed" %]
     [% title = "Email Address Confirmation Failed" %]
     Email address confirmation failed.
 
   [% ELSIF error == "entry_access_denied" %]
     [% title = "Permission Denied" %]
-    Sorry; you do not have the permissions necessary to enter a bug against
+    Sorry; you do not have the permissions necessary to enter [% terms.abug %] against
     the [% product FILTER html %] product.
-     
+
   [% ELSIF error == "file_not_specified" %]
     [% title = "No File Specified" %]
     You did not specify a file to attach.
-    
+
   [% ELSIF error == "file_too_large" %]
     [% title = "File Too Large" %]
     The file you are trying to attach is [% filesize %] kilobytes (KB) in size.
@@ -178,37 +181,37 @@
     KB.
     If your attachment is an image, try converting it to a compressable
     format like JPG or PNG, or put it elsewhere on the web and
-    link to it from the bug's URL field or in a comment on the bug.
-      
+    link to it from the [% terms.bug %]'s URL field or in a comment on the [% terms.bug %].
+
   [% ELSIF error == "flag_requestee_unauthorized" %]
     [% title = "Flag Requestee Not Authorized" %]
 
     You asked [% requestee.identity FILTER html %]
-    for <code>[% flag_type.name FILTER html %]</code> on bug [% bug_id -%] 
-    [% IF attach_id %], attachment [% attach_id %][% END %], but that bug
+    for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] [% bug_id -%]
+    [% IF attach_id %], attachment [% attach_id %][% END %], but that [% terms.bug %]&bnsp;
     has been restricted to users in certain groups, and the user you asked
-    isn't in all the groups to which the bug has been restricted.
-    Please choose someone else to ask, or make the bug accessible to users
+    isn't in all the groups to which the [% terms.bug %] has been restricted.
+    Please choose someone else to ask, or make the [% terms.bug %] accessible to users
     on its CC: list and add that user to the list.
-    
+
   [% ELSIF error == "flag_requestee_unauthorized_attachment" %]
     [% title = "Flag Requestee Not Authorized" %]
 
     You asked [% requestee.identity FILTER html %]
-    for <code>[% flag_type.name FILTER html %]</code> on bug [% bug_id %],
-    attachment [% attach_id %], but that attachment is restricted to users 
+    for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %]&nbsp;[% bug_id %],
+    attachment [% attach_id %], but that attachment is restricted to users
     in the [% Param("insidergroup") FILTER html %] group, and the user
     you asked isn't in that group.  Please choose someone else to ask,
     or ask an administrator to add the user to the group.
-    
+
   [% ELSIF error == "flag_type_cc_list_invalid" %]
     [% title = "Flag Type CC List Invalid" %]
     The CC list [% cc_list FILTER html %] must be less than 200 characters long.
-    
+
   [% ELSIF error == "flag_type_description_invalid" %]
     [% title = "Flag Type Description Invalid" %]
     The description must be less than 32K.
-    
+
   [% ELSIF error == "flag_type_name_invalid" %]
     [% title = "Flag Type Name Invalid" %]
     The name <em>[% name FILTER html %]</em> must be 1-50 characters long.
@@ -234,7 +237,7 @@
 
   [% ELSIF error == "illegal_attachment_edit_bug" %]
     [% title = "Unauthorised Action" %]
-    You are not authorised to edit attachments on bug [% bug_id %].
+    You are not authorised to edit attachments on [% terms.bug %] [%+ bug_id %].
          
   [% ELSIF error == "illegal_attachment_is_patch" %]
     [% title = "Your Query Makes No Sense" %]
@@ -246,7 +249,7 @@
     You tried to change the <strong>[% field %]</strong> field 
     from <em>[% oldvalue FILTER html %]</em> to 
     <em>[% newvalue FILTER html %]</em>, 
-    but only the owner or submitter of the bug, or a 
+    but only the owner or submitter of the [% terms.bug %], or a 
     sufficiently empowered user, may change that field.
   
   [% ELSIF error == "illegal_changed_in_last_x_days" %]
@@ -304,25 +307,27 @@
         
   [% ELSIF error == "insufficient_privs_for_multi" %]
     [% title = "Insufficient Privileges" %]
-    Sorry, you do not have sufficient privileges to edit multiple bugs.
+    Sorry, you do not have sufficient privileges to edit multiple 
+    [% terms.bugs %].
     
   [% ELSIF error == "invalid_attach_id" %]
     [% title = "Invalid Attachment ID" %]
     The attachment id [% attach_id FILTER html %] is invalid.
 
   [% ELSIF error == "invalid_bug_id" %]
-    [% title = "Invalid Bug ID" %]
-    The bug id [% bug_id FILTER html %] is invalid.
+    [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %]
+    The [% terms.bug %] id [% bug_id FILTER html %] is invalid.
 
   [% ELSIF error == "invalid_bug_id_non_existent" %]
-    [% title = "Invalid Bug ID" %]
-    Bug #[% bug_id %] does not exist.
+    [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %]
+    [% terms.Bug %] #[% bug_id %] does not exist.
     
   [% ELSIF error == "invalid_bug_id_or_alias" %]
-    [% title = "Invalid Bug ID" %]
-    The 'bug number' <em>[% bug_id FILTER html %]</em> is invalid.     
+    [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %]
+    The '[% terms.bug %] number' <em>[% bug_id FILTER html %]</em> is invalid.
     [% IF Param("usebugaliases") %]
-      It is neither a bug number nor an alias to a bug number.
+      It is neither [% terms.abug %] number nor an alias to [% terms.abug %]
+      number.
     [% END %]
     If you are trying to use QuickSearch, you need to enable JavaScript 
     in your browser. To help us fix this limitation, add your comments to 
@@ -336,10 +341,10 @@
   [% ELSIF error == "invalid_content_type" %]
     [% title = "Invalid Content-Type" %]
     The content type <em>[% contenttype FILTER html %]</em> is invalid.
-    Valid types must be of the form <em>foo/bar</em> where <em>foo</em> 
-    is either <em>application, audio, image, message, model, multipart, 
+    Valid types must be of the form <em>foo/bar</em> where <em>foo</em>
+    is either <em>application, audio, image, message, model, multipart,
     text,</em> or <em>video</em>.
-    
+
   [% ELSIF error == "invalid_maxrow" %]
     [% title = "Invalid Max Rows" %]
     The maximum number of rows, '[% maxrows FILTER html %]', must be a positive
@@ -353,7 +358,7 @@
     [% title = "Invalid Username" %]
     The name <tt>[% name FILTER html %]</tt> is not a valid username.  
     Either you misspelled it, or the person has not
-    registered for a Bugzilla account.
+    registered for a [% terms.Bugzilla %] account.
 
   [% ELSIF error == "invalid_username_or_password" %]
     [% title = "Invalid Username Or Password" %]
@@ -365,9 +370,9 @@
 
   [% ELSIF error == "milestone_required" %]
     [% title = "Milestone Required" %]
-    You must determine a target milestone for bug [% bug_id %]
+    You must determine a target milestone for [% terms.bug %] [%+ bug_id %]
     if you are going to accept it.  Part of accepting 
-    a bug is giving an estimate of when it will be fixed.
+    [% terms.abug %] is giving an estimate of when it will be fixed.
 
   [% ELSIF error == "misarranged_dates" %]
     [% title = "Misarranged Dates" %]
@@ -384,7 +389,7 @@
                 
   [% ELSIF error == "missing_content_type" %]
     [% title = "Missing Content-Type" %]
-     You asked Bugzilla to auto-detect the content type, but
+     You asked [% terms.Bugzilla %] to auto-detect the content type, but
      your browser did not specify a content type when uploading the file, 
      so you must enter a content type manually.
                 
@@ -428,7 +433,8 @@
                 
   [% ELSIF error == "need_component" %]
     [% title = "Component Required" %]
-    You must specify a component to help determine the new owner of these bugs.
+    You must specify a component to help determine the new owner of these 
+    [% terms.bugs %].
 
   [% ELSIF error == "need_numeric_value" %]
     [% title = "Numeric Value Required" %]
@@ -440,8 +446,8 @@
 
   [% ELSIF error == "need_product" %]
     [% title = "Product Required" %]
-    You must specify a product to help determine the new owner of these bugs.
-    
+    You must specify a product to help determine the new owner of these [% terms.bugs %].
+
   [% ELSIF error == "need_quip" %]
     [% title = "Quip Required" %]
     Please enter a quip in the text field.
@@ -449,35 +455,35 @@
   [% ELSIF error == "new_password_missing" %]
     [% title = "New Password Missing" %]
     You must enter a new password.
-    
+
   [% ELSIF error == "no_axes_defined" %]
     [% title = "No Axes Defined" %]
     You didn't define any axes to plot.
 
   [% ELSIF error == "no_bugs_chosen" %]
-    [% title = "No Bugs Chosen" %]
-    You apparently didn't choose any bugs to modify.
+    [% title = BLOCK %]No [% terms.Bugs %] Chosen[% END %]
+    You apparently didn't choose any [% terms.bugs %] to modify.
 
   [% ELSIF error == "no_component_change_for_multiple_products" %]
     [% title = "Action Not Permitted" %]
-    You cannot change the component for a list of bugs covering more than 
+    You cannot change the component for a list of [% terms.bugs %] covering more than
     one product.
-                       
+
   [% ELSIF error == "no_components" %]
     [% title = "No Components" %]
-    Sorry; there needs to be at least one component for this product in order 
-    to create a new bug.
+    Sorry; there needs to be at least one component for this product in order
+    to create a new [% terms.bug %].
     [% IF UserInGroup("editcomponents") %]
-      <a href="editcomponents.cgi">Create a new component</a>.      
+      <a href="editcomponents.cgi">Create a new component</a>.
     [% ELSE %]
-       Please contact [% Param("maintainer") %], giving the name of 
-       the product in which you tried to create a new bug.      
+       Please contact [% Param("maintainer") %], giving the name of
+       the product in which you tried to create a new [% terms.bug %].
     [% END %]
-                            
+
   [% ELSIF error == "no_dupe_stats" %]
     [% title = "Cannot Find Duplicate Statistics" %]
     There are no duplicate statistics for today ([% today %]) or yesterday.
-    
+
   [% ELSIF error == "no_dupe_stats_error_today" %]
     [% title = "Error Reading Today's Dupes File" %]
     An error occurred opening today's dupes file: [% error_msg FILTER html %].
@@ -487,66 +493,66 @@
     An error occurred opening [% changedsince FILTER html %] days ago
     ([% whenever FILTER html %])'s dupes file:
     [% error_msg FILTER html %].
-     
+
   [% ELSIF error == "no_dupe_stats_error_yesterday" %]
     [% title = "Error Reading Yesterday's Dupes File" %]
     There are no duplicate statistics for today ([% today %]), and an error
     occurred opening yesterday's dupes file: [% error_msg FILTER html %].
-    
+
   [% ELSIF error == "no_html_in_quips" %]
     [% title = "No HTML In Quips" %]
-    Sorry - for security reasons, support for HTML tags has been turned off 
+    Sorry - for security reasons, support for HTML tags has been turned off
     in quips.
-         
+
   [% ELSIF error == "no_new_quips" %]
     [% title = "No New Quips" %]
     This site does not permit the addition of new quips.
-    
+
   [% ELSIF error == "no_page_specified" %]
     [% title = "No Page Specified" %]
     You did not specify the id of a page to display.
 
   [% ELSIF error == "no_products" %]
     [% title = "No Products" %]
-    Either no products have been defined to enter bugs against or you have not
+    Either no products have been defined to enter [% terms.bugs %] against or you have not
     been given access to any.
-     
+
   [% ELSIF error == "old_password_incorrect" %]
     [% title = "Incorrect Old Password" %]
     You did not enter your old password correctly.
-     
+
   [% ELSIF error == "old_password_required" %]
     [% title = "Old Password Required" %]
     You must enter your old password to change email address.
-         
+
   [% ELSIF error == "passwords_dont_match" %]
     [% title = "Passwords Don't Match" %]
     The two passwords you entered did not match.
-     
+
   [% ELSIF error == "password_too_long" %]
     [% title = "Password Too Long" %]
-    The password is more than 16 characters long. It must be no more than 
+    The password is more than 16 characters long. It must be no more than
     16 characters.
-    
+
   [% ELSIF error == "password_too_short" %]
     [% title = "Password Too Short" %]
-    The password is less than three characters long. It must be at least 
+    The password is less than three characters long. It must be at least
     three characters.
-      
+
   [% ELSIF error == "patch_too_large" %]
     [% title = "File Too Large" %]
     The file you are trying to attach is [% filesize %] kilobytes (KB) in size.
     Patches cannot be more than [% Param('maxpatchsize') %] KB in size.
-    Try breaking your patch into several pieces.  
+    Try breaking your patch into several pieces.
 
   [% ELSIF error == "product_access_denied" %]
     [% title = "Access Denied" %]
     You do not have the permissions necessary to access that product.
-     
+
   [% ELSIF error == "product_edit_denied" %]
     [% title = "Product Edit Access Denied" %]
-    You are not permitted to edit bugs in product [% product %].
-    
+    You are not permitted to edit [% terms.bugs %] in product [% product %].
+
   [% ELSIF error == "query_name_missing" %]
     [% title = "No Query Name Specified" %]
     You must enter a name for your query.
@@ -561,8 +567,8 @@
 
   [% ELSIF error == "reassign_to_empty" %]
     [% title = "Illegal Reassignment" %]
-    You cannot reassign to a bug to nobody. Unless you
-    intentionally cleared out the "Reassign bug to" 
+    You cannot reassign to [% terms.abug %] to nobody. Unless you
+    intentionally cleared out the "Reassign [% terms.bug %] to"
     field, [% Param("browserbugmessage") %]
 
   [% ELSIF error == "report_access_denied" %]
@@ -571,42 +577,42 @@
 
   [% ELSIF error == "require_component" %]
     [% title = "Component Needed" %]
-    You must choose a component to file this bug in. If necessary, 
+    You must choose a component to file this [% terms.bug %] in. If necessary,
     just guess.
-    
+
   [% ELSIF error == "require_new_password" %]
     [% title = "New Password Needed" %]
     You cannot change your password without submitting a new one.
 
   [% ELSIF error == "require_summary" %]
     [% title = "Summary Needed" %]
-    You must enter a summary for this bug.
-  
+    You must enter a summary for this [% terms.bug %].
+
   [% ELSIF error == "resolving_remaining_time" %]
     [% title = "Trying to Resolve with Hours Remaining" %]
-    You cannot resolve a bug with hours still remaining.  Set 
-    Remaining Hours to zero if you want to resolve the bug.
+    You cannot resolve [% terms.abug %] with hours still remaining.  Set
+    Remaining Hours to zero if you want to resolve the [% terms.bug %].
 
   [% ELSIF error == "sanity_check_access_denied" %]
     [% title = "Access Denied" %]
     You do not have the permissions necessary to run a sanity check.
-     
+
   [% ELSIF error == "sidebar_supports_mozilla_only" %]
     Sorry - sidebar.cgi currently only supports Mozilla based web browsers.
     <a href="http://www.mozilla.org">Upgrade today</a>. :-)
 
   [% ELSIF error == "too_many_votes_for_bug" %]
     [% title = "Illegal Vote" %]
-    You may only use at most [% max %] votes for a single bug in the
-    <tt>[% prod FILTER html %]</tt> product, but you are trying to use 
+    You may only use at most [% max %] votes for a single [% terms.bug %] in the
+    <tt>[% prod FILTER html %]</tt> product, but you are trying to use
     [% votes %].
-     
+
   [% ELSIF error == "too_many_votes_for_product" %]
     [% title = "Illegal Vote" %]
-    You may only use at most [% max %] votes for bugs in the
-    <tt>[% prod FILTER html %]</tt> product, but you are trying to use 
+    You may only use at most [% max %] votes for [% terms.bugs %] in the
+    <tt>[% prod FILTER html %]</tt> product, but you are trying to use
     [% votes %].
-     
+
   [% ELSIF error == "token_inexistent" %]
     [% title = "Token Does Not Exist" %]
     The token you submitted does not exist, has expired, or has
@@ -614,17 +620,17 @@
 
   [% ELSIF error == "unknown_keyword" %]
     [% title = "Unknown Keyword" %]
-    <code>[% keyword FILTER html %]</code> is not a known keyword. 
+    <code>[% keyword FILTER html %]</code> is not a known keyword.
     The legal keyword names are <a href="describekeywords.cgi">listed here</a>.
 
   [% ELSIF error == "unknown_tab" %]
     [% title = "Unknown Tab" %]
     <code>[% current_tab_name FILTER html %]</code> is not a legal tab name.
-    
+
   [% ELSIF error == "votes_must_be_nonnegative" %]
     [% title = "Votes Must Be Non-negative" %]
-    Only use non-negative numbers for your bug votes.
-        
+    Only use non-negative numbers for your [% terms.bug %] votes.
+
   [% ELSIF error == "wrong_token_for_cancelling_email_change" %]
     [% title = "Wrong Token" %]
     That token cannot be used to cancel an email address change.
@@ -644,7 +650,7 @@
   [% ELSIF error == "zero_length_file" %]
     [% title = "File Is Empty" %]
     The file you are trying to attach is empty!
-    
+
   [% ELSE %]
     [% title = "Error string not found" %]
     The user error string <code>[% error FILTER html %]</code> was not found.
diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl
new file mode 100644
index 000000000..c63d1bf60
--- /dev/null
+++ b/template/en/default/global/variables.none.tmpl
@@ -0,0 +1,44 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s):
+  #%]
+
+[%# This is a list of terms that may be changed to "brand" the Bugzilla 
+  # instance (for example, referring to "bugs" as "issues".) When used, these
+  # strings are used in several different types of content, and are not  
+  # protected with Template-Toolkit FILTERs. Consequently, no special 
+  # characters are allowed.
+  #
+  # Remember to PROCESS rather than INCLUDE this template. 
+  #%]
+
+[% terms = {
+  "bug" => "bug",
+  "Bug" => "Bug",
+  "abug" = "a bug",
+  "Abug" = "A bug",
+  "ABug" = "A Bug",
+  "bugs" = "bugs",
+  "Bugs" = "Bugs",
+  "zeroSearchResults" = "Zarro Boogs found",
+  "bit" = "bit",
+  "bits" = "bits",
+  "Bugzilla" = "Bugzilla"
+  }
+%]