diff options
14 files changed, 14 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 52904d25..6574e587 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
78 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer | 78 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer |
79 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
82 | # 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." | 83 | # 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." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 481b5d05..d78fff35 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | redirect_current_page: 'Zur aktuellen Seite' | 77 | redirect_current_page: 'Zur aktuellen Seite' |
78 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren | 78 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren |
79 | android_configuration: Konfiguriere deine Android Application | 79 | android_configuration: Konfiguriere deine Android Application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | help_theme: "wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen." | 81 | help_theme: "wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen." |
81 | help_items_per_page: "Du kannst die Nummer von Artikeln pro Seite anpassen." | 82 | help_items_per_page: "Du kannst die Nummer von Artikeln pro Seite anpassen." |
82 | help_reading_speed: "wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen." | 83 | help_reading_speed: "wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 98888d05..49e9eab3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | redirect_current_page: 'To the current page' | 77 | redirect_current_page: 'To the current page' |
78 | pocket_consumer_key_label: Consumer key for Pocket to import contents | 78 | pocket_consumer_key_label: Consumer key for Pocket to import contents |
79 | android_configuration: Configure your Android application | 79 | android_configuration: Configure your Android application |
80 | android_instruction: "Touch here to prefill your Android application" | ||
80 | help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | help_items_per_page: "You can change the number of articles displayed on each page." | 82 | help_items_per_page: "You can change the number of articles displayed on each page." |
82 | 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." | 83 | 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." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 310a00de..96998f53 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | redirect_current_page: 'A la página actual' | 77 | redirect_current_page: 'A la página actual' |
78 | pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket | 78 | pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket |
79 | android_configuration: Configura tu aplicación Android | 79 | android_configuration: Configura tu aplicación Android |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí." | 81 | help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí." |
81 | help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página." | 82 | help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página." |
82 | help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Puedes definir aquí, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo." | 83 | help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Puedes definir aquí, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index d5247fc3..15460ef7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -78,6 +78,7 @@ config: | |||
78 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب | 78 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب |
79 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | # android_instruction: "Touch here to prefill your Android application" | ||
81 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
82 | # 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." | 83 | # 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." |
83 | # help_language: "You can change the language of wallabag interface." | 84 | # help_language: "You can change the language of wallabag interface." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index b338eba4..0d9fda5f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | redirect_current_page: "À la page courante" | 77 | redirect_current_page: "À la page courante" |
78 | pocket_consumer_key_label: "Clé d’authentification Pocket pour importer les données" | 78 | pocket_consumer_key_label: "Clé d’authentification Pocket pour importer les données" |
79 | android_configuration: "Configurez votre application Android" | 79 | android_configuration: "Configurez votre application Android" |
80 | android_instruction: "Appuyez ici pour préremplir votre application Android" | ||
80 | help_theme: "L’affichage de wallabag est personnalisable. C’est ici que vous choisissez le thème que vous préférez." | 81 | help_theme: "L’affichage de wallabag est personnalisable. C’est ici que vous choisissez le thème que vous préférez." |
81 | help_items_per_page: "Vous pouvez définir le nombre d’articles affichés sur chaque page." | 82 | help_items_per_page: "Vous pouvez définir le nombre d’articles affichés sur chaque page." |
82 | 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." | 83 | 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." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index a3ff5495..352ea290 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
78 | pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti | 78 | pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti |
79 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
82 | # 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." | 83 | # 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." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index a6566a12..be57e903 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | redirect_current_page: 'A la pagina actuala' | 77 | redirect_current_page: 'A la pagina actuala' |
78 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas | 78 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas |
79 | android_configuration: Configuratz vòstra aplicacion Android | 79 | android_configuration: Configuratz vòstra aplicacion Android |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | help_theme: "wallabag es personalizable. Podètz causir vòstre tèma preferit aquí." | 81 | help_theme: "wallabag es personalizable. Podètz causir vòstre tèma preferit aquí." |
81 | help_items_per_page: "Podètz cambiar lo nombre d'articles afichats per pagina." | 82 | help_items_per_page: "Podètz cambiar lo nombre d'articles afichats per pagina." |
82 | help_reading_speed: "wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article." | 83 | help_reading_speed: "wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 8e1276d9..ba5f6579 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | redirect_current_page: 'do bieżącej strony' | 77 | redirect_current_page: 'do bieżącej strony' |
78 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' | 78 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' |
79 | android_configuration: Skonfiguruj swoją androidową aplikację | 79 | android_configuration: Skonfiguruj swoją androidową aplikację |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | help_theme: "Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw." | 81 | help_theme: "Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw." |
81 | help_items_per_page: "Możesz zmienić ilość artykułów wyświetlanych na każdej stronie." | 82 | help_items_per_page: "Możesz zmienić ilość artykułów wyświetlanych na każdej stronie." |
82 | help_reading_speed: "wallabag oblicza czas czytania każdego artykułu. Dzięki tej liście możesz określić swoje tempo. Wallabag przeliczy ponownie czas potrzebny, na przeczytanie każdego z artykułów." | 83 | help_reading_speed: "wallabag oblicza czas czytania każdego artykułu. Dzięki tej liście możesz określić swoje tempo. Wallabag przeliczy ponownie czas potrzebny, na przeczytanie każdego z artykułów." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 953c86bb..4ab5f144 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
78 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' | 78 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' |
79 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
82 | # 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." | 83 | # 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." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 51dbbcaf..c663b23e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
78 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket | 78 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket |
79 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
82 | # 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." | 83 | # 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." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index ff19e9d9..e0e752e0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -77,6 +77,7 @@ config: | |||
77 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
78 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | 78 | # pocket_consumer_key_label: Consumer key for Pocket to import contents |
79 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
82 | # 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." | 83 | # 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." |
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 2bf64cd6..bcc57dac 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 | |||
@@ -82,7 +82,7 @@ | |||
82 | <fieldset class="w500p inline"> | 82 | <fieldset class="w500p inline"> |
83 | <div class="row"> | 83 | <div class="row"> |
84 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> | 84 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> |
85 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}">Touch here to prefill your Android application</a> | 85 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}">{{ 'config.form_settings.android_instruction' | trans }}</a> |
86 | <br/> | 86 | <br/> |
87 | <img id="androidQrcode" /> | 87 | <img id="androidQrcode" /> |
88 | <script> | 88 | <script> |
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 f290cb49..a8143315 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 | |||
@@ -107,7 +107,7 @@ | |||
107 | <div class="row"> | 107 | <div class="row"> |
108 | <div class="input-field col s12"> | 108 | <div class="input-field col s12"> |
109 | <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5> | 109 | <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5> |
110 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a> | 110 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">{{ 'config.form_settings.android_instruction' | trans }}</a> |
111 | <img id="androidQrcode" class="hide-on-med-and-down" /> | 111 | <img id="androidQrcode" class="hide-on-med-and-down" /> |
112 | </div> | 112 | </div> |
113 | <script> | 113 | <script> |