Merge branch 'develop' into feature/2402-make-now-count

vue/src/locales/en.json

@@ -1,5 +1,5 @@
 {
-    "warning_feature_beta": "This feature is currently in a BETA (testing) state. Please expect bugs and possibly breaking changes in the future (possibly loosing feature related data) when using this feature.",
+    "warning_feature_beta": "This feature is currently in a BETA (testing) state. Please expect bugs and possibly breaking changes in the future (possibly losing feature-related data) when using this feature.",
     "err_fetching_resource": "There was an error fetching a resource!",
     "err_creating_resource": "There was an error creating a resource!",
     "err_updating_resource": "There was an error updating a resource!",
@@ -14,9 +14,9 @@
     "success_moving_resource": "Successfully moved a resource!",
     "success_merging_resource": "Successfully merged a resource!",
     "file_upload_disabled": "File upload is not enabled for your space.",
+    "recipe_property_info": "You can also add properties to foods to calculate them automatically based on your recipe!",
     "warning_space_delete": "You can delete your space including all recipes, shopping lists, meal plans and whatever else you have created. This cannot be undone! Are you sure you want to do this ?",
     "food_inherit_info": "Fields on food that should be inherited by default.",
-    "facet_count_info": "Show recipe counts on search filters.",
     "step_time_minutes": "Step time in minutes",
     "confirm_delete": "Are you sure you want to delete this {object}?",
     "import_running": "Import running, please wait!",
@@ -37,6 +37,7 @@
     "Add_nutrition_recipe": "Add nutrition to recipe",
     "Remove_nutrition_recipe": "Delete nutrition from recipe",
     "Copy_template_reference": "Copy template reference",
+    "per_serving": "per servings",
     "Save_and_View": "Save & View",
     "Manage_Books": "Manage Books",
     "Meal_Plan": "Meal Plan",
@@ -76,6 +77,19 @@
     "Private_Recipe": "Private Recipe",
     "Private_Recipe_Help": "Recipe is only shown to you and people its shared with.",
     "reusable_help_text": "Should the invite link be usable for more than one user.",
+    "open_data_help_text": "The Tandoor Open Data project provides community contributed data for Tandoor. This field is filled automatically when importing it and allows updates in the future.",
+    "Open_Data_Slug": "Open Data Slug",
+    "Open_Data_Import": "Open Data Import",
+    "Data_Import_Info": "Enhance your Space by importing a community curated list of foods, units and more to improve your recipe collection.",
+    "Update_Existing_Data": "Update Existing Data",
+    "Use_Metric": "Use Metric Units",
+    "Learn_More": "Learn More",
+    "converted_unit": "Converted Unit",
+    "converted_amount": "Converted Amount",
+    "base_unit": "Base Unit",
+    "base_amount": "Base Amount",
+    "Datatype": "Datatype",
+    "Number of Objects": "Number of Objects",
     "Add_Step": "Add Step",
     "Keywords": "Keywords",
     "Books": "Books",
@@ -86,6 +100,8 @@
     "Energy": "Energy",
     "Nutrition": "Nutrition",
     "Date": "Date",
+    "StartDate": "Start Date",
+    "EndDate": "End Date",
     "Share": "Share",
     "Automation": "Automation",
     "Parameter": "Parameter",
@@ -98,6 +114,7 @@
     "Add": "Add",
     "New": "New",
     "Note": "Note",
+    "Alignment": "Alignment",
     "Success": "Success",
     "Failure": "Failure",
     "Protected": "Protected",
@@ -133,6 +150,7 @@
     "Search Settings": "Search Settings",
     "View": "View",
     "Recipes": "Recipes",
+    "Welcome": "Welcome",
     "Move": "Move",
     "Merge": "Merge",
     "Parent": "Parent",
@@ -161,6 +179,8 @@
     "merge_title": "Merge {type}",
     "move_title": "Move {type}",
     "Food": "Food",
+    "Property": "Property",
+    "Conversion": "Conversion",
     "Original_Text": "Original Text",
     "Recipe_Book": "Recipe Book",
     "del_confirmation_tree": "Are you sure that you want to delete {source} and all of it's children?",
@@ -168,6 +188,7 @@
     "create_title": "New {type}",
     "edit_title": "Edit {type}",
     "Name": "Name",
+    "Properties": "Properties",
     "Type": "Type",
     "Description": "Description",
     "Recipe": "Recipe",
@@ -299,6 +320,7 @@
     "CategoryName": "Category Name",
     "SupermarketName": "Supermarket Name",
     "CategoryInstruction": "Drag categories to change the order categories appear in shopping list.",
+    "OrderInformation": "Objects are ordered from small to large numbers.",
     "shopping_recent_days_desc": "Days of recent shopping list entries to display.",
     "shopping_recent_days": "Recent Days",
     "download_pdf": "Download PDF",
@@ -350,6 +372,10 @@
     "filter_name": "Filter Name",
     "left_handed": "Left-handed mode",
     "left_handed_help": "Will optimize the UI for use with your left hand.",
+    "show_step_ingredients_setting": "Show Ingredients Next To Recipe Steps",
+    "show_step_ingredients_setting_help": "Add ingredients table next to recipe steps. Applies at creation time. Can be overridden in the edit recipe view.",
+    "show_step_ingredients": "Show Step Ingredients",
+    "hide_step_ingredients": "Hide Step Ingredients",
     "Custom Filter": "Custom Filter",
     "shared_with": "Shared With",
     "sort_by": "Sort By",
@@ -406,6 +432,7 @@
     "ChildInheritFields": "Children Inherit Fields",
     "ChildInheritFields_help": "Children will inherit these fields by default.",
     "InheritFields_help": "The values of these fields will be inherited from parent (Exception: blank shopping categories are not inherited)",
+    "show_ingredients_table": "Display a table of the ingredients next to the step's text",
     "show_ingredient_overview": "Display a list of all ingredients at the start of the recipe.",
     "Ingredient Overview": "Ingredient Overview",
     "last_viewed": "Last Viewed",
@@ -463,21 +490,48 @@
     "Import_Result_Info": "{imported} of {total} recipes were imported",
     "Recipes_In_Import": "Recipes in your import file",
     "Toggle": "Toggle",
+    "total": "total",
     "Import_Error": "An Error occurred during your import. Please expand the Details at the bottom of the page to view it.",
     "Warning_Delete_Supermarket_Category": "Deleting a supermarket category will also delete all relations to foods. Are you sure?",
     "New_Supermarket": "Create new supermarket",
     "New_Supermarket_Category": "Create new supermarket category",
     "Are_You_Sure": "Are you sure?",
     "Valid Until": "Valid Until",
-    "Split_All_Steps": "Split all rows into seperate steps.",
+    "Split_All_Steps": "Split all rows into separate steps.",
     "Combine_All_Steps": "Combine all steps into a single field.",
     "Plural": "Plural",
     "plural_short": "plural",
+
+    "g": "gram [g] (metric, weight)",
+    "kg": "kilogram [kg] (metric, weight)",
+    "ounce": "ounce [oz] (weight)",
+    "pound": "pound (weight)",
+    "ml": "millilitre [ml] (metric, volume)",
+    "l": "litre [l] (metric, volume)",
+    "fluid_ounce": "fluid ounce [fl oz] (US, volume)",
+    "pint": "pint [pt] (US, volume)",
+    "quart": "quart [qt] (US, volume)",
+    "gallon": "gallon [gal] (US, volume)",
+    "tbsp": "tablespoon [tbsp] (US, volume)",
+    "tsp": "teaspoon [tsp] (US, volume)",
+    "imperial_fluid_ounce": "imperial fluid ounce [imp fl oz] (UK, volume)",
+    "imperial_pint": "imperial pint [imp pt] (UK, volume)",
+    "imperial_quart": "imperial quart [imp qt] (UK, volume)",
+    "imperial_gallon": "imperial gal [imp gal] (UK, volume)",
+    "imperial_tbsp": "imperial tablespoon [imp tbsp] (UK, volume)",
+    "imperial_tsp": "imperial teaspoon [imp tsp] (UK, volume)",
+    "Choose_Category": "Choose Category",
+    "Back": "Back",
     "Use_Plural_Unit_Always": "Use plural form for unit always",
     "Use_Plural_Unit_Simple": "Use plural form for unit dynamically",
     "Use_Plural_Food_Always": "Use plural form for food always",
     "Use_Plural_Food_Simple": "Use plural form for food dynamically",
     "plural_usage_info": "Use the plural form for units and food inside this space.",
-	"Create Recipe": "Create Recipe",
-    "Import Recipe": "Import Recipe"
+    "Create Recipe": "Create Recipe",
+    "Import Recipe": "Import Recipe",
+    "Never_Unit": "Never Unit",
+    "Transpose_Words": "Transpose Words",
+    "Name_Replace":"Name Replace",
+    "Food_Replace":"Food Replace",
+    "Unit_Replace":"Unit Replace"
 }