diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |
parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index cceff5c7..20e83a07 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -76,6 +76,11 @@ config: | |||
76 | redirect_current_page: 'To the current page' | 76 | redirect_current_page: 'To the current page' |
77 | pocket_consumer_key_label: Consumer key for Pocket to import contents | 77 | pocket_consumer_key_label: Consumer key for Pocket to import contents |
78 | android_configuration: Configure your Android application | 78 | android_configuration: Configure your Android application |
79 | help_theme: "wallabag is customizable. You can choose your prefered theme here." | ||
80 | help_items_per_page: "You can change the number of articles displayed on each page." | ||
81 | 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." | ||
82 | help_language: "You can change the language of wallabag interface." | ||
83 | help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." | ||
79 | form_rss: | 84 | form_rss: |
80 | 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.' | 85 | 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.' |
81 | token_label: 'RSS token' | 86 | token_label: 'RSS token' |
@@ -93,6 +98,7 @@ config: | |||
93 | name_label: 'Name' | 98 | name_label: 'Name' |
94 | email_label: 'Email' | 99 | email_label: 'Email' |
95 | twoFactorAuthentication_label: 'Two factor authentication' | 100 | twoFactorAuthentication_label: 'Two factor authentication' |
101 | help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | ||
96 | delete: | 102 | delete: |
97 | title: Delete my account (a.k.a danger zone) | 103 | title: Delete my account (a.k.a danger zone) |
98 | 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. | 104 | 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: | |||
106 | entries: Remove ALL entries | 112 | entries: Remove ALL entries |
107 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) | 113 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) |
108 | form_password: | 114 | form_password: |
115 | description: "You can change your password here. Your new password should by at least 8 characters long." | ||
109 | old_password_label: 'Current password' | 116 | old_password_label: 'Current password' |
110 | new_password_label: 'New password' | 117 | new_password_label: 'New password' |
111 | repeat_new_password_label: 'Repeat new password' | 118 | repeat_new_password_label: 'Repeat new password' |
@@ -247,7 +254,7 @@ about: | |||
247 | getting_help: | 254 | getting_help: |
248 | documentation: 'Documentation' | 255 | documentation: 'Documentation' |
249 | bug_reports: 'Bug reports' | 256 | bug_reports: 'Bug reports' |
250 | support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>' | 257 | support: '<a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>' |
251 | helping: | 258 | helping: |
252 | description: 'wallabag is free and open source. You can help us:' | 259 | description: 'wallabag is free and open source. You can help us:' |
253 | by_contributing: 'by contributing to the project:' | 260 | by_contributing: 'by contributing to the project:' |
@@ -477,7 +484,7 @@ error: | |||
477 | flashes: | 484 | flashes: |
478 | config: | 485 | config: |
479 | notice: | 486 | notice: |
480 | config_saved: 'Config saved. Some parameters will be considered after disconnection.' | 487 | config_saved: 'Config saved.' |
481 | password_updated: 'Password updated' | 488 | password_updated: 'Password updated' |
482 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 489 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
483 | user_updated: 'Information updated' | 490 | user_updated: 'Information updated' |