diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
| commit | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch) | |
| tree | a1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |
| parent | da4136557963018287cae61226e9006c3c741747 (diff) | |
| parent | 84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff) | |
| download | wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 36382b6f..2bb95728 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
| @@ -150,7 +150,7 @@ entry: | |||
| 150 | starred: 'Starred entries' | 150 | starred: 'Starred entries' |
| 151 | archived: 'Archived entries' | 151 | archived: 'Archived entries' |
| 152 | filtered: 'Filtered entries' | 152 | filtered: 'Filtered entries' |
| 153 | filtered_tags: 'Filtered by tags' | 153 | filtered_tags: 'Filtered by tags:' |
| 154 | untagged: 'Untagged entries' | 154 | untagged: 'Untagged entries' |
| 155 | list: | 155 | list: |
| 156 | number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' | 156 | number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' |
| @@ -472,7 +472,6 @@ flashes: | |||
| 472 | rss_updated: 'RSS information updated' | 472 | rss_updated: 'RSS information updated' |
| 473 | tagging_rules_updated: 'Tagging rules updated' | 473 | tagging_rules_updated: 'Tagging rules updated' |
| 474 | tagging_rules_deleted: 'Tagging rule deleted' | 474 | tagging_rules_deleted: 'Tagging rule deleted' |
| 475 | # user_added: 'User "%username%" added' | ||
| 476 | rss_token_updated: 'RSS token updated' | 475 | rss_token_updated: 'RSS token updated' |
| 477 | annotations_reset: Annotations reset | 476 | annotations_reset: Annotations reset |
| 478 | tags_reset: Tags reset | 477 | tags_reset: Tags reset |