diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
commit | b878be4cc99fd4927c70b59386cf7a57b33bb381 (patch) | |
tree | 9a5186ead93b9f6114b5341a7713f614eb58f6ec /src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |
parent | e673b54f702f274a087e4feff409663d9636e57b (diff) | |
parent | bffe65478de71113a16f6e7a7ef75845c9d61180 (diff) | |
download | wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip |
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 827bf770..e13987ae 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -72,9 +72,9 @@ config: | |||
72 | 300_word: 'I read ~300 words per minute' | 72 | 300_word: 'I read ~300 words per minute' |
73 | 400_word: 'I read ~400 words per minute' | 73 | 400_word: 'I read ~400 words per minute' |
74 | action_mark_as_read: | 74 | action_mark_as_read: |
75 | label: 'Where do you want to be redirected to after marking an article as read?' | 75 | label: 'What to do after removing, starring or marking as read an article?' |
76 | redirect_homepage: 'To the homepage' | 76 | redirect_homepage: 'Go to the homepage' |
77 | redirect_current_page: 'To the current page' | 77 | redirect_current_page: 'Stay on the current page' |
78 | pocket_consumer_key_label: Consumer key for Pocket to import contents | 78 | pocket_consumer_key_label: Consumer key for Pocket to import contents |
79 | android_configuration: Configure your Android application | 79 | android_configuration: Configure your Android application |
80 | android_instruction: "Touch here to prefill your Android application" | 80 | android_instruction: "Touch here to prefill your Android application" |
@@ -157,8 +157,8 @@ config: | |||
157 | not_equal_to: 'Not equal to...' | 157 | not_equal_to: 'Not equal to...' |
158 | or: 'One rule OR another' | 158 | or: 'One rule OR another' |
159 | and: 'One rule AND another' | 159 | and: 'One rule AND another' |
160 | matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 160 | matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 161 | notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
162 | 162 | ||
163 | entry: | 163 | entry: |
164 | default_title: 'Title of the entry' | 164 | default_title: 'Title of the entry' |