Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / config / locales / devise.en.yml

diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 79b3d5e..0f3b414 100644 (file)
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -35,11 +35,12 @@ en:
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
     registrations:
       signed_up: 'Welcome! You have signed up successfully.'
-      inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
       updated: 'You updated your account successfully.'
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
       reasons:
-        inactive: 'inactive'
+        signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+        signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+        signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
         unconfirmed: 'unconfirmed'
         locked: 'locked'
     unlocks: