Index: mozilla/webtools/bugzilla/attachment.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/attachment.cgi,v
retrieving revision 1.125
diff -pU1 -r1.125 mozilla/webtools/bugzilla/attachment.cgi
--- mozilla/webtools/bugzilla/attachment.cgi
+++ mozilla/webtools/bugzilla/attachment.cgi
@@ -790,3 +790,3 @@ sub delete_attachment {
             # The token is invalid.
-            ThrowUserError('token_inexistent');
+            ThrowUserError('token_does_not_exist');
         }
Index: mozilla/webtools/bugzilla/editfields.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/editfields.cgi,v
retrieving revision 1.7
diff -pU1 -r1.7 mozilla/webtools/bugzilla/editfields.cgi
--- mozilla/webtools/bugzilla/editfields.cgi
+++ mozilla/webtools/bugzilla/editfields.cgi
@@ -83,3 +83,3 @@ elsif ($action eq 'edit') {
     my $field = new Bugzilla::Field({'name' => $name});
-    $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
+    $field || ThrowUserError('customfield_does_not_exist', {'name' => $name});
 
@@ -102,3 +102,3 @@ elsif ($action eq 'update') {
     my $field = new Bugzilla::Field({'name' => $name});
-    $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
+    $field || ThrowUserError('customfield_does_not_exist', {'name' => $name});
 
Index: mozilla/webtools/bugzilla/editflagtypes.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/editflagtypes.cgi,v
retrieving revision 1.48
diff -pU1 -r1.48 mozilla/webtools/bugzilla/editflagtypes.cgi
--- mozilla/webtools/bugzilla/editflagtypes.cgi
+++ mozilla/webtools/bugzilla/editflagtypes.cgi
@@ -550,3 +550,3 @@ sub validateID {
     my $flag_type = new Bugzilla::FlagType($id)
-        || ThrowCodeError('flag_type_nonexistent', { id => $id });
+        || ThrowCodeError('flag_type_does_not_exist', { id => $id });
 
Index: mozilla/webtools/bugzilla/post_bug.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/post_bug.cgi,v
retrieving revision 1.182
diff -pU1 -r1.182 mozilla/webtools/bugzilla/post_bug.cgi
--- mozilla/webtools/bugzilla/post_bug.cgi
+++ mozilla/webtools/bugzilla/post_bug.cgi
@@ -64,3 +64,3 @@ if ($token) {
         # The token is invalid.
-        ThrowUserError('token_inexistent');
+        ThrowUserError('token_does_not_exist');
     }
Index: mozilla/webtools/bugzilla/reports.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/reports.cgi,v
retrieving revision 1.89
diff -pU1 -r1.89 mozilla/webtools/bugzilla/reports.cgi
--- mozilla/webtools/bugzilla/reports.cgi
+++ mozilla/webtools/bugzilla/reports.cgi
@@ -74,3 +74,3 @@ if (! defined $cgi->param('product')) {
     (-d $dir && -d $graph_dir) 
-      || ThrowCodeError('chart_dir_nonexistent',
+      || ThrowCodeError('chart_dir_does_not_exist',
                         {dir => $dir, graph_dir => $graph_dir});
Index: mozilla/webtools/bugzilla/token.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/token.cgi,v
retrieving revision 1.48
diff -pU1 -r1.48 mozilla/webtools/bugzilla/token.cgi
--- mozilla/webtools/bugzilla/token.cgi
+++ mozilla/webtools/bugzilla/token.cgi
@@ -74,3 +74,3 @@ if ($cgi->param('t')) {
                                            WHERE token = ?', undef, $::token);
-  $tokentype || ThrowUserError("token_inexistent");
+  $tokentype || ThrowUserError("token_does_not_exist");
 
@@ -120,3 +120,3 @@ if ( $::action eq 'reqpw' ) {
                                           undef, $login_name);
-    $user_id || ThrowUserError("account_inexistent");
+    $user_id || ThrowUserError("account_does_not_exist");
 }
Index: mozilla/webtools/bugzilla/Bugzilla/Flag.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Flag.pm,v
retrieving revision 1.79
diff -pU1 -r1.79 mozilla/webtools/bugzilla/Bugzilla/Flag.pm
--- mozilla/webtools/bugzilla/Bugzilla/Flag.pm
+++ mozilla/webtools/bugzilla/Bugzilla/Flag.pm
@@ -304,3 +304,3 @@ sub validate {
         my $flag_type = new Bugzilla::FlagType($id);
-        $flag_type || ThrowCodeError('flag_type_nonexistent', { id => $id });
+        $flag_type || ThrowCodeError('flag_type_does_not_exist', { id => $id });
 
@@ -323,3 +323,3 @@ sub validate {
         my $flag = new Bugzilla::Flag($id);
-        $flag || ThrowCodeError("flag_nonexistent", { id => $id });
+        $flag || ThrowCodeError("flag_does_not_exist", { id => $id });
 
Index: mozilla/webtools/bugzilla/docs/xml/using.xml
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/docs/xml/using.xml,v
retrieving revision 1.60
diff -pU1 -r1.60 mozilla/webtools/bugzilla/docs/xml/using.xml
--- mozilla/webtools/bugzilla/docs/xml/using.xml
+++ mozilla/webtools/bugzilla/docs/xml/using.xml
@@ -63,5 +63,5 @@
           with a token (a random string generated by the installation) to
-          confirm, respectively cancel, your registration. This is a way to
+          confirm and respectively cancel, your registration. This is a way to
           prevent users from abusing the generation of user accounts, for
-          instance by entering inexistent email addresses, or email addresses
+          instance by entering nonexistent email addresses, or email addresses
           which do not belong to them.
Index: mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl,v
retrieving revision 1.90
diff -pU1 -r1.90 mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
--- mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
+++ mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
@@ -98,3 +98,3 @@
         
-  [% ELSIF error == "chart_dir_nonexistent" %]
+  [% ELSIF error == "chart_dir_does_not_exist" %]
     One of the directories <tt>[% dir FILTER html %]</tt> and 
@@ -221,3 +221,3 @@
         
-  [% ELSIF error == "flag_nonexistent" %]
+  [% ELSIF error == "flag_does_not_exist" %]
     There is no flag with ID #[% id FILTER html %].
@@ -251,3 +251,3 @@
 
-  [% ELSIF error == "flag_type_nonexistent" %]
+  [% ELSIF error == "flag_type_does_not_exist" %]
     There is no flag type with the ID <em>[% id FILTER html %]</em>.
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.201
diff -pU1 -r1.201 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
@@ -70,3 +70,3 @@
 
-  [% ELSIF error == "account_inexistent" %]
+  [% ELSIF error == "account_does_not_exist" %]
     [% title = "Account Does Not Exist" %]
@@ -313,3 +313,3 @@
 
-  [% ELSIF error == "customfield_nonexistent" %]
+  [% ELSIF error == "customfield_does_not_exist" %]
     [% title = "Unknown Custom Field" %]
@@ -1369,3 +1369,3 @@
 
-  [% ELSIF error == "token_inexistent" %]
+  [% ELSIF error == "token_does_not_exist" %]
     [% title = "Token Does Not Exist" %]