summaryrefslogtreecommitdiffstats
path: root/template/en/default/account
diff options
context:
space:
mode:
authorreed%reedloden.com <>2007-03-11 10:11:16 +0100
committerreed%reedloden.com <>2007-03-11 10:11:16 +0100
commit3ce940a70dc15afe504ddcf772d088b952e0b9d9 (patch)
tree178823e02bc6f19021c422ce15ca0612df55e500 /template/en/default/account
parent5f7218dece9661ce08a760c92927e2101b546de7 (diff)
downloadbugzilla-3ce940a70dc15afe504ddcf772d088b952e0b9d9.tar.gz
bugzilla-3ce940a70dc15afe504ddcf772d088b952e0b9d9.tar.xz
Bug 366466 - "flag notification mail has canceled spelled incorrectly" [p=reed r=timeless a=mkanat]
Diffstat (limited to 'template/en/default/account')
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl28
-rw-r--r--template/en/default/account/email/confirm-new.html.tmpl2
2 files changed, 15 insertions, 15 deletions
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index 4afada50c..ead400ce8 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -27,7 +27,7 @@ To: [% emailaddress %]
Subject: [% PROCESS subject %]
X-Bugzilla-Type: admin
-A request was cancelled from [% remoteaddress %].
+A request was canceled from [% remoteaddress %].
If you did not request this, it could be either an honest
mistake or someone attempting to break into your [% terms.Bugzilla %] account.
@@ -44,13 +44,13 @@ Cancelled Because: [% PROCESS cancelactionmessage %]
[% BLOCK subject %]
[% IF tokentype == 'new_account' %]
- User account creation request cancelled
+ User account creation request canceled
[% ELSIF tokentype == 'password' %]
- Password change request cancelled
+ Password change request canceled
[% ELSIF tokentype == 'emailnew' OR tokentype == 'emailold' %]
- Email change request cancelled
+ Email change request canceled
[% ELSE %]
- [% tokentype %] token cancelled
+ [% tokentype %] token canceled
[% END %]
[% END %]
@@ -58,26 +58,26 @@ Cancelled Because: [% PROCESS cancelactionmessage %]
[% IF cancelaction == 'account_exists' %]
Account [% email %] already exists.
- [% ELSIF cancelaction == 'email_change_cancelled' %]
+ [% ELSIF cancelaction == 'email_change_canceled' %]
The request to change the email address for
the [% old_email %] account to [% new_email %] has
- been cancelled.
+ been canceled.
- [% ELSIF cancelaction == 'email_change_cancelled_reinstated' %]
+ [% ELSIF cancelaction == 'email_change_canceled_reinstated' %]
The request to change the email address for your account
- to [% new_email %] has been cancelled. Your old account
+ to [% new_email %] has been canceled. Your old account
settings have been reinstated.
- [% ELSIF cancelaction == 'emailold_change_cancelled' %]
+ [% ELSIF cancelaction == 'emailold_change_canceled' %]
The request to change the email address for your account
- to [% new_email %] has been cancelled.
+ to [% new_email %] has been canceled.
- [% ELSIF cancelaction == 'password_change_cancelled' %]
+ [% ELSIF cancelaction == 'password_change_canceled' %]
You have requested cancellation.
- [% ELSIF cancelaction == 'account_creation_cancelled' %]
+ [% ELSIF cancelaction == 'account_creation_canceled' %]
The creation of the user account [% emailaddress %]
- has been cancelled.
+ has been canceled.
[% ELSIF cancelaction == 'user_logged_in' %]
You have logged in.
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 6c7bdd05f..45c12b8f5 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -31,7 +31,7 @@
form below. You can also enter your real name, which is optional.<p>
If you don't fill this form before
<u>[%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]</u>,
- the creation of this account will be automatically cancelled.
+ the creation of this account will be automatically canceled.
</div>
<form id="confirm_account_form" method="post" action="token.cgi">