aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-11-17 09:53:14 +0100
committerGitHub <noreply@github.com>2016-11-17 09:53:14 +0100
commit9e0a49e6acf60c3dbf3c479cb36d404239dfda89 (patch)
tree78ee9b6c910db597af811337af66fff615c4fa09
parentd213219ec785db757dba455acd53480ab0d292fb (diff)
parentc894d76e5790f47a210b673abe00d780a894f55a (diff)
downloadwallabag-9e0a49e6acf60c3dbf3c479cb36d404239dfda89.tar.gz
wallabag-9e0a49e6acf60c3dbf3c479cb36d404239dfda89.tar.zst
wallabag-9e0a49e6acf60c3dbf3c479cb36d404239dfda89.zip
Merge pull request #2578 from wallabag/questionmark-icon
Added help on config screen
-rw-r--r--docs/de/user/configuration.rst6
-rw-r--r--docs/en/user/configuration.rst6
-rw-r--r--docs/en/user/import.rst2
-rw-r--r--docs/fr/user/configuration.rst6
-rw-r--r--docs/fr/user/import.rst2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.es.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig22
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig48
-rw-r--r--tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php2
33 files changed, 170 insertions, 34 deletions
diff --git a/docs/de/user/configuration.rst b/docs/de/user/configuration.rst
index 0b0793b1..23591cb9 100644
--- a/docs/de/user/configuration.rst
+++ b/docs/de/user/configuration.rst
@@ -13,8 +13,7 @@ Einstellungen
13Theme 13Theme
14~~~~~ 14~~~~~
15 15
16wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen. Du kannst 16wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen. Das Standardtheme
17auch ein neues erstellen, ein extra Kapitel wird dem gewidmet sein. Das Standardtheme
18ist ``Material``, es ist das Theme, dass in den Dokumentationsbildschirmfotos genutzt wird. 17ist ``Material``, es ist das Theme, dass in den Dokumentationsbildschirmfotos genutzt wird.
19 18
20Artikel pro Seite 19Artikel pro Seite
@@ -31,8 +30,7 @@ ein schneller oder langsamer Leser bist. wallabag wird die Lesezeit für jeden A
31Sprache 30Sprache
32~~~~~~~ 31~~~~~~~
33 32
34Du kannst die Sprache von der wallabag Benutzeroberfläche ändern. Du musst die ausloggen, damit diese 33Du kannst die Sprache von der wallabag Benutzeroberfläche ändern.
35Änderung Wirkung zeigt.
36 34
37RSS 35RSS
38--- 36---
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index f74924df..a6edcd4a 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -12,8 +12,7 @@ Settings
12Theme 12Theme
13~~~~~ 13~~~~~
14 14
15wallabag is customizable. You can choose your prefered theme here. You can also 15wallabag is customizable. You can choose your prefered theme here. The default theme is
16create a new one, a chapter will be dedicated for this. The default theme is
17``Material``, it's the theme used in the documentation screenshots. 16``Material``, it's the theme used in the documentation screenshots.
18 17
19Items per page 18Items per page
@@ -30,8 +29,7 @@ a fast or a slow reader. wallabag will recalculate the reading time for each art
30Language 29Language
31~~~~~~~~ 30~~~~~~~~
32 31
33You can change the language of wallabag interface. You need to logout for this change 32You can change the language of wallabag interface.
34to take effect.
35 33
36RSS 34RSS
37--- 35---
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index 70f0187d..38cd30c1 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -16,7 +16,7 @@ a new application on their developer website to continue.
16 and submit your new application 16 and submit your new application
17 17
18Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). 18Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
19You need to configure the ``pocket_consumer_key`` into the ``Import`` section in the ``Internal settings`` menu. 19You need to configure the ``pocket_consumer_key`` in the ``Config`` menu.
20 20
21Now, all is fine to migrate from Pocket. 21Now, all is fine to migrate from Pocket.
22 22
diff --git a/docs/fr/user/configuration.rst b/docs/fr/user/configuration.rst
index 8bfe66f5..8ee0a49b 100644
--- a/docs/fr/user/configuration.rst
+++ b/docs/fr/user/configuration.rst
@@ -13,8 +13,7 @@ Thème
13~~~~~ 13~~~~~
14 14
15L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème 15L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème
16que vous préférez. Vous pouvez aussi en créer un nouveau, une documentation sera 16que vous préférez. Le thème par défaut est ``Material``, c'est celui
17disponible pour guider. Le thème par défaut est ``Material``, c'est celui
18qui est utilisé dans les captures d'écran de la documentation. 17qui est utilisé dans les captures d'écran de la documentation.
19 18
20Nombre d'articles par page 19Nombre d'articles par page
@@ -30,8 +29,7 @@ wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir
30Langue 29Langue
31~~~~~~ 30~~~~~~
32 31
33Vous pouvez définir la langue de l'interface de wallabag. Vous devrez vous déconnecter 32Vous pouvez définir la langue de l'interface de wallabag.
34pour que la nouvelle langue soit prise en compte.
35 33
36RSS 34RSS
37--- 35---
diff --git a/docs/fr/user/import.rst b/docs/fr/user/import.rst
index 2e6caafb..33062a33 100644
--- a/docs/fr/user/import.rst
+++ b/docs/fr/user/import.rst
@@ -16,7 +16,7 @@ Vous devez créer une nouvelle application sur leur site dédié aux développeu
16 termes d'utilisation du service et soumettez votre application 16 termes d'utilisation du service et soumettez votre application
17 17
18Pocket vous fournira une **Consumer Key** (par exemple, `49961-985e4b92fe21fe4c78d682c1`). 18Pocket vous fournira une **Consumer Key** (par exemple, `49961-985e4b92fe21fe4c78d682c1`).
19Vous devez configurer la ``pocket_consumer_key`` dans la section ``Import`` du menu ``Configuration interne``. 19Vous devez configurer la ``pocket_consumer_key`` dans le menu ``Configuration``.
20 20
21Maintenant, tout est bien configuré pour migrer depuis Pocket. 21Maintenant, tout est bien configuré pour migrer depuis Pocket.
22 22
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index d0f0e3f3..69393ac9 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -68,7 +68,7 @@ class Config
68 * @Assert\Range( 68 * @Assert\Range(
69 * min = 1, 69 * min = 1,
70 * max = 100000, 70 * max = 100000,
71 * maxMessage = "validator.rss_limit_too_hight" 71 * maxMessage = "validator.rss_limit_too_high"
72 * ) 72 * )
73 */ 73 */
74 private $rssLimit; 74 private $rssLimit;
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 1077e9d1..a1bee173 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -71,6 +71,11 @@ config:
71 # 300_word: 'I read ~300 words per minute' 71 # 300_word: 'I read ~300 words per minute'
72 # 400_word: 'I read ~400 words per minute' 72 # 400_word: 'I read ~400 words per minute'
73 pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer 73 pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' 80 description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.'
76 token_label: 'RSS-Token' 81 token_label: 'RSS-Token'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Navn' 93 name_label: 'Navn'
89 email_label: 'Emailadresse' 94 email_label: 'Emailadresse'
90 # twoFactorAuthentication_label: 'Two factor authentication' 95 # twoFactorAuthentication_label: 'Two factor authentication'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Gammel adgangskode' 99 old_password_label: 'Gammel adgangskode'
93 new_password_label: 'Ny adgangskode' 100 new_password_label: 'Ny adgangskode'
94 repeat_new_password_label: 'Gentag adgangskode' 101 repeat_new_password_label: 'Gentag adgangskode'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 843102f4..c9625d06 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -71,6 +71,11 @@ config:
71 300_word: 'Ich lese ~300 Wörter pro Minute' 71 300_word: 'Ich lese ~300 Wörter pro Minute'
72 400_word: 'Ich lese ~400 Wörter pro Minute' 72 400_word: 'Ich lese ~400 Wörter pro Minute'
73 pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren 73 pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' 80 description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.'
76 token_label: 'RSS-Token' 81 token_label: 'RSS-Token'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Name' 93 name_label: 'Name'
89 email_label: 'E-Mail-Adresse' 94 email_label: 'E-Mail-Adresse'
90 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' 95 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Altes Kennwort' 99 old_password_label: 'Altes Kennwort'
93 new_password_label: 'Neues Kennwort' 100 new_password_label: 'Neues Kennwort'
94 repeat_new_password_label: 'Neues Kennwort wiederholen' 101 repeat_new_password_label: 'Neues Kennwort wiederholen'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 3cee6468..139cdc24 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -71,6 +71,11 @@ config:
71 300_word: 'I read ~300 words per minute' 71 300_word: 'I read ~300 words per minute'
72 400_word: 'I read ~400 words per minute' 72 400_word: 'I read ~400 words per minute'
73 pocket_consumer_key_label: Consumer key for Pocket to import contents 73 pocket_consumer_key_label: Consumer key for Pocket to import contents
74 help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 help_items_per_page: "You can change the number of articles displayed on each page."
76 help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 help_language: "You can change the language of wallabag interface."
78 help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.' 80 description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.'
76 token_label: 'RSS token' 81 token_label: 'RSS token'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Name' 93 name_label: 'Name'
89 email_label: 'Email' 94 email_label: 'Email'
90 twoFactorAuthentication_label: 'Two factor authentication' 95 twoFactorAuthentication_label: 'Two factor authentication'
96 help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Current password' 99 old_password_label: 'Current password'
93 new_password_label: 'New password' 100 new_password_label: 'New password'
94 repeat_new_password_label: 'Repeat new password' 101 repeat_new_password_label: 'Repeat new password'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 480eacc4..70e64bec 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -71,6 +71,11 @@ config:
71 300_word: 'Leo ~300 palabras por minuto' 71 300_word: 'Leo ~300 palabras por minuto'
72 400_word: 'Leo ~400 palabras por minuto' 72 400_word: 'Leo ~400 palabras por minuto'
73 # pocket_consumer_key_label: Consumer key for Pocket to import contents 73 # pocket_consumer_key_label: Consumer key for Pocket to import contents
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero' 80 description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero'
76 token_label: 'RSS token' 81 token_label: 'RSS token'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Nombre' 93 name_label: 'Nombre'
89 email_label: 'Direccion e-mail' 94 email_label: 'Direccion e-mail'
90 twoFactorAuthentication_label: 'Autentificación de dos factores' 95 twoFactorAuthentication_label: 'Autentificación de dos factores'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Contraseña actual' 99 old_password_label: 'Contraseña actual'
93 new_password_label: 'Nueva contraseña' 100 new_password_label: 'Nueva contraseña'
94 repeat_new_password_label: 'Confirmar la nueva contraseña' 101 repeat_new_password_label: 'Confirmar la nueva contraseña'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 619b596a..75359901 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -71,6 +71,11 @@ config:
71 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم' 71 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم'
72 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم' 72 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم'
73 pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب 73 pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' 80 description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.'
76 token_label: 'کد آر-اس-اس' 81 token_label: 'کد آر-اس-اس'
@@ -88,7 +93,9 @@ config:
88 name_label: 'نام' 93 name_label: 'نام'
89 email_label: 'نشانی ایمیل' 94 email_label: 'نشانی ایمیل'
90 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای' 95 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'رمز قدیمی' 99 old_password_label: 'رمز قدیمی'
93 new_password_label: 'رمز تازه' 100 new_password_label: 'رمز تازه'
94 repeat_new_password_label: 'رمز تازه را دوباره بنویسید' 101 repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index d7e839b2..f2c9d8db 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -71,6 +71,11 @@ config:
71 300_word: "Je lis environ 300 mots par minute" 71 300_word: "Je lis environ 300 mots par minute"
72 400_word: "Je lis environ 400 mots par minute" 72 400_word: "Je lis environ 400 mots par minute"
73 pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données 73 pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données
74 help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez."
75 help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page."
76 help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article."
77 help_language: "Vous pouvez définir la langue de l'interface de wallabag."
78 help_pocket_consumer_key: "Nécessaire pour l'import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket."
74 form_rss: 79 form_rss:
75 description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." 80 description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton."
76 token_label: "Jeton RSS" 81 token_label: "Jeton RSS"
@@ -88,7 +93,9 @@ config:
88 name_label: "Nom" 93 name_label: "Nom"
89 email_label: "Adresse courriel" 94 email_label: "Adresse courriel"
90 twoFactorAuthentication_label: "Double authentification" 95 twoFactorAuthentication_label: "Double authentification"
96 help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email."
91 form_password: 97 form_password:
98 description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères."
92 old_password_label: "Mot de passe actuel" 99 old_password_label: "Mot de passe actuel"
93 new_password_label: "Nouveau mot de passe" 100 new_password_label: "Nouveau mot de passe"
94 repeat_new_password_label: "Confirmez votre nouveau mot de passe" 101 repeat_new_password_label: "Confirmez votre nouveau mot de passe"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index eecd7882..b7d066ab 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -71,6 +71,11 @@ config:
71 300_word: 'Leggo ~300 parole al minuto' 71 300_word: 'Leggo ~300 parole al minuto'
72 400_word: 'Leggo ~400 parole al minuto' 72 400_word: 'Leggo ~400 parole al minuto'
73 pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti 73 pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' 80 description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.'
76 token_label: 'RSS token' 81 token_label: 'RSS token'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Nome' 93 name_label: 'Nome'
89 email_label: 'E-mail' 94 email_label: 'E-mail'
90 twoFactorAuthentication_label: 'Two factor authentication' 95 twoFactorAuthentication_label: 'Two factor authentication'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Password corrente' 99 old_password_label: 'Password corrente'
93 new_password_label: 'Nuova password' 100 new_password_label: 'Nuova password'
94 repeat_new_password_label: 'Ripeti la nuova password' 101 repeat_new_password_label: 'Ripeti la nuova password'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 7fa31bce..16ef1e5d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -71,6 +71,11 @@ config:
71 300_word: "Legissi a l'entorn de 300 mots per minuta" 71 300_word: "Legissi a l'entorn de 300 mots per minuta"
72 400_word: "Legissi a l'entorn de 400 mots per minuta" 72 400_word: "Legissi a l'entorn de 400 mots per minuta"
73 pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas 73 pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." 80 description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton."
76 token_label: 'Geton RSS' 81 token_label: 'Geton RSS'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Nom' 93 name_label: 'Nom'
89 email_label: 'Adreça de corrièl' 94 email_label: 'Adreça de corrièl'
90 twoFactorAuthentication_label: 'Dobla autentificacion' 95 twoFactorAuthentication_label: 'Dobla autentificacion'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Senhal actual' 99 old_password_label: 'Senhal actual'
93 new_password_label: 'Senhal novèl' 100 new_password_label: 'Senhal novèl'
94 repeat_new_password_label: 'Confirmatz vòstre novèl senhal' 101 repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 1b00fc6d..73250cc0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -71,6 +71,11 @@ config:
71 300_word: 'Czytam ~300 słów na minutę' 71 300_word: 'Czytam ~300 słów na minutę'
72 400_word: 'Czytam ~400 słów na minutę' 72 400_word: 'Czytam ~400 słów na minutę'
73 pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' 73 pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości'
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌' 80 description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌'
76 token_label: 'Token RSS' 81 token_label: 'Token RSS'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Nazwa' 93 name_label: 'Nazwa'
89 email_label: 'Adres email' 94 email_label: 'Adres email'
90 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' 95 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Stare hasło' 99 old_password_label: 'Stare hasło'
93 new_password_label: 'Nowe hasło' 100 new_password_label: 'Nowe hasło'
94 repeat_new_password_label: 'Powtórz nowe hasło' 101 repeat_new_password_label: 'Powtórz nowe hasło'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 54316161..a375ac7b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -71,6 +71,11 @@ config:
71 300_word: 'Posso ler ~300 palavras por minuto' 71 300_word: 'Posso ler ~300 palavras por minuto'
72 400_word: 'Posso ler ~400 palavras por minuto' 72 400_word: 'Posso ler ~400 palavras por minuto'
73 pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' 73 pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo'
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' 80 description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.'
76 token_label: 'Token RSS' 81 token_label: 'Token RSS'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Nome' 93 name_label: 'Nome'
89 email_label: 'E-mail' 94 email_label: 'E-mail'
90 twoFactorAuthentication_label: 'Autenticação de dois passos' 95 twoFactorAuthentication_label: 'Autenticação de dois passos'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Senha atual' 99 old_password_label: 'Senha atual'
93 new_password_label: 'Nova senha' 100 new_password_label: 'Nova senha'
94 repeat_new_password_label: 'Repita a nova senha' 101 repeat_new_password_label: 'Repita a nova senha'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 65cedfb2..7d8fcea3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -71,6 +71,11 @@ config:
71 # 300_word: 'I read ~300 words per minute' 71 # 300_word: 'I read ~300 words per minute'
72 # 400_word: 'I read ~400 words per minute' 72 # 400_word: 'I read ~400 words per minute'
73 pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket 73 pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' 80 description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.'
76 token_label: 'RSS-Token' 81 token_label: 'RSS-Token'
@@ -88,7 +93,9 @@ config:
88 name_label: 'Nume' 93 name_label: 'Nume'
89 email_label: 'E-mail' 94 email_label: 'E-mail'
90 # twoFactorAuthentication_label: 'Two factor authentication' 95 # twoFactorAuthentication_label: 'Two factor authentication'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Parola veche' 99 old_password_label: 'Parola veche'
93 new_password_label: 'Parola nouă' 100 new_password_label: 'Parola nouă'
94 repeat_new_password_label: 'Repeat new password' 101 repeat_new_password_label: 'Repeat new password'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 73fb6fce..357aa2ae 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -71,6 +71,11 @@ config:
71 # 300_word: 'I read ~300 words per minute' 71 # 300_word: 'I read ~300 words per minute'
72 # 400_word: 'I read ~400 words per minute' 72 # 400_word: 'I read ~400 words per minute'
73 # pocket_consumer_key_label: Consumer key for Pocket to import contents 73 # pocket_consumer_key_label: Consumer key for Pocket to import contents
74 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
75 # help_items_per_page: "You can change the number of articles displayed on each page."
76 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
77 # help_language: "You can change the language of wallabag interface."
78 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
74 form_rss: 79 form_rss:
75 description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' 80 description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.'
76 token_label: 'RSS belirteci (token)' 81 token_label: 'RSS belirteci (token)'
@@ -88,7 +93,9 @@ config:
88 name_label: 'İsim' 93 name_label: 'İsim'
89 email_label: 'E-posta' 94 email_label: 'E-posta'
90 twoFactorAuthentication_label: 'İki adımlı doğrulama' 95 twoFactorAuthentication_label: 'İki adımlı doğrulama'
96 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
91 form_password: 97 form_password:
98 # description: "You can change your password here. Your new password should by at least 8 characters long."
92 old_password_label: 'Eski şifre' 99 old_password_label: 'Eski şifre'
93 new_password_label: 'Yeni şifre' 100 new_password_label: 'Yeni şifre'
94 repeat_new_password_label: 'Yeni şifrenin tekrarı' 101 repeat_new_password_label: 'Yeni şifrenin tekrarı'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
index 313339ed..32a8b4a8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Adgangskoden skal være mindst 8 tegn' 3 password_too_short: 'Adgangskoden skal være mindst 8 tegn'
4 # password_wrong_value: 'Wrong value for your current password' 4 # password_wrong_value: 'Wrong value for your current password'
5 # item_per_page_too_high: 'This will certainly kill the app' 5 # item_per_page_too_high: 'This will certainly kill the app'
6 # rss_limit_too_hight: 'This will certainly kill the app' 6 # rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
index 486cc3e4..37b9888f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt' 3 password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt'
4 password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort' 4 password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort'
5 item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden' 5 item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden'
6 rss_limit_too_hight: 'Dies wird die Anwendung möglicherweise beenden' 6 rss_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
index cdfa46a6..29217497 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Password should by at least 8 chars long' 3 password_too_short: 'Password should by at least 8 chars long'
4 password_wrong_value: 'Wrong value for your current password' 4 password_wrong_value: 'Wrong value for your current password'
5 item_per_page_too_high: 'This will certainly kill the app' 5 item_per_page_too_high: 'This will certainly kill the app'
6 rss_limit_too_hight: 'This will certainly kill the app' 6 rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
index ebbff7cf..57ddaa5a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'La contraseña debe tener al menos 8 carácteres' 3 password_too_short: 'La contraseña debe tener al menos 8 carácteres'
4 password_wrong_value: 'Entrada equivocada para su contraseña actual' 4 password_wrong_value: 'Entrada equivocada para su contraseña actual'
5 item_per_page_too_high: 'Esto matará la aplicación' 5 item_per_page_too_high: 'Esto matará la aplicación'
6 rss_limit_too_hight: 'Esto matará la aplicación' 6 rss_limit_too_high: 'Esto matará la aplicación'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
index 01c62ae0..e0536d18 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد' 3 password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد'
4 password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید' 4 password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
5 item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود' 5 item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
6 rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود' 6 rss_limit_too_high: 'با این تعداد برنامه به فنا می‌رود'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
index 2d5eca29..64574709 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: "Le mot de passe doit contenir au moins 8 caractères" 3 password_too_short: "Le mot de passe doit contenir au moins 8 caractères"
4 password_wrong_value: "Votre mot de passe actuel est faux" 4 password_wrong_value: "Votre mot de passe actuel est faux"
5 item_per_page_too_high: "Ça ne va pas plaire à l’application" 5 item_per_page_too_high: "Ça ne va pas plaire à l’application"
6 rss_limit_too_hight: "Ça ne va pas plaire à l’application" 6 rss_limit_too_high: "Ça ne va pas plaire à l’application"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
index 826206f4..d9beb54f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'La password deve essere lunga almeno 8 caratteri' 3 password_too_short: 'La password deve essere lunga almeno 8 caratteri'
4 password_wrong_value: 'Valore inserito per la password corrente errato' 4 password_wrong_value: 'Valore inserito per la password corrente errato'
5 item_per_page_too_high: 'Questo valore è troppo alto' 5 item_per_page_too_high: 'Questo valore è troppo alto'
6 rss_limit_too_hight: 'Questo valore è troppo alto' 6 rss_limit_too_high: 'Questo valore è troppo alto'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
index 71b67575..f92c2708 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Lo senhal deu aver almens 8 caractèrs' 3 password_too_short: 'Lo senhal deu aver almens 8 caractèrs'
4 password_wrong_value: 'Vòstre senhal actual es pas bon' 4 password_wrong_value: 'Vòstre senhal actual es pas bon'
5 item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion" 5 item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion"
6 rss_limit_too_hight: "Aquò li agradarà pas a l'aplicacion" 6 rss_limit_too_high: "Aquò li agradarà pas a l'aplicacion"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
index 4f5a3caf..ffcd5e7f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Hasło powinno mieć minimum 8 znaków długości' 3 password_too_short: 'Hasło powinno mieć minimum 8 znaków długości'
4 password_wrong_value: 'Twoje obecne hasło jest błędne' 4 password_wrong_value: 'Twoje obecne hasło jest błędne'
5 item_per_page_too_high: 'To może spowodować problemy z aplikacją' 5 item_per_page_too_high: 'To może spowodować problemy z aplikacją'
6 rss_limit_too_hight: 'To może spowodować problemy z aplikacją' 6 rss_limit_too_high: 'To może spowodować problemy z aplikacją'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
index 49890830..4eddff10 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'A senha deve ter pelo menos 8 caracteres' 3 password_too_short: 'A senha deve ter pelo menos 8 caracteres'
4 password_wrong_value: 'A senha atual informada está errada' 4 password_wrong_value: 'A senha atual informada está errada'
5 item_per_page_too_high: 'Certamente isso pode matar a aplicação' 5 item_per_page_too_high: 'Certamente isso pode matar a aplicação'
6 rss_limit_too_hight: 'Certamente isso pode matar a aplicação' 6 rss_limit_too_high: 'Certamente isso pode matar a aplicação'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
index 2ffbbd4d..59a8cdd8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere' 3 password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere'
4 # password_wrong_value: 'Wrong value for your current password' 4 # password_wrong_value: 'Wrong value for your current password'
5 # item_per_page_too_high: 'This will certainly kill the app' 5 # item_per_page_too_high: 'This will certainly kill the app'
6 # rss_limit_too_hight: 'This will certainly kill the app' 6 # rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
index 1b358965..01388771 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
@@ -3,4 +3,4 @@ validator:
3 # password_too_short: 'Password should by at least 8 chars long' 3 # password_too_short: 'Password should by at least 8 chars long'
4 # password_wrong_value: 'Wrong value for your current password' 4 # password_wrong_value: 'Wrong value for your current password'
5 # item_per_page_too_high: 'This will certainly kill the app' 5 # item_per_page_too_high: 'This will certainly kill the app'
6 # rss_limit_too_hight: 'This will certainly kill the app' 6 # rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index ff7ef73a..98b0e119 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -14,6 +14,9 @@
14 {{ form_errors(form.config.theme) }} 14 {{ form_errors(form.config.theme) }}
15 {{ form_widget(form.config.theme) }} 15 {{ form_widget(form.config.theme) }}
16 </div> 16 </div>
17 <a href="#" title="{{ 'config.form_settings.help_theme'|trans }}">
18 <i class="material-icons">live_help</i>
19 </a>
17 </fieldset> 20 </fieldset>
18 21
19 <fieldset class="w500p inline"> 22 <fieldset class="w500p inline">
@@ -22,6 +25,9 @@
22 {{ form_errors(form.config.items_per_page) }} 25 {{ form_errors(form.config.items_per_page) }}
23 {{ form_widget(form.config.items_per_page) }} 26 {{ form_widget(form.config.items_per_page) }}
24 </div> 27 </div>
28 <a href="#" title="{{ 'config.form_settings.help_items_per_page'|trans }}">
29 <i class="material-icons">live_help</i>
30 </a>
25 </fieldset> 31 </fieldset>
26 32
27 <fieldset class="w500p inline"> 33 <fieldset class="w500p inline">
@@ -34,6 +40,9 @@
34 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> 40 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
35 </p> 41 </p>
36 </div> 42 </div>
43 <a href="#" title="{{ 'config.form_settings.help_reading_speed'|trans }}">
44 <i class="material-icons">live_help</i>
45 </a>
37 </fieldset> 46 </fieldset>
38 47
39 <fieldset class="w500p inline"> 48 <fieldset class="w500p inline">
@@ -42,6 +51,9 @@
42 {{ form_errors(form.config.language) }} 51 {{ form_errors(form.config.language) }}
43 {{ form_widget(form.config.language) }} 52 {{ form_widget(form.config.language) }}
44 </div> 53 </div>
54 <a href="#" title="{{ 'config.form_settings.help_language'|trans }}">
55 <i class="material-icons">live_help</i>
56 </a>
45 </fieldset> 57 </fieldset>
46 58
47 <fieldset class="w500p inline"> 59 <fieldset class="w500p inline">
@@ -54,6 +66,9 @@
54 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> 66 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
55 </p> 67 </p>
56 </div> 68 </div>
69 <a href="#" title="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
70 <i class="material-icons">live_help</i>
71 </a>
57 </fieldset> 72 </fieldset>
58 73
59 {{ form_rest(form.config) }} 74 {{ form_rest(form.config) }}
@@ -143,6 +158,9 @@
143 {{ form_errors(form.user.twoFactorAuthentication) }} 158 {{ form_errors(form.user.twoFactorAuthentication) }}
144 {{ form_widget(form.user.twoFactorAuthentication) }} 159 {{ form_widget(form.user.twoFactorAuthentication) }}
145 </div> 160 </div>
161 <a href="#" title="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
162 <i class="material-icons">live_help</i>
163 </a>
146 </fieldset> 164 </fieldset>
147 {% endif %} 165 {% endif %}
148 166
@@ -155,6 +173,10 @@
155 {{ form_start(form.pwd) }} 173 {{ form_start(form.pwd) }}
156 {{ form_errors(form.pwd) }} 174 {{ form_errors(form.pwd) }}
157 175
176 <div class="row">
177 {{ 'config.form_password.description'|trans }}
178 </div>
179
158 <fieldset class="w500p inline"> 180 <fieldset class="w500p inline">
159 <div class="row"> 181 <div class="row">
160 {{ form_label(form.pwd.old_password) }} 182 {{ form_label(form.pwd.old_password) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 19faddc0..9f67217b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -24,23 +24,33 @@
24 {{ form_errors(form.config) }} 24 {{ form_errors(form.config) }}
25 25
26 <div class="row"> 26 <div class="row">
27 <div class="input-field col s12"> 27 <div class="input-field col s11">
28 {{ form_label(form.config.theme) }} 28 {{ form_label(form.config.theme) }}
29 {{ form_errors(form.config.theme) }} 29 {{ form_errors(form.config.theme) }}
30 {{ form_widget(form.config.theme) }} 30 {{ form_widget(form.config.theme) }}
31 </div> 31 </div>
32 <div class="input-field col s1">
33 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}">
34 <i class="material-icons">live_help</i>
35 </a>
36 </div>
32 </div> 37 </div>
33 38
34 <div class="row"> 39 <div class="row">
35 <div class="input-field col s12"> 40 <div class="input-field col s11">
36 {{ form_label(form.config.items_per_page) }} 41 {{ form_label(form.config.items_per_page) }}
37 {{ form_errors(form.config.items_per_page) }} 42 {{ form_errors(form.config.items_per_page) }}
38 {{ form_widget(form.config.items_per_page) }} 43 {{ form_widget(form.config.items_per_page) }}
39 </div> 44 </div>
45 <div class="input-field col s1">
46 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}">
47 <i class="material-icons">live_help</i>
48 </a>
49 </div>
40 </div> 50 </div>
41 51
42 <div class="row"> 52 <div class="row">
43 <div class="input-field col s12"> 53 <div class="input-field col s11">
44 {{ form_label(form.config.reading_speed) }} 54 {{ form_label(form.config.reading_speed) }}
45 {{ form_errors(form.config.reading_speed) }} 55 {{ form_errors(form.config.reading_speed) }}
46 {{ form_widget(form.config.reading_speed) }} 56 {{ form_widget(form.config.reading_speed) }}
@@ -49,18 +59,28 @@
49 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> 59 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
50 </p> 60 </p>
51 </div> 61 </div>
62 <div class="input-field col s1">
63 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_reading_speed'|trans }}">
64 <i class="material-icons">live_help</i>
65 </a>
66 </div>
52 </div> 67 </div>
53 68
54 <div class="row"> 69 <div class="row">
55 <div class="input-field col s12"> 70 <div class="input-field col s11">
56 {{ form_label(form.config.language) }} 71 {{ form_label(form.config.language) }}
57 {{ form_errors(form.config.language) }} 72 {{ form_errors(form.config.language) }}
58 {{ form_widget(form.config.language) }} 73 {{ form_widget(form.config.language) }}
59 </div> 74 </div>
75 <div class="input-field col s1">
76 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}">
77 <i class="material-icons">live_help</i>
78 </a>
79 </div>
60 </div> 80 </div>
61 81
62 <div class="row"> 82 <div class="row">
63 <div class="input-field col s12"> 83 <div class="input-field col s11">
64 {{ form_label(form.config.pocket_consumer_key) }} 84 {{ form_label(form.config.pocket_consumer_key) }}
65 {{ form_errors(form.config.pocket_consumer_key) }} 85 {{ form_errors(form.config.pocket_consumer_key) }}
66 {{ form_widget(form.config.pocket_consumer_key) }} 86 {{ form_widget(form.config.pocket_consumer_key) }}
@@ -69,6 +89,11 @@
69 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> 89 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
70 </p> 90 </p>
71 </div> 91 </div>
92 <div class="input-field col s1">
93 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
94 <i class="material-icons">live_help</i>
95 </a>
96 </div>
72 </div> 97 </div>
73 98
74 {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 99 {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
@@ -152,7 +177,7 @@
152 177
153 {% if twofactor_auth %} 178 {% if twofactor_auth %}
154 <div class="row"> 179 <div class="row">
155 <div class="input-field col s12"> 180 <div class="input-field col s11">
156 {{ 'config.form_user.two_factor_description'|trans }} 181 {{ 'config.form_user.two_factor_description'|trans }}
157 182
158 <br /> 183 <br />
@@ -161,6 +186,11 @@
161 {{ form_label(form.user.twoFactorAuthentication) }} 186 {{ form_label(form.user.twoFactorAuthentication) }}
162 {{ form_errors(form.user.twoFactorAuthentication) }} 187 {{ form_errors(form.user.twoFactorAuthentication) }}
163 </div> 188 </div>
189 <div class="input-field col s1">
190 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
191 <i class="material-icons">live_help</i>
192 </a>
193 </div>
164 </div> 194 </div>
165 {% endif %} 195 {% endif %}
166 196
@@ -173,6 +203,12 @@
173 {{ form_start(form.pwd) }} 203 {{ form_start(form.pwd) }}
174 {{ form_errors(form.pwd) }} 204 {{ form_errors(form.pwd) }}
175 205
206 <div class="row">
207 <div class="input-field col s12">
208 {{ 'config.form_password.description'|trans }}
209 </div>
210 </div>
211
176 <div class="row"> 212 <div class="row">
177 <div class="input-field col s12"> 213 <div class="input-field col s12">
178 {{ form_label(form.pwd.old_password) }} 214 {{ form_label(form.pwd.old_password) }}
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
index 1954c654..d4fbe2d4 100644
--- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -373,7 +373,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
373 [ 373 [
374 'rss_config[rss_limit]' => 1000000000000, 374 'rss_config[rss_limit]' => 1000000000000,
375 ], 375 ],
376 'validator.rss_limit_too_hight', 376 'validator.rss_limit_too_high',
377 ], 377 ],
378 ]; 378 ];
379 } 379 }