From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Wed, 12 Jun 2019 19:36:00 +0000 (+0200)
Subject: Merge pull request #3995 from wallabag/feature/config-display-login
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1009b286c9b6186856c884948e5d7f1c334a7ac1;hp=-c;p=github%2Fwallabag%2Fwallabag.git

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

Display login in config / user
---

1009b286c9b6186856c884948e5d7f1c334a7ac1
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index b6e067cc,884a67ba..5c4ca29c
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@@ -102,6 -102,7 +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: 'Navn'
          email_label: 'Emailadresse'
          two_factor:
@@@ -422,7 -423,6 +423,7 @@@ tag
      list:
          # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
          # see_untagged_entries: 'See untagged entries'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          # add: 'Add'
          # placeholder: 'You can add several tags, separated by a comma.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 072cac0a,97a6a387..a21bd0f1
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'Anzahl der Einträge pro 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: 'E-Mail-Adresse'
          two_factor:
@@@ -413,7 -414,6 +414,7 @@@ tag
      list:
          number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.'
          see_untagged_entries: 'Zeige nicht getaggte Einträge'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'Hinzufügen'
          placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index e1631d10,2bd4828a..2f310246
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@@ -5,7 -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 +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:
@@@ -422,7 -423,6 +423,7 @@@ tag
      list:
          number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
          see_untagged_entries: 'See untagged entries'
 +        no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'Add'
          placeholder: 'You can add several tags, separated by a comma.'
@@@ -545,7 -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 -560,7 +561,7 @@@
          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 -574,7 +575,7 @@@
          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
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index ebd4477a,24dc5929..c194041a
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'Límite de artículos en feed RSS'
      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: 'Nombre'
          email_label: 'Dirección de e-mail'
          two_factor:
@@@ -422,7 -423,6 +423,7 @@@ tag
      list:
          number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.'
          see_untagged_entries: 'Ver artículos sin etiquetas'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'Añadir'
          placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index e3857e24,f041ef9e..9aef7dde
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'محدودیت آر-اس-اس'
      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: 'نام'
          email_label: 'نشانی ایمیل'
          two_factor:
@@@ -422,7 -423,6 +423,7 @@@ tag
      list:
          number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
          # see_untagged_entries: 'See untagged entries'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          # add: 'Add'
          # placeholder: 'You can add several tags, separated by a comma.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 97cb3272,5d2c5e36..9848ed9a
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@@ -5,7 -5,7 +5,7 @@@ security
          forgot_password: "Mot de passe oublié ?"
          submit: "Se connecter"
          register: "Créer un compte"
-         username: "Nom d’utilisateur"
+         username: "Identifiant"
          password: "Mot de passe"
          cancel: "Annuler"
      resetting:
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: "Nombre d’articles dans le flux"
      form_user:
          two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel OU que vous devriez utiliser une application de mot de passe à usage unique (comme Google Authenticator, Authy or FreeOTP) pour obtenir un code temporaire à chaque nouvelle connexion non approuvée. Vous ne pouvez pas choisir les deux options."
+         login_label: 'Identifiant'
          name_label: "Nom"
          email_label: "Adresse courriel"
          two_factor:
@@@ -422,7 -423,6 +423,7 @@@ tag
      list:
          number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
          see_untagged_entries: "Voir les articles sans tag"
 +        no_untagged_entries: 'Aucun article sans tag.'
      new:
          add: "Ajouter"
          placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule."
@@@ -545,7 -545,7 +546,7 @@@ user
          no: "Non"
          create_new_one: "Créer un nouvel utilisateur"
      form:
-         username_label: "Nom d’utilisateur"
+         username_label: "Identifiant (ne peut être changé)"
          name_label: "Nom"
          password_label: "Mot de passe"
          repeat_new_password_label: "Confirmez votre nouveau mot de passe"
@@@ -561,7 -561,7 +562,7 @@@
          delete_confirm: "Êtes-vous sûr ?"
          back_to_list: "Revenir à la liste"
      search:
-         placeholder: "Filtrer par nom d’utilisateur ou email"
+         placeholder: "Filtrer par identifiant ou email"
  
  site_credential:
      page_title: Gestion des accès aux sites
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 7c0110a4,dd650bf4..efbf062b
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'Numero di elementi nel 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: 'Nome'
          email_label: 'E-mail'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -421,7 -422,6 +422,7 @@@ tag
      list:
          number_on_the_page: "{0} Non ci sono etichette.|{1} C'è un'etichetta.|]1,Inf[ ci sono %count% etichette."
          see_untagged_entries: 'Vedi articoli non etichettati'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'Aggiungi'
          placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index e74d1a20,0097377d..86ce4644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: "Nombre d'articles dins un flux"
      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: 'Nom'
          email_label: 'Adreça de corrièl'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -421,7 -422,6 +422,7 @@@ tag
      list:
          number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas."
          see_untagged_entries: "Afichar las entradas sens etiquetas"
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'Ajustar'
          placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula."
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index f4da2b18,9ff4f459..9ebe0236
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'Link do RSS'
      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: 'Nazwa'
          email_label: 'Adres email'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -421,7 -422,6 +422,7 @@@ tag
      list:
          number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.'
          see_untagged_entries: 'Zobacz nieotagowane wpisy'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'Dodaj'
          placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 76d2bebe,b90e5a54..d310e016
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'Número de itens no 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: 'Nome'
          email_label: 'E-mail'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -421,7 -422,6 +422,7 @@@ tag
      list:
          number_on_the_page: '{0} Não existem tags.|{1} Uma tag.|]1,Inf[ Existem %count% tags.'
          see_untagged_entries: 'Ver entradas sem tags'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          # add: 'Add'
          # placeholder: 'You can add several tags, separated by a comma.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index c10df5fe,514df6dc..c11ff0b8
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'Limită RSS'
      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: 'Nume'
          email_label: 'E-mail'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -421,7 -422,6 +422,7 @@@ tag
      list:
          # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
          # see_untagged_entries: 'See untagged entries'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          # add: 'Add'
          # placeholder: 'You can add several tags, separated by a comma.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index 48695b3f,34d5cce8..9fe75369
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@@ -100,6 -100,7 +100,7 @@@ config
          feed_limit: 'Количество записей в фиде'
      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: 'Имя'
          email_label: 'Email'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -410,7 -411,6 +411,7 @@@ tag
      list:
          number_on_the_page: '{0} Теги не найдены.|{1} Найден один тег.|]1,Inf[ Найдено %count% тегов.'
          see_untagged_entries: 'Просмотреть записи без тегов'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'Добавить'
          placeholder: 'Вы можете добавить несколько тегов, разделенных запятой.'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index da5bbecd,aad2e51b..672dcbf0
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'จำนวนไอเทมที่เก็บ'
      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: 'ชื่อ'
          email_label: 'อีเมล'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -419,7 -420,6 +420,7 @@@ tag
      list:
          number_on_the_page: '{0} ไม่มีการแท็ก|{1} มีหนึ่งแท็ก|]1,Inf[ มี %count% แท็ก'
          see_untagged_entries: 'พบรายการที่ไม่ได้แท็ก'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          add: 'เพิ่ม'
          placeholder: 'คุณสามารถเพิ่มได้หลายแท็ก, จากการแบ่งโดย comma'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 8f42d381,c23461f6..c2ad854d
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@@ -102,6 -102,7 +102,7 @@@ config
          feed_limit: 'RSS içeriğinden talep edilecek makale limiti'
      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: 'Ä°sim'
          email_label: 'E-posta'
              # emailTwoFactor_label: 'Using email (receive a code by email)'
@@@ -419,7 -420,6 +420,7 @@@ tag
      list:
          number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.'
          # see_untagged_entries: 'See untagged entries'
 +        # no_untagged_entries: 'There are no untagged entries.'
      new:
          # add: 'Add'
          # placeholder: 'You can add several tags, separated by a comma.'