From d00f3ac25660d8f535f6ae00c54fc0c08bcae7f3 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <>
Date: Fri, 19 Mar 2004 00:14:54 +0000
Subject: Bug 237517 inconsistent spelling of cancelled or canceled r=kiko
 a=justdave

---
 template/en/default/account/cancel-token.txt.tmpl | 2 +-
 template/en/default/global/messages.html.tmpl     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index f014820ef..de2278419 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/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' %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 7fc93f013..de518dc0a 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/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.
 
-- 
cgit v1.2.3-24-g4f1b