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

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

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index 55f70843397c754843bf061b9aadbed247f2891a..1579366d2ed609e7e11ae29cf111b03144fdc95d 100644 (file)
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -1,3 +1,4 @@
+# settings_changed: Configuration updated
 # download_pictures: Download pictures on your server
 # carrot: Enable share to Carrot
 # diaspora_url: Diaspora URL, if the service is enabled
@@ -14,7 +15,9 @@
 # share_diaspora: Enable share to Diaspora
 # share_mail: Enable share by email
 # share_shaarli: Enable share to Shaarli
+# share_scuttle: Enable share to Scuttle
 # share_twitter: Enable share to Twitter
+# share_unmark: Enable share to Unmark.it
 # show_printlink: Display a link to print content
 # wallabag_support_url: Support URL for wallabag
 # wallabag_url: URL of *your* wallabag instance
@@ -29,3 +32,6 @@
 # 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
+# download_images_enabled: Download images locally
+# restricted_access: Enable authentication for websites with paywall
+# api_user_registration: Enable user to be registered using the API