aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml22
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig2
3 files changed, 13 insertions, 13 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 6658baa9..ae03f809 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -81,7 +81,7 @@ config:
81 archive: 'archived' 81 archive: 'archived'
82 rss_limit: 'Number of items in the feed' 82 rss_limit: 'Number of items in the feed'
83 form_user: 83 form_user:
84 two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" 84 two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection."
85 name_label: 'Name' 85 name_label: 'Name'
86 email_label: 'Email' 86 email_label: 'Email'
87 twoFactorAuthentication_label: 'Two factor authentication' 87 twoFactorAuthentication_label: 'Two factor authentication'
@@ -98,9 +98,9 @@ config:
98 faq: 98 faq:
99 title: 'FAQ' 99 title: 'FAQ'
100 tagging_rules_definition_title: 'What does « tagging rules » mean?' 100 tagging_rules_definition_title: 'What does « tagging rules » mean?'
101 tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.' 101 tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble of manually classifying your entries.'
102 how_to_use_them_title: 'How do I use them?' 102 how_to_use_them_title: 'How do I use them?'
103 how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »' 103 how_to_use_them_description: 'Let us assume you want to tag new entries as « <i>short reading</i> » when the reading time is under 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them with a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
104 variables_available_title: 'Which variables and operators can I use to write rules?' 104 variables_available_title: 'Which variables and operators can I use to write rules?'
105 variables_available_description: 'The following variables and operators can be used to create tagging rules:' 105 variables_available_description: 'The following variables and operators can be used to create tagging rules:'
106 meaning: 'Meaning' 106 meaning: 'Meaning'
@@ -140,7 +140,7 @@ entry:
140 archived: 'Archived entries' 140 archived: 'Archived entries'
141 filtered: 'Filtered entries' 141 filtered: 'Filtered entries'
142 list: 142 list:
143 number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 143 number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
144 reading_time: 'estimated reading time' 144 reading_time: 'estimated reading time'
145 reading_time_minutes: 'estimated reading time: %readingTime% min' 145 reading_time_minutes: 'estimated reading time: %readingTime% min'
146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
@@ -223,14 +223,14 @@ about:
223 bug_reports: 'Bug reports' 223 bug_reports: 'Bug reports'
224 support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>' 224 support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
225 helping: 225 helping:
226 description: 'wallabag is free and opensource. You can help us:' 226 description: 'wallabag is free and open source. You can help us:'
227 by_contributing: 'by contributing to the project:' 227 by_contributing: 'by contributing to the project:'
228 by_contributing_2: 'an issue lists all our needs' 228 by_contributing_2: 'an issue lists all our needs'
229 by_paypal: 'via Paypal' 229 by_paypal: 'via Paypal'
230 contributors: 230 contributors:
231 description: 'Thank you to contributors on wallabag web application' 231 description: 'Thank you to contributors on wallabag web application'
232 third_party: 232 third_party:
233 description: 'Here are the list of third-party libraries used in wallabag (with their licenses):' 233 description: 'Here is the list of third-party libraries used in wallabag (with their licenses):'
234 package: 'Package' 234 package: 'Package'
235 license: 'License' 235 license: 'License'
236 236
@@ -259,7 +259,7 @@ quickstart:
259 page_title: 'Quickstart' 259 page_title: 'Quickstart'
260 intro: 260 intro:
261 title: 'Welcome to wallabag!' 261 title: 'Welcome to wallabag!'
262 paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you." 262 paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you."
263 paragraph_2: 'Follow us!' 263 paragraph_2: 'Follow us!'
264 configure: 264 configure:
265 title: 'Configure the application' 265 title: 'Configure the application'
@@ -291,7 +291,7 @@ quickstart:
291 title: 'Full documentation' 291 title: 'Full documentation'
292 annotate: 'Annotate your article' 292 annotate: 'Annotate your article'
293 export: 'Convert your articles into ePUB or PDF' 293 export: 'Convert your articles into ePUB or PDF'
294 search_filters: 'See how you can look for an article by using search engine and filters' 294 search_filters: 'See how you can look for an article by using the search engine and filters'
295 fetching_errors: 'What can I do if an article encounters errors during fetching?' 295 fetching_errors: 'What can I do if an article encounters errors during fetching?'
296 all_docs: 'And so many other articles!' 296 all_docs: 'And so many other articles!'
297 support: 297 support:
@@ -304,11 +304,11 @@ quickstart:
304tag: 304tag:
305 page_title: 'Tags' 305 page_title: 'Tags'
306 list: 306 list:
307 number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' 307 number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
308 308
309import: 309import:
310 page_title: 'Import' 310 page_title: 'Import'
311 page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.' 311 page_description: 'Welcome to wallabag importer. Please select your previous service from which you want to migrate.'
312 action: 312 action:
313 import_contents: 'Import contents' 313 import_contents: 'Import contents'
314 form: 314 form:
@@ -318,7 +318,7 @@ import:
318 save_label: 'Upload file' 318 save_label: 'Upload file'
319 pocket: 319 pocket:
320 page_title: 'Import > Pocket' 320 page_title: 'Import > Pocket'
321 description: "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag." 321 description: "This importer will import all of your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
322 config_missing: 322 config_missing:
323 description: "Pocket import isn't configured." 323 description: "Pocket import isn't configured."
324 admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.' 324 admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 9ce5b645..920fa933 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -32,7 +32,7 @@
32 32
33 <div class="card-content"> 33 <div class="card-content">
34 {% if not entry.previewPicture is null %} 34 {% if not entry.previewPicture is null %}
35 <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-vert right"></i> 35 <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i>
36 {% endif %} 36 {% endif %}
37 37
38 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span> 38 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 75170f91..25ad23dd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -134,7 +134,7 @@
134 <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS"> 134 <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS">
135 <span class="icon-apple"></span> 135 <span class="icon-apple"></span>
136 </a> 136 </a>
137 <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/ru/firefox/addon/wallabag/" title="Firefox"> 137 <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag/" title="Firefox">
138 <span class="icon-firefox"></span> 138 <span class="icon-firefox"></span>
139 </a> 139 </a>
140 <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome"> 140 <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome">