Merge branch 'develop' into feature/keywords-rework

# 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
#	cookbook/templates/sw.js
#	cookbook/views/views.py
#	vue/src/components/RecipeCard.vue
#	vue/src/locales/en.json

vue/src/locales/de.json

@@ -1,5 +1,5 @@
 {
-    "Import": "Import",
+    "Import": "Importieren",
     "import_running": "Import läuft, bitte warten!",
     "Import_finished": "Import fertig",
     "View_Recipes": "Rezepte Ansehen",
@@ -27,7 +27,7 @@
     "min": "Min",
     "Servings": "Portionen",
     "Waiting": "Wartezeit",
-    "Preparation": "Zubereitung",
+    "Preparation": "Vorbereitung",
     "Edit": "Bearbeiten",
     "Open": "Öffnen",
     "Save": "Speichern",
@@ -48,5 +48,28 @@
     "Export": "Exportieren",
     "Rating": "Bewertung",
     "Close": "Schließen",
-    "Add": "Hinzufügen"
+    "Add": "Hinzufügen",
+    "Copy": "Kopieren",
+    "New": "Neu",
+    "Categories": "Kategorien",
+    "Category": "Kategorie",
+    "Selected": "Ausgewählt",
+    "Supermarket": "Supermarkt",
+    "Files": "Dateien",
+    "Size": "Größe",
+    "success_fetching_resource": "Ressource erfolgreich abgerufen!",
+    "Download": "Herunterladen",
+    "Success": "Erfolgreich",
+    "err_fetching_resource": "Ein Fehler trat während dem Abrufen einer Ressource auf!",
+    "err_creating_resource": "Ein Fehler trat während dem Erstellen einer Ressource auf!",
+    "err_updating_resource": "Ein Fehler trat während dem Aktualisieren einer Ressource auf!",
+    "success_creating_resource": "Ressource erfolgreich erstellt!",
+    "success_updating_resource": "Ressource erfolgreich aktualisiert!",
+    "File": "Datei",
+    "Delete": "Löschen",
+    "err_deleting_resource": "Ein Fehler trat während dem Löschen einer Ressource auf!",
+    "Cancel": "Abbrechen",
+    "success_deleting_resource": "Ressource erfolgreich gelöscht!",
+    "Load_More": "Mehr laden",
+    "Ok": "Öffnen"
 }

vue/src/locales/en.json

@@ -50,9 +50,11 @@
   "Date": "Date",
   "Share": "Share",
   "Export": "Export",
+  "Copy": "Copy",
   "Rating": "Rating",
   "Close": "Close",
   "Cancel": "Cancel",
+  "Link": "Link",
   "Add": "Add",
   "New": "New",
   "Success": "Success",
@@ -95,4 +97,4 @@
   "Advanced Search Settings": "Advanced Search Settings",
   "Download": "Download",
   "Root": "Root"
-}
+}

vue/src/locales/hy.json

@@ -0,0 +1,76 @@
+{
+    "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_Book": "",
+    "Add_to_Shopping": "",
+    "Add_to_Plan": "",
+    "Step_start_time": "",
+    "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": "",
+    "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": ""
+}