Merge remote-tracking branch 'origin/master' into 2.1

[github/wallabag/wallabag.git] / app / Resources / CraueConfigBundle / translations / CraueConfigBundle.en.yml

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 1c47ed2d239428e8872fed49e5e91fe5d0b01efe..48d0ec4b4a082dbea8d794653116ada901c72c35 100644 (file)
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -22,3 +22,9 @@ export: "export"
 import: "import"
 misc: "misc"
 modify_settings: "apply"
+piwik_host: Host of your website in Piwik
+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)"
+demo_mode_username: "Demo user"
+share_public: Allow public url for entries