Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
This commit is contained in:
commit
a50553219e
|
@ -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.'
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue