Merge pull request #2481 from wallabag/some-fixes

Some fixes
author: Nicolas Lœuillet <nicolas@loeuillet.org> 2016-10-21 15:15:41 +0200
committer: GitHub <noreply@github.com> 2016-10-21 15:15:41 +0200
commit: f99ddbc6f82b0e5619d51ec4415738bf34d350b6 (patch)
tree: 1aab7d493dcb8fe79f19d612ef62f7d8e58f597f /app/Resources
parent: 49dee2d2de63af36248e92ce740da2692358280e (diff)
parent: b64d8f2c9f4092b43da5f4a978028d80d9ee81a8 (diff)
download: wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.tar.gz
wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.tar.zst
wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.zip
11 files changed, 11 insertions, 11 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index 85079330..3e11d675 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -23,7 +23,7 @@ export: "eksport"
 import: "import"
 misc: "misc"
 modify_settings: "Gem ændring"
-piwik_host: Hosting af din side hos Piwik
+piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
 piwik_site_id: ID for din side hos Piwik
 piwik_enabled: Aktiver Piwik
 demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index b3412af7..c74b5c1f 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -23,7 +23,7 @@ export: "Export"
 import: "Import"
 misc: "Verschiedenes"
 modify_settings: "Übernehmen"
-piwik_host: Host deiner Webseite in Piwik
+piwik_host: Host deiner Webseite in Piwik (ohne http:// oder https://)
 piwik_site_id: ID deiner Webseite in Piwik
 piwik_enabled: Piwik aktivieren
 demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 8aaa27e7..77c09db4 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -23,7 +23,7 @@ export: "export"
 import: "import"
 misc: "misc"
 modify_settings: "apply"
-piwik_host: Host of your website in Piwik
+piwik_host: Host of your website in Piwik (without http:// ou https://)
 piwik_site_id: ID of your website in Piwik
 piwik_enabled: Enable Piwik
 demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index bf3a79af..baa83849 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -23,7 +23,7 @@ export: "exportar"
 import: "importar"
 misc: "misc"
 modify_settings: "modificar configuración"
-piwik_host: Host de tu website de Piwik
+piwik_host: Host de tu website de Piwik (sin http:// o https://)
 piwik_site_id: ID de tu website de Piwik
 piwik_enabled: Activar Piwik
 demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index d86c4343..b394977e 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -23,7 +23,7 @@ export: "برون‌سپاری"
 import: "درون‌ریزی"
 misc: "غیره"
 modify_settings: "اعمال"
-# piwik_host: Host of your website in Piwik
+# piwik_host: Host of your website in Piwik (without http:// or https://)
 # piwik_site_id: ID of your website in Piwik
 # piwik_enabled: Enable Piwik
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index 5e1ecf26..31a80880 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -23,7 +23,7 @@ export: "export"
 import: "import"
 misc: "divers"
 modify_settings: "appliquer"
-piwik_host: URL de votre site dans Piwik
+piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
 piwik_site_id: ID de votre site dans Piwik
 piwik_enabled: Activer Piwik
 demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index 9d820e4b..ba038556 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -23,7 +23,7 @@ export: "esporta"
 import: "importa"
 misc: "misc"
 modify_settings: "applica"
-piwik_host: Host del tuo sito in Piwik
+piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
 piwik_site_id: ID del tuo sito in Piwik
 piwik_enabled: Abilita Piwik
 demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index 49dc7732..55249e33 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -23,7 +23,7 @@ export: "expòrt"
 import: "impòrt"
 misc: "divèrs"
 modify_settings: "aplicar"
-piwik_host: URL de vòstre site dins Piwik
+piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
 piwik_site_id: ID de vòstre site dins Piwik
 piwik_enabled: Activar Piwik
 demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 7432b0a7..42cc5b52 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -23,7 +23,7 @@ export: "eksport"
 import: "import"
 misc: "różne"
 modify_settings: "zatwierdz"
-piwik_host: Host twojej strony Piwik
+piwik_host: Host twojej strony Piwik (bez http:// lub https://)
 piwik_site_id: ID twojej strony Piwik
 piwik_enabled: Włacz Piwik
 demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index 20d664f7..8e72b955 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -23,7 +23,7 @@ export: "exportă"
 import: "importă"
 misc: "diverse"
 modify_settings: "aplică"
-# piwik_host: Host of your website in Piwik
+# piwik_host: Host of your website in Piwik (without http:// or https://)
 # piwik_site_id: ID of your website in Piwik
 # piwik_enabled: Enable Piwik
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index 4b4d3edb..55f70843 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -23,7 +23,7 @@
 # import: "import"
 # misc: "misc"
 # modify_settings: "apply"
-# piwik_host: Host of your website in Piwik
+# piwik_host: Host of your website in Piwik (without http:// or https://)
 # piwik_site_id: ID of your website in Piwik
 # piwik_enabled: Enable Piwik
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
author	Nicolas Lœuillet <nicolas@loeuillet.org>	2016-10-21 15:15:41 +0200
committer	GitHub <noreply@github.com>	2016-10-21 15:15:41 +0200
commit	f99ddbc6f82b0e5619d51ec4415738bf34d350b6 (patch)
tree	1aab7d493dcb8fe79f19d612ef62f7d8e58f597f /app/Resources
parent	49dee2d2de63af36248e92ce740da2692358280e (diff)
parent	b64d8f2c9f4092b43da5f4a978028d80d9ee81a8 (diff)
download	wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.tar.gz wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.tar.zst wallabag-f99ddbc6f82b0e5619d51ec4415738bf34d350b6.zip

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml index 85079330..3e11d675 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -23,7 +23,7 @@ export: "eksport"
23	import: "import"	23	import: "import"
24	misc: "misc"	24	misc: "misc"
25	modify_settings: "Gem ændring"	25	modify_settings: "Gem ændring"
26	piwik_host: Hosting af din side hos Piwik	26	piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
27	piwik_site_id: ID for din side hos Piwik	27	piwik_site_id: ID for din side hos Piwik
28	piwik_enabled: Aktiver Piwik	28	piwik_enabled: Aktiver Piwik
29	demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"	29	demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml index b3412af7..c74b5c1f 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -23,7 +23,7 @@ export: "Export"
23	import: "Import"	23	import: "Import"
24	misc: "Verschiedenes"	24	misc: "Verschiedenes"
25	modify_settings: "Übernehmen"	25	modify_settings: "Übernehmen"
26	piwik_host: Host deiner Webseite in Piwik	26	piwik_host: Host deiner Webseite in Piwik (ohne http:// oder https://)
27	piwik_site_id: ID deiner Webseite in Piwik	27	piwik_site_id: ID deiner Webseite in Piwik
28	piwik_enabled: Piwik aktivieren	28	piwik_enabled: Piwik aktivieren
29	demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"	29	demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index 8aaa27e7..77c09db4 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -23,7 +23,7 @@ export: "export"
23	import: "import"	23	import: "import"
24	misc: "misc"	24	misc: "misc"
25	modify_settings: "apply"	25	modify_settings: "apply"
26	piwik_host: Host of your website in Piwik	26	piwik_host: Host of your website in Piwik (without http:// ou https://)
27	piwik_site_id: ID of your website in Piwik	27	piwik_site_id: ID of your website in Piwik
28	piwik_enabled: Enable Piwik	28	piwik_enabled: Enable Piwik
29	demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"	29	demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml index bf3a79af..baa83849 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -23,7 +23,7 @@ export: "exportar"
23	import: "importar"	23	import: "importar"
24	misc: "misc"	24	misc: "misc"
25	modify_settings: "modificar configuración"	25	modify_settings: "modificar configuración"
26	piwik_host: Host de tu website de Piwik	26	piwik_host: Host de tu website de Piwik (sin http:// o https://)
27	piwik_site_id: ID de tu website de Piwik	27	piwik_site_id: ID de tu website de Piwik
28	piwik_enabled: Activar Piwik	28	piwik_enabled: Activar Piwik
29	demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"	29	demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml index d86c4343..b394977e 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -23,7 +23,7 @@ export: "برون‌سپاری"
23	import: "درون‌ریزی"	23	import: "درون‌ریزی"
24	misc: "غیره"	24	misc: "غیره"
25	modify_settings: "اعمال"	25	modify_settings: "اعمال"
26	# piwik_host: Host of your website in Piwik	26	# piwik_host: Host of your website in Piwik (without http:// or https://)
27	# piwik_site_id: ID of your website in Piwik	27	# piwik_site_id: ID of your website in Piwik
28	# piwik_enabled: Enable Piwik	28	# piwik_enabled: Enable Piwik
29	# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"	29	# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index 5e1ecf26..31a80880 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -23,7 +23,7 @@ export: "export"
23	import: "import"	23	import: "import"
24	misc: "divers"	24	misc: "divers"
25	modify_settings: "appliquer"	25	modify_settings: "appliquer"
26	piwik_host: URL de votre site dans Piwik	26	piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
27	piwik_site_id: ID de votre site dans Piwik	27	piwik_site_id: ID de votre site dans Piwik
28	piwik_enabled: Activer Piwik	28	piwik_enabled: Activer Piwik
29	demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"	29	demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml index 9d820e4b..ba038556 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -23,7 +23,7 @@ export: "esporta"
23	import: "importa"	23	import: "importa"
24	misc: "misc"	24	misc: "misc"
25	modify_settings: "applica"	25	modify_settings: "applica"
26	piwik_host: Host del tuo sito in Piwik	26	piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
27	piwik_site_id: ID del tuo sito in Piwik	27	piwik_site_id: ID del tuo sito in Piwik
28	piwik_enabled: Abilita Piwik	28	piwik_enabled: Abilita Piwik
29	demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"	29	demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml index 49dc7732..55249e33 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -23,7 +23,7 @@ export: "expòrt"
23	import: "impòrt"	23	import: "impòrt"
24	misc: "divèrs"	24	misc: "divèrs"
25	modify_settings: "aplicar"	25	modify_settings: "aplicar"
26	piwik_host: URL de vòstre site dins Piwik	26	piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
27	piwik_site_id: ID de vòstre site dins Piwik	27	piwik_site_id: ID de vòstre site dins Piwik
28	piwik_enabled: Activar Piwik	28	piwik_enabled: Activar Piwik
29	demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"	29	demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml index 7432b0a7..42cc5b52 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -23,7 +23,7 @@ export: "eksport"
23	import: "import"	23	import: "import"
24	misc: "różne"	24	misc: "różne"
25	modify_settings: "zatwierdz"	25	modify_settings: "zatwierdz"
26	piwik_host: Host twojej strony Piwik	26	piwik_host: Host twojej strony Piwik (bez http:// lub https://)
27	piwik_site_id: ID twojej strony Piwik	27	piwik_site_id: ID twojej strony Piwik
28	piwik_enabled: Włacz Piwik	28	piwik_enabled: Włacz Piwik
29	demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"	29	demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml index 20d664f7..8e72b955 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -23,7 +23,7 @@ export: "exportă"
23	import: "importă"	23	import: "importă"
24	misc: "diverse"	24	misc: "diverse"
25	modify_settings: "aplică"	25	modify_settings: "aplică"
26	# piwik_host: Host of your website in Piwik	26	# piwik_host: Host of your website in Piwik (without http:// or https://)
27	# piwik_site_id: ID of your website in Piwik	27	# piwik_site_id: ID of your website in Piwik
28	# piwik_enabled: Enable Piwik	28	# piwik_enabled: Enable Piwik
29	# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"	29	# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"


diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml index 4b4d3edb..55f70843 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -23,7 +23,7 @@
23	# import: "import"	23	# import: "import"
24	# misc: "misc"	24	# misc: "misc"
25	# modify_settings: "apply"	25	# modify_settings: "apply"
26	# piwik_host: Host of your website in Piwik	26	# piwik_host: Host of your website in Piwik (without http:// or https://)
27	# piwik_site_id: ID of your website in Piwik	27	# piwik_site_id: ID of your website in Piwik
28	# piwik_enabled: Enable Piwik	28	# piwik_enabled: Enable Piwik
29	# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"	29	# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"