Merge branch 'translate-develop' into develop

# Conflicts:
#	cookbook/locale/fr/LC_MESSAGES/django.po

vue/src/locales/fr.json

@@ -1,80 +1,80 @@
 {
-    "err_fetching_resource": "",
+    "err_fetching_resource": "Il y a eu une erreur pour récupérer une ressource !",
-    "err_creating_resource": "",
+    "err_creating_resource": "Il y a eu une erreur pour créer une ressource !",
-    "err_updating_resource": "",
+    "err_updating_resource": "Il y a eu une erreur pour mettre à jour une ressource !",
-    "err_deleting_resource": "",
+    "err_deleting_resource": "Il y a eu une erreur pour supprimer une ressource !",
-    "success_fetching_resource": "",
+    "success_fetching_resource": "Ressource correctement récupérée !",
-    "success_creating_resource": "",
+    "success_creating_resource": "Ressource correctement créée !",
-    "success_updating_resource": "",
+    "success_updating_resource": "Ressource correctement mise à jour !",
-    "success_deleting_resource": "",
+    "success_deleting_resource": "Ressource correctement supprimée !",
-    "import_running": "",
+    "import_running": "Importation en cours, veuillez patienter !",
-    "all_fields_optional": "",
+    "all_fields_optional": "Tous les champs sont optionnels et peuvent être laissés vides.",
-    "convert_internal": "",
+    "convert_internal": "Convertir en recette interne",
-    "show_only_internal": "",
+    "show_only_internal": "Montrer uniquement les recettes internes",
-    "Log_Recipe_Cooking": "",
+    "Log_Recipe_Cooking": "Marquer la recette comme cuisinée",
-    "External_Recipe_Image": "",
+    "External_Recipe_Image": "Image externe de recette",
-    "Add_to_Shopping": "",
+    "Add_to_Shopping": "Ajouter à la liste de courses",
-    "Add_to_Plan": "",
+    "Add_to_Plan": "Ajouter au menu",
-    "Step_start_time": "",
+    "Step_start_time": "Heure de départ de l'étape",
-    "Sort_by_new": "",
+    "Sort_by_new": "Trier par nouveautés",
-    "Recipes_per_page": "",
+    "Recipes_per_page": "Nombre de recettes par page",
-    "Manage_Books": "",
+    "Manage_Books": "Gérer les favoris",
-    "Meal_Plan": "",
+    "Meal_Plan": "Menu de la semaine",
-    "Select_Book": "",
+    "Select_Book": "Sélectionnez livre",
-    "Recipe_Image": "",
+    "Recipe_Image": "Image de la recette",
-    "Import_finished": "",
+    "Import_finished": "Importation finie",
-    "View_Recipes": "",
+    "View_Recipes": "Voir les recettes",
-    "Log_Cooking": "",
+    "Log_Cooking": "Marquer comme cuisiné",
-    "New_Recipe": "",
+    "New_Recipe": "Nouvelle recette",
-    "Url_Import": "",
+    "Url_Import": "Importation de l'url",
-    "Reset_Search": "",
+    "Reset_Search": "Réinitialiser la recherche",
-    "Recently_Viewed": "",
+    "Recently_Viewed": "Vu récemment",
-    "Load_More": "",
+    "Load_More": "Charger plus",
-    "Keywords": "",
+    "Keywords": "Mots-clés",
-    "Books": "",
+    "Books": "Livres",
-    "Proteins": "",
+    "Proteins": "Protéines",
-    "Fats": "",
+    "Fats": "Matières grasses",
-    "Carbohydrates": "",
+    "Carbohydrates": "Glucides",
-    "Calories": "",
+    "Calories": "Calories",
-    "Nutrition": "",
+    "Nutrition": "Informations nutritionnelles",
-    "Date": "",
+    "Date": "Date",
-    "Share": "",
+    "Share": "Partager",
-    "Export": "",
+    "Export": "Exporter",
-    "Copy": "",
+    "Copy": "Copier",
-    "Rating": "",
+    "Rating": "Note",
-    "Close": "",
+    "Close": "Fermer",
-    "Link": "",
+    "Link": "Lien",
-    "Add": "",
+    "Add": "Ajouter",
-    "New": "",
+    "New": "Nouveau",
-    "Success": "",
+    "Success": "Réussite",
-    "Failure": "",
+    "Failure": "Échec",
-    "Ingredients": "",
+    "Ingredients": "Ingrédients",
-    "Supermarket": "",
+    "Supermarket": "Supermarché",
-    "Categories": "",
+    "Categories": "Catégories",
-    "Category": "",
+    "Category": "Catégorie",
-    "Selected": "",
+    "Selected": "Sélectionné",
-    "min": "",
+    "min": "min",
-    "Servings": "",
+    "Servings": "Portions",
-    "Waiting": "",
+    "Waiting": "Attente",
-    "Preparation": "",
+    "Preparation": "Préparation",
-    "External": "",
+    "External": "Externe",
-    "Size": "",
+    "Size": "Taille",
-    "Files": "",
+    "Files": "Fichiers",
-    "File": "",
+    "File": "Fichier",
     "Edit": "Modifier",
-    "Cancel": "",
+    "Cancel": "Annuler",
     "Delete": "Supprimer",
-    "Open": "",
+    "Open": "Ouvrir",
-    "Ok": "",
+    "Ok": "Ouvrir",
-    "Save": "",
+    "Save": "Sauvegarder",
-    "Step": "",
+    "Step": "Étape",
-    "Search": "",
+    "Search": "Rechercher",
-    "Import": "",
+    "Import": "Importer",
-    "Print": "",
+    "Print": "Imprimer",
-    "Settings": "",
+    "Settings": "Paramètres",
-    "or": "",
+    "or": "ou",
-    "and": "",
+    "and": "et",
-    "Information": "",
+    "Information": "Information",
-    "Download": "",
+    "Download": "Télécharger",
-    "Create": ""
+    "Create": "Créer"
 }