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

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / translations / messages.fr.yml

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 542f61c2081e43be9581ae646816ff21826971ed..9e47d600a005af84c7b2faae6441c7514cfe659b 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -145,6 +145,8 @@ entry:
         reading_time_minutes: 'durée de lecture: %readingTime% min'
         reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min'
         number_of_tags: '{1}et un autre tag|]1,Inf[et %count% autres 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: 'Marquer comme lu/non lu'
         toogle_as_star: 'Marquer comme favori'
@@ -177,7 +179,7 @@ entry:
             back_to_homepage: 'Retour'
             set_as_read: 'Marquer comme lu'
             set_as_unread: 'Marquer comme non lu'
-            set_as_favorite: 'Mettre en favori'
+            set_as_starred: 'Mettre en favori'
             view_original_article: 'Article original'
             re_fetch_content: 'Recharger le contenu'
             delete: 'Supprimer'
@@ -192,6 +194,7 @@ entry:
         edit_title: 'Modifier le titre'
         original_article: 'original'
         annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations'
+        created_at: 'Date de création'
     new:
         page_title: 'Sauvegarder un nouvel article'
         placeholder: 'http://website.com'