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

config/locales/devise.en.yml

@@ -30,6 +30,7 @@ en:
       signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
       updated: 'You updated your account successfully.'
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+      email_not_unique: 'Your email address has been registed'
     unlocks:
       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.'

config/locales/en.yml

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