diff --git a/src/locales/messages/cs-CZ.json b/src/locales/messages/cs-CZ.json
index cf5623bf..370384c2 100644
--- 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
index cf5623bf..370384c2 100644
--- 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
index 4bed053c..cdc95169 100644
--- 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
index cf5623bf..370384c2 100644
--- 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
index cf5623bf..370384c2 100644
--- 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"
 }
diff --git a/src/locales/messages/fi-FI.json b/src/locales/messages/fi-FI.json
index cf5623bf..370384c2 100644
--- a/src/locales/messages/fi-FI.json
+++ b/src/locales/messages/fi-FI.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/fr-FR.json b/src/locales/messages/fr-FR.json
index ac6d86af..0af999b1 100644
--- a/src/locales/messages/fr-FR.json
+++ b/src/locales/messages/fr-FR.json
@@ -26,7 +26,7 @@
     "add": "Ajouter un ingrédient",
     "on-shopping-list": "Vous avez cet ingrédient sur la liste de courses",
     "add-to-shelf": "Ajouter à l’étagère",
-    "remove-from-shelf": "Retirer de l’étagère",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Ajouter à la liste de courses",
     "remove-from-list": "Supprimer de la liste de courses",
     "update-success": "Ingrédient mis à jour avec succès",
@@ -61,7 +61,13 @@
     "variety-note": "La correspondance des recettes inclura l'ingrédient parent comme substitut (selon les paramètres de l'utilisateur)",
     "ingredients": "Ingrédients",
     "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": "Partager",
@@ -262,7 +268,7 @@
   "clear-filters": "Effacer tous les filtres",
   "rating-removed": "Suppression de la note cocktail",
   "rating-rated": "Cocktail noté avec {rating} étoiles",
-  "shelf-ingredients": "Ingrédients de rayon",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Ingrédients de la liste de courses",
   "notes": "Remarques",
   "collection-shared": "Partagé avec le bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisionnement",
     "confirm-activation": "Êtes-vous sûr de vouloir activer \"{name}\" ? Avec la formule gratuite, vous ne pouvez avoir qu'un seul bar actif, vous ne pourrez pas activer d'autres bars.",
     "activation-success": "Bar activé",
-    "members": "Membres du bar"
+    "members": "Membres du bar",
+    "logo": "Bar logo"
   },
   "close": "Fermer",
   "save-as": "Enregistrer sous",
@@ -418,7 +425,7 @@
     "type-json-description": "Importer à partir du format JSON",
     "type-yaml-description": "Importer à partir du format YAML",
     "type-collection-description": "Importation depuis une collection JSON de Bar Assistant",
-    "notice": "Les ingrédients existants et le verre seront assortis par leur nom (insensible à la casse). Si l’ingrédient ou le verre n’existe pas, il sera créé. Les unités communes sont automatiquement converties en \"ml\"."
+    "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": "Supprimer du bar",
   "public-shelves": "Étagères publiques",
@@ -575,7 +582,8 @@
     "add": "Ajouter un cocktail",
     "copy-action": "Dupliquer et modifier",
     "copy-success": "Cocktail dupliqué",
-    "source": "Source cocktail"
+    "source": "Source cocktail",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Alcool par 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/hr-HR.json b/src/locales/messages/hr-HR.json
index 7f097232..b8e9110f 100644
--- a/src/locales/messages/hr-HR.json
+++ b/src/locales/messages/hr-HR.json
@@ -25,8 +25,8 @@
     "main": "Glavni sastojak",
     "add": "Dodaj sastojak",
     "on-shopping-list": "Ovaj sastojak je na popisu za kupovinu",
-    "add-to-shelf": "Dodaj na policu",
-    "remove-from-shelf": "Ukloni s police",
+    "add-to-shelf": "Add to your shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Dodaj na popis za kupovinu",
     "remove-from-list": "Ukloni s popisa za kupovinu",
     "update-success": "Sastojak uspješno uređen",
@@ -61,7 +61,13 @@
     "variety-note": "Recepti koje možete napraviti uključuju matični sastojak kao zamjenu (oovisno o postavkama korisnika)",
     "ingredients": "Sastojci",
     "used_as_substitute_for": "Koristi se kao zamjena za",
-    "can_be_substituted_with": "Može se zamijeniti sa"
+    "can_be_substituted_with": "Može se zamijeniti sa",
+    "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": "Podijeli",
@@ -262,7 +268,7 @@
   "clear-filters": "Poništi filtere",
   "rating-removed": "Ocjena uklonjena",
   "rating-rated": "Koktel ocijenjen sa ocjenom {rating}",
-  "shelf-ingredients": "Sastojci u polici",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Sastojci na popisu za kupovinu",
   "notes": "Bilješke",
   "collection-shared": "Podijeljeno s barom",
@@ -393,7 +399,8 @@
     "status-provisioning": "Procesuiranje",
     "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 aktiviran",
-    "members": "Članovi bara"
+    "members": "Članovi bara",
+    "logo": "Bar logo"
   },
   "close": "Zatvori",
   "save-as": "Spremi kao",
@@ -575,7 +582,8 @@
     "add": "Dodaj koktel",
     "copy-action": "Udvostruči i uredi",
     "copy-success": "Koktel dupliciran",
-    "source": "Izvor koktela"
+    "source": "Izvor koktela",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Postotak alkohola",
   "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/hu-HU.json b/src/locales/messages/hu-HU.json
index cf5623bf..370384c2 100644
--- a/src/locales/messages/hu-HU.json
+++ b/src/locales/messages/hu-HU.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/it-IT.json b/src/locales/messages/it-IT.json
index 1600b013..5c40ca25 100644
--- a/src/locales/messages/it-IT.json
+++ b/src/locales/messages/it-IT.json
@@ -25,8 +25,8 @@
     "main": "Ingrediente principale",
     "add": "Aggiungi ingrediente",
     "on-shopping-list": "Hai questo ingrediente nella lista della spesa",
-    "add-to-shelf": "Aggiungi alla dispensa",
-    "remove-from-shelf": "Rimuovi dalla dispensa",
+    "add-to-shelf": "Add to your shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Aggiungi alla lista della spesa",
     "remove-from-list": "Rimuovi dalla lista della spesa",
     "update-success": "Ingrediente aggiornato con successo",
@@ -61,7 +61,13 @@
     "variety-note": "La ricerca delle ricette includerà l'ingrediente base come sostituto (a seconda delle impostazioni dell'utente)",
     "ingredients": "Ingredienti",
     "used_as_substitute_for": "Utilizzato come sostituto di",
-    "can_be_substituted_with": "Può essere sostituito con"
+    "can_be_substituted_with": "Può essere sostituito con",
+    "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": "Condividi",
@@ -262,7 +268,7 @@
   "clear-filters": "Cancella tutti i filtri",
   "rating-removed": "Valutazione cocktail rimossa",
   "rating-rated": "Cocktail valutato con {rating} stelle",
-  "shelf-ingredients": "Ingredienti in dispensa",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Ingredienti lista della spesa",
   "notes": "Note",
   "collection-shared": "Condiviso con il bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisionamento",
     "confirm-activation": "Sei sicuro di voler attivare \"{name}\"? Sul piano gratuito puoi solo avere un bar attivo, non sarai in grado di attivare altri bar.",
     "activation-success": "Bar attivato",
-    "members": "Membri del bar"
+    "members": "Membri del bar",
+    "logo": "Bar logo"
   },
   "close": "Chiudi",
   "save-as": "Salva come",
@@ -575,7 +582,8 @@
     "add": "Aggiungi cocktail",
     "copy-action": "Duplica e modifica",
     "copy-success": "Cocktail duplicato",
-    "source": "Sorgente cocktail"
+    "source": "Sorgente cocktail",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Gradi alcolici",
   "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/nl-NL.json b/src/locales/messages/nl-NL.json
index cf5623bf..370384c2 100644
--- a/src/locales/messages/nl-NL.json
+++ b/src/locales/messages/nl-NL.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/no-NO.json b/src/locales/messages/no-NO.json
index cf5623bf..370384c2 100644
--- a/src/locales/messages/no-NO.json
+++ b/src/locales/messages/no-NO.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/pl-PL.json b/src/locales/messages/pl-PL.json
index 790f6f48..d0dd98a3 100644
--- a/src/locales/messages/pl-PL.json
+++ b/src/locales/messages/pl-PL.json
@@ -26,7 +26,7 @@
     "add": "Dodaj składnik",
     "on-shopping-list": "Masz ten składnik na liście zakupów",
     "add-to-shelf": "Dodaj do półki",
-    "remove-from-shelf": "Usuń z półki",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Dodaj do listy zakupów",
     "remove-from-list": "Usuń z listy zakupów",
     "update-success": "Składnik został pomyślnie zaktualizowany",
@@ -61,7 +61,13 @@
     "variety-note": "Recipe matching will include the parent ingredient as a substitute (depending on user settings)",
     "ingredients": "Składniki",
     "used_as_substitute_for": "Used as a substitute for",
-    "can_be_substituted_with": "Można zamienić na"
+    "can_be_substituted_with": "Można zamienić na",
+    "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": "Udostępnij",
@@ -262,7 +268,7 @@
   "clear-filters": "Wyczyść wszystkie filtry",
   "rating-removed": "Usunięto ocenę koktajlu",
   "rating-rated": "Koktajl z oceną {rating} gwiazdek",
-  "shelf-ingredients": "Półka ze składnikami",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Lista zakupów składników",
   "notes": "Notatki",
   "collection-shared": "Wspólnie z barem",
@@ -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": "Dodaj koktajl",
     "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": "Alkohol objętościowo",
   "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/pt-PT.json b/src/locales/messages/pt-PT.json
index 0b81603a..c6f5df0b 100644
--- a/src/locales/messages/pt-PT.json
+++ b/src/locales/messages/pt-PT.json
@@ -26,7 +26,7 @@
     "add": "Adicionar ingrediente",
     "on-shopping-list": "Você tem este ingrediente na lista de compras",
     "add-to-shelf": "Adicionar à prateleira",
-    "remove-from-shelf": "Remover da prateleira",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Adicionar à lista de compras",
     "remove-from-list": "Remover da lista de compras",
     "update-success": "Ingrediente atualizado com sucesso",
@@ -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/ro-RO.json b/src/locales/messages/ro-RO.json
index cf5623bf..370384c2 100644
--- a/src/locales/messages/ro-RO.json
+++ b/src/locales/messages/ro-RO.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/sv-SE.json b/src/locales/messages/sv-SE.json
index 80c9af49..a5d087ee 100644
--- a/src/locales/messages/sv-SE.json
+++ b/src/locales/messages/sv-SE.json
@@ -25,8 +25,8 @@
     "main": "Huvudingrediens",
     "add": "Lägg till ingrediens",
     "on-shopping-list": "Du har den här ingrediensen på din inköpslista",
-    "add-to-shelf": "Lägg till på hylla",
-    "remove-from-shelf": "Ta bort från hylla",
+    "add-to-shelf": "Add to your shelf",
+    "remove-from-shelf": "Remove from your shelf",
     "add-to-list": "Lägg till på inköpslista",
     "remove-from-list": "Ta bort från inköpslista",
     "update-success": "Ingrediens har uppdaterats",
@@ -61,7 +61,13 @@
     "variety-note": "Recept matchning kommer innehålla föräldraingrediensen som ett substitut (beroende på användarinställningar)",
     "ingredients": "Ingredienser",
     "used_as_substitute_for": "Används som ersättning för",
-    "can_be_substituted_with": "Kan ersättas med"
+    "can_be_substituted_with": "Kan ersättas med",
+    "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": "Dela",
@@ -262,7 +268,7 @@
   "clear-filters": "Töm alla filter",
   "rating-removed": "Tog bort drinkens betyg",
   "rating-rated": "Drinkar betygsatta med {rating} stjärnor",
-  "shelf-ingredients": "Ingredienser på hyllan",
+  "shelf-ingredients": "My shelf ingredients",
   "shopping-list-ingredients": "Ingredienser på inköpslistan",
   "notes": "Anteckningar",
   "collection-shared": "Delad med bar",
@@ -393,7 +399,8 @@
     "status-provisioning": "Provisionering",
     "confirm-activation": "Är du säker på att du vill aktivera baren \"{name}\"? I gratisversionen kan du bara ha en bar aktiverad. Du kommer inte kunna aktivera någon annan bar.",
     "activation-success": "Baren aktiverad",
-    "members": "Barens medlemmar"
+    "members": "Barens medlemmar",
+    "logo": "Bar logo"
   },
   "close": "Stäng",
   "save-as": "Spara som",
@@ -575,7 +582,8 @@
     "add": "Lägg till drink",
     "copy-action": "Duplicera och redigera",
     "copy-success": "Drinken duplicerad",
-    "source": "Källa till drinken"
+    "source": "Källa till drinken",
+    "confirm-copy": "This will create a copy of \"{name}\""
   },
   "ABV-definition": "Alkohol per volym",
   "ingredient-category": {},
@@ -599,5 +607,9 @@
   "target-volume": "Målvolym",
   "target-volume-dilution": "Frivillig utspädning",
   "scale-recipe": "Skala receptet",
-  "target-volume-dilution-help": "Späd ut med {total} mängd vatten"
+  "target-volume-dilution-help": "Späd ut med {total} mängd vatten",
+  "bar_shelf": {
+    "cocktails": "Bar shelf cocktails"
+  },
+  "bar-shelf-ingredients": "Bar shelf ingredients"
 }
diff --git a/src/locales/messages/zh-CN.json b/src/locales/messages/zh-CN.json
index cf5623bf..370384c2 100644
--- a/src/locales/messages/zh-CN.json
+++ b/src/locales/messages/zh-CN.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/zh-TW.json b/src/locales/messages/zh-TW.json
index cf5623bf..370384c2 100644
--- a/src/locales/messages/zh-TW.json
+++ b/src/locales/messages/zh-TW.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"
 }