summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Selsky <selsky@columbia.edu>2012-08-03 00:27:27 +0200
committerMarc Schumann <wurblzap@gmail.com>2012-08-03 00:27:27 +0200
commitc6e47461e32197e566a687f2654b18ef908a8c30 (patch)
tree088357b31df1161295226eedfe91ed36d9d205cc
parent7a9af9adf59089bd612b112c29fcb88e054dacd6 (diff)
downloadbugzilla-c6e47461e32197e566a687f2654b18ef908a8c30.tar.gz
bugzilla-c6e47461e32197e566a687f2654b18ef908a8c30.tar.xz
Bug 759413 - Use "cannot" instead of "can not".
r=Wurblzap, a=LpSolit
-rw-r--r--docs/en/xml/administration.xml6
-rw-r--r--docs/en/xml/customization.xml2
-rw-r--r--docs/en/xml/installation.xml2
-rw-r--r--docs/en/xml/using.xml4
-rwxr-xr-xeditparams.cgi2
-rw-r--r--template/en/default/admin/fieldvalues/confirm-delete.html.tmpl2
-rw-r--r--template/en/default/bug/dependency-tree.html.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl10
8 files changed, 15 insertions, 15 deletions
diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index f3c640a5b..d0525d917 100644
--- a/docs/en/xml/administration.xml
+++ b/docs/en/xml/administration.xml
@@ -2362,7 +2362,7 @@ ReadOnly: ENTRY, NA/NA, CANEDIT
<para>
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 <xref linkend="sanitycheck"/> script. Currently keywords can not
+ using the <xref linkend="sanitycheck"/> script. Currently keywords cannot
be marked obsolete to prevent future usage.
</para>
<para>
@@ -2386,7 +2386,7 @@ ReadOnly: ENTRY, NA/NA, CANEDIT
</para>
<tip>
<para>
- 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.
</para>
<para>
diff --git a/docs/en/xml/customization.xml b/docs/en/xml/customization.xml
index 1bc3f10d8..ce549b8ea 100644
--- a/docs/en/xml/customization.xml
+++ b/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
- <emphasis>editbugs</emphasis> privileges, can not edit
+ <emphasis>editbugs</emphasis> privileges, cannot edit
bugs, except to comment and add themselves to the CC list.
</para>
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index bf9c5a1cc..8c5c29b8e 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -2394,7 +2394,7 @@ bash$ <command>./checksetup.pl</command>
<warning>
<para>
The period at the beginning of the command
- <command>./checksetup.pl</command> is important and can not
+ <command>./checksetup.pl</command> is important and cannot
be omitted.
</para>
</warning>
diff --git a/docs/en/xml/using.xml b/docs/en/xml/using.xml
index da389c43b..e625cca16 100644
--- a/docs/en/xml/using.xml
+++ b/docs/en/xml/using.xml
@@ -1531,7 +1531,7 @@
</term>
<listitem>
<para>
- Indicates user can not be impersonated by other users.
+ Indicates user cannot be impersonated by other users.
</para>
</listitem>
</varlistentry>
@@ -2014,7 +2014,7 @@
<para>
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.
</para>
</note>
diff --git a/editparams.cgi b/editparams.cgi
index 002697db0..b522fd414 100755
--- a/editparams.cgi
+++ b/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/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
index a5d04abbe..122df3612 100644
--- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
@@ -101,7 +101,7 @@
[% IF value_count == 1 %]
<li>'[% 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.
</li>
[% END %]
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 9f6590a73..a4bb0e672 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -219,7 +219,7 @@
<td>
<form method="get" action="showdependencytree.cgi"
style="display: inline; margin: 0px;">
- [%# 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 %]
<input name="maxdepth" size="4" maxlength="4" value="[%
maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 90ac376ba..0d51eaa1b 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -263,7 +263,7 @@
[% ELSIF error == "bug_url_too_long" %]
[% title = "Invalid $terms.Bug URL" %]
- [% terms.Bug %] URLs can not be longer than
+ [% terms.Bug %] URLs cannot be longer than
[%+ constants.MAX_BUG_URL_LENGTH FILTER none %] characters long.
<code>[% url FILTER html %]</code> 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" %]