Bug 759413 - Use "cannot" instead of "can not".

r=Wurblzap, a=LpSolit

diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index f3c640a5bd037553d38c85d66ad21d8f542f9370..d0525d917e41a3f31cdb6d2a2295edea077256df 100644 (file)
--- 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 1bc3f10d84dcfe2d0668c1fe14727d525af80491..ce549b8ea021298cbc4c48e1fb62ab8a20b6da77 100644 (file)
--- 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 bf9c5a1cc53ff51c1605745d12c7973f59ec079d..8c5c29b8e8fa64dd40d2517dc4d825129134ac71 100644 (file)
--- 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 da389c43b10e88fbb89b1e8b4d141e5943900d33..e625cca1657c60a3089e4c198b4f89ff9b108e44 100644 (file)
--- 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 002697db019a33e0ff61d144ca9d6f955f0f209e..b522fd41401298c311b05fa326cfcf4f626cc756 100755 (executable)
--- 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 a5d04abbec8b8e0ea1d92e9b6b440cbf6833866f..122df3612150b8116bf10f73393222e9e3a95e35 100644 (file)
--- 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 9f6590a736833ec298379b95484bc0571d667c66..a4bb0e67216e70d8a3e0e20cc6d3b6c883853b4c 100644 (file)
--- 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 90ac376ba6507b686ffe1215e89abad875d0f05e..0d51eaa1bb1739d153695dd97bf1ef8fba12c595 100644 (file)
--- 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" %]