From: reed%reedloden.com <>
Date: Sun, 11 Mar 2007 09:24:11 +0000 (+0000)
Subject: I missed two from my patch in bug 366466. s/Cancelled/Canceled/ [p=reed r=mkanat... 
X-Git-Tag: bugzilla-3.1.2~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=429fad7946e7461b2c3069ba292b3a5e95e2f825;p=thirdparty%2Fbugzilla.git

I missed two from my patch in bug 366466. s/Cancelled/Canceled/ [p=reed r=mkanat@IRC a=mkanat@IRC]
---

diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index ead400ce88..c4f6951a89 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -40,7 +40,7 @@ to [% maintainer %] if you suspect foul play.
              User: [% emailaddress %]
        Issue Date: [% issuedate %]
        Event Data: [% eventdata %]
-Cancelled Because: [% PROCESS cancelactionmessage %]
+Canceled Because: [% PROCESS cancelactionmessage %]
 
 [% BLOCK subject %]
   [% IF tokentype == 'new_account' %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index a8eddac7a0..2b14b3876b 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -44,7 +44,7 @@
     [% END %]
 
   [% ELSIF message_tag == "account_creation_canceled" %]
-    [% title = "User Account Creation Cancelled" %]
+    [% title = "User Account Creation Canceled" %]
     The creation of the user account [% account FILTER html %] has been
     canceled.