pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.1

Browse Source
This commit is contained in:
Jeremy Benoist
2016-08-22 23:03:16 +02:00
parent 9c545fe028 80bb0b7344
commit 79efca1e6f
45 changed files with 494 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
View File

@ -145,9 +145,11 @@ entry:
reading_time_minutes: 'estimated reading time: %readingTime% min'
reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
reading_time_minutes_short: '%readingTime% min'
reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
original_article: 'original'
toogle_as_read: 'Toggle mark as read'
toogle_as_star: 'Toggle favorite'
toogle_as_star: 'Toggle starred'
delete: 'Delete'
export_title: 'Export'
filters:
@ -177,7 +179,7 @@ entry:
back_to_homepage: 'Back'
set_as_read: 'Mark as read'
set_as_unread: 'Mark as unread'
set_as_favorite: 'Favorite'
set_as_starred: 'Toggle starred'
view_original_article: 'Original article'
re_fetch_content: 'Re-fetch content'
delete: 'Delete'
@ -192,6 +194,7 @@ entry:
edit_title: 'Edit title'
original_article: 'original'
annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
created_at: 'Creation date'
new:
page_title: 'Save new entry'
placeholder: 'http://website.com'