From 57584dc4744fea59833ef355f7513690d246c70f Mon Sep 17 00:00:00 2001
From: David Lawrence <dlawrence@mozilla.com>
Date: Tue, 4 Oct 2011 18:25:23 -0400
Subject: more porting work

---
 template/en/default/pages/fields.html.tmpl | 61 +++++++++++++++++-------------
 1 file changed, 34 insertions(+), 27 deletions(-)

(limited to 'template/en/default/pages/fields.html.tmpl')

diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
index 2794e1cc4..568245653 100644
--- a/template/en/default/pages/fields.html.tmpl
+++ b/template/en/default/pages/fields.html.tmpl
@@ -62,34 +62,41 @@
         </dt>
         <dd class="unconfirmed">
           This [% terms.bug %] has recently been added to the database. 
-          Nobody has confirmed that this [% terms.bug %] is valid. Users
+          Nobody has validated that this [% terms.bug %] is true. Users
           who have the "canconfirm" permission set may confirm
-          this [% terms.bug %], changing its state to 
-          <b>[% display_value("bug_status", "CONFIRMED") FILTER html %]</b>. 
-          Or, it may be directly resolved and marked
+          this [% terms.bug %], changing its state to [% display_value("bug_status", "NEW") FILTER html %]. Or, it may be
+          directly resolved and marked [% display_value("bug_status", "RESOLVED") FILTER html %].
+        </dd>
+        <dt>
+          <b>[% display_value("bug_status", "NEW") FILTER html %]</b>
+        </dt>
+        <dd>
+          This [% terms.bug %] has recently been added to the assignee's
+          list of [% terms.bugs %] and must be processed. [% terms.Bugs %] in
+          this state may be accepted, and become <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b>, passed
+          on to someone else, and remain <b>[% display_value("bug_status", "NEW") FILTER html %]</b>, or resolved and marked
           <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
         </dd>
 
-        <dt class="confirmed">
-          [% display_value("bug_status", "CONFIRMED") FILTER html %]
+        <dt>
+          <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b>
         </dt>
-        <dd class="confirmed">
-          This [% terms.bug %] is valid and has recently been filed.
-          [%+ terms.Bugs %] in this state become 
-          <b>[% display_value("bug_status", "IN_PROGRESS") FILTER html %]</b>
-          when somebody is working on them, or become resolved and marked
-          <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
+        <dd>
+          This [% terms.bug %] is not yet resolved, but is assigned to the 
+          proper person. From here [% terms.bugs %] can be given to another 
+          person and become <b>[% display_value("bug_status", "NEW") FILTER html %]</b>, or
+          resolved and become <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
         </dd>
 
-        <dt class="in_progress">
-          [% display_value("bug_status", "IN_PROGRESS") FILTER html %]
+        <dt>
+          <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b>
         </dt>
-        <dd class="in_progress">
-          This [% terms.bug %] is not yet resolved, but is assigned to the
-          proper person who is working on the [% terms.bug %]. From here,
-          [%+ terms.bugs %] can be given to another person and become
-          <b>[% display_value("bug_status", "CONFIRMED") FILTER html %]</b>, or
-          resolved and become 
+        <dd>
+          This [% terms.bug %] was once resolved, but the resolution was 
+          deemed incorrect. For example, a <b>[% display_value("resolution", "WORKSFORME") FILTER html %]</b> [% terms.bug %] is
+          <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b> when more information shows up and
+          the [% terms.bug %] is now reproducible. From here [% terms.bugs %] are
+          either marked <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b> or
           <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
         </dd>
         
@@ -124,9 +131,10 @@
           [% display_value("bug_status", "VERIFIED") FILTER html %]
         </dt>
         <dd class="verified">
-          QA has looked at the [% terms.bug %] and the resolution and
-          agrees that the appropriate resolution has been taken. This is
-          the final status for [% terms.bugs %].
+          QA has looked at the [% terms.bug %] and the resolution and 
+          agrees that the appropriate resolution has been taken.
+          Any zombie [% terms.bugs %] who choose to walk the earth again must 
+          do so by becoming <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b>.
         </dd>
         
         [% Hook.process('closed-status') %]
@@ -163,10 +171,9 @@
         </dt>
         <dd class="duplicate">
           The problem is a duplicate of an existing [% terms.bug %].
-          When [% terms.abug %] is marked as a
-          <b>[% display_value("resolution", "DUPLICATE") FILTER html %]</b>,
-          you will see which [% terms.bug %] it is a duplicate of,
-          next to the resolution.
+          Marking [% 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>
 
         <dt class="worksforme">
-- 
cgit v1.2.3-24-g4f1b