diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
| commit | 44043ebe82a22470e2514d05efac324035ee809a (patch) | |
| tree | 5ea40b62ce665a8bab6a3e280a47f3be11838e27 /app/Resources/CraueConfigBundle | |
| parent | 11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff) | |
| parent | e586d65b64089fc1cc230a18c470aae3f45f91a6 (diff) | |
| download | wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/Resources/CraueConfigBundle')
| -rw-r--r-- | app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml index 4c99652a..13771799 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml | |||
| @@ -36,5 +36,5 @@ share_public: Autorizar una URL publica pels articles | |||
| 36 | download_images_enabled: Telecargar los imatges en local | 36 | download_images_enabled: Telecargar los imatges en local |
| 37 | restricted_access: Activar l'autenticacion pels sites amb peatge | 37 | restricted_access: Activar l'autenticacion pels sites amb peatge |
| 38 | api_user_registration: Autorizar los utilizaires a se marcar amb l'API | 38 | api_user_registration: Autorizar los utilizaires a se marcar amb l'API |
| 39 | # store_article_headers: Enable if wallabag stores HTTP headers for each article | 39 | store_article_headers: Activar se wallabag garda las entèstas HTTP per cada article |
| 40 | # shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled | 40 | shaarli_share_origin_url: Activar lo partatge de l’url amb Shaarli, se lo servici es activat |