Bug 947823: Replace gender-specific pronouns with gender-neutral pronouns

r=gerv a=justdave

8 files changed, 14 insertions, 14 deletions

diff --git a/template/en/default/admin/confirm-action.html.tmpl b/template/en/default/admin/confirm-action.html.tmpl
index b6a21811b..6dda0d014 100644
--- a/template/en/default/admin/confirm-action.html.tmpl
+++ b/template/en/default/admin/confirm-action.html.tmpl
@@ -12,7 +12,7 @@
   # expected_action: the action the user was going to do.
   # script_name: the script generating this warning.
   # alternate_script: the suggested script to redirect the user to
-  #                   if he declines submission.
+  #                   if they decline submission.
   #%]
 
 [% PROCESS global/header.html.tmpl
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 175e0c08f..bf8539b87 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -84,8 +84,8 @@
                       </li>
                       <li>
                         defaulton/defaultoff - Default behavior as described
-                        above, but user can choose whether Bugzilla will remember his
-                        login or not.
+                        above, but user can choose whether Bugzilla will
+                        remember their login or not.
                       </li>
                     </ul>",
 
diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl
index fb26f3471..85aaae500 100644
--- a/template/en/default/admin/params/query.html.tmpl
+++ b/template/en/default/admin/params/query.html.tmpl
@@ -43,8 +43,8 @@
     "parameter permits to block the execution of queries with no criteria. " _
     "When turned off, a query must have some criteria specified to limit " _
     "the number of $terms.bugs returned to the user. When turned on, a user " _
-    "is allowed to run a query with no criteria and get all $terms.bugs he can " _
-    "see in his list. Turning this parameter on is not recommended on large " _
+    "is allowed to run a query with no criteria and get all $terms.bugs they can " _
+    "see in their list. Turning this parameter on is not recommended on large " _
     "installations.",
 
   default_search_limit =>
diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl
index da1580ed1..c6161d824 100644
--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -33,7 +33,7 @@
   [% ELSE %]
     might, in the future,
   [% END %]
-  allow him/her access to view this [% terms.bug %].</b>
+  allow them access to view this [% terms.bug %].</b>
   Do you wish to do this?
 </p>
 
diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl
index 2a3507ed2..3c8fcfbb2 100644
--- a/template/en/default/pages/quicksearch.html.tmpl
+++ b/template/en/default/pages/quicksearch.html.tmpl
@@ -346,7 +346,7 @@
   <a href="query.cgi?format=advanced">Advanced Search</a> form.</p>
 
 <ul class="qs_help">
-  <li>All [% terms.bugs %] reported by userA@company.com or assigned to him
+  <li>All [% terms.bugs %] reported by userA@company.com or assigned to them
     (the initial @ is a shortcut for the assignee, see the
     <a href="#shortcuts">Advanced Shortcuts</a> section above):<br>
     <kbd>ALL @userA@company.com OR reporter:userA@company.com</kbd></li>
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index f214bda0a..887bfc5e7 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -290,10 +290,10 @@
 <p>
   When a user uploads a new attachment and lets the "Content Type" field set to
   "auto-detect", Bugzilla now does its own MIME type detection
-  if the web browser tells him that the attachment is of type
+  if the web browser tells them that the attachment is of type
   "application/octet-stream", in an attempt to make a better guess than the web
   browser. In all other cases, Bugzilla still trusts what the browser
-  tells him.
+  tells them.
 </p>
 <p>
   Check the <a href="#v44_req_optional_mod">list of optional Perl modules</a> to
@@ -433,7 +433,7 @@
     set in the email itself.</li>
   <li><strong>Skins:</strong> Bugzilla no longer fetches all skins
     available when viewing a page. It only loads the skin selected by the user
-    in his preferences, which results in less requests to the server.</li>
+    in their preferences, which results in less requests to the server.</li>
 </ul>
 
 <h4>Enhancements for Administrators and Developers</h4>
diff --git a/template/en/default/pages/release-notes3.html.tmpl b/template/en/default/pages/release-notes3.html.tmpl
index caf345b0e..bb63a9093 100644
--- a/template/en/default/pages/release-notes3.html.tmpl
+++ b/template/en/default/pages/release-notes3.html.tmpl
@@ -2906,9 +2906,9 @@
   &quot;subscribe&quot; to those searches, and have them appear
   in their footer.</p>
 
-<p>If the sharer can &quot;bless&quot; the group he's sharing to,
-  (that is, if he can add users to that group), it's considered
-  that he's a manager of that group, and his queries show up
+<p>If the sharer can &quot;bless&quot; the group they're sharing to,
+  (that is, if they can add users to that group), it's considered
+  that they're a manager of that group, and their queries show up
   automatically in that group's footer (although they can
   unsubscribe from any particular search, if they want.)</p>
 
diff --git a/template/en/default/welcome-admin.html.tmpl b/template/en/default/welcome-admin.html.tmpl
index bc51cb7f8..3902daf74 100644
--- a/template/en/default/welcome-admin.html.tmpl
+++ b/template/en/default/welcome-admin.html.tmpl
@@ -55,7 +55,7 @@
 
     <li><a href="editparams.cgi?section=auth#createemailregexp_desc">createemailregexp</a>
     defines which users are allowed to create an account on this installation. If set
-    to ".*" (the default), everybody is free to create his own account. If set to
+    to ".*" (the default), everybody is free to create their own account. If set to
     "@mycompany.com$", only users having an account @mycompany.com will be allowed to
     create an account. If left blank, users will not be able to create accounts themselves;
     only an administrator will be able to create one for them. If you want a private