diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
commit | 64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch) | |
tree | 311473a357e3dedd496e1417293eed9a2a116ad6 /app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml | |
parent | 9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff) | |
parent | c64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff) | |
download | wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml')
-rw-r--r-- | app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml | 2 |
1 files changed, 1 insertions, 1 deletions
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)" |