Merge branch 'master' into registry-790

config/locales/admin/base.en.yml

@@ -0,0 +1,5 @@
+en:
+  admin:
+    base:
+      menu:
+        sign_out: Sign out

config/locales/admin/sessions.en.yml

@@ -0,0 +1,7 @@
+en:
+  admin:
+    sessions:
+      new:
+        header_html: Eesti Interneti SA<br>Admin portal
+        sign_in_btn: Sign in
+        remember_checkbox: Remember me

config/locales/api_users.en.yml

@@ -0,0 +1,16 @@
+en:
+  activerecord:
+    attributes:
+      api_user:
+        plain_text_password: Password
+    errors:
+      models:
+        api_user:
+          attributes:
+            username:
+              blank: 'Username is missing'
+              taken: 'Username already exists'
+            plain_text_password:
+              blank: 'Password is missing'
+            registrar:
+              blank: 'Registrar is missing'

config/locales/devise.en.yml

@@ -9,12 +9,12 @@ en:
     failure:
       already_authenticated: "You are already signed in."
       inactive: "Your account is not activated yet."
-      invalid: "Invalid email or password."
+      invalid: "Invalid %{authentication_keys} or password."
       locked: "Your account is locked."
       last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid email address or password."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
       timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in."
+      unauthenticated: "You need to sign in before continuing."
       unconfirmed: "You have to confirm your email address before continuing."
     mailer:
       confirmation_instructions:
@@ -23,6 +23,10 @@ en:
         subject: "Reset password instructions"
       unlock_instructions:
         subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
     omniauth_callbacks:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."

config/locales/en.yml

@@ -135,16 +135,6 @@ en:
             registrar:
               blank: 'Registrar is missing'
 
-        api_user:
-          attributes:
-            username:
-              blank: 'Username is missing'
-              taken: 'Username already exists'
-            password:
-              blank: 'Password is missing'
-            registrar:
-              blank: 'Registrar is missing'
-
         dnskey:
           attributes:
             alg:
@@ -400,7 +390,6 @@ en:
   invoices: 'Invoices'
   no_such_user: 'No such user'
   phone_no: 'Phone number'
-  log_in_with_mid: 'Log in with mobile-id'
   confirmation_sms_was_sent_to_your_phone_verification_code_is: 'Confirmation sms was sent to your phone. Verification code is %{code}.'
   user_signature_is_invalid: 'User signature is invalid'
   session_timeout: 'Session timeout'
@@ -432,7 +421,6 @@ en:
               blank: "Password can't be blank"
 
   username: 'Username'
-  log_in: 'Log in'
   domains: 'Domains'
   register: 'Register'
   contacts: 'Contacts'
@@ -729,7 +717,6 @@ en:
   mail_templates: Mail Templates
   failure: "It was not saved"
   contact_is_not_valid: 'Contact %{value} is not valid, please fix the invalid contact'
-  welcome_to_eis_registrar_portal: 'Welcome to EIS Registrar portal'
   next: 'Next'
   previous: 'Previous'
   personal_domain_verification_url: 'Personal domain verification url'
@@ -741,7 +728,6 @@ en:
   test_registrar: "Test registrar"
   verified_confirm: 'Verified status is for cases when current registrant is the one applying for the update. Legal document signed by the registrant is required. Are you sure this update is properly verified with the registrant?'
   verified: 'Verified'
-  only_estonian_residets_can_signin: "Access currently available only to Estonian citizens and e-residents with Estonian ID-card or Mobile-ID."
   deleted: 'Deleted'
   cant_match_version: 'Impossible match version with request'
   user_not_authenticated: "user not authenticated"

config/locales/et.yml

@@ -1,7 +1,6 @@
 et:
   username: 'Kasutajanimi'
   password: 'Parool'
-  log_in: 'Logi sisse'
 
   date:
     # Don't forget the nil at the beginning; there's no such thing as a 0th month

config/locales/registrant/sessions.en.yml

@@ -0,0 +1,12 @@
+en:
+  registrant:
+    sessions:
+      new:
+        header: Log in
+        hint:  >-
+          Access currently available only to Estonian citizens and e-residents with Estonian ID-card
+          or Mobile-ID.
+
+      login_mid:
+        header: Log in with mobile-id
+        submit_btn: Login

config/locales/registrar/sessions.en.yml

@@ -1,7 +1,9 @@
 en:
   registrar:
     sessions:
-      login:
-        login_btn: Login
+      new:
+        header_html: Eesti Interneti SA<br>Registrar Portal
+        submit_btn: Login
       login_mid:
-        login_btn: Login
+        header: Log in with mobile-id
+        submit_btn: Login