summaryrefslogtreecommitdiffstats
path: root/config/locales
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-06-09 10:01:56 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-06-09 10:01:56 +0000
commit4bd874ab46c38792f9e834d28a17ed5eabde9d61 (patch)
tree769a659b66782e7ce8a14c0c87f2d624237a2875 /config/locales
parentec46d4315c2ba4989fb355fd6722bd09b96c6d41 (diff)
downloadredmine-4bd874ab46c38792f9e834d28a17ed5eabde9d61.tar.gz
redmine-4bd874ab46c38792f9e834d28a17ed5eabde9d61.zip
Adds a way for a registered user to get a new action email (#14228).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11946 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml2
-rw-r--r--config/locales/fr.yml2
2 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 04b74b02b..9e280ecd8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -150,6 +150,8 @@ en:
notice_account_wrong_password: Wrong password
notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
notice_account_unknown_email: Unknown user.
+ notice_account_not_activated_yet: You haven't activated your account yet. If you want to receive a new activation email, please <a href="%{url}">click this link</a>.
+ notice_account_locked: Your account is locked.
notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
notice_account_activated: Your account has been activated. You can now log in.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index db83c74f8..dd0f7a844 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -167,6 +167,8 @@ fr:
notice_account_wrong_password: Mot de passe incorrect
notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
+ notice_account_not_activated_yet: Vous n'avez pas encore activé votre compte. Si vous voulez recevoir un nouveau message d'activation, veuillez <a href="%{url}">cliquer sur ce lien</a>.
+ notice_account_locked: Votre compte est verrouillé.
notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.