diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index fb98e730d4a..a343f5208c2 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -8325 \ No newline at end of file +8326 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/docs/en/xml/administration.xml b/mozilla/webtools/bugzilla/docs/en/xml/administration.xml index f3c640a5bd0..d0525d917e4 100644 --- a/mozilla/webtools/bugzilla/docs/en/xml/administration.xml +++ b/mozilla/webtools/bugzilla/docs/en/xml/administration.xml @@ -2362,7 +2362,7 @@ ReadOnly: ENTRY, NA/NA, CANEDIT Keywords are global, rather than per-product. If the administrator changes a keyword currently applied to any bugs, the keyword cache must be rebuilt - using the script. Currently keywords can not + using the script. Currently keywords cannot be marked obsolete to prevent future usage. @@ -2386,7 +2386,7 @@ ReadOnly: ENTRY, NA/NA, CANEDIT - Before adding a Custom Field, make sure that Bugzilla can not already + Before adding a Custom Field, make sure that Bugzilla cannot already do the desired behavior. Many Bugzilla options are not enabled by default, and many times Administrators find that simply enabling certain options that already exist is sufficient. @@ -3160,7 +3160,7 @@ ReadOnly: ENTRY, NA/NA, CANEDIT To run the "Sanity Check" script, log in as an Administrator and click the "Sanity Check" link in the admin page. Any problems that are found will be displayed in red letters. If the script is capable of fixing a problem, - it will present a link to initiate the fix. If the script can not + it will present a link to initiate the fix. If the script cannot fix the problem it will require manual database administration or recovery. diff --git a/mozilla/webtools/bugzilla/docs/en/xml/customization.xml b/mozilla/webtools/bugzilla/docs/en/xml/customization.xml index 1bc3f10d84d..ce549b8ea02 100644 --- a/mozilla/webtools/bugzilla/docs/en/xml/customization.xml +++ b/mozilla/webtools/bugzilla/docs/en/xml/customization.xml @@ -488,7 +488,7 @@ except group restrictions (unless they are members of the groups they are trying to change). Bug reporters also have the ability to edit some fields, but in a more restrictive manner. Other users, without - editbugs privileges, can not edit + editbugs privileges, cannot edit bugs, except to comment and add themselves to the CC list. diff --git a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml index bf9c5a1cc53..8c5c29b8e8f 100644 --- a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml +++ b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml @@ -2394,7 +2394,7 @@ bash$ ./checksetup.pl The period at the beginning of the command - ./checksetup.pl is important and can not + ./checksetup.pl is important and cannot be omitted. diff --git a/mozilla/webtools/bugzilla/docs/en/xml/using.xml b/mozilla/webtools/bugzilla/docs/en/xml/using.xml index da389c43b10..e625cca1657 100644 --- a/mozilla/webtools/bugzilla/docs/en/xml/using.xml +++ b/mozilla/webtools/bugzilla/docs/en/xml/using.xml @@ -1531,7 +1531,7 @@ - Indicates user can not be impersonated by other users. + Indicates user cannot be impersonated by other users. @@ -2014,7 +2014,7 @@ When running queries, the whining system acts as if you are the user executing the query. This means that the whining system will ignore - bugs that match your query, but that you can not access. + bugs that match your query, but that you cannot access. diff --git a/mozilla/webtools/bugzilla/editparams.cgi b/mozilla/webtools/bugzilla/editparams.cgi index 002697db019..b522fd41401 100755 --- a/mozilla/webtools/bugzilla/editparams.cgi +++ b/mozilla/webtools/bugzilla/editparams.cgi @@ -119,7 +119,7 @@ if ($action eq 'save' && $current_module) { } } elsif ($name eq 'globalwatchers') { # can't check this as others, as Bugzilla::Config::Common - # can not use Bugzilla::User + # cannot use Bugzilla::User foreach my $watcher (split(/[,\s]+/, $value)) { ThrowUserError( 'invalid_parameter', diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl index a5d04abbec8..122df361215 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl @@ -101,7 +101,7 @@ [% IF value_count == 1 %]
  • '[% value.name FILTER html %]' is the last value for - '[%- field.description FILTER html %]', and so it can not be deleted. + '[%- field.description FILTER html %]', and so it cannot be deleted.
    • [% END %] diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl index 9f6590a7368..a4bb0e67216 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl @@ -219,7 +219,7 @@
    - [%# Limit entry form: the button can not do anything when total depth + [%# Limit entry form: the button cannot do anything when total depth is less than two, so disable it %] [% url FILTER html %] is too long. @@ -332,8 +332,8 @@ integer between 0 and [% constants.MAX_SMALLINT FILTER html %]. [% ELSIF error == "classification_not_deletable" %] - [% title = "Default Classification Can Not Be Deleted" %] - You can not delete the default classification + [% title = "Default Classification Cannot Be Deleted" %] + You cannot delete the default classification [% ELSIF error == "classification_has_products" %] Sorry, there are products for this classification. You @@ -435,11 +435,11 @@ Your message did not contain any text, as far as we could tell. [% ELSIF error == "empty_group_description" %] - [% title = "The group description can not be empty" %] + [% title = "The group description cannot be empty" %] You must enter a description for the group. [% ELSIF error == "empty_group_name" %] - [% title = "The group name can not be empty" %] + [% title = "The group name cannot be empty" %] You must enter a name for the group. [% ELSIF error == "entry_access_denied" %]