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

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / translations / messages.en.yml

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index cceff5c7fd13165557305b0ec4562bb8f6987e60..20e83a0728ac13b4d668d2c600aa01ea038edf94 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -76,6 +76,11 @@ config:
             redirect_current_page: 'To the current page'
         pocket_consumer_key_label: Consumer key for Pocket to import contents
         android_configuration: Configure your Android application
+        help_theme: "wallabag is customizable. You can choose your prefered theme here."
+        help_items_per_page: "You can change the number of articles displayed on each page."
+        help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
+        help_language: "You can change the language of wallabag interface."
+        help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
     form_rss:
         description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.'
         token_label: 'RSS token'
@@ -93,6 +98,7 @@ config:
         name_label: 'Name'
         email_label: 'Email'
         twoFactorAuthentication_label: 'Two factor authentication'
+        help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
         delete:
             title: Delete my account (a.k.a danger zone)
             description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
         entries: Remove ALL entries
         confirm: Are you really sure? (THIS CAN'T BE UNDONE)
     form_password:
+        description: "You can change your password here. Your new password should by at least 8 characters long."
         old_password_label: 'Current password'
         new_password_label: 'New password'
         repeat_new_password_label: 'Repeat new password'
@@ -247,7 +254,7 @@ about:
     getting_help:
         documentation: 'Documentation'
         bug_reports: 'Bug reports'
-        support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
     helping:
         description: 'wallabag is free and open source. You can help us:'
         by_contributing: 'by contributing to the project:'
@@ -477,7 +484,7 @@ error:
 flashes:
     config:
         notice:
-            config_saved: 'Config saved. Some parameters will be considered after disconnection.'
+            config_saved: 'Config saved.'
             password_updated: 'Password updated'
             password_not_updated_demo: "In demonstration mode, you can't change password for this user."
             user_updated: 'Information updated'