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.ro.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.ro.yml')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index e68a91ec..e7daf880 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -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' |