diff options
| -rw-r--r-- | Bugzilla/Error.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Install/DB.pm | 2 | ||||
| -rwxr-xr-x | chart.cgi | 2 | ||||
| -rw-r--r-- | docs/rel_notes.txt | 22 | ||||
| -rw-r--r-- | docs/xml/about.xml | 4 | ||||
| -rw-r--r-- | docs/xml/customization.xml | 2 | ||||
| -rw-r--r-- | docs/xml/introduction.xml | 2 | ||||
| -rw-r--r-- | docs/xml/patches.xml | 2 | ||||
| -rw-r--r-- | docs/xml/using.xml | 4 | ||||
| -rwxr-xr-x | editcomponents.cgi | 2 | ||||
| -rwxr-xr-x | editproducts.cgi | 2 | ||||
| -rwxr-xr-x | sanitycheck.cgi | 4 | ||||
| -rw-r--r-- | template/en/default/account/prefs/settings.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/search/knob.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/search/search-help.html.tmpl | 2 |
16 files changed, 34 insertions, 34 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index 95088850e..d9f6e70b3 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -173,7 +173,7 @@ Bugzilla::Error - Error handling utilities for Bugzilla Various places throughout the Bugzilla codebase need to report errors to the user. The C<Throw*Error> family of functions allow this to be done in a -generic and localisable manner. +generic and localizable manner. These functions automatically unlock the database tables, if there were any locked. They will also roll back the transaction, if it is supported by diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index 4b4e7a068..99b405736 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -1896,7 +1896,7 @@ sub _copy_old_charts_into_database { qw(FIXED INVALID WONTFIX LATER REMIND DUPLICATE WORKSFORME MOVED); my @fields = (@statuses, @resolutions); - # We have a localisation problem here. Where do we get these values? + # We have a localization problem here. Where do we get these values? my $all_name = "-All-"; my $open_name = "All Open"; @@ -73,7 +73,7 @@ my $action = $cgi->param('action'); my $series_id = $cgi->param('series_id'); # Because some actions are chosen by buttons, we can't encode them as the value -# of the action param, because that value is localisation-dependent. So, we +# of the action param, because that value is localization-dependent. So, we # encode it in the name, as "action-<action>". Some params even contain the # series_id they apply to (e.g. subscribe, unsubscribe). my @actions = grep(/^action-/, $cgi->param()); diff --git a/docs/rel_notes.txt b/docs/rel_notes.txt index 64212a292..47317d0a3 100644 --- a/docs/rel_notes.txt +++ b/docs/rel_notes.txt @@ -2387,7 +2387,7 @@ See also next section. 'letsubmitterchoosepriority' was off. (bug 63018) -- Most CGIs are now templatised. This helps to make it +- Most CGIs are now templatized. This helps to make it easier to remember to HTML filter values and easier to spot when they are not, preventing cross site scripting attacks. (bug 86168) @@ -2398,17 +2398,17 @@ See also next section. *** IMPORTANT CHANGES *** -- 2.16 introduces "templatisation", a new feature that allows - administrators to easily customise the HTML output (the "look and feel") +- 2.16 introduces "templatization", a new feature that allows + administrators to easily customize the HTML output (the "look and feel") of Bugzilla without altering Perl code. Bugzilla uses the - "Template Toolkit" for this. Please see the "Template Customisation" + "Template Toolkit" for this. Please see the "Template Customization" section of the Bugzilla Guide for more details. - Administrators who ran the 2.15 development version and customised + Administrators who ran the 2.15 development version with custom templates should check the templates are still valid, as file names and file paths have changed. - Most output is now templatised. This process will be complete next + Most output is now templatized. This process will be complete next milestone. For speed, compiled templates are cached on disk. If you modify the @@ -2462,7 +2462,7 @@ See also next section. lengthy delays in future if this problem reoccurs. (bug 106377) -- In parallel with templatisation, a lot of changes have been made to the HTML +- In parallel with templatization, a lot of changes have been made to the HTML output of the Bugzilla CGIs. This could break code that attempts to parse such code. For example, this breaks mozbot. (no bug number) @@ -2739,8 +2739,8 @@ known to us after the Bugzilla 2.14 release. *** SECURITY ISSUES RESOLVED *** -- Multiple instances of unauthorised access to confidential - bugs has been fixed. +- Multiple instances of unauthorized access to confidential + bugs have been fixed. (bug 39524, 39526, 39527, 39531, 39533, 70189, 82781) - Multiple instances of untrusted parameters not being @@ -2751,7 +2751,7 @@ known to us after the Bugzilla 2.14 release. - After logging in passwords no longer appear in the URL. (bug 15980) -- Procedures to prevent unauthorised access to confidential +- Procedures to prevent unauthorized access to confidential files are now simpler. In particular the shadow directory no longer exists and the data/comments file no longer needs to be directly accessible, so the entire data directory can @@ -2762,7 +2762,7 @@ known to us after the Bugzilla 2.14 release. - If they do not already exist, checksetup.pl will attempt to write Apache .htaccess files by default, to prevent - unauthorised access to confidential files. You can turn this + unauthorized access to confidential files. You can turn this off in the localconfig file. (bug 76154) diff --git a/docs/xml/about.xml b/docs/xml/about.xml index e14bb451e..7e00ed568 100644 --- a/docs/xml/about.xml +++ b/docs/xml/about.xml @@ -1,6 +1,6 @@ <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ <!ENTITY conventions SYSTEM "conventions.xml"> ] > --> -<!-- $Id: about.xml,v 1.24 2006/06/06 15:24:10 uid623 Exp $ --> +<!-- $Id: about.xml,v 1.25 2007/07/22 22:25:12 timeless%mozdev.org Exp $ --> <chapter id="about"> <title>About This Guide</title> @@ -87,7 +87,7 @@ </para> <para> - In addition, there are Bugzilla template localisation projects in + In addition, there are Bugzilla template localization projects in the following languages. They may have translated documentation available: <ulink url="http://sourceforge.net/projects/bugzilla-ar/">Arabic</ulink>, diff --git a/docs/xml/customization.xml b/docs/xml/customization.xml index a513610be..824b88de9 100644 --- a/docs/xml/customization.xml +++ b/docs/xml/customization.xml @@ -1,6 +1,6 @@ <!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> --> <chapter id="customization"> - <title>Customising Bugzilla</title> + <title>Customizing Bugzilla</title> <section id="cust-skins"> <title>Custom Skins</title> diff --git a/docs/xml/introduction.xml b/docs/xml/introduction.xml index 5cf4a5599..3968702c6 100644 --- a/docs/xml/introduction.xml +++ b/docs/xml/introduction.xml @@ -68,7 +68,7 @@ </listitem> <listitem> - <para>Completely customisable and/or localisable web user + <para>Completely customizable and/or localizable web user interface</para> </listitem> diff --git a/docs/xml/patches.xml b/docs/xml/patches.xml index b1d92816f..12efb0ca4 100644 --- a/docs/xml/patches.xml +++ b/docs/xml/patches.xml @@ -21,7 +21,7 @@ <warning> <para> - These files pre-date the templatisation work done as part of the + These files pre-date the templatization work done as part of the 2.16 release, and have not been updated. </para> </warning> diff --git a/docs/xml/using.xml b/docs/xml/using.xml index ad59385bb..3c200a30a 100644 --- a/docs/xml/using.xml +++ b/docs/xml/using.xml @@ -243,7 +243,7 @@ <listitem> <para> <emphasis>Priority:</emphasis> - The bug assignee uses this field to prioritise his or her bugs. + The bug assignee uses this field to prioritize his or her bugs. It's a good idea not to change this on other people's bugs.</para> </listitem> @@ -1064,7 +1064,7 @@ <section id="userpreferences"> <title>User Preferences</title> - <para>Once you have logged in, you can customise various aspects of + <para>Once you have logged in, you can customize various aspects of Bugzilla via the "Edit prefs" link in the page footer. The preferences are split into three tabs:</para> diff --git a/editcomponents.cgi b/editcomponents.cgi index f28a87b7a..09acc0c51 100755 --- a/editcomponents.cgi +++ b/editcomponents.cgi @@ -218,7 +218,7 @@ if ($action eq 'new') { my $prodcomp = "&product=" . url_quote($product->name) . "&component=" . url_quote($comp_name); - # For localisation reasons, we get the title of the queries from the + # For localization reasons, we get the title of the queries from the # submitted form. my $open_name = $cgi->param('open_name'); my $nonopen_name = $cgi->param('nonopen_name'); diff --git a/editproducts.cgi b/editproducts.cgi index dac5799ad..9be85ded9 100755 --- a/editproducts.cgi +++ b/editproducts.cgi @@ -317,7 +317,7 @@ if ($action eq 'new') { push(@series, [$resolution, "resolution=" .url_quote($resolution)]); } - # For localisation reasons, we get the name of the "global" subcategory + # For localization reasons, we get the name of the "global" subcategory # and the title of the "open" query from the submitted form. my @openedstatuses = BUG_STATE_OPEN; my $query = diff --git a/sanitycheck.cgi b/sanitycheck.cgi index db25f5842..157281b11 100755 --- a/sanitycheck.cgi +++ b/sanitycheck.cgi @@ -874,10 +874,10 @@ Status('bug_check_status_everconfirmed'); BugCheck("bugs WHERE bug_status = 'UNCONFIRMED' AND everconfirmed = 1", 'bug_check_status_everconfirmed_error_text'); -# The below list of resolutions is hardcoded because we don't know if future +# The below list of resolutions is hard-coded because we don't know if future # resolutions will be confirmed, unconfirmed or maybeconfirmed. I suspect # they will be maybeconfirmed, e.g. ASLEEP and REMIND. This hardcoding should -# disappear when we have customised statuses. +# disappear when we have customized statuses. BugCheck("bugs WHERE bug_status IN ('NEW', 'ASSIGNED', 'REOPENED') AND everconfirmed = 0", 'bug_check_status_everconfirmed_error_text2'); diff --git a/template/en/default/account/prefs/settings.html.tmpl b/template/en/default/account/prefs/settings.html.tmpl index 568dac0cb..c47615dd9 100644 --- a/template/en/default/account/prefs/settings.html.tmpl +++ b/template/en/default/account/prefs/settings.html.tmpl @@ -35,7 +35,7 @@ <p class="criticalmessages"> All user preferences have been disabled by the <a href="mailto:[% Param("maintainer") %]">maintainer</a> - of this installation, and so you cannot customise any. + of this installation, and so you cannot customize any. </p> [% END %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 658532766..77d7d335c 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -629,12 +629,12 @@ You entered <tt>[% value FILTER html %]</tt>, which isn't. [% ELSIF error == "illegal_attachment_edit" %] - [% title = "Unauthorised Action" %] - You are not authorised to edit attachment [% attach_id FILTER html %]. + [% title = "Unauthorized Action" %] + You are not authorized to edit attachment [% attach_id FILTER html %]. [% ELSIF error == "illegal_attachment_edit_bug" %] - [% title = "Unauthorised Action" %] - You are not authorised to edit attachments on [% terms.bug %] + [% title = "Unauthorized Action" %] + You are not authorized to edit attachments on [% terms.bug %] [%+ bug_id FILTER html %]. [% ELSIF error == "illegal_attachment_is_patch" %] @@ -721,12 +721,12 @@ [% ELSIF error == "illegal_series_creation" %] [% admindocslinks = {'groups.html' => 'Group security'} %] [% docslinks = {'reporting.html' => 'Reporting'} %] - You are not authorised to create series. + You are not authorized to create series. [% ELSIF error == "illegal_series_edit" %] [% admindocslinks = {'groups.html' => 'Group security'} %] [% docslinks = {'reporting.html' => 'Reporting'} %] - You are not authorised to edit this series. To do this, you must either + You are not authorized to edit this series. To do this, you must either be its creator, or an administrator. [% ELSIF error == "insufficient_data_points" %] diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl index 58c83fdef..39ecaa107 100644 --- a/template/en/default/search/knob.html.tmpl +++ b/template/en/default/search/knob.html.tmpl @@ -32,7 +32,7 @@ [% PROCESS global/variables.none.tmpl %] -[%# This is not necessary for English templates, but useful for localisers. %] +[%# This is not necessary for English templates, but useful for localizers. %] [% ordersdesc = { "Reuse same sort as last time" => "Reuse same sort as last time", "Bug Number" => "$terms.Bug Number", diff --git a/template/en/default/search/search-help.html.tmpl b/template/en/default/search/search-help.html.tmpl index ef80fd39a..3f39b97b2 100644 --- a/template/en/default/search/search-help.html.tmpl +++ b/template/en/default/search/search-help.html.tmpl @@ -70,7 +70,7 @@ { id => "bug_severity", html => "How severe the $terms.bug is, or whether it's an enhancement." }, { id => "priority", - html => "Engineers prioritise their $terms.bugs using this field." }, + html => "Engineers prioritize their $terms.bugs using this field." }, { id => "rep_platform", html => "The hardware platform the $terms.bug was observed on." }, { id => "op_sys", |