aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml4
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml4
-rw-r--r--app/config/config.yml2
3 files changed, 9 insertions, 1 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index ea90460e..b5385dc3 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -4,6 +4,10 @@ diaspora_url: Diaspora URL, if the service is enabled
4export_epub: Enable ePub export 4export_epub: Enable ePub export
5export_mobi: Enable .mobi export 5export_mobi: Enable .mobi export
6export_pdf: Enable PDF export 6export_pdf: Enable PDF export
7export_csv: Enable CSV export
8export_json: Enable JSON export
9export_txt: Enable TXT export
10export_xml: Enable XML export
7pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) 11pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
8shaarli_url: URL de Shaarli, if the service is enabled 12shaarli_url: URL de Shaarli, if the service is enabled
9share_diaspora: Enable share to Diaspora 13share_diaspora: Enable share to Diaspora
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index 19600045..0efe14f4 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -4,6 +4,10 @@ diaspora_url: URL de Diaspora, si le service Diaspora est activé
4export_epub: Activer l'export ePub 4export_epub: Activer l'export ePub
5export_mobi: Activer l'export .mobi 5export_mobi: Activer l'export .mobi
6export_pdf: Activer l'export PDF 6export_pdf: Activer l'export PDF
7export_csv: Activer l'export CSV
8export_json: Activer l'export JSON
9export_txt: Activer l'export TXT
10export_xml: Activer l'export XML
7pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication) 11pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication)
8shaarli_url: URL de Shaarli, si le service Diaspora est activé 12shaarli_url: URL de Shaarli, si le service Diaspora est activé
9share_diaspora: Activer le partage vers Diaspora 13share_diaspora: Activer le partage vers Diaspora
diff --git a/app/config/config.yml b/app/config/config.yml
index 3c278ea6..dc6bccee 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
28 assets: ~ 28 assets: ~
29 29
30wallabag_core: 30wallabag_core:
31 version: 2.0.0-alpha.1 31 version: 2.0.0-alpha.2
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
33 languages: 33 languages:
34 en: 'English' 34 en: 'English'