diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-03-08 17:02:34 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-06-09 17:12:51 +0200 |
commit | 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 (patch) | |
tree | 03ee1eab0d89d1857daca9e273fd8c9ca47e33c2 /src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |
parent | 9f95b14dec88cf083cefa38d5fbd84189e07acac (diff) | |
download | wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.gz wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.zst wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.zip |
manage assets through npm
first draft
remote assetic totally
work
nearly there
use at least nodejs > 0.12
use proper version of grunt
bump nodejs version for travis
update npm
workaround for materialize
install node 5.0
add grunt-cli
baggy theme & cache node modules
cache bower & npm
make travis build assets on php7 only
exclude installing node & npm if not needed & use bash
clean & try to make icomoon work on baggy
ready
config for travis
rebase
make travis work
more travis work
impove travis & update deps
add missing pixrem deps
add module through oddly lost
ui updates
install latest nodejs
add install_dev.sh, link local binaries for npm/bower/grunt
ui improvements (mostly baggy)
fix travis build
no need to install on travis
Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
Add unread filter test to EntryControllerTest
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
Improve English translation
Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
Update installation instructions
-Fix grammar
-Add SELinux section
add screenshots of android docu in English
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
Move fixtures to the right place
Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
Change ManyToMany between entry & tag
Following https://gist.github.com/Ocramius/3121916
Be sure to remove the related entity when removing an entity.
Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:
- before that commit, the EntryTag will stay (at least using SQLite).
- with that commit, the related entity is removed
Prepare wallabag 2.0.5
enforce older materialize version
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 1cc42404..b65e4522 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 <= 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 >= 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 <= 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 >= 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"><</small> 1 min' | 146 | reading_time_less_one_minute: 'estimated reading time: <small class="inferieur"><</small> 1 min' |
@@ -154,6 +154,7 @@ entry: | |||
154 | status_label: 'Status' | 154 | status_label: 'Status' |
155 | archived_label: 'Archived' | 155 | archived_label: 'Archived' |
156 | starred_label: 'Starred' | 156 | starred_label: 'Starred' |
157 | unread_label: 'Unread' | ||
157 | preview_picture_label: 'Has a preview picture' | 158 | preview_picture_label: 'Has a preview picture' |
158 | preview_picture_help: 'Preview picture' | 159 | preview_picture_help: 'Preview picture' |
159 | language_label: 'Language' | 160 | language_label: 'Language' |
@@ -222,14 +223,14 @@ about: | |||
222 | bug_reports: 'Bug reports' | 223 | bug_reports: 'Bug reports' |
223 | 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>' |
224 | helping: | 225 | helping: |
225 | description: 'wallabag is free and opensource. You can help us:' | 226 | description: 'wallabag is free and open source. You can help us:' |
226 | by_contributing: 'by contributing to the project:' | 227 | by_contributing: 'by contributing to the project:' |
227 | by_contributing_2: 'an issue lists all our needs' | 228 | by_contributing_2: 'an issue lists all our needs' |
228 | by_paypal: 'via Paypal' | 229 | by_paypal: 'via Paypal' |
229 | contributors: | 230 | contributors: |
230 | description: 'Thank you to contributors on wallabag web application' | 231 | description: 'Thank you to contributors on wallabag web application' |
231 | third_party: | 232 | third_party: |
232 | 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):' |
233 | package: 'Package' | 234 | package: 'Package' |
234 | license: 'License' | 235 | license: 'License' |
235 | 236 | ||
@@ -258,7 +259,7 @@ quickstart: | |||
258 | page_title: 'Quickstart' | 259 | page_title: 'Quickstart' |
259 | intro: | 260 | intro: |
260 | title: 'Welcome to wallabag!' | 261 | title: 'Welcome to wallabag!' |
261 | 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." |
262 | paragraph_2: 'Follow us!' | 263 | paragraph_2: 'Follow us!' |
263 | configure: | 264 | configure: |
264 | title: 'Configure the application' | 265 | title: 'Configure the application' |
@@ -290,7 +291,7 @@ quickstart: | |||
290 | title: 'Full documentation' | 291 | title: 'Full documentation' |
291 | annotate: 'Annotate your article' | 292 | annotate: 'Annotate your article' |
292 | export: 'Convert your articles into ePUB or PDF' | 293 | export: 'Convert your articles into ePUB or PDF' |
293 | 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' |
294 | 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?' |
295 | all_docs: 'And so many other articles!' | 296 | all_docs: 'And so many other articles!' |
296 | support: | 297 | support: |
@@ -303,11 +304,11 @@ quickstart: | |||
303 | tag: | 304 | tag: |
304 | page_title: 'Tags' | 305 | page_title: 'Tags' |
305 | list: | 306 | list: |
306 | 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.' |
307 | 308 | ||
308 | import: | 309 | import: |
309 | page_title: 'Import' | 310 | page_title: 'Import' |
310 | 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.' |
311 | action: | 312 | action: |
312 | import_contents: 'Import contents' | 313 | import_contents: 'Import contents' |
313 | form: | 314 | form: |
@@ -317,7 +318,7 @@ import: | |||
317 | save_label: 'Upload file' | 318 | save_label: 'Upload file' |
318 | pocket: | 319 | pocket: |
319 | page_title: 'Import > Pocket' | 320 | page_title: 'Import > Pocket' |
320 | 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." |
321 | config_missing: | 322 | config_missing: |
322 | description: "Pocket import isn't configured." | 323 | description: "Pocket import isn't configured." |
323 | 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%.' |
@@ -396,6 +397,7 @@ flashes: | |||
396 | notice: | 397 | notice: |
397 | entry_already_saved: 'Entry already saved on %date%' | 398 | entry_already_saved: 'Entry already saved on %date%' |
398 | entry_saved: 'Entry saved' | 399 | entry_saved: 'Entry saved' |
400 | entry_saved_failed: 'Failed to save entry' | ||
399 | entry_updated: 'Entry updated' | 401 | entry_updated: 'Entry updated' |
400 | entry_reloaded: 'Entry reloaded' | 402 | entry_reloaded: 'Entry reloaded' |
401 | entry_reload_failed: 'Failed to reload entry' | 403 | entry_reload_failed: 'Failed to reload entry' |