diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-03 16:22:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-03 16:22:07 +0100 |
commit | da4136557963018287cae61226e9006c3c741747 (patch) | |
tree | 6bf23c0d32f3780843798ae47c65377ae1ff961a /src/Wallabag/CoreBundle/Resources | |
parent | 816c0940d142f8ec69bdd3f302c9751033cce7e2 (diff) | |
parent | ca08d02f2f17c0e4ec0152a701c540f62713a428 (diff) | |
download | wallabag-da4136557963018287cae61226e9006c3c741747.tar.gz wallabag-da4136557963018287cae61226e9006c3c741747.tar.zst wallabag-da4136557963018287cae61226e9006c3c741747.zip |
Merge pull request #2180 from wallabag/download-pictures
Download pictures
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
12 files changed, 87 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index cc5f9e9a..56d776ad 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -30,7 +30,7 @@ services: | |||
30 | - "@doctrine" | 30 | - "@doctrine" |
31 | 31 | ||
32 | wallabag_core.subscriber.table_prefix: | 32 | wallabag_core.subscriber.table_prefix: |
33 | class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber | 33 | class: Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber |
34 | arguments: | 34 | arguments: |
35 | - "%database_table_prefix%" | 35 | - "%database_table_prefix%" |
36 | tags: | 36 | tags: |
@@ -131,8 +131,29 @@ services: | |||
131 | - '%kernel.debug%' | 131 | - '%kernel.debug%' |
132 | 132 | ||
133 | wallabag_core.subscriber.sqlite_cascade_delete: | 133 | wallabag_core.subscriber.sqlite_cascade_delete: |
134 | class: Wallabag\CoreBundle\Subscriber\SQLiteCascadeDeleteSubscriber | 134 | class: Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber |
135 | arguments: | 135 | arguments: |
136 | - "@doctrine" | 136 | - "@doctrine" |
137 | tags: | 137 | tags: |
138 | - { name: doctrine.event_subscriber } | 138 | - { name: doctrine.event_subscriber } |
139 | |||
140 | wallabag_core.subscriber.download_images: | ||
141 | class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber | ||
142 | arguments: | ||
143 | - "@doctrine.orm.default_entity_manager" | ||
144 | - "@wallabag_core.entry.download_images" | ||
145 | - '@=service(''craue_config'').get(''download_images_enabled'')' | ||
146 | - "@logger" | ||
147 | tags: | ||
148 | - { name: kernel.event_subscriber } | ||
149 | |||
150 | wallabag_core.entry.download_images: | ||
151 | class: Wallabag\CoreBundle\Helper\DownloadImages | ||
152 | arguments: | ||
153 | - "@wallabag_core.entry.download_images.client" | ||
154 | - "%kernel.root_dir%/../web/assets/images" | ||
155 | - '@=service(''craue_config'').get(''wallabag_url'')' | ||
156 | - "@logger" | ||
157 | |||
158 | wallabag_core.entry.download_images.client: | ||
159 | class: GuzzleHttp\Client | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 9b0eecce..21c26079 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
369 | worker: | 369 | worker: |
370 | # 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:" | 370 | # 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:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | # firefox: | 372 | # firefox: |
372 | # page_title: 'Import > Firefox' | 373 | # page_title: 'Import > Firefox' |
373 | # 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." | 374 | # 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 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | # client_created: 'New client created.' | 507 | # client_created: 'New client created.' |
507 | # client_deleted: 'Client deleted' | 508 | # client_deleted: 'Client deleted' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index a156c54a..ff70cbee 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.' | 368 | how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.' |
369 | worker: | 369 | worker: |
370 | enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:" | 370 | enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | firefox: | 372 | firefox: |
372 | page_title: 'Aus Firefox importieren' | 373 | page_title: 'Aus Firefox importieren' |
373 | 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." | 374 | 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 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | client_created: 'Neuer Client erstellt.' | 507 | client_created: 'Neuer Client erstellt.' |
507 | client_deleted: 'Client gelöscht' | 508 | client_deleted: 'Client gelöscht' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 049959a0..36382b6f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 368 | how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
369 | worker: | 369 | worker: |
370 | 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:" | 370 | 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:" |
371 | download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | firefox: | 372 | firefox: |
372 | page_title: 'Import > Firefox' | 373 | page_title: 'Import > Firefox' |
373 | 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." | 374 | 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 +472,7 @@ flashes: | |||
471 | rss_updated: 'RSS information updated' | 472 | rss_updated: 'RSS information updated' |
472 | tagging_rules_updated: 'Tagging rules updated' | 473 | tagging_rules_updated: 'Tagging rules updated' |
473 | tagging_rules_deleted: 'Tagging rule deleted' | 474 | tagging_rules_deleted: 'Tagging rule deleted' |
475 | # user_added: 'User "%username%" added' | ||
474 | rss_token_updated: 'RSS token updated' | 476 | rss_token_updated: 'RSS token updated' |
475 | annotations_reset: Annotations reset | 477 | annotations_reset: Annotations reset |
476 | tags_reset: Tags reset | 478 | tags_reset: Tags reset |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 79c13ff0..2c80fe8f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
369 | worker: | 369 | worker: |
370 | # 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:" | 370 | # 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:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | firefox: | 372 | firefox: |
372 | page_title: 'Importar > Firefox' | 373 | page_title: 'Importar > Firefox' |
373 | # 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." | 374 | # 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 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | client_created: 'Nuevo cliente creado.' | 507 | client_created: 'Nuevo cliente creado.' |
507 | client_deleted: 'Cliente suprimido' | 508 | client_deleted: 'Cliente suprimido' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index e81513aa..6b6211d6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -285,6 +285,7 @@ quickstart: | |||
285 | paragraph_2: 'ادامه دهید!' | 285 | paragraph_2: 'ادامه دهید!' |
286 | configure: | 286 | configure: |
287 | title: 'برنامه را تنظیم کنید' | 287 | title: 'برنامه را تنظیم کنید' |
288 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
288 | language: 'زبان و نمای برنامه را تغییر دهید' | 289 | language: 'زبان و نمای برنامه را تغییر دهید' |
289 | rss: 'خوراک آر-اس-اس را فعال کنید' | 290 | rss: 'خوراک آر-اس-اس را فعال کنید' |
290 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' | 291 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' |
@@ -367,6 +368,7 @@ import: | |||
367 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
368 | worker: | 369 | worker: |
369 | # 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:" | 370 | # 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:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
370 | firefox: | 372 | firefox: |
371 | page_title: 'درونریزی > Firefox' | 373 | page_title: 'درونریزی > Firefox' |
372 | # 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." | 374 | # 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 +506,8 @@ flashes: | |||
504 | notice: | 506 | notice: |
505 | # client_created: 'New client created.' | 507 | # client_created: 'New client created.' |
506 | # client_deleted: 'Client deleted' | 508 | # client_deleted: 'Client deleted' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index ac7c112d..74d59e1a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer." | 368 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer." |
369 | worker: | 369 | worker: |
370 | enabled: "Les imports sont asynchrones. Une fois l'import commencé un worker externe traitera les messages un par un. Le service activé est :" | 370 | enabled: "Les imports sont asynchrones. Une fois l'import commencé un worker externe traitera les messages un par un. Le service activé est :" |
371 | 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 <strong>vivement</strong> d'activer les imports asynchrones." | ||
371 | firefox: | 372 | firefox: |
372 | page_title: 'Import > Firefox' | 373 | page_title: 'Import > Firefox' |
373 | 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. </p>" | 374 | 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. </p>" |
@@ -505,3 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | client_created: 'Nouveau client %name% créé' | 507 | client_created: 'Nouveau client %name% créé' |
507 | client_deleted: 'Client %name% supprimé' | 508 | client_deleted: 'Client %name% supprimé' |
509 | user: | ||
510 | notice: | ||
511 | added: 'Utilisateur "%username%" ajouté' | ||
512 | updated: 'Utilisateur "%username%" mis à jour' | ||
513 | deleted: 'Utilisateur "%username%" supprimé' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 454429f6..a448b602 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
369 | worker: | 369 | worker: |
370 | # 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:" | 370 | # 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:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | firefox: | 372 | firefox: |
372 | page_title: 'Importa da > Firefox' | 373 | page_title: 'Importa da > Firefox' |
373 | # 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." | 374 | # 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 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | client_created: 'Nuovo client creato.' | 507 | client_created: 'Nuovo client creato.' |
507 | client_deleted: 'Client eliminato' | 508 | client_deleted: 'Client eliminato' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index dadb6b03..a61f7cdd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar." | 368 | how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar." |
369 | worker: | 369 | worker: |
370 | 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 : " | 370 | 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 : " |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | firefox: | 372 | firefox: |
372 | page_title: 'Importar > Firefox' | 373 | page_title: 'Importar > Firefox' |
373 | 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." | 374 | 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 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | client_created: 'Novèl client creat' | 507 | client_created: 'Novèl client creat' |
507 | client_deleted: 'Client suprimit' | 508 | client_deleted: 'Client suprimit' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 200907c9..a7387b79 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.' | 368 | how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.' |
369 | worker: | 369 | worker: |
370 | 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:" | 370 | 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:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | firefox: | 372 | firefox: |
372 | page_title: 'Import > Firefox' | 373 | page_title: 'Import > Firefox' |
373 | 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." | 374 | 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 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | client_created: 'Nowy klient utworzony.' | 507 | client_created: 'Nowy klient utworzony.' |
507 | client_deleted: 'Klient usunięty' | 508 | client_deleted: 'Klient usunięty' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 255ee839..070abe27 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -368,6 +368,7 @@ import: | |||
368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
369 | worker: | 369 | worker: |
370 | # 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:" | 370 | # 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:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
371 | # firefox: | 372 | # firefox: |
372 | # page_title: 'Import > Firefox' | 373 | # page_title: 'Import > Firefox' |
373 | # 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." | 374 | # 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 +506,8 @@ flashes: | |||
505 | notice: | 506 | notice: |
506 | # client_created: 'New client created.' | 507 | # client_created: 'New client created.' |
507 | # client_deleted: 'Client deleted' | 508 | # client_deleted: 'Client deleted' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index f3696a55..7679b32a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -109,6 +109,7 @@ config: | |||
109 | # if_label: 'if' | 109 | # if_label: 'if' |
110 | # then_tag_as_label: 'then tag as' | 110 | # then_tag_as_label: 'then tag as' |
111 | # delete_rule_label: 'delete' | 111 | # delete_rule_label: 'delete' |
112 | # edit_rule_label: 'edit' | ||
112 | rule_label: 'Kural' | 113 | rule_label: 'Kural' |
113 | tags_label: 'Etiketler' | 114 | tags_label: 'Etiketler' |
114 | faq: | 115 | faq: |
@@ -367,6 +368,7 @@ import: | |||
367 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 368 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
368 | worker: | 369 | worker: |
369 | # 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:" | 370 | # 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:" |
371 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
370 | firefox: | 372 | firefox: |
371 | page_title: 'İçe Aktar > Firefox' | 373 | page_title: 'İçe Aktar > Firefox' |
372 | # 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." | 374 | # 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 +506,8 @@ flashes: | |||
504 | notice: | 506 | notice: |
505 | # client_created: 'New client created.' | 507 | # client_created: 'New client created.' |
506 | # client_deleted: 'Client deleted' | 508 | # client_deleted: 'Client deleted' |
509 | user: | ||
510 | notice: | ||
511 | # added: 'User "%username%" added' | ||
512 | # updated: 'User "%username%" updated' | ||
513 | # deleted: 'User "%username%" deleted' | ||