Index: mozilla/webtools/bugzilla/chart.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/chart.cgi,v retrieving revision 1.22 diff -u -r1.22 mozilla/webtools/bugzilla/chart.cgi --- mozilla/webtools/bugzilla/chart.cgi +++ mozilla/webtools/bugzilla/chart.cgi @@ -73,7 +73,7 @@ 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-". Some params even contain the # series_id they apply to (e.g. subscribe, unsubscribe.) my @actions = grep(/^action-/, $cgi->param()); Index: mozilla/webtools/bugzilla/editcomponents.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/editcomponents.cgi,v retrieving revision 1.80 diff -u -r1.80 mozilla/webtools/bugzilla/editcomponents.cgi --- mozilla/webtools/bugzilla/editcomponents.cgi +++ mozilla/webtools/bugzilla/editcomponents.cgi @@ -218,7 +218,7 @@ 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'); Index: mozilla/webtools/bugzilla/editproducts.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/editproducts.cgi,v retrieving revision 1.132 diff -u -r1.132 mozilla/webtools/bugzilla/editproducts.cgi --- mozilla/webtools/bugzilla/editproducts.cgi +++ mozilla/webtools/bugzilla/editproducts.cgi @@ -317,7 +317,7 @@ 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 = Index: mozilla/webtools/bugzilla/sanitycheck.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/sanitycheck.cgi,v retrieving revision 1.125 diff -u -r1.125 mozilla/webtools/bugzilla/sanitycheck.cgi --- mozilla/webtools/bugzilla/sanitycheck.cgi +++ mozilla/webtools/bugzilla/sanitycheck.cgi @@ -873,7 +873,7 @@ # The below list of resolutions is hardcoded 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", "Bugs with confirmed status but don't have everconfirmed set"); Index: mozilla/webtools/bugzilla/Bugzilla/Error.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Error.pm,v retrieving revision 1.19 diff -u -r1.19 mozilla/webtools/bugzilla/Bugzilla/Error.pm --- mozilla/webtools/bugzilla/Bugzilla/Error.pm +++ mozilla/webtools/bugzilla/Bugzilla/Error.pm @@ -173,7 +173,7 @@ Various places throughout the Bugzilla codebase need to report errors to the user. The C 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 Index: mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm,v retrieving revision 1.25 diff -u -r1.25 mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm --- mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm +++ mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm @@ -1902,7 +1902,7 @@ 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"; Index: mozilla/webtools/bugzilla/docs/rel_notes.txt =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/rel_notes.txt,v retrieving revision 1.42 diff -u -r1.42 mozilla/webtools/bugzilla/docs/rel_notes.txt --- mozilla/webtools/bugzilla/docs/rel_notes.txt +++ mozilla/webtools/bugzilla/docs/rel_notes.txt @@ -2360,7 +2360,7 @@ '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) @@ -2371,17 +2371,17 @@ *** 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 @@ -2435,7 +2435,7 @@ 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) @@ -2712,7 +2712,7 @@ *** SECURITY ISSUES RESOLVED *** -- Multiple instances of unauthorised access to confidential +- Multiple instances of unauthorized access to confidential bugs has been fixed. (bug 39524, 39526, 39527, 39531, 39533, 70189, 82781) @@ -2724,7 +2724,7 @@ - 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 @@ -2735,7 +2735,7 @@ - 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) Index: mozilla/webtools/bugzilla/docs/xml/about.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/about.xml,v retrieving revision 1.24 diff -u -r1.24 mozilla/webtools/bugzilla/docs/xml/about.xml --- mozilla/webtools/bugzilla/docs/xml/about.xml +++ mozilla/webtools/bugzilla/docs/xml/about.xml @@ -87,7 +87,7 @@ - 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: Arabic, Index: mozilla/webtools/bugzilla/docs/xml/customization.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/customization.xml,v retrieving revision 1.37 diff -u -r1.37 mozilla/webtools/bugzilla/docs/xml/customization.xml --- mozilla/webtools/bugzilla/docs/xml/customization.xml +++ mozilla/webtools/bugzilla/docs/xml/customization.xml @@ -1,6 +1,6 @@ - Customising Bugzilla + Customizing Bugzilla
Custom Skins Index: mozilla/webtools/bugzilla/docs/xml/introduction.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/introduction.xml,v retrieving revision 1.5 diff -u -r1.5 mozilla/webtools/bugzilla/docs/xml/introduction.xml --- mozilla/webtools/bugzilla/docs/xml/introduction.xml +++ mozilla/webtools/bugzilla/docs/xml/introduction.xml @@ -68,7 +68,7 @@ - Completely customisable and/or localisable web user + Completely customizable and/or localizable web user interface Index: mozilla/webtools/bugzilla/docs/xml/patches.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/patches.xml,v retrieving revision 1.24 diff -u -r1.24 mozilla/webtools/bugzilla/docs/xml/patches.xml --- mozilla/webtools/bugzilla/docs/xml/patches.xml +++ mozilla/webtools/bugzilla/docs/xml/patches.xml @@ -21,7 +21,7 @@ - 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. Index: mozilla/webtools/bugzilla/docs/xml/using.xml =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/using.xml,v retrieving revision 1.59 diff -u -r1.59 mozilla/webtools/bugzilla/docs/xml/using.xml --- mozilla/webtools/bugzilla/docs/xml/using.xml +++ mozilla/webtools/bugzilla/docs/xml/using.xml @@ -243,7 +243,7 @@ Priority: - 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. @@ -1024,7 +1024,7 @@
User Preferences - Once you have logged in, you can customise various aspects of + 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: Index: mozilla/webtools/bugzilla/template/en/default/account/prefs/settings.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/account/prefs/settings.html.tmpl,v retrieving revision 1.4 diff -u -r1.4 mozilla/webtools/bugzilla/template/en/default/account/prefs/settings.html.tmpl --- mozilla/webtools/bugzilla/template/en/default/account/prefs/settings.html.tmpl +++ mozilla/webtools/bugzilla/template/en/default/account/prefs/settings.html.tmpl @@ -35,7 +35,7 @@

All user preferences have been disabled by the maintainer - of this installation, and so you cannot customise any. + of this installation, and so you cannot customize any.

[% END %] Index: mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl,v retrieving revision 1.200 diff -u -r1.200 mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl --- mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl +++ mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl @@ -615,12 +615,12 @@ You entered [% value FILTER html %], 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" %] @@ -702,12 +702,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" %] Index: mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl,v retrieving revision 1.18 diff -u -r1.18 mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl --- mozilla/webtools/bugzilla/template/en/default/search/knob.html.tmpl +++ mozilla/webtools/bugzilla/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", Index: mozilla/webtools/bugzilla/template/en/default/search/search-help.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/search/search-help.html.tmpl,v retrieving revision 1.8 diff -u -r1.8 mozilla/webtools/bugzilla/template/en/default/search/search-help.html.tmpl --- mozilla/webtools/bugzilla/template/en/default/search/search-help.html.tmpl +++ mozilla/webtools/bugzilla/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",