Merge pull request #3995 from wallabag/feature/config-display-login

Display login in config / user

1 files changed, 5 insertions, 4 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index e1631d10..2f310246 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -5,7 +5,7 @@ security:
         forgot_password: 'Forgot your password?'
         submit: 'Login'
         register: 'Register'
-        username: 'Username'
+        username: 'Login'
         password: 'Password'
         cancel: 'Cancel'
     resetting:
@@ -102,6 +102,7 @@ config:
         feed_limit: 'Number of items in the feed'
     form_user:
         two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
+        login_label: 'Login (can not be changed)'
         name_label: 'Name'
         email_label: 'Email'
         two_factor:
@@ -545,7 +546,7 @@ user:
         no: No
         create_new_one: Create a new user
     form:
-        username_label: 'Username'
+        username_label: 'Login'
         name_label: 'Name'
         password_label: 'Password'
         repeat_new_password_label: 'Repeat new password'
@@ -560,7 +561,7 @@ user:
         delete_confirm: Are you sure?
         back_to_list: Back to list
     search:
-        placeholder: Filter by username or email
+        placeholder: Filter by login or email
 
 site_credential:
     page_title: Site credentials management
@@ -574,7 +575,7 @@ site_credential:
         no: No
         create_new_one: Create a new credential
     form:
-        username_label: 'Username'
+        username_label: 'Login'
         host_label: 'Host (subdomain.example.org, .example.org, etc.)'
         password_label: 'Password'
         save: Save