Merge branch 'feature/multi-tennancy' into develop

vue/src/locales/en.json

@@ -14,6 +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.",
+    "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!",
@@ -125,6 +128,8 @@
     "Move": "Move",
     "Merge": "Merge",
     "Parent": "Parent",
+    "Copy Link": "Copy Link",
+    "Copy Token": "Copy Token",
     "delete_confirmation": "Are you sure that you want to delete {source}?",
     "move_confirmation": "Move <i>{child}</i> to parent <i>{parent}</i>",
     "merge_confirmation": "Replace <i>{source}</i> with <i>{target}</i>",
@@ -262,6 +267,8 @@
     "New_Cookbook": "New cookbook",
     "Hide_Keyword": "Hide keywords",
     "Clear": "Clear",
+    "Users": "Users",
+    "Invites": "Invites",
     "err_move_self": "Cannot move item to itself",
     "nothing": "Nothing to do",
     "err_merge_self": "Cannot merge item with itself",
@@ -340,6 +347,7 @@
     "filter": "Filter",
     "Website": "Website",
     "App": "App",
+    "Message": "Message",
     "Bookmarklet": "Bookmarklet",
     "click_image_import": "Click the image you want to import for this recipe",
     "no_more_images_found": "No additional images found on Website.",
@@ -351,7 +359,9 @@
     "search_create_help_text": "Create a new recipe directly in Tandoor.",
     "warning_duplicate_filter": "Warning: Due to technical limitations having multiple filters of the same combination (and/or/not) might yield unexpected results.",
     "reset_children": "Reset Child Inheritance",
-    "reset_children_help": "Overwrite all children with values from inherited fields.  Inheritted fields of children will be set to Inherit Fields unless Children Inherit Fields is set.",
+    "reset_children_help": "Overwrite all children with values from inherited fields.  Inherited fields of children will be set to Inherit Fields unless Children Inherit Fields is set.",
+    "reset_food_inheritance": "Reset Inheritance",
+    "reset_food_inheritance_info": "Reset all foods to default inherited fields and their parent values.",
     "substitute_help": "Substitutes are considered when searching for recipes that can be made with onhand ingredients.",
     "substitute_siblings_help": "All food that share a parent of this food are considered substitutes.",
     "substitute_children_help": "All food that are children of this food are considered substitutes.",
@@ -360,7 +370,7 @@
     "SubstituteOnHand": "You have a substitute on hand.",
     "ChildInheritFields": "Children Inherit Fields",
     "ChildInheritFields_help": "Children will inherit these fields by default.",
-    "InheritFields_help": "The values of these fields will be inheritted from parent (Exception: blank shopping categories are not inheritted)",
+    "InheritFields_help": "The values of these fields will be inherited from parent (Exception: blank shopping categories are not inherited)",
     "last_viewed": "Last Viewed",
     "created_on": "Created On",
     "updatedon": "Updated On",
@@ -412,5 +422,6 @@
     "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?"
+    "Are_You_Sure": "Are you sure?",
+    "Valid Until": "Valid Until"
 }