Merge branch 'develop' of github.com:karlomikus/vue-salt-rim into dev…

…elop
karlomikus · Nov 14, 2024 · 7f7d47e · 7f7d47e
2 parents cf50834 + 5d35360
commit 7f7d47e
Show file tree

Hide file tree

Showing 18 changed files with 342 additions and 126 deletions.
diff --git a/src/locales/messages/cs-CZ.json b/src/locales/messages/cs-CZ.json
@@ -26,7 +26,7 @@
     "add": "Add ingredient",
     "on-shopping-list": "You have this ingredient on shopping list",
     "add-to-shelf": "Add to shelf",
-    "remove-from-shelf": "Remove from shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Add to shopping list",
     "remove-from-list": "Remove from shopping list",
     "update-success": "Ingredient updated successfully",
@@ -61,7 +61,13 @@
     "variety-note": "Recipe matching will include the parent ingredient as a substitute (depending on user settings)",
     "ingredients": "Ingredients",
     "used_as_substitute_for": "Used as a substitute for",
-    "can_be_substituted_with": "Can be substituted with"
+    "can_be_substituted_with": "Can be substituted with",
+    "add-to-bar-shelf": "Add to bar shelf",
+    "remove-from-bar-shelf": "Remove from bar shelf",
+    "shelf-bar-help": "Recipes matching ingredients in bar shelf will be shown to all bar members.",
+    "shelf-user-help": "Recipes matching ingredients in your shelf can only be managed by you.",
+    "bar-shelf-add-success": "Added \"{name}\" to bar shelf",
+    "bar-shelf-remove-success": "Removed \"{name}\" from bar shelf"
   },
   "share": {
     "title": "Share",
@@ -262,7 +268,7 @@
   "clear-filters": "Clear all filters",
   "rating-removed": "Removed cocktail rating",
   "rating-rated": "Cocktail rated with {rating} stars",
-  "shelf-ingredients": "Shelf ingredients",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Shopping list ingredients",
   "notes": "Notes",
   "collection-shared": "Shared with bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisioning",
     "confirm-activation": "Are you sure you want to activate \"{name}\"? On free plan you can have only one bar activated, you will not be able to activate any other bars.",
     "activation-success": "Bar activated",
-    "members": "Bar members"
+    "members": "Bar members",
+    "logo": "Bar logo"
   },
   "close": "Close",
   "save-as": "Save as",
@@ -418,7 +425,7 @@
     "type-json-description": "Import from JSON format",
     "type-yaml-description": "Import from YAML format",
     "type-collection-description": "Import from Bar Assistant JSON collection",
-    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created. Common units are automatically converted to \"ml\". Depending on collection size, importing can take a few minutes."
+    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created."
   },
   "remove-from-bar": "Remove from bar",
   "public-shelves": "Public shelves",
@@ -575,7 +582,8 @@
     "add": "Add cocktail",
     "copy-action": "Duplicate and edit",
     "copy-success": "Cocktail duplicated",
-    "source": "Cocktail source"
+    "source": "Cocktail source",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Alcohol by volume",
   "ingredient-category": {},
@@ -599,5 +607,9 @@
   "target-volume": "Target volume",
   "target-volume-dilution": "Optional dilution",
   "scale-recipe": "Scale recipe",
-  "target-volume-dilution-help": "Dilute with {total} of water"
+  "target-volume-dilution-help": "Dilute with {total} of water",
+  "bar_shelf": {
+    "cocktails": "Bar shelf cocktails"
+  },
+  "bar-shelf-ingredients": "Bar shelf ingredients"
 }
diff --git a/src/locales/messages/da-DK.json b/src/locales/messages/da-DK.json
@@ -26,7 +26,7 @@
     "add": "Add ingredient",
     "on-shopping-list": "You have this ingredient on shopping list",
     "add-to-shelf": "Add to shelf",
-    "remove-from-shelf": "Remove from shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Add to shopping list",
     "remove-from-list": "Remove from shopping list",
     "update-success": "Ingredient updated successfully",
@@ -61,7 +61,13 @@
     "variety-note": "Recipe matching will include the parent ingredient as a substitute (depending on user settings)",
     "ingredients": "Ingredients",
     "used_as_substitute_for": "Used as a substitute for",
-    "can_be_substituted_with": "Can be substituted with"
+    "can_be_substituted_with": "Can be substituted with",
+    "add-to-bar-shelf": "Add to bar shelf",
+    "remove-from-bar-shelf": "Remove from bar shelf",
+    "shelf-bar-help": "Recipes matching ingredients in bar shelf will be shown to all bar members.",
+    "shelf-user-help": "Recipes matching ingredients in your shelf can only be managed by you.",
+    "bar-shelf-add-success": "Added \"{name}\" to bar shelf",
+    "bar-shelf-remove-success": "Removed \"{name}\" from bar shelf"
   },
   "share": {
     "title": "Share",
@@ -262,7 +268,7 @@
   "clear-filters": "Clear all filters",
   "rating-removed": "Removed cocktail rating",
   "rating-rated": "Cocktail rated with {rating} stars",
-  "shelf-ingredients": "Shelf ingredients",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Shopping list ingredients",
   "notes": "Notes",
   "collection-shared": "Shared with bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisioning",
     "confirm-activation": "Are you sure you want to activate \"{name}\"? On free plan you can have only one bar activated, you will not be able to activate any other bars.",
     "activation-success": "Bar activated",
-    "members": "Bar members"
+    "members": "Bar members",
+    "logo": "Bar logo"
   },
   "close": "Close",
   "save-as": "Save as",
@@ -418,7 +425,7 @@
     "type-json-description": "Import from JSON format",
     "type-yaml-description": "Import from YAML format",
     "type-collection-description": "Import from Bar Assistant JSON collection",
-    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created. Common units are automatically converted to \"ml\". Depending on collection size, importing can take a few minutes."
+    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created."
   },
   "remove-from-bar": "Remove from bar",
   "public-shelves": "Public shelves",
@@ -575,7 +582,8 @@
     "add": "Add cocktail",
     "copy-action": "Duplicate and edit",
     "copy-success": "Cocktail duplicated",
-    "source": "Cocktail source"
+    "source": "Cocktail source",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Alcohol by volume",
   "ingredient-category": {},
@@ -599,5 +607,9 @@
   "target-volume": "Target volume",
   "target-volume-dilution": "Optional dilution",
   "scale-recipe": "Scale recipe",
-  "target-volume-dilution-help": "Dilute with {total} of water"
+  "target-volume-dilution-help": "Dilute with {total} of water",
+  "bar_shelf": {
+    "cocktails": "Bar shelf cocktails"
+  },
+  "bar-shelf-ingredients": "Bar shelf ingredients"
 }
diff --git a/src/locales/messages/de-DE.json b/src/locales/messages/de-DE.json
@@ -25,8 +25,8 @@
     "main": "Hauptzutaten",
     "add": "Zutat hinzufügen",
     "on-shopping-list": "Du hast diese auf deiner Einkaufsliste",
-    "add-to-shelf": "Zum Regal hinzufügen",
-    "remove-from-shelf": "Aus dem Regal löschen",
+    "add-to-shelf": "Add to your shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Zur Einkaufsliste hinzufügen",
     "remove-from-list": "Von der Einkaufsliste entfernen",
     "update-success": "Zutat aktualisiert",
@@ -61,7 +61,13 @@
     "variety-note": "Recipe matching will include the parent ingredient as a substitute (depending on user settings)",
     "ingredients": "Zutaten",
     "used_as_substitute_for": "Used as a substitute for",
-    "can_be_substituted_with": "Can be substituted with"
+    "can_be_substituted_with": "Can be substituted with",
+    "add-to-bar-shelf": "Add to bar shelf",
+    "remove-from-bar-shelf": "Remove from bar shelf",
+    "shelf-bar-help": "Recipes matching ingredients in bar shelf will be shown to all bar members.",
+    "shelf-user-help": "Recipes matching ingredients in your shelf can only be managed by you.",
+    "bar-shelf-add-success": "Added \"{name}\" to bar shelf",
+    "bar-shelf-remove-success": "Removed \"{name}\" from bar shelf"
   },
   "share": {
     "title": "Aktie",
@@ -262,7 +268,7 @@
   "clear-filters": "Filter zurücksetzen",
   "rating-removed": "Bewertung zurücksetzen",
   "rating-rated": "Cocktails mit {rating} sternen bewertet",
-  "shelf-ingredients": "Zutaten im Regal",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Zutaten auf der Einkaufsliste",
   "notes": "Notizen",
   "collection-shared": "Shared with bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisioning",
     "confirm-activation": "Are you sure you want to activate \"{name}\"? On free plan you can have only one bar activated, you will not be able to activate any other bars.",
     "activation-success": "Bar aktiviert",
-    "members": "Bar-Mitglieder"
+    "members": "Bar-Mitglieder",
+    "logo": "Bar logo"
   },
   "close": "Schließen",
   "save-as": "Speichern unter",
@@ -575,7 +582,8 @@
     "add": "Neuer Cocktail",
     "copy-action": "Kopieren und bearbeiten",
     "copy-success": "Cocktail kopiert",
-    "source": "Cocktail Herkunft"
+    "source": "Cocktail Herkunft",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Volumenprozent Alkohol",
   "ingredient-category": {},
@@ -599,5 +607,9 @@
   "target-volume": "Target volume",
   "target-volume-dilution": "Optional dilution",
   "scale-recipe": "Scale recipe",
-  "target-volume-dilution-help": "Dilute with {total} of water"
+  "target-volume-dilution-help": "Dilute with {total} of water",
+  "bar_shelf": {
+    "cocktails": "Bar shelf cocktails"
+  },
+  "bar-shelf-ingredients": "Bar shelf ingredients"
 }
diff --git a/src/locales/messages/el-GR.json b/src/locales/messages/el-GR.json
@@ -26,7 +26,7 @@
     "add": "Add ingredient",
     "on-shopping-list": "You have this ingredient on shopping list",
     "add-to-shelf": "Add to shelf",
-    "remove-from-shelf": "Remove from shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Add to shopping list",
     "remove-from-list": "Remove from shopping list",
     "update-success": "Ingredient updated successfully",
@@ -61,7 +61,13 @@
     "variety-note": "Recipe matching will include the parent ingredient as a substitute (depending on user settings)",
     "ingredients": "Ingredients",
     "used_as_substitute_for": "Used as a substitute for",
-    "can_be_substituted_with": "Can be substituted with"
+    "can_be_substituted_with": "Can be substituted with",
+    "add-to-bar-shelf": "Add to bar shelf",
+    "remove-from-bar-shelf": "Remove from bar shelf",
+    "shelf-bar-help": "Recipes matching ingredients in bar shelf will be shown to all bar members.",
+    "shelf-user-help": "Recipes matching ingredients in your shelf can only be managed by you.",
+    "bar-shelf-add-success": "Added \"{name}\" to bar shelf",
+    "bar-shelf-remove-success": "Removed \"{name}\" from bar shelf"
   },
   "share": {
     "title": "Share",
@@ -262,7 +268,7 @@
   "clear-filters": "Clear all filters",
   "rating-removed": "Removed cocktail rating",
   "rating-rated": "Cocktail rated with {rating} stars",
-  "shelf-ingredients": "Shelf ingredients",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Shopping list ingredients",
   "notes": "Notes",
   "collection-shared": "Shared with bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisioning",
     "confirm-activation": "Are you sure you want to activate \"{name}\"? On free plan you can have only one bar activated, you will not be able to activate any other bars.",
     "activation-success": "Bar activated",
-    "members": "Bar members"
+    "members": "Bar members",
+    "logo": "Bar logo"
   },
   "close": "Close",
   "save-as": "Save as",
@@ -418,7 +425,7 @@
     "type-json-description": "Import from JSON format",
     "type-yaml-description": "Import from YAML format",
     "type-collection-description": "Import from Bar Assistant JSON collection",
-    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created. Common units are automatically converted to \"ml\". Depending on collection size, importing can take a few minutes."
+    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created."
   },
   "remove-from-bar": "Remove from bar",
   "public-shelves": "Public shelves",
@@ -575,7 +582,8 @@
     "add": "Add cocktail",
     "copy-action": "Duplicate and edit",
     "copy-success": "Cocktail duplicated",
-    "source": "Cocktail source"
+    "source": "Cocktail source",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Alcohol by volume",
   "ingredient-category": {},
@@ -599,5 +607,9 @@
   "target-volume": "Target volume",
   "target-volume-dilution": "Optional dilution",
   "scale-recipe": "Scale recipe",
-  "target-volume-dilution-help": "Dilute with {total} of water"
+  "target-volume-dilution-help": "Dilute with {total} of water",
+  "bar_shelf": {
+    "cocktails": "Bar shelf cocktails"
+  },
+  "bar-shelf-ingredients": "Bar shelf ingredients"
 }
diff --git a/src/locales/messages/es-ES.json b/src/locales/messages/es-ES.json
@@ -26,7 +26,7 @@
     "add": "Add ingredient",
     "on-shopping-list": "You have this ingredient on shopping list",
     "add-to-shelf": "Add to shelf",
-    "remove-from-shelf": "Remove from shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Add to shopping list",
     "remove-from-list": "Remove from shopping list",
     "update-success": "Ingredient updated successfully",
@@ -61,7 +61,13 @@
     "variety-note": "Recipe matching will include the parent ingredient as a substitute (depending on user settings)",
     "ingredients": "Ingredients",
     "used_as_substitute_for": "Used as a substitute for",
-    "can_be_substituted_with": "Can be substituted with"
+    "can_be_substituted_with": "Can be substituted with",
+    "add-to-bar-shelf": "Add to bar shelf",
+    "remove-from-bar-shelf": "Remove from bar shelf",
+    "shelf-bar-help": "Recipes matching ingredients in bar shelf will be shown to all bar members.",
+    "shelf-user-help": "Recipes matching ingredients in your shelf can only be managed by you.",
+    "bar-shelf-add-success": "Added \"{name}\" to bar shelf",
+    "bar-shelf-remove-success": "Removed \"{name}\" from bar shelf"
   },
   "share": {
     "title": "Share",
@@ -262,7 +268,7 @@
   "clear-filters": "Clear all filters",
   "rating-removed": "Removed cocktail rating",
   "rating-rated": "Cocktail rated with {rating} stars",
-  "shelf-ingredients": "Shelf ingredients",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Shopping list ingredients",
   "notes": "Notes",
   "collection-shared": "Shared with bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisioning",
     "confirm-activation": "Are you sure you want to activate \"{name}\"? On free plan you can have only one bar activated, you will not be able to activate any other bars.",
     "activation-success": "Bar activated",
-    "members": "Bar members"
+    "members": "Bar members",
+    "logo": "Bar logo"
   },
   "close": "Close",
   "save-as": "Save as",
@@ -418,7 +425,7 @@
     "type-json-description": "Import from JSON format",
     "type-yaml-description": "Import from YAML format",
     "type-collection-description": "Import from Bar Assistant JSON collection",
-    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created. Common units are automatically converted to \"ml\". Depending on collection size, importing can take a few minutes."
+    "notice": "Existing ingredients, methods and glassware will be matched by their name (case insensitive). If ingredient does not exist, it will be created."
   },
   "remove-from-bar": "Remove from bar",
   "public-shelves": "Public shelves",
@@ -575,7 +582,8 @@
     "add": "Add cocktail",
     "copy-action": "Duplicate and edit",
     "copy-success": "Cocktail duplicated",
-    "source": "Cocktail source"
+    "source": "Cocktail source",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Alcohol by volume",
   "ingredient-category": {},
@@ -599,5 +607,9 @@
   "target-volume": "Target volume",
   "target-volume-dilution": "Optional dilution",
   "scale-recipe": "Scale recipe",
-  "target-volume-dilution-help": "Dilute with {total} of water"
+  "target-volume-dilution-help": "Dilute with {total} of water",
+  "bar_shelf": {
+    "cocktails": "Bar shelf cocktails"
+  },
+  "bar-shelf-ingredients": "Bar shelf ingredients"
 }