aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php10
-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.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.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/views/themes/baggy/Config/index.html.twig5
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig5
12 files changed, 78 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 25ea9efa..b30b4706 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -39,12 +39,12 @@ class ConfigType extends AbstractType
39 'label' => 'config.form_settings.items_per_page_label', 39 'label' => 'config.form_settings.items_per_page_label',
40 )) 40 ))
41 ->add('reading_speed', ChoiceType::class, array( 41 ->add('reading_speed', ChoiceType::class, array(
42 'label' => 'config.form_settings.reading_speed', 42 'label' => 'config.form_settings.reading_speed.label',
43 'choices' => array( 43 'choices' => array(
44 'I read ~100 words per minute' => '0.5', 44 'config.form_settings.reading_speed.100_word' => '0.5',
45 'I read ~200 words per minute' => '1', 45 'config.form_settings.reading_speed.200_word' => '1',
46 'I read ~300 words per minute' => '1.5', 46 'config.form_settings.reading_speed.300_word' => '1.5',
47 'I read ~400 words per minute' => '2', 47 'config.form_settings.reading_speed.400_word' => '2',
48 ), 48 ),
49 )) 49 ))
50 ->add('language', ChoiceType::class, array( 50 ->add('language', ChoiceType::class, array(
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index d2a54536..40ae4e5a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'Tema' 61 theme_label: 'Tema'
62 items_per_page_label: 'Poster pr. side' 62 items_per_page_label: 'Poster pr. side'
63 language_label: 'Sprog' 63 language_label: 'Sprog'
64 reading_speed:
65 # label: 'Reading speed'
66 # help_message: 'You can use online tools to estimate your reading speed:'
67 # 100_word: 'I read ~100 words per minute'
68 # 200_word: 'I read ~200 words per minute'
69 # 300_word: 'I read ~300 words per minute'
70 # 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 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.' 72 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.'
66 token_label: 'RSS-Token' 73 token_label: 'RSS-Token'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 2029caec..34f567b1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'Theme' 61 theme_label: 'Theme'
62 items_per_page_label: 'Einträge pro Seite' 62 items_per_page_label: 'Einträge pro Seite'
63 language_label: 'Sprache' 63 language_label: 'Sprache'
64 reading_speed:
65 # label: 'Reading speed'
66 # help_message: 'You can use online tools to estimate your reading speed:'
67 # 100_word: 'I read ~100 words per minute'
68 # 200_word: 'I read ~200 words per minute'
69 # 300_word: 'I read ~300 words per minute'
70 # 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 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.' 72 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.'
66 token_label: 'RSS-token' 73 token_label: 'RSS-token'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 3a65d475..1e49d4ba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'Theme' 61 theme_label: 'Theme'
62 items_per_page_label: 'Items per page' 62 items_per_page_label: 'Items per page'
63 language_label: 'Language' 63 language_label: 'Language'
64 reading_speed:
65 label: 'Reading speed'
66 help_message: 'You can use online tools to estimate your reading speed:'
67 100_word: 'I read ~100 words per minute'
68 200_word: 'I read ~200 words per minute'
69 300_word: 'I read ~300 words per minute'
70 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 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.' 72 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.'
66 token_label: 'RSS token' 73 token_label: 'RSS token'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 78b00b79..9b32d038 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'Tema' 61 theme_label: 'Tema'
62 items_per_page_label: 'Número de artículos por página' 62 items_per_page_label: 'Número de artículos por página'
63 language_label: 'Idioma' 63 language_label: 'Idioma'
64 reading_speed:
65 # label: 'Reading speed'
66 # help_message: 'You can use online tools to estimate your reading speed:'
67 # 100_word: 'I read ~100 words per minute'
68 # 200_word: 'I read ~200 words per minute'
69 # 300_word: 'I read ~300 words per minute'
70 # 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero' 72 description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero'
66 token_label: 'RSS token' 73 token_label: 'RSS token'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index de572d09..97f52a78 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'پوسته' 61 theme_label: 'پوسته'
62 items_per_page_label: 'تعداد مقاله در هر صفحه' 62 items_per_page_label: 'تعداد مقاله در هر صفحه'
63 language_label: 'زبان' 63 language_label: 'زبان'
64 reading_speed:
65 # label: 'Reading speed'
66 # help_message: 'You can use online tools to estimate your reading speed:'
67 # 100_word: 'I read ~100 words per minute'
68 # 200_word: 'I read ~200 words per minute'
69 # 300_word: 'I read ~300 words per minute'
70 # 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' 72 description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.'
66 token_label: 'کد آر-اس-اس' 73 token_label: 'کد آر-اس-اس'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index e30de057..56172463 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -46,6 +46,8 @@ footer:
46 powered_by: 'propulsé par' 46 powered_by: 'propulsé par'
47 about: 'À propos' 47 about: 'À propos'
48 page_title: 'Configuration' 48 page_title: 'Configuration'
49
50config:
49 tab_menu: 51 tab_menu:
50 settings: 'Paramètres' 52 settings: 'Paramètres'
51 rss: 'RSS' 53 rss: 'RSS'
@@ -59,6 +61,13 @@ footer:
59 theme_label: 'Thème' 61 theme_label: 'Thème'
60 items_per_page_label: "Nombre d'articles par page" 62 items_per_page_label: "Nombre d'articles par page"
61 language_label: 'Langue' 63 language_label: 'Langue'
64 reading_speed:
65 label: 'Vitesse de lecture'
66 help_message: 'Vous pouvez utiliser un outil en ligne pour estimer votre vitesse de lecture :'
67 100_word: 'Je lis environ 100 mots par minute'
68 200_word: 'Je lis environ 200 mots par minute'
69 300_word: 'Je lis environ 300 mots par minute'
70 400_word: 'Je lis environ 400 mots par minute'
62 form_rss: 71 form_rss:
63 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." 72 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."
64 token_label: 'Jeton RSS' 73 token_label: 'Jeton RSS'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 7bda3204..daeac4bf 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'Temat' 61 theme_label: 'Temat'
62 items_per_page_label: 'Ilość elementóœ na stronie' 62 items_per_page_label: 'Ilość elementóœ na stronie'
63 language_label: 'Język' 63 language_label: 'Język'
64 reading_speed:
65 # label: 'Reading speed'
66 # help_message: 'You can use online tools to estimate your reading speed:'
67 # 100_word: 'I read ~100 words per minute'
68 # 200_word: 'I read ~200 words per minute'
69 # 300_word: 'I read ~300 words per minute'
70 # 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌' 72 description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌'
66 token_label: 'Token RSS' 73 token_label: 'Token RSS'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 08e9080f..af4470b2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'Temă' 61 theme_label: 'Temă'
62 items_per_page_label: 'Articole pe pagină' 62 items_per_page_label: 'Articole pe pagină'
63 language_label: 'Limbă' 63 language_label: 'Limbă'
64 reading_speed:
65 # label: 'Reading speed'
66 # help_message: 'You can use online tools to estimate your reading speed:'
67 # 100_word: 'I read ~100 words per minute'
68 # 200_word: 'I read ~200 words per minute'
69 # 300_word: 'I read ~300 words per minute'
70 # 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' 72 description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.'
66 token_label: 'RSS-Token' 73 token_label: 'RSS-Token'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 02d424f9..5d859950 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -61,6 +61,13 @@ config:
61 theme_label: 'Tema' 61 theme_label: 'Tema'
62 items_per_page_label: 'Sayfa başına makale sayısı' 62 items_per_page_label: 'Sayfa başına makale sayısı'
63 language_label: 'Dil' 63 language_label: 'Dil'
64 reading_speed:
65 # label: 'Reading speed'
66 # help_message: 'You can use online tools to estimate your reading speed:'
67 # 100_word: 'I read ~100 words per minute'
68 # 200_word: 'I read ~200 words per minute'
69 # 300_word: 'I read ~300 words per minute'
70 # 400_word: 'I read ~400 words per minute'
64 form_rss: 71 form_rss:
65 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.' 72 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.'
66 token_label: 'RSS belirteci (token)' 73 token_label: 'RSS belirteci (token)'
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 721948ef..89e6e076 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
@@ -29,7 +29,10 @@
29 {{ form_label(form.config.reading_speed) }} 29 {{ form_label(form.config.reading_speed) }}
30 {{ form_errors(form.config.reading_speed) }} 30 {{ form_errors(form.config.reading_speed) }}
31 {{ form_widget(form.config.reading_speed) }} 31 {{ form_widget(form.config.reading_speed) }}
32 <p>{% trans %}You can use online tools to estimate your reading speed{% endtrans %} (<a href="http://www.myreadspeed.com/calculate/">{% trans %}like this one{%endtrans%}</a>).</p> 32 <p>
33 {{ 'config.form_settings.reading_speed.help_message'|trans }}
34 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
35 </p>
33 </div> 36 </div>
34 </fieldset> 37 </fieldset>
35 38
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 698219b9..3343a1d2 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
@@ -47,7 +47,10 @@
47 {{ form_label(form.config.reading_speed) }} 47 {{ form_label(form.config.reading_speed) }}
48 {{ form_errors(form.config.reading_speed) }} 48 {{ form_errors(form.config.reading_speed) }}
49 {{ form_widget(form.config.reading_speed) }} 49 {{ form_widget(form.config.reading_speed) }}
50 <p>{% trans %}You can use online tools to estimate your reading speed{% endtrans %} (<a href="http://www.myreadspeed.com/calculate/">{% trans %}like this one{%endtrans%}</a>).</p> 50 <p>
51 {{ 'config.form_settings.reading_speed.help_message'|trans }}
52 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
53 </p>
51 </div> 54 </div>
52 </div> 55 </div>
53 56