From d0308956b71eac546865487bf50c328456471b27 Mon Sep 17 00:00:00 2001 From: Charlie Somerville Date: Thu, 27 Feb 2014 09:48:50 +0100 Subject: Bug 947823: Replace gender-specific pronouns with gender-neutral pronouns r=gerv a=justdave --- template/en/default/admin/confirm-action.html.tmpl | 2 +- template/en/default/admin/params/auth.html.tmpl | 4 ++-- template/en/default/admin/params/query.html.tmpl | 4 ++-- template/en/default/bug/process/confirm-duplicate.html.tmpl | 2 +- template/en/default/pages/quicksearch.html.tmpl | 2 +- template/en/default/pages/release-notes.html.tmpl | 6 +++--- template/en/default/pages/release-notes3.html.tmpl | 6 +++--- template/en/default/welcome-admin.html.tmpl | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'template/en/default') 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 @@
  • 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.
  • ", 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 %]. + allow them access to view this [% terms.bug %]. Do you wish to do this?

    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 @@ Advanced Search form.

    Enhancements for Administrators and Developers

    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 @@ "subscribe" to those searches, and have them appear in their footer.

    -

    If the sharer can "bless" 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 +

    If the sharer can "bless" 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.)

    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 @@
  • createemailregexp 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 -- cgit v1.2.3-24-g4f1b