summaryrefslogtreecommitdiffstats
path: root/lang/en.yml
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-04 10:43:39 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-04 10:43:39 +0000
commitbd434427e61edbac03d273a308dcfffe72096ae0 (patch)
tree73856165e0c0c2d3581492280a5d44f52b5364bd /lang/en.yml
parent4ded4277c51b8f35dc9eaa031c918e55470a44b5 (diff)
downloadredmine-bd434427e61edbac03d273a308dcfffe72096ae0.tar.gz
redmine-bd434427e61edbac03d273a308dcfffe72096ae0.zip
Mailer:
* added an application setting to specify the application protocol (http or https) used to generate urls * added layouts for text and html emails * no more language specific templates * urls are now generated using UrlWriter * the mailer now uses AdvAttrAccessor code style to set email parameters git-svn-id: http://redmine.rubyforge.org/svn/trunk@877 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lang/en.yml')
-rw-r--r--lang/en.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/lang/en.yml b/lang/en.yml
index 4a52d281b..2ab4c11a2 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -80,6 +80,8 @@ mail_subject_lost_password: Your Redmine password
mail_body_lost_password: 'To change your Redmine password, click on the following link:'
mail_subject_register: Redmine account activation
mail_body_register: 'To activate your Redmine account, click on the following link:'
+mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+mail_body_account_information: Your Redmine account information
gui_validation_error: 1 error
gui_validation_error_plural: %d errors
@@ -189,6 +191,7 @@ setting_cross_project_issue_relations: Allow cross-project issue relations
setting_issue_list_default_columns: Default columns displayed on the issue list
setting_repositories_encodings: Repositories encodings
setting_emails_footer: Emails footer
+setting_protocol: Protocol
label_user: User
label_user_plural: Users