From 09dd4d3192073ba9ecc7feb8a5dfcd213affd525 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Mon, 24 Sep 2018 17:27:12 -0400 Subject: Bug 1493500 - Remove all trailing whitespaces from all files --- template/en/default/account/auth/login.html.tmpl | 4 +- template/en/default/account/create.html.tmpl | 2 +- template/en/default/account/created.html.tmpl | 2 +- .../en/default/account/email/confirm.html.tmpl | 2 +- .../en/default/account/email/request-new.txt.tmpl | 2 +- .../account/password/forgotten-password.txt.tmpl | 2 +- template/en/default/account/prefs/email.html.tmpl | 36 +- .../en/default/account/prefs/permissions.html.tmpl | 2 +- template/en/default/account/prefs/prefs.html.tmpl | 6 +- .../default/account/prefs/saved-searches.html.tmpl | 12 +- .../en/default/account/profile-activity.html.tmpl | 4 +- .../en/default/admin/classifications/add.html.tmpl | 4 +- .../en/default/admin/classifications/del.html.tmpl | 4 +- .../admin/classifications/edit-common.html.tmpl | 2 +- .../default/admin/classifications/edit.html.tmpl | 6 +- .../default/admin/classifications/select.html.tmpl | 4 +- .../admin/components/confirm-delete.html.tmpl | 22 +- .../en/default/admin/components/create.html.tmpl | 4 +- .../en/default/admin/components/edit.html.tmpl | 4 +- .../en/default/admin/components/footer.html.tmpl | 16 +- .../en/default/admin/components/list.html.tmpl | 8 +- .../admin/components/select-product.html.tmpl | 8 +- .../en/default/admin/custom_fields/cf-js.js.tmpl | 2 +- .../default/admin/custom_fields/create.html.tmpl | 2 +- .../en/default/admin/custom_fields/edit.html.tmpl | 10 +- .../en/default/admin/custom_fields/list.html.tmpl | 2 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 14 +- .../en/default/admin/fieldvalues/create.html.tmpl | 8 +- .../en/default/admin/fieldvalues/edit.html.tmpl | 8 +- .../en/default/admin/fieldvalues/footer.html.tmpl | 4 +- .../en/default/admin/fieldvalues/list.html.tmpl | 6 +- .../admin/fieldvalues/select-field.html.tmpl | 4 +- template/en/default/admin/flag-type/edit.html.tmpl | 6 +- .../default/admin/groups/confirm-remove.html.tmpl | 10 +- template/en/default/admin/groups/create.html.tmpl | 12 +- template/en/default/admin/groups/delete.html.tmpl | 14 +- template/en/default/admin/groups/edit.html.tmpl | 28 +- template/en/default/admin/groups/list.html.tmpl | 4 +- .../admin/keywords/confirm-delete.html.tmpl | 4 +- .../en/default/admin/keywords/create.html.tmpl | 2 +- .../admin/milestones/confirm-delete.html.tmpl | 10 +- .../en/default/admin/milestones/create.html.tmpl | 2 +- .../en/default/admin/milestones/footer.html.tmpl | 8 +- .../en/default/admin/milestones/list.html.tmpl | 8 +- .../admin/milestones/select-product.html.tmpl | 8 +- .../en/default/admin/params/bugchange.html.tmpl | 2 +- .../en/default/admin/params/bugfields.html.tmpl | 2 +- template/en/default/admin/params/common.html.tmpl | 2 +- .../default/admin/params/groupsecurity.html.tmpl | 4 +- template/en/default/admin/params/index.html.tmpl | 2 +- .../en/default/admin/params/usermatch.html.tmpl | 2 +- .../admin/products/confirm-delete.html.tmpl | 2 +- .../en/default/admin/products/create.html.tmpl | 6 +- .../default/admin/products/edit-common.html.tmpl | 6 +- template/en/default/admin/products/edit.html.tmpl | 10 +- .../en/default/admin/products/footer.html.tmpl | 10 +- .../products/groupcontrol/confirm-edit.html.tmpl | 2 +- .../admin/products/groupcontrol/edit.html.tmpl | 4 +- .../admin/products/groupcontrol/updated.html.tmpl | 4 +- .../admin/products/list-classifications.html.tmpl | 6 +- template/en/default/admin/products/list.html.tmpl | 12 +- .../en/default/admin/products/updated.html.tmpl | 14 +- template/en/default/admin/settings/edit.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 36 +- template/en/default/admin/table.html.tmpl | 20 +- template/en/default/admin/users/search.html.tmpl | 2 +- template/en/default/admin/users/userdata.html.tmpl | 2 +- .../admin/versions/confirm-delete.html.tmpl | 14 +- .../en/default/admin/versions/create.html.tmpl | 2 +- .../en/default/admin/versions/footer.html.tmpl | 8 +- template/en/default/admin/versions/list.html.tmpl | 2 +- .../admin/versions/select-product.html.tmpl | 8 +- template/en/default/attachment/diff-file.html.tmpl | 4 +- .../en/default/attachment/diff-footer.html.tmpl | 2 +- template/en/default/attachment/edit.html.tmpl | 28 +- .../en/default/bug/create/comment-guided.txt.tmpl | 6 +- .../en/default/bug/create/create-guided.html.tmpl | 40 +- .../en/default/bug/create/user-message.html.tmpl | 2 +- template/en/default/bug/dependency-tree.html.tmpl | 30 +- template/en/default/bug/field-events.js.tmpl | 2 +- template/en/default/bug/field-help.none.tmpl | 18 +- template/en/default/bug/field-label.html.tmpl | 2 +- template/en/default/bug/field.html.tmpl | 24 +- template/en/default/bug/format_comment.txt.tmpl | 2 +- template/en/default/bug/knob.html.tmpl | 4 +- template/en/default/bug/link.html.tmpl | 4 +- template/en/default/bug/new_bug.html.tmpl | 4 +- template/en/default/bug/process/midair.html.tmpl | 4 +- .../bug/process/verify-new-product.html.tmpl | 20 +- template/en/default/bug/show-multiple.html.tmpl | 10 +- template/en/default/bug/show.xml.tmpl | 10 +- template/en/default/bug/summarize-time.html.tmpl | 20 +- template/en/default/config.js.tmpl | 6 +- template/en/default/email/bugmail-common.txt.tmpl | 3 +- template/en/default/email/bugmail-header.txt.tmpl | 2 +- template/en/default/email/bugmail.html.tmpl | 2 +- template/en/default/email/lockout.txt.tmpl | 2 +- template/en/default/email/sudo.txt.tmpl | 6 +- template/en/default/email/whine.txt.tmpl | 4 +- template/en/default/extensions/extension.pm.tmpl | 2 +- .../en/default/extensions/hook-readme.txt.tmpl | 2 +- .../en/default/extensions/name-readme.txt.tmpl | 2 +- template/en/default/extensions/util.pm.tmpl | 4 +- .../default/global/choose-classification.html.tmpl | 4 +- .../en/default/global/choose-product.html.tmpl | 2 +- template/en/default/global/code-error.html.tmpl | 2 +- .../en/default/global/confirm-user-match.html.tmpl | 2 +- template/en/default/global/reason-descs.none.tmpl | 2 +- template/en/default/global/select-menu.html.tmpl | 14 +- template/en/default/global/user.html.tmpl | 2 +- template/en/default/global/value-descs.js.tmpl | 2 +- template/en/default/global/value-descs.none.tmpl | 2 +- template/en/default/global/variables.none.tmpl | 8 +- template/en/default/index.html.tmpl | 4 +- template/en/default/list/change-columns.html.tmpl | 12 +- template/en/default/list/edit-multiple.html.tmpl | 20 +- template/en/default/list/list.atom.tmpl | 2 +- template/en/default/list/list.html.tmpl | 24 +- template/en/default/list/list.rdf.tmpl | 10 +- template/en/default/list/quips.html.tmpl | 4 +- template/en/default/list/table.html.tmpl | 52 +- template/en/default/pages/bug-writing.html.tmpl | 44 +- template/en/default/pages/bugzilla.dtd.tmpl | 86 +- template/en/default/pages/linked.html.tmpl | 2 +- template/en/default/pages/quicksearch.html.tmpl | 30 +- template/en/default/pages/release-notes.html.tmpl | 62 +- template/en/default/pages/release-notes3.html.tmpl | 1362 ++++++++++---------- template/en/default/pages/sudo.html.tmpl | 28 +- template/en/default/reports/chart.csv.tmpl | 6 +- template/en/default/reports/chart.html.tmpl | 14 +- template/en/default/reports/chart.png.tmpl | 12 +- template/en/default/reports/create-chart.html.tmpl | 42 +- .../en/default/reports/duplicates-table.html.tmpl | 8 +- template/en/default/reports/duplicates.html.tmpl | 10 +- template/en/default/reports/edit-series.html.tmpl | 12 +- template/en/default/reports/report-line.png.tmpl | 2 +- template/en/default/reports/report-pie.png.tmpl | 4 +- template/en/default/reports/report-table.html.tmpl | 18 +- template/en/default/reports/report.csv.tmpl | 4 +- template/en/default/reports/report.html.tmpl | 34 +- .../en/default/reports/series-common.html.tmpl | 30 +- template/en/default/reports/series.html.tmpl | 14 +- template/en/default/request/queue.html.tmpl | 8 +- template/en/default/search/field.html.tmpl | 38 +- template/en/default/search/form.html.tmpl | 108 +- template/en/default/search/knob.html.tmpl | 10 +- .../default/search/search-create-series.html.tmpl | 14 +- .../en/default/search/search-instant.html.tmpl | 2 +- .../default/search/search-report-graph.html.tmpl | 2 +- .../default/search/search-report-select.html.tmpl | 4 +- .../default/search/search-report-table.html.tmpl | 2 +- .../en/default/search/search-specific.html.tmpl | 8 +- template/en/default/search/tabs.html.tmpl | 4 +- template/en/default/search/type-select.html.tmpl | 4 +- template/en/default/whine/mail.html.tmpl | 2 +- template/en/default/whine/schedule.html.tmpl | 4 +- 156 files changed, 1495 insertions(+), 1496 deletions(-) (limited to 'template') diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 8cf5e85ef..84e5bd62a 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -26,7 +26,7 @@ [% IF !target %] [% target = "index.cgi" %] [% END %] - + [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl @@ -57,7 +57,7 @@ - [% IF Param('rememberlogin') == 'defaulton' || + [% IF Param('rememberlogin') == 'defaulton' || Param('rememberlogin') == 'defaultoff' %]
-[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl index 39add3238..c0f094366 100644 --- a/template/en/default/account/email/confirm.html.tmpl +++ b/template/en/default/account/email/confirm.html.tmpl @@ -21,7 +21,7 @@ [%# INTERFACE: # token: string. The token to be used in this address change. #%] - + [% title = "Confirm Change Email" %] [% PROCESS global/header.html.tmpl %] diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 8fb36926f..45f5ab11f 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -29,7 +29,7 @@ X-Bugzilla-Type: admin [%+ terms.Bugzilla %] has received a request to create a user account using your email address ([% email %]). -To continue creating an account using this email address, visit the +To continue creating an account using this email address, visit the following link by [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]: [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=request_new_account diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index e014658dc..70373f52b 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -25,7 +25,7 @@ To: [% emailaddress %] Subject: [% terms.Bugzilla %] Change Password Request X-Bugzilla-Type: admin -You have (or someone impersonating you has) requested to change your +You have (or someone impersonating you has) requested to change your [%+ terms.Bugzilla %] password. To complete the change, visit the following link: [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cfmpw diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 014bf4f3d..132625368 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -78,7 +78,7 @@ document.write(' [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] - @@ -90,7 +90,7 @@ document.write(' [% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] - @@ -159,7 +159,7 @@ document.write(' [% FOREACH relationship = relationships %] -   @@ -223,12 +223,12 @@ document.write(' [% FOREACH relationship = relationships %] - @@ -239,16 +239,16 @@ document.write('Users watching you:
[% IF watchers.size %] @@ -294,7 +294,7 @@ You are currently not watching any users.

You can specify a list of [% terms.bugs %] from which you never want to get any email notification of any kind by adding their ID(s) as a comma-separated - list. Removing [% terms.abug %] by selecting it from the current ignored list + list. Removing [% terms.abug %] by selecting it from the current ignored list will re-enable email notifications for the [% terms.bug %].

[% IF user.bugs_ignored.size %] @@ -324,5 +324,5 @@ You are currently not watching any users. [% END %]

Add [% terms.bugs %]:
-

diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl index d3c787b07..a4597205c 100644 --- a/template/en/default/account/prefs/permissions.html.tmpl +++ b/template/en/default/account/prefs/permissions.html.tmpl @@ -85,7 +85,7 @@ [% IF user.in_group('bz_sudoers') %]
- You are a member of the bz_sudoers group, so you can + You are a member of the bz_sudoers group, so you can impersonate someone else. [% END %] diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index ec24eb100..631b08a10 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -25,11 +25,11 @@ # description: string. Description of the tab (used in tab title). # saveable: boolean. True if tab has a form which can be submitted. # True if user is not receiving self-generated mail. - # Note: For each tab name, a template "prefs/${tab.name}.tmpl" must exist, + # Note: For each tab name, a template "prefs/${tab.name}.tmpl" must exist, # and its interface must be fulfilled. # current_tab: A direct reference to one of the hashes in the tabs list. # This tab will be displayed. - # changes_saved: boolean/string. True if the CGI processed form data before + # changes_saved: boolean/string. True if the CGI processed form data before # displaying anything, and can contain an optional custom # message if required (which Perl still evaluates as True). # dont_show_button: boolean. Prevent the display of the "Submit Changes" button. @@ -134,7 +134,7 @@ [% END %] -[% PROCESS "account/prefs/${current_tab.name}.html.tmpl" +[% PROCESS "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %] [% IF current_tab.saveable %] diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 426b593dc..e611aa682 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -43,7 +43,7 @@

Your saved searches are as follows:

- +
-
Search @@ -82,7 +82,7 @@   - @@ -114,7 +114,7 @@ [% END %] - Don't share [% FOREACH group = queryshare_groups %] [% END %] @@ -160,7 +160,7 @@ [% IF user.queries_available.size %]

You may use these searches saved and shared by others:

- +
- diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl index 17d04de67..138ecd50b 100644 --- a/template/en/default/admin/classifications/edit.html.tmpl +++ b/template/en/default/admin/classifications/edit.html.tmpl @@ -55,13 +55,13 @@
Search @@ -197,7 +197,7 @@ [% q.name FILTER uri %]">Edit - -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/classifications/add.html.tmpl b/template/en/default/admin/classifications/add.html.tmpl index 1a6941f67..90b15d539 100644 --- a/template/en/default/admin/classifications/add.html.tmpl +++ b/template/en/default/admin/classifications/add.html.tmpl @@ -34,6 +34,6 @@ -[% PROCESS admin/classifications/footer.html.tmpl %] +[% PROCESS admin/classifications/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl index 5a3800f7a..ffd7d2f02 100644 --- a/template/en/default/admin/classifications/del.html.tmpl +++ b/template/en/default/admin/classifications/del.html.tmpl @@ -58,6 +58,6 @@ -[% PROCESS admin/classifications/footer.html.tmpl %] +[% PROCESS admin/classifications/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/classifications/edit-common.html.tmpl b/template/en/default/admin/classifications/edit-common.html.tmpl index e0db0089f..b839c9384 100644 --- a/template/en/default/admin/classifications/edit-common.html.tmpl +++ b/template/en/default/admin/classifications/edit-common.html.tmpl @@ -24,7 +24,7 @@
Classification:
- -[% PROCESS admin/classifications/footer.html.tmpl %] +[% PROCESS admin/classifications/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl index bc78cbb6e..af29be324 100644 --- a/template/en/default/admin/classifications/select.html.tmpl +++ b/template/en/default/admin/classifications/select.html.tmpl @@ -34,7 +34,7 @@ [% FOREACH cl = classifications %]
[% cl.name FILTER html %] + [% IF cl.description %] [% cl.description FILTER html_light %] [% ELSE %] @@ -63,4 +63,4 @@
-[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index a3dae68bb..60b08b430 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -49,7 +49,7 @@ from '[% product.name FILTER html %]' product Default assignee: [% comp.default_assignee.login FILTER html %] - + [% IF Param('useqacontact') %] @@ -103,23 +103,23 @@ from '[% product.name FILTER html %]' product

Confirmation

- + [% IF comp.bug_count %] [% IF !Param("allowbugdeletion") %]

Sorry, there - [% IF comp.bug_count > 1 %] - are [% comp.bug_count %] [%+ terms.bugs %] + [% IF comp.bug_count > 1 %] + are [% comp.bug_count %] [%+ terms.bugs %] [% ELSE %] - is [% comp.bug_count %] [%+ terms.bug %] + is [% comp.bug_count %] [%+ terms.bug %] [% END %] - outstanding for this component. You must reassign + outstanding for this component. You must reassign [% IF comp.bug_count > 1 %] - those [% terms.bugs %] + those [% terms.bugs %] [% ELSE %] that [% terms.bug %] [% END %] @@ -130,8 +130,8 @@ from '[% product.name FILTER html %]' product - @@ -67,7 +67,7 @@ - or or Delete this component. diff --git a/template/en/default/admin/components/footer.html.tmpl b/template/en/default/admin/components/footer.html.tmpl index ec1869b29..aa3509bb7 100644 --- a/template/en/default/admin/components/footer.html.tmpl +++ b/template/en/default/admin/components/footer.html.tmpl @@ -19,7 +19,7 @@ #%] [%# INTERFACE: - # comp: object; Bugzilla::Component object representing the component + # comp: object; Bugzilla::Component object representing the component # product: object; Bugzilla::Product object representing the product to # which the component belongs. #%] @@ -27,26 +27,26 @@

-Edit +Edit [% IF comp && !no_edit_component_link %] - component - '[% comp.name FILTER html %]' + '[% comp.name FILTER html %]' or edit [% END %] [% IF !no_edit_other_components_link %] -other components of product '[% product.name FILTER html %]', - or edit + [%- product.name FILTER uri %]">'[% product.name FILTER html %]', + or edit [% END %] -product '[% product.name FILTER html %]'. diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl index b45b97565..7a333d33d 100644 --- a/template/en/default/admin/components/list.html.tmpl +++ b/template/en/default/admin/components/list.html.tmpl @@ -42,17 +42,17 @@ [% columns = [ - { + { name => "name" heading => "Edit component..." contentlink => edit_contentlink }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 }, - { + { name => "initialowner" heading => "Default Assignee" }, diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl index 0910f9802..7defbd065 100644 --- a/template/en/default/admin/components/select-product.html.tmpl +++ b/template/en/default/admin/components/select-product.html.tmpl @@ -32,14 +32,14 @@ %] [% columns = [ - { + { name => "name" heading => "Edit components of..." - contentlink => "editcomponents.cgi?product=%%name%%" + contentlink => "editcomponents.cgi?product=%%name%%" }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 } ] diff --git a/template/en/default/admin/custom_fields/cf-js.js.tmpl b/template/en/default/admin/custom_fields/cf-js.js.tmpl index cc1a4e4aa..e7c669af1 100644 --- a/template/en/default/admin/custom_fields/cf-js.js.tmpl +++ b/template/en/default/admin/custom_fields/cf-js.js.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is NASA. - # Portions created by NASA are Copyright (C) 2008 + # Portions created by NASA are Copyright (C) 2008 # San Jose State University Foundation. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl index 2b3f0eadb..79a9603a3 100644 --- a/template/en/default/admin/custom_fields/create.html.tmpl +++ b/template/en/default/admin/custom_fields/create.html.tmpl @@ -110,7 +110,7 @@ YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('ty
Use this label for the list of [% terms.bugs %] that link to - [%+ terms.abug %] with this + [%+ terms.abug %] with this [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] field. For example, if the description is "Is a duplicate of", the reverse description would be "Duplicates of this [% terms.bug %]". diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl index ab6eeec0c..147d6ee93 100644 --- a/template/en/default/admin/custom_fields/edit.html.tmpl +++ b/template/en/default/admin/custom_fields/edit.html.tmpl @@ -92,7 +92,7 @@ value="[% field.reverse_desc FILTER html %]">
Use this label for the list of [% terms.bugs %] that link to - [%+ terms.abug %] with this + [%+ terms.abug %] with this [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %] field. For example, if the description is "Is a duplicate of", the reverse description would be "Duplicates of this [% terms.bug %]". @@ -111,7 +111,7 @@ [% FOREACH sel_field = Bugzilla.fields({ is_select => 1 }) %] [% NEXT IF sel_field.id == field.id %]

@@ -156,7 +156,7 @@ [% FOREACH sel_field = Bugzilla.fields({ is_select => 1 }) %] [% NEXT IF sel_field.id == field.id %] diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl index 9c42ce639..8d20e1e41 100644 --- a/template/en/default/admin/fieldvalues/edit.html.tmpl +++ b/template/en/default/admin/fieldvalues/edit.html.tmpl @@ -21,7 +21,7 @@ [% PROCESS global/variables.none.tmpl %] [% title = BLOCK %] - Edit Value '[% value.name FILTER html %]' for the + Edit Value '[% value.name FILTER html %]' for the '[% field.description FILTER html %]' ([% field.name FILTER html %]) field [% END %] [% PROCESS global/header.html.tmpl @@ -49,7 +49,7 @@ - [% IF field.name == "bug_status" %] @@ -71,7 +71,7 @@ [% FOREACH field_value = field.value_field.legal_values %] [% NEXT IF field_value.name == '' %] - diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl index 54d961623..a3830702c 100644 --- a/template/en/default/admin/groups/confirm-remove.html.tmpl +++ b/template/en/default/admin/groups/confirm-remove.html.tmpl @@ -46,21 +46,21 @@

This option will remove all explicitly defined users from '[% group.name FILTER html %].'

[% END %] - +

Generally, you will only need to do this when upgrading groups created with [% terms.Bugzilla %] versions 2.16 and earlier. Use this option with extreme care and consult the documentation for further information.

- + - +

Or return to the Edit Groups page.

- -[% PROCESS global/footer.html.tmpl %] + +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index a6facbfe1..6b733538a 100644 --- a/template/en/default/admin/groups/create.html.tmpl +++ b/template/en/default/admin/groups/create.html.tmpl @@ -100,8 +100,8 @@ than deleting the group would be. Note: If you are creating a group, you probably want it to be usable for [% terms.bugs %], in which case you should leave this checked.

-

User RegExp is optional, and if filled in, will -automatically grant membership to this group to anyone with an +

User RegExp is optional, and if filled in, will +automatically grant membership to this group to anyone with an email address that matches this regular expression.

@@ -111,13 +111,13 @@ email address that matches this regular expression.

in comments in [% terms.bugs %] besides the name of the author of comments.

-

By default, the new group will be associated with existing -products. Unchecking the "Insert new group into all existing -products" option will prevent this and make the group become +

By default, the new group will be associated with existing +products. Unchecking the "Insert new group into all existing +products" option will prevent this and make the group become visible only when its controls have been added to a product.

Back to the main [% terms.bugs %] page or to the group list. -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl index b93c84b25..794ca259c 100644 --- a/template/en/default/admin/groups/delete.html.tmpl +++ b/template/en/default/admin/groups/delete.html.tmpl @@ -71,12 +71,12 @@ [% IF group.bugs.size %]

[% group.bugs.size FILTER html %] [%+ terms.bug %] reports are - visible only to this group. You cannot delete this group while any + visible only to this group. You cannot delete this group while any [%+ terms.bugs %] are using it.
Show me - which [% terms.bugs %] - + which [% terms.bugs %] -

@@ -113,7 +113,7 @@ [% SET hidden = 0 %] [% IF data.controls.othercontrol == constants.CONTROLMAPMANDATORY AND data.controls.membercontrol == constants.CONTROLMAPMANDATORY - AND data.controls.entry + AND data.controls.entry %] [% SET hidden = 1 %] [% END %] @@ -133,14 +133,14 @@

[% END %] - + [% IF group.flag_types.size %]

This group restricts who can make changes to flags of certain types. You cannot delete this group while there are flag types using it.
Show - me which types - + me which types -

[% END %] @@ -167,7 +167,7 @@

Confirmation

Do you really want to delete this group?

- [% IF group.users.size || group.bugs.size || group.products.size + [% IF group.users.size || group.bugs.size || group.products.size || group.flags.size %]

You must check all of the above boxes or correct the @@ -184,4 +184,4 @@ Go back to the group list. -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl index f0dce8c85..0f764c841 100644 --- a/template/en/default/admin/groups/edit.html.tmpl +++ b/template/en/default/admin/groups/edit.html.tmpl @@ -26,7 +26,7 @@ # group - A Bugzilla::Group representing the group being edited. # *_current - Arrays of Bugzilla::Group objects that show the current # values for this group, as far as grants. - # *_available - Arrays of Bugzilla::Group objects that show the current + # *_available - Arrays of Bugzilla::Group objects that show the current # available values for each grant. #%] @@ -58,7 +58,7 @@

@@ -126,7 +126,7 @@ @@ -139,10 +139,10 @@
- There [% IF comp.bug_count > 1 %] - are [% comp.bug_count %] [%+ terms.bugs %] + There [% IF comp.bug_count > 1 %] + are [% comp.bug_count %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] [% END %] @@ -147,7 +147,7 @@ from '[% product.name FILTER html %]' product [% IF comp.bug_count == 0 || Param('allowbugdeletion') %]

Do you really want to delete this component?

- +
@@ -160,4 +160,4 @@ from '[% product.name FILTER html %]' product [% PROCESS admin/components/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl index b6b79f8b6..13b2c8e41 100644 --- a/template/en/default/admin/components/create.html.tmpl +++ b/template/en/default/admin/components/create.html.tmpl @@ -23,7 +23,7 @@ # product: object; Bugzilla::Product object representing the product to # which the component belongs. #%] - + [% title = BLOCK %]Add component to the [% product.name FILTER html %] product[% END %] [% PROCESS global/header.html.tmpl javascript_urls = [ "js/field.js" ] @@ -35,7 +35,7 @@ [% PROCESS "admin/components/edit-common.html.tmpl" %] - +
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index e1083e7e8..ecfb3e299 100644 --- a/template/en/default/admin/components/edit.html.tmpl +++ b/template/en/default/admin/components/edit.html.tmpl @@ -44,7 +44,7 @@
-
@@ -65,7 +65,7 @@ [% IF field.value_field %]
-
[% IF value.is_default %] diff --git a/template/en/default/admin/fieldvalues/footer.html.tmpl b/template/en/default/admin/fieldvalues/footer.html.tmpl index 7d4a41d47..1b94b5c0e 100644 --- a/template/en/default/admin/fieldvalues/footer.html.tmpl +++ b/template/en/default/admin/fieldvalues/footer.html.tmpl @@ -36,7 +36,7 @@ [% END %] [% IF value.defined && !no_edit_link %] - Edit value '[% field.description FILTER html %]' field. diff --git a/template/en/default/admin/fieldvalues/list.html.tmpl b/template/en/default/admin/fieldvalues/list.html.tmpl index 2b6aedb6f..d84f9a59d 100644 --- a/template/en/default/admin/fieldvalues/list.html.tmpl +++ b/template/en/default/admin/fieldvalues/list.html.tmpl @@ -16,7 +16,7 @@ [%# INTERFACE: # values: array of hashes having the following properties: # - name: string; The value. - # - sortkey: number; The sortkey used to order the value when + # - sortkey: number; The sortkey used to order the value when # displayed to the user in a list. # # field: object; the field we are editing values for. @@ -41,12 +41,12 @@ [% columns = [ - { + { name => "name" heading => "Edit field value..." contentlink => edit_contentlink }, - { + { name => "sortkey" heading => "Sortkey" }, diff --git a/template/en/default/admin/fieldvalues/select-field.html.tmpl b/template/en/default/admin/fieldvalues/select-field.html.tmpl index 3704d42aa..33f6f656b 100644 --- a/template/en/default/admin/fieldvalues/select-field.html.tmpl +++ b/template/en/default/admin/fieldvalues/select-field.html.tmpl @@ -16,7 +16,7 @@ [%# INTERFACE: # fields: Array of hashes. Each hash contains only one key, "name." - # The names are the same as the keys from field_descs + # The names are the same as the keys from field_descs # (see global/field-descs.html.tmpl). #%] @@ -30,7 +30,7 @@ %] [% columns = [ - { + { name => "name" heading => "Edit field values for..." content_use_field = 1 diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 69dc05bd3..b3cdf52e8 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -120,7 +120,7 @@ [% END %]
- @@ -128,13 +128,13 @@ 		Inclusions:
[% PROCESS category_select name="inclusion_to_remove" categories = inclusions %]
- 		Exclusions:
[% PROCESS category_select name="exclusion_to_remove" categories = exclusions %]
-
Group: [% IF group.is_bug_group %] - [% ELSE %] [% group.name FILTER html %] @@ -70,7 +70,7 @@ Description: [% IF group.is_bug_group %] - [% ELSE %] [% group.description FILTER html %] @@ -81,7 +81,7 @@
User Regexp: -
Use For [% terms.Bugs %]: -
@@ -151,7 +151,7 @@ items_available = members_available items_current = members_current %] - + @@ -162,7 +162,7 @@ @@ -212,11 +212,11 @@ - +

Mass Remove

You can use this form to do mass-removal of users from groups. - This is often very useful if you upgraded from [% terms.Bugzilla %] + This is often very useful if you upgraded from [% terms.Bugzilla %] 2.16.

Groups That Are a Member of This Group
- ("Users in X are automatically in + ("Users in X are automatically in [%+ group.name FILTER html %]")		 Groups That This Group Is a Member Of
- ("If you are in [% group.name FILTER html %], you are + ("If you are in [% group.name FILTER html %], you are automatically also in...")
[% PROCESS select_pair name = "member_of" size = 10 items_available = member_of_available items_current = member_of_current %]
Groups That Can Grant Membership in This Group
- ("Users in X can add other users to + ("Users in X can add other users to [%+ group.name FILTER html %]")
@@ -227,7 +227,7 @@ -

If you leave the field blank, all explicit memberships in +

If you leave the field blank, all explicit memberships in this group will be removed.

@@ -235,10 +235,10 @@
- +

Back to the group list.

-[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] [% BLOCK select_pair %] diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index 1d137dc5f..e3e96ee87 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -86,7 +86,7 @@ content => " " } } - } + } %] [% FOREACH group IN ["chartgroup", "insidergroup", "timetrackinggroup", "querysharegroup"] %] @@ -120,7 +120,7 @@ content => "user" } } -%] +%] [% PROCESS admin/table.html.tmpl columns = columns diff --git a/template/en/default/admin/keywords/confirm-delete.html.tmpl b/template/en/default/admin/keywords/confirm-delete.html.tmpl index 20a6deee7..7fd93439a 100644 --- a/template/en/default/admin/keywords/confirm-delete.html.tmpl +++ b/template/en/default/admin/keywords/confirm-delete.html.tmpl @@ -35,7 +35,7 @@ There are [% keyword.bug_count FILTER html %] [%+ terms.bugs %] with this keyword set. [% END %] - + Are you sure you want to delete the [% keyword.name FILTER html %] keyword?

@@ -50,4 +50,4 @@

Edit other keywords.

-[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/create.html.tmpl b/template/en/default/admin/keywords/create.html.tmpl index e5d6aa0df..02bf84218 100644 --- a/template/en/default/admin/keywords/create.html.tmpl +++ b/template/en/default/admin/keywords/create.html.tmpl @@ -22,7 +22,7 @@ [%# INTERFACE: # none #%] - + [% PROCESS global/header.html.tmpl title = "Add keyword" subheader = "This page allows you to add a new keyword." diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl index 068e8e254..1d47610df 100644 --- a/template/en/default/admin/milestones/confirm-delete.html.tmpl +++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl @@ -63,20 +63,20 @@

Confirmation

- + [% IF milestone.bug_count %]
There - [% IF milestone.bug_count > 1 %] - are [% milestone.bug_count FILTER none %] [%+ terms.bugs %] + [% IF milestone.bug_count > 1 %] + are [% milestone.bug_count FILTER none %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] [% END %] entered for this milestone! When you delete this milestone, ALL of these [% terms.bugs %] will be retargeted - to [% product.default_milestone FILTER html %], the default milestone for + to [% product.default_milestone FILTER html %], the default milestone for the [% product.name FILTER html %] product.
@@ -95,4 +95,4 @@ [% PROCESS admin/milestones/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl index d7c2f580f..740ef2e67 100644 --- a/template/en/default/admin/milestones/create.html.tmpl +++ b/template/en/default/admin/milestones/create.html.tmpl @@ -22,7 +22,7 @@ # product: object; Bugzilla::Product object representing the product to # which the milestone belongs. #%] - + [% title = BLOCK %]Add Milestone to Product '[% product.name FILTER html %]'[% END %] [% subheader = BLOCK %]This page allows you to add a new milestone to product '[% product.name FILTER html %]'.[% END %] diff --git a/template/en/default/admin/milestones/footer.html.tmpl b/template/en/default/admin/milestones/footer.html.tmpl index 1cae69e17..f35283d6f 100644 --- a/template/en/default/admin/milestones/footer.html.tmpl +++ b/template/en/default/admin/milestones/footer.html.tmpl @@ -40,11 +40,11 @@ [% UNLESS no_add_milestone_link %] Add a milestone. + [%- product.name FILTER uri %]">Add a milestone. [% END %] [% IF milestone.name && !no_edit_milestone_link %] - Edit milestone '[% product.name FILTER html %]'. [% END %] - Edit product '[% product.name FILTER html %]'. diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl index 6392f567f..4a79b9c31 100644 --- a/template/en/default/admin/milestones/list.html.tmpl +++ b/template/en/default/admin/milestones/list.html.tmpl @@ -45,12 +45,12 @@ [% columns = [ - { + { name => "name" heading => "Edit milestone..." contentlink => edit_contentlink }, - { + { name => "sortkey" heading => "Sortkey" }, @@ -88,8 +88,8 @@ content => "(Default milestone)" override_contentlink => 1 contentlink => undef - } -%] + } +%] [% Hook.process('before_table') %] diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl index 587db6d65..ab052377b 100644 --- a/template/en/default/admin/milestones/select-product.html.tmpl +++ b/template/en/default/admin/milestones/select-product.html.tmpl @@ -32,14 +32,14 @@ %] [% columns = [ - { + { name => "name" heading => "Edit milestones of..." - contentlink => "editmilestones.cgi?product=%%name%%" + contentlink => "editmilestones.cgi?product=%%name%%" }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 } ] diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl index 15d4f1e29..324603125 100644 --- a/template/en/default/admin/params/bugchange.html.tmpl +++ b/template/en/default/admin/params/bugchange.html.tmpl @@ -41,7 +41,7 @@ "If off, then all $terms.bugs initially have the default " _ "milestone for the product being filed in.", - musthavemilestoneonaccept => + musthavemilestoneonaccept => "If you are using ${field_descs.target_milestone}, do you want to require" _ " that the milestone be set in order for a user to set" _ " ${terms.abug}'s status to ${accept_status}?", diff --git a/template/en/default/admin/params/bugfields.html.tmpl b/template/en/default/admin/params/bugfields.html.tmpl index a0d9664ad..9c09610e1 100644 --- a/template/en/default/admin/params/bugfields.html.tmpl +++ b/template/en/default/admin/params/bugfields.html.tmpl @@ -37,7 +37,7 @@ 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?", - use_see_also => + use_see_also => "Do you wish to use the See Also field? It allows you refer to" _ " $terms.bugs in other installations. Even if you disable this field," _ " $terms.bug relationships (URLs) already set on $terms.bugs will" diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl index cd135e1d2..e7b480c69 100644 --- a/template/en/default/admin/params/common.html.tmpl +++ b/template/en/default/admin/params/common.html.tmpl @@ -138,7 +138,7 @@ Unknown param type [% param.type FILTER html %]!!! - [% END %] + [% END %]

[% UNLESS param.no_reset %]

diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl index 041af6833..1fca6488c 100644 --- a/template/en/default/admin/params/groupsecurity.html.tmpl +++ b/template/en/default/admin/params/groupsecurity.html.tmpl @@ -50,13 +50,13 @@ usevisibilitygroups => "Do you wish to restrict visibility of users to members of " _ "specific groups?", - + strict_isolation => "Don't allow users to be assigned to, " _ "be qa-contacts on, " _ "be added to CC list, " _ "or make or remove dependencies " _ "involving any bug that is in a product on which that " _ - "user is forbidden to edit.", + "user is forbidden to edit.", } %] diff --git a/template/en/default/admin/params/index.html.tmpl b/template/en/default/admin/params/index.html.tmpl index de6a56f2e..3ded64710 100644 --- a/template/en/default/admin/params/index.html.tmpl +++ b/template/en/default/admin/params/index.html.tmpl @@ -37,7 +37,7 @@ [% param.name FILTER html %] - + [% panel.title FILTER html %] diff --git a/template/en/default/admin/params/usermatch.html.tmpl b/template/en/default/admin/params/usermatch.html.tmpl index d574edca7..8eaf53889 100644 --- a/template/en/default/admin/params/usermatch.html.tmpl +++ b/template/en/default/admin/params/usermatch.html.tmpl @@ -30,7 +30,7 @@ "sites where there are a large number of users.", ajax_user_autocompletion => "If this option is set, typing characters in a certain user " _ - "fields will display a list of matches that can be selected from.", + "fields will display a list of matches that can be selected from.", maxusermatches => "Search for no more than this many matches.
" _ "If set to '1', no users will be displayed on ambiguous matches. " _ diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index aa728df75..1bd04a5e1 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -18,7 +18,7 @@ # # (classification fields available if Param('useclassification') is enabled:) # - # classification: Bugzilla::Classification object; The classification + # classification: Bugzilla::Classification object; The classification # the product is in # #%] diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index d2167c64b..e7046dbe8 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -15,7 +15,7 @@ [%# INTERFACE: # classification: Bugzilla::Classification object; If classifications - # are enabled, then this is + # are enabled, then this is # the currently selected classification # #%] @@ -43,7 +43,7 @@ Version: - @@ -63,7 +63,7 @@ [% PROCESS "admin/products/footer.html.tmpl" - no_add_product_link = 1 + no_add_product_link = 1 no_edit_product_link = 1 %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl index 4812707cd..2bb0c8920 100644 --- a/template/en/default/admin/products/edit-common.html.tmpl +++ b/template/en/default/admin/products/edit-common.html.tmpl @@ -29,10 +29,10 @@ [% classification.name FILTER html %] [% END %] - + Product: - @@ -62,7 +62,7 @@ [% END %] - + Open for [% terms.bug %] entry: [% product.bug_count FILTER html %] - - - + [% PROCESS "admin/products/footer.html.tmpl" - no_add_product_link = 1 + no_add_product_link = 1 no_edit_product_link = 1 %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/products/footer.html.tmpl b/template/en/default/admin/products/footer.html.tmpl index 78e1864a7..542a526df 100644 --- a/template/en/default/admin/products/footer.html.tmpl +++ b/template/en/default/admin/products/footer.html.tmpl @@ -17,7 +17,7 @@ # product: Bugzilla::Product Object; the product # # classification: Bugzilla::Classification object ; If classifications - # are enabled, then this is the currently + # are enabled, then this is the currently # selected classification # # no_XXX_link: boolean; if defined, then don't show the corresponding @@ -35,7 +35,7 @@ [% classification_url_part_start = BLOCK %]classification= [%- classification.name FILTER uri %] [% END %] - [% classification_text = BLOCK %] + [% classification_text = BLOCK %] of classification '[% classification.name FILTER html %]' [% END %] [% END %] @@ -58,8 +58,8 @@ [% END %] [% IF product && !no_edit_product_link %] - Edit product '[% product.name FILTER html %]'. @@ -68,7 +68,7 @@ [%# Edit other products (in a classification if specified): %] [% UNLESS no_edit_other_products_link %] - Edit other products [% classification_text %]. diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index f9c836980..05abc5fdb 100644 --- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -27,7 +27,7 @@ [% PROCESS global/header.html.tmpl title = title %] [% FOREACH group = mandatory_groups %]

-group '[% group.name FILTER html %]' impacts [% group.count %] +group '[% group.name FILTER html %]' impacts [% group.count %] [%+ terms.bugs %] for which the group is newly mandatory and will be added. [% END %] diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 8c634ebfe..027c80172 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -23,8 +23,8 @@ [% title = BLOCK %] Edit Group Controls for [% product.name FILTER html %] [% END %] -[% PROCESS global/header.html.tmpl - title = title +[% PROCESS global/header.html.tmpl + title = title %]

diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl index 353ce5c75..5bc7cd4d2 100644 --- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl @@ -10,7 +10,7 @@ # # The Original Code is the Bugzilla Bug Tracking System. # - # Contributor(s): André Batosti + # Contributor(s): André Batosti # #%] @@ -37,7 +37,7 @@ [% IF changes._group_controls.now_mandatory.size %] [% FOREACH g = changes._group_controls.now_mandatory %] - Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is + Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is mandatory for this product

[% g.bug_count FILTER html %] [%+ terms.bugs %] added

[% END %] diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl index 161cc4b5b..94f19f108 100644 --- a/template/en/default/admin/products/list-classifications.html.tmpl +++ b/template/en/default/admin/products/list-classifications.html.tmpl @@ -28,17 +28,17 @@ %] [% columns = [ - { + { name => "name" heading => "Edit products of..." contentlink => 'editproducts.cgi?classification=%%name%%' }, - { + { name => "description" heading => "Description" allow_html_content => 1 }, - { + { name => "product_count" align => "right" heading => "Product Count" diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index 0641c6283..dceeefed6 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -14,10 +14,10 @@ #%] [%# INTERFACE: - # products: array of Bugzilla::Product objects + # products: array of Bugzilla::Product objects # # classification: Bugzilla::Classification object; If classifications - # are enabled, then this is + # are enabled, then this is # the currently selected classification # showbugcounts: boolean; true if bug counts should be included in the table #%] @@ -28,7 +28,7 @@ [% classification_url_part = BLOCK %]&classification= [%- classification.name FILTER uri %] [%- END %] - [% classification_title = BLOCK %] + [% classification_title = BLOCK %] in classification '[% classification.name FILTER html %]' [% END %] [% END %] @@ -38,17 +38,17 @@ %] [% columns = [ - { + { name => "name" heading => "Edit product..." contentlink => 'editproducts.cgi?action=edit&product=%%name%%' }, - { + { name => "description" heading => "Description" allow_html_content => 1 }, - { + { name => "is_active" heading => "Open For New $terms.Bugs" yesno_field => 1 diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl index d93022a6e..5ddea6675 100644 --- a/template/en/default/admin/products/updated.html.tmpl +++ b/template/en/default/admin/products/updated.html.tmpl @@ -32,7 +32,7 @@ [% END %] [% END %] -[% title = BLOCK %]Updating Product '[% product.name FILTER html %]' +[% title = BLOCK %]Updating Product '[% product.name FILTER html %]' [% classification_text FILTER none %][% END %] [% PROCESS global/header.html.tmpl title = title @@ -63,7 +63,7 @@ [% IF product.is_active %] open for [% ELSE %] - closed to + closed to [% END %] new [% terms.bugs %].

@@ -79,15 +79,15 @@ [% IF changes.allows_unconfirmed.defined %]

[% IF product.allows_unconfirmed %] - The product now allows the + The product now allows the [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status. [% ELSE %] - The product no longer allows the + The product no longer allows the [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status. - Note that any + Note that any - [%- terms.bugs %] that currently have the + [%- product.name FILTER uri %]&bug_status=UNCONFIRMED"> + [%- terms.bugs %] that currently have the [%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status will remain in that status until they are edited. [% END %] diff --git a/template/en/default/admin/settings/edit.html.tmpl b/template/en/default/admin/settings/edit.html.tmpl index eeb6c3203..23c8fdbce 100644 --- a/template/en/default/admin/settings/edit.html.tmpl +++ b/template/en/default/admin/settings/edit.html.tmpl @@ -96,7 +96,7 @@ page, and the Default Value will automatically apply to everyone. - +

[% ELSE %] There are no preferences to edit. diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index e88ae2617..24b934732 100644 --- a/template/en/default/admin/sudo.html.tmpl +++ b/template/en/default/admin/sudo.html.tmpl @@ -17,7 +17,7 @@ # # Contributor(s): A. Karl Kornel #%] - + [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl @@ -26,28 +26,28 @@ style_urls = ['skins/standard/admin.css'] doc_section = "useradmin.html#impersonatingusers" %] - + [% DEFAULT target_login = "" %]

- The sudo feature of [% terms.Bugzilla %] allows you to impersonate a - user for a short time While an sudo session is in progress, every action you - perform will be taking place as if you had logged in as the user whom will be + The sudo feature of [% terms.Bugzilla %] allows you to impersonate a + user for a short time While an sudo session is in progress, every action you + perform will be taking place as if you had logged in as the user whom will be impersonating.

- This is a very powerful feature; you should be very careful while using it. + This is a very powerful feature; you should be very careful while using it. Your actions may be logged more carefully than normal.

- To begin, + To begin, [% IF Param('usemenuforusers') %] - select + select [% ELSE %] - enter the login of + enter the login of [% END %] : [% INCLUDE global/userselect.html.tmpl @@ -58,39 +58,39 @@ size => 30 %]

- + [% IF !Param('usemenuforusers') %]

The username must be entered exactly. No matching will be performed.

[% END %] - +

Next, please take a moment to explain

- +

The message you enter here will be sent to the impersonated user by email. - You may leave this empty if you wish, but they will still know that you + You may leave this empty if you wish, but they will still know that you are impersonating them.

- + [% IF user.authorizer.can_login %]

Finally, enter :
- This is done for two reasons. First of all, it is done to reduce - the chances of someone doing large amounts of damage using your - already-logged-in account. Second, it is there to force you to take the + This is done for two reasons. First of all, it is done to reduce + the chances of someone doing large amounts of damage using your + already-logged-in account. Second, it is there to force you to take the time to consider if you really need to use this feature.

[% END %] - +

Click the button to begin the session: diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl index 69fae3dac..f96688b2c 100644 --- a/template/en/default/admin/table.html.tmpl +++ b/template/en/default/admin/table.html.tmpl @@ -21,8 +21,8 @@ [%# INTERFACE: # - # columns: - # array of hashes representing the columns in the table. + # columns: + # array of hashes representing the columns in the table. # Each hash contains data for a single column. Hash keys: # name: Name of the field in the data param # heading: The text to print at the header cell @@ -30,11 +30,11 @@ # Expressions of format %%xxx%% are replaced with value # with the key xxx in data hash of the current row. # content: If specified, the content of this variable is used - # instead of the data pulled from the current row. + # instead of the data pulled from the current row. # NOTE: This value is only partially HTML filtered! - # content_use_field: If defined and true, then each value in the + # content_use_field: If defined and true, then each value in the # column corresponds with a key in the - # field_descs field, and that value from the + # field_descs field, and that value from the # field_descs hash will be used instead of "content." # See fieldvalues/select-field for an example of use. # This content WILL be HTML-filtered in this case. @@ -69,7 +69,7 @@ # against. The second hash then again points to another hash. Within this # third hash (3), the keys represent values to match against. The item # contains a fourth hash (4) specifying overridden values. - # + # # Each column value mentioned in the 'columns' documentation above # can be overwritten (apart from name and heading). To override a # table-cell value 'xxx', specify a new 'xxx' value, and specify a @@ -123,7 +123,7 @@ [%# Are there any specific overrides for this column? %] [% FOREACH match_field = overrides.${c.name}.keys %] - + [% override = overrides.${c.name}.${match_field}.${row.$match_field} %] [% NEXT UNLESS override %] @@ -153,7 +153,7 @@ [% END %] [% END %] - + [% IF content_use_field && field_descs.exists(row.${c.name}) %] [% colname = row.${c.name} %] [% field_descs.${colname} FILTER html %] @@ -174,11 +174,11 @@ [% END %] [% END %] [% END %] - + [% IF contentlink %] [% END %] - + [% END %] diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl index b9dbccb36..a6994ac3f 100644 --- a/template/en/default/admin/users/search.html.tmpl +++ b/template/en/default/admin/users/search.html.tmpl @@ -21,7 +21,7 @@ # id: group id # name: group name #%] - + [% PROCESS global/header.html.tmpl title = "Search users" diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl index c4ab07010..32cc43f10 100644 --- a/template/en/default/admin/users/userdata.html.tmpl +++ b/template/en/default/admin/users/userdata.html.tmpl @@ -24,7 +24,7 @@ [% IF editusers %] - [% IF editform %] [% IF !otheruser.in_group('bz_sudo_protect') %] diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl index 39091d5fc..64d931cb1 100644 --- a/template/en/default/admin/versions/confirm-delete.html.tmpl +++ b/template/en/default/admin/versions/confirm-delete.html.tmpl @@ -67,16 +67,16 @@ [% IF version.bug_count %]

Sorry, there - [% IF version.bug_count > 1 %] - are [% version.bug_count FILTER none %] [%+ terms.bugs %] + [% IF version.bug_count > 1 %] + are [% version.bug_count FILTER none %] [%+ terms.bugs %] [% ELSE %] - is [% version.bug_count FILTER none %] [%+ terms.bug %] + is [% version.bug_count FILTER none %] [%+ terms.bug %] [% END %] - outstanding for this version. You must move + outstanding for this version. You must move [% IF version.bug_count > 1 %] - those [% terms.bugs %] + those [% terms.bugs %] [% ELSE %] that [% terms.bug %] [% END %] @@ -85,7 +85,7 @@ [% ELSE %]

Do you really want to delete this version?

- + @@ -98,4 +98,4 @@ [% PROCESS admin/versions/footer.html.tmpl %] -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl index 2b75dabeb..3529c3238 100644 --- a/template/en/default/admin/versions/create.html.tmpl +++ b/template/en/default/admin/versions/create.html.tmpl @@ -22,7 +22,7 @@ # product: object; Bugzilla::Product object representing the product to # which the version is being created for #%] - + [% title = BLOCK %]Add Version to Product '[% product.name FILTER html %]'[% END %] [% subheader = BLOCK %]This page allows you to add a new version to product '[% product.name FILTER html %]'.[% END %] diff --git a/template/en/default/admin/versions/footer.html.tmpl b/template/en/default/admin/versions/footer.html.tmpl index ae26e5744..6c94b9ce1 100644 --- a/template/en/default/admin/versions/footer.html.tmpl +++ b/template/en/default/admin/versions/footer.html.tmpl @@ -38,11 +38,11 @@ [% UNLESS no_add_version_link %] Add a version. + [%- product.name FILTER uri %]">Add a version. [% END %] [% IF version.name && !no_edit_version_link %] - Edit version '[% product.name FILTER html %]'. [% END %] - Edit product '[% product.name FILTER html %]'. diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl index 69435d220..f77b7e870 100644 --- a/template/en/default/admin/versions/list.html.tmpl +++ b/template/en/default/admin/versions/list.html.tmpl @@ -41,7 +41,7 @@ [% columns = [ - { + { name => "name" heading => "Edit version..." contentlink => edit_contentlink diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl index 7fded475e..ccb46a193 100644 --- a/template/en/default/admin/versions/select-product.html.tmpl +++ b/template/en/default/admin/versions/select-product.html.tmpl @@ -32,14 +32,14 @@ %] [% columns = [ - { + { name => "name" heading => "Edit versions of..." - contentlink => "editversions.cgi?product=%%name%%" + contentlink => "editversions.cgi?product=%%name%%" }, - { + { name => "description" - heading => "Description" + heading => "Description" allow_html_content => 1 } ] diff --git a/template/en/default/attachment/diff-file.html.tmpl b/template/en/default/attachment/diff-file.html.tmpl index d510b5a5e..7bd04160a 100644 --- a/template/en/default/attachment/diff-file.html.tmpl +++ b/template/en/default/attachment/diff-file.html.tmpl @@ -68,7 +68,7 @@ incremental_restore() [% END %] [% IF section.old_lines > 1 %] -  Lines [% section.old_start %]-[% section.old_start + +  Lines [% section.old_start %]-[% section.old_start + section.old_lines - 1 %] [% ELSE %] Line [% section.old_start %] @@ -77,7 +77,7 @@ incremental_restore() [% END %]   [% section.func_info FILTER html IF section.func_info %] - [% END %] + [% END %] Link Here  diff --git a/template/en/default/attachment/diff-footer.html.tmpl b/template/en/default/attachment/diff-footer.html.tmpl index e9965a9a8..fe98162e2 100644 --- a/template/en/default/attachment/diff-footer.html.tmpl +++ b/template/en/default/attachment/diff-footer.html.tmpl @@ -34,7 +34,7 @@ Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %] [% PROCESS global/footer.html.tmpl %] - + [% ELSE %] diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index d06d4ad56..44d388ec1 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -62,8 +62,8 @@
- [% "[patch]" IF attachment.ispatch%] - + [% "[patch]" IF attachment.ispatch%] + [% attachment.description FILTER html %] [% IF can_edit %] @@ -96,28 +96,28 @@ wrap = 'soft' classes = 'block' _ editable_or_hide defaultcontent = attachment.description - %] + %]
+ value="[% attachment.filename FILTER html %]">
+ value="[% attachment.contenttype FILTER html %]">
- +
Creator: [%+ INCLUDE global/user.html.tmpl who = attachment.attacher %]
- +
Size: [% IF attachment.datasize %] @@ -136,7 +136,7 @@
-
@@ -156,7 +156,7 @@
[% END %]
-
+
@@ -249,8 +249,8 @@ [% ELSE %]

- Attachment is not viewable in your browser because its MIME type - ([% attachment.contenttype FILTER html %]) is not one that your browser is + Attachment is not viewable in your browser because its MIME type + ([% attachment.contenttype FILTER html %]) is not one that your browser is able to display.

@@ -285,12 +285,12 @@ [% Hook.process('form_before_submit') %] - [% IF user.id %] + [% IF user.id %]

- [% END %] -
+ [% END %] +
diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl index 67748e594..baf390c18 100644 --- a/template/en/default/bug/create/comment-guided.txt.tmpl +++ b/template/en/default/bug/create/comment-guided.txt.tmpl @@ -24,7 +24,7 @@ # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to # pull out various custom fields and format an initial Description entry # from them. - #%] + #%] [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] User-Agent: [%+ cgi.user_agent() %] @@ -42,12 +42,12 @@ Steps to Reproduce: [% END %] [% IF cgi.param("actual_results") %] -Actual Results: +Actual Results: [%+ cgi.param("actual_results") %] [% END %] [% IF cgi.param("expected_results") %] -Expected Results: +Expected Results: [%+ cgi.param("expected_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 a1c2c2e08..9201eb977 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -62,7 +62,7 @@ function PutDescription() {

Step 1 of 3 - has your [% terms.bug %] already been reported?

- Please don't skip this step - half of all + Please don't skip this step - half of all [% terms.bugs %] filed are reported already. Check the two lists of frequently-reported [% terms.bugs %]: @@ -79,7 +79,7 @@ function PutDescription() {

All-time Top 20 (loaded initially) | - Hot in the last two weeks + Hot in the last two weeks