Index: mozilla/webtools/bugzilla/attachment.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/attachment.cgi,v
retrieving revision 1.128
diff -u -r1.128 mozilla/webtools/bugzilla/attachment.cgi
--- mozilla/webtools/bugzilla/attachment.cgi
+++ mozilla/webtools/bugzilla/attachment.cgi
@@ -684,7 +684,7 @@
                   && ($event eq 'attachment' . $attachment->id))
         {
             # The token is invalid.
-            ThrowUserError('token_inexistent');
+            ThrowUserError('token_does_not_exist');
         }
 
         # The token is valid. Delete the content of the attachment.
Index: mozilla/webtools/bugzilla/post_bug.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/post_bug.cgi,v
retrieving revision 1.186
diff -u -r1.186 mozilla/webtools/bugzilla/post_bug.cgi
--- mozilla/webtools/bugzilla/post_bug.cgi
+++ mozilla/webtools/bugzilla/post_bug.cgi
@@ -62,7 +62,7 @@
               && ($old_bug_id =~ "^createbug:"))
     {
         # The token is invalid.
-        ThrowUserError('token_inexistent');
+        ThrowUserError('token_does_not_exist');
     }
 
     $old_bug_id =~ s/^createbug://;
Index: mozilla/webtools/bugzilla/token.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/token.cgi,v
retrieving revision 1.49
diff -u -r1.49 mozilla/webtools/bugzilla/token.cgi
--- mozilla/webtools/bugzilla/token.cgi
+++ mozilla/webtools/bugzilla/token.cgi
@@ -72,7 +72,7 @@
   # Make sure the token exists in the database.
   my ($tokentype) = $dbh->selectrow_array('SELECT tokentype FROM tokens
                                            WHERE token = ?', undef, $::token);
-  $tokentype || ThrowUserError("token_inexistent");
+  $tokentype || ThrowUserError("token_does_not_exist");
 
   # Make sure the token is the correct type for the action being taken.
   if ( grep($::action eq $_ , qw(cfmpw cxlpw chgpw)) && $tokentype ne 'password' ) {
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.214
diff -u -r1.214 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
@@ -1412,7 +1412,7 @@
     <tt>[% product FILTER html %]</tt> product, which exceeds the maximum of
     [%+ max FILTER html %] votes for this product.
 
-  [% ELSIF error == "token_inexistent" %]
+  [% ELSIF error == "token_does_not_exist" %]
     [% title = "Token Does Not Exist" %]
     The token you submitted does not exist, has expired, or has
     been canceled.