more porting work

30 files changed, 689 insertions, 221 deletions

diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 39984aeaf..14efbc367 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -73,8 +73,8 @@
             id="log_in[% qs_suffix %]">
     <script type="text/javascript">
       mini_login_constants = {
-          "login" : "login",
-          "warning" : "You must set the login and password before logging in."
+          "login" : "email address",
+          "warning" : "You must set the email address and password before logging in."
       };
       [%# We need this event to fire after autocomplete, because it does
         # something different depending on whether or not there's already
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 80dd12153..f11c33cdc 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -37,14 +37,14 @@
 [% USE Bugzilla %]
 
 <p>
-  I need a legitimate login and password to continue.
+  I need an email address and password to continue.
 </p>
 
 <form name="login" action="[% target FILTER html %]" method="POST"
 [%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]>
   <table>
     <tr>
-      <th align="right"><label for="Bugzilla_login">Login:</label></th>
+      <th align="right"><label for="Bugzilla_login">Email Address:</label></th>
       <td>
         <input size="35" id="Bugzilla_login" name="Bugzilla_login">
         [% Param('emailsuffix') FILTER html %]
@@ -64,7 +64,7 @@
         <td>
           <input type="checkbox" id="Bugzilla_remember" name="Bugzilla_remember" value="on"
                  [%+ "checked" IF Param('rememberlogin') == "defaulton" %]>
-          <label for="Bugzilla_remember">Remember my Login</label>
+          <label for="Bugzilla_remember">Remember my email address</label>
         </td>
       </tr>
     [% END %]
@@ -110,7 +110,7 @@
     <form id="forgot" method="get" action="token.cgi">
       <input type="hidden" name="a" value="reqpw">
       If you have an account, but have forgotten your password,
-      enter your login name below and submit a request
+      enter your email address below and submit a request
       to change your password.<br>
       <input size="35" name="loginname">
       <input type="submit" id="request" value="Reset Password">
diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl
index 5e8dc9ca2..d3c787b07 100644
--- a/template/en/default/account/prefs/permissions.html.tmpl
+++ b/template/en/default/account/prefs/permissions.html.tmpl
@@ -65,9 +65,9 @@
         There are no permission bits set on your account.
       [% END %]
 
-      [% IF user.in_group('editusers') %]
+      [% IF user.in_group('admin') %]
         <br>
-        You have editusers privileges.  You can turn on and off
+        You have admin privileges.  You can turn on and off
         all permissions for all users.
       [% ELSIF set_bits.size %]
         <br>
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index a8e8a297b..0ba40b375 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -78,4 +78,7 @@
     _ " use the <code>http://user:pass@proxy_url/</code> syntax.",
 
   strict_transport_security => sts_desc,
+
+  disable_bug_updates =>
+    "When enabled, all updates to $terms.bugs will be blocked.",
 } %]
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl
index 5b04382b6..96ca587d2 100644
--- a/template/en/default/attachment/createformcontents.html.tmpl
+++ b/template/en/default/attachment/createformcontents.html.tmpl
@@ -54,6 +54,7 @@
   <th>Content Type:</th>
   <td>
     <em>If the attachment is a patch, check the box below.</em><br>
+    [% Hook.process("patch_notes") %]
     <input type="checkbox" id="ispatch" name="ispatch" value="1"
            onchange="setContentTypeDisabledState(this.form);">
     <label for="ispatch">patch</label><br><br>
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 208ea092a..a6a2867bb 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -25,6 +25,37 @@
 <script src="[% 'js/comments.js' FILTER mtime %]" type="text/javascript">
 </script>
 
+<script type="text/javascript">
+<!--
+  /* Adds the reply text to the `comment' textarea */
+  function replyToComment(id, real_id, name) {
+      var prefix = "(In reply to " + name + " from comment #" + id + ")\n";
+      var replytext = "";
+      [% IF user.settings.quote_replies.value == 'quoted_reply' %]
+        /* pre id="comment_name_N" */
+        var text_elem = document.getElementById('comment_text_'+id);
+        var text = getText(text_elem);
+        replytext = prefix + wrapReplyText(text);
+      [% ELSIF user.settings.quote_replies.value == 'simple_reply' %]
+        replytext = prefix;
+      [% END %]
+
+      [% IF user.is_insider %]
+        if (document.getElementById('isprivate_' + real_id).checked) {
+            document.getElementById('newcommentprivacy').checked = 'checked';
+            updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment'); 
+        }
+      [% END %]
+
+      /* <textarea id="comment"> */
+      var textarea = document.getElementById('comment');
+      textarea.value += replytext;
+
+      textarea.focus();
+  } 
+//-->
+</script>
+
 [% DEFAULT start_at = 0 mode = "show" %]
 [% sort_order = user.settings.comment_sort_order.value %]
 
@@ -52,6 +83,8 @@
     [% END %]
 [% END %]
 
+[% Hook.process("comment_banner") %]
+
 <!-- This auto-sizes the comments and positions the collapse/expand links 
      to the right. -->
 <table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
@@ -65,14 +98,6 @@
   [% count = count + increment %]
 [% END %]
 
-[% IF user.settings.comment_box_position.value == "before_comments" && user.id %]
-  <div class="bz_add_comment">
-    <a href="#" 
-       onclick="return goto_add_comments();">
-       Add Comment</a>
-  </div>
-[% END %]
-
 [%# Note: this template is used in multiple places; if you use this hook,
   # make sure you are aware of this fact.
   #%]  
@@ -86,11 +111,6 @@
                                return false;">Collapse All Comments</a></li>
       <li><a href="#" onclick="toggle_all_comments('expand');
                                return false;">Expand All Comments</a></li>
-      [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
-        <li class="bz_add_comment"><a href="#" 
-            onclick="return goto_add_comments('bug_status_bottom');">
-            Add Comment</a></li>
-      [% END %]                               
     </ul>
   [% END %]
 </td>
@@ -120,8 +140,12 @@
 
         [% IF mode == "edit" %]
           <span class="bz_comment_actions">
+            [<a class="bz_reply_link" href="#add_comment"
+              [% IF user.settings.quote_replies.value != 'off' %]
+                onclick="replyToComment('[% count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
+              [% END %]
+            >reply</a>]
             <script type="text/javascript"><!--
-              addReplyLink([% count %], [% comment.id %]);
               addCollapseLink([% count %]); // -->
             </script>
           </span>
@@ -148,6 +172,7 @@
 
         <span class="bz_comment_user">
           [% INCLUDE global/user.html.tmpl who = comment.author %]
+          [% Hook.process('user', 'bug/comments.html.tmpl') %]
         </span>
 
         <span class="bz_comment_user_images">
diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl
index df04d8fb5..67748e594 100644
--- a/template/en/default/bug/create/comment-guided.txt.tmpl
+++ b/template/en/default/bug/create/comment-guided.txt.tmpl
@@ -41,7 +41,7 @@ Steps to Reproduce:
 [%+ cgi.param("reproduce_steps") %]
 [% END %]
 
-[% IF cgi.param("actual_results") -%]
+[% IF cgi.param("actual_results") %]
 Actual Results:  
 [%+ cgi.param("actual_results") %]
 [% END %]
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index d10314628..43437bcd7 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -31,22 +31,12 @@
 [% PROCESS global/header.html.tmpl
    title = "Enter $terms.ABug"
    onload = "PutDescription()"
-   style = "#somebugs { width: 100%; height: 500px }"
+   style_urls = [ "skins/standard/guided.css" ]
  %]
 
 [% style = "" %]
 
-<p>
-  <font color="red">
-    This is a template used on mozilla.org.  This template, and the
-    comment-guided.txt.tmpl template that formats the data submitted via 
-    the form in this template, are included as a demo of what it's
-    possible to do with custom templates in general, and custom [% terms.bug %]
-    entry templates in particular. As much of the text will not apply, 
-    you should alter it 
-    if you want to use this form on your [% terms.Bugzilla %] installation.
-  </font>
-</p>
+[% INCLUDE 'bug/create/user-message.html.tmpl' %]
 
 [% tablecolour = "#FFFFCC" %]
 
@@ -80,15 +70,15 @@ function PutDescription() {
 
 [%# Include other products if sensible %]
 [% IF product.name == "Firefox" %]
-  [% productstring = "product=Mozilla%20Application%20Suite&amp;product=Firefox" %]
+  [% productstring = "product=Toolkit&amp;product=Core&amp;product=Firefox" %]
 [% ELSIF product.name == "Thunderbird" %]
-  [% productstring = "product=Mozilla%20Application%20Suite&amp;product=Thunderbird" %]
+  [% productstring = "product=MailNews%20Core&amp;product=Thunderbird" %]
 [% ELSE %]
   [% productstring = BLOCK %]product=[% product.name FILTER uri %][% END %]
 [% END %]
 
 <p>
-    <a href="duplicates.cgi?[% productstring %]&amp;format=simple" target="somebugs">All-time Top 100</a> (loaded initially) |
+    <a href="duplicates.cgi?[% productstring %]&amp;format=simple" target="somebugs">All-time Top 20</a> (loaded initially) |
     <a href="duplicates.cgi?[% productstring %]&amp;format=simple&amp;sortby=delta&amp;reverse=1&amp;maxrows=100&amp;changedsince=14" target="somebugs">Hot in the last two weeks</a>  
 </p>
 
@@ -112,14 +102,14 @@ function PutDescription() {
     <input type="hidden" name="product" value="[% product.name FILTER html %]">
     [% IF product.name == "Firefox" OR 
           product.name == "Thunderbird" OR 
-          product.name == "Mozilla Application Suite" OR
+          product.name == "SeaMonkey" OR
           product.name == "Camino" %]
       <input type="hidden" name="product" value="Core">
       <input type="hidden" name="product" value="Toolkit">
-      <input type="hidden" name="product" value="PSM">
       <input type="hidden" name="product" value="NSPR">
       <input type="hidden" name="product" value="NSS">
-    [% END %]      
+      <input type="hidden" name="product" value="MailNews Core">
+    [% END %]
     <input type="hidden" name="chfieldfrom" value="-6m">
     <input type="hidden" name="chfieldto" value="Now">
     <input type="hidden" name="chfield" value="[Bug creation]">
@@ -215,7 +205,7 @@ function PutDescription() {
 
   [%# We override rep_platform and op_sys for simplicity. The values chosen
       are based on which are most common in the b.m.o database %]
-  [% rep_platform = [ "PC", "Macintosh", "All", "Other" ] %]
+  [% rep_platform = [ "x86", "x86_64", "PowerPC", "All", "Other" ] %]
 
   <tr bgcolor="[% tablecolour %]">
     <td align="right" valign="top">
@@ -238,7 +228,7 @@ function PutDescription() {
     </td>
   </tr>
 
-  [% IF product.name.match("Firefox|Camino|Mozilla Application Suite") %]
+  [% IF product.name.match("Firefox|Camino|SeaMonkey") %]
     [% matches = cgi.user_agent('Gecko/(\d+)') %]
     [% buildid = cgi.user_agent() IF matches %]
   [% END %]
@@ -257,8 +247,8 @@ function PutDescription() {
       <p>
         This should identify the exact version of the product you were using.  
         If the above field is blank or you know it is incorrect, copy the 
-        version text from the product's Help | 
-        About menu (for browsers this will begin with "Mozilla/5.0...").  
+        user agent text from the product's Help | Troubleshooting Information menu 
+        (for browsers this will begin with "Mozilla/5.0..."). 
         If the product won't start, instead paste the complete URL you downloaded 
         it from.
       </p>
@@ -275,7 +265,7 @@ function PutDescription() {
         URL that demonstrates the problem you are seeing (optional).<br>
         <b>IMPORTANT</b>: if the problem is with a broken web page, you need
         to report it
-        <a href="https://bugzilla.mozilla.org/page.cgi?id=broken-website.html">a different way</a>.
+        <a href="http://input.mozilla.com/feedback">a different way</a>.
       </p>
    </td>
   </tr>
@@ -418,10 +408,7 @@ function PutDescription() {
       %]
       <p>
         Add any additional information you feel may be
-        relevant to this [% terms.bug %], such as the <b>theme</b> you were
-        using (does the [% terms.bug %] still occur
-        with the default theme?), a 
-        <b><a href="http://kb.mozillazine.org/Quality_Feedback_Agent">Talkback crash ID</a></b>, or special
+        relevant to this [% terms.bug %], such as special
         information about <b>your computer's configuration</b>. Any information
         longer than a few lines, such as a <b>stack trace</b> or <b>HTML
         testcase</b>, should be added
@@ -431,13 +418,12 @@ function PutDescription() {
         into your URL bar.
         <br>
         <br>
-        If you are reporting a crash, note the module in
-        which the software crashed (e.g., <tt>Application Violation in
-        gkhtml.dll</tt>).
+        If you are reporting a crash, please <a href="https://developer.mozilla.org/En/How_to_get_a_stacktrace_for_a_bug_report
+">try and get a stack trace</a>, which tells us exactly where things went wrong.
       </p>
     </td>
   </tr>
-
+  
   <tr>
     <td valign="top" align="right">
       <b>Severity</b>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index ee19ab5d6..52f4c3cf4 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -59,12 +59,10 @@ var flags = new Array([% product.components.size %]);
     comp_desc[[% count %]] = "[% c.description FILTER html_light FILTER js %]";
     initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]";
     [% flag_list = [] %]
-    [% FOREACH f = c.flag_types.bug %]
-      [% NEXT UNLESS f.is_active %]
+    [% FOREACH f = c.flag_types(is_active=>1).bug %]
       [% flag_list.push(f.id) %]
     [% END %]
-    [% FOREACH f = c.flag_types.attachment %]
-      [% NEXT UNLESS f.is_active %]
+    [% FOREACH f = c.flag_types(is_active=>1).attachment %]
       [% flag_list.push(f.id) %]
     [% END %]
     flags[[% count %]] = [[% flag_list.join(",") FILTER js %]];
@@ -358,18 +356,17 @@ TUI_hide_default('attachment_text_field');
     %]
 
     <td rowspan="[% num_rows FILTER html %]">
-      [% IF product.flag_types.bug.size > 0 %]
+      [% IF product.flag_types(isactive=>1).bug.size > 0 %]
         [% display_flag_headers = 0 %]
         [% any_flags_requesteeble = 0 %]
 
-        [% FOREACH flag_type = product.flag_types.bug %]
-          [% NEXT UNLESS flag_type.is_active %]
+        [% FOREACH flag_type = product.flag_types(is_active=>1).bug %]
           [% display_flag_headers = 1 %]
           [% SET any_flags_requesteeble = 1 IF flag_type.is_requestable && flag_type.is_requesteeble %]
         [% END %]
 
         [% IF display_flag_headers %]
-          [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types.bug
+          [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types(is_active=>1).bug
                                            any_flags_requesteeble = any_flags_requesteeble
                                            flag_table_id = "bug_flags"
           %]
@@ -488,9 +485,11 @@ TUI_hide_default('attachment_text_field');
 
 <tbody>
   [% USE Bugzilla %]
-
+  
   [% FOREACH field = Bugzilla.active_custom_fields %]
     [% NEXT UNLESS field.enter_bug %]
+    [% NEXT IF cf_hidden_in_product(field.name, product.name, component.name) %]
+    
     [% SET value = ${field.name}.defined ? ${field.name} : "" %]
     <tr [% 'class="expert_fields"' IF !field.is_mandatory %]>
       [% INCLUDE bug/field.html.tmpl 
@@ -574,22 +573,6 @@ TUI_hide_default('attachment_text_field');
     </td>
   </tr>
 
-  [% IF user.is_insider %]
-    <tr class="expert_fields">
-      <th>&nbsp;</th>
-      <td colspan="3">
-        &nbsp;&nbsp;
-        <input type="checkbox" id="comment_is_private" name="comment_is_private"
-          [% ' checked="checked"' IF comment_is_private %]
-               onClick="updateCommentTagControl(this, 'comment')">
-        <label for="comment_is_private">
-          Make description and any new attachment private (visible only to members 
-          of the <strong>[% Param('insidergroup') FILTER html %]</strong> group)
-        </label>
-      </td>
-    </tr>
-  [% END %]
-
   [% IF Param("maxattachmentsize") %]
   <tr>
     <th>Attachment:</th>
@@ -605,10 +588,20 @@ TUI_hide_default('attachment_text_field');
           <legend>Add an attachment</legend>
           <table class="attachment_entry">
             [% PROCESS attachment/createformcontents.html.tmpl
-                       flag_types = product.flag_types.attachment
+                       flag_types = product.flag_types(is_active=>1).attachment
                        any_flags_requesteeble = 1
                        flag_table_id ="attachment_flags" %]
           </table>
+
+          [% IF user.is_insider %]
+            <input type="checkbox" id="comment_is_private" name="comment_is_private"
+                   [% ' checked="checked"' IF comment_is_private %]
+                   onClick="updateCommentTagControl(this, 'comment')">
+            <label for="comment_is_private">
+              Make this attachment and [% terms.bug %] description private (visible only 
+              to members of the <strong>[% Param('insidergroup') FILTER html %]</strong> group)
+            </label>
+          [% END %]
         </fieldset>
       </div>
     </td>
@@ -629,6 +622,13 @@ TUI_hide_default('attachment_text_field');
     [% END %]
 
     <tr>
+      <th>Status Whiteboard:</th>
+      <td colspan="3">
+        <input id="status_whiteboard" name="status_whiteboard" size="70"
+               value="[% status_whiteboard FILTER html %]">
+      </td>
+    </tr>
+    <tr>
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.dependson editable = 1
       %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index ab150dd31..b44d7c9b0 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -32,21 +32,13 @@
 
   <script type="text/javascript">
   <!--
-  
-  /* Outputs a link to call replyToComment(); used to reduce HTML output */
-  function addReplyLink(id, real_id) {
-      /* XXX this should really be updated to use the DOM Core's
-       * createElement, but finding a container isn't trivial.
-       */
-      [% IF user.settings.quote_replies.value != 'off' %]
-        document.write('[<a href="#add_comment" onclick="replyToComment(' + 
-                       id + ',' + real_id + '); return false;">reply<' + '/a>]');
-      [% END %]
-  }
-
   /* Adds the reply text to the `comment' textarea */
-  function replyToComment(id, real_id) {
-      var prefix = "(In reply to comment #" + id + ")\n";
+  function replyToComment(id, real_id, name) {
+      var prefix = "(In reply to ";
+      if (name) {
+          prefix = prefix + name + " from";
+      }
+      prefix = prefix + " comment #" + id + ")\n";
       var replytext = "";
       [% IF user.settings.quote_replies.value == 'quoted_reply' %]
         /* pre id="comment_name_N" */
@@ -57,12 +49,15 @@
         replytext = prefix;
       [% END %]
 
-    [% IF user.is_insider %]
-      if (document.getElementById('isprivate_' + real_id).checked) {
-          document.getElementById('newcommentprivacy').checked = 'checked';
-          updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment'); 
-      }
-    [% END %]
+      [% IF user.is_insider %]
+        if (document.getElementById('isprivate_' + real_id).checked) {
+            document.getElementById('newcommentprivacy').checked = 'checked';
+            updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment'); 
+        }
+      [% END %]
+    
+      /* Remove embedded links to attachment details */
+      replytext = replytext.replace(/(attachment\s+\d+)(\s+\[[^\[]+\])+/gi, '$1');
 
       /* <textarea id="comment"> */
       var textarea = document.getElementById('comment');
@@ -71,33 +66,6 @@
       textarea.focus();
   }
 
-  if (typeof Node == 'undefined') {
-      /* MSIE doesn't define Node, so provide a compatibility object */
-      window.Node = {
-          TEXT_NODE: 3,
-          ENTITY_REFERENCE_NODE: 5
-      };
-  }
-
-  /* Concatenates all text from element's childNodes. This is used
-   * instead of innerHTML because we want the actual text (and
-   * innerText is non-standard).
-   */
-  function getText(element) {
-      var child, text = "";
-      for (var i=0; i < element.childNodes.length; i++) {
-          child = element.childNodes[i];
-          var type = child.nodeType;
-          if (type == Node.TEXT_NODE || type == Node.ENTITY_REFERENCE_NODE) {
-              text += child.nodeValue;
-          } else {
-              /* recurse into nodes of other types */
-              text += getText(child);
-          }
-      }
-      return text;
-  }
-
 [% IF user.is_timetracker %]
   var fRemainingTime = [% bug.remaining_time %]; // holds the original value
   function adjustRemainingTime() {
@@ -116,7 +84,6 @@
       // if the remaining time is changed manually, update fRemainingTime
       fRemainingTime = document.changeform.remaining_time.value;
   }
-
 [% END %]
 
   /* Index all classifications so we can keep track of the classification
@@ -164,17 +131,26 @@
           [% PROCESS section_url_keyword_whiteboard %]
           
           [% PROCESS section_spacer %]
-          
-          [%# *** Dependencies *** %]
+
+          [%# *** Dependencies and duplicates *** %]
+          [% PROCESS section_duplicates %]
+
           [% PROCESS section_dependson_blocks %]
-          
+
+          [% IF user.id %]          
+            <tr>
+              <td colspan="2">
+                [% PROCESS commit_button id="_top"%]
+              </td>
+            </tr>
+          [% END %]
         </table>
       </td>
       <td>
         <div class="bz_column_spacer">&nbsp;</div>
       </td>
       [%# 2nd Column %]
-      <td id="bz_show_bug_column_2" class="bz_show_bug_column">
+      <td id="bz_show_bug_column_2" class="bz_show_bug_column_table" valign="top">
         <table cellpadding="3" cellspacing="1">
         [%# *** Reported and modified dates *** %]
          [% PROCESS section_dates %]
@@ -182,16 +158,16 @@
          [% PROCESS section_cclist %]
          
          [% PROCESS section_spacer %]
-
-         [% PROCESS section_see_also %] 
+                
+         [% PROCESS section_flags %]
          
-         [% PROCESS section_customfields %]
+         [% PROCESS section_see_also %] 
          
          [% PROCESS section_spacer %]
          
+         [% PROCESS section_customfields %]
+         
          [% Hook.process("after_custom_fields") %]
-                
-         [% PROCESS section_flags %]
 
         </table>
       </td>
@@ -220,6 +196,8 @@
 
     [% IF user.settings.comment_box_position.value == 'before_comments' %]
       [% PROCESS comment_box %]
+    [% ELSE %]
+      [% PROCESS summon_comment_box %]
     [% END %]
   </td>
   <td>
@@ -238,7 +216,10 @@
   [% IF user.settings.comment_box_position.value == 'after_comments' %]
     <hr>
     [% PROCESS comment_box %]
-  [% END %]        
+  [% ELSE %]
+    [% PROCESS summon_comment_box %]
+  [% END %]
+  
 
 </form>
 
@@ -249,7 +230,10 @@
 [% BLOCK section_title %]
   [%# That's the main table, which contains all editable fields. %]
   <div class="bz_alias_short_desc_container edit_form">
-      [% PROCESS commit_button id="_top"%]
+     <span class="last_comment_link">
+       <a href="#c[% bug.comments.size - 1 %]" 
+          accesskey="l"><b>L</b>ast Comment</a>
+     </span>      
      <a href="show_bug.cgi?id=[% bug.bug_id %]">
         [%-# %]<b>[% terms.Bug %]&nbsp;[% bug.bug_id FILTER html %]</b>
      [%-# %]</a> -<span id="summary_alias_container" class="bz_default_hidden"> 
@@ -408,6 +392,30 @@
       </span>
     </td>
   </tr>
+  [% IF Param('usestatuswhiteboard') %]
+    <tr>
+      <td class="field_label">
+        <label for="status_whiteboard" accesskey="w"><b><u>W</u>hiteboard</b></label>:
+      </td>
+      [% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %]
+    </tr>
+  [% END %]
+  
+  [% IF use_keywords %]
+    <tr>
+      <td class="field_label">
+        <label for="keywords" accesskey="k">
+          <b><a href="describekeywords.cgi"><u>K</u>eywords</a></b></label>:
+      </td>
+      <td class="field_value" colspan="2">
+        [% INCLUDE bug/field.html.tmpl
+           bug = bug, field = bug_fields.keywords, value = bug.keywords
+           editable = bug.check_can_change_field("keywords", 0, 1),
+           no_tds = 1
+        %]
+      </td>
+    </tr>
+  [% END %]
 [% END %]
 
 [%############################################################################%]
@@ -568,14 +576,17 @@
     <td>
       [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %]
         <span id="bz_url_edit_container" class="bz_default_hidden"> 
-        [% IF is_safe_url(bug.bug_file_loc) %]
-           <a href="[% bug.bug_file_loc FILTER html %]" target="_blank"
-              title="[% bug.bug_file_loc FILTER html %]">
-             [% bug.bug_file_loc FILTER truncate(40) FILTER html %]</a>
-        [% ELSE %]
-          [% bug.bug_file_loc FILTER html %]
-        [% END %]
-        (<a href="#" id="bz_url_edit_action">edit</a>)</span>
+          <a href="[% bug.bug_file_loc FILTER html %]" target="_blank"
+             title="[% bug.bug_file_loc FILTER html %]"
+             [% IF NOT is_safe_url(bug.bug_file_loc) %]
+               onclick="return confirm(
+                 'This is considered an unsafe URL and could possibly be harmful. '
+                  + 'The full URL is:\n\n[% bug.bug_file_loc FILTER js FILTER html %]\n\n'
+                  + 'Continue?')"
+             [% END %]>
+          [% bug.bug_file_loc FILTER truncate(40) FILTER html %]</a>
+          (<a href="#" id="bz_url_edit_action">edit</a>)
+        </span>
       [% END %]
       <span id="bz_url_input_area">
         [% url_output =  PROCESS input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %]
@@ -597,36 +608,34 @@
       [% END %]
     </td>
   </tr>
-  
-  [% IF Param('usestatuswhiteboard') %]
-    <tr>
-      <td class="field_label">
-        <label for="status_whiteboard" accesskey="w"><b><u>W</u>hiteboard</b></label>:
-      </td>
-      [% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %]
-    </tr>
-  [% END %]
-  
-  [% IF use_keywords %]
-    <tr>
-      <td class="field_label">
-        <label for="keywords" accesskey="k">
-          <b><a href="describekeywords.cgi"><u>K</u>eywords</a></b></label>:
-      </td>
-      <td class="field_value" colspan="2">
-        [% INCLUDE bug/field.html.tmpl
-           bug = bug, field = bug_fields.keywords, value = bug.keywords
-           editable = bug.check_can_change_field("keywords", 0, 1),
-           no_tds = 1
-        %]
-      </td>
-    </tr>
-  [% END %]
 [% END %]
 
 [%############################################################################%]
-[%# Block for Depends On / Blocks                                              #%]
+[%# Block for Duplicates                                                     #%]
 [%############################################################################%]
+
+[% BLOCK section_duplicates %]
+  [% RETURN UNLESS bug.duplicates.size %]
+  <tr>
+    <td class="field_label">
+      <label for="duplicates">Duplicates</label>:
+    </td>
+    <td class="field_value" colspan="2">
+      <span id="duplicates">
+        [% FOREACH dupe = bug.duplicates %]
+          [% dupe.id FILTER bug_link(dupe, use_alias => 1) FILTER none %][% " " %]
+        [% END %]
+      </span>
+      (<a href="buglist.cgi?bug_id=[% bug.duplicate_ids.join(",") FILTER html %]">
+       [%-%]view as [% terms.bug %] list</a>)
+    </td>
+  </tr>
+[% END %]
+
+[%############################################################################%]
+[%# Block for Depends On / Blocks                                            #%]
+[%############################################################################%]
+
 [% BLOCK section_dependson_blocks %]
   <tr>
     [% INCLUDE dependencies 
@@ -812,10 +821,18 @@
         [% IF user.id || bug.cc.size %]
           <span id="cc_edit_area_showhide_container" class="bz_default_hidden">
             (<a href="#" id="cc_edit_area_showhide">[% IF user.id %]edit[% ELSE %]show[% END %]</a>)
-          </span>
+          [% IF user.id %]
+            <div id="cc_list_num_users">
+              <ul class="cc_list_display"> 
+                [% FOREACH c = bug.cc %]
+                  <li>[% c FILTER email FILTER html %]</li>
+                [% END %]
+              </ul>
+            </div>
+          [% END %]
+        </span>
         [% END %]
         <div id="cc_edit_area">
-          <br>
           [% IF user.id %]
             <div>
               <div><label for="cc"><b>Add</b></label></div>
@@ -922,6 +939,8 @@
 [%# *** Custom Fields *** %]
   [% USE Bugzilla %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
+    [% NEXT IF NOT user.id AND field.value == "---" %]
+    [% NEXT IF cf_hidden_in_product(field.name, bug.product, bug.component, 1) %]
     <tr>
       [% PROCESS bug/field.html.tmpl value = bug.${field.name}
                                      editable = bug.check_can_change_field(field.name, 0, 1)
@@ -1127,6 +1146,21 @@
   </div>
 [% END %]
 
+[% BLOCK summon_comment_box %]
+<div id="comment_top_hat">
+  <script type="text/javascript">
+    function summonCommentBox() {
+        var commentbox = document.getElementById('add_comment');
+        document.getElementById('comment_top_hat').appendChild(commentbox);
+        document.getElementById('wave_wand').style.display = 'none';
+    }
+  </script>
+  <p id="wave_wand">
+    <a href="javascript:summonCommentBox()"><i>Summon comment box</i></a>
+  </p>
+</div>
+[% END %]
+
 [%############################################################################%]
 [%# Block for SELECT fields                                                  #%]
 [%############################################################################%]
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 323b4b6be..bb9c553e5 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -125,6 +125,30 @@
           [% END %]
           [% FOREACH legal_value = legal_values %]
             [% NEXT IF NOT legal_value.is_active AND NOT value.contains(legal_value.name).size %]
+          
+            [%# Purpose: hide field values from those who can't change them %]
+            [% IF field.name.match("^cf_blocking_") OR
+                  field.name.match("^cf_status_") OR
+                  field.name.match("^cf_tracking_") OR
+                  field.name == "resolution" %]
+              [% NEXT UNLESS bug.check_can_change_field(field.name, '---', legal_value.name) OR
+                             value.contains(legal_value.name).size %]
+            [% END %]
+            
+            [% IF field.name == "resolution" &&
+               legal_value.name != bug.resolution %]
+              [% r = legal_value.name %]
+              [% IF bug.user.canconfirm &&
+                    !(bug.user.canedit || bug.user.isreporter) %]
+                [% NEXT IF r != "WORKSFORME" && r != "INCOMPLETE" %]
+              [% END %]
+              [% IF bug.user.isreporter &&
+                    !(bug.user.canconfirm || bug.user.canedit) %]
+                [% NEXT IF r == "INCOMPLETE" %]
+              [% END %]
+              [% NEXT IF r == "EXPIRED" %]
+            [% END %]
+          
             <option value="[% legal_value.name FILTER html %]"
                     id="v[% legal_value.id FILTER html %]_
                         [%- field.name FILTER html %]"
diff --git a/template/en/default/bug/process/updates-disabled.html.tmpl b/template/en/default/bug/process/updates-disabled.html.tmpl
new file mode 100644
index 000000000..5ea84d476
--- /dev/null
+++ b/template/en/default/bug/process/updates-disabled.html.tmpl
@@ -0,0 +1,73 @@
+[%# 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
+  # the Mozilla Foundation.
+  # Portions created by the Initial Developer are Copyright (C) 2011
+  # the Initial Developer. All Rights Reserved.
+  #
+  # Contributor(s): Byron Jones <glob@mozilla.com>
+  #
+  #%]
+[% PROCESS global/variables.none.tmpl %]
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>[% terms.Bugzilla %] - [% terms.Bug %] Updates Temporarily Suspended</title>
+<style type="text/css">
+body {
+  margin: 2em;
+  background-color: #455372;
+  color: #fff;
+  font-family: verdana, sans-serif;
+  font-size: small;
+}
+a {
+  color: #fff;
+  text-decoration: underline;
+}
+#buggie {
+  float: left;
+}
+#content {
+  margin-left: 100px;
+  max-width: 600px;
+}
+</style>
+</head>
+<body>
+<img src="images/buggie.png" id="buggie" alt="buggie">
+<div id="content">
+<h1>[% terms.Bug %] Updates Temporarily Suspended</h1>
+
+<p>
+We are currently adding a field to [% terms.Bugzilla %].  This requires us to
+prevent updates to [% terms.bugs %] for the duration of the database schema
+change to add the field (usually 3 to 5 minutes).
+</p>
+
+<p>
+<b>You should be able to leave this page open, wait a minute or two, then hit
+reload or refresh in your browser</b> (and OK any request to re-send the form
+data) to complete your [% terms.bug %] change.  Once this maintenance is
+complete, your change will succeed and you won't get this page any more.
+</p>
+
+<p>
+Only updates to [% terms.bugs %] are being blocked by this page, any other
+activities in [% terms.Bugzilla %] are still fair game. <a href="index.cgi"
+target="_blank">Open [% terms.Bugzilla %] in a new tab/window</a> if you'd
+like, to continue working on other things while waiting.
+</p>
+</div>
+</body>
+</html>
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 33dde14a3..03ce294c5 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -180,6 +180,7 @@
     [% USE Bugzilla %]
     [% field_counter = 0 %]
     [% FOREACH field = Bugzilla.active_custom_fields %]
+        [% NEXT IF cf_hidden_in_product(field.name, bug.product, bug.component) %]
         [% field_counter = field_counter + 1 %]
         [%# Odd-numbered fields get an opening <tr> %]
         [% '<tr>' IF field_counter % 2 %]
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index dae207f26..cb323d229 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -20,8 +20,10 @@
   #
   #%]
 [% PROCESS bug/time.html.tmpl %]
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
 <?xml version="1.0" [% IF Param('utf8') %]encoding="UTF-8" [% END %]standalone="yes" ?>
-<!DOCTYPE bugzilla SYSTEM "[% urlbase FILTER html %]bugzilla.dtd">
+<!DOCTYPE bugzilla [% IF cgi.param('dtd') %][[% PROCESS pages/bugzilla.dtd.tmpl %]][% ELSE %]SYSTEM "[% urlbase FILTER xml %]page.cgi?id=bugzilla.dtd"[% END %]>
 
 <bugzilla version="[% constants.BUGZILLA_VERSION %]"
           urlbase="[% urlbase FILTER xml %]"
@@ -142,6 +144,7 @@
     [% ELSIF field == "see_also" %]
       [% val = val.name %]
     [% END %]
+    [% NEXT IF cf_hidden_in_product(field.name, bug.product, bug.component) %]
     <[% field %][% IF name != '' %] name="[% name FILTER xml %]"[% END -%]>
       [%- val FILTER xml %]</[% field %]>
   [% END %]
diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index 15f784ce8..d7b282776 100644
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -171,9 +171,8 @@
               [% IF show_flags %]
                 <bz:flag_types>
                   <Seq>
-                    [% flag_types = component.flag_types.bug.merge(component.flag_types.attachment) %]
+                    [% flag_types = component.flag_types(is_active=>1).bug.merge(component.flag_types(is_active=>1).attachment) %]
                     [% FOREACH flag_type = flag_types %]
-                      [% NEXT UNLESS flag_type.is_active %]
                       [% all_visible_flag_types.${flag_type.id} = flag_type %]
                       <li resource="[% escaped_urlbase %]flag.cgi?id=[% flag_type.id FILTER uri
                           %]&amp;name=[% flag_type.name FILTER uri %]" />
diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl
index 2d20aff7c..7c0bace4a 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -22,9 +22,15 @@
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 [% PROCESS "global/reason-descs.none.tmpl" %]
+[% show_new = isnew
+              && (to_user.settings.bugmail_new_prefix.value == 'on') %]
 
 [% isnew = bug.lastdiffed ? 0 : 1 %]
 
+[% UNLESS to_user.settings.product_chooser.value == 'full_product_chooser' %]
+Do not reply to this email.  You can add comments to this [% terms.bug %] at
+[% END %]
+
 [%+ PROCESS generate_diffs -%]
 
 [% FOREACH comment = new_comments %]
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index a7449883f..480197431 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -239,8 +239,7 @@
 
     [%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %]
     <link rel="search" type="application/opensearchdescription+xml"
-                       title="[% terms.Bugzilla %]" href="./search_plugin.cgi">
-    <link rel="shortcut icon" href="images/favicon.ico" >
+                       title="[% terms.BugzillaTitle %]" href="./search_plugin.cgi">
     [% Hook.process("additional_header") %]
   </head>
 
@@ -265,7 +264,7 @@
 <table border="0" cellspacing="0" cellpadding="0" id="titles">
 <tr>
     <td id="title">
-      <p>[% terms.Bugzilla %]
+      <p>[% terms.BugzillaTitle %]
       [% " &ndash; $header" IF header %]</p>
     </td>
 
diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index a0b11f048..52d1c9803 100644
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -52,6 +52,7 @@
    "email_format"                     => "Preferred email format",
    "html"                             => "HTML",
    "text_only"                        => "Text Only",
+   "bugmail_new_prefix"               => "Add 'New:' to subject line of email sent when a new $terms.bug is filed",
                    } 
 %]
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 35640b220..5310952f2 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1342,6 +1342,40 @@
        [% END %]
      </ul>
 
+  [% ELSIF error == "password_not_complex" %]
+     [% title = "Password Fails Requirements" %]
+     [% passregex = Param('password_complexity') %]
+     Password must contain at least one:
+     <ul>
+       [% IF passregex.search('letters') %]
+         <li>UPPERCASE letter</li>
+         <li>lowercase letter</li>
+       [% END %]
+       [% IF passregex.search('numbers') %]
+         <li>digit</li>
+       [% END %]
+       [% IF passregex.search('specialchars') %]
+         <li>special character</li>
+       [% END %]
+     </ul>
+
+  [% ELSIF error == "password_not_complex" %]
+     [% title = "Password Fails Requirements" %]
+     [% passregex = Param('password_complexity') %]
+     Password must contain at least one:
+     <ul>
+       [% IF passregex.search('letters') %]
+         <li>UPPERCASE letter</li>
+         <li>lowercase letter</li>
+       [% END %]
+       [% IF passregex.search('numbers') %]
+         <li>digit</li>
+       [% END %]
+       [% IF passregex.search('specialchars') %]
+         <li>special character</li>
+       [% END %]
+     </ul>
+
   [% ELSIF error == "product_access_denied" %]
     [% title = "Product Access Denied" %]
     Either the product 
diff --git a/template/en/default/global/user.html.tmpl b/template/en/default/global/user.html.tmpl
index df902b451..a6be5eee9 100644
--- a/template/en/default/global/user.html.tmpl
+++ b/template/en/default/global/user.html.tmpl
@@ -27,6 +27,9 @@
   [% FILTER collapse %]
     [% IF user.id %]
       <a class="email" href="mailto:[% who.email FILTER html %]"
+      [% IF user.in_group('editusers') || user.bless_groups.size > 0 %]
+         onclick="show_admin_username(event, [% who.id FILTER none %], '[% who.email FILTER js %]'); return false"
+      [% END %]
          title="[% who.identity FILTER html %]">
     [%- END -%]
     [% IF who.name %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 92e578e8f..7c7d99408 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -282,8 +282,9 @@
 
   [% USE Bugzilla %]
   [%# Show all legal values and all fields, ignoring visibility controls. %]
-  [% bug = 0 %]
+  [% bug = default.defined ? default : 0 %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
+    [% NEXT IF cf_hidden_in_product(field.name, one_product, components) %]
     <tr>
       [% PROCESS bug/field.html.tmpl value = dontchange
                                      editable = 1
@@ -427,6 +428,7 @@
     [% FOREACH r = resolutions %]
       [% NEXT IF !r %]
       [% NEXT IF r == "DUPLICATE" || r == "MOVED" %]
+      [% NEXT IF r == "EXPIRED" AND user.login != "gerv@mozilla.org" %]
       <option value="[% r FILTER html %]">[% display_value("resolution", r) FILTER html %]</option>
     [% END %]
   </select>
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 28540cdc0..4120fc228 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -42,10 +42,11 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
+[% url_filtered_title = title FILTER url_quote %]
 [% PROCESS global/header.html.tmpl
   title = title
   style = style
-  atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom" 
+  atomlink = "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom" 
   yui = [ 'autocomplete', 'calendar' ]
   javascript_urls = [ "js/util.js", "js/field.js" ]
   style_urls = [ "skins/standard/buglist.css" ]
@@ -197,7 +198,7 @@
         [% urlquerypart FILTER html %]&amp;ctype=csv&human=1">CSV</a> |
         <a href="buglist.cgi?
         [% urlquerypart FILTER html %]&amp;title=
-        [%- title FILTER html %]&amp;ctype=atom">Feed</a> |
+        [%- title FILTER url_quote %]&amp;ctype=atom">Feed</a> |
         <a href="buglist.cgi?
         [% urlquerypart FILTER html %]&amp;ctype=ics">iCalendar</a> |
         <a href="colchange.cgi?
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 2b266d4ce..c2964f17c 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -80,12 +80,15 @@
 [%############################################################################%]
 
 [% tableheader = BLOCK %]
-  <table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%">
+  <table class="bz_buglist sortable" cellspacing="0" cellpadding="4" width="100%">
+    <thead> 
     <tr class="bz_buglist_header bz_first_buglist_header">
       [% IF dotweak %]
       <th>&nbsp;</th>
       [% END %]
-      <th colspan="[% splitheader ? 2 : 1 %]" class="first-child">
+      <th colspan="[% splitheader ? 2 : 1 %]" class="first-child
+                   sortable_column_0
+                   sorted_[% lsearch(order_columns, 'bug_id') FILTER html %]">
         <a href="buglist.cgi?
                   [% urlquerypart FILTER html %]&amp;order=
                   [% PROCESS new_order id='bug_id' %]
@@ -100,7 +103,7 @@
         [% FOREACH id = displaycolumns %]
           [% NEXT UNLESS loop.count() % 2 == 0 %]
           [% column = columns.$id %]
-          [% PROCESS columnheader %]
+          [% PROCESS columnheader key=loop.count() %]
         [% END %]
 
         </tr><tr class="bz_buglist_header">
@@ -112,7 +115,7 @@
         [% FOREACH id = displaycolumns %]
           [% NEXT IF loop.count() % 2 == 0 %]
           [% column = columns.$id %]
-          [% PROCESS columnheader %]
+          [% PROCESS columnheader key=loop.count() %]
         [% END %]
 
       [% ELSE %]
@@ -125,10 +128,13 @@
       [% END %]
 
     </tr>
+    </thead>
 [% END %]
 
 [% BLOCK columnheader %]
-  <th colspan="[% splitheader ? 2 : 1 %]">
+  <th colspan="[% splitheader ? 2 : 1 %]"
+      class="sortable_column_[% key FILTER html %]
+             sorted_[% lsearch(order_columns, id) FILTER html %]">
     <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;order=
       [% PROCESS new_order %]
       [%-#%]&amp;query_based_on=
@@ -168,6 +174,7 @@
 
 [% tableheader %]
 
+<tbody class="sorttable_body">
 [% FOREACH bug = bugs %]
   [% count = loop.count() %]
 
@@ -193,7 +200,17 @@
 
     [% FOREACH column = displaycolumns %]
     <td [% 'style="white-space: nowrap"' IF NOT abbrev.$column.wrap %]
-        class="bz_[% column FILTER css_class_quote %]_column">
+        class="bz_[% column FILTER css_class_quote %]_column"
+        [% SWITCH column %]
+          [% CASE 'opendate' %]
+            sorttable_customkey="[% bug.opentime FILTER html %]"
+          [% CASE 'changeddate' %]
+            sorttable_customkey="[% bug.changedtime FILTER html %]"
+          [% CASE columns_sortkey.keys %]
+            [% SET sortkey = columns_sortkey.$column.${bug.$column} %]
+            sorttable_customkey="[% sortkey FILTER html %]"
+        [% END %]
+    >
       [% IF abbrev.$column.maxlength %]
         <span title="[%- display_value(column, bug.$column) FILTER html %]">
       [% END %]
@@ -228,6 +245,7 @@
   [% END %]
 
 [% END %]
+</tbody>
 
 </table>
 
diff --git a/template/en/default/pages/bugzilla.dtd.tmpl b/template/en/default/pages/bugzilla.dtd.tmpl
new file mode 100644
index 000000000..f7fc1b4ad
--- /dev/null
+++ b/template/en/default/pages/bugzilla.dtd.tmpl
@@ -0,0 +1,179 @@
+[%# 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): Dawn Endico <endico@mozilla.org>
+  #                 Dave Miller <justdave@syndicomm.com>
+  #                 Bradley Baetz <bbaetz@student.usyd.edu.au>
+  #                 Myk Mylez <myk@mozilla.org>
+  #                 Colin Ogilvie <mozilla@colinogilvie.co.uk>
+  #                 Joel Peshkin <bugreport@peshkin.net>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #                 Gervase Markham <gerv@gerv.net>
+  #                 Max Kanat-Alexander <mkanat@bugzilla.org>
+  #                 David Lawrence <dkl@mozilla.com>
+  #
+  #%]
+[% USE Bugzilla %]
+<!ELEMENT [% "bugzilla" %] (bug+)>
+<!ATTLIST [% "bugzilla" %] 
+          version CDATA #REQUIRED
+          urlbase CDATA #REQUIRED
+          maintainer CDATA #REQUIRED
+          exporter CDATA #IMPLIED
+>
+<!ELEMENT [% "bug" %] (bug_id, 
+               (alias?, 
+                creation_ts, 
+                short_desc, 
+                delta_ts, 
+                reporter_accessible, 
+                cclist_accessible, 
+                classification_id, 
+                classification, 
+                product, 
+                component, 
+                version, 
+                rep_platform, 
+                op_sys, 
+                bug_status, 
+                resolution?, 
+                dup_id?, 
+                see_also*, 
+                bug_file_loc?, 
+                status_whiteboard?, 
+                keywords*, 
+                priority, 
+                bug_severity, 
+                target_milestone?, 
+                dependson*, 
+                blocked*, 
+                everconfirmed, 
+                reporter, 
+                assigned_to, 
+                cc*, 
+                (estimated_time, 
+                 remaining_time, 
+                 actual_time, 
+                 deadline?)?, 
+                qa_contact?,
+[% FOREACH field = Bugzilla.active_custom_fields %]
+                [%+ field.name FILTER xml -%]
+                [%- IF field.type == constants.FIELD_TYPE_MULTI_SELECT %]*[% ELSE %]?[% END %], 
+[% END %]
+                votes?, 
+                token?, 
+                group*, 
+                flag*, 
+                long_desc*, 
+                attachment*)?)>
+<!ATTLIST [% "bug" %]
+          error (NotFound | NotPermitted | InvalidBugId) #IMPLIED
+>
+<!ELEMENT bug_id (#PCDATA)>
+<!ELEMENT alias (#PCDATA)>
+<!ELEMENT reporter_accessible (#PCDATA)>
+<!ELEMENT cclist_accessible (#PCDATA)>
+<!ELEMENT exporter (#PCDATA)>
+<!ELEMENT urlbase (#PCDATA)>
+<!ELEMENT bug_status (#PCDATA)>
+<!ELEMENT classification_id (#PCDATA)>
+<!ELEMENT classification (#PCDATA)>
+<!ELEMENT product (#PCDATA)>
+<!ELEMENT priority (#PCDATA)>
+<!ELEMENT version (#PCDATA)>
+<!ELEMENT rep_platform (#PCDATA)>
+<!ELEMENT assigned_to (#PCDATA)>
+<!ATTLIST assigned_to 
+          name CDATA #REQUIRED
+>
+<!ELEMENT delta_ts (#PCDATA)>
+<!ELEMENT component (#PCDATA)>
+<!ELEMENT reporter (#PCDATA)>
+<!ATTLIST reporter
+          name CDATA #REQUIRED
+>
+<!ELEMENT target_milestone (#PCDATA)>
+<!ELEMENT bug_severity (#PCDATA)>
+<!ELEMENT creation_ts (#PCDATA)>
+<!ELEMENT qa_contact (#PCDATA)>
+<!ATTLIST qa_contact
+          name CDATA #REQUIRED
+>
+<!ELEMENT status_whiteboard (#PCDATA)>
+<!ELEMENT op_sys (#PCDATA)>
+<!ELEMENT resolution (#PCDATA)>
+<!ELEMENT dup_id (#PCDATA)>
+<!ELEMENT bug_file_loc (#PCDATA)>
+<!ELEMENT short_desc (#PCDATA)>
+<!ELEMENT keywords (#PCDATA)>
+<!ELEMENT dependson (#PCDATA)>
+<!ELEMENT blocked (#PCDATA)>
+<!ELEMENT everconfirmed (#PCDATA)>
+<!ELEMENT cc (#PCDATA)>
+<!ELEMENT see_also (#PCDATA)>
+<!ELEMENT votes (#PCDATA)>
+<!ELEMENT token (#PCDATA)>
+<!ELEMENT group (#PCDATA)>
+<!ATTLIST group
+          id CDATA #REQUIRED
+>
+<!ELEMENT estimated_time (#PCDATA)>
+<!ELEMENT remaining_time (#PCDATA)>
+<!ELEMENT actual_time (#PCDATA)>
+<!ELEMENT deadline (#PCDATA)>
+[% FOREACH field = Bugzilla.active_custom_fields %]
+<!ELEMENT [% field.name FILTER xml %] (#PCDATA)>
+[% END %]
+<!ELEMENT long_desc (commentid, attachid?, who, bug_when, work_time?, thetext)>
+<!ATTLIST long_desc
+          isprivate (0|1) #REQUIRED
+>
+<!ELEMENT commentid (#PCDATA)>
+<!ELEMENT who (#PCDATA)>
+<!ATTLIST who
+          name CDATA #REQUIRED
+>
+<!ELEMENT bug_when (#PCDATA)>
+<!ELEMENT work_time (#PCDATA)>
+<!ELEMENT thetext (#PCDATA)>
+<!ELEMENT attachment (attachid, date, delta_ts, desc, filename, type, size, attacher, token?, data?, flag*)>
+<!ATTLIST attachment
+          isobsolete (0|1) #REQUIRED
+          ispatch (0|1) #REQUIRED
+          isprivate (0|1) #REQUIRED
+          isurl (0|1) #REQUIRED
+>
+<!ELEMENT attacher (#PCDATA)>
+<!ELEMENT attachid (#PCDATA)>
+<!ELEMENT date (#PCDATA)>
+<!ELEMENT desc (#PCDATA)>
+<!ELEMENT filename (#PCDATA)>
+<!ELEMENT type (#PCDATA)>
+<!ELEMENT size (#PCDATA)>
+<!ELEMENT data (#PCDATA)>
+<!ATTLIST data
+          encoding (base64) #IMPLIED
+>
+<!ELEMENT flag EMPTY>
+<!ATTLIST flag
+          name CDATA #REQUIRED
+          id CDATA #REQUIRED
+          type_id CDATA #REQUIRED 
+          status CDATA #REQUIRED
+          setter CDATA #REQUIRED
+          requestee CDATA #IMPLIED
+>
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">
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index fb957484b..989e0c4e3 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -25,7 +25,8 @@
 [% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %]
 [% attidsummary = attachment.id _ ': ' _ attachment.description %]
 [% flagtype_name = flag ? flag.type.name : old_flag.type.name %]
-[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
+[%# Upstreaming: denied (bug 621883) %]
+[% statuses = { '+' => "granted" , '-' => 'not granted' , 'X' => "canceled" ,
                 '?' => "asked" } %]
 
 [% to_identity = "" %]
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index defc94cc3..19f199692 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -115,7 +115,7 @@
       <select name="[% field.name FILTER html%]" 
               id="[% field.name FILTER html %]" 
         [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
-        multiple="multiple" size="7">
+        multiple="multiple" size="9">
         [% legal_values = ${field.name} %]
         [% IF field.name == "component" %]
           [% legal_values = ${"component_"} %]
diff --git a/template/en/default/search/search-google.html.tmpl b/template/en/default/search/search-google.html.tmpl
new file mode 100644
index 000000000..080887abb
--- /dev/null
+++ b/template/en/default/search/search-google.html.tmpl
@@ -0,0 +1,57 @@
+[%# 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 the Mozilla Foundation
+  # Portions created by the Initial Developers are Copyright (C) 2011 the
+  # Initial Developer. All Rights Reserved.
+  #
+  # Contributor(s):
+  #   Dave Lawrence <dkl@mozilla.com>
+  #%] 
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl 
+  title = "Search " _ terms.Bugs _ " using Google"
+%]
+
+[% WRAPPER search/tabs.html.tmpl %]
+
+<p>
+  Use the <a href="http://www.google.com">Google</a> search engine to search 
+  for [% terms.Bugzilla +%] [%+ terms.bugs %]. Find the [% terms.bugs %] you are
+  looking for by entering words that best describe it.
+</p>
+
+<p>
+  For example, if the [% terms.bug %] you are looking for is a browser crash when 
+  you go to a secure web site with an embedded Flash animation, you might search 
+  for "crash secure SSL flash".
+</p>
+
+<p>
+  <span style="color:red;">*</span>
+  Google only indexes publicly viewable [% terms.bugs %] and all may not be represented.
+<p>
+
+<form method="get" action="http://www.google.com/search">
+<input type="hidden" name="sitesearch" value="bugzilla.mozilla.org">
+  <nobr>
+    <input type="text" name="q" size="60" maxlength="255" value="">
+    <input type="submit" value="Search">
+  </nobr>
+</form>
+
+[% END %]
+
+[% PROCESS global/footer.html.tmpl %]
+
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 31d950ec5..277a90960 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -98,7 +98,7 @@ for "crash secure SSL flash".
       <label for="content">Words:</label>
     </th>
     <td>
-      <input name="content" size="40" id="content"
+      <input name="content" size="60" id="content"
              value="[% default.content.0 FILTER html %]">
       <script type="text/javascript"> <!--
           document.forms['queryform'].content.focus(); 
@@ -107,6 +107,15 @@ for "crash secure SSL flash".
     </td>
   </tr>
   <tr>
+    <td>&nbsp;</td>
+    <td>
+      <input type="hidden" name="comments" value="0">
+      <input type="checkbox" id="comments" name="comments"
+             value="1" [% 'checked' IF cgi.param("comments") %]>
+      <label for="comments">Search comments</label>
+    </td>
+  </tr>
+  <tr>
     <td></td>
     <td>
     
diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl
index 119b30fde..6a2f7f70a 100644
--- a/template/en/default/search/tabs.html.tmpl
+++ b/template/en/default/search/tabs.html.tmpl
@@ -27,7 +27,9 @@
      tabs = [ { name => 'specific', label => "Simple Search",
                 link => "query.cgi?format=specific" },
               { name => 'advanced', label => "Advanced Search",
-                link => "query.cgi?format=advanced" } ]
+                link => "query.cgi?format=advanced" }, 
+              { name => 'google',  label => 'Google Search', 
+                link => "query.cgi?format=google" } ]
      current_tab_name = query_format || format || "advanced"
 %]