summaryrefslogtreecommitdiffstats
path: root/template
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
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')
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl28
-rw-r--r--template/en/default/account/email/confirm-new.html.tmpl2
-rw-r--r--template/en/default/global/messages.html.tmpl20
-rw-r--r--template/en/default/global/user-error.html.tmpl2
-rw-r--r--template/en/default/request/email.txt.tmpl2
5 files changed, 27 insertions, 27 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">
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" %]
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 76267e3a0..a5fd17b88 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -25,7 +25,7 @@
[% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %]
[% attidsummary = attachment.id _ ': ' _ attachment.description %]
-[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" ,
+[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
'?' => "asked" } %]
[% IF flag.status == '?' %]
[% to_identity = flag.addressee.identity _ " for" %]