Bug 237517 inconsistent spelling of cancelled or canceled

template/en/default/account/cancel-token.txt.tmpl

@@ -70,7 +70,7 @@ Cancelled Because:
     The request to change the email address for your account
     to [% new_email %] has been cancelled.
 
-  [% ELSIF cancelaction == 'password_change_canceled' %]
+  [% ELSIF cancelaction == 'password_change_cancelled' %]
     You have requested cancellation.
 
   [% ELSIF cancelaction == 'user_logged_in' %]

template/en/default/global/messages.html.tmpl

@@ -94,7 +94,7 @@
     [% title = "$terms.Bugzilla Login Changed" %]
     Your [% terms.Bugzilla %] login has been changed.
 
-  [% ELSIF message_tag == "password_change_canceled" %]
+  [% ELSIF message_tag == "password_change_cancelled" %]
     [% title = "Cancel Request to Change Password" %]
     Your request has been cancelled.
 

token.cgi

@@ -175,7 +175,7 @@ sub confirmChangePassword {
 }
 
 sub cancelChangePassword {    
-    $vars->{'message'} = "password_change_canceled";
+    $vars->{'message'} = "password_change_cancelled";
     Bugzilla::Token::Cancel($::token, $vars->{'message'});
 
     print $cgi->header();