diff --git a/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
index 399f31b1719..9af0efef5bd 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -53,7 +53,7 @@
       [% END %]
     </tr>
     <tr>
-      <td>My Bugs</td>
+      <td>My [% terms.Bugs %]</td>
       <td>
         [% filtered_username = user.login FILTER url_quote %]
         <a href="[% Param('mybugstemplate').replace('%userid%', filtered_username) %]">Run</a>
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl
index e7bd9635561..291e1dd6101 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/components/edit.html.tmpl
@@ -104,7 +104,7 @@
       <td>[% terms.Bugs %]:</td>
       <td>
 [% IF comp.bug_count > 0 %]
-        <a title="Bugs in component '[% comp.name FILTER html %]'"
+        <a title="[% terms.Bugs %] in component '[% comp.name FILTER html %]'"
            href="buglist.cgi?component=
                 [%- comp.name FILTER url_quote %]&amp;product=
                 [%- product.name FILTER url_quote %]">[% comp.bug_count %]</a>
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl
index 3fdb20f4388..f7ab7220aa2 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl
@@ -72,7 +72,7 @@
       <td><input type="text" id="desc" name="desc" value="" size="40"></td>
 
       <th align="right">
-        <label for="new_bugmail">Displayed in bugmail for new [% terms.bugs %]:</label>
+        <label for="new_bugmail">Displayed in [% terms.bug %]mail for new [% terms.bugs %]:</label>
       </th>
       <td><input type="checkbox" id="new_bugmail" name="new_bugmail" value="1"></td>
     </tr>
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl
index 2165ac323ac..882b17b044e 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl
@@ -62,7 +62,7 @@
                  value="[% field.description FILTER html %]"></td>
 
       <th align="right">
-        <label for="new_bugmail">Displayed in bugmail for new [% terms.bugs %]:</label>
+        <label for="new_bugmail">Displayed in [% terms.bug %]mail for new [% terms.bugs %]:</label>
       </th>
       <td><input type="checkbox" id="new_bugmail" name="new_bugmail" value="1"
                  [%- " checked" IF field.mailhead %]></td>
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl
index befd1575302..03c040124cf 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/list.html.tmpl
@@ -42,11 +42,11 @@
      },
      {
        name => "enter_bug"
-       heading => "Editable on Bug Creation"
+       heading => "Editable on $terms.Bug Creation"
      },
      {
        name => "mailhead"
-       heading => "In Bugmail on Bug Creation"
+       heading => "In ${terms.Bug}mail on $terms.Bug Creation"
      },
      {
        name => "obsolete"
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/keywords/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/keywords/list.html.tmpl
index 1ffa0f27d14..90b079fc460 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/keywords/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/keywords/list.html.tmpl
@@ -48,7 +48,7 @@
      },
      { 
        name => "bug_count"
-       heading => "Bugs"
+       heading => "$terms.Bugs"
        align => "right"
        contentlink => "buglist.cgi?keywords=%%name%%"
      },
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/users/userdata.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/users/userdata.html.tmpl
index f495eb0f197..e7afe66bbe8 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/users/userdata.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/users/userdata.html.tmpl
@@ -64,12 +64,12 @@
     </td>
   </tr>
   <tr>
-    <th><label for="disable_mail">Bugmail Disabled:</label></th>
+    <th><label for="disable_mail">[% terms.Bug %]mail Disabled:</label></th>
     <td>
       <input type="checkbox" name="disable_mail" id="disable_mail" value="1" 
       [% IF otheruser.email_disabled %] checked="checked" [% END %] />
-      (This affects bugmail and whinemail, not password-reset or other 
-      non-bug-related emails)
+      (This affects [% terms.bug %]mail and whinemail, not password-reset or other 
+      non-[% terms.bug %]-related emails)
     </td>
   </tr>
   <tr>
diff --git a/mozilla/webtools/bugzilla/template/en/default/email/newchangedmail.txt.tmpl b/mozilla/webtools/bugzilla/template/en/default/email/newchangedmail.txt.tmpl
index ba24dc1dd26..1bca350ee54 100644
--- a/mozilla/webtools/bugzilla/template/en/default/email/newchangedmail.txt.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/email/newchangedmail.txt.tmpl
@@ -43,7 +43,7 @@ X-Bugzilla-Changed-Fields: [% changedfields %]
 [%+ diffs %]
 
 -- 
-Configure bugmail: [% urlbase %]userprefs.cgi?tab=email
+Configure [% terms.bug %]mail: [% urlbase %]userprefs.cgi?tab=email
 ------- You are receiving this mail because: -------
 [% FOREACH relationship = reasons %]
   [% SWITCH relationship %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
index 702bc8badfe..11fe0733c57 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
@@ -68,9 +68,9 @@
               The disable text has been modified.
             [% ELSIF field == 'disable_mail' %]
               [% IF otheruser.email_disabled %]
-                Bugmail has been disabled.
+                [% terms.Bug %]mail has been disabled.
               [% ELSE %]
-                Bugmail has been enabled.
+                [% terms.Bug %]mail has been enabled.
               [% END %]
             [% END %]
           </li>
diff --git a/mozilla/webtools/bugzilla/template/en/default/reports/chart.png.tmpl b/mozilla/webtools/bugzilla/template/en/default/reports/chart.png.tmpl
index 119ff344f2d..a3933e4b71e 100644
--- a/mozilla/webtools/bugzilla/template/en/default/reports/chart.png.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/reports/chart.png.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% y_label = "Bugs" %]
+[% y_label = "$terms.Bugs" %]
 [% x_label = "Time" %]
 
 [% IF chart.cumulate %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/reports/report-simple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/reports/report-simple.html.tmpl
index 04db73b76fd..9ef8638353d 100644
--- a/mozilla/webtools/bugzilla/template/en/default/reports/report-simple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/reports/report-simple.html.tmpl
@@ -22,7 +22,7 @@
 
 <html>
 
-  [% title = "Bug List" %]
+  [% title = "$terms.Bug List" %]
 
   <head>
     <title>[% title FILTER html %]</title>