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

This commit is contained in:
Jeremy Benoist
2016-10-11 21:01:30 +02:00
74 changed files with 1595 additions and 1519 deletions

View File

@ -200,7 +200,7 @@ entry:
description: 'Vises artiklen forkert?'
edit_title: 'Rediger titel'
original_article: 'original'
# annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
# annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
created_at: 'Oprettelsesdato'
new:
page_title: 'Gem ny artikel'