Index: admin/custom_fields/create.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/create.html.tmpl,v
retrieving revision 1.7
diff -pU1 -r1.7 admin/custom_fields/create.html.tmpl
--- admin/custom_fields/create.html.tmpl
+++ admin/custom_fields/create.html.tmpl
@@ -74,3 +74,3 @@
       <th align="right">
-        <label for="new_bugmail">Displayed in [% terms.bug %]mail for new [% terms.bugs %]:</label>
+        <label for="new_bugmail">Displayed in [% terms.bugmail %] for new [% terms.bugs %]:</label>
       </th>
Index: admin/custom_fields/edit.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/edit.html.tmpl,v
retrieving revision 1.5
diff -pU1 -r1.5 admin/custom_fields/edit.html.tmpl
--- admin/custom_fields/edit.html.tmpl
+++ admin/custom_fields/edit.html.tmpl
@@ -64,3 +64,3 @@
       <th align="right">
-        <label for="new_bugmail">Displayed in [% terms.bug %]mail for new [% terms.bugs %]:</label>
+        <label for="new_bugmail">Displayed in [% terms.bugmail %] for new [% terms.bugs %]:</label>
       </th>
Index: admin/users/userdata.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/admin/users/userdata.html.tmpl,v
retrieving revision 1.10
diff -pU1 -r1.10 admin/users/userdata.html.tmpl
--- admin/users/userdata.html.tmpl
+++ admin/users/userdata.html.tmpl
@@ -74,3 +74,3 @@
   <tr>
-    <th><label for="disable_mail">[% terms.Bug %]mail Disabled:</label></th>
+    <th><label for="disable_mail">[% terms.Bugmail %] Disabled:</label></th>
     <td>
@@ -78,3 +78,3 @@
       [% IF otheruser.email_disabled %] checked="checked" [% END %] />
-      (This affects [% terms.bug %]mail and whinemail, not password-reset or other 
+      (This affects [% terms.bugmail %] and whinemail, not password-reset or other 
       non-[% terms.bug %]-related emails)
Index: email/newchangedmail.txt.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/email/newchangedmail.txt.tmpl,v
retrieving revision 1.8
diff -pU1 -r1.8 email/newchangedmail.txt.tmpl
--- email/newchangedmail.txt.tmpl
+++ email/newchangedmail.txt.tmpl
@@ -45,3 +45,3 @@ X-Bugzilla-Changed-Fields: [% changedfie
 -- 
-Configure [% terms.bug %]mail: [% urlbase %]userprefs.cgi?tab=email
+Configure [% terms.bugmail %]: [% urlbase %]userprefs.cgi?tab=email
 ------- You are receiving this mail because: -------
Index: global/messages.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl,v
retrieving revision 1.58
diff -pU1 -r1.58 global/messages.html.tmpl
--- global/messages.html.tmpl
+++ global/messages.html.tmpl
@@ -70,5 +70,5 @@
               [% IF otheruser.email_disabled %]
-                [% terms.Bug %]mail has been disabled.
+                [% terms.Bugmail %] has been disabled.
               [% ELSE %]
-                [% terms.Bug %]mail has been enabled.
+                [% terms.Bugmail %] has been enabled.
               [% END %]
Index: global/variables.none.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/variables.none.tmpl,v
retrieving revision 1.4
diff -pU1 -r1.4 global/variables.none.tmpl
--- global/variables.none.tmpl
+++ global/variables.none.tmpl
@@ -51,2 +51,4 @@
   "Bugs" => "Bugs",
+  "bugmail" => "bugmail",
+  "Bugmail" => "Bugmail",
   "zeroSearchResults" => "Zarro Boogs found",