From: Jeremy Benoist
Date: Thu, 3 Nov 2016 15:22:07 +0000 (+0100)
Subject: Merge pull request #2180 from wallabag/download-pictures
X-Git-Tag: 2.2.0~3^2~79
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=da4136557963018287cae61226e9006c3c741747;hp=-c;p=github%2Fwallabag%2Fwallabag.git
Merge pull request #2180 from wallabag/download-pictures
Download pictures
---
da4136557963018287cae61226e9006c3c741747
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 9b0eecce,87083799..21c26079
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@@ -71,7 -71,6 +71,7 @@@ config
# 300_word: 'I read ~300 words per minute'
# 400_word: 'I read ~400 words per minute'
pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
+ # android_configuration: Configure your Android application
form_rss:
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.'
token_label: 'RSS-Token'
@@@ -368,6 -367,7 +368,7 @@@ import
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker:
# enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
# firefox:
# page_title: 'Import > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
# client_created: 'New client created.'
# client_deleted: 'Client deleted'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index a156c54a,5e5dd996..ff70cbee
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: 'Ich lese ~300 Wörter pro Minute'
400_word: 'Ich lese ~400 Wörter pro Minute'
pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren
+ # android_configuration: Configure your Android application
form_rss:
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.'
token_label: 'RSS-Token'
@@@ -368,6 -367,7 +368,7 @@@ import
how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.'
worker:
enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'Aus Firefox importieren'
description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichernâ¦\". Du erhälst eine .json Datei."
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
client_created: 'Neuer Client erstellt.'
client_deleted: 'Client gelöscht'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 049959a0,ab56cdb9..36382b6f
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: 'I read ~300 words per minute'
400_word: 'I read ~400 words per minute'
pocket_consumer_key_label: Consumer key for Pocket to import contents
+ android_configuration: Configure your Android application
form_rss:
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.'
token_label: 'RSS token'
@@@ -368,6 -367,7 +368,7 @@@ import
how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker:
enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+ download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'Import > Firefox'
description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -471,6 -471,7 +472,7 @@@ flashes
rss_updated: 'RSS information updated'
tagging_rules_updated: 'Tagging rules updated'
tagging_rules_deleted: 'Tagging rule deleted'
+ # user_added: 'User "%username%" added'
rss_token_updated: 'RSS token updated'
annotations_reset: Annotations reset
tags_reset: Tags reset
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 79c13ff0,c852e5b7..2c80fe8f
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: 'Leo ~300 palabras por minuto'
400_word: 'Leo ~400 palabras por minuto'
# pocket_consumer_key_label: Consumer key for Pocket to import contents
+ # android_configuration: Configure your Android application
form_rss:
description: 'Los feeds RSS de wallabag permiten leer los artÃculos guardados con su lector RSS favorito. Necesita generar un token primero'
token_label: 'RSS token'
@@@ -368,6 -367,7 +368,7 @@@ import
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker:
# enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'Importar > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
client_created: 'Nuevo cliente creado.'
client_deleted: 'Cliente suprimido'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index e81513aa,cf072450..6b6211d6
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: 'Ù
٠تÙرÛبا٠۳۰۰ ÙاÚ٠را در دÙÛÙÙ Ù
ÛâØ®ÙاÙÙ
'
400_word: 'Ù
٠تÙرÛبا٠۴۰۰ ÙاÚ٠را در دÙÛÙÙ Ù
ÛâØ®ÙاÙÙ
'
pocket_consumer_key_label: Ú©ÙÛد Ú©Ø§Ø±Ø¨Ø±Û Pocket Ø¨Ø±Ø§Û Ø¯Ø±ÙÙâرÛØ²Û Ù
طاÙب
+ # android_configuration: Configure your Android application
form_rss:
description: 'با Ø®Ùراک آر-اس-اس Ú©Ù wallabag در اختÛارتا٠Ù
ÛâÚ¯Ø°Ø§Ø±Ø¯Ø Ù
ÛâتÙاÙÛد Ù
ÙاÙÙâÙØ§Û Ø°Ø®ÛرÙâشد٠را در ÙرÙ
âاÙزار آر-اس-اس دÙØ®Ùا٠خÙد بخÙاÙÛد. Ø¨Ø±Ø§Û Ø§Û٠کار Ùخست باÛد ÛÚ© کد بسازÛد.'
token_label: 'کد آر-اس-اس'
@@@ -285,6 -284,7 +285,7 @@@ quickstart
paragraph_2: 'اداÙ
٠دÙÛد!'
configure:
title: 'برÙاÙ
٠را تÙظÛÙ
Ú©ÙÛد'
+ # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
language: 'زبا٠٠ÙÙ
Ø§Û Ø¨Ø±ÙاÙ
٠را تغÛÛر دÙÛد'
rss: 'Ø®Ùراک آر-اس-اس را Ùعا٠کÙÛد'
tagging_rules: 'ÙاÙÙÙâÙØ§Û Ø¨Ø±ÚسبâÚ¯Ø°Ø§Ø±Û Ø®Ùدکار Ù
ÙاÙÙâÙاÛتا٠را تعرÛÙ Ú©ÙÛد'
@@@ -367,6 -367,7 +368,7 @@@ import
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker:
# enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'درÙÙâرÛØ²Û > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -504,3 -505,8 +506,8 @@@ flashes
notice:
# client_created: 'New client created.'
# client_deleted: 'Client deleted'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index ac7c112d,c4aa3751..74d59e1a
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: 'Je lis environ 300 mots par minute'
400_word: 'Je lis environ 400 mots par minute'
pocket_consumer_key_label: Clé d'authentification Pocket pour importer les données
+ android_configuration: Configurez votre application Android
form_rss:
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."
token_label: 'Jeton RSS'
@@@ -368,6 -367,7 +368,7 @@@ import
how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer."
worker:
enabled: "Les imports sont asynchrones. Une fois l'import commencé un worker externe traitera les messages un par un. Le service activé est :"
+ download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l'import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons vivement d'activer les imports asynchrones."
firefox:
page_title: 'Import > Firefox'
description: "Cet outil va vous permettre d'importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde... ». Vous allez récupérer un fichier .json.
"
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
client_created: 'Nouveau client %name% créé'
client_deleted: 'Client %name% supprimé'
+ user:
+ notice:
+ added: 'Utilisateur "%username%" ajouté'
+ updated: 'Utilisateur "%username%" mis à jour'
+ deleted: 'Utilisateur "%username%" supprimé'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 454429f6,38c780dd..a448b602
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: 'Leggo ~300 parole al minuto'
400_word: 'Leggo ~400 parole al minuto'
pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
+ # android_configuration: Configure your Android application
form_rss:
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.'
token_label: 'RSS token'
@@@ -368,6 -367,7 +368,7 @@@ import
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker:
# enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'Importa da > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
client_created: 'Nuovo client creato.'
client_deleted: 'Client eliminato'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index dadb6b03,103ca831..a61f7cdd
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: "Legissi a l'entorn de 300 mots per minuta"
400_word: "Legissi a l'entorn de 400 mots per minuta"
pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas
+ # android_configuration: Configure your Android application
form_rss:
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."
token_label: 'Geton RSS'
@@@ -368,6 -367,7 +368,7 @@@ import
how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar."
worker:
enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina externa s'ocuparà dels messatges un per un. Lo servici actual es : "
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'Importar > Firefox'
description: "Aquesta aisina importarà totas vòstres favorits de Firefox. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
client_created: 'Novèl client creat'
client_deleted: 'Client suprimit'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 200907c9,1680dae0..a7387b79
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@@ -71,7 -71,6 +71,7 @@@ config
300_word: 'Czytam ~300 sÅów na minutÄ'
400_word: 'Czytam ~400 sÅów na minutÄ'
pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartoÅci'
+ # android_configuration: Configure your Android application
form_rss:
description: 'KanaÅy RSS prowadzone przez wallabag pozwalajÄ
Ci na czytanie twoich zapisanych artykuÅów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerowaÄ tokena.â'
token_label: 'Token RSS'
@@@ -368,6 -367,7 +368,7 @@@ import
how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go zaÅadowaÄ.'
worker:
enabled: "Import jest wykonywany asynchronicznie. Od momentu rozpoczÄcia importu, zewnÄtrzna usÅuga może zajmowaÄ siÄ na raz tylko jednym zadaniem. BieżÄ
cÄ
usÅugÄ
jest:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'Import > Firefox'
description: "Ten importer zaimportuje wszystkie twoje zakÅadki z Firefoksa. Idź do twoich zakÅadek (Ctrl+Shift+O), nastÄpnie w \"Import i kopie zapasowe\", wybierz \"Utwórz kopiÄ zapasowÄ
...\". Uzyskasz plik .json."
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
client_created: 'Nowy klient utworzony.'
client_deleted: 'Klient usuniÄty'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 255ee839,16d39188..070abe27
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@@ -71,7 -71,6 +71,7 @@@ config
# 300_word: 'I read ~300 words per minute'
# 400_word: 'I read ~400 words per minute'
pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
+ # android_configuration: Configure your Android application
form_rss:
description: 'Feed-urile RSS oferite de wallabag îÈi permit sÄ-Èi citeÈti articolele salvate în reader-ul tÄu preferat RSS.'
token_label: 'RSS-Token'
@@@ -368,6 -367,7 +368,7 @@@ import
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker:
# enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
# firefox:
# page_title: 'Import > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -505,3 -505,8 +506,8 @@@ flashes
notice:
# client_created: 'New client created.'
# client_deleted: 'Client deleted'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'
diff --combined src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index f3696a55,c9a269ec..7679b32a
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@@ -71,7 -71,6 +71,7 @@@ config
# 300_word: 'I read ~300 words per minute'
# 400_word: 'I read ~400 words per minute'
# pocket_consumer_key_label: Consumer key for Pocket to import contents
+ # android_configuration: Configure your Android application
form_rss:
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.'
token_label: 'RSS belirteci (token)'
@@@ -109,6 -108,7 +109,7 @@@
# if_label: 'if'
# then_tag_as_label: 'then tag as'
# delete_rule_label: 'delete'
+ # edit_rule_label: 'edit'
rule_label: 'Kural'
tags_label: 'Etiketler'
faq:
@@@ -367,6 -367,7 +368,7 @@@ import
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker:
# enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:"
+ # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We strongly recommend to enable asynchronous import to avoid errors."
firefox:
page_title: 'İçe Aktar > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@@@ -504,3 -505,8 +506,8 @@@ flashes
notice:
# client_created: 'New client created.'
# client_deleted: 'Client deleted'
+ user:
+ notice:
+ # added: 'User "%username%" added'
+ # updated: 'User "%username%" updated'
+ # deleted: 'User "%username%" deleted'