Merge branch 'develop' into feature/vue3

vue/src/locales/nl.json

@@ -2,7 +2,7 @@
     "import_running": "Er wordt geïmporteerd, even geduld!",
     "all_fields_optional": "Alle velden zijn optioneel en kunnen leeg gelaten worden.",
     "convert_internal": "Zet om naar intern recept",
-    "Log_Recipe_Cooking": "Bereiding loggen",
+    "Log_Recipe_Cooking": "Bereiding registreren",
     "External_Recipe_Image": "Externe Afbeelding Recept",
     "Add_to_Book": "Voeg toe aan Boek",
     "Add_to_Shopping": "Voeg toe aan Boodschappen",
@@ -12,7 +12,7 @@
     "Recipe_Image": "Afbeelding Recept",
     "Import_finished": "Importeren gereed",
     "View_Recipes": "Bekijk Recepten",
-    "Log_Cooking": "Log Bereiding",
+    "Log_Cooking": "Registreer bereiding",
     "Proteins": "Eiwitten",
     "Fats": "Vetten",
     "Carbohydrates": "Koolhydraten",
@@ -77,7 +77,7 @@
     "Ok": "Ok",
     "Load_More": "Laad meer",
     "Manage_Books": "Beheer boeken",
-    "Create": "Voeg toe",
+    "Create": "Aanmaken",
     "Failure": "Storing",
     "View": "Bekijk",
     "Recipes": "Recepten",
@@ -172,7 +172,7 @@
     "Week": "Week",
     "Month": "Maand",
     "Color": "Kleur",
-    "New_Meal_Type": "Nieuw Maaltype",
+    "New_Meal_Type": "Nieuw maaltijd type",
     "Image": "Afbeelding",
     "Planner_Settings": "Planner instellingen",
     "Period": "Periode",
@@ -180,11 +180,11 @@
     "Periods": "Periodes",
     "Plan_Show_How_Many_Periods": "Hoeveel perioden tonen",
     "Starting_Day": "Eerste dag van de week",
-    "Meal_Types": "Maaltypes",
-    "Meal_Type": "Maaltype",
+    "Meal_Types": "Maaltijd types",
+    "Meal_Type": "Maaltijd type",
     "Clone": "Kloon",
     "Drag_Here_To_Delete": "Sleep hierheen om te verwijderen",
-    "Meal_Type_Required": "Maaltype is verplicht",
+    "Meal_Type_Required": "Maaltijd type is verplicht",
     "Title_or_Recipe_Required": "Titel of recept selectie is verplicht",
     "Select_File": "Selecteer Bestand",
     "Year": "Jaar",
@@ -431,14 +431,14 @@
     "Second": "Seconde",
     "Seconds": "Seconden",
     "Account": "Account",
-    "Cosmetic": "Cosmetisch",
+    "Cosmetic": "Weergave",
     "Message": "Bericht",
     "Sticky_Nav": "Navigatie altijd zichbaar",
     "Sticky_Nav_Help": "Geef navigatiemenu altijd bovenin weer.",
     "Nav_Color": "Navigatiekleur",
     "Nav_Color_Help": "Verander de navigatiekleur.",
     "Use_Kj": "kJ gebruiken in plaats van kcal",
-    "Comments_setting": "Commentaar weergeven",
+    "Comments_setting": "Opmerkingen weergeven",
     "Change_Password": "Wachtwoord veranderen",
     "Social_Authentication": "Authenticeren met sociale media-account",
     "First_name": "Voornaam",
@@ -452,7 +452,7 @@
     "Private_Recipe": "Privé Recept",
     "Copy Link": "Kopieer Link",
     "Decimals": "Decimalen",
-    "Use_Fractions": "Gebruik Kommagetallen",
+    "Use_Fractions": "Gebruik breuken",
     "Theme": "Thema",
     "Hour": "Uur",
     "Users": "Gebruikers",
@@ -523,7 +523,7 @@
     "Back": "Terug",
     "err_importing_recipe": "Bij het importeren van het recept is een fout opgetreden!",
     "CustomLogoHelp": "Upload vierkante afbeeldingen in verschillende groottes om het logo in het browser tabblad en geïnstalleerde web apps aan te passen.",
-    "DefaultPage": "Standaard Pagina",
+    "DefaultPage": "Startpagina",
     "hide_step_ingredients": "Verberg Stap Ingrediënten",
     "CustomTheme": "Aangepast Thema",
     "CustomThemeHelp": "Overschrijf de stijl van het thema door een aangepast CSS bestand te uploaden.",
@@ -549,15 +549,15 @@
     "ShowRecentlyCompleted": "Toon recent voltooide items",
     "ShoppingBackgroundSyncWarning": "Slecht netwerk, wachten met synchroniseren…",
     "OrderInformation": "Objecten worden van kleine naar grote nummers gesorteerd.",
-    "Show_Logo": "Toon Logo",
-    "Show_Logo_Help": "Toon Tandoor of ruimte logo in navigatie balk.",
+    "Show_Logo": "Toon logo",
+    "Show_Logo_Help": "Toon het Tandoor of 'Ruimte' logo in de navigatie balk.",
     "Created": "Gemaakt",
     "Updated": "Geüpdate",
     "Unchanged": "Ongewijzigd",
     "Error": "Fout",
     "Logo": "Logo",
-    "Nav_Text_Mode": "Navigatie Tekst Mode",
-    "Space_Cosmetic_Settings": "Sommige cosmetische instellingen kunnen worden gewijzigd door de administrator van de Ruimte en zullen de persoonlijk instellingen voor die Ruimte overschrijven.",
+    "Nav_Text_Mode": "Navigatie tekstkleur",
+    "Space_Cosmetic_Settings": "Sommige weergave instellingen kunnen worden geforceerd door de administrator van de 'Ruimte' en zullen de persoonlijke instellingen voor die 'Ruimte' overschrijven.",
     "Nav_Text_Mode_Help": "Beinvloed het uiterlijk voor ieder thema anders.",
     "show_ingredients_table": "Toon een tabel van de ingrediënten naast de stap tekst",
     "Alignment": "Afstemming",
@@ -571,5 +571,6 @@
     "Name_Replace": "Naam Vervangen",
     "Food_Replace": "Voedingsmiddelen Vervangen",
     "Never_Unit": "Nooit Eenheid",
-    "Transpose_Words": "Omzetten Woorden"
+    "Transpose_Words": "Omzetten Woorden",
+    "us_cup": "kopje (US, eenheid)"
 }

vue/src/locales/zh_Hans.json

@@ -13,14 +13,14 @@
     "show_only_internal": "仅显示内部食谱",
     "Log_Recipe_Cooking": "食谱烹饪记录",
     "External_Recipe_Image": "外部食谱图像",
-    "Add_to_Shopping": "添加到购物",
+    "Add_to_Shopping": "加入购物清单",
     "Add_to_Plan": "添加到计划",
     "Step_start_time": "步骤开始时间",
     "Sort_by_new": "按新旧排序",
     "Recipes_per_page": "每页食谱数量",
-    "Manage_Books": "管理书籍",
+    "Manage_Books": "烹饪手册管理",
     "Meal_Plan": "用餐计划",
-    "Select_Book": "选择书籍",
+    "Select_Book": "选择烹饪手册",
     "Recipe_Image": "食谱图像",
     "Import_finished": "导入完成",
     "View_Recipes": "查看食谱",
@@ -31,7 +31,7 @@
     "Recently_Viewed": "最近浏览",
     "Load_More": "加载更多",
     "Keywords": "关键词",
-    "Books": "书籍",
+    "Books": "烹饪手册",
     "Proteins": "蛋白质",
     "Fats": "脂肪",
     "Carbohydrates": "碳水化合物",
@@ -198,7 +198,7 @@
     "Week_Numbers": "周数",
     "Show_Week_Numbers": "显示周数？",
     "Coming_Soon": "即将到来",
-    "New_Cookbook": "新烹饪书",
+    "New_Cookbook": "新建烹饪手册",
     "Hide_Keyword": "隐藏关键词",
     "Export_To_ICal": "导出 .ics",
     "Added_To_Shopping_List": "添加到购物清单",
@@ -296,7 +296,7 @@
     "Default_Unit": "默认单位",
     "Seconds": "秒",
     "and_down": "& Down",
-    "ignore_shopping_help": "请不要将食物添加到购物列表中（例如水）",
+    "ignore_shopping_help": "请不要将食物添加到购物清单中（例如水）",
     "Use_Fractions_Help": "查看食谱时自动将小数转换为分数。",
     "Foods": "食物",
     "Use_Fractions": "使用分数",
@@ -323,7 +323,7 @@
     "Invites": "邀请",
     "warning_duplicate_filter": "警告：由于技术限制，使用相同组合（和/或/不）的多个筛选器可能会产生意想不到的结果。",
     "Account": "账户",
-    "Cosmetic": "化妆品",
+    "Cosmetic": "外观",
     "API": "API",
     "enable_expert": "启用专家模式",
     "expert_mode": "专家模式",
@@ -331,7 +331,7 @@
     "fields": "字段",
     "show_keywords": "显示关键字",
     "show_foods": "显示食物",
-    "show_books": "显示书籍",
+    "show_books": "显示烹饪手册",
     "show_units": "显示单位",
     "show_filters": "显示筛选器",
     "filter_name": "筛选器名称",
@@ -346,7 +346,7 @@
     "Click_To_Edit": "点击编辑",
     "search_no_recipes": "找不到任何食谱！",
     "search_import_help_text": "从外部网站或应用程序导入食谱。",
-    "search_create_help_text": "直接在泥炉中创建新食谱。",
+    "search_create_help_text": "直接在 Tandoor 中创建新食谱。",
     "reset_children": "重置子继承",
     "reset_food_inheritance": "重置继承",
     "reset_food_inheritance_info": "将所有食物重置为默认继承字段及其父值。",
@@ -479,7 +479,7 @@
     "Auto_Sort_Help": "将所有食材移动到最恰当的步骤。",
     "Create Recipe": "创建食谱",
     "Import Recipe": "导入食谱",
-    "recipe_property_info": "您也可以为食物添加属性，以便根据食谱自动计算！",
+    "recipe_property_info": "您也可以为食物添加属性，以便根据您的食谱自动计算它们！",
     "per_serving": "每份",
     "converted_amount": "换算量",
     "Open_Data_Import": "开放数据导入",
@@ -558,5 +558,16 @@
     "CustomImageHelp": "上传图片以在空间概览中显示。",
     "CustomNavLogoHelp": "上传图像以用作导航栏徽标。",
     "CustomLogoHelp": "上传不同尺寸的方形图像以更改为浏览器选项卡和安装的网络应用程序中的徽标。",
-    "CustomLogos": "自定义徽标"
+    "CustomLogos": "自定义徽标",
+    "us_cup": "量杯（美式容量单位）",
+    "Created": "已创建",
+    "Shopping_input_placeholder": "例：土豆 / 100 土豆 / 100 g 土豆",
+    "created_by": "创建者",
+    "Updated": "已更新",
+    "Unchanged": "未更改",
+    "Error": "错误",
+    "DefaultPage": "默认页面",
+    "Transpose_Words": "字符串转置",
+    "Calculator": "计算器",
+    "Never_Unit": "禁用单位识别"
 }