Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without…

t/008filter.t

@@ -136,6 +136,9 @@ foreach my $path (@Support::Templates::include_paths) {
             # Special Template Toolkit loop variable
             next if $directive =~ /^loop\.(index|count)$/;
             
+            # Branding terms
+            next if $directive =~ /^terms\./;
+            
             # Things which are already filtered
             # Note: If a single directive prints two things, and only one is 
             # filtered, we may not catch that case.

template/en/default/account/auth/ldap-error.html.tmpl

@@ -25,6 +25,8 @@
   #   of the error.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% SWITCH auth_err_tag %]
   [% CASE "cannot_retreive_attr" %]
     The specified LDAP attribute [% info.attr FILTER html %] was not found.
@@ -36,7 +38,7 @@
     [% END %]
 
   [% CASE "no_userid" %]
-    Bugzilla created a new account for you, but then could not find the
+    [% terms.Bugzilla %] created a new account for you, but then could not find the
     new userid.
 
   [% CASE "server_not_defined" %]

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

@@ -26,6 +26,8 @@
   #   submitted to the target script
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Login"
 %]
@@ -84,7 +86,7 @@
 
   [% IF Param("createemailregexp") %]
     <p>
-      If you don't have a Bugzilla account, you can 
+      If you don't have a [% terms.Bugzilla %] account, you can
       <a href="createaccount.cgi">create a new account</a>.
     </p>
   [% END %]

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

@@ -19,6 +19,9 @@
   # Contributor(s):     John Vandenberg <zeroj@null.net>
   #                     Tobias Burnus <burnus@net-b.de>
   #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 From: bugzilla-admin-daemon
 To: [% emailaddress %]
 Subject: [% PROCESS subject %]
@@ -26,7 +29,7 @@ Subject: [% PROCESS subject %]
 A request was cancelled from [% remoteaddress %].
 
 If you did not request this, it could be either an honest
-mistake or someone attempting to break into your Bugzilla account.
+mistake or someone attempting to break into your [% terms.Bugzilla %] account.
 
 Take a look at the information below and forward this email
 to [% maintainer %] if you suspect foul play.
@@ -85,11 +88,11 @@ Cancelled Because:
   [% ELSE %]
     [%# Give sensible error if the cancel-token function is used incorrectly.
       #%]
-    You are using Bugzilla's cancel-token function incorrectly. You
+    You are using [% terms.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.
 
-    If you are a Bugzilla end-user seeing this message, please forward this
+    If you are a [% terms.Bugzilla %] end-user seeing this message, please forward this
     email to [% Param('maintainer') %].
   [% END %]
 [% END %]

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

@@ -19,12 +19,15 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% PROCESS global/header.html.tmpl 
-  title = "Create a new Bugzilla account"
-%]
+[% PROCESS global/variables.none.tmpl %]
+
+[% title = BLOCK %]
+Create a new [% terms.Bugzilla %] account
+[% END %]
+[% PROCESS global/header.html.tmpl %]
 
 <p>
-  To create a Bugzilla account, all that you need to do is to enter a
+  To create a [% terms.Bugzilla %] account, all that you need to do is to enter a
   legitimate e-mail address.  The account will be created, and its
   password will be mailed to you. Optionally you may enter your real name
   as well.

template/en/default/account/email/change-new.txt.tmpl

@@ -18,12 +18,15 @@
   #
   # Contributor(s):     John Vandenberg <zeroj@null.net>
   #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% expiration_ts = token_ts + (max_token_age * 86400) %]
 From: bugzilla-admin-daemon
 To: [% emailaddress %]
-Subject: Bugzilla Change Email Address Request
+Subject: [% terms.Bugzilla %] Change Email Address Request
 
-Bugzilla has received a request to change the email address 
+[% terms.Bugzilla %] has received a request to change the email address
 for the [% oldemailaddress %] account to your address.
 
 To confirm the change, visit the following link:

template/en/default/account/email/change-old.txt.tmpl

@@ -23,15 +23,18 @@
   # newemailaddress: string. The user's new Bugzilla login email address.
   # token: string. The token associated with this change.
   #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% expiration_ts = token_ts + (max_token_age * 86400) %]
 From: bugzilla-admin-daemon
 To: [% emailaddress %]
-Subject: Bugzilla Change Email Address Request
+Subject: [% terms.Bugzilla %] Change Email Address Request
 Importance: High
 X-MSMail-Priority: High
 X-Priority: 1
 
-Bugzilla has received a request to change the email address 
+[% terms.Bugzilla %] has received a request to change the email address
 for your account to [% newemailaddress %].
 
 If you are not the person who made this request, or you wish to cancel

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

@@ -23,6 +23,8 @@
   # login: string. The user's Bugzilla login email address.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Account Exists"
 %]
@@ -30,7 +32,7 @@
 <form method="get" action="token.cgi">
   <input type="hidden" name="a" value="reqpw">
   <input type="hidden" name="loginname" value="[% login FILTER html %]">
-  A Bugzilla account for <tt>[% login FILTER html %]</tt> already exists. If you
+  A [% terms.Bugzilla %] account for <tt>[% login FILTER html %]</tt> already exists. If you
   are the account holder and have forgotten your password,
   <input type="submit" value="submit a request to change it">.
 </form>

template/en/default/account/password/forgotten-password.txt.tmpl

@@ -18,13 +18,16 @@
   #
   # Contributor(s):     John Vandenberg <zeroj@null.net>
   #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% expiration_ts = token_ts + (max_token_age * 86400) %]
 From: bugzilla-admin-daemon
 To: [% emailaddress %]
-Subject:  Bugzilla Change Password Request
+Subject:  [% terms.Bugzilla %] Change Password Request
 
-You (or someone impersonating you) has requested to change your Bugzilla
-password.  To change your password, visit the following link:
+You (or someone impersonating you) has requested to change your [% terms.Bugzilla %]
+&nbsp;password.  To change your password, visit the following link:
 
 [%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %]
 

template/en/default/account/prefs/email.html.tmpl

@@ -32,6 +32,8 @@
   # Also references the 'supportwatchers' Param.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% useqacontact = Param('useqacontact') %]
 
 <table>
@@ -45,8 +47,8 @@
     <tr>
       <td colspan="4">
         If you want to help cover for someone when they're on vacation, or if
-        you need to do the QA related to all of their bugs, you can tell 
-        Bugzilla to send mail related to their bugs to you also.  List the 
+        you need to do the QA related to all of their [% terms.bugs %], you can tell
+        [% terms.Bugzilla %] to send mail related to their [% terms.bugs %] to you also.  List the
         email addresses of any users you wish to watch here, separated by
         commas.
       </td>
@@ -64,7 +66,7 @@
     <td colspan="2">
       <p>
         If you don't like getting a notification for "trivial"
-        changes to bugs, you can use the settings below to
+        changes to [% terms.bugs %], you can use the settings below to
         filter some (or even all) notifications.
       </p>
     </td>
@@ -138,7 +140,7 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb
 <table width="100%" border="1">
   <tr>
     <td colspan="[% useqacontact ? '5' : '4' %]" align="center" width="50%">
-      <b>When my relationship to this bug is:</b>
+      <b>When my relationship to this [% terms.bug %] is:</b>
     </td>
     <td rowspan="2" width="50%">
       <b>I want to receive mail when:</b>
@@ -165,25 +167,29 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb
     </td>
   </tr>
 
+[% bugLabelLower = BLOCK %]
+[% terms.bug %]
+[% END %]
+
   [% FOREACH reason = [
       { name = 'Removeme',
-        description = 'I\'m added to or removed from this capacity' },
+        description = "I'm added to or removed from this capacity" },
       { name = 'Comments',
-        description = 'New Comments are added' },
+        description = "New Comments are added" },
       { name = 'Attachments',
-        description = 'New Attachments are added' },
+        description = "New Attachments are added" },
       { name = 'Status',
-        description = 'Priority, status, severity, and/or milestone changes' },
+        description = "Priority, status, severity, and/or milestone changes" },
       { name = 'Resolved',
-        description = 'The bug is resolved or verified' },
+        description = "The ${bugLabelLower} is resolved or verified" },
       { name = 'Keywords',
-        description = 'Keywords field changes' },
+        description = "Keywords field changes" },
       { name = 'CC',
-        description = 'CC field changes' },
+        description = "CC field changes" },
       { name = 'Other',
-        description = 'Any field not mentioned above changes' },
+        description = "Any field not mentioned above changes" },
       { name = 'Unconfirmed',
-        description = 'The bug is in the unconfirmed state' },
+        description = "The ${bugLabelLower} is in the unconfirmed state" },
   ] %]
     <tr>
       [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ]

template/en/default/account/prefs/footer.html.tmpl

@@ -26,9 +26,11 @@
   #   footer: boolean. True if the query appears in the footer.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <table>
   <tr>
-    <th align="right">The 'My bugs' link:</th>
+    <th align="right">The 'My [% terms.bugs %]' link:</th>
     <td>
       <select name="mybugslink">
         <option value="1">should appear on the footer of every page</option>
@@ -66,7 +68,7 @@
         If you create remembered queries using the
         <a href="query.cgi">query page</a>,
         you can then come to this page and choose to have some of them
-        appear in the footer of each Bugzilla page.
+        appear in the footer of each [% terms.Bugzilla %] page.
         <br>
         <br>
       </td>

template/en/default/account/prefs/permissions.html.tmpl

@@ -30,11 +30,13 @@
   #           other people.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <table align="center">
   <tr>
     <td>
       [% IF has_bits.size %]
-        You have the following permission bits set on your account:
+        You have the following permission [% terms.bits %] set on your account:
         <p>
         <br>
         <table align="center">
@@ -46,7 +48,7 @@
           [% END %]
         </table>
       [% ELSE %]
-        There are no permission bits set on your account.
+        There are no permission [% terms.bits %] set on your account.
       [% END %]
 
       [% IF user.groups.editusers %]
@@ -55,7 +57,7 @@
         all permissions for all users.
       [% ELSIF set_bits.size %]
         <br>
-        And you can turn on or off the following bits for
+        And you can turn on or off the following [% terms.bits %] for
         <a href="editusers.cgi">other users</a>:
         <p>
           <table align="center">

template/en/default/admin/flag-type/confirm-delete.html.tmpl

@@ -19,6 +19,8 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# Filter off the name here to be used multiple times below %]
 [% name = BLOCK %][% flag_type.name FILTER html %][% END %]
 
@@ -32,7 +34,7 @@
    instead of deleting the type you can
    <a href="editflagtypes.cgi?action=deactivate&amp;id=[% flag_type.id %]">deactivate it</a>,
    in which case the type and its flags will remain in the database
-   but will not appear in the Bugzilla UI.
+   but will not appear in the [% terms.Bugzilla %] UI.
 </p>
 
 <table>

template/en/default/admin/flag-type/edit.html.tmpl

@@ -19,6 +19,8 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# The javascript and header_html blocks get used in header.html.tmpl. %]
 [% javascript = BLOCK %]
   var usetms = 0; // do we have target milestone?
@@ -36,9 +38,13 @@
 [% END %]
 
 [% IF type.target_type == "bug" %]
-  [% title = "Create Flag Type for Bugs" %]
+  [% title = BLOCK %]Create Flag Type for [% terms.Bugs %][% END %]
+  [% typeLabelLowerPlural = BLOCK %][% terms.bugs %][% END %]
+  [% typeLabelLowerSingular = BLOCK %][% terms.bug %][% END %]
 [% ELSE %]
   [% title = "Create Flag Type for Attachments" %]
+  [% typeLabelLowerPlural = BLOCK %]attachments[% END %]
+  [% typeLabelLowerSingular = BLOCK %]attachment[% END %]
 [% END %]
 
 [% IF last_action == "copy" %]
@@ -87,8 +93,9 @@
 
     <tr>
       <th>Category:</th>
+
       <td>
-        the products/components to which [% type.target_type %]s must 
+        the products/components to which [% typeLabelLowerPlural %] must
         (inclusions) or must not (exclusions) belong in order for users
         to be able to set flags of this type for them
         <table>
@@ -172,7 +179,7 @@
       <th>&nbsp;</th>
       <td>
         <input type="checkbox" name="is_multiplicable" [% "checked" IF type.is_multiplicable || !type.is_multiplicable.defined %]>
-        multiplicable (multiple flags of this type can be set on the same [% type.target_type %])
+        multiplicable (multiple flags of this type can be set on the same [% typeLabelLowerSingular %])
       </td>
     </tr>
 

template/en/default/admin/flag-type/list.html.tmpl

@@ -19,6 +19,8 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = 'Administer Flag Types'
   style = "
@@ -28,7 +30,7 @@
 %]
 
 <p>
-  Flags are markers that identify whether a bug or attachment has been granted
+  Flags are markers that identify whether [% terms.abug %] or attachment has been granted
   or denied some status.  Flags appear in the UI as a name and a status symbol
   ("+" for granted, "-" for denied, and "?" for statuses requested by users).
 </p>
@@ -41,12 +43,12 @@
   depending on whether the patch passed or failed review.
 </p>
 
-<h3>Flag Types for Bugs</h3>
+<h3>Flag Types for [% terms.Bugs %]</h3>
 
 [% PROCESS display_flag_types types=bug_types %]
 
 <p>
-  <a href="editflagtypes.cgi?action=enter&amp;target_type=bug">Create Flag Type for Bugs</a>
+  <a href="editflagtypes.cgi?action=enter&amp;target_type=bug">Create Flag Type for [% terms.Bugs %]</a>
 </p>
 
 <h3>Flag Types for Attachments</h3>

template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl

@@ -20,20 +20,21 @@
   #
   #%]
 
-
+[% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl title="Confirm Group Control Change for product \'$product\'" %]
 
 [% FOREACH group = mandatory_groups %]
 <P>
-group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which the group is
-newly mandatory and will be added.
+group '[% group.name FILTER html %]' impacts [% group.count %]&nbsp;[% terms.bugs %] for
+which the group is newly mandatory and will be added.
 [% END %]
 
 [% FOREACH group = na_groups %]
 <P>
-group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which the group is no longer applicable and will be removed.
-[% END %]
+group '[% group.name FILTER html %]' impacts [% group.count %]&nbsp;
+[% terms.bugs %] for which the group is no longer applicable and will
+be removed.[% END %]
 <form method="post" >
 
   [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]

template/en/default/admin/products/groupcontrol/edit.html.tmpl

@@ -19,6 +19,7 @@
   # Contributor(s): Joel Peshkin <bugreport@peshkin.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
 
 [% filt_product = product FILTER html %]
 [% PROCESS global/header.html.tmpl
@@ -36,7 +37,7 @@
       <th>MemberControl</th>
       <th>OtherControl</th>
       <th>Canedit</th>
-      <th>Bugs</th>
+      <th>[% terms.Bugs %]</th>
     </tr>
     [% FOREACH group = groups %]
       [% IF group.isactive == 0 AND group.bugcount > 0 %]
@@ -131,7 +132,7 @@ These settings control the relationship of the groups to this
 product.
 <p>
 If any group has <b>Entry</b> selected, then this product will
-restrict bug entry to only those users who are members of all the
+restrict [% terms.bug %] entry to only those users who are members of all the
 groups with entry selected.
 <p>
 If any group has <b>Canedit</b> selected, then this product
@@ -141,7 +142,7 @@ all the canedit groups will be able to edit. This is an additional
 restriction that further restricts what can be edited by a user.
 <p>
 The <b>MemberControl</b> and <b>OtherControl</b> fields
-indicate which bugs will be placed in
+indicate which [% terms.bugs %] will be placed in
 this group according to the following definitions.
 <br>
 <table border=1>
@@ -164,7 +165,7 @@ this group according to the following definitions.
       NA
     </td>
     <td>
-      Bugs in this product are never associated with this group.
+      [% terms.Bugs %] in this product are never associated with this group.
     </td>
   </tr>
   <tr>
@@ -175,9 +176,9 @@ this group according to the following definitions.
       NA
     </td>
     <td>
-      Bugs in this product are permitted to be restricted to this
-      group.  Users who are a member of this group will be able
-      to place bugs in this group.
+      [% terms.Bugs %] in this product are permitted to be restricted to this
+      group.  Users who are a member of this group will be able to place [% terms.bugs %] in
+      this group.
     </td>
   </tr>
   <tr>
@@ -188,8 +189,8 @@ this group according to the following definitions.
       Shown
     </td>
     <td>
-      Bugs in this product can be placed in this group by anyone
-      with permission to edit the bug even if they are not a member
+      [% terms.Bugs %] in this product can be placed in this group by anyone
+      with permission to edit the [% terms.bug %] even if they are not a member
       of this group.
     </td>
   </tr>
@@ -201,9 +202,9 @@ this group according to the following definitions.
       Default
     </td>
     <td>
-      Bugs in this product can be placed in this group by anyone
-      with permission to edit the bug even if they are not a member
-      of this group. Non-members place bugs in this group by default.
+      [% terms.Bugs %] in this product can be placed in this group by anyone
+      with permission to edit the [% terms.bug %] even if they are not a member
+      of this group. Non-members place [% terms.bugs %] in this group by default.
     </td>
   </tr>
   <tr>
@@ -214,11 +215,10 @@ this group according to the following definitions.
       Mandatory
     </td>
     <td>
-      Bugs in this product are permitted to be restricted to this
-      group.  Users who are a member of this group will be able
-      to place bugs in this group.
-      Non-members will be forced to restrict bugs to this group
-      when they initially enter a bug in this product.
+      [% terms.Bugs %] in this product are permitted to be restricted to this
+      group.  Users who are a member of this group will be able to place [% terms.bugs %]
+       in this group.  Non-members will be forced to restrict [% terms.bugs %] to
+       this group when they initially enter [% terms.abug %] in this product.
     </td>
   </tr>
   <tr>
@@ -229,10 +229,9 @@ this group according to the following definitions.
       NA
     </td>
     <td>
-      Bugs in this product are permitted to be restricted to this
-      group and are placed in this group by default.
-      Users who are a member of this group will be able
-      to place bugs in this group.
+      [% terms.Bugs %] in this product are permitted to be restricted to this
+      group and are placed in this group by default.  Users who are a member of this
+      group will be able to place [% terms.bugs %] in this group.
     </td>
   </tr>
   <tr>
@@ -243,11 +242,10 @@ this group according to the following definitions.
       Default
     </td>
     <td>
-      Bugs in this product are permitted to be restricted to this
-      group and are placed in this group by default.
-      Users who are a member of this group will be able
-      to place bugs in this group. Non-members will be able to
-      restrict bugs to this group on entry and will do so by default
+      [% terms.Bugs %] in this product are permitted to be restricted to this
+      group and are placed in this group by default.  Users who are a member of this group
+      will be able to place [% terms.bugs %] in this group.  Non-members will be
+      able to restrict [% terms.bugs %] to this group on entry and will do so by default
     </td>
   </tr>
   <tr>
@@ -258,11 +256,10 @@ this group according to the following definitions.
       Mandatory
     </td>
     <td>
-      Bugs in this product are permitted to be restricted to this
-      group and are placed in this group by default.
-      Users who are a member of this group will be able
-      to place bugs in this group. Non-members will be forced
-      to place bugs in this group on entry.
+      [% terms.Bugs %] in this product are permitted to be restricted to this
+      group and are placed in this group by default.  Users who are a member of this group
+      will be able to place [% terms.bugs %] in this group. Non-members will be forced
+      to place [% terms.bugs %] in this group on entry.
     </td>
   </tr>
   <tr>
@@ -273,7 +270,7 @@ this group according to the following definitions.
       Mandatory
     </td>
     <td>
-      Bugs in this product are required to be restricted to this
+      [% terms.Bugs %] in this product are required to be restricted to this
       group.  Users are not given any option.
     </td>
   </tr>

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

@@ -19,10 +19,12 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# Define strings that will serve as the title and header of this page %]
-[% title = BLOCK %]Create New Attachment for Bug #[% bugid %][% END %]
+[% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %]
 [% h1 = BLOCK %]Create New Attachment for
-  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
+  [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
 [% PROCESS global/header.html.tmpl
@@ -128,17 +130,17 @@
       <tr>
         <th>Reassignment:</th>
         <td>
-          <em>If you want to assign this bug to yourself, 
+          <em>If you want to assign this [% terms.bug %] to yourself,
               check the box below.</em><br>
           <input type="checkbox" id="takebug" name="takebug" value="1">
-          <label for="takebug">take bug</label>
+          <label for="takebug">take [% terms.bug %]</label>
         </td>
       </tr>
     [% END %]
     <tr>
       <th>Comment:</th>
       <td>
-        <em>(optional) Add a comment about this attachment to the bug.</em><br>
+        <em>(optional) Add a comment about this attachment to the [% terms.bug %].</em><br>
         <textarea wrap="soft" name="comment" rows="6" cols="80"></textarea>
       </td>
     </tr>

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

@@ -28,6 +28,8 @@
   #  Possible values: autodetect, list, manual.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Changes Submitted"
   style = "th { text-align: left; }"
@@ -38,14 +40,14 @@
     <td>
       <h2>
         <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a>
-        to <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a> Created
+        to <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a> Created
       </h2>
 
       [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
 
       [% IF contenttypemethod == 'autodetect' %]
         <p>
-          <b>Note:</b> Bugzilla automatically detected the content type
+          <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
           <em>[% contenttype %]</em> for this attachment.  If this is
           incorrect, correct the value by
           <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">editing the attachment</a>.
@@ -53,13 +55,14 @@
       [% END %]
     </td>
     <td>
-      <a href="show_bug.cgi?id=[% bugid %]">Go back to bug #[% bugid %]</a>
+      <a href="show_bug.cgi?id=[% bugid %]">Go back to [% terms.bug %] #[% bugid %]</a>
     </td>
   </tr>
 </table>
 
 <p>
-<a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create Another Attachment to Bug #[% bugid %]</a>
+<a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create
+ Another Attachment to [% terms.Bug %] #[% bugid %]</a>
 </p>
 
 [% PROCESS global/footer.html.tmpl %]

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

@@ -19,10 +19,12 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# Define strings that will serve as the title and header of this page %]
-[% title = BLOCK %]Edit Attachment #[% attachid %] for Bug #[% bugid %][% END %]
+[% title = BLOCK %]Edit Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %][% END %]
 [% h1 = BLOCK %]Edit Attachment #[% attachid %] for
-  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
+  [%+ GetBugLink(bugid, "$terms.Bugs $bugid") %][% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
 [% PROCESS global/header.html.tmpl
@@ -178,7 +180,7 @@
         [% END %]
 
         <div id="smallCommentFrame">
-          <b>Comment (on the bug):</b><br>
+          <b>Comment (on the [% terms.bug %]):</b><br>
             <textarea name="comment" rows="5" cols="25" wrap="soft"></textarea><br>
         </div>
 
@@ -217,7 +219,7 @@
 
   </table>
 
-  Attachments on this Bug:
+  Attachments on this [% terms.Bug %]:
   [% FOREACH a = attachments %]
     [% IF a == attachid %]
       #[% a %]

template/en/default/attachment/show-multiple.html.tmpl

@@ -19,11 +19,12 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
 [% filtered_summary = bugsummary FILTER html %]
 [% h1 = BLOCK %]View All Attachments for
-  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
+  [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %]
 [% PROCESS global/header.html.tmpl
-  title = "View All Attachments for Bug #$bugid"
+  title = "View All Attachments for $terms.Bug #$bugid"
   h1 = h1
   h2 = filtered_summary
   style = "

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

@@ -25,6 +25,8 @@
   # attachid: integer. ID of the attachment we just attached.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Changes Submitted"
   style = "th { text-align: left; }"
@@ -37,13 +39,13 @@
     <td>
       <h2>Changes to
         <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
-        of bug [% bugid %] submitted
+        of [% terms.bug %]&nbsp;[% bugid %] submitted
       </h2>
       [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
     </td>
 
     <td>
-      <a href="show_bug.cgi?id=[% bugid %]">Back to Bug #[% bugid %]</a>
+      <a href="show_bug.cgi?id=[% bugid %]">Back to [% terms.Bug %] #[% bugid %]</a>
     </td>
   </tr>
 </table>

template/en/default/bug/activity/show.html.tmpl

@@ -26,10 +26,12 @@
   # activity.html.tmpl template fulfilled.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-  title = "Changes made to bug $bug_id"
+  title = "Changes made to $terms.bug $bug_id"
   h1 = "Activity log"
-  h2 = "Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
+  h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
  %]
 
 <br>
@@ -37,7 +39,7 @@
 [% PROCESS bug/activity/table.html.tmpl %]
 
 <p>
-  <a href="show_bug.cgi?id=[% bug_id %]">Back to bug [% bug_id %]</a>
+  <a href="show_bug.cgi?id=[% bug_id %]">Back to [% terms.bug %]&nbsp;[% bug_id %]</a>
 </p>
 
 [% PROCESS global/footer.html.tmpl %]

template/en/default/bug/activity/table.html.tmpl

@@ -33,14 +33,16 @@
   #                  it was affected by an old Bugzilla bug.)
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS bug/time.html.tmpl %]
 
 [% IF incomplete_data %]
   <p>
-    There used to be a bug Bugzilla which caused activity data
+    There used to be a [% terms.bug %] in [% terms.Bugzilla %] which caused activity data
     to be lost if there was a large number of cc's or dependencies.  That
-    has been fixed, however, there was some data already lost on this bug
-    that could not be regenerated.  The changes that the script could not
+    has been fixed, however, there was some data already lost on this [% terms.bug %] that
+    could not be regenerated.  The changes that the script could not
     reliably determine are prefixed by '?'.
   </p>
 [% END %]

template/en/default/bug/choose.html.tmpl

@@ -19,15 +19,17 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-   title = "Search by bug number"
+   title = "Search by $terms.bug number"
  %]
 
 <form method="get" action="show_bug.cgi">
   <p>
-    You may find a single bug by entering its bug id here:
+    You may find a single [% terms.bug %] by entering its [% terms.bug %] id here:
     <input name="id" size="6">
-    <input type="submit" value="Show Me This Bug">
+    <input type="submit" value="Show Me This [% terms.Bug %]">
   </p>
 </form>
 

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

@@ -273,11 +273,11 @@ function set_assign_to() {
     [% IF group.size %]
       <br>
         <strong>
-          Only users in all of the selected groups can view this bug:
+          Only users in all of the selected groups can view this [% terms.bug %]:
         </strong>
       <br>
       <font size="-1">
-        (Leave all boxes unchecked to make this a public bug.)
+        (Leave all boxes unchecked to make this a public [% terms.bug %].)
       </font>
       <br>
       <br>
@@ -300,7 +300,7 @@ function set_assign_to() {
     <td colspan="3">
       <input type="submit" value="    Commit    "
              onclick="if (this.form.short_desc.value == '')
-             { alert('Please enter a summary sentence for this bug.'); 
+             { alert('Please enter a summary sentence for this [% terms.bug %].');
                return false; } return true;">
       &nbsp;&nbsp;&nbsp;&nbsp;
       <input type="submit" name="maketemplate"

template/en/default/bug/create/created.html.tmpl

@@ -19,8 +19,10 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-  title = "Bug $id Submitted"
+  title = "$terms.Bug $id Submitted"
 %]
 
 [% header_done = 1 %]

template/en/default/bug/create/make-template.html.tmpl

@@ -19,6 +19,8 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Bookmarks are your friend"
   h1 = "Template constructed"
@@ -26,7 +28,7 @@
 
 <p>
 If you bookmark <a href="enter_bug.cgi?[% url FILTER html %]">this link</a>,
-going to the bookmark will bring up the enter bug page with the fields
+going to the bookmark will bring up the enter [% terms.bug %] page with the fields
 initialized as you've requested.
 </p>
 

template/en/default/bug/create/user-message.html.tmpl

@@ -28,7 +28,9 @@
   # the 'product' variable.
   #%]
 
-Before reporting a bug, please read the <a href="bugwritinghelp.html">
-bug writing guidelines</a>, please look at the list of
-<a href="duplicates.cgi">most frequently reported bugs</a>, and please
-<a href="query.cgi">search</a> for the bug.
+[% PROCESS global/variables.none.tmpl %]
+
+Before reporting [% terms.abug %], please read the <a href="bugwritinghelp.html">
+[% terms.bug %] writing guidelines</a>, please look at the list of
+<a href="duplicates.cgi">most frequently reported [% terms.bugs %]</a>, and please
+<a href="query.cgi">search</a> for the [% terms.bug %].

template/en/default/bug/dependency-graph.html.tmpl

@@ -32,13 +32,15 @@
                        dependencies. (Optional)
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% title = "Dependency Graph"
    h1 = title
  %]
 
 [% IF NOT multiple_bugs AND NOT doall %]
-  [% title = "$title for bug $bug_id"
-     h1 = "$h1 for bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>" 
+  [% title = "$title for $terms.bug $bug_id"
+     h1 = "$h1 for $terms.bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
    %]
 [% END %]
 
@@ -47,7 +49,7 @@
 [% image_map %]
 
 <p>
-  Green circles represent open bugs.
+  Green circles represent open [% terms.bugs %].
 </p>
 
 [% IF image_map %]
@@ -64,7 +66,7 @@
   <table>
     <tr>
       <td>
-        Bug numbers:
+        [% terms.Bug %] numbers:
         <input name="id" value="[% bug_id %]">
       </td>
     </tr>
@@ -73,7 +75,7 @@
       <td>
         <input type="checkbox" name="doall"
         [% " checked" IF doall %]>
-        Show <b>every</b> bug in the system with dependencies
+        Show <b>every</b> [% terms.bug %] in the system with dependencies
       </td>
     </tr>
 
@@ -81,7 +83,7 @@
       <td colspan="3">
         <input type="checkbox" name="showsummary"
           [% " checked" IF showsummary %]>
-        Show the summaries of all displayed bugs
+        Show the summaries of all displayed [% terms.bugs %]
       </td>
     </tr>
 

template/en/default/bug/dependency-tree.html.tmpl

@@ -21,20 +21,23 @@
   #                 Myk Melez <myk@mozilla.org>
   #%]
 
+[% INCLUDE global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-   title = "Dependency tree for Bug $bugid"
-   h1    = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">bug $bugid</a>"
+   title = "Dependency tree for $terms.Bug $bugid"
+   h1    = "Dependency tree for <a href=\"show_bug.cgi?id=$bugid\">$terms.Bug $bugid</a>"
    style = "strike { background-color: #d9d9d9; color: #000000; }"
 %]
 
 [% PROCESS depthControlToolbar %]
 
 [%# Display the tree of bugs that this bug depends on. %]
-<h3>[% hide_resolved ? "Open b" : "B" %]ugs that <a href="show_bug.cgi?id=[% bugid %]">bug [% bugid %]</a> depends on</h3>
+<h3>[% hide_resolved ? "Open $terms.bugs" : "$terms.Bugs" %]
+ that <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %]&nbsp;[% bugid %]</a> depends on</h3>
 [% IF dependson_ids.size > 0 %]
   (
   [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %]
-  <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]">view as bug list</a>
+  <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]">view as [% terms.bug %] list</a>
   [% IF canedit && dependson_ids.size > 1 %]
     | <a href="buglist.cgi?bug_id=[% dependson_ids.join(",") %]&amp;tweak=1">change several</a>
   [% END %])
@@ -45,11 +48,12 @@
 [% END %]
 
 [%# Display the tree of bugs that this bug blocks. %]
-<h3>[% hide_resolved ? "Open b" : "B" %]ugs that <a href="show_bug.cgi?id=[% bugid %]">bug [% bugid %]</a> blocks</h3>
+<h3>[% hide_resolved ? "Open $terms.bugs" : "$terms.Bugs" %]
+ that <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %]&nbsp;[% bugid %]</a> blocks</h3>
 [% IF blocked_ids.size > 0 %]
   (
   [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END %]
-  <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as bug list</a>
+  <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]">view as [% terms.bug %] list</a>
   [% IF canedit && blocked_ids.size > 1 %]
     | <a href="buglist.cgi?bug_id=[% blocked_ids.join(",") %]&amp;tweak=1">change several</a>
   [% END %])
@@ -79,7 +83,7 @@
         [[% IF dep.milestone %][% dep.milestone FILTER html %], [% END %]
         [% dep.assignee_email FILTER html %]] -
         [% IF dep.seen %]
-          <i>This bug appears elsewhere in this tree.</i></a>
+          <i>This [% terms.bug %] appears elsewhere in this tree.</i></a>
         [% ELSE %]
           [% dep.summary FILTER html %].</a>
         [% END %]

template/en/default/bug/edit.html.tmpl

@@ -20,6 +20,8 @@
   #                 Vaskin Kissoyan <vkissoyan@yahoo.com>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS bug/time.html.tmpl %]
 
 [% IF UserInGroup(Param('timetrackinggroup')) %]
@@ -57,13 +59,13 @@
   <table cellspacing="1" cellpadding="1" border="0">
     <tr>
       <td align="right">
-        <b>Bug#:</b>
+        <b>[% terms.Bug %]#:</b>
       </td>
       <td>
         <a href="[% Param('urlbase') %]show_bug.cgi?id=[% bug.bug_id %]">
           [% bug.bug_id %]</a>
           [% IF Param("usebugaliases") %]
-            <label title="a name for the bug that can be used in place of its ID number, f.e. when adding it to a list of dependencies">
+            <label title="a name for the [% terms.bug %] that can be used in place of its ID number, f.e. when adding it to a list of dependencies">
               <b>alias:</b>
               <input name="alias" value="[% bug.alias FILTER html %]" size="20" maxlength="20">
             </label>
@@ -163,7 +165,7 @@
       <td>
         [% bug.resolution FILTER html %]
         [% IF bug.resolution == "DUPLICATE" %]
-          of [% "bug ${bug.dup_id}" FILTER bug_link(bug.dup_id) %]
+          of [% terms.bug %]&nbsp;[% "${bug.dup_id}" FILTER bug_link(bug.dup_id) %]
         [% END %]
       </td>
       <td>&nbsp;</td>
@@ -371,9 +373,9 @@
       <td>
         [% bug.votes %]&nbsp;&nbsp;&nbsp;
         <a href="votes.cgi?action=show_bug&amp;bug_id=[% bug.bug_id %]">Show
-        votes for this bug</a>&nbsp;&nbsp;&nbsp;
+        votes for this [% terms.bug %]</a>&nbsp;&nbsp;&nbsp;
         <a href="votes.cgi?action=show_user&amp;bug_id=[% bug.bug_id %]">Vote
-        for this bug</a>
+        for this [% terms.bug %]</a>
       </td>
     </tr>
   </table>
@@ -402,10 +404,10 @@
         [% IF NOT emitted_description %]
           [% emitted_description = 1 %]
           <br>
-          <b>Only users in all of the selected groups can view this bug:</b>
+          <b>Only users in all of the selected groups can view this [% terms.bug %]:</b>
           <br>
           <font size="-1">
-            (Unchecking all boxes makes this a more public bug.)
+            (Unchecking all boxes makes this a more public [% terms.bug %].)
           </font>
           <br>
           <br>
@@ -422,7 +424,7 @@
 
     [% IF NOT inallgroups %]
       <b>
-        Only members of a group can change the visibility of a bug for 
+        Only members of a group can change the visibility of [% terms.abug %] for
         that group
       </b>
     <br>
@@ -430,15 +432,15 @@
 
     [% IF inagroup %]
       <p>
-        <b>Users in the roles selected below can always view this bug:</b>
+        <b>Users in the roles selected below can always view this [% terms.bug %]:</b>
         <br>
         <small>
           (The assignee
           [% IF (Param('useqacontact')) %]
              and QA contact
           [% END %]
-          can always see a bug, and this section does not take effect unless 
-          the bug is restricted to at least one group.)
+          can always see [% terms.abug %], and this section does not take effect unless
+          the [% terms.bug %] is restricted to at least one group.)
         </small>
       </p>
 
@@ -464,7 +466,7 @@
   [% IF bug.bug_status == "UNCONFIRMED" &&
         bug.user.canconfirm %]
     <input type="radio" name="knob" value="confirm">
-    Confirm bug (change status to <b>NEW</b>)
+    Confirm [% terms.bug %] (change status to <b>NEW</b>)
     <br>
     [% knum = knum + 1 %]
   [% END %]
@@ -473,8 +475,8 @@
     [% IF bug.isopened %]
       [% IF bug.bug_status != "ASSIGNED" && bug.user.canconfirm %]
         <input type="radio" name="knob" value="accept">
-        Accept bug (
-        [% "confirm bug, " IF bug.isunconfirmed %]change
+        Accept [% terms.bug %] (
+        [% IF bug.isunconfirmed %]confirm [% terms.bug %], [% END %]change
         status to <b>ASSIGNED</b>)
         <br>
         [% knum = knum + 1 %]
@@ -488,7 +490,7 @@
       [% END %]
 
       <input type="radio" name="knob" value="resolve">
-      Resolve bug, changing <a href="bug_status.html">resolution</a> to
+      Resolve [% terms.bug %], changing <a href="bug_status.html">resolution</a> to
       <select name="resolution"
               onchange="document.changeform.knob[[% knum %]].checked=true">
       [% FOREACH r = bug.choices.resolution %]
@@ -499,7 +501,7 @@
       [% knum = knum + 1 %]
 
       <input type="radio" name="knob" value="duplicate">
-      Resolve bug, mark it as duplicate of bug # 
+      Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] #
       <input name="dup_id" size="6"
              onchange="if (this.value != '')
                        {document.changeform.knob[[% knum %]].checked=true}">
@@ -507,7 +509,7 @@
       [% knum = knum + 1 %]
 
       <input type="radio" name="knob" value="reassign">
-      <a href="bug_status.html#assigned_to">Reassign</a> bug to
+      <a href="bug_status.html#assigned_to">Reassign</a> [% terms.bug %] to
       <input name="assigned_to" size="32"
              onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') &&
                             (this.value != '')) {
@@ -517,37 +519,37 @@
       <br>
       [% IF bug.isunconfirmed && bug.user.canconfirm %]
         &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="andconfirm">
-        and confirm bug (change status to <b>NEW</b>)
+        and confirm [% terms.bug %] (change status to <b>NEW</b>)
         <br>
       [% END %]
       [% knum = knum + 1 %]
 
       <input type="radio" name="knob" value="reassignbycomponent">
-      Reassign bug to owner
+      Reassign [% terms.bug %] to owner
       [% " and QA contact" IF Param('useqacontact') %]
       of selected component
       <br>
       [% IF bug.isunconfirmed && bug.user.canconfirm %]
         &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="compconfirm">
-        and confirm bug (change status to <b>NEW</b>)
+        and confirm [% terms.bug %] (change status to <b>NEW</b>)
         <br>
       [% END %]
       [% knum = knum + 1 %]
     [% ELSE %]
       [% IF bug.resolution != "MOVED" ||
            (bug.resolution == "MOVED" && bug.user.canmove) %]
-        <input type="radio" name="knob" value="reopen"> Reopen bug
+        <input type="radio" name="knob" value="reopen"> Reopen [% terms.bug %]
         <br>
         [% knum = knum + 1 %]
       [% END %]
       [% IF bug.bug_status == "RESOLVED" %]
         <input type="radio" name="knob" value="verify">
-        Mark bug as <b>VERIFIED</b><br>
+        Mark [% terms.bug %] as <b>VERIFIED</b><br>
         [% knum = knum + 1 %]
       [% END %]
       [% IF bug.bug_status != "CLOSED" %]
         <input type="radio" name="knob" value="close">
-        Mark bug as <b>CLOSED</b><br>
+        Mark [% terms.bug %] as <b>CLOSED</b><br>
         [% knum = knum + 1 %]
       [% END %]
     [% END %]
@@ -558,7 +560,7 @@
   <p>
     <font size="+1">
       <b>
-        <a href="show_activity.cgi?id=[% bug.bug_id %]">View Bug Activity</a>
+        <a href="show_activity.cgi?id=[% bug.bug_id %]">View [% terms.Bug %] Activity</a>
         &nbsp; | &nbsp;
         <a href="long_list.cgi?buglist=[% bug.bug_id %]">Format For Printing</a>
       </b>
@@ -599,7 +601,7 @@
 [%############################################################################%]
 
 [% BLOCK dependencies %]
-  <th align="right">Bug [% bug.bug_id %] [%+ dep.title %]:</th>
+  <th align="right">[% terms.Bug %]&nbsp;[% bug.bug_id %] [%+ dep.title %]:</th>
   <td>
   [% FOREACH depbug = bug.${dep.fieldname} %]
     [% depbug FILTER bug_link(depbug) %][% " " %]

template/en/default/bug/navigate.html.tmpl

@@ -19,9 +19,11 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% IF bug_list && bug_list.size > 0 %]
   [% this_bug_idx = lsearch(bug_list, bug.bug_id) %]
-  <b>Bug List:</b>
+  <b>[% terms.Bug %] List:</b>
   [% IF this_bug_idx != -1 %]
     ([% this_bug_idx + 1 %] of [% bug_list.size %])
   [% END %]
@@ -45,7 +47,7 @@
         <i><font color="#777777">Next</font></i>
       [% END %]
     [% ELSE %]
-      (This bug is not in your list)
+      (This [% terms.bug %] is not in your list)
     [% END %]
   [% ELSE %]
     &nbsp;&nbsp;
@@ -55,4 +57,4 @@
 [% END %]
 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="query.cgi">Query page</a>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="enter_bug.cgi">Enter new bug</a>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="enter_bug.cgi">Enter new [% terms.bug %]</a>

template/en/default/bug/process/bugmail.html.tmpl

@@ -36,6 +36,8 @@
   #                  list.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% mail = SendBugMail(mailing_bugid, mailrecipients) %]
 
 [% PROCESS emails
@@ -49,7 +51,7 @@
 %]
 <br>
 <center>
-  If you wish to tweak the kinds of mail Bugzilla sends you, you can
+  If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can
   <a href="userprefs.cgi?tab=email">change your preferences</a>.
 </center>
 

template/en/default/bug/process/confirm-duplicate.html.tmpl

@@ -30,23 +30,25 @@
   #   of the original bug can access that bug.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl title="Duplicate Warning" %]
 
 <p>
-  When marking a bug as a duplicate, the reporter of the duplicate 
+  When marking [% terms.abug %] as a duplicate, the reporter of the duplicate
   is normally added to the CC list of the original. The permissions
-  on bug [% original_bug_id %] (the original) are currently set 
+  on [% terms.bug %]&nbsp;[% original_bug_id %] (the original) are currently set
   such that the reporter would not normally be able to see it.
 </p>
 
 <p>
-  <b>Adding the reporter to the CC list of bug [% original_bug_id %] 
+  <b>Adding the reporter to the CC list of [% terms.bug %]&nbsp;[% original_bug_id %]
   [% IF cclist_accessible %]
     will immediately
   [% ELSE %]
     might, in the future,
   [% END %]
-  allow him/her access to view this bug.</b>
+  allow him/her access to view this [% terms.bug %].</b>
   Do you wish to do this?
 </p>
 
@@ -56,15 +58,15 @@
 
 <p>
   <input type="radio" name="confirm_add_duplicate" value="1">
-    Yes, add the reporter to CC list on bug [% original_bug_id %]
+    Yes, add the reporter to CC list on [% terms.bug %]&nbsp;[% original_bug_id %]
 </p>
 <p>
   <input type="radio" name="confirm_add_duplicate" value="0" checked="checked">
-    No, do not add the reporter to CC list on bug [% original_bug_id %]
+    No, do not add the reporter to CC list on [% terms.bug %]&nbsp;[% original_bug_id %]
 </p>
 <p>
   <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes,
-    and revisit bug [% duplicate_bug_id %]</a>
+    and revisit [% terms.bug %]&nbsp;[% duplicate_bug_id %]</a>
 <p>
   <input type="submit" value="Submit">
 </p>

template/en/default/bug/process/header.html.tmpl

@@ -23,8 +23,10 @@
   # As global/header.html.tmpl.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% IF    title_tag == "bug_processed" %]
-  [% title = "Bug processed" %]
+  [% title = "$terms.Bug processed" %]
 [% ELSIF title_tag == "mid_air" %]
   [% title = "Mid-air collision!" %]
 [% END %]

template/en/default/bug/process/midair.html.tmpl

@@ -34,6 +34,8 @@
   # bug_id: number; the ID of the bug being changed.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% UNLESS header_done %]
   [% PROCESS bug/process/header.html.tmpl %]
 [% END %]
@@ -41,7 +43,7 @@
 <h1>Mid-air collision detected!</h1>
 
 <p>
-  Someone else has made changes to this bug at the same time you were trying to.
+  Someone else has made changes to this [% terms.bug %] at the same time you were trying to.
   The changes made were:
 </p>
 
@@ -73,7 +75,7 @@ You have the following choices:
   </li>
   <li>
     <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes,
-      and revisit bug [% bug_id %]</a>
+      and revisit [% terms.bug %]&nbsp;[% bug_id %]</a>
   </li>
 </ul>
 

template/en/default/bug/process/next.html.tmpl

@@ -23,10 +23,12 @@
   # bug : Bug object; the next bug to show
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <hr>
 
 <p>
-  The next bug in your list is bug
+  The next [% terms.bug %] in your list is [% terms.bug %]
   <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>:
 </p>
 

template/en/default/bug/process/results.html.tmpl

@@ -29,6 +29,8 @@
   # mailrecipients: hash; BugMail recipient params. Optional.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% UNLESS header_done %]
   [% PROCESS bug/process/header.html.tmpl %]
 [% END %]
@@ -37,11 +39,11 @@
 
 [%
   title = {
-    'bug' => "Changes submitted for bug $id" , 
-    'dupe' => "Duplicate notation added to bug $id" , 
-    'dep' => "Checking for dependency changes on bug $id" , 
-    'votes' => "Bug $id confirmed by number of votes" , 
-    'created' => "Bug $id has been added to the database" , 
+    'bug' => "Changes submitted for $terms.bug $id" ,
+    'dupe' => "Duplicate notation added to $terms.bug $id" ,
+    'dep' => "Checking for dependency changes on $terms.bug $id" ,
+    'votes' => "$terms.Bug $id confirmed by number of votes" ,
+    'created' => "$terms.Bug $id has been added to the database" ,
   }
 %]
 
@@ -52,7 +54,7 @@
       [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %]
     </td>
     <td>
-      <a href="show_bug.cgi?id=[% id %]">Back To BUG# [% id %]</a>
+      <a href="show_bug.cgi?id=[% id %]">Back To [% terms.Bug %]# [% id %]</a>
     </td>
   </tr>
 </table>

template/en/default/bug/process/verify-new-product.html.tmpl

@@ -35,6 +35,8 @@
   #   the target milestone field
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <form action="process_bug.cgi" method="post">
 
 [% PROCESS "global/hidden-fields.html.tmpl"
@@ -46,11 +48,11 @@
 
   <p>
   [% IF use_target_milestone %]
-    You are moving the bug(s) to the product <b>[% form.product %]</b>, 
+    You are moving the [% terms.bug %](s) to the product <b>[% form.product %]</b>,
     and the version, component, and/or target milestone fields are no longer
     correct.  Please set the correct version, component, and target milestone now:
   [% ELSE %]
-    You are moving the bug(s) to the product <b>[% form.product %]</b>, 
+    You are moving the [% terms.bug %](s) to the product <b>[% form.product %]</b>,
     and the version and component fields are no longer correct.
     Please set the correct version and component now:
   [% END %]
@@ -78,17 +80,17 @@
 [% END %]
 
 [% IF verify_bug_group %]
-  <h3>Verify Bug Group</h3>
+  <h3>Verify [% terms.Bug %] Group</h3>
 
   <p>
-    Do you want to add the bug to its new product's default groups (if any)?
+    Do you want to add the [% terms.bug %] to its new product's default groups (if any)?
   </p>
 
   <p>
     <input type="radio" name="addtonewgroup" value="no"><b>no</b><br>
     <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br>
     <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked">
-      <b>yes, but only if the bug was in any of its old product's default groups</b><br>
+      <b>yes, but only if the [% terms.bug %] was in any of its old product's default groups</b><br>
   </p>
 [% END %]
 

template/en/default/bug/show-multiple.html.tmpl

@@ -20,8 +20,10 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-  title = "Full Text Bug Listing"
+  title = "Full Text $terms.Bug Listing"
   style_urls = [ "css/show_multiple.css" ]
 %]
 [% PROCESS bug/time.html.tmpl %]
@@ -31,7 +33,7 @@
   [% END %]
 [% ELSE %]
   <p>
-    You'd have more luck if you gave me some bug numbers.
+    You'd have more luck if you gave me some [% terms.bug %] numbers.
   </p>
 [% END %]
 
@@ -47,14 +49,14 @@
   <img alt="" src="1x1.gif" width="1" height="80" align="left">
   <div align="center">
     <b>
-      <font size="+3">Bug [% bug.bug_id %] - [% bug.short_desc FILTER html %]</font>
+      <font size="+3">[% terms.Bug %]&nbsp;[% bug.bug_id %] - [% bug.short_desc FILTER html %]</font>
     </b>
   </div>
 
   <table width="100%">
     <tr>
       <td>
-        <b>Bug#:</b>
+        <b>[% terms.Bug %]#:</b>
         <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>
       </td>
       [% PROCESS cell attr = { description => "Product",

template/en/default/bug/show.html.tmpl

@@ -21,14 +21,16 @@
   #                 Bradley Baetz <bbaetz@student.usyd.edu.au>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# This script/template only handles one bug #%]
 [% bug = bugs.0 %]
 
 [% filtered_desc = bug.short_desc FILTER html %]
 [% filtered_timestamp = bug.delta_ts FILTER time %]
 [% PROCESS global/header.html.tmpl
-  title = "Bug $bug.bug_id - $bug.short_desc"
-  h1 = "Bugzilla Bug $bug.bug_id"
+  title = "$terms.Bug $bug.bug_id - $bug.short_desc"
+  h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id"
   h2 = filtered_desc
   h3 = "Last modified: $filtered_timestamp"
   style_urls = [ "css/edit_bug.css" ]

template/en/default/bug/votes/delete-all.html.tmpl

@@ -23,13 +23,15 @@
   # This template has no interface.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
            title = "Remove your votes?"
  %]
 
 <p>
-  You are about to remove all of your bug votes. Are you sure you wish to 
-  remove your vote from every bug you've voted on?
+  You are about to remove all of your [% terms.bug %] votes. Are you sure you wish to
+  remove your vote from every [% terms.bug %] you've voted on?
 </p>
 
 <form action="votes.cgi" method="post">

template/en/default/bug/votes/list-for-bug.html.tmpl

@@ -27,9 +27,11 @@
   # total: integer. The total number of votes for this bug.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
            title = "Show Votes"
-           h2 = "Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
+           h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
  %]
 
 <table cellspacing="4">

template/en/default/bug/votes/list-for-user.html.tmpl

@@ -19,6 +19,8 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
            title = "Show Votes"
            h2 = voting_user.name
@@ -42,7 +44,7 @@
     <table cellspacing="4">
       <tr>
         <td></td>
-        <th>Bug #</th>
+        <th>[% terms.Bug %] #</th>
         <th>Summary</th>
         <th>Votes</th>
       </tr>
@@ -63,7 +65,7 @@
             <td>
               <font size="-1">
                 (Note: only [% product.maxperbug %] vote
-                [% "s" IF product.maxperbug != 1 %] allowed per bug in 
+                [% "s" IF product.maxperbug != 1 %] allowed per [% terms.bug %] in
                 this product.)
               </font>
             </td>
@@ -134,7 +136,7 @@
     [% ELSE %]
     This user is
     [% END %]
-    currently not voting on any bugs.
+    currently not voting on any [% terms.bugs %].
   </p>
 [% END %]
 

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>

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 %]
 

template/en/default/global/code-error.html.tmpl

@@ -30,6 +30,8 @@
   # alphabetical order by error tag, and leave a blank line between errors.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% DEFAULT title = "Internal Error" %]
 
 [% error_message = BLOCK %]
@@ -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.
@@ -101,7 +103,7 @@
     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" %]
@@ -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
@@ -236,11 +238,11 @@
   [% 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,7 +253,7 @@
 
 <tt>
   <p>
-    Bugzilla has suffered an internal error. Please save this page and send
+    [% 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>

template/en/default/global/field-descs.none.tmpl

@@ -21,11 +21,13 @@
 
 [%# 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?",

template/en/default/global/footer.html.tmpl

@@ -50,6 +50,5 @@
     </td>
   </tr>
 </table>
-
 </body>
 </html>

template/en/default/global/hidden-fields.html.tmpl

@@ -33,10 +33,10 @@
   [% 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 %]

template/en/default/global/message.html.tmpl

@@ -24,7 +24,9 @@
   # 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 %]
 

template/en/default/global/messages.html.tmpl

@@ -23,6 +23,8 @@
   # alphabetical order by message tag, and leave a blank line between messages.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% message_tag = message %]
 
 [% message = BLOCK %]
@@ -87,8 +89,8 @@
     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 %]

template/en/default/global/site-navigation.html.tmpl

@@ -25,6 +25,8 @@
   # bug.bug_id: integer. Number of current bug (for navigation purposes)
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
@@ -63,7 +65,7 @@
             href="votes.cgi?action=show_bug&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 %]
 

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 %]
 

template/en/default/global/variables.none.tmpl

+[%# 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"
+  }
+%]

template/en/default/index.html.tmpl

@@ -25,9 +25,13 @@
   # username: string. The login name of the user, if any.
   #%]
 
-[% PROCESS global/header.html.tmpl
-  title = 'Bugzilla Main Page'
-%]
+[% PROCESS global/variables.none.tmpl %]
+
+[% title = BLOCK %]
+[% terms.Bugzilla %] Main Page
+[% END %]
+[% PROCESS global/header.html.tmpl %]
+
 
 <script type="text/javascript" language="JavaScript">
 <!--
@@ -36,7 +40,7 @@ function addSidebar() {
   {
     var sidebarname=window.location.host;
     if (!/bug/i.test(sidebarname))
-      sidebarname="Bugzilla "+sidebarname;
+      sidebarname="[% terms.Bugzilla %] "+sidebarname;
     window.sidebar.addPanel (sidebarname, "[% Param('urlbase') %]sidebar.cgi", "");
   }
   else
@@ -52,12 +56,12 @@ function addSidebar() {
 
 <table width="100%"><tr>
  <td>
-  <p>This is where we put in lots of nifty words explaining all about Bugzilla.</p>
+  <p>This is where we put in lots of nifty words explaining all about [% terms.Bugzilla %].</p>
 
   But it all boils down to a choice of:
   <p>
-  <a href="query.cgi">Query existing bug reports</a><br>
-  <a href="enter_bug.cgi">Enter a new bug report</a><br>
+  <a href="query.cgi">Query existing [% terms.bug %] reports</a><br>
+  <a href="enter_bug.cgi">Enter a new [% terms.bug %] report</a><br>
   <a href="report.cgi">Summary reports and charts</a><br>
   </p><p>
 [% IF username %]
@@ -66,7 +70,7 @@ function addSidebar() {
 [% ELSE %]
   <a href="query.cgi?GoAheadAndLogIn=1">Log in to an existing account</a><br>
   [% IF Param('createemailregexp') %]
-    <a href="createaccount.cgi">Open a new Bugzilla account</a><br>
+    <a href="createaccount.cgi">Open a new [% terms.Bugzilla %] account</a><br>
   [% END %]
 [% END %]
   </p><p>
@@ -75,7 +79,7 @@ function addSidebar() {
   <form name="f" action="show_bug.cgi" method="get"
       onsubmit="QuickSearch(f.id.value); return false;">
   <p>
-  Enter a bug # or some search terms:<br>
+  Enter a [% terms.bug %] # or some search terms:<br>
   <input type="text" name="id">
   <input type="submit" value="Show">
   <a href="quicksearch.html">[Help]</a>

template/en/default/list/change-columns.html.tmpl

@@ -19,12 +19,14 @@
   # Contributor(s): Dave Lawrence <dkl@redhat.com>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Change Columns"
 %]
 
 <p>
-  Select the columns you wish to appear in your buglists. Note that
+  Select the columns you wish to appear in your [% terms.bug %] lists. Note that
   this feature requires cookies to work.
 </p>
 
@@ -67,7 +69,7 @@
 <form action="colchange.cgi">
   <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]">
   <input type="hidden" name="resetit" value="1">
-  <input type="submit" value="Reset to Bugzilla default">
+  <input type="submit" value="Reset to [% terms.Bugzilla %] default">
 </form>
 
 [% PROCESS global/footer.html.tmpl %]

template/en/default/list/edit-multiple.html.tmpl

@@ -19,6 +19,8 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% dontchange = "--do_not_change--" %]
 <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]">
 
@@ -38,9 +40,9 @@
 <hr>
 
 <p><font size="-1">
-  To change multiple bugs:
+  To change multiple [% terms.bugs %]:
   <ol>
-    <li>Check the bugs you want to change above.</li>
+    <li>Check the [% terms.bugs %] you want to change above.</li>
     <li>Make your changes in the form fields below.  If the change
         you are making requires an explanation, include it in
         the comments box.</li>
@@ -192,9 +194,9 @@
   <b>Groupset:</b><br>
   <table border="1">
     <tr>
-      <th>Don&apos;t<br>change<br>this group<br>restriction</td>
-      <th>Remove<br>bugs<br>from this<br>group</td>
-      <th>Add<br>bugs<br>to this<br>group</td>
+      <th>Don't<br>change<br>this group<br>restriction</td>
+      <th>Remove<br>[% terms.bugs %]<br>from this<br>group</td>
+      <th>Add<br>[% terms.bugs %]<br>to this<br>group</td>
       <th>Group Name:</td>
     </tr>
 
@@ -229,7 +231,7 @@
   </table>
 
   [% IF foundinactive %]
-    <font size="-1">(Note: Bugs may not be added to <strike>inactive 
+    <font size="-1">(Note: [% terms.Bugs %] may not be added to <strike>inactive
     groups</strike>, only removed.)</font><br>
   [% END %]
 
@@ -245,14 +247,14 @@
   [% knum = knum + 1 %]
   <input id="knob-confirm" type="radio" name="knob" value="confirm">
   <label for="knob-confirm">
-    Confirm bugs (change status to <b>NEW</b>)
+    Confirm [% terms.bugs %] (change status to <b>NEW</b>)
   </label><br>
 [% END %]
 
 [% knum = knum + 1 %]
 <input id="knob-accept" type="radio" name="knob" value="accept">
 <label for="knob-accept">
-  Accept bugs (change status to <b>ASSIGNED</b>)
+  Accept [% terms.bugs %] (change status to <b>ASSIGNED</b>)
 </label><br>
 
 [%# If all the bugs being changed are open, allow the user to close them. %]
@@ -264,7 +266,7 @@
   [% knum = knum + 1 %]
   <input id="knob-resolve" type="radio" name="knob" value="resolve">
   <label for="knob-resolve">
-    Resolve bugs, changing <a href="bug_status.html">resolution</a> to
+    Resolve [% terms.bugs %], changing <a href="bug_status.html">resolution</a> to
   </label>
   <select name="resolution" onchange="document.forms.changeform.knob[[% knum %]].checked=true">
     [% FOREACH resolution = resolutions %]
@@ -281,25 +283,25 @@
 [% IF !bugstatuses.containsany(openstates) %]
   [% knum = knum + 1 %]
   <input id="knob-reopen" type="radio" name="knob" value="reopen">
-  <label for="knob-reopen">Reopen bugs</label><br>
+  <label for="knob-reopen">Reopen [% terms.bugs %]</label><br>
 [% END %]
 
 [% IF bugstatuses.size == 1 %]
   [% IF bugstatuses.contains('RESOLVED') %]
     [% knum = knum + 1 %]
     <input id="knob-verify" type="radio" name="knob" value="verify">
-    <label for="knob-verify">Mark bugs as <b>VERIFIED</b></label><br>
+    <label for="knob-verify">Mark [% terms.bugs %] as <b>VERIFIED</b></label><br>
   [% ELSIF bugstatuses.contains('VERIFIED') %]
     [% knum = knum + 1 %]
     <input id="knob-close" type="radio" name="knob" value="close">
-    <label for="knob-close">Mark bugs as <b>CLOSED</b></label><br>
+    <label for="knob-close">Mark [% terms.bugs %] as <b>CLOSED</b></label><br>
   [% END %]
 [% END %]
 
 [% knum = knum + 1 %]
 <input id="knob-reassign" type="radio" name="knob" value="reassign">
 <label for="knob-reassign"><a href="bug_status.html#assigned_to">
-  Reassign</a> bugs to
+  Reassign</a> [% terms.bugs %] to
 </label>
 <input name="assigned_to"
        value="[% user.login FILTER html %]"
@@ -312,7 +314,7 @@
        name="knob"
        value="reassignbycomponent">
 <label for="knob-reassignbycomponent">
-  Reassign bugs to owner of selected component
+  Reassign [% terms.bugs %] to owner of selected component
 </label><br>
 
 <input type="submit" value="Commit">

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

@@ -23,11 +23,13 @@
   # title: string. The title for this page. (optional)
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%############################################################################%]
 [%# Initialization                                                           #%]
 [%############################################################################%]
 
-[% DEFAULT title = "Bug List" %]
+[% DEFAULT title = "$terms.Bug List" %]
 [% title = title FILTER html %]
 
 
@@ -44,7 +46,7 @@
 
   <body>
     [% IF bugs.size == 0 %]
-      <h3>Zarro Boogs found.</h3>
+      <h3>[% terms.zeroSearchResults %].</h3>
     [% ELSE %]
       [% PROCESS list/table.html.tmpl %]
     [% END %]

template/en/default/list/list.csv.tmpl

@@ -20,6 +20,8 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 bug_id,
 [% FOREACH column = displaycolumns %]
   [% column FILTER csv %],

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

@@ -23,7 +23,9 @@
 [%# Template Initialization                                                  #%]
 [%############################################################################%]
 
-[% DEFAULT title = "Bug List" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% DEFAULT title = "$terms.Bug List" %]
 [% style_urls = [ "css/buglist.css" ] %]
 [% qorder = order FILTER url_quote IF order %]
 
@@ -45,7 +47,7 @@
   [% END %]
 
   [% IF Param('enablequips') != 'off' %]
-    [% DEFAULT quip = "Bugzilla would like to put a random quip here, but no one has entered any." %]
+    [% DEFAULT quip = "$terms.Bugzilla would like to put a random quip here, but no one has entered any." %]
     <a href="quips.cgi"><i>[% quip FILTER html %]</i></a>
   [% END %]
 
@@ -53,8 +55,8 @@
 
 [% IF toolong %]
   <h2>
-    This list is too long for Bugzilla's little mind; the 
-    Next/Prev/First/Last buttons won't appear on individual bugs.
+    This list is too long for [% terms.Bugzilla %]'s little mind; the
+    Next/Prev/First/Last buttons won't appear on individual [% terms.bugs %].
   </h2>
 [% END %]
 
@@ -66,7 +68,7 @@
 [%############################################################################%]
 
 [% IF bugs.size > 9 %]
-  [% bugs.size %] bugs found.
+  [% bugs.size %]&nbsp;[% terms.bugs %] found.
 [% END %]
 
 
@@ -91,18 +93,18 @@
 [%############################################################################%]
 
 [% IF bugs.size == 0 %]
-  Zarro Boogs found.
+  [% terms.zeroSearchResults %].
   <p>
     <a href="query.cgi">Query Page</a>
-    &nbsp;&nbsp;<a href="enter_bug.cgi">Enter New Bug</a>
+    &nbsp;&nbsp;<a href="enter_bug.cgi">Enter New [% terms.Bug %]</a>
     <a href="query.cgi?[% urlquerypart FILTER html %]">Edit this query</a>
   </p>
 
 [% ELSIF bugs.size == 1 %]
-  One bug found.
+  One [% terms.bug %] found.
 
 [% ELSE %]
-  [% bugs.size %] bugs found.
+  [% bugs.size %]&nbsp;[% terms.bugs %] found.
 
 [% END %]
 
@@ -140,13 +142,13 @@
 
     [% IF bugs.size > 1 && caneditbugs && !dotweak %]
       <a href="buglist.cgi?[% urlquerypart FILTER html %]
-        [%- "&order=$qorder" FILTER html IF order %]&amp;tweak=1">Change Several 
-        Bugs at Once</a>
+        [%- "&order=$qorder" FILTER html IF order %]&amp;tweak=1">Change Several&nbsp;
+        [% terms.Bugs %] at Once</a>
       &nbsp;&nbsp;
     [% END %]
 
     [% IF bugowners %]
-      <a href="mailto:[% bugowners %]">Send Mail to Bug Owners</a> &nbsp;&nbsp;
+      <a href="mailto:[% bugowners %]">Send Mail to [% terms.Bug %] Owners</a> &nbsp;&nbsp;
     [% END %]
 
     <a href="query.cgi?

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

@@ -26,8 +26,10 @@
   # quips: list of strings. Defined iff show_quips is true. List of all quips.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-           title = "Bugzilla Quip System"
+           title = "$terms.Bugzilla Quip System"
            h1 = "Add your own clever headline"
  %]
 
@@ -55,7 +57,7 @@
 [% END %]
 
 <p>
-  Bugzilla will pick a random quip for the headline on each bug list, and 
+  [% terms.Bugzilla %] will pick a random quip for the headline on each [% terms.bug %] list, and
   you can extend the quip list. Type in something clever or funny or boring
   (but not obscene or offensive, please) and bonk on the button.
   [% IF Param("enablequips") == "approved" AND !user.groups.admin %]

template/en/default/list/server-push.html.tmpl

@@ -24,9 +24,11 @@
   # query: string. The SQL query which makes the buglist.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <html>
   <head>
-    <title>Bugzilla is pondering your query</title>
+    <title>[% terms.Bugzilla %] is pondering your query</title>
   </head>
   <body>
     <h1 style="margin-top: 20%; text-align: center;">Please stand by ...</h1>

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

@@ -20,12 +20,13 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
 [% INCLUDE global/header.html.tmpl title = "Linkify Text" %]
 
 <p>
   If you enter some text, this form will return it marked up like a
-  standard Bugzilla comment. That is, valid bug numbers, URLs, email addresses
-  and so on will be replaced with appropriate HTML links.
+  standard [% terms.Bugzilla %] comment. That is, valid [% terms.bug %] numbers,
+  URLs, email addresses and so on will be replaced with appropriate HTML links.
 </p>
 
 <form action="page.cgi" method="post">

template/en/default/reports/duplicates-simple.html.tmpl

@@ -23,12 +23,14 @@
   # You need to fulfill the interface to duplicates-table.html.tmpl.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <html>
 
   [% IF product %]
-    [% title = "Most Frequently Reported Bugs for $product" %]
+    [% title = "Most Frequently Reported $terms.Bugs for $product" %]
   [% ELSE %]
-    [% title = "Most Frequently Reported Bugs" %]
+    [% title = "Most Frequently Reported $terms.Bugs" %]
   [% END%]
 
   <head>

template/en/default/reports/duplicates-table.html.tmpl

@@ -42,12 +42,14 @@
   # product: string. Restrict to this product only.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# *** Column Headers *** %]
 
 [% IF bug_ids.size > 0 %]
   <table border>
     <tr bgcolor="#CCCCCC">
-      [% FOREACH column = [ { name => "id", description => "Bug #" },
+      [% FOREACH column = [ { name => "id", description => "$terms.Bug #" },
                             { name => "count", description => "Dupe<br>Count" },
                             { name => "delta",
                         description => "Change in last<br>$changedsince day(s)" },
@@ -143,5 +145,5 @@
 
   </table>
 [% ELSE %]
-  <h3>No duplicate bugs found.</h3>
+  <h3>No duplicate [% terms.bugs %] found.</h3>
 [% END %]

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

@@ -33,10 +33,12 @@
   # duplicates-table.html.tmpl.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% IF product %]
-  [% title = "Most Frequently Reported Bugs for $product" %]
+  [% title = "Most Frequently Reported $terms.Bugs for $product" %]
 [% ELSE %]
-  [% title = "Most Frequently Reported Bugs" %]
+  [% title = "Most Frequently Reported $terms.Bugs" %]
 [% END%]
 
 [% PROCESS global/header.html.tmpl
@@ -106,7 +108,7 @@
     <tr>
       <td>
         <label for="openonly">
-          Open bugs only:
+          Open [% terms.bugs %] only:
         </label>
       </td>
       <td>
@@ -123,48 +125,48 @@
 <form method="post" action="buglist.cgi">
   <input type="hidden" name="bug_id" value="[% bug_ids_string %]">
   <input type="hidden" name="order" value="Reuse same sort as last time">
-  Or just give this to me as a <input type="submit" value="bug list">. 
+  Or just give this to me as a <input type="submit" value="[% terms.bug %] list">.
   (Note: the order may not be the same.)
 </form>
 
 <hr>
 
 <b>
-  <a name="explanation">What are "Most Frequently Reported Bugs"?</a>
+  <a name="explanation">What are "Most Frequently Reported [% terms.Bugs %]"?</a>
 </b>
 
 <blockquote>
-  The Most Frequent Bugs page lists the known open bugs which 
+  The Most Frequent [% terms.Bugs %] page lists the known open [% terms.bugs %] which
   are reported most frequently. It is
-  automatically generated from the Bugzilla database every 24 hours, by 
-  counting the number of direct and indirect duplicates of bugs.
+  automatically generated from the [% terms.Bugzilla %] database every 24 hours, by
+  counting the number of direct and indirect duplicates of [% terms.bugs %].
   This information is provided in order to assist in minimizing
-  the amount of duplicate bugs entered into Bugzilla, which saves time
-  for Quality Assurance engineers who have to triage the bugs.
+  the amount of duplicate [% terms.bugs %] entered into [% terms.Bugzilla %], which
+  saves time for Quality Assurance engineers who have to triage the [% terms.bugs %].
 </blockquote>
 
 <b>How do I use this list?</b>
 
 <ul>
-  <li>Review the most frequent bugs list.</li>
+  <li>Review the most frequent [% terms.bugs %] list.</li>
   <li>If your problem is listed:</li>
 
   <ul>
-    <li>Click on the bug number to confirm that you have found the same bug, 
-        and comment if you have additional information or move on with your 
-        testing of the product.
+    <li>Click on the [% terms.bug %] number to confirm that you have found the
+    	same [% terms.bug %], and comment if you have additional information
+    	or move on with your testing of the product.
     </li>
   </ul>
 
   <li>If your problem not listed:</li>
 
   <ul>
-    <li><a href="query.cgi">Try and locate a similar bug</a> 
+    <li><a href="query.cgi">Try and locate a similar [% terms.bug %]</a>
         that has already been filed.</li>
-    <li>If you find your bug in Bugzilla, feel free to comment with any new or
-        additional data you may have.</li>
-    <li>If you cannot find your problem already documented in Bugzilla, 
-        <a href="enter_bug.cgi">file a new bug</a>.</li>
+    <li>If you find your [% terms.bug %] in [% terms.Bugzilla %],
+    	feel free to comment with any new or additional data you may have.</li>
+    <li>If you cannot find your problem already documented in [% terms.Bugzilla %],
+        <a href="enter_bug.cgi">file a new [% terms.bug %]</a>.</li>
   </ul>
 </ul>
 

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

@@ -27,8 +27,10 @@
   # caneditkeywords: boolean. True if this user can edit keywords
  %]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-  title = "Bugzilla Keyword Descriptions"
+  title = "$terms.Bugzilla Keyword Descriptions"
 %]
 
 [% FOREACH keyword = keywords %]
@@ -41,7 +43,7 @@
       <tr bgcolor="#6666FF">
         <th align="left">Name</th>
         <th align="left">Description</th>
-        <th align="left">Bugs</th>
+        <th align="left">[% terms.Bugs %]</th>
       </tr>
   [% END %]
 

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

@@ -24,12 +24,14 @@
   # types in Bugzilla.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Reporting and Charting Kitchen"
 %]
 
 <p>
-  Bugzilla allows you to view and track the state of the bug database in
+  [% terms.Bugzilla %] allows you to view and track the state of the [% terms.bug %] database in
   all manner of exciting ways.
 </p>
 
@@ -38,13 +40,13 @@
 <ul>
   <li>
     <strong><a href="query.cgi">Search</a></strong> -
-    list sets of bugs.
+    list sets of [% terms.bugs %].
   </li>
   <li>
     <strong>
       <a href="query.cgi?format=report-table">Tabular reports</a>
     </strong> -
-    tables of bug counts in 1, 2 or 3 dimensions, as HTML or CSV.
+    tables of [% terms.bug %] counts in 1, 2 or 3 dimensions, as HTML or CSV.
   </li>
   <li>
     <strong>
@@ -59,7 +61,7 @@
 <ul>
   <li>
     <strong><a href="reports.cgi">Old Charts</a></strong> - 
-    plot the status and/or resolution of bugs against
+    plot the status and/or resolution of [% terms.bugs %] against
     time, for each product in your database.
   </li>
   <li>

template/en/default/reports/report-bar.png.tmpl

@@ -19,7 +19,9 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% y_label = "Bugs" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% y_label = "$terms.Bugs" %]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 

template/en/default/reports/report-line.png.tmpl

@@ -19,7 +19,9 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% y_label = "Bugs" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% y_label = "$terms.Bugs" %]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 

template/en/default/reports/report-table.csv.tmpl

@@ -21,7 +21,9 @@
 [%# INTERFACE:
   # See report-table.html.tmpl.
   #%]
-[% num_bugs = "Number of bugs" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% num_bugs = BLOCK %]Number of [% terms.bugs %][% END %]
 [% tbl_field_disp = field_descs.$tbl_field || tbl_field %]
 [% col_field_disp = field_descs.$col_field || col_field %]
 [% row_field_disp = field_descs.$row_field || row_field %]

template/en/default/request/email.txt.tmpl

@@ -19,6 +19,9 @@
   # Contributor(s):     Myk Melez <myk@mozilla.org>
   #                     Jeff Hedlund <jeff.hedlund@matrixsi.com>
   #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% bugidsummary = flag.target.bug.id _ ': ' _ flag.target.bug.summary %]
 [% attidsummary = flag.target.attachment.id _ ': ' _
                   flag.target.attachment.summary %]
@@ -36,7 +39,7 @@
 From: bugzilla-request-daemon
 To: [% to_email %]
 CC: [% flag.type.cc_list %]
-Subject: [% flag.type.name %] [%+ subject_status %]: [Bug [% flag.target.bug.id %]] [% flag.target.bug.summary %]
+Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %]&nbsp;[% flag.target.bug.id %]] [% flag.target.bug.summary %]
 [%- IF flag.target.attachment.exists %] :
   [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %]
 
@@ -45,7 +48,7 @@ Subject: [% flag.type.name %] [%+ subject_status %]: [Bug [% flag.target.bug.id
 
 [% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] for [% flag.type.name %]:
 
-Bug [% bugidsummary %]
+[% terms.Bug %]&nbsp;[% bugidsummary %]
 [% END %]
 [%+ Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %]
 [% IF flag.target.attachment.exists %]

template/en/default/request/queue.html.tmpl

@@ -19,6 +19,8 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# The javascript and header_html blocks get used in header.html.tmpl. %]
 [% javascript = BLOCK %]
   var usetms = 0; // do we have target milestone?
@@ -106,7 +108,7 @@
 [% column_headers = {
       "type"       => "Flag" ,
       "status"     => "Status" ,
-      "bug"        => "Bug" , 
+      "bug"        => "$terms.Bug" ,
       "attachment" => "Attachment" ,
       "requester"  => "Requester" ,
       "requestee"  => "Requestee" ,

template/en/default/search/form.html.tmpl

@@ -21,6 +21,8 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
   [%# Note: use Template comments and not JS ones here, to avoid bloating
     what we actually send to the browser %]
 
@@ -611,7 +613,7 @@ function selectProduct(f) {
              id="emailassigned_to[% n %]" value="1"
              [% " checked" IF default.emailassigned_to.$n %]>
       <label for="emailassigned_to[% n %]">
-        bug owner
+        [% terms.bug %] owner
       </label>
     </td>
   </tr>
@@ -692,7 +694,7 @@ function selectProduct(f) {
         <option value="include"[% " selected" IF default.bugidtype.0 == "include" %]>Only include</option>
         <option value="exclude"[% " selected" IF default.bugidtype.0 == "exclude" %]>Exclude</option>
       </select>
-      bugs numbered: 
+      [% terms.bugs %] numbered:
     </td>
     <td>
       <input type="text" name="bug_id" value="[% default.bug_id.0 FILTER html %]" size="20">
@@ -705,7 +707,7 @@ function selectProduct(f) {
   [% IF Param('usevotes') %]
     <tr>
       <td align="right">
-        Only bugs with at least:
+        Only [% terms.bugs %] with at least:
       </td>
       <td>
         <input name="votes" size="3" value="[% default.votes.0 FILTER html %]"> votes
@@ -722,11 +724,11 @@ function selectProduct(f) {
 
     <td valign="top">
       <fieldset>
-        <legend><strong>Bug Changes</strong></legend>
+        <legend><strong>[% terms.Bug %] Changes</strong></legend>
 
 
 <dl>
-  <dt>Only bugs changed between:</dt>
+  <dt>Only [% terms.bugs %] changed between:</dt>
   <dd>
     <input name="chfieldfrom" size="10" value="[% default.chfieldfrom.0 FILTER html %]">
     and <input name="chfieldto" size="10" value="[% default.chfieldto.0 FILTER html %]">

template/en/default/search/knob.html.tmpl

@@ -21,10 +21,12 @@
   #                 Jouni Heikniemi <jouni@heikniemi.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# This is not necessary for English templates, but useful for localisers. %]
 [% ordersdesc = {
    "Reuse same sort as last time" => "Reuse same sort as last time",
-   "Bug Number"   => "Bug Number",
+   "Bug Number"   => "$terms.Bug Number",
    "Importance"   => "Importance",
    "Assignee"     => "Assignee",
    "Last Changed" => "Last Changed" } %]

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

@@ -25,11 +25,13 @@
   # search/boolean-charts.html.tmpl.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
 [% PROCESS global/header.html.tmpl
-  title = "Search for bugs"
+  title = "Search for $terms.bugs"
   onload = "selectProduct(document.forms['queryform']);initHelp();"
 %]
 
@@ -56,7 +58,7 @@
       <font color="red">
       [% IF cgi.user_agent("Mozilla/5") %]
         Note that if the help popups are hidden by form element scroll bars,
-        this is a bug in your browser, not in Bugzilla.
+        this is a bug in your browser, not in [% terms.Bugzilla %].
       [% END %]
     </font>
   </p>

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

@@ -23,64 +23,64 @@
 { id => "short_desc_type", 
   html => "The type of summary search you would like" },   
 { id => "short_desc", 
-  html => "The bug summary is a short sentence which succinctly describes <br> 
-           what the bug is about." },   
+  html => "The $terms.bug summary is a short sentence which succinctly  
+           describes <br> what the $terms.bug is about." },   
 { id => "product", 
-  html => "Bugs are categorised into Products and Components. Product is the<br>
-           top-level categorisation." },   
+  html => "$terms.Bugs are categorised into Products and Components. Product is 
+           the<br>top-level categorisation." },   
 { id => "component", 
   html => "Components are second-level categories; each belongs to a<br> 
            particular Product. Select a Product to narrow down this list." },   
 { id => "version", 
-  html => "The version field defines the version of the software the bug<br>
-           was found in." },   
+  html => "The version field defines the version of the software the 
+           $terms.bug<br>was found in." },   
 { id => "target_milestone", 
   html => "The target_milestone field is used to define when the engineer<br>
-           the bug is assigned to expects to fix it." },   
+           the $terms.bug is assigned to expects to fix it." },   
 { id => "long_desc", 
-  html => "Bugs have comments added to them by Bugzilla users. You can<br> 
-           search for some text in those comments." },   
+  html => "$terms.Bugs have comments added to them by $terms.Bugzilla users.  
+           You can<br>search for some text in those comments." },   
 { id => "long_desc_type", 
   html => "The type of comment search you would like" },   
 { id => "bug_file_loc", 
-  html => "Bugs can have a URL associated with them - for example, a pointer<br>
-           to a web site where the problem is seen." },   
+  html => "$terms.Bugs can have a URL associated with them - for example, a 
+           pointer<br>to a web site where the problem is seen." },   
 { id => "bug_file_loc_type", 
   html => "The type of URL search you would like" },   
 { id => "status_whiteboard", 
-  html => "Each bug has a free-form single line text entry box for adding<br>
-           tags and status information." },   
+  html => "Each $terms.bug has a free-form single line text entry box for 
+           adding<br>tags and status information." },   
 { id => "status_whiteboard_type", 
   html => "The type of whiteboard search you would like" },   
 { id => "keywords", 
-  html => "You can add keywords from a defined list to bugs, in order to<br>
-           tag and group them." },   
+  html => "You can add keywords from a defined list to $terms.bugs, in order 
+           to<br>tag and group them." },   
 { id => "keywords_type", 
   html => "The type of keyword search you would like" },   
 { id => "bug_status", 
-  html => "A bug may be in any of a number of states." },   
+  html => "A $terms.bug may be in any of a number of states." },   
 { id => "resolution", 
-  html => "If a bug is in a resolved state, then one of these reasons will<br>
-           be given for its resolution." },   
+  html => "If a $terms.bug is in a resolved state, then one of these reasons 
+           will<br>be given for its resolution." },   
 { id => "bug_severity", 
-  html => "How severe the bug is, or whether it's an enhancement." },   
+  html => "How severe the $terms.bug is, or whether it's an enhancement." },   
 { id => "priority", 
-  html => "Engineers prioritise their bugs using this field." },   
+  html => "Engineers prioritise their $terms.bugs using this field." },   
 { id => "rep_platform", 
-  html => "The hardware platform the bug was observed on." },   
+  html => "The hardware platform the $terms.bug was observed on." },   
 { id => "op_sys", 
-  html => "The operating system the bug was observed on." },   
+  html => "The operating system the $terms.bug was observed on." },   
 { id => "email1", 
-  html => "Every bug has people associated with it in different roles.<br>
-           Here, you can search on what people are in what role." },   
+  html => "Every $terms.bug has people associated with it in different 
+           roles.<br>Here, you can search on what people are in what role." },
 { id => "email2", 
-  html => "Every bug has people associated with it in different roles.<br>
-           Here, you can search on what people are in what role." },   
+  html => "Every $terms.bug has people associated with it in different 
+           roles.<br>Here, you can search on what people are in what role." },
 { id => "bug_id", 
-  html => "You can limit your search to a specific set of bugs." },   
+  html => "You can limit your search to a specific set of $terms.bugs ." },   
 { id => "votes", 
-  html => "Some bugs can be voted for, and you can limit your search to bugs<br>
-           with more than a certain number of votes." },   
+  html => "Some $terms.bugs can be voted for, and you can limit your search to 
+           $terms.bugs<br>with more than a certain number of votes." },   
 { id => "chfield", 
   html => "You can search for specific types of change - this field define <br>
            which field you are interested in changes for." },   

template/en/default/search/search-report-graph.html.tmpl

@@ -24,6 +24,8 @@
   # the interfaces of the templates it contains.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Generate Report"
   onload = "selectProduct(document.forms['reportform']);"
@@ -32,8 +34,8 @@
 [% PROCESS "search/search-report-select.html.tmpl" %]
 
 <p>
-  Produce a pictorial graph of bug counts by choosing one or more fields as 
-  your axes, and then refining your set of bugs using the rest of the form. 
+  Produce a pictorial graph of [% terms.bug %] counts by choosing one or more fields as
+  your axes, and then refining your set of [% terms.bugs %] using the rest of the form.
   If you choose a third axis, it will be represented by multiple tables of data.
   Note: vertical axis settings will be ignored for pie charts.
 </p>

template/en/default/search/search-report-table.html.tmpl

@@ -24,6 +24,8 @@
   # the interfaces of the templates it contains.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Generate Report"
   onload = "selectProduct(document.forms['reportform']);"
@@ -32,8 +34,8 @@
 [% PROCESS "search/search-report-select.html.tmpl" %]
 
 <p>
-  Produce a table of bug counts by choosing one or more fields as your axes, 
-  and then refining your set of bugs using the rest of the form. 
+  Produce a table of [% terms.bug %] counts by choosing one or more fields as your axes,
+  and then refining your set of [% terms.bugs %] using the rest of the form.
   If you choose a third axis, it will be represented by multiple tables of data.
 </p>
 

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

@@ -25,11 +25,13 @@
   # search/boolean-charts.html.tmpl.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 
 [% PROCESS global/header.html.tmpl
-  title = "Search for bugs"
+  title = "Search for $terms.bugs"
   onload = "selectProduct(document.forms['queryform']);initHelp();"
 %]
 
@@ -56,7 +58,7 @@
       <font color="red">
       [% IF cgi.user_agent("Mozilla/5") %]
         Note that if the help popups are hidden by form element scroll bars,
-        this is a bug in your browser, not in Bugzilla.
+        this is a bug in your browser, not in [% terms.Bugzilla %].
       [% END %]
     </font>
   </p>

template/en/default/sidebar.xul.tmpl

@@ -21,6 +21,9 @@
   #                 Scott Collins <scc@mozilla.org>
   #                 Christopher A. Aillon <christopher@aillon.com>
   #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 <?xml version="1.0"?>
 <!-- [% template_version %] -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
@@ -69,7 +72,7 @@ function normal_keypress_handler( aEvent ) {
     <box orient="vertical" flex="1">
       <text class="text-link" onclick="load_relative_url('query.cgi')" value="new query"/>
       <text class="text-link" onclick="load_relative_url('report.cgi')" value="reports"/>
-      <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="new bug"/>
+      <text class="text-link" onclick="load_relative_url('enter_bug.cgi')" value="new [% terms.bug %]"/>
       <separator class="thin"/>
 
 [% IF user %]
@@ -96,7 +99,7 @@ function normal_keypress_handler( aEvent ) {
       <separator class="thin"/>
   [%- IF user.showmybugslink %]
       [% filtered_username = user.login FILTER url_quote %]
-      <text class="text-link" onclick="load_relative_url('[% Param('mybugstemplate').replace('%userid%', filtered_username) FILTER js FILTER html %]')" value="my bugs"/>
+      <text class="text-link" onclick="load_relative_url('[% Param('mybugstemplate').replace('%userid%', filtered_username) FILTER js FILTER html %]')" value="my [% terms.bugs %]"/>
   [%- END %]
   [%- IF Param('usevotes') %]
       <text class="text-link" onclick="load_relative_url('votes.cgi?action=show_user')" value="my votes"/>