aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml2
-rw-r--r--app/config/config.yml2
12 files changed, 13 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"
23import: "import" 23import: "import"
24misc: "misc" 24misc: "misc"
25modify_settings: "Gem ændring" 25modify_settings: "Gem ændring"
26piwik_host: Hosting af din side hos Piwik 26piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
27piwik_site_id: ID for din side hos Piwik 27piwik_site_id: ID for din side hos Piwik
28piwik_enabled: Aktiver Piwik 28piwik_enabled: Aktiver Piwik
29demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)" 29demo_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"
23import: "Import" 23import: "Import"
24misc: "Verschiedenes" 24misc: "Verschiedenes"
25modify_settings: "Übernehmen" 25modify_settings: "Übernehmen"
26piwik_host: Host deiner Webseite in Piwik 26piwik_host: Host deiner Webseite in Piwik (ohne http:// oder https://)
27piwik_site_id: ID deiner Webseite in Piwik 27piwik_site_id: ID deiner Webseite in Piwik
28piwik_enabled: Piwik aktivieren 28piwik_enabled: Piwik aktivieren
29demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)" 29demo_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"
23import: "import" 23import: "import"
24misc: "misc" 24misc: "misc"
25modify_settings: "apply" 25modify_settings: "apply"
26piwik_host: Host of your website in Piwik 26piwik_host: Host of your website in Piwik (without http:// ou https://)
27piwik_site_id: ID of your website in Piwik 27piwik_site_id: ID of your website in Piwik
28piwik_enabled: Enable Piwik 28piwik_enabled: Enable Piwik
29demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 29demo_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"
23import: "importar" 23import: "importar"
24misc: "misc" 24misc: "misc"
25modify_settings: "modificar configuración" 25modify_settings: "modificar configuración"
26piwik_host: Host de tu website de Piwik 26piwik_host: Host de tu website de Piwik (sin http:// o https://)
27piwik_site_id: ID de tu website de Piwik 27piwik_site_id: ID de tu website de Piwik
28piwik_enabled: Activar Piwik 28piwik_enabled: Activar Piwik
29demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)" 29demo_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: "برون‌سپاری"
23import: "درون‌ریزی" 23import: "درون‌ریزی"
24misc: "غیره" 24misc: "غیره"
25modify_settings: "اعمال" 25modify_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"
23import: "import" 23import: "import"
24misc: "divers" 24misc: "divers"
25modify_settings: "appliquer" 25modify_settings: "appliquer"
26piwik_host: URL de votre site dans Piwik 26piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
27piwik_site_id: ID de votre site dans Piwik 27piwik_site_id: ID de votre site dans Piwik
28piwik_enabled: Activer Piwik 28piwik_enabled: Activer Piwik
29demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)" 29demo_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"
23import: "importa" 23import: "importa"
24misc: "misc" 24misc: "misc"
25modify_settings: "applica" 25modify_settings: "applica"
26piwik_host: Host del tuo sito in Piwik 26piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
27piwik_site_id: ID del tuo sito in Piwik 27piwik_site_id: ID del tuo sito in Piwik
28piwik_enabled: Abilita Piwik 28piwik_enabled: Abilita Piwik
29demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)" 29demo_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"
23import: "impòrt" 23import: "impòrt"
24misc: "divèrs" 24misc: "divèrs"
25modify_settings: "aplicar" 25modify_settings: "aplicar"
26piwik_host: URL de vòstre site dins Piwik 26piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
27piwik_site_id: ID de vòstre site dins Piwik 27piwik_site_id: ID de vòstre site dins Piwik
28piwik_enabled: Activar Piwik 28piwik_enabled: Activar Piwik
29demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)" 29demo_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"
23import: "import" 23import: "import"
24misc: "różne" 24misc: "różne"
25modify_settings: "zatwierdz" 25modify_settings: "zatwierdz"
26piwik_host: Host twojej strony Piwik 26piwik_host: Host twojej strony Piwik (bez http:// lub https://)
27piwik_site_id: ID twojej strony Piwik 27piwik_site_id: ID twojej strony Piwik
28piwik_enabled: Włacz Piwik 28piwik_enabled: Włacz Piwik
29demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)" 29demo_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ă"
23import: "importă" 23import: "importă"
24misc: "diverse" 24misc: "diverse"
25modify_settings: "aplică" 25modify_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)"
diff --git a/app/config/config.yml b/app/config/config.yml
index 0b4494d3..81d1728a 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -51,6 +51,8 @@ wallabag_core:
51 rss_limit: 50 51 rss_limit: 50
52 reading_speed: 1 52 reading_speed: 1
53 cache_lifetime: 10 53 cache_lifetime: 10
54 fetching_error_message: |
55 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
54 56
55wallabag_user: 57wallabag_user:
56 registration_enabled: "%fosuser_registration%" 58 registration_enabled: "%fosuser_registration%"