Merge branch 'master' into wrath

Bartender4.lua

@@ -107,3 +107,33 @@ function Bartender4.modulePrototype:ToggleOptions()
 	end
 end
 Bartender4:SetDefaultModulePrototype(Bartender4.modulePrototype)
+
+local L_BT_LEFT = L["|cffffff00Click|r to toggle bar lock"]
+local L_BT_RIGHT = L["|cffffff00Right-click|r to open the options menu"]
+
+LibStub("LibDataBroker-1.1"):NewDataObject("Bartender4", {
+	type = "launcher",
+	text = "Bartender4",
+	OnClick = function(_, msg)
+		if msg == "LeftButton" then
+			if Bartender4.Locked then
+				Bartender4["Unlock"](Bartender4)
+			else
+				Bartender4["Lock"](Bartender4)
+			end
+		elseif msg == "RightButton" then
+			if LibStub("AceConfigDialog-3.0").OpenFrames["Bartender4"] then
+				LibStub("AceConfigDialog-3.0"):Close("Bartender4")
+			else
+				LibStub("AceConfigDialog-3.0"):Open("Bartender4")
+			end
+		end
+	end,
+	icon = "Interface\\Icons\\INV_Drink_05",
+	OnTooltipShow = function(tooltip)
+		if not tooltip or not tooltip.AddLine then return end
+		tooltip:AddLine("Bartender4")
+		tooltip:AddLine(L_BT_LEFT)
+		tooltip:AddLine(L_BT_RIGHT)
+	end,
+})

locale/deDE.lua

@@ -110,3 +110,5 @@ if not L then return end
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["Zoom"] = true
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true

locale/enUS.lua

@@ -110,3 +110,5 @@ L["Visibility"] = true
 L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 L["Zoom"] = true
+L["|cffffff00Click|r to toggle bar lock"] = true
+L["|cffffff00Right-click|r to open the options menu"] = true

locale/esES.lua

@@ -110,3 +110,5 @@ if not L then return end
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["Zoom"] = true
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true

locale/frFR.lua

@@ -110,3 +110,5 @@ L["Toggle the use of the right-click self-cast functionality."] = "Utilise ou no
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 L["Zoom"] = "Zoom"
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true

locale/koKR.lua

@@ -110,3 +110,5 @@ L["Toggle the use of the right-click self-cast functionality."] = "우-클릭시
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 L["Zoom"] = "확대"
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true

locale/ruRU.lua

@@ -110,3 +110,5 @@ L["Toggle the use of the right-click self-cast functionality."] = "Перекл
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 L["Zoom"] = "Увеличение"
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true

locale/zhCN.lua

@@ -110,3 +110,5 @@ L["Toggle the use of the right-click self-cast functionality."] = "关闭/开启
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 L["Zoom"] = "缩放"
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true

locale/zhTW.lua

@@ -110,3 +110,5 @@ L["Toggle the use of the right-click self-cast functionality."] = "切換使用
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 L["Zoom"] = "放大"
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true