developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

This commit is contained in:
chris 2012-10-15 15:28:24 +08:00
parent fe183c316f e6e547e456
commit a50553219e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/devise.en.yml
View File

@ -30,6 +30,7 @@ en:
signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.' signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
updated: 'You updated your account successfully.' updated: 'You updated your account successfully.'
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.' destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
email_not_unique: 'Your email address has been registed'
unlocks: unlocks:
send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.' send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
unlocked: 'Your account was successfully unlocked. You are now signed in.' unlocked: 'Your account was successfully unlocked. You are now signed in.'

8
config/locales/en.yml
View File

@ -27,6 +27,9 @@ en:
help: Help help: Help
hide: Hide hide: Hide
homepage: Homepage homepage: Homepage
langs:
zh_tw: Traditional Chinese
en: English
login: Login login: Login
logout: Logout logout: Logout
no_: "No" no_: "No"
@ -270,6 +273,11 @@ en:
upload_design: Upload design upload_design: Upload design
url: URL url: URL
user: User user: User
user_new_interface:
sys_basic_form: User system info
password: Password
password_confirmation: Password Confirmation
email: User account
user_role: user_role:
auth: auth:
all_member: All Member all_member: All Member