summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
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/global
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/global')
-rw-r--r--template/en/default/global/messages.html.tmpl20
-rw-r--r--template/en/default/global/user-error.html.tmpl2
2 files changed, 11 insertions, 11 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 560ef2b33..a8eddac7a 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -43,10 +43,10 @@
this [% terms.Bugzilla %] installation.
[% END %]
- [% ELSIF message_tag == "account_creation_cancelled" %]
+ [% ELSIF message_tag == "account_creation_canceled" %]
[% title = "User Account Creation Cancelled" %]
The creation of the user account [% account FILTER html %] has been
- cancelled.
+ canceled.
[% ELSIF message_tag == "account_updated" %]
[% IF changed_fields.size
@@ -186,22 +186,22 @@
Properties of the '[% field.name FILTER html %]' field have been
successfully updated.
- [% ELSIF message_tag == "emailold_change_cancelled" %]
+ [% ELSIF message_tag == "emailold_change_canceled" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for your account to
- [%+ new_email FILTER html %] has been cancelled.
+ [%+ new_email FILTER html %] has been canceled.
- [% ELSIF message_tag == "email_change_cancelled" %]
+ [% ELSIF message_tag == "email_change_canceled" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the
account [%+ old_email FILTER html %] to
- [%+ new_email FILTER html %] has been cancelled.
+ [%+ new_email FILTER html %] has been canceled.
- [% ELSIF message_tag == "email_change_cancelled_reinstated" %]
+ [% ELSIF message_tag == "email_change_canceled_reinstated" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the
account [%+ old_email FILTER html %] to
- [%+ new_email FILTER html %] has been cancelled.
+ [%+ new_email FILTER html %] has been canceled.
Your old account settings have been reinstated.
[% ELSIF message_tag == "flag_creation_failed" %]
@@ -303,9 +303,9 @@
clear the <em>shutdownhtml</em> field.
[% END%]
- [% ELSIF message_tag == "password_change_cancelled" %]
+ [% ELSIF message_tag == "password_change_canceled" %]
[% title = "Cancel Request to Change Password" %]
- Your request has been cancelled.
+ Your request has been canceled.
[% ELSIF message_tag == "password_change_request" %]
[% title = "Request to Change Password" %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 01368f06d..7452ab8d1 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1384,7 +1384,7 @@
[% ELSIF error == "token_inexistent" %]
[% title = "Token Does Not Exist" %]
The token you submitted does not exist, has expired, or has
- been cancelled.
+ been canceled.
[% ELSIF error == "too_soon_for_new_token" %]
[% title = "Too Soon For New Token" %]