Bug 46296: Make editparams.cgi be multi-panel by category - Patch by Frédéric Buclin <LpSolit@gmail.com> r=joel a=justdave

19 files changed, 1153 insertions, 0 deletions

diff --git a/template/en/default/admin/params/admin.html.tmpl b/template/en/default/admin/params/admin.html.tmpl
new file mode 100644
index 000000000..202902b15
--- /dev/null
+++ b/template/en/default/admin/params/admin.html.tmpl
@@ -0,0 +1,66 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Administrative Policies"
+   desc = "Set up account and attachment policies"
+%]
+
+[% param_descs = {
+  allowbugdeletion => "The pages to edit products and components and versions can delete " _
+                      "all associated $terms.bugs when you delete a product (or component or " _
+                      "version). Since that is a pretty scary idea, you have to turn on " _
+                      "this option before any such deletions will ever happen.",
+
+  allowemailchange => "Users can change their own email address through the preferences. " _
+                      "Note that the change is validated by emailing both addresses, so " _
+                      "switching this option on will not let users use an invalid address.",
+
+  allowuserdeletion => "The user editing pages are capable of letting you delete user accounts. " _
+                       "$terms.Bugzilla will issue a warning in case you'd run into inconsistencies " _
+                       "when you're about to do so, but such deletions remain kinda scary. " _
+                       "So, you have to turn on this option before any such deletions " _
+                       "will ever happen.",
+
+  supportwatchers => "Support one user watching (ie getting copies of all related " _
+                     "email about) another's ${terms.bugs}. Useful for people going on " _
+                     "vacation, and QA folks watching particular developers' ${terms.bugs}.",
+
+  maxpatchsize => "The maximum size (in kilobytes) of patches. $terms.Bugzilla will not " _
+                  "accept patches greater than this number of kilobytes in size. " _
+                  "To accept patches of any size (subject to the limitations of " _
+                  "your server software), set this value to zero.",
+
+  maxattachmentsize => "The maximum size (in kilobytes) of non-patch attachments. " _
+                       "$terms.Bugzilla will not accept attachments greater than this number " _
+                       "of kilobytes in size. To accept attachments of any size " _
+                       "(subject to the limitations of your server software), set this " _
+                       "value to zero.",
+
+  maxlocalattachment => "The maximum size (in megabytes) of attachments identified by " _
+                        "the user as 'Big Files' to be stored locally on the webserver. " _
+                        "If set to zero, attachments will never be kept on the local " _
+                        "filesystem.",
+
+  convert_uncompressed_images => "If this option is on, attachments with content type image/bmp " _
+                                 "will be converted to image/png and compressed before uploading to " _
+                                 "the database to conserve disk space." }
+%]
\ No newline at end of file
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
new file mode 100644
index 000000000..040190699
--- /dev/null
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -0,0 +1,124 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "User Authentication"
+   desc = "Set up your authentication policies"
+%]
+
+[% param_descs = {
+  auth_env_id => "Environment variable used by external authentication system " _
+                 "to store a unique identifier for each user. Leave it blank " _
+                 "if there isn't one or if this method of authentication " _
+                 "is not being used.",
+
+  auth_env_email => "Environment variable used by external authentication system " _
+                    "to store each user's email address. This is a required " _
+                    "field for environmental authentication. Leave it blank " _
+                    "if you are not going to use this feature.",
+
+  auth_env_realname => "Environment variable used by external authentication system " _
+                       "to store the user's real name. Leave it blank if there " _
+                       "isn't one or if this method of authentication is not being " _
+                       "used.",
+
+  user_info_class => "Mechanism(s) to be used for gathering a user's login information.
+                      More than one may be selected. If the first one returns nothing,
+                      the second is tried, and so on.<br>
+                      The types are:
+                      <dl>
+                        <dt>CGI</dt>
+                        <dd>
+                          Asks for username and password via CGI form interface.
+                        </dd>
+                        <dt>Env</dt>
+                        <dd>
+                          Info for a pre-authenticated user is passed in system
+                          environment variables.
+                        </dd>
+                      </dl>",
+
+  user_verify_class => "Mechanism(s) to be used for verifying (authenticating) information
+                        gathered by user_info_class.
+                        More than one may be selected. If the first one cannot find the
+                        user, the second is tried, and so on.<br>
+                        The types are:
+                        <dl>
+                          <dt>DB</dt>
+                          <dd>
+                            ${terms.Bugzilla}'s built-in authentication. This is the most common
+                            choice.
+                          </dd>
+                          <dt>LDAP</dt>
+                          <dd>
+                            LDAP authentication using an LDAP server. This method is
+                            experimental; please see the $terms.Bugzilla documentation for more
+                            information. Using this method requires additional parameters
+                            to be set above.
+                          </dd>
+                        </dl>",
+
+  rememberlogin => "Controls management of session cookies
+                    <ul>
+                      <li>
+                        on - Session cookies never expire (the user has to login only
+                        once per browser).
+                      </li>
+                      <li>
+                        off - Session cookies last until the users session ends (the user
+                        will have to login in each new browser session).
+                      </li>
+                      <li>
+                        defaulton/defaultoff - Default behavior as described
+                        above, but user can choose whether $terms.Bugzilla will remember his
+                        login or not.
+                      </li>
+                    </ul>",
+
+  loginnetmask => "The number of bits for the netmask used if a user chooses to " _
+                  "allow a login to be valid for more than a single IP. Setting " _
+                  "this to 32 disables this feature.<br> " _
+                  "Note that enabling this may decrease the security of your system.",
+
+  requirelogin => "If this option is set, all access to the system beyond the " _
+                  "front page will require a login. No anonymous users will " _
+                  "be permitted.",
+
+  emailregexp => "This defines the regexp to use for legal email addresses. The " _
+                 "default tries to match fully qualified email addresses. Another " _
+                 "popular value to put here is <tt>^[^@]+$</tt>, which means " _
+                 "'local usernames, no @ allowed.'",
+
+  emailregexpdesc => "This describes in English words what kinds of legal addresses " _
+                     "are allowed by the <tt>emailregexp</tt> param.",
+
+  emailsuffix => "This is a string to append to any email addresses when actually " _
+                 "sending mail to that address. It is useful if you have changed " _
+                 "the <tt>emailregexp</tt> param to only allow local usernames, " _
+                 "but you want the mail to be delivered to username@my.local.hostname.",
+
+  createemailregexp => "This defines the regexp to use for email addresses that are " _
+                       "permitted to self-register using a 'New Account' feature. The " _
+                       "default (.*) permits any account matching the emailregexp " _
+                       "to be created. If this parameter is left blank, no users " _
+                       "will be permitted to create their own accounts and all accounts " _
+                       "will have to be created by an administrator." }
+%]
\ No newline at end of file
diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl
new file mode 100644
index 000000000..02ed1bce5
--- /dev/null
+++ b/template/en/default/admin/params/bugchange.html.tmpl
@@ -0,0 +1,78 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Bug Change Policies"
+   desc = "Set up bug change policies"
+%]
+
+[% param_descs = {
+  letsubmitterchoosepriority => "If this is on, then people submitting $terms.bugs can " _
+                                "choose an initial priority for that ${terms.bug}. " _
+                                "If off, then all $terms.bugs initially have the default " _
+                                "priority selected below.",
+
+  letsubmitterchoosemilestone => "If this is on, then people submitting $terms.bugs can " _
+                                 "choose the Target Milestone for that ${terms.bug}. " _
+                                 "If off, then all $terms.bugs initially have the default " _
+                                 "milestone for the product being filed in.",
+
+  defaultpriority => "This is the priority that newly entered $terms.bugs are set to.",
+
+  musthavemilestoneonaccept => "If you are using Target Milestone, do you want to require that " _
+                               "the milestone be set in order for a user to ACCEPT a ${terms.bug}?",
+
+  commentoncreate => "If this option is on, the user needs to enter a description " _
+                     "when entering a new ${terms.bug}.",
+
+  commentonaccept => "If this option is on, the user needs to enter a short comment if " _
+                     "he accepts the ${terms.bug}.",
+
+  commentonclearresolution => "If this option is on, the user needs to enter a short comment if " _
+                              "the ${terms.bug}'s resolution is cleared.",
+
+  commentonconfirm => "If this option is on, the user needs to enter a short comment " _
+                      "when confirming a ${terms.bug}.",
+
+  commentonresolve => "If this option is on, the user needs to enter a short comment if " _
+                      "the $terms.bug is resolved.",
+
+  commentonreassign => "If this option is on, the user needs to enter a short comment if " _
+                       "the $terms.bug is reassigned.",
+
+  commentonreassignbycomponent => "If this option is on, the user needs to enter a short comment if " _
+                                  "the $terms.bug is reassigned by component.",
+
+  commentonreopen => "If this option is on, the user needs to enter a short comment if " _
+                     "the $terms.bug is reopened.",
+
+  commentonverify => "If this option is on, the user needs to enter a short comment if " _
+                     "the $terms.bug is verified.",
+
+  commentonclose => "If this option is on, the user needs to enter a short comment if " _
+                    "the $terms.bug is closed.",
+
+  commentonduplicate => "If this option is on, the user needs to enter a short comment " _
+                        "if the $terms.bug is marked as duplicate.",
+
+  noresolveonopenblockers => "Don\'t allow $terms.bugs to be resolved as fixed " _
+                             "if they have unresolved dependencies." }
+%]
diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl
new file mode 100644
index 000000000..2e82e08e5
--- /dev/null
+++ b/template/en/default/admin/params/bugfields.html.tmpl
@@ -0,0 +1,62 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Bug Fields"
+   desc = "Choose fields you want to display"
+%]
+
+[% param_descs = {
+  useclassification => "If this is on, $terms.Bugzilla will associate each product with a " _
+                       "specific classification. But you must have 'editclassification' " _
+                       "permissions enabled in order to edit classifications.",
+
+  showallproducts => "If this is on and useclassification is set, $terms.Bugzilla will add a " _
+                     "'All' link in the 'New $terms.Bug' page to list all available products.",
+
+  usetargetmilestone => "Do you wish to use the Target Milestone field?",
+
+  useqacontact => "Do you wish to use the QA Contact field?",
+
+  usestatuswhiteboard => "Do you wish to use the Status Whiteboard field?",
+
+  usevotes => "Do you wish to allow users to vote for ${terms.bugs}? Note that in order " _
+              "for this to be effective, you will have to change the maximum " _
+              "votes allowed in a product to be non-zero in " _
+              "<a href=\"editproducts.cgi\">the product edit page</a>.",
+
+  usebugaliases => "Do you wish to use $terms.bug aliases, which allow you to assign " _
+                   "$terms.bugs an easy-to-remember name by which you can refer to them?",
+
+  defaultseverity => "This is the severity that newly entered $terms.bugs are set to.",
+
+  defaultplatform => "This is the platform that is preselected on the $terms.bug " _
+                     "entry form.<br> " _
+                     "You can leave this empty: " _
+                     "$terms.Bugzilla will then use the platform that the browser " _
+                     "reports to be running on as the default.",
+
+  defaultopsys => "This is the operating system that is preselected on the $terms.bug " _
+                  "entry form.<br> " _
+                  "You can leave this empty: " _
+                  "$terms.Bugzilla will then use the operating system that the browser " _
+                  "reports to be running on as the default." }
+%]
\ No newline at end of file
diff --git a/template/en/default/admin/params/bugmove.html.tmpl b/template/en/default/admin/params/bugmove.html.tmpl
new file mode 100644
index 000000000..902cb5a3e
--- /dev/null
+++ b/template/en/default/admin/params/bugmove.html.tmpl
@@ -0,0 +1,50 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Bug Moving"
+   desc = "Set up parameters to move bugs to/from another installation"
+%]
+
+[% param_descs = {
+  "move-enabled" => "If this is on, $terms.Bugzilla will allow certain people " _
+                    "to move $terms.bugs to the defined database.",
+
+  "move-button-text" => "The text written on the Move button. Explain where the $terms.bug is " _
+                        "being moved to.",
+
+  "move-to-url" => "The URL of the database we allow some of our $terms.bugs to be moved to.",
+
+  "move-to-address" => "To move ${terms.bugs}, an email is sent to the target database. This is " _
+                       "the email address that database uses to listen for incoming ${terms.bugs}.",
+
+  "moved-from-address" => "To move ${terms.bugs}, an email is sent to the target database. This is " _
+                          "the email address from which this mail, and error messages are sent.",
+
+  movers => "A list of people with permission to move $terms.bugs and reopen moved " _
+            "${terms.bugs} (in case the move operation fails).",
+
+  "moved-default-product" => "$terms.Bugs moved from other databases to here are assigned " _
+                             "to this product.",
+
+  "moved-default-component" => "$terms.Bugs moved from other databases to here are assigned " _
+                               "to this component." }
+%]
diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl
new file mode 100644
index 000000000..d04e83d3f
--- /dev/null
+++ b/template/en/default/admin/params/common.html.tmpl
@@ -0,0 +1,75 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%# INTERFACE:
+  # panel: hash representing the current panel.
+  #%]
+
+<dl>
+  [% FOREACH param = panel.param_list %]
+    <dt>[% param.name FILTER html %]</dt>
+    <dd>[% panel.param_descs.${param.name} FILTER none %]
+      <p>
+      [% IF param.type == "t" %]
+        <input size="80" name="[% param.name FILTER html %]"
+               value="[% Param(param.name) FILTER html %]">
+      [% ELSIF param.type == "l" %]
+        <textarea name="[% param.name FILTER html %]" rows="10" cols="80">
+            [% Param(param.name) FILTER html %]</textarea>
+      [% ELSIF param.type == "b" %]
+        <input type="radio" name="[% param.name FILTER html %]"
+               value=1 [% "checked=\"checked\"" IF Param(param.name) %]>On
+        <input type="radio" name="[% param.name FILTER html %]"
+               value=0 [% "checked=\"checked\"" IF !Param(param.name) %]>Off
+      [% ELSIF param.type == "m" %]
+        [% boxSize = 5 %]
+        [% boxSize = param.choices.size IF param.choices.size < 5 %]
+
+        <select multiple="multiple" size="[% boxSize FILTER html %]"
+                name="[% param.name FILTER html %]">
+          [% FOREACH item = param.choices %]
+            <option value="[% item FILTER html %]"
+                    [% " selected=\"selected\"" IF lsearch(Param(param.name), item) != -1 %]>
+              [% item FILTER html %]                                                                
+            </option>
+          [% END %]
+        </select>
+      [% ELSIF param.type == "s" %]
+        <select name="[% param.name FILTER html %]">
+          [% FOREACH item = param.choices %]
+            <option value="[% item FILTER html %]"
+                    [% " selected=\"selected\"" IF item == Param(param.name) %]>
+              [% item FILTER html %]
+            </option>
+          [% END %]
+        </select>
+      [% ELSE %]
+        <font color="red">
+          <blink>Unknown param type [% param.type FILTER html %]!!!</blink>
+        </font>
+      [% END %]  
+      </p>
+      <p>
+        <input type="checkbox" name="reset-[% param.name FILTER html %]">Reset
+      </p>
+      <hr>
+    </dd>
+  [% END %]
+</dl>
diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
new file mode 100644
index 000000000..adf527c33
--- /dev/null
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -0,0 +1,68 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+
+[% 
+   title = "Required Settings"
+   desc = "Settings that are required for proper operation of $terms.Bugzilla" 
+%]
+
+[% param_descs = {
+  maintainer => "The email address of the person who maintains this installation " _
+                "of ${terms.Bugzilla}.",
+
+  urlbase => "The URL that is the common initial leading part of all $terms.Bugzilla " _
+             "URLs.",
+
+  sslbase => "The URL that is the common initial leading part of all HTTPS " _
+             "(SSL) $terms.Bugzilla URLs.",
+
+  ssl => "Controls when $terms.Bugzilla should enforce sessions to use HTTPS by " _
+         "using <tt>sslbase</tt>.",
+
+  cookiedomain => "The domain for $terms.Bugzilla cookies. Normally blank. " _
+                  "If your website is at 'www.foo.com', setting this to " _
+                  "'.foo.com' will also allow 'bar.foo.com' to access " _
+                  "$terms.Bugzilla cookies. This is useful if you have more than " _
+                  "one hostname pointing at the same web server, and you " _
+                  "want them to share the $terms.Bugzilla cookie.",
+
+  cookiepath => "Path, relative to your web document root, to which to restrict " _
+                "$terms.Bugzilla cookies. Normally this is the URI portion of your URL " _
+                "base. Begin with a / (single slash mark). For instance, if " _
+                "$terms.Bugzilla serves from 'http://www.somedomain.com/bugzilla/', set " _
+                "this parameter to /bugzilla/. Setting it to / will allow " _
+                "all sites served by this web server or virtual host to read " _
+                "$terms.Bugzilla cookies.",
+
+  timezone => "The timezone that your database server lives in. If set to '', " _
+              "then the timezone will not be displayed with the timestamps.",
+
+  utf8 => "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New " _
+          "installations should set this to true to avoid character encoding " _
+          "problems. Existing databases should set this to true only after " _
+          "the data has been converted from existing legacy character " _
+          "encodings to UTF-8.",
+
+  shutdownhtml => "If this field is non-empty, then $terms.Bugzilla will be completely " _
+                  "disabled and this text will be displayed instead of all the " _
+                  "$terms.Bugzilla pages." }
+%]
\ No newline at end of file
diff --git a/template/en/default/admin/params/dependencygraph.html.tmpl b/template/en/default/admin/params/dependencygraph.html.tmpl
new file mode 100644
index 000000000..9ac2ad04b
--- /dev/null
+++ b/template/en/default/admin/params/dependencygraph.html.tmpl
@@ -0,0 +1,50 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Dependency Graphs"
+   desc = "Optional setup for dependency graphing"
+%]
+
+[% param_descs = {
+  webdotbase => "It is possible to show graphs of dependent ${terms.bugs}. You may set
+                 this parameter to any of the following:
+                 <ul>
+                   <li>
+                     A complete file path to 'dot' (part of
+                     <a href=\"http://www.graphviz.org\">GraphViz</a>) will
+                     generate the graphs locally.
+                   </li>
+                   <li>
+                     A URL prefix pointing to an installation of the
+                     <a href=\"http://www.research.att.com/~north/cgi-bin/webdot.cgi\">webdot
+                     package</a> will generate the graphs remotely.
+                   </li>
+                   <li>
+                     A blank value will disable dependency graphing.
+                   </li>
+                 </ul>
+                 The default value is a publicly-accessible webdot server. If you change
+                 this value, make certain that the webdot server can read files from your
+                 webdot directory. On Apache you do this by editing the .htaccess file,
+                 for other systems the needed measures may vary. You can run checksetup.pl
+                 to recreate the .htaccess file if it has been lost."}
+%]
\ No newline at end of file
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
new file mode 100644
index 000000000..bd94cc513
--- /dev/null
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -0,0 +1,90 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%# INTERFACE:
+  # panels: array of hashes representing the panels available.
+  # param_changed: array of parameters which have been changed.
+  # shutdown_is_active: boolean; is true when 'shutdownhtml' has been turned on.
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% curpanel = 0 %]
+[% panels = panels.sort('sortkey') %]
+
+[% FOREACH panel = panels %]
+  [% PROCESS "admin/params/${panel.name}.html.tmpl"
+             params = panel.param_list %]
+  [% panel.title = title %]
+  [% panel.desc = desc %]
+  [% panel.param_descs = param_descs %]
+  [% IF panel.current %][% curpanel = loop.index %][% END %]
+[% END %]
+
+[% current_panel = panels.$curpanel %]
+
+[%# We cannot call header.html.tmpl earlier as we have to know which panel is active first %]
+[% PROCESS global/header.html.tmpl
+   title = "$terms.Bugzilla Configuration: $current_panel.title"
+   message = message
+   style_urls = ['skins/standard/params.css']
+%]
+
+<table border="0" width="100%">
+  <tr>
+    <td>
+      [%# NAVIGATION BAR %]
+      <table id="menu">
+        [% FOREACH panel = panels %]
+          <tr>
+            [% IF panel.current %]
+              <td class="selected_section">
+                <span title="[% panel.desc FILTER html %]">[% panel.title FILTER html %]</span>
+              </td>
+            [% ELSE %]
+              <td>
+                <a href="editparams.cgi?section=[% panel.name FILTER url_quote %]"
+                   title="[% panel.desc FILTER html %]">[% panel.title FILTER html %]</a>
+              </td>
+            [% END %]
+          </tr>
+        [% END %]
+      </table>
+    </td>
+    <td>
+      <p>
+        This lets you edit the basic operating parameters of [% terms.Bugzilla %].
+        Be careful!<br>
+        Any item you check "Reset" on will get reset to its default value.
+      </p>
+      [%# CONTENT PANEL %]
+      <form method="post" action="editparams.cgi">
+        [% PROCESS admin/params/common.html.tmpl panel = current_panel %]
+        <input type="hidden" name="section" value="[% current_panel.name FILTER html %]">
+        <input type="hidden" name="action" value="save">
+        <input type="reset" value="Reset form">
+        <input type="submit" name="action" value="Save Changes">
+      </form>
+    </td>
+  </tr>
+</table>
+
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl
new file mode 100644
index 000000000..fe986f387
--- /dev/null
+++ b/template/en/default/admin/params/groupsecurity.html.tmpl
@@ -0,0 +1,51 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Group Security"
+   desc = "Decide how you will use Security Groups"
+%]
+
+[% param_descs = {
+  makeproductgroups => "If this is on, $terms.Bugzilla will associate a $terms.bug group " _
+                       "with each product in the database, and use it for querying ${terms.bugs}.",
+
+  useentrygroupdefault => "If this is on, $terms.Bugzilla will use product $terms.bug groups " _
+                          "by default to restrict who can enter ${terms.bugs}. If this is on, " _
+                          "users can see any product to which they have entry access in search menus. " _
+                          "If this is off, users can see any product to which they have not " _
+                          "been excluded by a mandatory restriction.",
+
+  chartgroup => "The name of the group of users who can use the 'New Charts' " _
+                "feature. Administrators should ensure that the public categories " _
+                "and series definitions do not divulge confidential information " _
+                "before enabling this for an untrusted population. If left blank, " _
+                "no users will be able to use New Charts.",
+
+  insidergroup => "The name of the group of users who can see/change private " _
+                  "comments and attachments.",
+
+  timetrackinggroup => "The name of the group of users who can see/change time tracking " _
+                       "information.",
+
+  usevisibilitygroups => "Do you wish to restrict visibility of users to members of " _
+                         "specific groups?" }
+%]
diff --git a/template/en/default/admin/params/l10n.html.tmpl b/template/en/default/admin/params/l10n.html.tmpl
new file mode 100644
index 000000000..1ab062cca
--- /dev/null
+++ b/template/en/default/admin/params/l10n.html.tmpl
@@ -0,0 +1,46 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Localization"
+   desc = "Define what languages you want made available to your users"
+%]
+
+[%# Get the list of available languages %]
+[% available_languages = "unknown" %]
+[% FOREACH param = params %]
+  [% IF param.name == "languages" %]
+    [% available_languages = param.extra_desc.available_languages FILTER html %]
+  [% END %]
+[% END %]
+
+[% param_descs = {
+  languages => "A comma-separated list of RFC 1766 language tags. These " _
+               "identify the languages in which you wish $terms.Bugzilla output " _
+               "to be displayed. Note that you must install the appropriate " _
+               "language pack before adding a language to this Param. The " _
+               "language used is the one in this list with the highest " _
+               "q-value in the user's Accept-Language header.<br> " _
+               "Available languages: $available_languages" ,
+
+  defaultlanguage => "The UI language $terms.Bugzilla falls back on if no suitable " _
+                     "language is found in the user's Accept-Language header." }
+%]
diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl
new file mode 100644
index 000000000..6e7068796
--- /dev/null
+++ b/template/en/default/admin/params/ldap.html.tmpl
@@ -0,0 +1,46 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "LDAP"
+   desc = "Configure this first before choosing LDAP as an authentication method"
+%]
+
+[% param_descs = {
+  LDAPserver => "The name (and optionally port) of your LDAP server " _
+                "(e.g. ldap.company.com, or ldap.company.com:portnum).",
+
+  LDAPbinddn => "If your LDAP server requires that you use a binddn and password " _
+                "instead of binding anonymously, enter it here " _
+                "(e.g. cn=default,cn=user:password). " _
+                "Leave this empty for the normal case of an anonymous bind.",
+
+  LDAPBaseDN => "The BaseDN for authenticating users against " _
+                "(e.g. ou=People,o=Company).",
+
+  LDAPuidattribute => "The name of the attribute containing the user's login name.",
+
+  LDAPmailattribute => "The name of the attribute of a user in your directory that " _
+                       "contains the email address.",
+
+  LDAPfilter => "LDAP filter to AND with the <tt>LDAPuidattribute</tt> for " _
+                "filtering the list of valid users." }
+%]
diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
new file mode 100644
index 000000000..4dd0f0088
--- /dev/null
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -0,0 +1,109 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Mail Transport Config"
+   desc = "How will outgoing mail be delivered?"
+%]
+
+[% param_descs = {
+  mail_delivery_method => "Defines how email is sent, or if it is sent at all.<br>
+                           <ul>
+                             <li>
+                               'sendmail', 'smtp' and 'qmail' are all MTAs.
+                               You need to install a third-party sendmail replacement if
+                               you want to use sendmail on Windows.
+                             </li>
+                             <li>
+                               'testfile' is useful for debugging: all email is stored
+                               in 'data/mailer.testfile' instead of being sent. For more
+                               information, see the Mail::Mailer manual.
+                             </li>
+                             <li>
+                               'none' will completely disable email. $terms.Bugzilla continues
+                               to act as though it is sending mail, but nothing is sent or
+                               stored.
+                             </li>
+                           </ul>",
+
+  sendmailnow => "Sites using anything older than version 8.12 of 'sendmail' " _
+                 "can achieve a significant performance increase in the " _
+                 "UI -- at the cost of delaying the sending of mail -- by " _
+                 "disabling this parameter. Sites using 'sendmail' 8.12 or " _
+                 "higher should leave this on, as they will see no benefit from " _
+                 "turning it off. Sites using an MTA other than 'sendmail' " _
+                 "<b>must</b> leave it on, or no $terms.bug mail will be sent.",
+
+  smtpserver => "The SMTP server address (if using SMTP for mail delivery).",
+
+  passwordmail => "The email that gets sent to people to tell them their password. " _
+                  "Within this text, %mailaddress% gets replaced by the person's " _
+                  "email address, %login% gets replaced by the person's login " _
+                  "(usually the same thing), and %password% gets replaced by their " _
+                  "password. %<i>anythingelse</i>% gets replaced by the " _
+                  "definition of that parameter (as defined on this page).",
+
+  newchangedmail => "The email that gets sent to people when a $terms.bug changes. Within " _
+                    "this text, %to% gets replaced with the e-mail address of the " _
+                    "person receiving the mail. %bugid% gets replaced by the $terms.bug " _
+                    "number. %diffs% gets replaced with what has changed. " _
+                    "%neworchanged% is 'New:' if this mail is reporting a new $terms.bug or " _
+                    "empty if changes were made to an existing one. %summary% gets " _
+                    "replaced by the summary of this ${terms.bug}. %reasonsheader% is " _
+                    "replaced by an abbreviated list of reasons why the user is " _
+                    "getting the email, suitable for use in an email header (such " _
+                    "as X-Bugzilla-Reason). %reasonsbody% is replaced by text that " _
+                    "explains why the user is getting the email in more user " _
+                    "friendly text than %reasonsheader%. " _
+                    "%threadingmarker% will become either a Message-ID line (for " _
+                    "new-${terms.bug} messages) or a In-Reply-To line (for ${terms.bug}-change " _
+                    "messages). " _
+                    "%<i>anythingelse</i>% gets " _
+                    "replaced by the definition of that parameter (as defined on " _
+                    "this page).",
+
+  whinedays => "The number of days that we'll let a $terms.bug sit untouched in a NEW " _
+               "state before our cronjob will whine at the owner.<br> " _
+               "Set to 0 to disable whining.",
+
+  whinemail => "The email that gets sent to anyone who has a NEW or REOPENED " _
+               "$terms.bug that hasn't been touched for more than <b>whinedays</b>. " _
+               "Within this text, %email% gets replaced by the offender's " _
+               "email address. %userid% gets replaced by the offender's " _
+               "$terms.Bugzilla login (which, in most installations, is the same as " _
+               "the email address.) %<i>anythingelse</i>% gets replaced by the " _
+               "definition of that parameter (as defined on this page).<p> " _
+               "It is a good idea to make sure this message has a valid From: " _
+               "address, so that if the mail bounces, a real person can know " _
+               "that there are $terms.bugs assigned to an invalid address.",
+
+  voteremovedmail => "This is a mail message to send to anyone who gets a vote removed " _
+                     "from $terms.abug for any reason. %to% gets replaced by the person who " _
+                     "used to be voting for this ${terms.bug}. %bugid% gets replaced by the " _
+                     "$terms.bug number. %reason% gets replaced by a short reason describing " _
+                     "why the vote(s) were removed. %votesremoved%, %votesold% and " _
+                     "%votesnew% is the number of votes removed, before and after " _
+                     "respectively. %votesremovedtext%, %votesoldtext% and " _
+                     "%votesnewtext% are these as sentences, e.g. 'You had 2 votes on " _
+                     "this ${terms.bug}.' %count% is also supported for backwards " _
+                     "compatibility. %<i>anythingelse</i>% gets replaced by the " _
+                     "definition of that parameter (as defined on this page)." }
+%]
diff --git a/template/en/default/admin/params/patchviewer.html.tmpl b/template/en/default/admin/params/patchviewer.html.tmpl
new file mode 100644
index 000000000..f3dd6d4a1
--- /dev/null
+++ b/template/en/default/admin/params/patchviewer.html.tmpl
@@ -0,0 +1,65 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Patch Viewer"
+   desc = "Set up third-party applications to run with PatchViewer"
+%]
+
+[% param_descs = {
+  cvsroot => "The <a href=\"http://www.cvshome.org\">CVS</a> root that most " _
+             "users of your system will be using for 'cvs diff'. Used in " _
+             "Patch Viewer ('Diff' option on patches) to figure out where " _
+             "patches are rooted even if users did the 'cvs diff' from " _
+             "different places in the directory structure (NOTE: if your " _
+             "CVS repository is remote and requires a password, you must " _
+             "either ensure the $terms.Bugzilla user has done a 'cvs login' or " _
+             "specify the password " _
+             "<a href=\"http://www.cvshome.org/docs/manual/cvs_2.html#SEC26\">as " _
+             "part of the CVS root.</a>). Leave this blank if you have no " _
+             "CVS repository.",
+
+  cvsroot_get => "The CVS root $terms.Bugzilla will be using to get patches from. " _
+                 "Some installations may want to mirror their CVS repository on " _
+                 "the $terms.Bugzilla server or even have it on that same server, and " _
+                 "thus the repository can be the local file system (and much " _
+                 "faster). Make this the same as cvsroot if you don't " _
+                 "understand what this is (if cvsroot is blank, make this blank too).",
+
+  bonsai_url => "The URL to a <a href=\"http://www.mozilla.org/bonsai.html\">Bonsai</a> " _
+                "server containing information about your CVS repository. " _
+                "Patch Viewer will use this information to create links to " _
+                "bonsai's blame for each section of a patch (it will append " _
+                "'/cvsblame.cgi?...' to this url). Leave this blank if you " _
+                "don't understand what this is.",
+
+  lxr_url => "The URL to an <a href=\"http://sourceforge.net/projects/lxr\">LXR</a> server " _
+             "that indexes your CVS repository. Patch Viewer will use this " _
+             "information to create links to LXR for each file in a patch. " _
+             "Leave this blank if you don't understand what this is.",
+
+  lxr_root => "Some LXR installations do not index the CVS repository from the root -- " _
+              "<a href=\"http://lxr.mozilla.org/mozilla\">Mozilla's</a>, for " _
+              "example, starts indexing under <code>mozilla/</code>. This " _
+              "means URLs are relative to that extra path under the root. " _
+              "Enter this if you have a similar situation. Leave it blank " _
+              "if you don't know what this is." }
+%]
diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl
new file mode 100644
index 000000000..ca4280f62
--- /dev/null
+++ b/template/en/default/admin/params/query.html.tmpl
@@ -0,0 +1,58 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Query Defaults"
+   desc = "Default options for query and buglists"
+%]
+
+[% param_descs = {
+  quip_list_entry_control => "Controls how easily users can add entries to the quip list.
+                              <ul>
+                                <li>
+                                  open - Users may freely add to the quip list, and
+                                  their entries will immediately be available for viewing.
+                                </li>
+                                <li>
+                                  moderated - quips can be entered, but need to be approved
+                                  by an admin before they will be shown.
+                                </li>
+                                <li>
+                                  closed - no new additions to the quips list are allowed.
+                                </li>
+                              </ul>",
+
+  mostfreqthreshold => "The minimum number of duplicates $terms.abug needs to show up on the " _
+                       "<a href=\"duplicates.cgi\">most frequently reported $terms.bugs page</a>. " _
+                       "If you have a large database and this page takes a long time to " _
+                       "load, try increasing this number.",
+
+  mybugstemplate => "This is the URL to use to bring up a simple 'all of my $terms.bugs' " _
+                    "list for a user. %userid% will get replaced with the login name of a user.",
+
+  defaultquery => "This is the default query that initially comes up when you " _
+                  "access the advanced query page. It's in URL parameter " _
+                  "format, which makes it hard to read. Sorry!",
+
+  quicksearch_comment_cutoff => "The maximum number of search terms for a QuickSearch " _
+                                "to search comments. If the QuickSearch query contains " _
+                                "more terms than this value, QuickSearch will not search comments." }
+%]
diff --git a/template/en/default/admin/params/shadowdb.html.tmpl b/template/en/default/admin/params/shadowdb.html.tmpl
new file mode 100644
index 000000000..7d038381a
--- /dev/null
+++ b/template/en/default/admin/params/shadowdb.html.tmpl
@@ -0,0 +1,50 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "Shadow Database"
+   desc = "An optional hack to increase database performance"
+%]
+
+[% param_descs = {
+  shadowdbhost => "The host the shadow database is on.",
+
+  shadowdbport => "The port the shadow database is on. Ignored if " _
+                  "<tt>shadowdbhost</tt> is blank. Note: if the host is the local " _
+                  "machine, then MySQL will ignore this setting, and you must " _
+                  "specify a socket below.",
+
+  shadowdbsock => "The socket used to connect to the shadow database, if the host " _
+                  "is the local machine. This setting is required because MySQL " _
+                  "ignores the port specified by the client and connects using " _
+                  "its compiled-in socket path (on unix machines) when connecting " _
+                  "from a client to a local server. If you leave this blank, and " _
+                  "have the database on localhost, then the <tt>shadowdbport</tt> " _
+                  "will be ignored.",
+
+  shadowdb => "If non-empty, then this is the name of another database in " _
+              "which $terms.Bugzilla will use as a read-only copy of everything. " _
+              "This is done so that long slow read-only operations can be used " _
+              "against this db, and not lock up things for everyone else. This " _
+              "database is on the <tt>shadowdbhost</tt>, and must exist. " _
+              "$terms.Bugzilla does not update it, if you use this parameter, then " _
+              "you need to set up replication for your database." }
+%]
diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl
new file mode 100644
index 000000000..bf733c933
--- /dev/null
+++ b/template/en/default/admin/params/usermatch.html.tmpl
@@ -0,0 +1,45 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Dave Miller <justdave@bugzilla.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
+  #%]
+[%
+   title = "User Matching"
+   desc = "Set up your user matching policies"
+%]
+
+[% param_descs = {
+  usemenuforusers => "If this option is set, a popup menu will be used where a user " _
+                     "needs to be selected. This option should not be enabled on " _
+                     "sites where there are a large number of users.",
+
+  usermatchmode => "Allow match strings to be entered for user names when entering " _
+                   "and editing ${terms.bugs}.<p> " _
+                   "'off' disables matching,<br> " _
+                   "'wildcard' allows only wildcards,<br> " _
+                   "and 'search' allows both wildcards and substring (freetext) matches.",
+
+  maxusermatches => "Search for no more than this many matches.<br> " _
+                    "If set to '1', no users will be displayed on ambiguous matches. " _
+                    "This is useful for user privacy purposes.<br> " _
+                    "A value of zero means no limit.",
+
+  confirmuniqueusermatch => "Whether a confirmation screen should be displayed when only " _
+                            "one user matches a search entry." }
+%]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index d0435597d..7a33265a5 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -169,6 +169,22 @@
     [% title = "$terms.Bugzilla Login Changed" %]
     Your [% terms.Bugzilla %] login has been changed.
 
+  [% ELSIF message_tag == "parameters_updated" %]
+    [% title = "Parameters Updated" %]
+    [% IF param_changed.size > 0 %]
+      [% FOREACH param = param_changed %]
+        Changed <em>[% param FILTER html %]</em><br>
+      [% END %]
+    [% ELSE %]
+      No changes made.
+    [% END %]
+
+    [% IF shutdown_is_active == 1 %]
+      <hr>
+      [% terms.Bugzilla %] has now been shut down. To re-enable the system,
+      clear the <em>shutdownhtml</em> field.
+    [% END%]
+
   [% ELSIF message_tag == "password_change_cancelled" %]
     [% title = "Cancel Request to Change Password" %]
     Your request has been cancelled.
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 6cafb4895..22d7c8dcd 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -647,6 +647,10 @@
     The maximum number of rows, '[% maxrows FILTER html %]', must be
     a positive integer.
 
+  [% ELSIF error == "invalid_parameter" %]
+    [% title = "Invalid Parameter" %]
+    The new value for [% name FILTER html %] is invalid: [% err FILTER html %].
+
   [% ELSIF error == "invalid_product_name" %]
     [% title = "Invalid Product Name" %]
     The product name '[% product FILTER html %]' is invalid or does not exist.