diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
| commit | 7083c0a21d27e7e1bf45a9807a76844116d61fb8 (patch) | |
| tree | b72b5a0516d9114aeeccd6ecdb055ee240bda66a /app/Resources/CraueConfigBundle | |
| parent | 44043ebe82a22470e2514d05efac324035ee809a (diff) | |
| parent | 495f83c92539444bff7dfd6cd647b7d65a74f949 (diff) | |
| download | wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.gz wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.zst wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/Resources/CraueConfigBundle')
| -rw-r--r-- | app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index a26e451f..239c69eb 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | |||
| @@ -27,7 +27,7 @@ export: "export" | |||
| 27 | import: "import" | 27 | import: "import" |
| 28 | misc: "misc" | 28 | misc: "misc" |
| 29 | modify_settings: "apply" | 29 | modify_settings: "apply" |
| 30 | piwik_host: Host of your website in Piwik (without http:// ou https://) | 30 | piwik_host: Host of your website in Piwik (without http:// or https://) |
| 31 | piwik_site_id: ID of your website in Piwik | 31 | piwik_site_id: ID of your website in Piwik |
| 32 | piwik_enabled: Enable Piwik | 32 | piwik_enabled: Enable Piwik |
| 33 | demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)" | 33 | demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)" |
| @@ -37,4 +37,4 @@ download_images_enabled: Download images locally | |||
| 37 | restricted_access: Enable authentication for paywalled websites | 37 | restricted_access: Enable authentication for paywalled websites |
| 38 | api_user_registration: Enable user to be registered using the API | 38 | api_user_registration: Enable user to be registered using the API |
| 39 | store_article_headers: Enable if wallabag stores HTTP headers for each article | 39 | store_article_headers: Enable if wallabag stores HTTP headers for each article |
| 40 | shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled \ No newline at end of file | 40 | shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled |