Merge branch 'feature/keywords-rework' into feature/fulltext-search

# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/models.py
#	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/templates/sw.js
#	cookbook/views/api.py
#	cookbook/views/views.py
#	vue/src/locales/en.json
#	vue/webpack-stats.json
#	vue/yarn.lock

vue/src/locales/en.json

@@ -1,10 +1,18 @@
 {
+  "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!",
+  "err_deleting_resource": "There was an error deleting a resource!",
+  "success_fetching_resource": "Successfully fetched a resource!",
+  "success_creating_resource": "Successfully created a resource!",
+  "success_updating_resource": "Successfully updated a resource!",
+  "success_deleting_resource": "Successfully deleted a resource!",
+
   "import_running": "Import running, please wait!",
   "all_fields_optional": "All fields are optional and can be left empty.",
   "convert_internal": "Convert to internal recipe",
   "show_only_internal": "Show only internal recipes",
-
-
+  "show_split_screen": "Show split view",
 
   "Log_Recipe_Cooking": "Log Recipe Cooking",
   "External_Recipe_Image": "External Recipe Image",
@@ -23,6 +31,14 @@
   "Url_Import": "Url Import",
   "Reset_Search": "Reset Search",
   "Recently_Viewed": "Recently Viewed",
+  "Load_More": "Load More",
+  "New_Keyword": "New Keyword",
+  "Delete_Keyword": "Delete Keyword",
+  "Edit_Keyword": "Edit Keyword",
+  "Move_Keyword": "Move Keyword",
+  "Merge_Keyword": "Merge Keyword",
+  "Hide_Keywords": "Hide Keywords",
+  "Hide_Recipes": "Hide Recipes",
 
   "Keywords": "Keywords",
   "Books": "Books",
@@ -34,10 +50,14 @@
   "Date": "Date",
   "Share": "Share",
   "Export": "Export",
+  "Copy": "Copy",
   "Rating": "Rating",
   "Close": "Close",
+  "Cancel": "Cancel",
+  "Link": "Link",
   "Add": "Add",
   "New": "New",
+  "Success": "Success",
   "Ingredients": "Ingredients",
   "Supermarket": "Supermarket",
   "Categories": "Categories",
@@ -48,8 +68,13 @@
   "Waiting": "Waiting",
   "Preparation": "Preparation",
   "External": "External",
+  "Size": "Size",
+  "Files": "Files",
+  "File": "File",
   "Edit": "Edit",
+  "Delete": "Delete",
   "Open": "Open",
+  "Ok": "Open",
   "Save": "Save",
   "Step": "Step",
   "Search": "Search",
@@ -59,5 +84,18 @@
   "or": "or",
   "and": "and",
   "Information": "Information",
-  "Advanced Search Settings": "Advanced Search Settings"
-}
+  "Advanced Search Settings": "Advanced Search Settings",
+  "View": "View",
+  "Recipes": "Recipes",
+  "Move": "Move",
+  "Merge": "Merge",
+  "Parent": "Parent",
+  "delete_confimation": "Are you sure that you want to delete {kw} and all of it's children?",
+  "move_confirmation": "Move {child} to parent {parent}",
+  "merge_confirmation": "Replace {source} with {target}",
+  "move_selection": "Select a parent to move {child} to.",
+  "merge_selection": "Replace all occurences of {source} with the selected {type}.",
+  "Advanced Search Settings": "Advanced Search Settings",
+  "Download": "Download",
+  "Root": "Root"
+}