6 files changed, 15 insertions, 15 deletions
diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl
index 09dfafd1f..239d7f984 100644
--- a/template/en/default/admin/groups/create.html.tmpl
+++ b/template/en/default/admin/groups/create.html.tmpl
@@ -50,7 +50,7 @@
 
 <p><b>Name</b> is what is used with the UserInGroup() function in any
 customized cgi files you write that use a given group.  It can also be used
-by people submitting [% terms.bugs %] by email to limit a [% terms.bug %] to
+by people submitting [% terms.bugs %] by email to limit [% terms.abug %] to
 a certain set of groups. It may not contain any spaces.</p>
 
 <p><b>Description</b> is what will be shown in the [% terms.bug %] reports
diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl
index b020e49ac..0a4c20927 100644
--- a/template/en/default/bug/activity/table.html.tmpl
+++ b/template/en/default/bug/activity/table.html.tmpl
@@ -39,7 +39,7 @@
 
 [% IF incomplete_data %]
   <p>
-    There used to be a [% terms.bug %] in [% terms.Bugzilla %] which caused activity data
+    There used to be [% terms.abug %] 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 [% terms.bug %] that
     could not be regenerated.  The changes that the script could not
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index b8ea79826..605d811f6 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -79,7 +79,7 @@ function addSidebar() {
   <form name="f" action="show_bug.cgi" method="get"
       onsubmit="QuickSearch(f.id.value); return false;">
   <p>
-  Enter a [% terms.bug %] # or some search terms:<br>
+  Enter [% terms.abug %] # or some search terms:<br>
   <input type="text" name="id">
   <input type="submit" value="Show">
   <a href="quicksearch.html">[Help]</a>
diff --git a/template/en/default/pages/bug-writing.html.tmpl b/template/en/default/pages/bug-writing.html.tmpl
index 1a228b0c4..c007b043b 100644
--- a/template/en/default/pages/bug-writing.html.tmpl
+++ b/template/en/default/pages/bug-writing.html.tmpl
@@ -31,7 +31,7 @@
 <h3>Why You Should Read This</h3>
 
 <blockquote>
-  <p>Simply put, the more effectively you report a [% terms.bug %], the more
+  <p>Simply put, the more effectively you report [% terms.abug %], the more
   likely an
   engineer will actually fix it.</p>
 
@@ -57,7 +57,7 @@
 
     <li><b>Specific.</b> The quicker the engineer can isolate the 
     [% terms.bug %] to a specific area, the more likely she'll expediently 
-    fix it. (If a programmer or tester has to decypher a [% terms.bug %], 
+    fix it. (If a programmer or tester has to decipher [% terms.abug %], 
     they may spend more time cursing the submitter than solving the 
     problem.)<br>
     <br>
@@ -163,7 +163,7 @@
     <p><b>Assigned To: Which engineer should be responsible for fixing
     this [% terms.bug %]?</b><br>
     [% terms.Bugzilla %] will automatically assign the [% terms.bug %] to a
-    default engineer upon submitting a [% terms.bug %] report. If you'd prefer
+    default engineer upon submitting [% terms.abug %] report. If you'd prefer
     to directly assign the [% terms.bug %] to someone else, enter their e-mail
     address into this field. (To see the list of default engineers for each
     component, click on the Component link.)</p>
@@ -181,7 +181,7 @@
   <blockquote>
     <p><b>Summary:</b> <b>How would you describe the [% terms.bug %], in 
     approximately 60 or fewer characters?</b><br>
-     A good summary should <b>quickly and uniquely identify a [% terms.bug %]
+     A good summary should <b>quickly and uniquely identify [% terms.abug %]
     report</b>. Otherwise, an engineer cannot meaningfully identify your
     [% terms.bug %] by its summary, and will often fail to pay attention to 
     your [% terms.bug %] report when skimming through a 10 
@@ -323,7 +323,7 @@ PowerPC unmapped memory exception at 0B512BD0 NSGetFactory+055F0
     mix a handful of [% terms.bugs %] into a single report, the right people 
     probably won't discover your [% terms.bugs %] in a timely fashion, or at 
     all. Certain [% terms.bugs %] are also more important than others. It's 
-    impossible to prioritize a [% terms.bug %] report when
+    impossible to prioritize [% terms.abug %] report when
     it contains four different issues, all of differing importance.</p>
 
     <p><b>No [% terms.bug %] is too trivial to report.</b> Unless you're 
diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
index caec210b8..a6c9842e6 100644
--- a/template/en/default/pages/fields.html.tmpl
+++ b/template/en/default/pages/fields.html.tmpl
@@ -25,7 +25,7 @@
 
 <p>
 The <b>status</b> and <b>resolution</b> fields define and track the life
-cycle of a [% terms.bug %].  
+cycle of [% terms.abug %].  
 </p>
 
 <a name="status"></a>
@@ -130,17 +130,17 @@ cycle of a [% terms.bug %].
 
         <dt><b>INVALID</b></dt>
 
-        <dd>The problem described is not a [% terms.bug %]</dd>
+        <dd>The problem described is not [% terms.abug %]</dd>
 
         <dt><b>WONTFIX</b></dt>
 
-        <dd>The problem described is a [% terms.bug %] which will never be 
+        <dd>The problem described is [% terms.abug %] which will never be 
         fixed.</dd>
 
         <dt><b>DUPLICATE</b></dt>
 
         <dd>The problem is a duplicate of an existing [% terms.bug %]. Marking 
-        a [% terms.bug %] duplicate requires the [% terms.bug %]# of the 
+        [% terms.abug %] duplicate requires the [% terms.bug %]# of the 
         duplicating [% terms.bug %] and will at least put that [% terms.bug %] 
         number in the description field.</dd>
 
@@ -162,7 +162,7 @@ cycle of a [% terms.bug %].
 </table>
 
 <h2><a name="bug_severity">Severity</a></h2>
-This field describes the impact of a [% terms.bug %]. 
+This field describes the impact of [% terms.abug %]. 
 
 <table>
   <tr>
@@ -204,7 +204,7 @@ This field describes the impact of a [% terms.bug %].
 </table>
 
 <h2><a name="priority">Priority</a></h2>
-This field describes the importance and order in which a [% terms.bug %]
+This field describes the importance and order in which [% terms.abug %]
 should be fixed. This field is utilized by the
 programmers/engineers to prioritize their work to be done. The
 available priorities range from <b>P1</b> (most important) to 
diff --git a/template/en/default/pages/voting.html.tmpl b/template/en/default/pages/voting.html.tmpl
index 2e555b1ce..f1d768307 100644
--- a/template/en/default/pages/voting.html.tmpl
+++ b/template/en/default/pages/voting.html.tmpl
@@ -42,7 +42,7 @@ a little for many [% terms.bugs %], or vote a lot for a few [% terms.bugs %].
   have at least one vote.</li>
 </ul>
 
-<p>To vote for a [% terms.bug %]:</p>
+<p>To vote for [% terms.abug %]:</p>
 
 <ul>
   <li>Bring up the [% terms.bug %] in question.</li>