Merge branch 'develop' into feature/fulltext-search

# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	requirements.txt
#	vue/src/apps/RecipeSearchView/RecipeSearchView.vue
#	vue/src/components/GenericMultiselect.vue
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2021-08-22 13:28:57 +02:00
86 changed files with 7258 additions and 3337 deletions

View File

@@ -16,13 +16,13 @@
"Log_Recipe_Cooking": "Log Recipe Cooking",
"External_Recipe_Image": "External Recipe Image",
"Add_to_Book": "Add to Book",
"Add_to_Shopping": "Add to Shopping",
"Add_to_Plan": "Add to Plan",
"Step_start_time": "Step start time",
"Sort_by_new": "Sort by new",
"Recipes_per_page": "Recipes per Page",
"Manage_Books": "Manage Books",
"Meal_Plan": "Meal Plan",
"Select_Book": "Select Book",
"Recipe_Image": "Recipe Image",
@@ -60,6 +60,7 @@
"Add": "Add",
"New": "New",
"Success": "Success",
"Failure": "Failure",
"Ingredients": "Ingredients",
"Supermarket": "Supermarket",
"Categories": "Categories",
@@ -86,6 +87,8 @@
"or": "or",
"and": "and",
"Information": "Information",
"Download": "Download",
"Create": "Create",
"Advanced Search Settings": "Advanced Search Settings",
"View": "View",
"Recipes": "Recipes",

80
vue/src/locales/fr.json Normal file
View File

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

View File

@@ -0,0 +1,80 @@
{
"err_fetching_resource": "",
"err_creating_resource": "",
"err_updating_resource": "",
"err_deleting_resource": "",
"success_fetching_resource": "",
"success_creating_resource": "",
"success_updating_resource": "",
"success_deleting_resource": "",
"import_running": "",
"all_fields_optional": "",
"convert_internal": "",
"show_only_internal": "",
"Log_Recipe_Cooking": "",
"External_Recipe_Image": "外部菜谱图像",
"Add_to_Shopping": "添加到购物",
"Add_to_Plan": "添加到计划",
"Step_start_time": "",
"Sort_by_new": "",
"Recipes_per_page": "",
"Manage_Books": "管理书籍",
"Meal_Plan": "",
"Select_Book": "",
"Recipe_Image": "菜谱图像",
"Import_finished": "导入完成",
"View_Recipes": "",
"Log_Cooking": "",
"New_Recipe": "新菜谱",
"Url_Import": "导入网址",
"Reset_Search": "重置搜索",
"Recently_Viewed": "最近浏览",
"Load_More": "加载更多",
"Keywords": "关键字",
"Books": "书籍",
"Proteins": "蛋白质",
"Fats": "脂肪",
"Carbohydrates": "碳水化合物",
"Calories": "卡路里",
"Nutrition": "营养",
"Date": "日期",
"Share": "分享",
"Export": "导出",
"Copy": "拷贝",
"Rating": "评分",
"Close": "关闭",
"Link": "链接",
"Add": "添加",
"New": "新",
"Success": "成功",
"Failure": "失败",
"Ingredients": "材料",
"Supermarket": "超级市场",
"Categories": "分类",
"Category": "分类",
"Selected": "选定",
"min": "",
"Servings": "份量",
"Waiting": "等待",
"Preparation": "准备",
"External": "外部",
"Size": "大小",
"Files": "文件",
"File": "文件",
"Edit": "编辑",
"Cancel": "取消",
"Delete": "删除",
"Open": "打开",
"Ok": "打开",
"Save": "储存",
"Step": "步骤",
"Search": "搜索",
"Import": "导入",
"Print": "打印",
"Settings": "设置",
"or": "或",
"and": "与",
"Information": "更多资讯",
"Download": "下载",
"Create": "创立"
}

View File

@@ -0,0 +1,80 @@
{
"err_fetching_resource": "",
"err_creating_resource": "",
"err_updating_resource": "",
"err_deleting_resource": "",
"success_fetching_resource": "",
"success_creating_resource": "",
"success_updating_resource": "",
"success_deleting_resource": "",
"import_running": "",
"all_fields_optional": "",
"convert_internal": "",
"show_only_internal": "",
"Log_Recipe_Cooking": "",
"External_Recipe_Image": "",
"Add_to_Shopping": "",
"Add_to_Plan": "",
"Step_start_time": "",
"Sort_by_new": "",
"Recipes_per_page": "",
"Manage_Books": "",
"Meal_Plan": "",
"Select_Book": "",
"Recipe_Image": "",
"Import_finished": "",
"View_Recipes": "",
"Log_Cooking": "",
"New_Recipe": "",
"Url_Import": "",
"Reset_Search": "",
"Recently_Viewed": "",
"Load_More": "",
"Keywords": "",
"Books": "",
"Proteins": "",
"Fats": "",
"Carbohydrates": "",
"Calories": "",
"Nutrition": "",
"Date": "",
"Share": "",
"Export": "",
"Copy": "",
"Rating": "",
"Close": "",
"Link": "",
"Add": "",
"New": "",
"Success": "",
"Failure": "",
"Ingredients": "",
"Supermarket": "",
"Categories": "",
"Category": "",
"Selected": "",
"min": "",
"Servings": "",
"Waiting": "",
"Preparation": "",
"External": "",
"Size": "",
"Files": "",
"File": "",
"Edit": "",
"Cancel": "",
"Delete": "",
"Open": "",
"Ok": "",
"Save": "",
"Step": "",
"Search": "",
"Import": "",
"Print": "",
"Settings": "",
"or": "",
"and": "",
"Information": "",
"Download": "",
"Create": ""
}