aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2020-01-28 10:07:22 +0100
committerGitHub <noreply@github.com>2020-01-28 10:07:22 +0100
commit62107f50d3b43039a635dcaecce317ef0299ee1f (patch)
treeb35424d19bf21c5a8c02bb88ebcc2a5463bdb698
parent8afcb3a6478325959c872fccf206bf8dc80d164c (diff)
parent1de4a8f938771b2a751a57056777aa4bcb8476c2 (diff)
downloadwallabag-62107f50d3b43039a635dcaecce317ef0299ee1f.tar.gz
wallabag-62107f50d3b43039a635dcaecce317ef0299ee1f.tar.zst
wallabag-62107f50d3b43039a635dcaecce317ef0299ee1f.zip
Merge pull request #4264 from herrriehm/master
cosmetic changes
-rw-r--r--app/config/config_dev.yml2
-rw-r--r--app/config/wallabag.yml8
-rw-r--r--docker-compose.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml2
16 files changed, 19 insertions, 19 deletions
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 0c490575..fa6e14e7 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -36,7 +36,7 @@ monolog:
36 channels: [doctrine] 36 channels: [doctrine]
37 37
38swiftmailer: 38swiftmailer:
39 # see http://mailcatcher.me/ 39 # see https://mailcatcher.me/
40 transport: smtp 40 transport: smtp
41 host: 'localhost' 41 host: 'localhost'
42 port: 1025 42 port: 1025
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index f1ef0924..c54d7eb7 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -26,7 +26,7 @@ wallabag_core:
26 list_mode: 0 26 list_mode: 0
27 fetching_error_message_title: 'No title found' 27 fetching_error_message_title: 'No title found'
28 fetching_error_message: | 28 fetching_error_message: |
29 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. 29 wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
30 api_limit_mass_actions: 10 30 api_limit_mass_actions: 10
31 encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" 31 encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
32 default_internal_settings: 32 default_internal_settings:
@@ -44,7 +44,7 @@ wallabag_core:
44 section: entry 44 section: entry
45 - 45 -
46 name: diaspora_url 46 name: diaspora_url
47 value: http://diasporapod.com 47 value: https://diasporapod.com
48 section: entry 48 section: entry
49 - 49 -
50 name: share_unmark 50 name: share_unmark
@@ -64,11 +64,11 @@ wallabag_core:
64 section: entry 64 section: entry
65 - 65 -
66 name: shaarli_url 66 name: shaarli_url
67 value: http://myshaarli.com 67 value: https://myshaarli.com
68 section: entry 68 section: entry
69 - 69 -
70 name: scuttle_url 70 name: scuttle_url
71 value: http://scuttle.org 71 value: https://scuttle.org
72 section: entry 72 section: entry
73 - 73 -
74 name: share_mail 74 name: share_mail
diff --git a/docker-compose.yml b/docker-compose.yml
index 0f8f0970..34eb0956 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
16 build: 16 build:
17 context: docker/php 17 context: docker/php
18 args: 18 args:
19 # Set here your timezone using one of this: http://php.net/manual/en/timezones.php 19 # Set here your timezone using one of this: https://php.net/manual/en/timezones.php
20 timezone: 'Europe/Monaco' 20 timezone: 'Europe/Monaco'
21 ports: 21 ports:
22 - "9000:9000" 22 - "9000:9000"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 8573ba72..47de066f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -264,7 +264,7 @@ entry:
264 # provided_by: 'Provided by' 264 # provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'Gem ny artikel' 266 page_title: 'Gem ny artikel'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.dk'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 206d3562..27585f77 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -264,7 +264,7 @@ entry:
264 provided_by: 'Provided by' 264 provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'Save new entry' 266 page_title: 'Save new entry'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.com'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 10f5e79a..2cf67176 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -264,7 +264,7 @@ entry:
264 provided_by: 'Proporcionado por' 264 provided_by: 'Proporcionado por'
265 new: 265 new:
266 page_title: 'Guardar un nuevo artículo' 266 page_title: 'Guardar un nuevo artículo'
267 placeholder: 'http://sitioweb.com' 267 placeholder: 'https://sitioweb.es'
268 form_new: 268 form_new:
269 url_label: URL 269 url_label: URL
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 730b7e68..c1fb74d3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -264,7 +264,7 @@ entry:
264 # provided_by: 'Provided by' 264 # provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'ذخیرهٔ مقالهٔ تازه' 266 page_title: 'ذخیرهٔ مقالهٔ تازه'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.ir'
268 form_new: 268 form_new:
269 url_label: نشانی 269 url_label: نشانی
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 1eecd111..2b8bb092 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -264,7 +264,7 @@ entry:
264 provided_by: "Fourni par" 264 provided_by: "Fourni par"
265 new: 265 new:
266 page_title: "Sauvegarder un nouvel article" 266 page_title: "Sauvegarder un nouvel article"
267 placeholder: "http://website.com" 267 placeholder: "https://website.fr"
268 form_new: 268 form_new:
269 url_label: "Adresse" 269 url_label: "Adresse"
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index f1a8e3b1..8cee3e52 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -264,7 +264,7 @@ entry:
264 # provided_by: 'Provided by' 264 # provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'Salva un nuovo contenuto' 266 page_title: 'Salva un nuovo contenuto'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.it'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 89bf8b16..052582ab 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -264,7 +264,7 @@ entry:
264 provided_by: 'Provesit per' 264 provided_by: 'Provesit per'
265 new: 265 new:
266 page_title: 'Enregistrar un novèl article' 266 page_title: 'Enregistrar un novèl article'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.cat'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 0118ad21..93e8f852 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -264,7 +264,7 @@ entry:
264 provided_by: 'Dostarczony przez' 264 provided_by: 'Dostarczony przez'
265 new: 265 new:
266 page_title: 'Zapisz nowy wpis' 266 page_title: 'Zapisz nowy wpis'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.pl'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index d0082cda..7159569e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -264,7 +264,7 @@ entry:
264 provided_by: 'Fornecido por' 264 provided_by: 'Fornecido por'
265 new: 265 new:
266 page_title: 'Salvar novo artigo' 266 page_title: 'Salvar novo artigo'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.pt'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index c8e2dfb4..f671da8d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -264,7 +264,7 @@ entry:
264 # provided_by: 'Provided by' 264 # provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'Salvează un nou articol' 266 page_title: 'Salvează un nou articol'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.ro'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index 41379f90..7d45df1c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -264,7 +264,7 @@ entry:
264 # provided_by: 'Provided by' 264 # provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'Сохранить новую запись' 266 page_title: 'Сохранить новую запись'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.ru'
268 form_new: 268 form_new:
269 url_label: Ссылка 269 url_label: Ссылка
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index b5a3bcb6..03f8fa9a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -264,7 +264,7 @@ entry:
264 # provided_by: 'Provided by' 264 # provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'บันทึกรายการใหม่' 266 page_title: 'บันทึกรายการใหม่'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.th'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 4aaef781..05cfbbfc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -264,7 +264,7 @@ entry:
264 # provided_by: 'Provided by' 264 # provided_by: 'Provided by'
265 new: 265 new:
266 page_title: 'Yeni makaleyi kaydet' 266 page_title: 'Yeni makaleyi kaydet'
267 placeholder: 'http://website.com' 267 placeholder: 'https://website.tr'
268 form_new: 268 form_new:
269 url_label: Url 269 url_label: Url
270 search: 270 search: