From c1fa4143345e91f03e86ca386e943c29fa7cedfa Mon Sep 17 00:00:00 2001 From: Simpy Date: Thu, 9 Nov 2023 15:36:59 -0500 Subject: [PATCH 01/70] classic macro proc not showing (requires that other addon) --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 1fec69ee04..f8f2758b35 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1824,7 +1824,7 @@ function Update(self, fromUpdateConfig) if isTypeAction then local actionType, actionID, subType = GetActionInfo(self._state_action) local actionSpell, actionMacro, actionFlyout = actionType == 'spell', actionType == 'macro', actionType == 'flyout' - local macroSpell = (actionMacro and subType == 'spell') and actionID or nil + local macroSpell = actionMacro and ((WoWRetail and subType == 'spell' and actionID) or (not WoWRetail and GetMacroSpell(actionID))) or nil local spellID = (actionSpell and actionID) or macroSpell local spellName = spellID and GetSpellInfo(spellID) or nil @@ -2461,8 +2461,14 @@ Action.SetTooltip = function(self) return GameTooltip:SetAction(sel Action.GetSpellId = function(self) if self._state_type == "action" then local actionType, id, subType = GetActionInfo(self._state_action) - if actionType == "spell" or (actionType == "macro" and subType == "spell") then + if actionType == "spell" then return id + elseif actionType == "macro" then + if WoWRetail then + return (subType == "spell" and id) or nil + else + return (GetMacroSpell(id)) + end end end end From 7df941733eaa641c2d6cf98636ec53f51be8b521 Mon Sep 17 00:00:00 2001 From: Simpy Date: Thu, 9 Nov 2023 15:44:29 -0500 Subject: [PATCH 02/70] bump the ver --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index f8f2758b35..ca29519283 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1,7 +1,7 @@ -- License: LICENSE.txt local MAJOR_VERSION = "LibActionButton-1.0-ElvUI" -local MINOR_VERSION = 45 -- the real minor version is 107 +local MINOR_VERSION = 46 -- the real minor version is 107 local LibStub = LibStub if not LibStub then error(MAJOR_VERSION .. " requires LibStub.") end From 20fcd6e7c9adf817a74cb4385b5bc38eb0241df8 Mon Sep 17 00:00:00 2001 From: Simpy Date: Fri, 10 Nov 2023 16:41:42 -0500 Subject: [PATCH 03/70] masque cropping weird #1081 --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 0d5f20ffd8..d3c26af022 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -201,9 +201,9 @@ function AB:TrimIcon(button, masque) local icon = button.icon or button.Icon if not icon then return end - if not masque and button.db and not button.db.keepSizeRatio then + if button.db and not button.db.keepSizeRatio then icon:SetTexCoord(E:CropRatio(button, button.db.customCoords)) - else + elseif not masque then icon:SetTexCoord(unpack(E.TexCoords)) end end From b16822fecbd9d2587aca3b45b6ed22274a088430 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sat, 11 Nov 2023 03:16:22 -0500 Subject: [PATCH 04/70] ss --- ElvUI_Libraries/Core/LibAceConfigHelper/LibAceConfigHelper.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_Libraries/Core/LibAceConfigHelper/LibAceConfigHelper.lua b/ElvUI_Libraries/Core/LibAceConfigHelper/LibAceConfigHelper.lua index b12fdc00c9..535b0f4e48 100644 --- a/ElvUI_Libraries/Core/LibAceConfigHelper/LibAceConfigHelper.lua +++ b/ElvUI_Libraries/Core/LibAceConfigHelper/LibAceConfigHelper.lua @@ -64,7 +64,7 @@ function ACH:Execute(name, desc, order, func, image, confirm, width, get, set, d end function ACH:Group(name, desc, order, childGroups, get, set, disabled, hidden, func) - return { type = 'group', childGroups = childGroups, name = name, desc = desc, order = order, set = set, get = get, hidden = hidden, disabled = disabled, func = func, args = {} } + return { type = 'group', childGroups = childGroups, name = name, desc = desc, order = order, set = set, get = get, disabled = disabled, hidden = hidden, func = func, args = {} } end function ACH:Header(name, order, get, set, hidden) From 9893eabf898a1a2ae316f985aac51a060e0866fd Mon Sep 17 00:00:00 2001 From: Simpy Date: Sat, 11 Nov 2023 11:12:16 -0500 Subject: [PATCH 05/70] use the font itself for zone/sub zone --- ElvUI/Core/General/Fonts.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/General/Fonts.lua b/ElvUI/Core/General/Fonts.lua index 2bbdccc40a..213ee6efd3 100644 --- a/ElvUI/Core/General/Fonts.lua +++ b/ElvUI/Core/General/Fonts.lua @@ -7,8 +7,8 @@ local strsub = strsub local strmatch = strmatch local FontMap = { - worldzone = { object = _G.ZoneTextString }, - worldsubzone = { object = _G.SubZoneTextString }, + worldzone = { object = _G.ZoneTextFont }, + worldsubzone = { object = _G.SubZoneTextFont }, pvpzone = { object = _G.PVPArenaTextString }, pvpsubzone = { object = _G.PVPInfoTextString }, cooldown = { object = _G.SystemFont_Shadow_Large_Outline }, From 2a0e5a0166ca72dbb668757107d922277450fa4d Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 12 Nov 2023 15:35:35 -0500 Subject: [PATCH 06/70] use ACTION_USABLE_CHANGED on retail --- .../LibActionButton-1.0.lua | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index ca29519283..5bb1554e48 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -51,6 +51,10 @@ lib.activeButtons = lib.activeButtons or {} lib.actionButtons = lib.actionButtons or {} lib.nonActionButtons = lib.nonActionButtons or {} +-- usable state for retail using slot +lib.slotByButton = lib.slotByButton or {} +lib.buttonBySlot = lib.buttonBySlot or {} + local AuraButtons = lib.AuraButtons or { auras = {}, buttons = {} } lib.AuraButtons = AuraButtons @@ -1295,7 +1299,6 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("UPDATE_BINDINGS") lib.eventFrame:RegisterEvent("PLAYER_MOUNT_DISPLAY_CHANGED") lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_STATE") - lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_USABLE") lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN") lib.eventFrame:RegisterEvent("PLAYER_TARGET_CHANGED") lib.eventFrame:RegisterEvent("TRADE_SKILL_SHOW") @@ -1329,8 +1332,11 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("UPDATE_VEHICLE_ACTIONBAR") end - if not WoWRetail then - -- Needed for classics show grid.. ACTIONBAR_SHOWGRID fires with PET_BAR_SHOWGRID but ACTIONBAR_HIDEGRID doesn't fire with PET_BAR_HIDEGRID + if WoWRetail then + lib.eventFrame:RegisterEvent("ACTION_USABLE_CHANGED") + else + lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_USABLE") + -- Needed for classics show grid.. ACTIONBAR_SHOWGRID fires with PET_BAR_SHOWGRID but ACTIONBAR_HIDEGRID doesn't fire with PET_BAR_HIDEGRID lib.eventFrame:RegisterEvent("PET_BAR_HIDEGRID") end @@ -1419,6 +1425,13 @@ function OnEvent(frame, event, arg1, ...) elseif (event == "ACTIONBAR_UPDATE_STATE" or event == "UNIT_ENTERED_VEHICLE" or event == "UNIT_EXITED_VEHICLE") or (event == "TRADE_SKILL_SHOW" or event == "TRADE_SKILL_CLOSE" or event == "ARCHAEOLOGY_CLOSED" or event == "TRADE_CLOSED") then ForAllButtons(UpdateButtonState, true) + elseif event == "ACTION_USABLE_CHANGED" then + for _, change in ipairs(arg1) do + local button = lib.buttonBySlot[change.slot] + if button then + UpdateUsable(button, change.usable, change.noMana) + end + end elseif event == "ACTIONBAR_UPDATE_USABLE" then for button in next, ActionButtons do UpdateUsable(button) @@ -1748,7 +1761,18 @@ function Generic:UpdateAction(force) setmetatable(self, meta) self._state_type = actionType end + self._state_action = action + + if action then + lib.buttonBySlot[action] = self + else + local slot = lib.slotByButton[self] + if slot then + lib.buttonBySlot[slot] = nil + end + end + Update(self) end end @@ -1950,13 +1974,16 @@ function UpdateButtonState(self) lib.callbacks:Fire("OnButtonState", self) end -function UpdateUsable(self) +function UpdateUsable(self, isUsable, notEnoughMana) -- TODO: make the colors configurable -- TODO: allow disabling of the whole recoloring if self.config.outOfRangeColoring == "button" and self.outOfRange then self.icon:SetVertexColor(unpack(self.config.colors.range)) else - local isUsable, notEnoughMana = self:IsUsable() + if isUsable == nil or notEnoughMana == nil then + isUsable, notEnoughMana = self:IsUsable() + end + if isUsable then self.icon:SetVertexColor(unpack(self.config.colors.usable)) elseif notEnoughMana then From fb32ce00d38076a6441cba13f1872ae85a1750ed Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 12 Nov 2023 17:17:38 -0500 Subject: [PATCH 07/70] use ACTION_RANGE_CHECK_UPDATE on retail --- .../LibActionButton-1.0.lua | 132 +++++++++++------- 1 file changed, 81 insertions(+), 51 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 5bb1554e48..ccb2e4fb4c 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -148,6 +148,7 @@ local function GameTooltip_GetOwnerForbidden() if GameTooltip:IsForbidden() then return nil end + return GameTooltip:GetOwner() end @@ -581,6 +582,29 @@ function Generic:OnButtonEvent(event, key, down) end end +local function SetupRange(button, hasTexture) -- retail range event api ~Simpy + if hasTexture and button._state_type == 'action' then + local action = button._state_action + if action and not lib.buttonBySlot[action] then -- dont readd actions already added + lib.buttonBySlot[action] = button + lib.slotByButton[button] = action + + if WoWRetail then -- activate the event for slot + C_ActionBar.EnableActionRangeCheck(action, true) + end + end + else + local slot = lib.slotByButton[button] + if slot then + lib.buttonBySlot[slot] = nil + + if WoWRetail then -- deactivate event for slot (unused) + C_ActionBar.EnableActionRangeCheck(slot, false) + end + end + end +end + ----------------------------------------------------------- --- utility @@ -1334,6 +1358,7 @@ function InitializeEventHandler() if WoWRetail then lib.eventFrame:RegisterEvent("ACTION_USABLE_CHANGED") + lib.eventFrame:RegisterEvent("ACTION_RANGE_CHECK_UPDATE") else lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_USABLE") -- Needed for classics show grid.. ACTIONBAR_SHOWGRID fires with PET_BAR_SHOWGRID but ACTIONBAR_HIDEGRID doesn't fire with PET_BAR_HIDEGRID @@ -1417,6 +1442,7 @@ function OnEvent(frame, event, arg1, ...) if AURA_COOLDOWNS_ENABLED then UpdateAuraCooldowns() end + UpdateRangeTimer() elseif event == "UNIT_AURA" then if AURA_COOLDOWNS_ENABLED then @@ -1425,6 +1451,11 @@ function OnEvent(frame, event, arg1, ...) elseif (event == "ACTIONBAR_UPDATE_STATE" or event == "UNIT_ENTERED_VEHICLE" or event == "UNIT_EXITED_VEHICLE") or (event == "TRADE_SKILL_SHOW" or event == "TRADE_SKILL_CLOSE" or event == "ARCHAEOLOGY_CLOSED" or event == "TRADE_CLOSED") then ForAllButtons(UpdateButtonState, true) + elseif event == "ACTION_RANGE_CHECK_UPDATE" then + local button = lib.buttonBySlot[arg1] + if button then + UpdateRange(button, nil, ...) -- inRange, checksRange + end elseif event == "ACTION_USABLE_CHANGED" then for _, change in ipairs(arg1) do local button = lib.buttonBySlot[change.slot] @@ -1562,11 +1593,14 @@ local rangeTimer = -1 function OnUpdate(_, elapsed) flashTime = flashTime - elapsed rangeTimer = rangeTimer - elapsed + -- Run the loop only when there is something to update - if rangeTimer <= 0 or flashTime <= 0 then + local rangeReady = not WoWRetail and rangeTimer <= 0 + local flashReady = flashTime <= 0 + + if rangeReady or flashReady then for button in next, ActiveButtons do - -- Flashing - if button.flashing == 1 and flashTime <= 0 then + if flashReady and button.flashing == 1 then if button.Flash:IsShown() then button.Flash:Hide() else @@ -1574,17 +1608,16 @@ function OnUpdate(_, elapsed) end end - -- Range - if rangeTimer <= 0 then + if rangeReady then UpdateRange(button) -- Sezz end end - -- Update values - if flashTime <= 0 then + if flashReady then flashTime = flashTime + ATTACK_BUTTON_FLASH_TIME end - if rangeTimer <= 0 then + + if rangeReady then rangeTimer = TOOLTIP_UPDATE_TIME end end @@ -1623,9 +1656,9 @@ function UpdateGrid(self) end end -function UpdateRange(button, force) -- Sezz: moved from OnUpdate +function UpdateRange(button, force, inRange, checksRange) -- Sezz: moved from OnUpdate local oldRange = button.outOfRange - button.outOfRange = button:IsInRange() == false + button.outOfRange = ((inRange == nil or checksRange == nil) and button:IsInRange() == false) or (checksRange and not inRange) if force or (oldRange ~= button.outOfRange) then if button.config.outOfRangeColoring == "button" then @@ -1633,6 +1666,7 @@ function UpdateRange(button, force) -- Sezz: moved from OnUpdate elseif button.config.outOfRangeColoring == "hotkey" and not button.config.hideElements.hotkey then UpdateTextElement(button, button.HotKey, button.config.text.hotkey, NumberFontNormalSmallGray:GetFont(), true) end + lib.callbacks:Fire("OnUpdateRange", button) end end @@ -1764,15 +1798,6 @@ function Generic:UpdateAction(force) self._state_action = action - if action then - lib.buttonBySlot[action] = self - else - local slot = lib.slotByButton[self] - if slot then - lib.buttonBySlot[slot] = nil - end - end - Update(self) end end @@ -1844,37 +1869,12 @@ function Update(self, fromUpdateConfig) end end - local isTypeAction = self._state_type == 'action' - if isTypeAction then - local actionType, actionID, subType = GetActionInfo(self._state_action) - local actionSpell, actionMacro, actionFlyout = actionType == 'spell', actionType == 'macro', actionType == 'flyout' - local macroSpell = actionMacro and ((WoWRetail and subType == 'spell' and actionID) or (not WoWRetail and GetMacroSpell(actionID))) or nil - local spellID = (actionSpell and actionID) or macroSpell - local spellName = spellID and GetSpellInfo(spellID) or nil - - self.isFlyoutButton = actionFlyout - self.abilityName = spellName - AuraButtons.buttons[self] = spellName - - if spellName then - if not AuraButtons.auras[spellName] then - AuraButtons.auras[spellName] = {} - end - - tinsert(AuraButtons.auras[spellName], self) - end - else - self.isFlyoutButton = nil - self.abilityName = nil - end - -- Update icon and hotkey local texture = self:GetTexture() - if texture then self.icon:SetTexture(texture) self.icon:Show() - self.rangeTimer = - 1 + if WoWRetail then if not self.MasqueSkinned then self.SlotBackground:Hide() @@ -1908,7 +1908,7 @@ function Update(self, fromUpdateConfig) else self.icon:Hide() self.cooldown:Hide() - self.rangeTimer = nil + if WoWRetail then if not self.MasqueSkinned then self.SlotBackground:Show() @@ -1926,9 +1926,37 @@ function Update(self, fromUpdateConfig) end end + local isTypeAction = self._state_type == 'action' + if isTypeAction then + local actionType, actionID, subType = GetActionInfo(self._state_action) + local actionSpell, actionMacro, actionFlyout = actionType == 'spell', actionType == 'macro', actionType == 'flyout' + local macroSpell = actionMacro and ((WoWRetail and subType == 'spell' and actionID) or (not WoWRetail and GetMacroSpell(actionID))) or nil + local spellID = (actionSpell and actionID) or macroSpell + local spellName = spellID and GetSpellInfo(spellID) or nil + + self.isFlyoutButton = actionFlyout + self.abilityName = spellName + AuraButtons.buttons[self] = spellName + + if spellName then + if not AuraButtons.auras[spellName] then + AuraButtons.auras[spellName] = {} + end + + tinsert(AuraButtons.auras[spellName], self) + end + else + self.isFlyoutButton = nil + self.abilityName = nil + end + self:UpdateLocal() - UpdateRange(self, fromUpdateConfig) -- Sezz: update range check on state change + SetupRange(self, texture) -- we can call this on retail or not, only activates events on retail ~Simpy + + if not WoWRetail then + UpdateRange(self, fromUpdateConfig) -- Sezz: update range check on state change + end UpdateCount(self) @@ -2157,15 +2185,21 @@ function UpdateCooldown(self) lib.callbacks:Fire("OnCooldownUpdate", self, start, duration, modRate) end +function UpdateRangeTimer() + rangeTimer = -1 +end + function StartFlash(self) self.flashing = 1 flashTime = 0 + UpdateButtonState(self) end function StopFlash(self) self.flashing = 0 self.Flash:Hide() + UpdateButtonState(self) end @@ -2434,10 +2468,6 @@ else end Generic.UpdateFlyout = UpdateFlyout -function UpdateRangeTimer() - rangeTimer = -1 -end - ----------------------------------------------------------- --- WoW API mapping --- Generic Button From b5e94fafe7c56498531668b410c415d7fb3ba737 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 12 Nov 2023 17:46:23 -0500 Subject: [PATCH 08/70] handle flashing of each button rather than all buttons --- .../LibActionButton-1.0.lua | 69 +++++++++++-------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index ccb2e4fb4c..596e369e20 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1379,9 +1379,6 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("SPELL_FLYOUT_UPDATE") end - lib.eventFrame:Show() - lib.eventFrame:SetScript("OnUpdate", OnUpdate) - if UseCustomFlyout and IsLoggedIn() then DiscoverFlyoutSpells() end @@ -1443,7 +1440,11 @@ function OnEvent(frame, event, arg1, ...) UpdateAuraCooldowns() end - UpdateRangeTimer() + if not WoWRetail then + for button in next, ActiveButtons do + UpdateRangeTimer(button) + end + end elseif event == "UNIT_AURA" then if AURA_COOLDOWNS_ENABLED then UpdateAuraCooldowns() @@ -1588,37 +1589,33 @@ function OnEvent(frame, event, arg1, ...) end end -local flashTime = 0 -local rangeTimer = -1 -function OnUpdate(_, elapsed) - flashTime = flashTime - elapsed - rangeTimer = rangeTimer - elapsed +function Generic:OnUpdate(elapsed) + self.flashTime = (self.flashTime or 0) - elapsed + self.rangeTimer = (self.rangeTimer or 0) - elapsed -- Run the loop only when there is something to update - local rangeReady = not WoWRetail and rangeTimer <= 0 - local flashReady = flashTime <= 0 + local rangeReady = not WoWRetail and self.rangeTimer <= 0 + local flashReady = self.flashTime <= 0 if rangeReady or flashReady then - for button in next, ActiveButtons do - if flashReady and button.flashing == 1 then - if button.Flash:IsShown() then - button.Flash:Hide() - else - button.Flash:Show() - end + if flashReady and self.flashing == 1 then + if self.Flash:IsShown() then + self.Flash:Hide() + else + self.Flash:Show() end + end - if rangeReady then - UpdateRange(button) -- Sezz - end + if rangeReady then + UpdateRange(self) -- Sezz end if flashReady then - flashTime = flashTime + ATTACK_BUTTON_FLASH_TIME + self.flashTime = self.flashTime + ATTACK_BUTTON_FLASH_TIME end if rangeReady then - rangeTimer = TOOLTIP_UPDATE_TIME + self.rangeTimer = TOOLTIP_UPDATE_TIME end end end @@ -1872,6 +1869,7 @@ function Update(self, fromUpdateConfig) -- Update icon and hotkey local texture = self:GetTexture() if texture then + self:SetScript("OnUpdate", Generic.OnUpdate) self.icon:SetTexture(texture) self.icon:Show() @@ -1906,6 +1904,7 @@ function Update(self, fromUpdateConfig) end end else + self:SetScript("OnUpdate", nil) self.icon:Hide() self.cooldown:Hide() @@ -1999,6 +1998,7 @@ function UpdateButtonState(self) else self:SetChecked(false) end + lib.callbacks:Fire("OnButtonState", self) end @@ -2185,22 +2185,33 @@ function UpdateCooldown(self) lib.callbacks:Fire("OnCooldownUpdate", self, start, duration, modRate) end -function UpdateRangeTimer() - rangeTimer = -1 +function UpdateRangeTimer(self) + self.rangeTimer = -1 end function StartFlash(self) + local prevFlash = self.flashing + self.flashing = 1 - flashTime = 0 + self.flashTime = 0 - UpdateButtonState(self) + if prevFlash ~= self.flashing then + UpdateButtonState(self) + end end function StopFlash(self) + local prevFlash = self.flashing + self.flashing = 0 - self.Flash:Hide() - UpdateButtonState(self) + if self.Flash:IsShown() then + self.Flash:Hide() + end + + if prevFlash ~= self.flashing then + UpdateButtonState(self) + end end function UpdateFlash(self) From 1a341dcaf9be0d574a901ab5773f779750251382 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 12 Nov 2023 18:05:12 -0500 Subject: [PATCH 09/70] optimize flashing code a bit --- .../LibActionButton-1.0.lua | 34 ++++++------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 596e369e20..a778bfb790 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1526,7 +1526,7 @@ function OnEvent(frame, event, arg1, ...) end elseif event == "STOP_AUTOREPEAT_SPELL" then for button in next, ActiveButtons do - if button.flashing == 1 and not button:IsAttack() then + if button.flashing and not button:IsAttack() then StopFlash(button) end end @@ -1593,30 +1593,16 @@ function Generic:OnUpdate(elapsed) self.flashTime = (self.flashTime or 0) - elapsed self.rangeTimer = (self.rangeTimer or 0) - elapsed - -- Run the loop only when there is something to update - local rangeReady = not WoWRetail and self.rangeTimer <= 0 - local flashReady = self.flashTime <= 0 + if self.flashing and self.flashTime <= 0 then + self.Flash:SetShown(not self.Flash:IsShown()) - if rangeReady or flashReady then - if flashReady and self.flashing == 1 then - if self.Flash:IsShown() then - self.Flash:Hide() - else - self.Flash:Show() - end - end - - if rangeReady then - UpdateRange(self) -- Sezz - end + self.flashTime = self.flashTime + ATTACK_BUTTON_FLASH_TIME + end - if flashReady then - self.flashTime = self.flashTime + ATTACK_BUTTON_FLASH_TIME - end + if not WoWRetail and self.rangeTimer <= 0 then + UpdateRange(self) -- Sezz - if rangeReady then - self.rangeTimer = TOOLTIP_UPDATE_TIME - end + self.rangeTimer = TOOLTIP_UPDATE_TIME end end @@ -2192,7 +2178,7 @@ end function StartFlash(self) local prevFlash = self.flashing - self.flashing = 1 + self.flashing = true self.flashTime = 0 if prevFlash ~= self.flashing then @@ -2203,7 +2189,7 @@ end function StopFlash(self) local prevFlash = self.flashing - self.flashing = 0 + self.flashing = false if self.Flash:IsShown() then self.Flash:Hide() From 7cc1ac5236ca3b4fef35915ba3df3f3b47479d64 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 12 Nov 2023 20:51:17 -0500 Subject: [PATCH 10/70] test --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index a778bfb790..7688bed3ed 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1795,7 +1795,9 @@ function Update(self, fromUpdateConfig) ActionButtons[self] = nil NonActionButtons[self] = true end + self:SetAlpha(1.0) + UpdateButtonState(self) UpdateUsable(self) UpdateCooldown(self) @@ -1804,9 +1806,11 @@ function Update(self, fromUpdateConfig) ActiveButtons[self] = nil ActionButtons[self] = nil NonActionButtons[self] = nil + if gridCounter == 0 and not self.config.showGrid then self:SetAlpha(0.0) end + self.cooldown:Hide() self:SetChecked(false) @@ -1939,9 +1943,7 @@ function Update(self, fromUpdateConfig) SetupRange(self, texture) -- we can call this on retail or not, only activates events on retail ~Simpy - if not WoWRetail then - UpdateRange(self, fromUpdateConfig) -- Sezz: update range check on state change - end + UpdateRange(self, fromUpdateConfig) -- Sezz: update range check on state change UpdateCount(self) From e651b167fa1f7b5c81efe13551ac16bc5e0cf919 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 12 Nov 2023 21:56:02 -0500 Subject: [PATCH 11/70] allow updating over each other --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 7688bed3ed..67b6390d0a 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -585,7 +585,7 @@ end local function SetupRange(button, hasTexture) -- retail range event api ~Simpy if hasTexture and button._state_type == 'action' then local action = button._state_action - if action and not lib.buttonBySlot[action] then -- dont readd actions already added + if action then lib.buttonBySlot[action] = button lib.slotByButton[button] = action From a30e73f4b1aa92ac151f312ace474d2a5800e7fe Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 00:11:27 -0500 Subject: [PATCH 12/70] test 2 --- .../LibActionButton-1.0.lua | 84 +++++++++++++------ 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 67b6390d0a..e6c1a6cb33 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -10,8 +10,8 @@ if not lib then return end -- Lua functions local type, error, tostring, tonumber, assert, select = type, error, tostring, tonumber, assert, select -local setmetatable, wipe, unpack, pairs, next, strsub = setmetatable, wipe, unpack, pairs, next, strsub -local str_match, format, tinsert, tremove = string.match, format, tinsert, tremove +local setmetatable, wipe, unpack, pairs, ipairs, next, pcall = setmetatable, wipe, unpack, pairs, ipairs, next, pcall +local str_match, format, tinsert, tremove, strsub = string.match, format, tinsert, tremove, strsub local WoWRetail = (WOW_PROJECT_ID == WOW_PROJECT_MAINLINE) local WoWClassic = (WOW_PROJECT_ID == WOW_PROJECT_CLASSIC) @@ -53,7 +53,7 @@ lib.nonActionButtons = lib.nonActionButtons or {} -- usable state for retail using slot lib.slotByButton = lib.slotByButton or {} -lib.buttonBySlot = lib.buttonBySlot or {} +lib.buttonsBySlot = lib.buttonsBySlot or {} local AuraButtons = lib.AuraButtons or { auras = {}, buttons = {} } lib.AuraButtons = AuraButtons @@ -582,25 +582,49 @@ function Generic:OnButtonEvent(event, key, down) end end +local function WatchRange(button, slot) + if not lib.buttonsBySlot[slot] then + lib.buttonsBySlot[slot] = {} + end + + lib.buttonsBySlot[slot][button] = true + lib.slotByButton[button] = slot + + if WoWRetail then -- activate the event for slot + C_ActionBar.EnableActionRangeCheck(slot, true) + end +end + +local function ClearRange(button, slot) + local buttons = lib.buttonsBySlot[slot] + if buttons then + buttons[button] = nil + + if WoWRetail and not next(buttons) then -- deactivate event for slot (unused) + C_ActionBar.EnableActionRangeCheck(slot, false) + lib.buttonsBySlot[slot] = nil + end + end +end + local function SetupRange(button, hasTexture) -- retail range event api ~Simpy if hasTexture and button._state_type == 'action' then local action = button._state_action if action then - lib.buttonBySlot[action] = button - lib.slotByButton[button] = action - - if WoWRetail then -- activate the event for slot - C_ActionBar.EnableActionRangeCheck(action, true) + local slot = lib.slotByButton[button] + if not slot then -- new action + WatchRange(button, action) + elseif slot ~= action then -- changed action + WatchRange(button, action) -- add new action + ClearRange(button, slot) -- clear previous action end end - else + else -- remove old action local slot = lib.slotByButton[button] if slot then - lib.buttonBySlot[slot] = nil + lib.slotByButton[button] = nil - if WoWRetail then -- deactivate event for slot (unused) - C_ActionBar.EnableActionRangeCheck(slot, false) - end + ClearRange(button, slot) end end end @@ -1032,7 +1056,7 @@ if UseCustomFlyout then -- link the button to the header lib.flyoutHandler:SetFrameRef("flyoutButton" .. i, button) - table.insert(lib.FlyoutButtons, button) + tinsert(lib.FlyoutButtons, button) lib.callbacks:Fire("OnFlyoutButtonCreated", button) end @@ -1301,7 +1325,7 @@ function Generic:UpdateConfig(config) UpdateTextElements(self) UpdateHotkeys(self) UpdateGrid(self) - Update(self, true) + Update(self, 'UpdateConfig') end ----------------------------------------------------------- @@ -1403,7 +1427,7 @@ function OnEvent(frame, event, arg1, ...) for button in next, ButtonRegistry do if button._state_type == "action" and (arg1 == 0 or arg1 == tonumber(button._state_action)) then ClearNewActionHighlight(button._state_action, true, false) - Update(button) + Update(button, event) end end @@ -1453,15 +1477,21 @@ function OnEvent(frame, event, arg1, ...) or (event == "TRADE_SKILL_SHOW" or event == "TRADE_SKILL_CLOSE" or event == "ARCHAEOLOGY_CLOSED" or event == "TRADE_CLOSED") then ForAllButtons(UpdateButtonState, true) elseif event == "ACTION_RANGE_CHECK_UPDATE" then - local button = lib.buttonBySlot[arg1] - if button then - UpdateRange(button, nil, ...) -- inRange, checksRange + -- print('checked', arg1) + + local buttons = lib.buttonsBySlot[arg1] + if buttons then + for button in next, buttons do + UpdateRange(button, nil, ...) -- inRange, checksRange + end end elseif event == "ACTION_USABLE_CHANGED" then for _, change in ipairs(arg1) do - local button = lib.buttonBySlot[change.slot] - if button then - UpdateUsable(button, change.usable, change.noMana) + local buttons = lib.buttonsBySlot[change.slot] + if buttons then + for button in next, buttons do + UpdateUsable(button, change.usable, change.noMana) + end end end elseif event == "ACTIONBAR_UPDATE_USABLE" then @@ -1567,7 +1597,7 @@ function OnEvent(frame, event, arg1, ...) elseif event == "PLAYER_EQUIPMENT_CHANGED" then for button in next, ActiveButtons do if button._state_type == "item" then - Update(button) + Update(button, event) end end elseif event == "SPELL_UPDATE_CHARGES" then @@ -1781,11 +1811,11 @@ function Generic:UpdateAction(force) self._state_action = action - Update(self) + Update(self, 'UpdateAction') end end -function Update(self, fromUpdateConfig) +function Update(self, which) if self:HasAction() then ActiveButtons[self] = true if self._state_type == "action" then @@ -1943,7 +1973,7 @@ function Update(self, fromUpdateConfig) SetupRange(self, texture) -- we can call this on retail or not, only activates events on retail ~Simpy - UpdateRange(self, fromUpdateConfig) -- Sezz: update range check on state change + UpdateRange(self, which == 'UpdateConfig') -- Sezz: update range check on state change UpdateCount(self) @@ -1973,7 +2003,7 @@ function Update(self, fromUpdateConfig) end end - lib.callbacks:Fire("OnButtonUpdate", self) + lib.callbacks:Fire("OnButtonUpdate", self, which) end function Generic:UpdateLocal() From 886bb7ab9cc4ec9527b2ed5df0ab4cd3b81e66a3 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 00:12:09 -0500 Subject: [PATCH 13/70] split this --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index e6c1a6cb33..606358f237 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -600,8 +600,11 @@ local function ClearRange(button, slot) if buttons then buttons[button] = nil - if WoWRetail and not next(buttons) then -- deactivate event for slot (unused) - C_ActionBar.EnableActionRangeCheck(slot, false) + if not next(buttons) then -- deactivate event for slot (unused) + if WoWRetail then + C_ActionBar.EnableActionRangeCheck(slot, false) + end + lib.buttonsBySlot[slot] = nil end end From 675f690076deead40c2af3ba895c2b0552fdfb67 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 00:17:31 -0500 Subject: [PATCH 14/70] note --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 606358f237..9e9af9ec7d 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -582,6 +582,9 @@ function Generic:OnButtonEvent(event, key, down) end end +----------------------------------------------------------- +--- retail range event api ~Simpy + local function WatchRange(button, slot) if not lib.buttonsBySlot[slot] then lib.buttonsBySlot[slot] = {} @@ -610,7 +613,7 @@ local function ClearRange(button, slot) end end -local function SetupRange(button, hasTexture) -- retail range event api ~Simpy +local function SetupRange(button, hasTexture) if hasTexture and button._state_type == 'action' then local action = button._state_action if action then From 440e91a3bcf9620c79c761ff99ec56ac7ffd97e2 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 00:20:17 -0500 Subject: [PATCH 15/70] safety first --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 9e9af9ec7d..29df4a60f1 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1483,8 +1483,6 @@ function OnEvent(frame, event, arg1, ...) or (event == "TRADE_SKILL_SHOW" or event == "TRADE_SKILL_CLOSE" or event == "ARCHAEOLOGY_CLOSED" or event == "TRADE_CLOSED") then ForAllButtons(UpdateButtonState, true) elseif event == "ACTION_RANGE_CHECK_UPDATE" then - -- print('checked', arg1) - local buttons = lib.buttonsBySlot[arg1] if buttons then for button in next, buttons do @@ -1493,7 +1491,7 @@ function OnEvent(frame, event, arg1, ...) end elseif event == "ACTION_USABLE_CHANGED" then for _, change in ipairs(arg1) do - local buttons = lib.buttonsBySlot[change.slot] + local buttons = change.slot and lib.buttonsBySlot[change.slot] if buttons then for button in next, buttons do UpdateUsable(button, change.usable, change.noMana) From b3d994170328033cc9c4cccb5327d790b3ede35a Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 00:28:36 -0500 Subject: [PATCH 16/70] faster --- .../LibActionButton-1.0.lua | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 29df4a60f1..a9d1e417f8 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1624,19 +1624,24 @@ function OnEvent(frame, event, arg1, ...) end function Generic:OnUpdate(elapsed) - self.flashTime = (self.flashTime or 0) - elapsed - self.rangeTimer = (self.rangeTimer or 0) - elapsed + if self.flashing then + self.flashTime = (self.flashTime or 0) - elapsed - if self.flashing and self.flashTime <= 0 then - self.Flash:SetShown(not self.Flash:IsShown()) + if self.flashTime <= 0 then + self.Flash:SetShown(not self.Flash:IsShown()) - self.flashTime = self.flashTime + ATTACK_BUTTON_FLASH_TIME + self.flashTime = self.flashTime + ATTACK_BUTTON_FLASH_TIME + end end - if not WoWRetail and self.rangeTimer <= 0 then - UpdateRange(self) -- Sezz + if not WoWRetail then + self.rangeTimer = (self.rangeTimer or 0) - elapsed + + if self.rangeTimer <= 0 then + UpdateRange(self) -- Sezz - self.rangeTimer = TOOLTIP_UPDATE_TIME + self.rangeTimer = TOOLTIP_UPDATE_TIME + end end end From 7f151d121ffd22acd392949890d571588c9ffde5 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 00:31:49 -0500 Subject: [PATCH 17/70] clear the flashTime when its not being used --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index a9d1e417f8..51e342008f 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -2220,7 +2220,6 @@ function StartFlash(self) local prevFlash = self.flashing self.flashing = true - self.flashTime = 0 if prevFlash ~= self.flashing then UpdateButtonState(self) @@ -2231,6 +2230,7 @@ function StopFlash(self) local prevFlash = self.flashing self.flashing = false + self.flashTime = nil if self.Flash:IsShown() then self.Flash:Hide() From b4a901aef069d13b4e9f40b7db960b1c1e35331c Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 01:12:18 -0500 Subject: [PATCH 18/70] shut down hidden bars in LAB --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 34 +++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index d3c26af022..b4636c5f3d 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -233,6 +233,7 @@ function AB:PositionAndSizeBar(barName) local db = AB.db[barName] local bar = AB.handledBars[barName] + local enabled = db.enabled local buttonSpacing = db.buttonSpacing local backdropSpacing = db.backdropSpacing local buttonsPerRow = db.buttonsPerRow @@ -261,6 +262,7 @@ function AB:PositionAndSizeBar(barName) local _, horizontal, anchorUp, anchorLeft = AB:GetGrowth(point) local button, lastButton, lastColumnButton, anchorRowButton, lastShownButton + local vehicleIndex = (E.Retail or E.Wrath) and GetVehicleBarIndex() for i = 1, NUM_ACTIONBAR_BUTTONS do lastButton = bar.buttons[i-1] @@ -281,6 +283,7 @@ function AB:PositionAndSizeBar(barName) lastShownButton = button end + AB:HandleButtonState(button, i, vehicleIndex, enabled) AB:HandleButton(bar, button, i, lastButton, lastColumnButton) AB:StyleButton(button, nil, bar.MasqueGroup and E.private.actionbar.masque.actionbars) end @@ -298,7 +301,7 @@ function AB:PositionAndSizeBar(barName) RegisterStateDriver(bar, 'page', page) bar:SetAttribute('page', page) - if db.enabled then + if enabled then E:EnableMover(bar.mover.name) bar:Show() @@ -314,6 +317,24 @@ function AB:PositionAndSizeBar(barName) E:SetMoverSnapOffset('ElvAB_'..bar.id, db.buttonSpacing * 0.5) end +function AB:HandleButtonState(button, index, vehicleIndex, enabled) + if enabled then + button:SetState(0, 'action', index) + + for k = 1, 18 do + button:SetState(k, 'action', (k - 1) * 12 + index) + end + + if vehicleIndex and index == 12 then + button:SetState(vehicleIndex, 'custom', AB.customExitButton) + end + else + for k = 0, 18 do + button:SetState(k, 'empty') + end + end +end + function AB:CreateBar(id) local barName = 'ElvUI_Bar'..id local bar = CreateFrame('Frame', barName, E.UIParent, 'SecureHandlerStateTemplate') @@ -338,23 +359,12 @@ function AB:CreateBar(id) AB:HookScript(bar, 'OnEnter', 'Bar_OnEnter') AB:HookScript(bar, 'OnLeave', 'Bar_OnLeave') - local vehicleIndex = (E.Retail or E.Wrath) and GetVehicleBarIndex() - for i = 1, 12 do local button = LAB:CreateButton(i, format('%sButton%d', barName, i), bar) - button:SetState(0, 'action', i) button.AuraCooldown.targetAura = true E:RegisterCooldown(button.AuraCooldown, 'actionbar') - for k = 1, 18 do - button:SetState(k, 'action', (k - 1) * 12 + i) - end - - if vehicleIndex and i == 12 then - button:SetState(vehicleIndex, 'custom', AB.customExitButton) - end - if E.Retail then button.ProfessionQualityOverlayFrame = CreateFrame('Frame', nil, button, 'ActionButtonProfessionOverlayTemplate') end From bb0e9beeed9d322124057ea0b03d11274b2510eb Mon Sep 17 00:00:00 2001 From: Repooc Date: Mon, 13 Nov 2023 01:32:40 -0500 Subject: [PATCH 19/70] Dynamic Flight (aka Dragon Riding) Fader option poc for issue #849 --- ElvUI/Core/Defaults/Profile.lua | 1 + ElvUI/Core/Modules/UnitFrames/UnitFrames.lua | 4 ++++ ElvUI_Libraries/Core/oUF_Plugins/oUF_Fader.lua | 16 ++++++++++++++++ ElvUI_Options/Core/UnitFrames.lua | 15 ++++++++------- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/ElvUI/Core/Defaults/Profile.lua b/ElvUI/Core/Defaults/Profile.lua index 18f6b3d14f..cc2761f43b 100644 --- a/ElvUI/Core/Defaults/Profile.lua +++ b/ElvUI/Core/Defaults/Profile.lua @@ -2196,6 +2196,7 @@ P.unitframe.units.player.fader.playertarget = true P.unitframe.units.player.fader.power = true P.unitframe.units.player.fader.range = nil P.unitframe.units.player.fader.vehicle = true +P.unitframe.units.player.fader.dynamicflight = true P.unitframe.units.player.healPrediction.enable = true P.unitframe.units.player.health.position = 'LEFT' P.unitframe.units.player.health.text_format = '[healthcolor][health:current-percent:shortvalue]' diff --git a/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua b/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua index 7cb95907c1..a5db76178e 100644 --- a/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua +++ b/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua @@ -598,6 +598,10 @@ do -- IDs maintained in Difficulty Datatext and Nameplate StyleFilters fader:SetOption('MinAlpha', db.minAlpha) fader:SetOption('MaxAlpha', db.maxAlpha) + if frame == _G.ElvUF_Player then + fader:SetOption('DynamicFlight', db.dynamicflight) + end + if frame ~= _G.ElvUF_Player then fader:SetOption('Range', db.range) fader:SetOption('UnitTarget', db.unittarget) diff --git a/ElvUI_Libraries/Core/oUF_Plugins/oUF_Fader.lua b/ElvUI_Libraries/Core/oUF_Plugins/oUF_Fader.lua index 5935c3e5cc..9daef06099 100644 --- a/ElvUI_Libraries/Core/oUF_Plugins/oUF_Fader.lua +++ b/ElvUI_Libraries/Core/oUF_Plugins/oUF_Fader.lua @@ -23,6 +23,7 @@ local UnitHealthMax = UnitHealthMax local UnitPower = UnitPower local UnitPowerMax = UnitPowerMax local UnitPowerType = UnitPowerType +local C_PlayerInfo_GetGlidingInfo = C_PlayerInfo and C_PlayerInfo.GetGlidingInfo -- These variables will be left-over when disabled if they were used (for reuse later if they become re-enabled): ---- Fader.HoverHooked, Fader.TargetHooked @@ -61,6 +62,13 @@ local function updateInstanceDifficulty(element) element.InstancedCached = element.InstanceDifficulty and element.InstanceDifficulty[difficultyID] or nil end +local function CanGlide() + if not C_PlayerInfo_GetGlidingInfo then return end + + local _, canGlide = C_PlayerInfo_GetGlidingInfo() + return canGlide +end + local function Update(self, _, unit) local element = self.Fader if self.isForced or (not element or not element.count or element.count <= 0) then @@ -106,6 +114,7 @@ local function Update(self, _, unit) (element.Health and UnitHealth(unit) < UnitHealthMax(unit)) or (element.Power and (PowerTypesFull[powerType] and UnitPower(unit) < UnitPowerMax(unit))) or (element.Vehicle and (oUF.isRetail or oUF.isWrath) and UnitHasVehicleUI(unit)) or + (element.DynamicFlight and oUF.isRetail and not CanGlide()) or (element.Hover and GetMouseFocus() == (self.__faderobject or self)) then ToggleAlpha(self, element, element.MaxAlpha) @@ -301,6 +310,13 @@ local options = { if oUF.isRetail then tinsert(options.Casting.events, 'UNIT_SPELLCAST_EMPOWER_START') tinsert(options.Casting.events, 'UNIT_SPELLCAST_EMPOWER_STOP') + options.DynamicFlight = { + enable = function(self) + self:RegisterEvent('PLAYER_GAINS_VEHICLE_DATA', Update, true) + self:RegisterEvent('PLAYER_LOSES_VEHICLE_DATA', Update, true) + end, + events = {'PLAYER_GAINS_VEHICLE_DATA','PLAYER_LOSES_VEHICLE_DATA'} + } end if not oUF.isClassic then diff --git a/ElvUI_Options/Core/UnitFrames.lua b/ElvUI_Options/Core/UnitFrames.lua index 85d170eb22..7ec9a249a8 100644 --- a/ElvUI_Options/Core/UnitFrames.lua +++ b/ElvUI_Options/Core/UnitFrames.lua @@ -598,13 +598,14 @@ local function GetOptionsTable_Fader(updateFunc, groupName, numUnits) config.args.health = ACH:Toggle(L["Health"], nil, 8, nil, nil, nil, nil, nil, disabledOrRanged) config.args.power = ACH:Toggle(L["Power"], nil, 9, nil, nil, nil, nil, nil, disabledOrRanged) config.args.vehicle = ACH:Toggle(L["Vehicle"], nil, 10, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.casting = ACH:Toggle(L["Casting"], nil, 11, nil, nil, nil, nil, nil, disabledOrRanged) - - config.args.spacer1 = ACH:Spacer(12, 'full') - config.args.delay = ACH:Range(L["Fade Out Delay"], nil, 13, { min = 0, max = 3, step = 0.01 }, nil, nil, nil, disabledOrRanged) - config.args.smooth = ACH:Range(L["Smooth"], nil, 14, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) - config.args.minAlpha = ACH:Range(L["Min Alpha"], nil, 15, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) - config.args.maxAlpha = ACH:Range(L["Max Alpha"], nil, 16, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) + config.args.dynamicflight = ACH:Toggle(L["Dynamic Flight"], nil, 11, nil, nil, nil, nil, nil, disabled, groupName ~= 'player') + config.args.casting = ACH:Toggle(L["Casting"], nil, 12, nil, nil, nil, nil, nil, disabledOrRanged) + + config.args.spacer1 = ACH:Spacer(13, 'full') + config.args.delay = ACH:Range(L["Fade Out Delay"], nil, 14, { min = 0, max = 3, step = 0.01 }, nil, nil, nil, disabledOrRanged) + config.args.smooth = ACH:Range(L["Smooth"], nil, 15, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) + config.args.minAlpha = ACH:Range(L["Min Alpha"], nil, 16, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) + config.args.maxAlpha = ACH:Range(L["Max Alpha"], nil, 17, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) config.args.instanceDifficulties = ACH:Group(L["Instance Difficulties"], nil, 30, nil, function(info) return E.db.unitframe.units[groupName].fader.instanceDifficulties[info[#info]] end, function(info, value) E.db.unitframe.units[groupName].fader.instanceDifficulties[info[#info]] = value updateFunc(UF, groupName, numUnits) end) config.args.instanceDifficulties.args.none = ACH:Toggle(L["None"], nil, 1, nil, nil, nil, nil, nil, disabled) From 604ce5673264f23f44ed9ad8c64ac1b423a06807 Mon Sep 17 00:00:00 2001 From: Repooc Date: Mon, 13 Nov 2023 01:37:17 -0500 Subject: [PATCH 20/70] try this for other frames as well, for those that want to have a clean look while dragonflying --- ElvUI/Core/Defaults/Profile.lua | 2 +- ElvUI/Core/Modules/UnitFrames/UnitFrames.lua | 5 +---- ElvUI_Options/Core/UnitFrames.lua | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ElvUI/Core/Defaults/Profile.lua b/ElvUI/Core/Defaults/Profile.lua index cc2761f43b..1ca790f2a5 100644 --- a/ElvUI/Core/Defaults/Profile.lua +++ b/ElvUI/Core/Defaults/Profile.lua @@ -1474,6 +1474,7 @@ local UF_Fader = { smooth = 0.33, unittarget = false, vehicle = false, + dynamicflight = false, instanceDifficulties = { none = false, dungeonNormal = false, @@ -2196,7 +2197,6 @@ P.unitframe.units.player.fader.playertarget = true P.unitframe.units.player.fader.power = true P.unitframe.units.player.fader.range = nil P.unitframe.units.player.fader.vehicle = true -P.unitframe.units.player.fader.dynamicflight = true P.unitframe.units.player.healPrediction.enable = true P.unitframe.units.player.health.position = 'LEFT' P.unitframe.units.player.health.text_format = '[healthcolor][health:current-percent:shortvalue]' diff --git a/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua b/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua index a5db76178e..e945babbac 100644 --- a/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua +++ b/ElvUI/Core/Modules/UnitFrames/UnitFrames.lua @@ -597,10 +597,7 @@ do -- IDs maintained in Difficulty Datatext and Nameplate StyleFilters fader:SetOption('Casting', db.casting) fader:SetOption('MinAlpha', db.minAlpha) fader:SetOption('MaxAlpha', db.maxAlpha) - - if frame == _G.ElvUF_Player then - fader:SetOption('DynamicFlight', db.dynamicflight) - end + fader:SetOption('DynamicFlight', db.dynamicflight) if frame ~= _G.ElvUF_Player then fader:SetOption('Range', db.range) diff --git a/ElvUI_Options/Core/UnitFrames.lua b/ElvUI_Options/Core/UnitFrames.lua index 7ec9a249a8..0659465973 100644 --- a/ElvUI_Options/Core/UnitFrames.lua +++ b/ElvUI_Options/Core/UnitFrames.lua @@ -598,7 +598,7 @@ local function GetOptionsTable_Fader(updateFunc, groupName, numUnits) config.args.health = ACH:Toggle(L["Health"], nil, 8, nil, nil, nil, nil, nil, disabledOrRanged) config.args.power = ACH:Toggle(L["Power"], nil, 9, nil, nil, nil, nil, nil, disabledOrRanged) config.args.vehicle = ACH:Toggle(L["Vehicle"], nil, 10, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.dynamicflight = ACH:Toggle(L["Dynamic Flight"], nil, 11, nil, nil, nil, nil, nil, disabled, groupName ~= 'player') + config.args.dynamicflight = ACH:Toggle(L["Dynamic Flight"], nil, 11, nil, nil, nil, nil, nil, disabled) config.args.casting = ACH:Toggle(L["Casting"], nil, 12, nil, nil, nil, nil, nil, disabledOrRanged) config.args.spacer1 = ACH:Spacer(13, 'full') From 0e2edfba6c6b56d5f58024c86094849510db985a Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 01:48:02 -0500 Subject: [PATCH 21/70] sort --- ElvUI_Options/Core/UnitFrames.lua | 38 ++++++++++++++++--------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/ElvUI_Options/Core/UnitFrames.lua b/ElvUI_Options/Core/UnitFrames.lua index 0659465973..02ba258357 100644 --- a/ElvUI_Options/Core/UnitFrames.lua +++ b/ElvUI_Options/Core/UnitFrames.lua @@ -590,24 +590,26 @@ local function GetOptionsTable_Fader(updateFunc, groupName, numUnits) local config = ACH:Group(L["Fader"], nil, nil, nil, function(info) return E.db.unitframe.units[groupName].fader[info[#info]] end, function(info, value) E.db.unitframe.units[groupName].fader[info[#info]] = value updateFunc(UF, groupName, numUnits) end) config.args.enable = ACH:Toggle(L["Enable"], nil, 1) config.args.range = ACH:Toggle(L["Range"], nil, 2, nil, nil, nil, nil, nil, disabled, groupName == 'player') - config.args.hover = ACH:Toggle(L["Hover"], nil, 3, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.combat = ACH:Toggle(L["Combat"], nil, 4, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.unittarget = ACH:Toggle(L["Unit Target"], nil, 5, nil, nil, nil, nil, nil, disabledOrRanged, groupName == 'player') - config.args.playertarget = ACH:Toggle(groupName == 'player' and L["Target"] or L["Player Target"], nil, 6, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.focus = ACH:Toggle(L["Focus"], nil, 7, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.health = ACH:Toggle(L["Health"], nil, 8, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.power = ACH:Toggle(L["Power"], nil, 9, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.vehicle = ACH:Toggle(L["Vehicle"], nil, 10, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.dynamicflight = ACH:Toggle(L["Dynamic Flight"], nil, 11, nil, nil, nil, nil, nil, disabled) - config.args.casting = ACH:Toggle(L["Casting"], nil, 12, nil, nil, nil, nil, nil, disabledOrRanged) - - config.args.spacer1 = ACH:Spacer(13, 'full') - config.args.delay = ACH:Range(L["Fade Out Delay"], nil, 14, { min = 0, max = 3, step = 0.01 }, nil, nil, nil, disabledOrRanged) - config.args.smooth = ACH:Range(L["Smooth"], nil, 15, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) - config.args.minAlpha = ACH:Range(L["Min Alpha"], nil, 16, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) - config.args.maxAlpha = ACH:Range(L["Max Alpha"], nil, 17, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) - - config.args.instanceDifficulties = ACH:Group(L["Instance Difficulties"], nil, 30, nil, function(info) return E.db.unitframe.units[groupName].fader.instanceDifficulties[info[#info]] end, function(info, value) E.db.unitframe.units[groupName].fader.instanceDifficulties[info[#info]] = value updateFunc(UF, groupName, numUnits) end) + config.args.unittarget = ACH:Toggle(L["Unit Target"], nil, 3, nil, nil, nil, nil, nil, disabledOrRanged, groupName == 'player') + + config.args.spacer1 = ACH:Spacer(10, 'full') + config.args.hover = ACH:Toggle(L["Hover"], nil, 11, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.combat = ACH:Toggle(L["Combat"], nil, 12, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.playertarget = ACH:Toggle(groupName == 'player' and L["Target"] or L["Player Target"], nil, 13, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.focus = ACH:Toggle(L["Focus"], nil, 14, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.health = ACH:Toggle(L["Health"], nil, 15, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.power = ACH:Toggle(L["Power"], nil, 16, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.vehicle = ACH:Toggle(L["Vehicle"], nil, 17, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.casting = ACH:Toggle(L["Casting"], nil, 18, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.dynamicflight = ACH:Toggle(L["Dynamic Flight"], nil, 19, nil, nil, nil, nil, nil, disabledOrRanged) + + config.args.spacer2 = ACH:Spacer(30, 'full') + config.args.delay = ACH:Range(L["Fade Out Delay"], nil, 31, { min = 0, max = 3, step = 0.01 }, nil, nil, nil, disabledOrRanged) + config.args.smooth = ACH:Range(L["Smooth"], nil, 32, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) + config.args.minAlpha = ACH:Range(L["Min Alpha"], nil, 33, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) + config.args.maxAlpha = ACH:Range(L["Max Alpha"], nil, 34, { min = 0, max = 1, step = 0.01 }, nil, nil, nil, disabled) + + config.args.instanceDifficulties = ACH:Group(L["Instance Difficulties"], nil, 40, nil, function(info) return E.db.unitframe.units[groupName].fader.instanceDifficulties[info[#info]] end, function(info, value) E.db.unitframe.units[groupName].fader.instanceDifficulties[info[#info]] = value updateFunc(UF, groupName, numUnits) end) config.args.instanceDifficulties.args.none = ACH:Toggle(L["None"], nil, 1, nil, nil, nil, nil, nil, disabled) config.args.instanceDifficulties.args.dungeonNormal = ACH:Toggle(L["Dungeon (normal)"], nil, 2, nil, nil, nil, nil, nil, disabled) config.args.instanceDifficulties.args.dungeonHeroic = ACH:Toggle(L["Dungeon (heroic)"], nil, 3, nil, nil, nil, nil, nil, disabled) From 12eb7350e1f5c14106f632b851d02524848de79f Mon Sep 17 00:00:00 2001 From: Taizun <15648000+Taizunz@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:42:26 +0100 Subject: [PATCH 22/70] remove references to search syntax (#1086) Change tooltip of the input fields in Bags->Sorting, and remove references to Search Syntax as those haven't been available for quite a while. --- ElvUI_Options/Core/Bags.lua | 12 ++++++------ ElvUI_Options/Locales/deDE.lua | 10 +++++----- ElvUI_Options/Locales/enUS.lua | 10 +++++----- ElvUI_Options/Locales/esMX.lua | 10 +++++----- ElvUI_Options/Locales/frFR.lua | 10 +++++----- ElvUI_Options/Locales/itIT.lua | 10 +++++----- ElvUI_Options/Locales/koKR.lua | 10 +++++----- ElvUI_Options/Locales/ptBR.lua | 10 +++++----- ElvUI_Options/Locales/ruRU.lua | 10 +++++----- ElvUI_Options/Locales/trTR.lua | 10 +++++----- ElvUI_Options/Locales/zhCN.lua | 10 +++++----- ElvUI_Options/Locales/zhTW.lua | 10 +++++----- 12 files changed, 61 insertions(+), 61 deletions(-) diff --git a/ElvUI_Options/Core/Bags.lua b/ElvUI_Options/Core/Bags.lua index 36dc0a0495..3f1efb56b1 100644 --- a/ElvUI_Options/Core/Bags.lua +++ b/ElvUI_Options/Core/Bags.lua @@ -213,11 +213,11 @@ Bags.args.vendorGrays.args.progressBar = ACH:Toggle(L["Progress Bar"], nil, 4) Bags.args.bagSortingGroup = ACH:Group(L["Sorting"], nil, 5, nil, nil, nil, function() return (not E.Bags.Initialized) or E.db.bags.useBlizzardCleanup end) Bags.args.bagSortingGroup.args.sortInverted = ACH:Toggle(L["Sort Inverted"], L["Direction the bag sorting will use to allocate the items."], 1) -Bags.args.bagSortingGroup.args.description = ACH:Description(L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."], 3) -Bags.args.bagSortingGroup.args.addEntryGroup = ACH:Group(L["Add Item or Search Syntax"], nil, 3) +Bags.args.bagSortingGroup.args.description = ACH:Description(L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."], 3) +Bags.args.bagSortingGroup.args.addEntryGroup = ACH:Group(L["Add Item"], nil, 3) Bags.args.bagSortingGroup.args.addEntryGroup.inline = true -Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryProfile = ACH:Input(L["Profile"], L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."], 1, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.db.bags.ignoredItems[(itemID or value)] = value end) -Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryGlobal = ACH:Input(L["Global"], L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."], 2, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.global.bags.ignoredItems[(itemID or value)] = value if E.db.bags.ignoredItems[(itemID or value)] then E.db.bags.ignoredItems[(itemID or value)] = nil end end) +Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryProfile = ACH:Input(L["Profile"], L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"], 1, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.db.bags.ignoredItems[(itemID or value)] = value end) +Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryGlobal = ACH:Input(L["Global"], L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"], 2, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.global.bags.ignoredItems[(itemID or value)] = value if E.db.bags.ignoredItems[(itemID or value)] then E.db.bags.ignoredItems[(itemID or value)] = nil end end) local function getIgnoreList(list) local data = {} @@ -232,5 +232,5 @@ local function getIgnoreList(list) return data end -Bags.args.bagSortingGroup.args.ignoredEntriesProfile = ACH:MultiSelect(L["Ignored Items and Search Syntax (Profile)"], nil, 4, function() return getIgnoreList(E.db.bags.ignoredItems) end, nil, nil, function(_, value) return E.db.bags.ignoredItems[value] end, function(_, value) E.db.bags.ignoredItems[value] = nil GameTooltip:Hide() end, nil, function() return not next(E.db.bags.ignoredItems) end) -Bags.args.bagSortingGroup.args.ignoredEntriesGlobal = ACH:MultiSelect(L["Ignored Items and Search Syntax (Global)"], nil, 5, function() return getIgnoreList(E.global.bags.ignoredItems) end, nil, nil, function(_, value) return E.global.bags.ignoredItems[value] end, function(_, value) E.global.bags.ignoredItems[value] = nil GameTooltip:Hide() end, nil, function() return not next(E.global.bags.ignoredItems) end) +Bags.args.bagSortingGroup.args.ignoredEntriesProfile = ACH:MultiSelect(L["Ignored Items (Profile)"], nil, 4, function() return getIgnoreList(E.db.bags.ignoredItems) end, nil, nil, function(_, value) return E.db.bags.ignoredItems[value] end, function(_, value) E.db.bags.ignoredItems[value] = nil GameTooltip:Hide() end, nil, function() return not next(E.db.bags.ignoredItems) end) +Bags.args.bagSortingGroup.args.ignoredEntriesGlobal = ACH:MultiSelect(L["Ignored Items (Global)"], nil, 5, function() return getIgnoreList(E.global.bags.ignoredItems) end, nil, nil, function(_, value) return E.global.bags.ignoredItems[value] end, function(_, value) E.global.bags.ignoredItems[value] = nil GameTooltip:Hide() end, nil, function() return not next(E.global.bags.ignoredItems) end) diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua index fa5945ac00..40e8ceb69b 100644 --- a/ElvUI_Options/Locales/deDE.lua +++ b/ElvUI_Options/Locales/deDE.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Hinzufügen / Entfernen" L["Add a Item Name or ID to the list."] = "Füge der Liste einen Gegenstandsnamen oder eine ID hinzu." L["Add a Name or NPC ID to the list."] = "Füge einen Namen oder NPC ID der Liste hinzu." L["Add a spell to the filter."] = "Zauber zum Filter hinzufügen" -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "Füge ein Gegenstand oder ein Suchoperator zu der Ignorierliste hinzu. Gegenstände die auf den Suchoperator zutreffen werden ignoriert." +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Füge ein Gegenstand oder ein Suchoperator zu der Ignorierliste hinzu. Gegenstände die auf den Suchoperator zutreffen werden ignoriert." L["Add Currency by ID"] = "Währungs ID hinzufügen" L["Add Currency"] = "Währung hinzufügen" L["Add Current"] = "Aktuelles hinzufügen" L["Add Instance ID"] = "Instanz ID hinzufügen" L["Add Item Name or ID"] = "Gegenstandsname oder ID hinzufügen" -L["Add Item or Search Syntax"] = "Füge Gegenstand oder Suchoperator hinzu" +L["Add Item"] = "Füge Gegenstand oder Suchoperator hinzu" L["Add Map ID"] = "Karten ID hinzufügen" L["Add Name or NPC ID"] = "Füge Name oder NPC ID hinzu" L["Add Regular Filter"] = "Füge regulären Filter hinzu" @@ -741,7 +741,7 @@ L["Height"] = "Höhe" L["Help Frame"] = "Hilfefenster" L["Help"] = "Hilfe" L["Herbalism"] = "Kräuterkunde" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Hier kannst du Gegenstände oder Suchbedingungen vom Suchen ausschließen. Um ein Gegenstand zu entfernen, klicke einfach auf den Namen in der Liste." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Hier kannst du Gegenstände oder Suchbedingungen vom Suchen ausschließen. Um ein Gegenstand zu entfernen, klicke einfach auf den Namen in der Liste." L["HH:MM Threshold"] = "HH:MM Schwellenwert" L["HH:MM"] = true L["Hide At Max Level"] = "Auf max. Level vestecken" @@ -877,8 +877,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Wenn du ein Plugin installiert hast, was diese Einstellungen unterstützt, findest du sie im Dropdown rechts." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Wenn du die Aktionsleisten entsperrst und versuchst einen Zauber zu verschieben, wird voraussichtlich der Zauber ausgelöst beim drücken anstatt beim loslassen der Taste." L["Ignore mouse events."] = "Ignoriere Maus Events." -L["Ignored Items and Search Syntax (Global)"] = "Ignorierte Gegenstände oder Suchoperatoren (Global)" -L["Ignored Items and Search Syntax (Profile)"] = "Ignorierte Gegenstände oder Suchoperatoren (Profil)" +L["Ignored Items (Global)"] = "Ignorierte Gegenstände oder Suchoperatoren (Global)" +L["Ignored Items (Profile)"] = "Ignorierte Gegenstände oder Suchoperatoren (Profil)" L["Import Now"] = "Jetzt importieren" L["Import Profile"] = "Profil Importieren" L["Import"] = "Importieren" diff --git a/ElvUI_Options/Locales/enUS.lua b/ElvUI_Options/Locales/enUS.lua index 708c9a937d..f3777ddacc 100644 --- a/ElvUI_Options/Locales/enUS.lua +++ b/ElvUI_Options/Locales/enUS.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = true L["Add a Item Name or ID to the list."] = true L["Add a Name or NPC ID to the list."] = true L["Add a spell to the filter."] = true -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = true +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = true L["Add Currency by ID"] = true L["Add Currency"] = true L["Add Current"] = true L["Add Instance ID"] = true L["Add Item Name or ID"] = true -L["Add Item or Search Syntax"] = true +L["Add Item"] = true L["Add Map ID"] = true L["Add Name or NPC ID"] = true L["Add Regular Filter"] = true @@ -742,7 +742,7 @@ L["Height"] = true L["Help Frame"] = true L["Help"] = true L["Herbalism"] = true -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = true L["HH:MM"] = true L["Hide At Max Level"] = true @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = true L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = true L["Ignore mouse events."] = true -L["Ignored Items and Search Syntax (Global)"] = true -L["Ignored Items and Search Syntax (Profile)"] = true +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = true L["Import Profile"] = true L["Import"] = true diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index bca599e164..0628d75aee 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Añadir / Quitar" L["Add a Item Name or ID to the list."] = "Añadir un nombre o ID de objetos a la lista." L["Add a Name or NPC ID to the list."] = "Agregue un nombre o ID de NPC a la lista." L["Add a spell to the filter."] = "Añade un hechizo al filtro." -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "Agregue un objetos o una sintaxis de búsqueda a la lista ignorada. Los objetos que coincidan con la sintaxis de búsqueda serán ignorados." +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Agregue un objetos o una sintaxis de búsqueda a la lista ignorada. Los objetos que coincidan con la sintaxis de búsqueda serán ignorados." L["Add Currency by ID"] = "Agregar ID de moneda" L["Add Currency"] = "Añadir Moneda" L["Add Current"] = "Agregar Corriente" L["Add Instance ID"] = "Agregar ID de instancia" L["Add Item Name or ID"] = "Anadir un nombre o ID de objetos." -L["Add Item or Search Syntax"] = "Agregar objetos o sintaxis de búsqueda" +L["Add Item"] = "Agregar objetos o sintaxis de búsqueda" L["Add Map ID"] = "Agregar ID de mapa" L["Add Name or NPC ID"] = "Agregar nombre o ID de NPC" L["Add Regular Filter"] = "Agregar filtro regular" @@ -742,7 +742,7 @@ L["Height"] = "Altura" L["Help Frame"] = "Ayuda" L["Help"] = true L["Herbalism"] = true -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = true L["HH:MM"] = true L["Hide At Max Level"] = true @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = true L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = true L["Ignore mouse events."] = "Ignorar los eventos del ratón" -L["Ignored Items and Search Syntax (Global)"] = true -L["Ignored Items and Search Syntax (Profile)"] = true +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = true L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/frFR.lua b/ElvUI_Options/Locales/frFR.lua index 6e276f3295..a4eae406ba 100644 --- a/ElvUI_Options/Locales/frFR.lua +++ b/ElvUI_Options/Locales/frFR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Ajouter / Enlever" L["Add a Item Name or ID to the list."] = "Ajoutez un nom d'objet ou un ID à la liste." L["Add a Name or NPC ID to the list."] = "Ajouter le nom ou l'ID d'un PNJ à la liste" L["Add a spell to the filter."] = "Ajouter un sort au filtre." -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "Ajoutez un objet ou une syntaxe de recherche à la liste des ignorés. Les objets correspondant à la syntaxe de recherche seront ignorés." +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Ajoutez un objet ou une syntaxe de recherche à la liste des ignorés. Les objets correspondant à la syntaxe de recherche seront ignorés." L["Add Currency by ID"] = "Ajouter la monnaie par ID" L["Add Currency"] = "Ajouter la monnaie" L["Add Current"] = "Ajouter l'actuel" L["Add Instance ID"] = "Ajouter l'ID de l'instance" L["Add Item Name or ID"] = "Ajouter le nom ou l'ID de l'objet" -L["Add Item or Search Syntax"] = "Ajouter un élément ou une syntaxe pour la recherche" +L["Add Item"] = "Ajouter un élément ou une syntaxe pour la recherche" L["Add Map ID"] = "Ajouter l'ID de la carte" L["Add Name or NPC ID"] = "Ajouter le nom ou l'ID d'un PNJ" L["Add Regular Filter"] = "Ajouter un filtre" @@ -742,7 +742,7 @@ L["Height"] = "Hauteur" L["Help Frame"] = "Fenêtre d'Assistance clientèle" L["Help"] = "Aide" L["Herbalism"] = "Herboristerie" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Ici, vous pouvez ajouter des objets ou des termes de recherche que vous souhaitez exclure de la catégorisation. Pour supprimer un objet, il vous suffit de cliquer sur son nom dans la liste." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Ici, vous pouvez ajouter des objets ou des termes de recherche que vous souhaitez exclure de la catégorisation. Pour supprimer un objet, il vous suffit de cliquer sur son nom dans la liste." L["HH:MM Threshold"] = "Seuil HH:MM" L["HH:MM"] = true L["Hide At Max Level"] = "Cacher au niveau maximum" @@ -876,8 +876,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Si vous avez des plugins prenant en charge cette fonctionnalité installés, vous pouvez les trouver dans le menu déroulant de sélection à droite." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Si vous déverrouillez les barres d'actions, essayer de déplacer un sort pourrait instantanément le lancer si vous lancez les sorts en appuyant sur la touche plutôt qu'en la relâchant." L["Ignore mouse events."] = "Ignorer les événements de la souris." -L["Ignored Items and Search Syntax (Global)"] = "Objets ignorés et syntaxe de recherche (globale)" -L["Ignored Items and Search Syntax (Profile)"] = "Objets ignorés et syntaxe de recherche (profil)" +L["Ignored Items (Global)"] = "Objets ignorés et syntaxe de recherche (globale)" +L["Ignored Items (Profile)"] = "Objets ignorés et syntaxe de recherche (profil)" L["Import Now"] = "Importer maintenant" L["Import"] = "Importer" L["Import Profile"] = "Importer le profil" diff --git a/ElvUI_Options/Locales/itIT.lua b/ElvUI_Options/Locales/itIT.lua index c7a4abff09..8fd80e9bc9 100644 --- a/ElvUI_Options/Locales/itIT.lua +++ b/ElvUI_Options/Locales/itIT.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = true L["Add a Item Name or ID to the list."] = true L["Add a Name or NPC ID to the list."] = true L["Add a spell to the filter."] = true -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = true +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = true L["Add Currency by ID"] = true L["Add Currency"] = true L["Add Current"] = true L["Add Instance ID"] = true L["Add Item Name or ID"] = true -L["Add Item or Search Syntax"] = true +L["Add Item"] = true L["Add Map ID"] = "Aggiungi ID Mappa" L["Add Name or NPC ID"] = true L["Add Regular Filter"] = true @@ -741,7 +741,7 @@ L["Height"] = true L["Help Frame"] = true L["Help"] = true L["Herbalism"] = true -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = true L["HH:MM"] = true L["Hide At Max Level"] = true @@ -877,8 +877,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = true L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = true L["Ignore mouse events."] = true -L["Ignored Items and Search Syntax (Global)"] = true -L["Ignored Items and Search Syntax (Profile)"] = true +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = true L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/koKR.lua b/ElvUI_Options/Locales/koKR.lua index 7ca233218c..29a2ce542a 100644 --- a/ElvUI_Options/Locales/koKR.lua +++ b/ElvUI_Options/Locales/koKR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "추가/삭제" L["Add a Item Name or ID to the list."] = "목록에 아이템 이름이나 ID를 추가합니다." L["Add a Name or NPC ID to the list."] = "목록에 NPC 이름이나 ID를 추가합니다." L["Add a spell to the filter."] = "필터에 주문을 추가합니다." -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "검색을 제외할 물품 또는 단어를 추가합니다. 검색 단어와 일치하는 항목은 제외하게 됩니다." +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "검색을 제외할 물품 또는 단어를 추가합니다. 검색 단어와 일치하는 항목은 제외하게 됩니다." L["Add Currency by ID"] = "화폐 ID 추가" L["Add Currency"] = "화페 추가" L["Add Current"] = "현재 상태 추가" L["Add Instance ID"] = "던전 ID 추가" L["Add Item Name or ID"] = "아이템 이름/ID 추가" -L["Add Item or Search Syntax"] = "검색할 아이템 또는 단어 추가" +L["Add Item"] = "검색할 아이템 또는 단어 추가" L["Add Map ID"] = "지도 ID 추가" L["Add Name or NPC ID"] = "이름 또는 NPC ID 추가" L["Add Regular Filter"] = "일반 필터 추가" @@ -757,7 +757,7 @@ L["Height"] = "세로 길이" L["Help"] = "도움말" L["Help Frame"] = "도움말 프레임" L["Herbalism"] = "약초 채집" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "여기에 가방 정리에서 제외할 아이템 또는 검색어를 추가할 수 있습니다. 제거할 때는 목록에서 아이템 이름을 클릭만 하시면 됩니다." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "여기에 가방 정리에서 제외할 아이템 또는 검색어를 추가할 수 있습니다. 제거할 때는 목록에서 아이템 이름을 클릭만 하시면 됩니다." L["HH:MM Threshold"] = "시:분 표시 변경 값(분)" L["HH:MM"] = "시:분" L["Hide At Max Level"] = "만렙시 숨김" @@ -893,8 +893,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "이 기능을 지원하는 플러그인이 설치되어 있는 경우, 오른쪽의 선택 드롭 다운에서 찾을 수 있습니다." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "[단축키를 누를때 실행]을 켜고(on) 해당 옵션을 끄기(off) 한후 단축바 아이이콘 이동하면 스킬이 발동됩니다." L["Ignore mouse events."] = "아이콘이 마우스에 전혀 반응하지 않도록 합니다. 클릭 입력도 아이콘을 통과하게 됩니다." -L["Ignored Items and Search Syntax (Global)"] = "제외된 아이템 또는 검색구문 (전역)" -L["Ignored Items and Search Syntax (Profile)"] = "제외된 아이템 또는 검색구문 (프로필)" +L["Ignored Items (Global)"] = "제외된 아이템 또는 검색구문 (전역)" +L["Ignored Items (Profile)"] = "제외된 아이템 또는 검색구문 (프로필)" L["Import Now"] = "지금 가져오기" L["Import"] = "입력" L["Import Profile"] = "프로필 가져오기" diff --git a/ElvUI_Options/Locales/ptBR.lua b/ElvUI_Options/Locales/ptBR.lua index 1e9b876b4a..840fb8ff08 100644 --- a/ElvUI_Options/Locales/ptBR.lua +++ b/ElvUI_Options/Locales/ptBR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Adicionar / Remover" L["Add a Item Name or ID to the list."] = true L["Add a Name or NPC ID to the list."] = "Adicionar um Nome ou ID do NPC para a lista." L["Add a spell to the filter."] = "Adicionar um feitiço ao filtro." -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "Adicionar um item ou sintaxe de busca para a lista dos ignorados. Items que coincidem com a sintaxe de busca serão ignorados." +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Adicionar um item ou sintaxe de busca para a lista dos ignorados. Items que coincidem com a sintaxe de busca serão ignorados." L["Add Currency by ID"] = "Adicionar ID de Moeda" L["Add Currency"] = true L["Add Current"] = "Adicionar Atual" L["Add Instance ID"] = "Adicionar ID da Instância" L["Add Item Name or ID"] = true -L["Add Item or Search Syntax"] = "Adicionar Item ou Sintaxe de Busca" +L["Add Item"] = "Adicionar Item ou Sintaxe de Busca" L["Add Map ID"] = "Adicionar ID do Mapa" L["Add Name or NPC ID"] = "Adicionar Nome ou ID do NPC" L["Add Regular Filter"] = "Adicionar Filtro Comum" @@ -742,7 +742,7 @@ L["Height"] = "Altura" L["Help Frame"] = "Ajuda" L["Help"] = true L["Herbalism"] = "Herbalismo" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Aqui você pode adicionar itens ou termos de busca que você quer que sejam excluídos por sorteamento. Para remover um item apenas clique num nome na lista." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Aqui você pode adicionar itens ou termos de busca que você quer que sejam excluídos por sorteamento. Para remover um item apenas clique num nome na lista." L["HH:MM Threshold"] = "Limiar da HH:MM" L["HH:MM"] = true L["Hide At Max Level"] = "Esconder quando level máximo" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Se você tiver algum plugin suportando esta funcionalidade instalado você pode achá-lo no menu dropdown à direita." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Se você destravar as Barras de Ações, tentar mover um feitiço pode fazê-lo ser castado se você casta feitiços ao pressionar a tecla em vez de quando soltá-la." L["Ignore mouse events."] = "Ignorar eventos do mouse (rato)." -L["Ignored Items and Search Syntax (Global)"] = "Itens Ignorados e Sintaxe de Busca (Global)" -L["Ignored Items and Search Syntax (Profile)"] = "Itens Ignorados e Sintaxe de Busca (Perfil)" +L["Ignored Items (Global)"] = "Itens Ignorados e Sintaxe de Busca (Global)" +L["Ignored Items (Profile)"] = "Itens Ignorados e Sintaxe de Busca (Perfil)" L["Import Now"] = "Importar Agora" L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/ruRU.lua b/ElvUI_Options/Locales/ruRU.lua index 3c81847e2c..a50587ee58 100644 --- a/ElvUI_Options/Locales/ruRU.lua +++ b/ElvUI_Options/Locales/ruRU.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Добавить/Удалить" L["Add a Item Name or ID to the list."] = "Добавить название или ID предмета в список." L["Add a Name or NPC ID to the list."] = "Добавить имя или ID НИПа в список." L["Add a spell to the filter."] = "Добавить заклинание в фильтр" -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "Добавить предмет или синтаксис поиска в список игнорируемых. Предметы, соответствующие синтаксису, будут игнорироваться." +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Добавить предмет или синтаксис поиска в список игнорируемых. Предметы, соответствующие синтаксису, будут игнорироваться." L["Add Currency by ID"] = "Добавить ID валюты" L["Add Currency"] = "Добавить валюту" L["Add Current"] = "Добавить текущее" L["Add Instance ID"] = "Добавить ID подземелья" L["Add Item Name or ID"] = "Добавить название или ID предмета" -L["Add Item or Search Syntax"] = "Добавить предмет или синтаксис поиска" +L["Add Item"] = "Добавить предмет или синтаксис поиска" L["Add Map ID"] = "Добавить ID карты" L["Add Name or NPC ID"] = "Добавить имя или ID НИПа" L["Add Regular Filter"] = "Добавить обычный фильтр" @@ -749,7 +749,7 @@ L["Height"] = "Высота" L["Help Frame"] = "Помощь" L["Help"] = "Помощь" L["Herbalism"] = "Травы" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Здесь Вы можете добавить предметы или запросы поиска, которые хотите исключить из сортировки. Для удаления предмета просто кликните на его имени в списке." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Здесь Вы можете добавить предметы или запросы поиска, которые хотите исключить из сортировки. Для удаления предмета просто кликните на его имени в списке." L["HH:MM Threshold"] = "Граница ЧЧ:ММ" L["HH:MM"] = "ЧЧ:ММ" L["Hide At Max Level"] = "Прятать на максимальном уровне" @@ -886,8 +886,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Если у Вас установлены плагины, которые поддерживают этот функционал, Вы можете найти их в выпадающем списке справа." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Если Вы разблокируете панели, а затем попытаетесь переместить заклинание, оно может быть применено мгновенно, если включено применение при нажатии." L["Ignore mouse events."] = "Игнорировать мышь" -L["Ignored Items and Search Syntax (Global)"] = "Игнорируемые предметы и синтаксис (Глобальный)" -L["Ignored Items and Search Syntax (Profile)"] = "Игнорируемые предметы и синтаксис (Профиль)" +L["Ignored Items (Global)"] = "Игнорируемые предметы и синтаксис (Глобальный)" +L["Ignored Items (Profile)"] = "Игнорируемые предметы и синтаксис (Профиль)" L["Import Now"] = "Импортировать" L["Import Profile"] = "Импорт профиля" L["Import"] = "Импорт" diff --git a/ElvUI_Options/Locales/trTR.lua b/ElvUI_Options/Locales/trTR.lua index ad7a164577..495a4e2b8b 100644 --- a/ElvUI_Options/Locales/trTR.lua +++ b/ElvUI_Options/Locales/trTR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Ekle / Kaldir" L["Add a Item Name or ID to the list."] = "Listeye bir Oge Ismi veya Kimligi ekleyin." L["Add a Name or NPC ID to the list."] = "Listeye bir Isim veya NPC Kimligi ekleyin." L["Add a spell to the filter."] = "Filtreye bir buyu ekle." -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "Yok sayilan listeye bir oge veya arama sozdizimi ekleyin. Arama sozdizimiyle eslesen ogeler yoksayilacak." +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Yok sayilan listeye bir oge veya arama sozdizimi ekleyin. Arama sozdizimiyle eslesen ogeler yoksayilacak." L["Add Currency by ID"] = "Kimlige gore Para Birimi Ekle" L["Add Currency"] = "Para Birimi Ekle" L["Add Current"] = "Mevcut Ekle" L["Add Instance ID"] = "Ornek Kimligi Ekle" L["Add Item Name or ID"] = "Oge Ismi veya Kimligi Ekle" -L["Add Item or Search Syntax"] = "Oge Ekle veya Sozdizimi Ara" +L["Add Item"] = "Oge Ekle veya Sozdizimi Ara" L["Add Map ID"] = "Harita Kimligi Ekle" L["Add Name or NPC ID"] = "Isim veya NPC Kimligi Ekle" L["Add Regular Filter"] = "Normal Filtre Ekle" @@ -742,7 +742,7 @@ L["Height"] = "Yukseklik" L["Help Frame"] = "Yardim Cercevesi" L["Help"] = "Yardim" L["Herbalism"] = "Bitkicilik" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Buradan siralamadan cikarilmasini istediginiz ogeleri veya arama terimlerini ekleyebilirsiniz. Bir ogeyi kaldirmak icin listedeki adini tiklamaniz yeterlidir." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Buradan siralamadan cikarilmasini istediginiz ogeleri veya arama terimlerini ekleyebilirsiniz. Bir ogeyi kaldirmak icin listedeki adini tiklamaniz yeterlidir." L["HH:MM Threshold"] = "SS:DD Esigi" L["HH:MM"] = "SS:DD" L["Hide At Max Level"] = "Maksimum Seviyede Gizle" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Bu ozelligi destekleyen herhangi bir eklentiniz varsa, bunlari sagdaki secim acilir menusunde bulabilirsiniz." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Eylem cubuklarinin kilidini acarsaniz, bir buyuyu hareket ettirmeye calismak, tusu serbest birakmak yerine tusa basarak buyu yaparsaniz, buyuyu aninda yapabilir." L["Ignore mouse events."] = "Fare olaylarini yoksay." -L["Ignored Items and Search Syntax (Global)"] = "Yok Sayilan Ogeler ve Arama Sozdizimi (Global)" -L["Ignored Items and Search Syntax (Profile)"] = "Yok Sayilan Ogeler ve Arama Sozdizimi (Profil)" +L["Ignored Items (Global)"] = "Yok Sayilan Ogeler ve Arama Sozdizimi (Global)" +L["Ignored Items (Profile)"] = "Yok Sayilan Ogeler ve Arama Sozdizimi (Profil)" L["Import Now"] = "simdi Ice Aktar" L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/zhCN.lua b/ElvUI_Options/Locales/zhCN.lua index 3ce2ff7c1d..5ecbf098cd 100644 --- a/ElvUI_Options/Locales/zhCN.lua +++ b/ElvUI_Options/Locales/zhCN.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "添加/移除" L["Add a Item Name or ID to the list."] = "向列表添加一个物品名称或者ID" L["Add a Name or NPC ID to the list."] = "向列表添加一个姓名或者NPC ID" L["Add a spell to the filter."] = "添加一个技能到过滤器" -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "添加一个物品或者匹配语法到屏蔽列表.符合匹配语法的物品将被忽略" +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "添加一个物品或者匹配语法到屏蔽列表.符合匹配语法的物品将被忽略" L["Add Currency by ID"] = "添加货币ID" L["Add Currency"] = "添加货币" L["Add Current"] = "添加当前" L["Add Instance ID"] = "添加副本ID" L["Add Item Name or ID"] = "添加物品名称或者ID" -L["Add Item or Search Syntax"] = "添加物品或者匹配语法" +L["Add Item"] = "添加物品或者匹配语法" L["Add Map ID"] = "添加地图ID" L["Add Name or NPC ID"] = "添加姓名或NPC ID" L["Add Regular Filter"] = "添加常规过滤器" @@ -742,7 +742,7 @@ L["Height"] = "高" L["Help Frame"] = "帮助框架" L["Help"] = "帮助" L["Herbalism"] = "草药" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "你可以在这里添加你想在排序中排除的物品或者匹配语法.在列表中点击他们的名字来移除一个物品" +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "你可以在这里添加你想在排序中排除的物品或者匹配语法.在列表中点击他们的名字来移除一个物品" L["HH:MM Threshold"] = "时:分 阈值" L["HH:MM"] = "时:分" L["Hide At Max Level"] = "在最高等级时隐藏" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "如果你有任何已安装的插件支持该功能, 你可以在下面的下拉菜单找到它们" L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "如果不锁定动作条, 那么当你试图移动技能时你可能会在鼠标按下技能键时使用技能" L["Ignore mouse events."] = "忽略鼠标事件" -L["Ignored Items and Search Syntax (Global)"] = "被忽略的物品和搜索语法(全局)" -L["Ignored Items and Search Syntax (Profile)"] = "被忽略的物品和搜索语法(配置文件)" +L["Ignored Items (Global)"] = "被忽略的物品和搜索语法(全局)" +L["Ignored Items (Profile)"] = "被忽略的物品和搜索语法(配置文件)" L["Import Now"] = "现在导入" L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/zhTW.lua b/ElvUI_Options/Locales/zhTW.lua index fe2901b458..7ec643888f 100644 --- a/ElvUI_Options/Locales/zhTW.lua +++ b/ElvUI_Options/Locales/zhTW.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "添加/刪除" L["Add a Item Name or ID to the list."] = "向列表添加一個物品名稱或者 ID" L["Add a Name or NPC ID to the list."] = "向列表添加一個姓名或者 NPC ID" L["Add a spell to the filter."] = "添加一個技能到過濾器" -L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "增加一個物品或是搜尋語法到忽略清單. 符合搜尋語法的物品將會被忽略" +L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "增加一個物品或是搜尋語法到忽略清單. 符合搜尋語法的物品將會被忽略" L["Add Currency by ID"] = "添加貨幣 ID" L["Add Currency"] = "添加貨幣" L["Add Current"] = "添加貨幣" L["Add Instance ID"] = "添加副本 ID" L["Add Item Name or ID"] = "添加物品名稱或 ID" -L["Add Item or Search Syntax"] = "增加物品或是搜尋語法" +L["Add Item"] = "增加物品或是搜尋語法" L["Add Map ID"] = "添加地圖ID" L["Add Name or NPC ID"] = "添加姓名或 NPC ID" L["Add Regular Filter"] = "添加常規過濾器" @@ -742,7 +742,7 @@ L["Height"] = "高" L["Help Frame"] = "幫助" L["Help"] = "幫助" L["Herbalism"] = "草藥學" -L["Here you can add items or search terms that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "在此你可以新增物品或是搜尋語法來排除排序某些物品. 要移除物品請點選列表中的物品名稱" +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "在此你可以新增物品或是搜尋語法來排除排序某些物品. 要移除物品請點選列表中的物品名稱" L["HH:MM Threshold"] = "HH:MM(時:分) 閾值" L["HH:MM"] = true L["Hide At Max Level"] = "在最高等級時隱藏" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "如果你安裝了任何支援此功能的插件, 你可以在右邊的下拉選單中找到它" L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "如果你將快捷列解鎖後嘗試移動技能, 技能可能會馬上施放因為你使用按下施法而非釋放施法" L["Ignore mouse events."] = "忽略滑鼠事件." -L["Ignored Items and Search Syntax (Global)"] = "忽略的物品與搜尋語法 (全局)" -L["Ignored Items and Search Syntax (Profile)"] = "忽略的物品與搜尋語法 (個人)" +L["Ignored Items (Global)"] = "忽略的物品與搜尋語法 (全局)" +L["Ignored Items (Profile)"] = "忽略的物品與搜尋語法 (個人)" L["Import Now"] = "現在導入" L["Import"] = true L["Import Profile"] = true From 48c97201cbbd9002064a3b8fbf21fe6800fd02f5 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 02:48:20 -0500 Subject: [PATCH 23/70] clean up 12eb7350e1 --- ElvUI_Options/Core/Bags.lua | 4 ++-- ElvUI_Options/Locales/deDE.lua | 12 ++++++------ ElvUI_Options/Locales/enUS.lua | 2 +- ElvUI_Options/Locales/esMX.lua | 4 ++-- ElvUI_Options/Locales/frFR.lua | 10 +++++----- ElvUI_Options/Locales/itIT.lua | 2 +- ElvUI_Options/Locales/koKR.lua | 10 +++++----- ElvUI_Options/Locales/ptBR.lua | 10 +++++----- ElvUI_Options/Locales/ruRU.lua | 10 +++++----- ElvUI_Options/Locales/trTR.lua | 10 +++++----- ElvUI_Options/Locales/zhCN.lua | 10 +++++----- ElvUI_Options/Locales/zhTW.lua | 10 +++++----- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ElvUI_Options/Core/Bags.lua b/ElvUI_Options/Core/Bags.lua index 3f1efb56b1..5ca42006cc 100644 --- a/ElvUI_Options/Core/Bags.lua +++ b/ElvUI_Options/Core/Bags.lua @@ -216,8 +216,8 @@ Bags.args.bagSortingGroup.args.sortInverted = ACH:Toggle(L["Sort Inverted"], L[" Bags.args.bagSortingGroup.args.description = ACH:Description(L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."], 3) Bags.args.bagSortingGroup.args.addEntryGroup = ACH:Group(L["Add Item"], nil, 3) Bags.args.bagSortingGroup.args.addEntryGroup.inline = true -Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryProfile = ACH:Input(L["Profile"], L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"], 1, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.db.bags.ignoredItems[(itemID or value)] = value end) -Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryGlobal = ACH:Input(L["Global"], L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"], 2, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.global.bags.ignoredItems[(itemID or value)] = value if E.db.bags.ignoredItems[(itemID or value)] then E.db.bags.ignoredItems[(itemID or value)] = nil end end) +Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryProfile = ACH:Input(L["Profile"], L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."], 1, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.db.bags.ignoredItems[(itemID or value)] = value end) +Bags.args.bagSortingGroup.args.addEntryGroup.args.addEntryGlobal = ACH:Input(L["Global"], L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."], 2, nil, nil, C.Blank, function(_, value) if value == '' or gsub(value, '%s+', '') == '' then return end local itemID = strmatch(value, 'item:(%d+)') E.global.bags.ignoredItems[(itemID or value)] = value if E.db.bags.ignoredItems[(itemID or value)] then E.db.bags.ignoredItems[(itemID or value)] = nil end end) local function getIgnoreList(list) local data = {} diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua index 40e8ceb69b..708a1e3fb8 100644 --- a/ElvUI_Options/Locales/deDE.lua +++ b/ElvUI_Options/Locales/deDE.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Hinzufügen / Entfernen" L["Add a Item Name or ID to the list."] = "Füge der Liste einen Gegenstandsnamen oder eine ID hinzu." L["Add a Name or NPC ID to the list."] = "Füge einen Namen oder NPC ID der Liste hinzu." L["Add a spell to the filter."] = "Zauber zum Filter hinzufügen" -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Füge ein Gegenstand oder ein Suchoperator zu der Ignorierliste hinzu. Gegenstände die auf den Suchoperator zutreffen werden ignoriert." +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "Währungs ID hinzufügen" L["Add Currency"] = "Währung hinzufügen" L["Add Current"] = "Aktuelles hinzufügen" L["Add Instance ID"] = "Instanz ID hinzufügen" -L["Add Item Name or ID"] = "Gegenstandsname oder ID hinzufügen" -L["Add Item"] = "Füge Gegenstand oder Suchoperator hinzu" +L["Add Item Name or ID"] = true +L["Add Item"] = true L["Add Map ID"] = "Karten ID hinzufügen" L["Add Name or NPC ID"] = "Füge Name oder NPC ID hinzu" L["Add Regular Filter"] = "Füge regulären Filter hinzu" @@ -741,7 +741,7 @@ L["Height"] = "Höhe" L["Help Frame"] = "Hilfefenster" L["Help"] = "Hilfe" L["Herbalism"] = "Kräuterkunde" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Hier kannst du Gegenstände oder Suchbedingungen vom Suchen ausschließen. Um ein Gegenstand zu entfernen, klicke einfach auf den Namen in der Liste." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "HH:MM Schwellenwert" L["HH:MM"] = true L["Hide At Max Level"] = "Auf max. Level vestecken" @@ -877,8 +877,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Wenn du ein Plugin installiert hast, was diese Einstellungen unterstützt, findest du sie im Dropdown rechts." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Wenn du die Aktionsleisten entsperrst und versuchst einen Zauber zu verschieben, wird voraussichtlich der Zauber ausgelöst beim drücken anstatt beim loslassen der Taste." L["Ignore mouse events."] = "Ignoriere Maus Events." -L["Ignored Items (Global)"] = "Ignorierte Gegenstände oder Suchoperatoren (Global)" -L["Ignored Items (Profile)"] = "Ignorierte Gegenstände oder Suchoperatoren (Profil)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "Jetzt importieren" L["Import Profile"] = "Profil Importieren" L["Import"] = "Importieren" diff --git a/ElvUI_Options/Locales/enUS.lua b/ElvUI_Options/Locales/enUS.lua index f3777ddacc..9ad81ee666 100644 --- a/ElvUI_Options/Locales/enUS.lua +++ b/ElvUI_Options/Locales/enUS.lua @@ -42,7 +42,7 @@ L["Add / Remove"] = true L["Add a Item Name or ID to the list."] = true L["Add a Name or NPC ID to the list."] = true L["Add a spell to the filter."] = true -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = true +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = true L["Add Currency"] = true L["Add Current"] = true diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index 0628d75aee..292a92f72f 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Añadir / Quitar" L["Add a Item Name or ID to the list."] = "Añadir un nombre o ID de objetos a la lista." L["Add a Name or NPC ID to the list."] = "Agregue un nombre o ID de NPC a la lista." L["Add a spell to the filter."] = "Añade un hechizo al filtro." -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Agregue un objetos o una sintaxis de búsqueda a la lista ignorada. Los objetos que coincidan con la sintaxis de búsqueda serán ignorados." +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "Agregar ID de moneda" L["Add Currency"] = "Añadir Moneda" L["Add Current"] = "Agregar Corriente" L["Add Instance ID"] = "Agregar ID de instancia" L["Add Item Name or ID"] = "Anadir un nombre o ID de objetos." -L["Add Item"] = "Agregar objetos o sintaxis de búsqueda" +L["Add Item"] = true L["Add Map ID"] = "Agregar ID de mapa" L["Add Name or NPC ID"] = "Agregar nombre o ID de NPC" L["Add Regular Filter"] = "Agregar filtro regular" diff --git a/ElvUI_Options/Locales/frFR.lua b/ElvUI_Options/Locales/frFR.lua index a4eae406ba..ca4a0bb2a8 100644 --- a/ElvUI_Options/Locales/frFR.lua +++ b/ElvUI_Options/Locales/frFR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Ajouter / Enlever" L["Add a Item Name or ID to the list."] = "Ajoutez un nom d'objet ou un ID à la liste." L["Add a Name or NPC ID to the list."] = "Ajouter le nom ou l'ID d'un PNJ à la liste" L["Add a spell to the filter."] = "Ajouter un sort au filtre." -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Ajoutez un objet ou une syntaxe de recherche à la liste des ignorés. Les objets correspondant à la syntaxe de recherche seront ignorés." +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "Ajouter la monnaie par ID" L["Add Currency"] = "Ajouter la monnaie" L["Add Current"] = "Ajouter l'actuel" L["Add Instance ID"] = "Ajouter l'ID de l'instance" L["Add Item Name or ID"] = "Ajouter le nom ou l'ID de l'objet" -L["Add Item"] = "Ajouter un élément ou une syntaxe pour la recherche" +L["Add Item"] = true L["Add Map ID"] = "Ajouter l'ID de la carte" L["Add Name or NPC ID"] = "Ajouter le nom ou l'ID d'un PNJ" L["Add Regular Filter"] = "Ajouter un filtre" @@ -742,7 +742,7 @@ L["Height"] = "Hauteur" L["Help Frame"] = "Fenêtre d'Assistance clientèle" L["Help"] = "Aide" L["Herbalism"] = "Herboristerie" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Ici, vous pouvez ajouter des objets ou des termes de recherche que vous souhaitez exclure de la catégorisation. Pour supprimer un objet, il vous suffit de cliquer sur son nom dans la liste." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "Seuil HH:MM" L["HH:MM"] = true L["Hide At Max Level"] = "Cacher au niveau maximum" @@ -876,8 +876,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Si vous avez des plugins prenant en charge cette fonctionnalité installés, vous pouvez les trouver dans le menu déroulant de sélection à droite." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Si vous déverrouillez les barres d'actions, essayer de déplacer un sort pourrait instantanément le lancer si vous lancez les sorts en appuyant sur la touche plutôt qu'en la relâchant." L["Ignore mouse events."] = "Ignorer les événements de la souris." -L["Ignored Items (Global)"] = "Objets ignorés et syntaxe de recherche (globale)" -L["Ignored Items (Profile)"] = "Objets ignorés et syntaxe de recherche (profil)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "Importer maintenant" L["Import"] = "Importer" L["Import Profile"] = "Importer le profil" diff --git a/ElvUI_Options/Locales/itIT.lua b/ElvUI_Options/Locales/itIT.lua index 8fd80e9bc9..12f00d2fbe 100644 --- a/ElvUI_Options/Locales/itIT.lua +++ b/ElvUI_Options/Locales/itIT.lua @@ -42,7 +42,7 @@ L["Add / Remove"] = true L["Add a Item Name or ID to the list."] = true L["Add a Name or NPC ID to the list."] = true L["Add a spell to the filter."] = true -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = true +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = true L["Add Currency"] = true L["Add Current"] = true diff --git a/ElvUI_Options/Locales/koKR.lua b/ElvUI_Options/Locales/koKR.lua index 29a2ce542a..044ae4a234 100644 --- a/ElvUI_Options/Locales/koKR.lua +++ b/ElvUI_Options/Locales/koKR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "추가/삭제" L["Add a Item Name or ID to the list."] = "목록에 아이템 이름이나 ID를 추가합니다." L["Add a Name or NPC ID to the list."] = "목록에 NPC 이름이나 ID를 추가합니다." L["Add a spell to the filter."] = "필터에 주문을 추가합니다." -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "검색을 제외할 물품 또는 단어를 추가합니다. 검색 단어와 일치하는 항목은 제외하게 됩니다." +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "화폐 ID 추가" L["Add Currency"] = "화페 추가" L["Add Current"] = "현재 상태 추가" L["Add Instance ID"] = "던전 ID 추가" L["Add Item Name or ID"] = "아이템 이름/ID 추가" -L["Add Item"] = "검색할 아이템 또는 단어 추가" +L["Add Item"] = true L["Add Map ID"] = "지도 ID 추가" L["Add Name or NPC ID"] = "이름 또는 NPC ID 추가" L["Add Regular Filter"] = "일반 필터 추가" @@ -757,7 +757,7 @@ L["Height"] = "세로 길이" L["Help"] = "도움말" L["Help Frame"] = "도움말 프레임" L["Herbalism"] = "약초 채집" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "여기에 가방 정리에서 제외할 아이템 또는 검색어를 추가할 수 있습니다. 제거할 때는 목록에서 아이템 이름을 클릭만 하시면 됩니다." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "시:분 표시 변경 값(분)" L["HH:MM"] = "시:분" L["Hide At Max Level"] = "만렙시 숨김" @@ -893,8 +893,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "이 기능을 지원하는 플러그인이 설치되어 있는 경우, 오른쪽의 선택 드롭 다운에서 찾을 수 있습니다." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "[단축키를 누를때 실행]을 켜고(on) 해당 옵션을 끄기(off) 한후 단축바 아이이콘 이동하면 스킬이 발동됩니다." L["Ignore mouse events."] = "아이콘이 마우스에 전혀 반응하지 않도록 합니다. 클릭 입력도 아이콘을 통과하게 됩니다." -L["Ignored Items (Global)"] = "제외된 아이템 또는 검색구문 (전역)" -L["Ignored Items (Profile)"] = "제외된 아이템 또는 검색구문 (프로필)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "지금 가져오기" L["Import"] = "입력" L["Import Profile"] = "프로필 가져오기" diff --git a/ElvUI_Options/Locales/ptBR.lua b/ElvUI_Options/Locales/ptBR.lua index 840fb8ff08..fa3c1efd71 100644 --- a/ElvUI_Options/Locales/ptBR.lua +++ b/ElvUI_Options/Locales/ptBR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Adicionar / Remover" L["Add a Item Name or ID to the list."] = true L["Add a Name or NPC ID to the list."] = "Adicionar um Nome ou ID do NPC para a lista." L["Add a spell to the filter."] = "Adicionar um feitiço ao filtro." -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Adicionar um item ou sintaxe de busca para a lista dos ignorados. Items que coincidem com a sintaxe de busca serão ignorados." +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "Adicionar ID de Moeda" L["Add Currency"] = true L["Add Current"] = "Adicionar Atual" L["Add Instance ID"] = "Adicionar ID da Instância" L["Add Item Name or ID"] = true -L["Add Item"] = "Adicionar Item ou Sintaxe de Busca" +L["Add Item"] = true L["Add Map ID"] = "Adicionar ID do Mapa" L["Add Name or NPC ID"] = "Adicionar Nome ou ID do NPC" L["Add Regular Filter"] = "Adicionar Filtro Comum" @@ -742,7 +742,7 @@ L["Height"] = "Altura" L["Help Frame"] = "Ajuda" L["Help"] = true L["Herbalism"] = "Herbalismo" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Aqui você pode adicionar itens ou termos de busca que você quer que sejam excluídos por sorteamento. Para remover um item apenas clique num nome na lista." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "Limiar da HH:MM" L["HH:MM"] = true L["Hide At Max Level"] = "Esconder quando level máximo" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Se você tiver algum plugin suportando esta funcionalidade instalado você pode achá-lo no menu dropdown à direita." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Se você destravar as Barras de Ações, tentar mover um feitiço pode fazê-lo ser castado se você casta feitiços ao pressionar a tecla em vez de quando soltá-la." L["Ignore mouse events."] = "Ignorar eventos do mouse (rato)." -L["Ignored Items (Global)"] = "Itens Ignorados e Sintaxe de Busca (Global)" -L["Ignored Items (Profile)"] = "Itens Ignorados e Sintaxe de Busca (Perfil)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "Importar Agora" L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/ruRU.lua b/ElvUI_Options/Locales/ruRU.lua index a50587ee58..e10f0d9903 100644 --- a/ElvUI_Options/Locales/ruRU.lua +++ b/ElvUI_Options/Locales/ruRU.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Добавить/Удалить" L["Add a Item Name or ID to the list."] = "Добавить название или ID предмета в список." L["Add a Name or NPC ID to the list."] = "Добавить имя или ID НИПа в список." L["Add a spell to the filter."] = "Добавить заклинание в фильтр" -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Добавить предмет или синтаксис поиска в список игнорируемых. Предметы, соответствующие синтаксису, будут игнорироваться." +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "Добавить ID валюты" L["Add Currency"] = "Добавить валюту" L["Add Current"] = "Добавить текущее" L["Add Instance ID"] = "Добавить ID подземелья" L["Add Item Name or ID"] = "Добавить название или ID предмета" -L["Add Item"] = "Добавить предмет или синтаксис поиска" +L["Add Item"] = true L["Add Map ID"] = "Добавить ID карты" L["Add Name or NPC ID"] = "Добавить имя или ID НИПа" L["Add Regular Filter"] = "Добавить обычный фильтр" @@ -749,7 +749,7 @@ L["Height"] = "Высота" L["Help Frame"] = "Помощь" L["Help"] = "Помощь" L["Herbalism"] = "Травы" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Здесь Вы можете добавить предметы или запросы поиска, которые хотите исключить из сортировки. Для удаления предмета просто кликните на его имени в списке." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "Граница ЧЧ:ММ" L["HH:MM"] = "ЧЧ:ММ" L["Hide At Max Level"] = "Прятать на максимальном уровне" @@ -886,8 +886,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Если у Вас установлены плагины, которые поддерживают этот функционал, Вы можете найти их в выпадающем списке справа." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Если Вы разблокируете панели, а затем попытаетесь переместить заклинание, оно может быть применено мгновенно, если включено применение при нажатии." L["Ignore mouse events."] = "Игнорировать мышь" -L["Ignored Items (Global)"] = "Игнорируемые предметы и синтаксис (Глобальный)" -L["Ignored Items (Profile)"] = "Игнорируемые предметы и синтаксис (Профиль)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "Импортировать" L["Import Profile"] = "Импорт профиля" L["Import"] = "Импорт" diff --git a/ElvUI_Options/Locales/trTR.lua b/ElvUI_Options/Locales/trTR.lua index 495a4e2b8b..8383d1a88d 100644 --- a/ElvUI_Options/Locales/trTR.lua +++ b/ElvUI_Options/Locales/trTR.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Ekle / Kaldir" L["Add a Item Name or ID to the list."] = "Listeye bir Oge Ismi veya Kimligi ekleyin." L["Add a Name or NPC ID to the list."] = "Listeye bir Isim veya NPC Kimligi ekleyin." L["Add a spell to the filter."] = "Filtreye bir buyu ekle." -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "Yok sayilan listeye bir oge veya arama sozdizimi ekleyin. Arama sozdizimiyle eslesen ogeler yoksayilacak." +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "Kimlige gore Para Birimi Ekle" L["Add Currency"] = "Para Birimi Ekle" L["Add Current"] = "Mevcut Ekle" L["Add Instance ID"] = "Ornek Kimligi Ekle" L["Add Item Name or ID"] = "Oge Ismi veya Kimligi Ekle" -L["Add Item"] = "Oge Ekle veya Sozdizimi Ara" +L["Add Item"] = true L["Add Map ID"] = "Harita Kimligi Ekle" L["Add Name or NPC ID"] = "Isim veya NPC Kimligi Ekle" L["Add Regular Filter"] = "Normal Filtre Ekle" @@ -742,7 +742,7 @@ L["Height"] = "Yukseklik" L["Help Frame"] = "Yardim Cercevesi" L["Help"] = "Yardim" L["Herbalism"] = "Bitkicilik" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Buradan siralamadan cikarilmasini istediginiz ogeleri veya arama terimlerini ekleyebilirsiniz. Bir ogeyi kaldirmak icin listedeki adini tiklamaniz yeterlidir." +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "SS:DD Esigi" L["HH:MM"] = "SS:DD" L["Hide At Max Level"] = "Maksimum Seviyede Gizle" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Bu ozelligi destekleyen herhangi bir eklentiniz varsa, bunlari sagdaki secim acilir menusunde bulabilirsiniz." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Eylem cubuklarinin kilidini acarsaniz, bir buyuyu hareket ettirmeye calismak, tusu serbest birakmak yerine tusa basarak buyu yaparsaniz, buyuyu aninda yapabilir." L["Ignore mouse events."] = "Fare olaylarini yoksay." -L["Ignored Items (Global)"] = "Yok Sayilan Ogeler ve Arama Sozdizimi (Global)" -L["Ignored Items (Profile)"] = "Yok Sayilan Ogeler ve Arama Sozdizimi (Profil)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "simdi Ice Aktar" L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/zhCN.lua b/ElvUI_Options/Locales/zhCN.lua index 5ecbf098cd..c207782091 100644 --- a/ElvUI_Options/Locales/zhCN.lua +++ b/ElvUI_Options/Locales/zhCN.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "添加/移除" L["Add a Item Name or ID to the list."] = "向列表添加一个物品名称或者ID" L["Add a Name or NPC ID to the list."] = "向列表添加一个姓名或者NPC ID" L["Add a spell to the filter."] = "添加一个技能到过滤器" -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "添加一个物品或者匹配语法到屏蔽列表.符合匹配语法的物品将被忽略" +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "添加货币ID" L["Add Currency"] = "添加货币" L["Add Current"] = "添加当前" L["Add Instance ID"] = "添加副本ID" L["Add Item Name or ID"] = "添加物品名称或者ID" -L["Add Item"] = "添加物品或者匹配语法" +L["Add Item"] = true L["Add Map ID"] = "添加地图ID" L["Add Name or NPC ID"] = "添加姓名或NPC ID" L["Add Regular Filter"] = "添加常规过滤器" @@ -742,7 +742,7 @@ L["Height"] = "高" L["Help Frame"] = "帮助框架" L["Help"] = "帮助" L["Herbalism"] = "草药" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "你可以在这里添加你想在排序中排除的物品或者匹配语法.在列表中点击他们的名字来移除一个物品" +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "时:分 阈值" L["HH:MM"] = "时:分" L["Hide At Max Level"] = "在最高等级时隐藏" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "如果你有任何已安装的插件支持该功能, 你可以在下面的下拉菜单找到它们" L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "如果不锁定动作条, 那么当你试图移动技能时你可能会在鼠标按下技能键时使用技能" L["Ignore mouse events."] = "忽略鼠标事件" -L["Ignored Items (Global)"] = "被忽略的物品和搜索语法(全局)" -L["Ignored Items (Profile)"] = "被忽略的物品和搜索语法(配置文件)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "现在导入" L["Import"] = true L["Import Profile"] = true diff --git a/ElvUI_Options/Locales/zhTW.lua b/ElvUI_Options/Locales/zhTW.lua index 7ec643888f..9591948ff7 100644 --- a/ElvUI_Options/Locales/zhTW.lua +++ b/ElvUI_Options/Locales/zhTW.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "添加/刪除" L["Add a Item Name or ID to the list."] = "向列表添加一個物品名稱或者 ID" L["Add a Name or NPC ID to the list."] = "向列表添加一個姓名或者 NPC ID" L["Add a spell to the filter."] = "添加一個技能到過濾器" -L["Add an item by dragging it onto this field, shift-clicking it into the field, or by entering the numerical Item ID"] = "增加一個物品或是搜尋語法到忽略清單. 符合搜尋語法的物品將會被忽略" +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true L["Add Currency by ID"] = "添加貨幣 ID" L["Add Currency"] = "添加貨幣" L["Add Current"] = "添加貨幣" L["Add Instance ID"] = "添加副本 ID" L["Add Item Name or ID"] = "添加物品名稱或 ID" -L["Add Item"] = "增加物品或是搜尋語法" +L["Add Item"] = true L["Add Map ID"] = "添加地圖ID" L["Add Name or NPC ID"] = "添加姓名或 NPC ID" L["Add Regular Filter"] = "添加常規過濾器" @@ -742,7 +742,7 @@ L["Height"] = "高" L["Help Frame"] = "幫助" L["Help"] = "幫助" L["Herbalism"] = "草藥學" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "在此你可以新增物品或是搜尋語法來排除排序某些物品. 要移除物品請點選列表中的物品名稱" +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "HH:MM(時:分) 閾值" L["HH:MM"] = true L["Hide At Max Level"] = "在最高等級時隱藏" @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "如果你安裝了任何支援此功能的插件, 你可以在右邊的下拉選單中找到它" L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "如果你將快捷列解鎖後嘗試移動技能, 技能可能會馬上施放因為你使用按下施法而非釋放施法" L["Ignore mouse events."] = "忽略滑鼠事件." -L["Ignored Items (Global)"] = "忽略的物品與搜尋語法 (全局)" -L["Ignored Items (Profile)"] = "忽略的物品與搜尋語法 (個人)" +L["Ignored Items (Global)"] = true +L["Ignored Items (Profile)"] = true L["Import Now"] = "現在導入" L["Import"] = true L["Import Profile"] = true From 423b03c19a8beeb167a7d1dbdf4ae38bd7fab7cd Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 03:06:51 -0500 Subject: [PATCH 24/70] locales --- ElvUI_Options/Locales/deDE.lua | 2 +- ElvUI_Options/Locales/esMX.lua | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua index 708a1e3fb8..4e473676ee 100644 --- a/ElvUI_Options/Locales/deDE.lua +++ b/ElvUI_Options/Locales/deDE.lua @@ -47,7 +47,7 @@ L["Add Currency by ID"] = "Währungs ID hinzufügen" L["Add Currency"] = "Währung hinzufügen" L["Add Current"] = "Aktuelles hinzufügen" L["Add Instance ID"] = "Instanz ID hinzufügen" -L["Add Item Name or ID"] = true +L["Add Item Name or ID"] = "Gegenstandsname oder ID hinzufügen" L["Add Item"] = true L["Add Map ID"] = "Karten ID hinzufügen" L["Add Name or NPC ID"] = "Füge Name oder NPC ID hinzu" diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index 292a92f72f..cbb15131e1 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -42,13 +42,13 @@ L["Add / Remove"] = "Añadir / Quitar" L["Add a Item Name or ID to the list."] = "Añadir un nombre o ID de objetos a la lista." L["Add a Name or NPC ID to the list."] = "Agregue un nombre o ID de NPC a la lista." L["Add a spell to the filter."] = "Añade un hechizo al filtro." -L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = "Añada un Objeto arrastrándolo, pulsando Mayúsculas o introduciendo el ID del Objeto aquí." L["Add Currency by ID"] = "Agregar ID de moneda" L["Add Currency"] = "Añadir Moneda" L["Add Current"] = "Agregar Corriente" L["Add Instance ID"] = "Agregar ID de instancia" -L["Add Item Name or ID"] = "Anadir un nombre o ID de objetos." -L["Add Item"] = true +L["Add Item Name or ID"] = "Añadir nombre o ID de Objeto" +L["Add Item"] = "Añadir Objeto" L["Add Map ID"] = "Agregar ID de mapa" L["Add Name or NPC ID"] = "Agregar nombre o ID de NPC" L["Add Regular Filter"] = "Agregar filtro regular" @@ -56,7 +56,7 @@ L["Add Special Filter"] = "Agregar filtro especial" L["Add Spell ID or Name"] = "Agregar nombre o ID de hechizo" L["Add SpellID"] = "Añadir ID de Hechizo" L["Add Subzone Name"] = "Agregar nombre de subzona" -L["Add Texture"] = true +L["Add Texture"] = "Añadir textura" L["Add Zone Name"] = "Agregar nombre de zona" L["Add"] = "Añadir" L["Added Instance ID: %s"] = "ID de instancia agregado: %s" @@ -85,7 +85,7 @@ L["Alliance"] = true L["Allied Races"] = true L["Allow Masque to handle the skinning of this element."] = "Permitir que Masque se encargue de la piel de este elemento." L["Allow newly learned spells to be automatically placed on an empty actionbar slot."] = "Permitir que los hechizos recién aprendidos se coloquen automáticamente en una ranura vacía de la barra de acción." -L["Allow Sharing"] = true +L["Allow Sharing"] = "Permitir compartir" L["Allows you to tie a stack count to an aura when you add it to the list, which allows the trigger to act when an aura reaches X number of stacks."] = "Permite vincular un recuento de pilas a un aura cuando se añade a la lista, lo que permite que el activador actúe cuando un aura alcanza X número de pilas." L["Alpha channel is taken from the color option."] = "El canal alfa se toma de la opción de color." L["Alpha Fading"] = "Desvanecimiento Alfa" @@ -100,7 +100,7 @@ L["Anchor"] = true L["Anima Diversion"] = true L["Announce Interrupts"] = "Anunciar Interrupciones" L["Announce when you interrupt a spell to the specified chat channel."] = "Anunciar cuando interrumpas un hechizo en el canal especificado." -L["Another Players Pet"] = true +L["Another Players Pet"] = "Otra mascota de los jugadores" L["Any"] = "Alguna" L["Applies the font and font size settings throughout the entire user interface. Note: Some font size settings will be skipped due to them having a smaller font size by default."] = "Aplica la configuración de la fuente y el tamaño de la fuente en toda la interfaz de usuario. Nota: Algunos ajustes de tamaño de fuente se omitirán debido a que tienen un tamaño de fuente más pequeño por defecto." L["Apply Font To All"] = "Aplicar el Tipo de Letra a todos" @@ -108,7 +108,7 @@ L["Apply this filter if a buff has remaining time greater than this. Set to zero L["Apply this filter if a buff has remaining time less than this. Set to zero to disable."] = "Aplica este filtro si un beneficio tiene un tiempo restante inferior a este. Establecer en cero para deshabilitar." L["Apply this filter if a debuff has remaining time greater than this. Set to zero to disable."] = "Aplica este filtro si una perjuicio tiene un tiempo restante mayor que este. Establecer en cero para deshabilitar." L["Apply this filter if a debuff has remaining time less than this. Set to zero to disable."] = "Aplica este filtro si un perjuicio tiene un tiempo restante inferior a este. Establecer en cero para deshabilitar." -L["Apply To All"] = true +L["Apply To All"] = "Aplicable a todos" L["Archaeology Frame"] = "Arqueología" L["Are you sure you want to reset ActionBars settings?"] = "¿Estás seguro de que quieres restablecer la configuración de barras de acción?" L["Are you sure you want to reset Auras settings?"] = "¿Estás seguro de que quieres restablecer la configuración de Auras?" @@ -742,7 +742,7 @@ L["Height"] = "Altura" L["Help Frame"] = "Ayuda" L["Help"] = true L["Herbalism"] = true -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Aquí puede añadir objetos para excluir de ordenar. Para eliminar un objeto, haga clic en su nombre en la lista." L["HH:MM Threshold"] = true L["HH:MM"] = true L["Hide At Max Level"] = true @@ -878,8 +878,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = true L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = true L["Ignore mouse events."] = "Ignorar los eventos del ratón" -L["Ignored Items (Global)"] = true -L["Ignored Items (Profile)"] = true +L["Ignored Items (Global)"] = "Objetos ignorados (Global)" +L["Ignored Items (Profile)"] = "Objetos ignorados (Perfil)" L["Import Now"] = true L["Import"] = true L["Import Profile"] = true From 025e2848d0017114c9aef8ff219f74a02c72e3a8 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 03:39:03 -0500 Subject: [PATCH 25/70] locales 2 --- ElvUI_Options/Locales/esMX.lua | 50 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index cbb15131e1..32bd511819 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -81,8 +81,8 @@ L["ADVENTURE_MAP_TITLE"] = "Mapa de exploración" L["Alert Frames"] = "Alertas" L["Alerts"] = "Alertas" L["Alive"] = true -L["Alliance"] = true -L["Allied Races"] = true +L["Alliance"] = "Alianza" +L["Allied Races"] = "Razas Aliadas" L["Allow Masque to handle the skinning of this element."] = "Permitir que Masque se encargue de la piel de este elemento." L["Allow newly learned spells to be automatically placed on an empty actionbar slot."] = "Permitir que los hechizos recién aprendidos se coloquen automáticamente en una ranura vacía de la barra de acción." L["Allow Sharing"] = "Permitir compartir" @@ -96,8 +96,8 @@ L["Always Display"] = "Mostrar Siempre" L["Always Show Player"] = "Mostrar siempre jugador" L["Always Show Realm"] = "Mostrar siempre el reino" L["Anchor Point"] = "Punto de Fijación" -L["Anchor"] = true -L["Anima Diversion"] = true +L["Anchor"] = "Fijación" +L["Anima Diversion"] = "Desvío Anima" L["Announce Interrupts"] = "Anunciar Interrupciones" L["Announce when you interrupt a spell to the specified chat channel."] = "Anunciar cuando interrumpas un hechizo en el canal especificado." L["Another Players Pet"] = "Otra mascota de los jugadores" @@ -121,32 +121,32 @@ L["Are you sure you want to reset General settings?"] = "¿Estás seguro de que L["Are you sure you want to reset NamePlates settings?"] = "¿Estás seguro de que quieres restablecer la configuración de Placas de Nombre?" L["Are you sure you want to reset Tooltip settings?"] = "¿Estás seguro de que quieres restablecer la configuración de Descripción Emergente?" L["Are you sure you want to reset UnitFrames settings?"] = "¿Estás seguro de que quieres restablecer la configuración de Marco de Unidad?" -L["Arena Registrar"] = true +L["Arena Registrar"] = "Registrador de Arena" L["Arrow Scale"] = "Escala de Flechas" L["Arrow Spacing"] = "Espacio entre Flechas" -L["Arrow Texture"] = true +L["Arrow Texture"] = "Textura de Flechas" L["Ascending or Descending order."] = "Orden ascendente o descendente." L["Ascending"] = "Ascendente" -L["Assigned Icon"] = true +L["Assigned Icon"] = "Icono Asignado" L["Assist Frames"] = "Marcos de Asistencia" -L["Assist"] = true +L["Assist"] = "Asistencia" L["At what point should the text be displayed. Set to -1 to disable."] = "En qué punto debe mostrarse el texto. Establécelo en -1 para desactivar." L["Attach Text To"] = "Adjuntar texto a" L["Attach To"] = "Adjuntar a" L["Attempt to create URL links inside the chat."] = "Trata de crear enlaces URL dentro del chat." L["Attempt to support eyefinity/nvidia surround."] = "Intenta soportar eyefinity y nvidia surround." L["Attempts to center UI elements in a 16:9 format for ultrawide monitors"] = "Intenta centrar los elementos de la interfaz de usuario en un formato 16:9 para monitores ultra anchos." -L["Auction House"] = true +L["Auction House"] = "Casa de Subastas" L["AUCTIONS"] = "Subastas" L["Aura Filters"] = "Filtros de Aura" -L["Aura Highlight"] = true +L["Aura Highlight"] = "Resaltado de Aura" L["Aura Indicator"] = "Indicator de Aura" L["Auto Add New Spells"] = "Agregar automáticamente nuevos hechizos" L["Auto Hide"] = "Ocultar Automáticamente" L["Auto Repair"] = "Reparación Automática" -L["Auto Self Cast"] = true -L["Auto Toggle"] = true -L["Auto Track Reputation"] = true +L["Auto Self Cast"] = "Autolanzamiento" +L["Auto Toggle"] = "Alternar Automática" +L["Auto Track Reputation"] = "Seguimiento Automático de Reputación" L["Auto-Close Pet Battle Log"] = "Registro de batalla de mascotas con cierre automático" L["Auto-Hide"] = "Ocultar Automáticamente" L["Automatic"] = "Automático" @@ -155,10 +155,10 @@ L["Automatically hide the objective frame during boss fights while you are runni L["Automatically hide the objective frame during boss or arena fights."] = "Ocultar automáticamente el marco objetivo durante las peleas de jefe o arena." L["Automatically repair using the following method when visiting a merchant."] = "Repara de forma automática usando el siguiente método cuando visites un comerciante." L["Automatically vendor gray items when visiting a vendor."] = "Vender automáticamente los objetos grises al visitar al vendedor." -L["Automation"] = true +L["Automation"] = "Automatización" L["Available Tags"] = "Tags de Disponibles" -L["Azerite Essence"] = true -L["Azerite"] = true +L["Azerite Essence"] = "Esencia de Azerita" +L["Azerite"] = "Azerita" L["AZERITE_RESPEC_TITLE"] = "Reforjador de azerita" L["Backdrop color of transparent frames"] = "Color de fondo de los marcos transparentes." L["Backdrop Color"] = "Color de Fondo" @@ -168,7 +168,7 @@ L["Backdrop Spacing"] = "Espacio para el Telón de Fondo" L["Backdrop Transparency"] = true L["Backdrop"] = "Fondo" L["Background Glow"] = "Brillo de Fondo" -L["Backpack Only"] = true +L["Backpack Only"] = "Sólo Mochila" L["Bad Color"] = "Malos colores" L["Bad Scale"] = "Escala malo" L["Bad Transition Color"] = "Color de transición malo" @@ -192,11 +192,11 @@ L["Bar Direction"] = "Dirección de la Barra" L["Bar Settings"] = true L["BARBERSHOP"] = "Peluquería" L["Bars will transition smoothly."] = "Las barras harán las transiciones suavemente." -L["Battlefield"] = true -L["BATTLEFIELDS"] = "Campos de batalla" +L["Battlefield"] = "Campo de Batalla" +L["BATTLEFIELDS"] = "Campos de Batalla" L["Battleground Friendly"] = "Campo de Batalla Amistoso" L["Battleground Texts"] = "Textos de los Campos de Batalla" -L["Battlegrounds"] = true +L["Battlegrounds"] = "Campos de Batalla" L["Begin a new row or column after this many auras."] = "Empieza una nueva fila o columna después de estas auras." L["Below Chat (Inside)"] = "Debajo Chat (Interior)" L["Below Chat"] = "Debajo Chat" @@ -214,11 +214,11 @@ L["Blizzard CVars"] = true L["Blizzard Style"] = "Estilo Blizzard" L["Blizzard"] = true L["BlizzUI Improvements"] = "Mejoras en BlizzUI" -L["Block Combat Click"] = "Bloqueo de Combate Click" -L["Block Combat Hover"] = "Bloque de Combate Hover" -L["Block Focus Glow"] = true -L["Block Mouseover Glow"] = "Bloque de Resplandor de Mouseover" -L["Block Target Glow"] = "Bloque de Resplandor de Target" +L["Block Combat Click"] = "Bloqueo Combate Click" +L["Block Combat Hover"] = "Bloque Combate Hover" +L["Block Focus Glow"] = "Bloque Enfoque Resplandor" +L["Block Mouseover Glow"] = "Bloque Pasar el Ratón Resplandor" +L["Block Target Glow"] = "Bloque Objetivo Resplandor" L["Blocks all click events while in combat."] = "Bloquea todos los eventos de clic mientras estás en combate." L["Blocks datatext tooltip from showing in combat."] = "Bloquea el texto de los datos para que no se muestre en el combate." L["Bonus Reward Position"] = "Posición de Recompensa de Bonificación" From 116f09da96c318ddcd53fda720d77b9ac1178d77 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 03:55:15 -0500 Subject: [PATCH 26/70] update lab more --- .../Core/LibActionButton-1.0/LibActionButton-1.0.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 51e342008f..70ae761b51 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1,7 +1,7 @@ -- License: LICENSE.txt local MAJOR_VERSION = "LibActionButton-1.0-ElvUI" -local MINOR_VERSION = 46 -- the real minor version is 107 +local MINOR_VERSION = 46 -- the real minor version is 108 local LibStub = LibStub if not LibStub then error(MAJOR_VERSION .. " requires LibStub.") end @@ -334,9 +334,11 @@ function SetupSecureSnippets(button) if IsPressHoldReleaseSpell then local spellID if type == 'action' then - local actionType, id = GetActionInfo(action) + local actionType, id, subType = GetActionInfo(action) if actionType == 'spell' then spellID = id + elseif actionType == 'macro' and subType == 'spell' then + spellID = id end elseif type == 'spell' then spellID = action @@ -1958,7 +1960,7 @@ function Update(self, which) if isTypeAction then local actionType, actionID, subType = GetActionInfo(self._state_action) local actionSpell, actionMacro, actionFlyout = actionType == 'spell', actionType == 'macro', actionType == 'flyout' - local macroSpell = actionMacro and ((WoWRetail and subType == 'spell' and actionID) or (not WoWRetail and GetMacroSpell(actionID))) or nil + local macroSpell = actionMacro and ((subType == 'spell' and actionID) or (subType ~= 'spell' and GetMacroSpell(actionID))) or nil local spellID = (actionSpell and actionID) or macroSpell local spellName = spellID and GetSpellInfo(spellID) or nil @@ -2559,8 +2561,8 @@ Action.GetSpellId = function(self) if actionType == "spell" then return id elseif actionType == "macro" then - if WoWRetail then - return (subType == "spell" and id) or nil + if subType == "spell" then + return id else return (GetMacroSpell(id)) end From 03857e46719e19af47a10ee41509ed18be6bf21b Mon Sep 17 00:00:00 2001 From: Merathilis Date: Mon, 13 Nov 2023 11:38:21 +0100 Subject: [PATCH 27/70] Update a bit german locales --- ElvUI_Options/Locales/deDE.lua | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua index 4e473676ee..1614d47db2 100644 --- a/ElvUI_Options/Locales/deDE.lua +++ b/ElvUI_Options/Locales/deDE.lua @@ -2,7 +2,7 @@ local L = ElvUI[1].Libs.ACL:NewLocale('ElvUI', 'deDE') L["ALT"] = true -L["CTRL"] = true +L["CTRL"] = "STRG" -- with german keyboard layout L["SHIFT"] = true L["NONE"] = "Nichts" L["GROUP"] = "Gruppe" @@ -42,13 +42,13 @@ L["Add / Remove"] = "Hinzufügen / Entfernen" L["Add a Item Name or ID to the list."] = "Füge der Liste einen Gegenstandsnamen oder eine ID hinzu." L["Add a Name or NPC ID to the list."] = "Füge einen Namen oder NPC ID der Liste hinzu." L["Add a spell to the filter."] = "Zauber zum Filter hinzufügen" -L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true +L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = "Füge einen Gegenstand hinzu, indem du ziehst, bei gedrückter Shift-Taste klickst oder die Gegenstands ID in diesem Feld eingibst." L["Add Currency by ID"] = "Währungs ID hinzufügen" L["Add Currency"] = "Währung hinzufügen" L["Add Current"] = "Aktuelles hinzufügen" L["Add Instance ID"] = "Instanz ID hinzufügen" L["Add Item Name or ID"] = "Gegenstandsname oder ID hinzufügen" -L["Add Item"] = true +L["Add Item"] = "Gegenstand hinzufügen" L["Add Map ID"] = "Karten ID hinzufügen" L["Add Name or NPC ID"] = "Füge Name oder NPC ID hinzu" L["Add Regular Filter"] = "Füge regulären Filter hinzu" @@ -232,9 +232,9 @@ L["Borders"] = "Umrandungen" L["Boss Mod Auras"] = "Boss Mod Auren" L["Both users will need this option enabled."] = "Beide Benutzer müssen diese Option aktiviert haben." L["Both"] = "Beide" -L["Bottom Left"] = true --No need to translate +L["Bottom Left"] = "Unten Links" --No need to translate L["Bottom Panel"] = "Untere Leiste" -L["Bottom Right"] = true --No need to translate +L["Bottom Right"] = "Unten Rechts" --No need to translate L["Bottom to Top"] = "Von unten nach oben" L["BUFFOPTIONS_LABEL"] = "Stärkungs-/Schwächungszauber" L["Buffs on Debuffs"] = "Stärkunszauber auf Schwächungszauber" @@ -249,7 +249,7 @@ L["Buttons"] = "Tasten" L["By Type"] = "Nach Typ" L["Calendar Frame"] = "Kalenderfenster" L["Camera Distance Scale"] = "Kameradistanz" -L["Camera Spin"] = true +L["Camera Spin"] = "Kameradrehung" L["Camera"] = "Kamera" L["Can Attack"] = "Kann angreifen" L["Can Not Attack"] = "Kann nicht angreifen" @@ -673,7 +673,7 @@ L["FRIENDLY_PLAYER"] = "Freundlicher Spieler" L["Friends"] = "Freunde" L["From Me"] = "Von Mir" L["From Pet"] = "Von Begleiter" -L["Full Bar"] = true +L["Full Bar"] = "Volle Leiste" L["Full Overlay"] = "Volles Überblenden" L["Full Time"] = "Vollzeit" L["Full"] = "Voll" @@ -716,7 +716,7 @@ L["Guild Control Frame"] = "Gildenkontrollfenster" L["Guild Ranks"] = "Gildenränge" L["Guild Registrar"] = "Gildenregister" L["Guild"] = "Gilde" -L["Half Bar"] = true +L["Half Bar"] = "Halbe Leiste" L["Happy"] = "Glücklich" L["Has Aura"] = "Hat Auren" L["Has No Stealable"] = "Hat nichts stehlbares" @@ -741,7 +741,7 @@ L["Height"] = "Höhe" L["Help Frame"] = "Hilfefenster" L["Help"] = "Hilfe" L["Herbalism"] = "Kräuterkunde" -L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true +L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Hier kannst du Gegenstände hinzufügen, die du von der Sortierung ausschließen möchtest. Um einen Gegenstand zu entfernen, klick einfach auf seinen Namen in der Liste." L["HH:MM Threshold"] = "HH:MM Schwellenwert" L["HH:MM"] = true L["Hide At Max Level"] = "Auf max. Level vestecken" @@ -877,8 +877,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Wenn du ein Plugin installiert hast, was diese Einstellungen unterstützt, findest du sie im Dropdown rechts." L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Wenn du die Aktionsleisten entsperrst und versuchst einen Zauber zu verschieben, wird voraussichtlich der Zauber ausgelöst beim drücken anstatt beim loslassen der Taste." L["Ignore mouse events."] = "Ignoriere Maus Events." -L["Ignored Items (Global)"] = true -L["Ignored Items (Profile)"] = true +L["Ignored Items (Global)"] = "Ignorierte Gegenstände (Global)" +L["Ignored Items (Profile)"] = "Ignorierte Gegenstände (Profil)" L["Import Now"] = "Jetzt importieren" L["Import Profile"] = "Profil Importieren" L["Import"] = "Importieren" @@ -1017,7 +1017,7 @@ L["Low Health Half"] = true L["Low Health Threshold"] = "Wenig Leben Schwellenwert" L["Low Threat"] = "Geringe Bedrohung" L["Low Threshold"] = "Niedrige CD-Schwelle" -L["Low"] = true +L["Low"] = "Gering" L["Lower numbers mean a higher priority. Filters are processed in order from 1 to 100."] = "Niedrigere Nummern bedeuten eine höhere Priorität. Filter werden von 1 bis 100 verarbeitet." L["LUNAR_POWER"] = "Astrale Macht" L["Macro Text"] = "Makrotext" @@ -1030,7 +1030,7 @@ L["Main backdrop color of the UI."] = "Allgemeine Hintergrundfarbe der Benutzero L["Main border color of the UI."] = "Standard Rahmenfarbe der Benutzeroberfläche" L["Main Options"] = "Standard Einstellungen" L["Main statusbar texture."] = "Hauptstatusleisten Textur" -L["Major Factions"] = true +L["Major Factions"] = "Hauptfraktion" L["Make textures transparent."] = "Mache Texturen transparent." L["Make the unitframe glow when it is below this percent of health."] = "Lasse den Einheitsrahmen leuchten, wenn er unter diesem Prozentsatz an Gesundheit liegt." L["Make the world map smaller."] = "Macht die Weltkarte kleiner." @@ -1042,7 +1042,7 @@ L["Maps"] = "Karten" L["Mark Quest Reward"] = "Markiere Questbelohnung" L["Marks the most valuable quest reward with a gold coin."] = "Markiert die wertvollste Questbelohnung mit einem Goldstück." L["Masque Support"] = "Masque Unterstützung" -L["Masque"] = true +L["Masque"] = true -- No need to translate L["Match if Item Name or ID is NOT in the list."] = "Übereinstimmung, wenn Gegenstandslname oder ID NICHT in der Liste enthalten ist." L["Match if Name or NPC ID is NOT in the list."] = "Löst aus, wenn Name oder NPC ID NICHT in der Liste ist." L["Match Player Level"] = "Entspreche Spielerlevel" @@ -1101,7 +1101,7 @@ L["Multi-Monitor Support"] = "Multi-Monitor Unterstützung" L["Multiple Ranks"] = "Mehrere Ränge" L["Multiply the backdrops height or width by this value. This is usefull if you wish to have more than one bar behind a backdrop."] = "Multipliziere die Höhe und die Breite des Hintergrundes. Das ist nützlich, wenn du mehr als eine Leiste hinter einem Hintergrund haben möchtest." L["Must be in group with the player if he isn't on the same server as you."] = "Muss mit dem Spieler in der Gruppe sein, wenn er nicht auf demselben Server wie du ist." -L["My Guild"] = true +L["My Guild"] = "Meine Gilde" L["Mythic+ Best Run"] = "Mythisch+ Bester Versuch" L["Mythic+ Data"] = "Mythisch+ Daten" L["Mythic+ Score"] = "Mythisch+ Wertung" @@ -1125,11 +1125,11 @@ L["New Item Glow"] = "Neuer Gegenstand Leuchten" L["New Panel"] = "Neues Panel" L["No Alert In Combat"] = "Kein Alarm im Kampf" L["No Duration"] = "Keine Dauer" -L["No Icon"] = true +L["No Icon"] = "Kein Symbol" L["No Label"] = "Keine Beschriftung" L["No NPC Title"] = true L["No Sorting"] = "Nicht Sortieren" -L["No Target"] = true +L["No Target"] = "Kein Ziel" L["Non-Interruptible"] = "Nicht Unterbrechbar" L["Non-Raid Frame"] = "Kein Schlachtzugsfenster" L["Non-Target Alpha"] = "Nicht Anvisiert Alpha" @@ -1143,10 +1143,10 @@ L["Not Casting Anything"] = "Zaubert nicht irgendetwas" L["Not Channeling Anything"] = "Kanalisiert nicht irgendetwas" L["Not Charmed"] = true L["Not Focused"] = "Nicht im Fokus" -L["Not in Party"] = true -L["Not in Raid"] = true +L["Not in Party"] = "Nicht in Gruppe" +L["Not in Raid"] = "Nicht im Schlachtzug" L["Not Known"] = "Nicht bekannt" -L["Not My Guild"] = true +L["Not My Guild"] = "Nicht meine Gilde" L["Not Owned By Player"] = "Nicht im Besitz des Spielers" L["Not Pet Battle"] = true L["Not Pet"] = "Kein Begleiter" From a34084fc55eb79b3a26526f2060e35dcdfd2d7da Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 11:39:21 -0500 Subject: [PATCH 28/70] only set action for the pages we will use --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index b4636c5f3d..5fb6edc3de 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -264,6 +264,13 @@ function AB:PositionAndSizeBar(barName) local button, lastButton, lastColumnButton, anchorRowButton, lastShownButton local vehicleIndex = (E.Retail or E.Wrath) and GetVehicleBarIndex() + -- paging needs to be updated even if the bar is disabled + local defaults = AB.barDefaults[barName] + local page = AB:GetPage(barName, defaults.page, defaults.conditions) + RegisterStateDriver(bar, 'page', page) + bar:SetAttribute('page', page) + + local pages = enabled and { strsplit(';', gsub(page, '%[.-]', '')) } for i = 1, NUM_ACTIONBAR_BUTTONS do lastButton = bar.buttons[i-1] lastColumnButton = bar.buttons[i-buttonsPerRow] @@ -283,7 +290,7 @@ function AB:PositionAndSizeBar(barName) lastShownButton = button end - AB:HandleButtonState(button, i, vehicleIndex, enabled) + AB:HandleButtonState(button, i, vehicleIndex, pages) AB:HandleButton(bar, button, i, lastButton, lastColumnButton) AB:StyleButton(button, nil, bar.MasqueGroup and E.private.actionbar.masque.actionbars) end @@ -295,12 +302,6 @@ function AB:PositionAndSizeBar(barName) AB:UpdateMasque(bar) end - -- paging needs to be updated even if the bar is disabled - local defaults = AB.barDefaults[barName] - local page = AB:GetPage(barName, defaults.page, defaults.conditions) - RegisterStateDriver(bar, 'page', page) - bar:SetAttribute('page', page) - if enabled then E:EnableMover(bar.mover.name) bar:Show() @@ -317,12 +318,13 @@ function AB:PositionAndSizeBar(barName) E:SetMoverSnapOffset('ElvAB_'..bar.id, db.buttonSpacing * 0.5) end -function AB:HandleButtonState(button, index, vehicleIndex, enabled) - if enabled then +function AB:HandleButtonState(button, index, vehicleIndex, pages) + if pages then button:SetState(0, 'action', index) - for k = 1, 18 do - button:SetState(k, 'action', (k - 1) * 12 + index) + for _, page in next, pages do + local num = tonumber(page) + button:SetState(num, 'action', (num - 1) * 12 + index) end if vehicleIndex and index == 12 then From 2deafb037014456b423e99d83a4dece03734b236 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 11:42:13 -0500 Subject: [PATCH 29/70] update note --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 5fb6edc3de..a6e15cfcb2 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -596,7 +596,7 @@ function AB:UpdateButtonSettings(specific) for barName, bar in pairs(AB.handledBars) do if not specific or specific == barName then AB:UpdateButtonConfig(barName, bar.bindButtons) -- config them first - AB:PositionAndSizeBar(barName) -- db is set here, button style also runs here + AB:PositionAndSizeBar(barName) -- db is set here, button style, and paging also runs here for _, button in ipairs(bar.buttons) do AB:StyleFlyout(button) From 02bbf807ccd33746df5003bff696467eb9569443 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 12:55:12 -0500 Subject: [PATCH 30/70] TargetReticle in LAB --- ElvUI/Core/Defaults/Profile.lua | 1 + ElvUI/Core/Modules/ActionBars/ActionBars.lua | 13 +++++++ .../LibActionButton-1.0.lua | 34 +++++++++++++++++-- ElvUI_Options/Core/ActionBars.lua | 4 +++ 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/Defaults/Profile.lua b/ElvUI/Core/Defaults/Profile.lua index 1ca790f2a5..f51c81b1b4 100644 --- a/ElvUI/Core/Defaults/Profile.lua +++ b/ElvUI/Core/Defaults/Profile.lua @@ -2721,6 +2721,7 @@ local AB_Bar = { alpha = 1, inheritGlobalFade = false, showGrid = true, + targetReticle = true, flyoutDirection = 'AUTOMATIC', paging = {}, countColor = { r = 1, g = 1, b = 1 }, diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index a6e15cfcb2..c2ef1fdef2 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -371,6 +371,17 @@ function AB:CreateBar(id) button.ProfessionQualityOverlayFrame = CreateFrame('Frame', nil, button, 'ActionButtonProfessionOverlayTemplate') end + local targetReticle = button.TargetReticleAnimFrame + if targetReticle then + targetReticle:SetAllPoints() + + targetReticle.Base:SetTexCoord(unpack(E.TexCoords)) + targetReticle.Base:SetInside() + + targetReticle.Highlight:SetTexCoord(unpack(E.TexCoords)) + targetReticle.Highlight:SetInside() + end + button.MasqueSkinned = true -- skip LAB styling (we handle it and masque as well) if Masque and E.private.actionbar.masque.actionbars then @@ -1302,7 +1313,9 @@ function AB:UpdateButtonConfig(barName, buttonName) bar.buttonConfig.hideElements.macro = not db.macrotext bar.buttonConfig.hideElements.hotkey = not db.hotkeytext + bar.buttonConfig.enabled = db.enabled -- only used to keep events off for targetReticle bar.buttonConfig.showGrid = db.showGrid + bar.buttonConfig.targetReticle = db.targetReticle bar.buttonConfig.clickOnDown = GetCVarBool('ActionButtonUseKeyDown') bar.buttonConfig.outOfRangeColoring = (AB.db.useRangeColorText and 'hotkey') or 'button' bar.buttonConfig.colors.range = E:SetColorTable(bar.buttonConfig.colors.range, AB.db.noRangeColor) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 70ae761b51..f4f3a51a3f 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -155,7 +155,9 @@ end local DefaultConfig = { outOfRangeColoring = "button", tooltip = "enabled", + enabled = true, showGrid = false, + targetReticle = true, useColoring = true, colors = { range = { 0.8, 0.1, 0.1 }, @@ -565,8 +567,17 @@ local function UpdateRegisterClicks(self, down) end -- prevent pickup calling spells ~Simpy -function Generic:OnButtonEvent(event, key, down) - if event == "GLOBAL_MOUSE_UP" then +function Generic:OnButtonEvent(event, key, down, spellID) + if event == "UNIT_SPELLCAST_RETICLE_TARGET" then + if (self.abilityID == spellID) and not self.TargetReticleAnimFrame:IsShown() then + self.TargetReticleAnimFrame.HighlightAnim:Play() + self.TargetReticleAnimFrame:Show() + end + elseif event == "UNIT_SPELLCAST_RETICLE_CLEAR" or event == "UNIT_SPELLCAST_STOP" or event == "UNIT_SPELLCAST_SUCCEEDED" or event == "UNIT_SPELLCAST_FAILED" then + if self.TargetReticleAnimFrame:IsShown() then + self.TargetReticleAnimFrame:Hide() + end + elseif event == "GLOBAL_MOUSE_UP" then self:UnregisterEvent(event) UpdateFlyout(self) @@ -1328,6 +1339,22 @@ function Generic:UpdateConfig(config) self.Name:Show() end + if WoWRetail then + if self.config.enabled and self.config.targetReticle then + self:RegisterUnitEvent('UNIT_SPELLCAST_STOP', 'player') + self:RegisterUnitEvent('UNIT_SPELLCAST_SUCCEEDED', 'player') + self:RegisterUnitEvent('UNIT_SPELLCAST_FAILED', 'player') + self:RegisterUnitEvent('UNIT_SPELLCAST_RETICLE_TARGET', 'player') + self:RegisterUnitEvent('UNIT_SPELLCAST_RETICLE_CLEAR', 'player') + else + self:UnregisterEvent('UNIT_SPELLCAST_STOP') + self:UnregisterEvent('UNIT_SPELLCAST_SUCCEEDED') + self:UnregisterEvent('UNIT_SPELLCAST_FAILED') + self:UnregisterEvent('UNIT_SPELLCAST_RETICLE_TARGET') + self:UnregisterEvent('UNIT_SPELLCAST_RETICLE_CLEAR') + end + end + self:SetAttribute("flyoutDirection", self.config.flyoutDirection) UpdateTextElements(self) @@ -1966,6 +1993,8 @@ function Update(self, which) self.isFlyoutButton = actionFlyout self.abilityName = spellName + self.abilityID = spellID + AuraButtons.buttons[self] = spellName if spellName then @@ -1978,6 +2007,7 @@ function Update(self, which) else self.isFlyoutButton = nil self.abilityName = nil + self.abilityID = nil end self:UpdateLocal() diff --git a/ElvUI_Options/Core/ActionBars.lua b/ElvUI_Options/Core/ActionBars.lua index a22a4a98c6..d2ad941248 100644 --- a/ElvUI_Options/Core/ActionBars.lua +++ b/ElvUI_Options/Core/ActionBars.lua @@ -334,6 +334,10 @@ local function CreateBarOptions(num) bar.args.generalOptions.values.showGrid = L["Show Empty Buttons"] bar.args.generalOptions.values.keepSizeRatio = L["Keep Size Ratio"] + if E.Retail then + bar.args.generalOptions.values.targetReticle = L["Target Reticle"] + end + bar.args.barGroup.args.flyoutDirection = ACH:Select(L["Flyout Direction"], nil, 3, { UP = L["Up"], DOWN = L["Down"], LEFT = L["Left"], RIGHT = L["Right"], AUTOMATIC = L["Automatic"] }, nil, nil, nil, function(info, value) E.db.actionbar[barNumber][info[#info]] = value AB:UpdateButtonSettings(barNumber) end) bar.args.barGroup.args.visibility.set = function(_, value) E.db.actionbar[barNumber].visibility = value AB:UpdateButtonSettings(barNumber) end bar.args.barGroup.args.paging = ACH:Input(L["Action Paging"], L["This works like a macro, you can run different situations to get the actionbar to page differently.\n Example: '[combat] 2;'"], 7, 4, 'full', function() return E.db.actionbar[barNumber].paging[E.myclass] end, function(_, value) E.db.actionbar[barNumber].paging[E.myclass] = value AB:UpdateButtonSettings(barNumber) end) From 5c1eee984c9e9296d5010cbaecac58dd9d4e3fee Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 13:20:37 -0500 Subject: [PATCH 31/70] fix the mask --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index c2ef1fdef2..fe5a020694 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -378,7 +378,6 @@ function AB:CreateBar(id) targetReticle.Base:SetTexCoord(unpack(E.TexCoords)) targetReticle.Base:SetInside() - targetReticle.Highlight:SetTexCoord(unpack(E.TexCoords)) targetReticle.Highlight:SetInside() end From 6c9cd98fc6f38b83a0fe669da3224b971e75eaf8 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 14:03:57 -0500 Subject: [PATCH 32/70] reticle color + dont highlight when reticle is shown --- ElvUI/Core/Defaults/Profile.lua | 1 + ElvUI/Core/Media/SharedMedia.lua | 1 + ElvUI/Core/Media/Textures/TargetReticle.tga | Bin 0 -> 11759 bytes ElvUI/Core/Modules/ActionBars/ActionBars.lua | 7 +++++++ .../LibActionButton-1.0/LibActionButton-1.0.lua | 2 +- ElvUI_Options/Core/ActionBars.lua | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 ElvUI/Core/Media/Textures/TargetReticle.tga diff --git a/ElvUI/Core/Defaults/Profile.lua b/ElvUI/Core/Defaults/Profile.lua index f51c81b1b4..498a99df5e 100644 --- a/ElvUI/Core/Defaults/Profile.lua +++ b/ElvUI/Core/Defaults/Profile.lua @@ -2577,6 +2577,7 @@ P.actionbar = { desaturateOnCooldown = false, equippedItem = false, equippedItemColor = { r = 0.4, g = 1.0, b = 0.4 }, + targetReticleColor = { r = 0.2, g = 1.0, b = 0.2 }, flashAnimation = false, flyoutSize = 32, -- match buttonsize default, blizz default is 28 font = 'Homespun', diff --git a/ElvUI/Core/Media/SharedMedia.lua b/ElvUI/Core/Media/SharedMedia.lua index 406eac34eb..637271447f 100644 --- a/ElvUI/Core/Media/SharedMedia.lua +++ b/ElvUI/Core/Media/SharedMedia.lua @@ -169,6 +169,7 @@ AddMedia('texture','Smooth') AddMedia('texture','Spark') AddMedia('texture','Tank') AddMedia('texture','TukuiLogo') +AddMedia('texture','TargetReticle') AddMedia('emoji','Angry') AddMedia('emoji','Blush') diff --git a/ElvUI/Core/Media/Textures/TargetReticle.tga b/ElvUI/Core/Media/Textures/TargetReticle.tga new file mode 100644 index 0000000000000000000000000000000000000000..c58ea7f2e80dc438af4f7e81fa538173679e42bf GIT binary patch literal 11759 zcmd6t2Y8j$-M|AVG8~AXU=;&eaa3)sqiBb-ZtLT0t8H!7D%R1ZwhFfOGOSclscqG& zb#JW`86hAfkc4cK8z2)B$mHhUBsW7KNq@hW+Yin!U>gwuR`E8lPBbLM?I%WO(_0j3R z&GOp=z76(`*3vh;&FO*>TmX0r^obKE4k#!nxS8$sx5CDLk5!ctoZEAu_$8 zp&>GhM|6g7Av*>;gw7bhEzT8&u!I>v56Qrg-FDk8>5xMXNxJX8`;J?=a^>SSH8pJv z?||xd-fi)aFT44+X3d(ms;a6se*xHbKaco~wQJYLXZkkCF|;;+*R5OE9)f}nXSNCZ zx4-@EapDqZfIWB&A3Jtz(yUptM&{(?JPq1SpzmdJZ)Ig=FVlL%;c#zJQBiMUVPP*E z^i0Xi%j=n*pP%0|l}C4of4lv6%UkemhP}g_D1cR~R`r&ami9ttF9h|9fVL?&H}`1~ zOTZRVzWwcQCtZH|#gR{ zU;p~o<`D}QE^Gr<=kn#t+wFPt%{QChefM2k#NW5yemlazCcZZ@tC9b04fHiIzV7|^ z->(gQ@WBVQ$-eo;9!EIR8O{^}{|69-{LVY?H1j?3`s=R?y_x@`{07(;En3tHMeT^R zW5I$2Em>Jvam2Y1e!AsHzT{6nz4?ei&w%cx74S=#&UwyTX?=2Y_8Bx@z>drgwES)-aYB{ZJ+O%nbl9(W-9 z@WT&>|MaIn75(Kee_8Ru3oopA?X}m6VJ-~eB_WWPB>UzUdmQ1&#~ypE$eBPW5t0!5 zAeT>{KD~0vlqr>yCQT~8VR1HU^ClXTp_ZVvz5E|fOG}HwUOO_|jMi+fsHo_Kpmk@QaYpf%zVs!D zt3kusmMmEk``-7yx9Y63&MM%y_y<4uK_QzhA93VCbPk%9`|PvN=0QxshaY~pf;B2x zx^!t-W@ct(2-T_jjBkFi#}STv?z!jkoC$DZ6jrrgI{`U)k9{%Z1e_Hy>U;eV< z`s=S>eZ>`5l$>|odEs-;Ij7{b(@ra9A!=N#k3RY+`ot4YtOrI73%3Cc?g+U72FfS= zy#?PNCc9ygOe_1ZQ|2*7oidK%w6Jvo#o_y=Xf(QsZ&6T|?X}llId|WEcU5_Ld7EPq zNa1Hc``L_(F1je|s;jPAhJGyh-S2*v{?bb?WzCy6FU)GJM^JG#Q#V$rcf*Day^%z{t}%{MPbU6)>X;f2d#e&y3oKV9?6E3ed|E4BCE zfB)Ja{_uyT2OfA}?$uXcT@IshxM+id8oxjD%rony5^6t|LphaWIZqa;>h7;r0#$Bh zJ)28PN;(;^89*JVc@t8tWhJUFx#W_SSkFu)jZ&@&g+k?D{Nfjve*W{HPeC*bQOq<5 zD`JnyaukK@YHx4vip63rFjtQV%TrQPifIL*`Sa)JCi~_W6rmil>K*9}X9__`h@l8f zX{`T3);kSx6d)EMHL{AWh$_an%3uHb*VSxVZEpPDd+)6|`|PvBlP6EEWLwoSP757y zn&3DYeP~4{Ep&8%tQXc>QN}2wZsPmKmtTIl0p%**d+)t-zx?Gd7hiC}1>rsS+%s#~ zuwly%J@n9}r=EIh8vUua-g;{)do~LtE@iv4u%??4XB$Xs7cX9%jd^;5?ehDZZn|mG zrI%iM8*4c+#LM-`zWL=xKl;(6-}C24XE;*`LSn^Qg#6S~Ph}#4l&^f{EAzkp^{+2w z_pd?(8?aAZ7`;}68kxCt^Q{X-t{gICNapb2!?TfN)gS-($Lb@FIAS>(un-Z zoL~VTn=@xlA!N*l|2d;ZjhcrM%0l5Pw02ERO`9NjBgVc%BZZ{Pv2cy4si_-K>bQOs z^=b!J5P-;g3_XZ4DXw3|Tt=`z&3xD6wSVhd-%`_;K-_ZdPsJmTJW>h5W%%(qsKE!U z)lzj6UG1iQ%zOT?e)X#-FTVKViHtjcpMCZ@k@<(w4yGMI+mANVUw!UKAN!5r@jtZB z(2{B6o#u4G2u`qq7Y#bF{-K8+T8gQA|9}Gyn2iQ5L3dWLJ?hbsu9lXTZg_5DV^+gb z93$7l&X2S9-B|s&?8^4R3EmM%+`s}8(a0XD$HI3hKz4E|#4KTTGEP4EXL*@n0_!%bU)?J=^=`bV{V zsC&=jk3Zh{=%bHTr>CbYmoDU81K?$}#UfC~h+;loGLJbi_Dwg0=yhj~7%}3sL4yX3 zXWUrYINCup8QO=oCv7-w=yV=?xXMHOzS!dkM>=C1ZLE-lC}c5+3B`;N66M`;%Pk8~ zy19%?<#)M09-Ci0b8(Jn_1;;*p0$_b7GaT%aMETxu+Z?m3YSpW}%K9 zTrha>;6?lIzyJIA?zwNg@kS1aJ3Bf$de~OFvpWwy_~29e2$f)0)-_A8IfVD!X}i$| z$?ibe9n|;59!DhDcBT*l)`ctvF^LgMJK2Z1Y~K0qGveh%W5$fhJnp#T3NU6Xi7Lvl z`&Gu8tg<4Cv!L$T=z%_9HzK=eeh(pKlpvvuiN#pgvS0k-7iFkV{^5roo{EK;qig{X zZEbDcj1^6X{fQ8E6isDy!>X3DDFcIPvN(`7UoQigS^bm~*fRr)j@}u2_{0iAf-pui zkCsIQmj2CeesclgK?a)NfEx8+{4)4<1Bg^qjZDJmsGxh$T&sa09s?fW5o81dTq7B? z&oPd5?VKx&vBDI#IAE%Q-I_skFdzT02*xswKmPaveDzAzl?~MFlE{!tBrl`3VyMkd z21SW)s{p+63t#v`F4ip#h86%I1w8B9+S&|FD^Zv`u#&Emgs4awRS8U};ec8E6Rd&j z-%G3;dH|4LuleQ2ayanGJDGQEr zw6pdT3SMa@_Aw%KT_Xv=LgKPTU;EnEvhiNwT_HW#DUyzqE57rc?-a3HGBLiX1ngPF z3sL+|*ON~^`8Hv|sURLl(^pA|@(gyw6kfJa9lS}foYzJGxlKh3$D55np*}A95^1NZc;a+ zgt$Q^Y`|kYf)!9b{9=zI9C@HKg@9Wq5F)BkDh4r$QOuCJgGP_sN+tTqWMZkw5TVo( z17pUtqRHL*cKpjpAaq;0-LxAL;+7lm1dl*lCDAYTIKq)*ohbw%36W^2h#YW9?phGJ_TkYlLP zAF}O04m3AeQy@*wrP#5~7!jwQGj80tt3jaZOOE_&z5})ICr9b{#U4jEay&DyB5Ya? zq)xJl+UK8tK2HoXzCAhnY`0k51|oO>GxtKo8z&TPfsZ!{>(2$ahFZRj0)mBlhL-?! zVxjDD#KHUSyYJZqv9A;O$4J22VYE=lV%VOHy%S^@2pABcSPjs<0uQ@_Z<`TeJq3W@ z15~4{I`>%HZI@!D@1g8Dub|`I7fZYGolc7Q1Fh}7rCOga7LJ``|P;bMzVj-HTNBCj$M5_rZ zlzHXQp+k=Vg?`VVJJ5vyxtu3-z@CxjW0zfa*=X6qwqY-vL~g;I`a3dVBVBq%)i;1R)7g$o~+%HAK9038GtLQH2efOE7XB-0vcK zM>@lqLJ*P=h5Y{={eM~b|5?@hS2vw{A8a~)gJj(5!~bd9?Zn_{vv=L#xGOX`C-17k z`A25AeLJ&js;#~Il+Etnb4GbMqgn$zoKf~poKb%a_KD8O0Oy}_MmvzB$I_8*<*GY% zv;=UIal9vhAmOTm(3}4U_LHMcOn8J(#Z~w81u|j74a1H^AVdEB(g`P=a2^OnWSF8e z4kWYA3`#`3BR|1(tRJzl!&!EiU%qkAT?-~Onry)aZ7JYo?jA@3xZ~6 zQvWb$_B^9ySAyo9rXD0#W#lWSw@XR+(r{Hl>Ork7|GVG)ZX)$?xkS8csfQyEGW8IG zkO(l%N=q%Nqq)mSNeacRfbdA$B-1;PiQ9_)<~P47r*c<-j-`|8&Zn3iq;ynTy8is< zKfkm4?z{iXDV;Ec)!EsZNa=#~ku);vpGxT{JVi)Cs;qxdFDW?v^wSprV4jI>S67$E zn33CWzx}~aEq$IKG}C8{RWAobg&aYrf;IK4U;Szh@($8xWF763b${l+b>SjN^GInM z|L})DtR?7d#23~BGtcB;foj1#_QYc9Ksi*y!&V1W>%R5quMYGV{t^tqOg(0&3iA^)kfjo~iEmXW zopjPi9M!!`**BB1mNx!Fg+DD0;d7K6CWp0~!#brLd+f1_Gt5Dv=T?<7X3VIf2ETP) z92ALo-%3tWHnBJ#dp?0D zE2HLK?wy70l~-fZU-f`3k7Al&rH(Va4r*lW81Xgi#(b(f707EHY7)kv&qsA;6F|7i z4X9TyV@<%{=6vuLj_WK(jGn?{ly1;K(>T!IEr&3EO&r1mJ;7L`qS4M4iqK%8QRrg9 zyyf0-!wvIrqq7Vl2c;&Pa=}t7T-(?$gAHn+2Y2Po3;^`PmT- zAn9Z^TLBOT@FHpk%W(m#X<@R$h5Y}%N)17oXhAJjubb9IeJ-Elz$Y*cH*gko9+9-6 zouv;0U!wyV9y!$)zZmYztUdnkVcQAL6oQb1C}c5+35*#OfjwyZFgZDSF=r8Jgh+*W z(mKrIChaTzt7MyN80937F*wArZ> zbT&-}mTCzBMhY%J1<@BECBb;U>iMMSt1nPNnta${hh4qX^Hnq2WV3485hgi_BUWcH z(<9awgd{{E<6>iQumVH7fRgMyiY9Y8mdGGxDx)O4+Jh9T85I9 zk%Wqm1)zMY|lk=E=M$i#Y#uVW2%-k5QIsA|{C8bk}imvl1^*#9EXqU*d%-a)oA! zEM3a>kV6j1c?!r7Q9OxC5ti$DFR1+2r9Fa zed9|px?Ii{u5+X_oax;PAqi2)*K>OVL%j&BX=qG3XWT^;tm_d?8`vvJoU%DOD`cfD z%^BRc;BwYtpKEw;l|wm|V>#Dvb@O7V-9z}}4Ym&A+GbR&33;v~o;AoXgVGJ&SU`3g zA*|b*3>1pX388XPzZ?!yvLPlDF)icn%aWNhXQrD*0jK|F4a^0%1VUDhf@?Lw+Zff_ zDjv*keWxZ%7{U^!Cmv{74pue4@6gJUcqJCMoET^YOc!wQT}fiw4y=#CyMd6m#y!kk zn@)L?$39-Wy;8K9wh4wT&g+~vc}0O>vH|D4j&-g;aVn5}JwowXMkgtR(yYdstYq(n zQQ8uS3mZcl_*>YAs8764#R`}=BRbc$e`TZ1b(^<*J0(hG) zoVZOVWHHbJjHI2F9*~m>lzP99OOv0WhAJ zZZwlGUMc6XIOIi|Gb*_NY>W7ZE5j>kXrZxcU`S4^utf|4nx(g)9cl za+KyhN^fiizpxqQ2)ctvs)xnvK|k9OMXQ?_b~m}GawdmzD#voJ4@(-()*TM?3-A(I zecK|q*oq8-`>1*f54a6@OhN89Ec(PdtwHZ_$FtpfahqP!3x1(2fUBB`M||QHe?Up_ z7>r9z`rPL}w-;J=0c!jjJGPT4U9^r6|FjQ8alHlT1+n;pzWndi-X#8Q3o)&258m2Q zb?;Ag2}4-I6t*}5Y(^VNLx=`OLd`TMgT`Zg?>q;A0PhC$Tkb3ex0mnd-$-z+*?Ysm z73K(|9PLFdNoy0DPy_hEV|N_yVTkl$x^*&oo>qRh+`*o~+m@Tx!CMHzgX`D&ro{DY N?}WyMAfy21-vH Date: Mon, 13 Nov 2023 14:44:20 -0500 Subject: [PATCH 33/70] handle icon changes better (this also fixes a bug with target aura and using druid boomy glpyh) --- .../LibActionButton-1.0.lua | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 5d1fe732cd..d145adbe26 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1383,6 +1383,7 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("PLAYER_MOUNT_DISPLAY_CHANGED") lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_STATE") lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN") + lib.eventFrame:RegisterEvent("SPELLS_CHANGED") lib.eventFrame:RegisterEvent("PLAYER_TARGET_CHANGED") lib.eventFrame:RegisterEvent("TRADE_SKILL_SHOW") lib.eventFrame:RegisterEvent("TRADE_SKILL_CLOSE") @@ -1434,7 +1435,6 @@ function InitializeEventHandler() if UseCustomFlyout then lib.eventFrame:RegisterEvent("PLAYER_LOGIN") - lib.eventFrame:RegisterEvent("SPELLS_CHANGED") lib.eventFrame:RegisterEvent("SPELL_FLYOUT_UPDATE") end @@ -1443,13 +1443,27 @@ function InitializeEventHandler() end end -local _lastFormUpdate = GetTime() function OnEvent(frame, event, arg1, ...) if event == "PLAYER_LOGIN" then if UseCustomFlyout then DiscoverFlyoutSpells() end - elseif event == "SPELLS_CHANGED" or event == "SPELL_FLYOUT_UPDATE" then + elseif event == "SPELLS_CHANGED" then + for button in next, ActiveButtons do + local texture = button:GetTexture() + if texture then + button.icon:SetTexture(texture) + end + end + + if AURA_COOLDOWNS_ENABLED then + UpdateAuraCooldowns() + end + + if UseCustomFlyout then + UpdateFlyoutSpells() + end + elseif event == "SPELL_FLYOUT_UPDATE" then if UseCustomFlyout then UpdateFlyoutSpells() end @@ -1471,23 +1485,6 @@ function OnEvent(frame, event, arg1, ...) end elseif event == "PLAYER_ENTERING_WORLD" or event == "UPDATE_VEHICLE_ACTIONBAR" then ForAllButtons(Update) - elseif event == "UNIT_MODEL_CHANGED" then - local _time = GetTime() -- we can't use UPDATE_SHAPESHIFT_FORM cause of issues, this one has less issues - if (_time - _lastFormUpdate) < 1 then return end -- but even this event fires multiple times on retail - _lastFormUpdate = _time - - if AURA_COOLDOWNS_ENABLED then - UpdateAuraCooldowns() - end - - -- the attack icon can change when shapeshift form changes, so need to do a quick update here - -- for performance reasons don't run full updates here, though - for button in next, ActiveButtons do - local texture = button:GetTexture() - if texture then - button.icon:SetTexture(texture) - end - end elseif event == "ACTIONBAR_SHOWGRID" then ShowGrid() elseif event == "ACTIONBAR_HIDEGRID" or event == "PET_BAR_HIDEGRID" then From ee9be0a7303727047186fd4e2bc80765cd5db0b8 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 14:46:40 -0500 Subject: [PATCH 34/70] drop this --- ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index d145adbe26..2dcd99dcd6 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1390,7 +1390,6 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("TRADE_CLOSED") lib.eventFrame:RegisterUnitEvent("UNIT_AURA", "target") - lib.eventFrame:RegisterUnitEvent("UNIT_MODEL_CHANGED", "player") lib.eventFrame:RegisterUnitEvent("UNIT_INVENTORY_CHANGED", "player") lib.eventFrame:RegisterEvent("PLAYER_ENTER_COMBAT") From 738faa3056e5baddcf0ec00e6d88ac4dd3d0cca1 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 15:16:14 -0500 Subject: [PATCH 35/70] handle wrath still --- .../LibActionButton-1.0.lua | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index 2dcd99dcd6..c61a1ac8ea 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1383,7 +1383,6 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("PLAYER_MOUNT_DISPLAY_CHANGED") lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_STATE") lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN") - lib.eventFrame:RegisterEvent("SPELLS_CHANGED") lib.eventFrame:RegisterEvent("PLAYER_TARGET_CHANGED") lib.eventFrame:RegisterEvent("TRADE_SKILL_SHOW") lib.eventFrame:RegisterEvent("TRADE_SKILL_CLOSE") @@ -1420,8 +1419,8 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("ACTION_RANGE_CHECK_UPDATE") else lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_USABLE") - -- Needed for classics show grid.. ACTIONBAR_SHOWGRID fires with PET_BAR_SHOWGRID but ACTIONBAR_HIDEGRID doesn't fire with PET_BAR_HIDEGRID - lib.eventFrame:RegisterEvent("PET_BAR_HIDEGRID") + lib.eventFrame:RegisterEvent("PET_BAR_HIDEGRID") -- Needed for classics show grid.. ACTIONBAR_SHOWGRID fires with PET_BAR_SHOWGRID but ACTIONBAR_HIDEGRID doesn't fire with PET_BAR_HIDEGRID + lib.eventFrame:RegisterEvent("UNIT_MODEL_CHANGED") -- Retail will use SPELLS_CHANGED end -- With those two, do we still need the ACTIONBAR equivalents of them? @@ -1432,6 +1431,10 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("LOSS_OF_CONTROL_ADDED") lib.eventFrame:RegisterEvent("LOSS_OF_CONTROL_UPDATE") + if UseCustomFlyout or WoWRetail then + lib.eventFrame:RegisterEvent("SPELLS_CHANGED") + end + if UseCustomFlyout then lib.eventFrame:RegisterEvent("PLAYER_LOGIN") lib.eventFrame:RegisterEvent("SPELL_FLYOUT_UPDATE") @@ -1448,6 +1451,23 @@ function OnEvent(frame, event, arg1, ...) DiscoverFlyoutSpells() end elseif event == "SPELLS_CHANGED" then + if WoWRetail then + for button in next, ActiveButtons do + local texture = button:GetTexture() + if texture then + button.icon:SetTexture(texture) + end + end + + if AURA_COOLDOWNS_ENABLED then + UpdateAuraCooldowns() + end + end + + if UseCustomFlyout then + UpdateFlyoutSpells() + end + elseif event == "UNIT_MODEL_CHANGED" then for button in next, ActiveButtons do local texture = button:GetTexture() if texture then @@ -1458,10 +1478,6 @@ function OnEvent(frame, event, arg1, ...) if AURA_COOLDOWNS_ENABLED then UpdateAuraCooldowns() end - - if UseCustomFlyout then - UpdateFlyoutSpells() - end elseif event == "SPELL_FLYOUT_UPDATE" then if UseCustomFlyout then UpdateFlyoutSpells() From eb6314ab073b3e2fc39ed0cd8581831709f11226 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 15:21:01 -0500 Subject: [PATCH 36/70] looks better --- .../LibActionButton-1.0.lua | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua index c61a1ac8ea..12a66e395f 100644 --- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua +++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua @@ -1420,7 +1420,6 @@ function InitializeEventHandler() else lib.eventFrame:RegisterEvent("ACTIONBAR_UPDATE_USABLE") lib.eventFrame:RegisterEvent("PET_BAR_HIDEGRID") -- Needed for classics show grid.. ACTIONBAR_SHOWGRID fires with PET_BAR_SHOWGRID but ACTIONBAR_HIDEGRID doesn't fire with PET_BAR_HIDEGRID - lib.eventFrame:RegisterEvent("UNIT_MODEL_CHANGED") -- Retail will use SPELLS_CHANGED end -- With those two, do we still need the ACTIONBAR equivalents of them? @@ -1431,8 +1430,10 @@ function InitializeEventHandler() lib.eventFrame:RegisterEvent("LOSS_OF_CONTROL_ADDED") lib.eventFrame:RegisterEvent("LOSS_OF_CONTROL_UPDATE") - if UseCustomFlyout or WoWRetail then + if WoWRetail then lib.eventFrame:RegisterEvent("SPELLS_CHANGED") + else + lib.eventFrame:RegisterEvent("UNIT_MODEL_CHANGED") end if UseCustomFlyout then @@ -1451,17 +1452,15 @@ function OnEvent(frame, event, arg1, ...) DiscoverFlyoutSpells() end elseif event == "SPELLS_CHANGED" then - if WoWRetail then - for button in next, ActiveButtons do - local texture = button:GetTexture() - if texture then - button.icon:SetTexture(texture) - end + for button in next, ActiveButtons do + local texture = button:GetTexture() + if texture then + button.icon:SetTexture(texture) end + end - if AURA_COOLDOWNS_ENABLED then - UpdateAuraCooldowns() - end + if AURA_COOLDOWNS_ENABLED then + UpdateAuraCooldowns() end if UseCustomFlyout then From fd012d320db7936c01f2b33fb4146aed260171a0 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 15:38:10 -0500 Subject: [PATCH 37/70] test --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 906704b2ae..7b1301ac4a 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -270,7 +270,7 @@ function AB:PositionAndSizeBar(barName) RegisterStateDriver(bar, 'page', page) bar:SetAttribute('page', page) - local pages = enabled and { strsplit(';', gsub(page, '%[.-]', '')) } + local pages = enabled and { strsplit(';', (gsub(page, '%[.-]', ''))) } for i = 1, NUM_ACTIONBAR_BUTTONS do lastButton = bar.buttons[i-1] lastColumnButton = bar.buttons[i-buttonsPerRow] From 856a2c41a49b04edba0355ca9e48640d10c00bdd Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 16:22:50 -0500 Subject: [PATCH 38/70] pages --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 24 ++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 7b1301ac4a..5565a8344a 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -229,6 +229,19 @@ function AB:MoverMagic(bar) -- ~Simpy end end +function AB:ActivePages(page) + local pages = {} + + for _, index in next, { strsplit(';', (gsub(page, '%[.-]', ''))) } do + local num = tonumber(index) + if num then + pages[num] = true + end + end + + return pages +end + function AB:PositionAndSizeBar(barName) local db = AB.db[barName] local bar = AB.handledBars[barName] @@ -270,7 +283,7 @@ function AB:PositionAndSizeBar(barName) RegisterStateDriver(bar, 'page', page) bar:SetAttribute('page', page) - local pages = enabled and { strsplit(';', (gsub(page, '%[.-]', ''))) } + local pages = enabled and AB:ActivePages(page) or nil for i = 1, NUM_ACTIONBAR_BUTTONS do lastButton = bar.buttons[i-1] lastColumnButton = bar.buttons[i-buttonsPerRow] @@ -328,9 +341,12 @@ function AB:HandleButtonState(button, index, vehicleIndex, pages) if pages then button:SetState(0, 'action', index) - for _, page in next, pages do - local num = tonumber(page) - button:SetState(num, 'action', (num - 1) * 12 + index) + for k = 1, 18 do + if pages[k] then + button:SetState(k, 'action', (k - 1) * 12 + index) + else + button:SetState(k, 'empty') + end end if vehicleIndex and index == 12 then From 017628ec9f000d7c4af1933de6b21691a70f5c9a Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 16:25:11 -0500 Subject: [PATCH 39/70] clean --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 5565a8344a..01a59d0536 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -231,8 +231,9 @@ end function AB:ActivePages(page) local pages = {} + local clean = gsub(page, '%[.-]', '') - for _, index in next, { strsplit(';', (gsub(page, '%[.-]', ''))) } do + for _, index in next, { strsplit(';', clean) } do local num = tonumber(index) if num then pages[num] = true From 4b872168848911aad6ee1b548fee2a84bdc886c7 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 16:26:02 -0500 Subject: [PATCH 40/70] up --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 01a59d0536..8ba221c56e 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -243,6 +243,28 @@ function AB:ActivePages(page) return pages end +function AB:HandleButtonState(button, index, vehicleIndex, pages) + if pages then + button:SetState(0, 'action', index) + + for k = 1, 18 do + if pages[k] then + button:SetState(k, 'action', (k - 1) * 12 + index) + else + button:SetState(k, 'empty') + end + end + + if vehicleIndex and index == 12 then + button:SetState(vehicleIndex, 'custom', AB.customExitButton) + end + else + for k = 0, 18 do + button:SetState(k, 'empty') + end + end +end + function AB:PositionAndSizeBar(barName) local db = AB.db[barName] local bar = AB.handledBars[barName] @@ -338,28 +360,6 @@ function AB:PositionAndSizeBar(barName) E:SetMoverSnapOffset('ElvAB_'..bar.id, db.buttonSpacing * 0.5) end -function AB:HandleButtonState(button, index, vehicleIndex, pages) - if pages then - button:SetState(0, 'action', index) - - for k = 1, 18 do - if pages[k] then - button:SetState(k, 'action', (k - 1) * 12 + index) - else - button:SetState(k, 'empty') - end - end - - if vehicleIndex and index == 12 then - button:SetState(vehicleIndex, 'custom', AB.customExitButton) - end - else - for k = 0, 18 do - button:SetState(k, 'empty') - end - end -end - function AB:CreateBar(id) local barName = 'ElvUI_Bar'..id local bar = CreateFrame('Frame', barName, E.UIParent, 'SecureHandlerStateTemplate') From 17d6e572ed9926d1ce8cc7cebd4146a8014585d4 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 16:36:26 -0500 Subject: [PATCH 41/70] drop this --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 8ba221c56e..1073ace64b 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -245,8 +245,6 @@ end function AB:HandleButtonState(button, index, vehicleIndex, pages) if pages then - button:SetState(0, 'action', index) - for k = 1, 18 do if pages[k] then button:SetState(k, 'action', (k - 1) * 12 + index) @@ -259,7 +257,7 @@ function AB:HandleButtonState(button, index, vehicleIndex, pages) button:SetState(vehicleIndex, 'custom', AB.customExitButton) end else - for k = 0, 18 do + for k = 1, 18 do button:SetState(k, 'empty') end end From 6ee8d54465d2389b2d4a2cfd0d284b378f17cd9c Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 16:38:05 -0500 Subject: [PATCH 42/70] shorter --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 22 +++++++------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 1073ace64b..51fff9accb 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -244,23 +244,17 @@ function AB:ActivePages(page) end function AB:HandleButtonState(button, index, vehicleIndex, pages) - if pages then - for k = 1, 18 do - if pages[k] then - button:SetState(k, 'action', (k - 1) * 12 + index) - else - button:SetState(k, 'empty') - end - end - - if vehicleIndex and index == 12 then - button:SetState(vehicleIndex, 'custom', AB.customExitButton) - end - else - for k = 1, 18 do + for k = 1, 18 do + if pages and pages[k] then + button:SetState(k, 'action', (k - 1) * 12 + index) + else button:SetState(k, 'empty') end end + + if pages and vehicleIndex and index == 12 then + button:SetState(vehicleIndex, 'custom', AB.customExitButton) + end end function AB:PositionAndSizeBar(barName) From 0bc17a4df46a61821f36ffec16cfc9cec4196ee7 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 16:52:23 -0500 Subject: [PATCH 43/70] mind control default --- ElvUI/Core/Defaults/Profile.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Defaults/Profile.lua b/ElvUI/Core/Defaults/Profile.lua index 498a99df5e..bb76658c02 100644 --- a/ElvUI/Core/Defaults/Profile.lua +++ b/ElvUI/Core/Defaults/Profile.lua @@ -2816,7 +2816,7 @@ P.actionbar.bar1.paging.ROGUE = '[bonusbar:1] 7;'..(E.Wrath and ' [bonusbar:2] 8 P.actionbar.bar1.paging.WARLOCK = E.Wrath and '[form:1] 7;' or nil P.actionbar.bar1.paging.DRUID = '[bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 8; [bonusbar:2] 10; [bonusbar:3] 9; [bonusbar:4] 10;' P.actionbar.bar1.paging.EVOKER = '[bonusbar:1] 7;' -P.actionbar.bar1.paging.PRIEST = '[bonusbar:1] 7;' +P.actionbar.bar1.paging.PRIEST = '[bonusbar:1] 7;'..(E.Classic and ' [possessbar] 16;' or '') P.actionbar.bar1.paging.WARRIOR = '[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;' P.actionbar.bar3.enabled = true From 50d76424539292452f5071d1b0f942b53e3da9c0 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 17:05:30 -0500 Subject: [PATCH 44/70] locales + whats new --- ElvUI_Options/Core/ActionBars.lua | 8 ++++---- ElvUI_Options/Core/Bags.lua | 2 +- ElvUI_Options/Core/UnitFrames.lua | 2 +- ElvUI_Options/Locales/deDE.lua | 3 ++- ElvUI_Options/Locales/enUS.lua | 3 ++- ElvUI_Options/Locales/esMX.lua | 3 ++- ElvUI_Options/Locales/frFR.lua | 3 ++- ElvUI_Options/Locales/itIT.lua | 3 ++- ElvUI_Options/Locales/koKR.lua | 3 ++- ElvUI_Options/Locales/ptBR.lua | 3 ++- ElvUI_Options/Locales/ruRU.lua | 3 ++- ElvUI_Options/Locales/trTR.lua | 3 ++- ElvUI_Options/Locales/zhCN.lua | 3 ++- ElvUI_Options/Locales/zhTW.lua | 3 ++- 14 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ElvUI_Options/Core/ActionBars.lua b/ElvUI_Options/Core/ActionBars.lua index 1a6286220c..3c833803aa 100644 --- a/ElvUI_Options/Core/ActionBars.lua +++ b/ElvUI_Options/Core/ActionBars.lua @@ -135,7 +135,7 @@ general.args.generalGroup.args.chargeCooldown = ACH:Toggle(L["Charge Cooldown Te general.args.generalGroup.args.desaturateOnCooldown = ACH:Toggle(L["Desaturate Cooldowns"], nil, 11, nil, nil, nil, nil, function(info, value) E.db.actionbar[info[#info]] = value AB:ToggleCooldownOptions() end) general.args.generalGroup.args.transparent = ACH:Toggle(L["Transparent"], nil, 12, nil, nil, nil, nil, function(info, value) E.db.actionbar[info[#info]] = value E.ShowPopup = true end) general.args.generalGroup.args.flashAnimation = ACH:Toggle(L["Button Flash"], L["Use a more visible flash animation for Auto Attacks."], 13, nil, nil, nil, nil, function(info, value) E.db.actionbar[info[#info]] = value E.ShowPopup = true end) -general.args.generalGroup.args.equippedItem = ACH:Toggle(L["Equipped Item Color"], nil, 14) +general.args.generalGroup.args.equippedItem = ACH:Toggle(L["Equipped Item"], nil, 14) general.args.generalGroup.args.useRangeColorText = ACH:Toggle(L["Color Keybind Text"], L["Color Keybind Text when Out of Range, instead of the button."], 15) general.args.generalGroup.args.handleOverlay = ACH:Toggle(L["Action Button Glow"], nil, 16) @@ -160,8 +160,8 @@ general.args.colorGroup.args.usableColor = ACH:Color(L["Usable"], L["Color of th general.args.colorGroup.args.notUsableColor = ACH:Color(L["Not Usable"], L["Color of the actionbutton when not usable."], 4) general.args.colorGroup.args.colorSwipeNormal = ACH:Color(L["Swipe: Normal"], nil, 5, true) general.args.colorGroup.args.colorSwipeLOC = ACH:Color(L["Swipe: Loss of Control"], nil, 6, true, nil, nil, nil, nil, not E.Retail) -general.args.colorGroup.args.equippedItemColor = ACH:Color(L["Equipped Item Color"], nil, 7) -general.args.colorGroup.args.targetReticleColor = ACH:Color(L["Target Reticle Color"], nil, 8) +general.args.colorGroup.args.equippedItemColor = ACH:Color(L["Equipped Item"], nil, 7) +general.args.colorGroup.args.targetReticleColor = ACH:Color(E.NewSign..L["Target Reticle"], nil, 8) general.args.applyGroup = ACH:Group(L["Apply To All"], nil, 35, nil, function(info) return E.db.actionbar[info[#info]] end, function(info, value) E.db.actionbar[info[#info]] = value AB:ApplyTextOption(info[#info], value, info[#info - 1] == 'fontGroup') end) general.args.applyGroup.args.fontGroup = ACH:Group(L["Font Group"], nil, 1) @@ -336,7 +336,7 @@ local function CreateBarOptions(num) bar.args.generalOptions.values.keepSizeRatio = L["Keep Size Ratio"] if E.Retail then - bar.args.generalOptions.values.targetReticle = L["Target Reticle"] + bar.args.generalOptions.values.targetReticle = E.NewSign..L["Target Reticle"] end bar.args.barGroup.args.flyoutDirection = ACH:Select(L["Flyout Direction"], nil, 3, { UP = L["Up"], DOWN = L["Down"], LEFT = L["Left"], RIGHT = L["Right"], AUTOMATIC = L["Automatic"] }, nil, nil, nil, function(info, value) E.db.actionbar[barNumber][info[#info]] = value AB:UpdateButtonSettings(barNumber) end) diff --git a/ElvUI_Options/Core/Bags.lua b/ElvUI_Options/Core/Bags.lua index 5ca42006cc..147db471ab 100644 --- a/ElvUI_Options/Core/Bags.lua +++ b/ElvUI_Options/Core/Bags.lua @@ -145,7 +145,7 @@ if E.Retail then Bags.args.general.args.autoToggle.args.toggles.values.soulBind = L["Soul Binds"] end -Bags.args.general.args.spinnerGroup = ACH:Group(E.NewSign..L["Sort Spinner"], nil, 12, nil, function(info) return E.db.bags.spinner[info[#info]] end, function(info, value) E.db.bags.spinner[info[#info]] = value end) +Bags.args.general.args.spinnerGroup = ACH:Group(L["Sort Spinner"], nil, 12, nil, function(info) return E.db.bags.spinner[info[#info]] end, function(info, value) E.db.bags.spinner[info[#info]] = value end) Bags.args.general.args.spinnerGroup.args.enable = ACH:Toggle(L["Enable"], nil, 1) Bags.args.general.args.spinnerGroup.args.size = ACH:Range(L["Size"], nil, 2, { min = 20, max = 80, step = 1 }) Bags.args.general.args.spinnerGroup.args.color = ACH:Color(L["COLOR"], nil, 3, nil, nil, function(info) local t = E.db.bags.spinner[info[#info]] local d = P.bags.spinner[info[#info]] return t.r, t.g, t.b, t.a, d.r, d.g, d.b end, function(info, r, g, b) local t = E.db.bags.spinner[info[#info]] t.r, t.g, t.b = r, g, b end) diff --git a/ElvUI_Options/Core/UnitFrames.lua b/ElvUI_Options/Core/UnitFrames.lua index 02ba258357..55f2f4051f 100644 --- a/ElvUI_Options/Core/UnitFrames.lua +++ b/ElvUI_Options/Core/UnitFrames.lua @@ -285,7 +285,7 @@ local function GetOptionsTable_AuraWatch(updateFunc, groupName, numGroup, subGro config.args.generalGroup.args.configureButton = ACH:Execute(L["Configure Auras"], nil, 3, function() local configString = format('Aura Indicator (%s)', groupName == 'pet' and 'Pet' or E.db.unitframe.units[groupName].buffIndicator.profileSpecific and 'Profile' or 'Class') C:SetToFilterConfig(configString) end) config.args.generalGroup.inline = true - config.args.countGroup = ACH:Group(E.NewSign..L["Count Text"], nil, 15) + config.args.countGroup = ACH:Group(L["Count Text"], nil, 15) config.args.countGroup.args.countFont = ACH:SharedMediaFont(L["Font"], nil, 1) config.args.countGroup.args.countFontSize = ACH:Range(L["Font Size"], nil, 2, { min = 4, max = 24, step = 1 }) config.args.countGroup.args.countFontOutline = ACH:FontFlags(L["Font Outline"], L["Set the font outline."], 3) diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua index 1614d47db2..5a39ff88dc 100644 --- a/ElvUI_Options/Locales/deDE.lua +++ b/ElvUI_Options/Locales/deDE.lua @@ -593,7 +593,8 @@ L["ENERGY"] = "Energie" L["Energy/Mana Regen Tick"] = "Energie/Mana Regenerations Tick" L["Engineering"] = "Ingenieurskunst" L["Enhanced PVP Messages"] = "Erweiterte PvP Nachrichten" -L["Equipped Item Color"] = "Farbe des ausgerüsteten Gegenstands" +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = "Ausgerüstet" L["Error decoding data. Import string may be corrupted!"] = "Fehler beim entschlüsseln der Daten. Die importierende Zeichenfolge scheint beschädigt zu sein!" L["Error exporting profile!"] = "Fehler beim Exportieren des Profils!" diff --git a/ElvUI_Options/Locales/enUS.lua b/ElvUI_Options/Locales/enUS.lua index 9ad81ee666..62b9903ba7 100644 --- a/ElvUI_Options/Locales/enUS.lua +++ b/ElvUI_Options/Locales/enUS.lua @@ -594,7 +594,8 @@ L["ENERGY"] = "Energy" L["Energy/Mana Regen Tick"] = true L["Engineering"] = true L["Enhanced PVP Messages"] = true -L["Equipped Item Color"] = true +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = true L["Error exporting profile!"] = true diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index 32bd511819..b82937b774 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -594,7 +594,8 @@ L["ENERGY"] = "Energía" L["Energy/Mana Regen Tick"] = true L["Engineering"] = true L["Enhanced PVP Messages"] = true -L["Equipped Item Color"] = true +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = true L["Error exporting profile!"] = true diff --git a/ElvUI_Options/Locales/frFR.lua b/ElvUI_Options/Locales/frFR.lua index ca4a0bb2a8..b3bea92922 100644 --- a/ElvUI_Options/Locales/frFR.lua +++ b/ElvUI_Options/Locales/frFR.lua @@ -594,7 +594,8 @@ L["ENERGY"] = "Énergie" L["Energy/Mana Regen Tick"] = "Tick Régénération Énergie/Mana" L["Engineering"] = "Ingénierie" L["Enhanced PVP Messages"] = "Messages PVP améliorés" -L["Equipped Item Color"] = "Couleur de l'objet équipé" +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = "Équipé" L["Error decoding data. Import string may be corrupted!"] = "Erreur lors du décodage des données. Celles-ci sont peut être corropues" L["Error exporting profile!"] = "Erreur d'exportation du profil" diff --git a/ElvUI_Options/Locales/itIT.lua b/ElvUI_Options/Locales/itIT.lua index 12f00d2fbe..fe918164b9 100644 --- a/ElvUI_Options/Locales/itIT.lua +++ b/ElvUI_Options/Locales/itIT.lua @@ -593,7 +593,8 @@ L["ENERGY"] = "Energy" L["Energy/Mana Regen Tick"] = true L["Engineering"] = true L["Enhanced PVP Messages"] = true -L["Equipped Item Color"] = true +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = true L["Error exporting profile!"] = true diff --git a/ElvUI_Options/Locales/koKR.lua b/ElvUI_Options/Locales/koKR.lua index 044ae4a234..bdb0e2b015 100644 --- a/ElvUI_Options/Locales/koKR.lua +++ b/ElvUI_Options/Locales/koKR.lua @@ -604,7 +604,8 @@ L["ENERGY"] = "기력" L["Energy/Mana Regen Tick"] = "기력/마나 재생 틱" L["Engineering"] = "기계공학" L["Enhanced PVP Messages"] = "향상된 PVP 메시지" -L["Equipped Item Color"] = "착용중 아이탬 색상" +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = "착용" L["Error decoding data. Import string may be corrupted!"] = "데이터 해독에 오류. 문자열 가져오기가 오염된 것 같습니다!" L["Error exporting profile!"] = "프로필 내보내기 오류!" diff --git a/ElvUI_Options/Locales/ptBR.lua b/ElvUI_Options/Locales/ptBR.lua index fa3c1efd71..7df994c99f 100644 --- a/ElvUI_Options/Locales/ptBR.lua +++ b/ElvUI_Options/Locales/ptBR.lua @@ -594,7 +594,8 @@ L["ENERGY"] = "Energia" L["Energy/Mana Regen Tick"] = true L["Engineering"] = "Engenharia" L["Enhanced PVP Messages"] = "Melhorias nas mensagens PVP" -L["Equipped Item Color"] = true +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "Erro ao decodificar os dados. A string de importação pode estar corrompida!" L["Error exporting profile!"] = "Erro ao exportar perfil!" diff --git a/ElvUI_Options/Locales/ruRU.lua b/ElvUI_Options/Locales/ruRU.lua index e10f0d9903..0f6e49bef0 100644 --- a/ElvUI_Options/Locales/ruRU.lua +++ b/ElvUI_Options/Locales/ruRU.lua @@ -601,7 +601,8 @@ L["ENERGY"] = "Энергия" L["Energy/Mana Regen Tick"] = "Метка восстановления маны/энергии" L["Engineering"] = "Инженерия" L["Enhanced PVP Messages"] = "Улучшенные PvP сообщения" -L["Equipped Item Color"] = "Цвет одетых предметов" +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = "Надето" L["Error decoding data. Import string may be corrupted!"] = "Ошибка при кодировании. Импортируемая строка может быть повреждена!" L["Error exporting profile!"] = "Ошибка при экспорте профиля!" diff --git a/ElvUI_Options/Locales/trTR.lua b/ElvUI_Options/Locales/trTR.lua index 8383d1a88d..211fc15539 100644 --- a/ElvUI_Options/Locales/trTR.lua +++ b/ElvUI_Options/Locales/trTR.lua @@ -594,7 +594,8 @@ L["ENERGY"] = "Energy" L["Energy/Mana Regen Tick"] = true L["Engineering"] = "Muhendislik" L["Enhanced PVP Messages"] = "Gelistirilmis PVP Mesajlari" -L["Equipped Item Color"] = "Kusanilmis Esya Rengi" +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "Veri kodu cozulurken hata olustu. Ice aktarma dizesi bozulmus olabilir!" L["Error exporting profile!"] = "Profil disa aktarilirken hata olustu!" diff --git a/ElvUI_Options/Locales/zhCN.lua b/ElvUI_Options/Locales/zhCN.lua index c207782091..a9f2e98ec4 100644 --- a/ElvUI_Options/Locales/zhCN.lua +++ b/ElvUI_Options/Locales/zhCN.lua @@ -594,7 +594,8 @@ L["ENERGY"] = "能量" L["Energy/Mana Regen Tick"] = true L["Engineering"] = "工程" L["Enhanced PVP Messages"] = "PVP增强信息" -L["Equipped Item Color"] = "已装备物品颜色" +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "解码错误.导入的字符串可能已损坏！" L["Error exporting profile!"] = "导出配置文件失败" diff --git a/ElvUI_Options/Locales/zhTW.lua b/ElvUI_Options/Locales/zhTW.lua index 9591948ff7..976417f430 100644 --- a/ElvUI_Options/Locales/zhTW.lua +++ b/ElvUI_Options/Locales/zhTW.lua @@ -594,7 +594,8 @@ L["ENERGY"] = "能量" L["Energy/Mana Regen Tick"] = true L["Engineering"] = "工程學" L["Enhanced PVP Messages"] = "PVP增強信息" -L["Equipped Item Color"] = "已裝備物品顏色" +L["Equipped Item"] = true +L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "解碼錯誤.導出字符串可能已損壞！" L["Error exporting profile!"] = "導出配置文件失敗" From 45d68ec66ff6fd0d04e48384652723237ab43930 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 17:09:11 -0500 Subject: [PATCH 45/70] sort locales --- ElvUI_Options/Locales/deDE.lua | 20 +++++++---------- ElvUI_Options/Locales/enUS.lua | 14 ++++++------ ElvUI_Options/Locales/esMX.lua | 16 ++++++------- ElvUI_Options/Locales/frFR.lua | 18 +++++++-------- ElvUI_Options/Locales/itIT.lua | 16 ++++++------- ElvUI_Options/Locales/koKR.lua | 41 +++++++++++++++++----------------- ElvUI_Options/Locales/ptBR.lua | 16 ++++++------- ElvUI_Options/Locales/ruRU.lua | 20 ++++++++--------- ElvUI_Options/Locales/trTR.lua | 16 ++++++------- ElvUI_Options/Locales/zhCN.lua | 16 ++++++------- ElvUI_Options/Locales/zhTW.lua | 16 ++++++------- 11 files changed, 102 insertions(+), 107 deletions(-) diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua index 5a39ff88dc..e87dcb0402 100644 --- a/ElvUI_Options/Locales/deDE.lua +++ b/ElvUI_Options/Locales/deDE.lua @@ -16,12 +16,6 @@ L["LEFT"] = "Links" L["RIGHT"] = "Rechts" L["TOP"] = "Oben" -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = "Bibliotheks Dropdown" -L["On Me"] = "Auf Mir" -L["On Pet"] = "Auf Begleiter" -L["Tag Update Rate"] = "Tag Aktualisierungsrate" -L["Maximum tick rate allowed for tag updates per second."] = "Maximal zulässige Tickrate für Tag Updates pro Sekunde." L["%s and then %s"] = "%s und dann %s" L["24-Hour Time"] = "24-Stunden Format" L["2D"] = "2D" @@ -186,8 +180,8 @@ L["Bags Only"] = "Nur Taschen" L["Bags/Bank"] = "Taschen/Bank" L["Bank %d"] = true L["Bank Only"] = "Nur Bank" -L["Bar %s is used for stance or forms.\nYou will have to adjust paging to use this bar.\nAre you sure?"] = "Diese Leiste %s ist für Haltungen oder Formen.\nDu musst die Sichtbarkeit dieser Leiste anpassen um sie zu nutzen.\nBist du sicher?" L["Bar %s is used for stance or forms.\nYou will have to adjust paging to use this bar.\nAre you sure?"] = "Der Balken %s wird für Haltungen oder Formen verwendet.\nDu musst die Paging Funktion anpassen, um diesen Balken zu verwenden.\nBist Du sicher?" +L["Bar %s is used for stance or forms.\nYou will have to adjust paging to use this bar.\nAre you sure?"] = "Diese Leiste %s ist für Haltungen oder Formen.\nDu musst die Sichtbarkeit dieser Leiste anpassen um sie zu nutzen.\nBist du sicher?" L["Bar Direction"] = "Leistenrichtung" L["Bar Settings"] = "Leisten Einstellungen" L["BARBERSHOP"] = "Barbier" @@ -463,6 +457,7 @@ L["DEATH_RECAP_TITLE"] = "Todesursache" L["Debuff Highlighting"] = "Hervorhebung von Schwächungszaubern" L["Debuffs on Buffs"] = "Schwächungszauber auf Stärkungszauber" L["Debug Tools"] = "Debug Werkzeuge" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "Dezimalstellen" L["Decode Text"] = "Entschlüsselter Text" L["Decode"] = "Entschlüsseln" @@ -594,7 +589,6 @@ L["Energy/Mana Regen Tick"] = "Energie/Mana Regenerations Tick" L["Engineering"] = "Ingenieurskunst" L["Enhanced PVP Messages"] = "Erweiterte PvP Nachrichten" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = "Ausgerüstet" L["Error decoding data. Import string may be corrupted!"] = "Fehler beim entschlüsseln der Daten. Die importierende Zeichenfolge scheint beschädigt zu sein!" L["Error exporting profile!"] = "Fehler beim Exportieren des Profils!" @@ -996,6 +990,7 @@ L["LEVEL_BOSS"] = "Setze das Level auf -1 für Boss Einheiten oder auf 0 um zu d L["LF Guild Frame"] = "LF Gildenfenster" L["LFG Queue"] = "LFG Warteschlange" L["LFG_TITLE"] = "Suche nach Gruppe" +L["Library Dropdown"] = "Bibliotheks Dropdown" L["Limit the number of rows or columns."] = "Beschränkung für die Anzahl an Leisten oder Spalten." L["Lines"] = "Zeilen" L["Link to the latest development version."] = "Link zur neusten Entwicklungsversion." @@ -1059,6 +1054,7 @@ L["Max Overflow"] = "Maximaler Überlauf" L["Max Wraps"] = "Maximale Leisten" L["Maximum Duration"] = "Maximale Dauer" L["Maximum Level"] = "Maximales Level" +L["Maximum tick rate allowed for tag updates per second."] = "Maximal zulässige Tickrate für Tag Updates pro Sekunde." L["Maximum Time Left"] = "Max. Zeit verbleibend" L["Media"] = "Medien" L["Medium"] = "Mittel" @@ -1182,8 +1178,9 @@ L["Officer"] = "Offizier" L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "Versatz der Kraftleiste zu der Lebensleiste. Setze es auf 0 um den Versatz zu deaktivieren." L["Offset"] = "Versatz" L["On Cooldown"] = "Auf Abklingzeit" +L["On Me"] = "Auf Mir" +L["On Pet"] = "Auf Begleiter" L["On screen positions for different elements."] = "Position der verschiedenen Elemente." --- L["On screen positions for different elements."] = "Bildschirmpositionen für verschiedene Elemente." --from core L["Only Free Slots"] = "Nur freie Slots" L["Only highlight the aura that originated from you and not others."] = "Hebe nur die Aura hervor, die von dir ausgeht und nicht von anderen." L["Only load nameplates for units within this range."] = true @@ -1601,6 +1598,7 @@ L["Tab Panels"] = true L["Tab Selector"] = "Tabauswahl" L["Tabard Frame"] = "Wappenrockfenster" L["Table"] = "Tabelle" +L["Tag Update Rate"] = "Tag Aktualisierungsrate" L["Tagged NPC"] = "Ausgewählter NPC" L["TALENTS"] = "Talente" L["Talking Head Backdrop"] = "Sprechender Kopf Hintergrund" @@ -1619,6 +1617,7 @@ L["Target Indicator Color"] = "Ziel Indikatorfarbe" L["Target Info"] = "Zielinfo" L["Target Marker Icon"] = "Zielmarkierungssymbol" L["Target On Mouse-Down"] = "Ziel bei Maus-Runter" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Ziele auf Einheiten mit gedrückter Maus runter statt Maus hoch.\n|cffff3333Note:|r Wenn Clique aktiviert ist, wirkt sich diese Option nur auf ElvUI Fenster aus, wenn sie nicht auf der schwarzen Liste in Clique stehen." L["Target"] = "Ziel" L["Target/Low Health Indicator"] = "Ziel-/Geringer Leben Indikator" @@ -1777,7 +1776,6 @@ L["Unitframe Thin Borders"] = "Einheitsfenster Dünne Rahmen" L["Unitframes Border"] = "Einheitsfenster Rahmen" L["UnitFrames"] = "Einheitenfenster" L["Unlock various elements of the UI to be repositioned."] = "Schalte verschiedene Elemente der Benutzeroberfläche frei, um sie neu zu positionieren." --- L["Unlock various elements of the UI to be repositioned."] = "Schalte verschiedene Elemente der Benutzeroberfläche frei, die neu positioniert werden sollen." --from core L["Up"] = "Hinauf" L["Upgrade Icon"] = "Upgrade Symbol" L["URL Links"] = "URL Links" @@ -1864,9 +1862,7 @@ L["Y-Offset"] = "Y-Versatz" L["Yell"] = "Schreien" L["You are about to reset paging. Are you sure?"] = "Du bist im Begriff, die Paging Funktion zurückzusetzen. Bist Du Dir sicher?" L["You are going to copy settings for |cffD3CF00\"%s\"|r from your current |cff4beb2c\"%s\"|r profile to |cff4beb2c\"%s\"|r profile. Are you sure?"] = "Du möchtest Einstellungen für |cffD3CF00\"%s\"|r von deinem derzeitigen |cff4beb2c\"%s\"|r Profil zu |cff4beb2c\"%s\"|r Profil kopieren. Bist du sicher?" --- L["You are going to copy settings for |cffD3CF00\"%s\"|r from your current |cff4beb2c\"%s\"|r profile to |cff4beb2c\"%s\"|r profile. Are you sure?"] = "Du wirst die Einstellungen für |cffD3CF00\"%s\"|r von deinem aktuellen |cff4beb2c\"%s\"|r-Profil in das |cff4beb2c\"%s\"|r-Profil kopieren. Bist du sicher?" --from core L["You are going to copy settings for |cffD3CF00\"%s\"|r from |cff4beb2c\"%s\"|r profile to your current |cff4beb2c\"%s\"|r profile. Are you sure?"] = "Du möchtest Einstellungen für |cffD3CF00\"%s\"|r Profil zu deinem aktuellem |cff4beb2c\"%s\"|r Profil kopieren. Bist du sicher?" --- L["You are going to copy settings for |cffD3CF00\"%s\"|r from |cff4beb2c\"%s\"|r profile to your current |cff4beb2c\"%s\"|r profile. Are you sure?"] = "Du wirst die Einstellungen für |cffD3CF00\"%s\"|r aus dem |cff4beb2c\"%s\"|r-Profil in dein aktuelles |cff4beb2c\"%s\"|r-Profil kopieren. Bist du sicher?" --From core L["You cannot copy settings from the same unit."] = "Du kannst keine Einstellungen vom selben Gerät kopieren." L["You cannot copy settings from the same unit."] = "Du kannst keine Einstellungen von der gleichen Einheit kopieren." L["You do not need to use Is Casting Anything or Is Channeling Anything for these spells to trigger."] = "Du brauchst nicht Ist irgendetwas am Zaubern oder Ist irgendetwas am Kanalisieren für die Zauber auswählen um Auszulösen." diff --git a/ElvUI_Options/Locales/enUS.lua b/ElvUI_Options/Locales/enUS.lua index 62b9903ba7..c5946ba837 100644 --- a/ElvUI_Options/Locales/enUS.lua +++ b/ElvUI_Options/Locales/enUS.lua @@ -16,12 +16,6 @@ L["LEFT"] = true L["RIGHT"] = true L["TOP"] = true -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = true -L["On Pet"] = true -L["Tag Update Rate"] = true -L["Maximum tick rate allowed for tag updates per second."] = true L["%s and then %s"] = true L["24-Hour Time"] = true L["2D"] = true @@ -464,6 +458,7 @@ L["DEATH_RECAP_TITLE"] = "Death Recap" L["Debuff Highlighting"] = true L["Debuffs on Buffs"] = true L["Debug Tools"] = true +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = true L["Decode Text"] = true L["Decode"] = true @@ -595,7 +590,6 @@ L["Energy/Mana Regen Tick"] = true L["Engineering"] = true L["Enhanced PVP Messages"] = true L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = true L["Error exporting profile!"] = true @@ -997,6 +991,7 @@ L["LEVEL_BOSS"] = "Set level to -1 for boss units or set to 0 to disable." L["LF Guild Frame"] = true L["LFG Queue"] = true L["LFG_TITLE"] = "Looking For Group" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = true L["Lines"] = true L["Link to the latest development version."] = true @@ -1060,6 +1055,7 @@ L["Max Overflow"] = true L["Max Wraps"] = true L["Maximum Duration"] = true L["Maximum Level"] = true +L["Maximum tick rate allowed for tag updates per second."] = true L["Maximum Time Left"] = true L["Media"] = true L["Medium"] = true @@ -1183,6 +1179,8 @@ L["Officer"] = true L["Offset of the powerbar to the healthbar, set to 0 to disable."] = true L["Offset"] = true L["On Cooldown"] = true +L["On Me"] = true +L["On Pet"] = true L["On screen positions for different elements."] = true L["Only Free Slots"] = true L["Only highlight the aura that originated from you and not others."] = true @@ -1600,6 +1598,7 @@ L["Tab Panels"] = true L["Tab Selector"] = true L["Tabard Frame"] = true L["Table"] = true +L["Tag Update Rate"] = true L["Tagged NPC"] = true L["TALENTS"] = "Talents" L["Talking Head Backdrop"] = true @@ -1618,6 +1617,7 @@ L["Target Indicator Color"] = true L["Target Info"] = true L["Target Marker Icon"] = true L["Target On Mouse-Down"] = true +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = true L["Target"] = true L["Target/Low Health Indicator"] = true diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index b82937b774..27cae4f54b 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -16,12 +16,6 @@ L["LEFT"] = true L["RIGHT"] = true L["TOP"] = true -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = "En Mí" -L["On Pet"] = "En Mascota" -L["Tag Update Rate"] = "Tasa de actualización de Tags." -L["Maximum tick rate allowed for tag updates per second."] = "Tasa máxima de tick permitida para actualizaciones de Tags por segundo." L["%s and then %s"] = "%s y entonces %s" L["24-Hour Time"] = "Tiempo de 24 horas" L["2D"] = "2D" @@ -464,6 +458,7 @@ L["DEATH_RECAP_TITLE"] = "Resumen de la muerte" L["Debuff Highlighting"] = "Resaltado de Perjuicio" L["Debuffs on Buffs"] = true L["Debug Tools"] = "Herramientas de Depuración" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "Longitud Decimal" L["Decode Text"] = "Decodificar texto" L["Decode"] = true @@ -595,7 +590,6 @@ L["Energy/Mana Regen Tick"] = true L["Engineering"] = true L["Enhanced PVP Messages"] = true L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = true L["Error exporting profile!"] = true @@ -882,8 +876,8 @@ L["Ignore mouse events."] = "Ignorar los eventos del ratón" L["Ignored Items (Global)"] = "Objetos ignorados (Global)" L["Ignored Items (Profile)"] = "Objetos ignorados (Perfil)" L["Import Now"] = true -L["Import"] = true L["Import Profile"] = true +L["Import"] = true L["Importing"] = true L["In Combat Label"] = true L["In Combat"] = true @@ -997,6 +991,7 @@ L["LEVEL_BOSS"] = "Set level to -1 for boss units or set to 0 to disable." L["LF Guild Frame"] = "Búsqueda de Hermandad" L["LFG Queue"] = true L["LFG_TITLE"] = "Buscar grupo" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = "Limita el número de filas o de columnas." L["Lines"] = true L["Link to the latest development version."] = true @@ -1060,6 +1055,7 @@ L["Max Overflow"] = true L["Max Wraps"] = "Filas/Columnas Máximas" L["Maximum Duration"] = true L["Maximum Level"] = true +L["Maximum tick rate allowed for tag updates per second."] = "Tasa máxima de tick permitida para actualizaciones de Tags por segundo." L["Maximum Time Left"] = true L["Media"] = "Medios" L["Medium"] = true @@ -1183,6 +1179,8 @@ L["Officer"] = true L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "Desplazamiento de la barra de poder sobre la barra de salud, 0 para desactivar." L["Offset"] = "Desplazamiento" L["On Cooldown"] = true +L["On Me"] = "En Mí" +L["On Pet"] = "En Mascota" L["On screen positions for different elements."] = true L["Only Free Slots"] = true L["Only highlight the aura that originated from you and not others."] = true @@ -1601,6 +1599,7 @@ L["Tab Panels"] = true L["Tab Selector"] = true L["Tabard Frame"] = "Tabardos" L["Table"] = true +L["Tag Update Rate"] = "Tasa de actualización de Tags." L["Tagged NPC"] = true L["TALENTS"] = "Talentos" L["Talking Head Backdrop"] = true @@ -1619,6 +1618,7 @@ L["Target Indicator Color"] = true L["Target Info"] = true L["Target Marker Icon"] = true L["Target On Mouse-Down"] = "Apuntar al Presionar el Botón del Ratón" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = true L["Target"] = true L["Target/Low Health Indicator"] = true diff --git a/ElvUI_Options/Locales/frFR.lua b/ElvUI_Options/Locales/frFR.lua index b3bea92922..d580e358e4 100644 --- a/ElvUI_Options/Locales/frFR.lua +++ b/ElvUI_Options/Locales/frFR.lua @@ -16,12 +16,6 @@ L["LEFT"] = "GAUCHE" L["RIGHT"] = "DROITE" L["TOP"] = "HAUT" -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = "Liste déroulante de la bibliothèque" -L["On Me"] = "Sur moi" -L["On Pet"] = "Sur le familier" -L["Tag Update Rate"] = "Taux de mise à jour des balises" -L["Maximum tick rate allowed for tag updates per second."] = "Taux maximal de mise à jour des balises autorisé par seconde." L["%s and then %s"] = "%s et alors %s" L["24-Hour Time"] = "Mode 24 Heures" L["2D"] = true @@ -464,6 +458,7 @@ L["DEATH_RECAP_TITLE"] = "Circonstances de la mort" L["Debuff Highlighting"] = "Surbrillance des affaiblissements" L["Debuffs on Buffs"] = "Affaiblissements sur Améliorations" L["Debug Tools"] = "Outils de débogage" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "Chiffres après la virgule" L["Decode Text"] = "Texte décodé" L["Decode"] = true @@ -595,7 +590,6 @@ L["Energy/Mana Regen Tick"] = "Tick Régénération Énergie/Mana" L["Engineering"] = "Ingénierie" L["Enhanced PVP Messages"] = "Messages PVP améliorés" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = "Équipé" L["Error decoding data. Import string may be corrupted!"] = "Erreur lors du décodage des données. Celles-ci sont peut être corropues" L["Error exporting profile!"] = "Erreur d'exportation du profil" @@ -858,7 +852,7 @@ L["If enabled then the filter will only activate when you are not focusing the u L["If enabled then the filter will only activate when you are not in a Vehicle."] = "Si activé, le filtre ne s'activera que lorsque vous n'êtes pas dans un véhicule." L["If enabled then the filter will only activate when you are not targeting the unit."] = "Si activé, le filtre ne s'activera que lorsque vous ne ciblez pas l'unité." L["If enabled then the filter will only activate when you are out of combat."] = "Si activé, le filtre ne s'activera que lorsque vous êtes hors combat." -L["If enabled then the filter will only activate when you are resting at an Inn."] = "Si activé, le filtre ne s'activera que lorsque vous vous reposez dans une auberge." +L["If enabled then the filter will only activate when you are resting at an Inn."] = "Si activé, le filtre ne s'activera que lorsque vous vous reposez dans une auberge." L["If enabled, the style filter will only activate when you are in one of the instances specified in Instance ID."] = "Si activé, le filtre de style ne s'activera que lorsque vous serez dans l'une des instances spécifiées dans l'ID d'instance." L["If enabled, the style filter will only activate when you are in one of the maps specified in Map ID."] = "Si activé, le filtre de style ne s'activera que lorsque vous serez dans l'une des cartes spécifiées dans l'ID de carte." L["If enabled, the style filter will only activate when you are in one of the subzones specified in Add Subzone Name."] = "Si activé, le filtre de style ne s'activera que lorsque vous serez dans l'une des sous-zones spécifiées dans Ajouter le nom de la sous-zone." @@ -880,8 +874,8 @@ L["Ignore mouse events."] = "Ignorer les événements de la souris." L["Ignored Items (Global)"] = true L["Ignored Items (Profile)"] = true L["Import Now"] = "Importer maintenant" -L["Import"] = "Importer" L["Import Profile"] = "Importer le profil" +L["Import"] = "Importer" L["Importing"] = "Importation en cours" L["In Combat Label"] = "Étiquette en combat" L["In Combat"] = "En combat" @@ -994,6 +988,7 @@ L["LEVEL_BOSS"] = "Set level to -1 for boss units or set to 0 to disable." L["LF Guild Frame"] = "Recherche de Guilde" L["LFG Queue"] = "Outil raid" L["LFG_TITLE"] = "Recherche de groupe" +L["Library Dropdown"] = "Liste déroulante de la bibliothèque" L["Limit the number of rows or columns."] = "Limiter le nombre de lignes ou de colonnes." L["Lines"] = "Lignes" L["Link to the latest development version."] = "Lien vers la dernière version de développement." @@ -1057,6 +1052,7 @@ L["Max Overflow"] = "Dépassement maximum" L["Max Wraps"] = "Retour à la ligne maximale" L["Maximum Duration"] = "Durée maximum" L["Maximum Level"] = "Niveau maximum" +L["Maximum tick rate allowed for tag updates per second."] = "Taux maximal de mise à jour des balises autorisé par seconde." L["Maximum Time Left"] = "Temps maximal restant" L["Media"] = "Médias" L["Medium"] = "Moyen" @@ -1180,6 +1176,8 @@ L["Officer"] = "Officier" L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "Décalage de la barre de pouvoir à la barre de vie, mettre 0 pour désactiver." L["Offset"] = "Décalage" L["On Cooldown"] = "Sur Cooldown" +L["On Me"] = "Sur moi" +L["On Pet"] = "Sur le familier" L["On screen positions for different elements."] = "Positions à l'écran pour différents éléments." L["Only Free Slots"] = "Uniquement les emplacements libres" L["Only highlight the aura that originated from you and not others."] = "Ne surligne que les auras d'origine de votre personnage et pas celles des autres." @@ -1598,6 +1596,7 @@ L["Tab Panels"] = "Panneaux d'onglets" L["Tab Selector"] = "Sélecteur d'onglet" L["Tabard Frame"] = "Cadre du tabard" L["Table"] = "Tableau" +L["Tag Update Rate"] = "Taux de mise à jour des balises" L["Tagged NPC"] = "PNJ marqué" L["TALENTS"] = "Talents" L["Talking Head Backdrop"] = "Fond de la fenêtre de dialogue flottante" @@ -1616,6 +1615,7 @@ L["Target Indicator Color"] = "Couleur de l'indicateur de cible" L["Target Info"] = "Info de la cible" L["Target Marker Icon"] = "Icône de marqueur de cible" L["Target On Mouse-Down"] = "Cibler lors d'un appui sur le clic (et non pas en relachant le clic)" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = true L["Target"] = "Cible" L["Target/Low Health Indicator"] = "Indicateur de la cible" diff --git a/ElvUI_Options/Locales/itIT.lua b/ElvUI_Options/Locales/itIT.lua index fe918164b9..50e19edc0d 100644 --- a/ElvUI_Options/Locales/itIT.lua +++ b/ElvUI_Options/Locales/itIT.lua @@ -16,12 +16,6 @@ L["LEFT"] = true L["RIGHT"] = true L["TOP"] = true -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = true -L["On Pet"] = true -L["Tag Update Rate"] = true -L["Maximum tick rate allowed for tag updates per second."] = true L["%s and then %s"] = true L["24-Hour Time"] = true L["2D"] = true @@ -463,6 +457,7 @@ L["DEATH_RECAP_TITLE"] = "Death Recap" L["Debuff Highlighting"] = true L["Debuffs on Buffs"] = true L["Debug Tools"] = true +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = true L["Decode Text"] = true L["Decode"] = true @@ -594,7 +589,6 @@ L["Energy/Mana Regen Tick"] = true L["Engineering"] = true L["Enhanced PVP Messages"] = true L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = true L["Error exporting profile!"] = true @@ -881,8 +875,8 @@ L["Ignore mouse events."] = true L["Ignored Items (Global)"] = true L["Ignored Items (Profile)"] = true L["Import Now"] = true -L["Import"] = true L["Import Profile"] = true +L["Import"] = true L["Importing"] = true L["In Combat Label"] = true L["In Combat"] = true @@ -996,6 +990,7 @@ L["LEVEL_BOSS"] = "Set level to -1 for boss units or set to 0 to disable." L["LF Guild Frame"] = true L["LFG Queue"] = true L["LFG_TITLE"] = "Looking For Group" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = true L["Lines"] = true L["Link to the latest development version."] = true @@ -1059,6 +1054,7 @@ L["Max Overflow"] = true L["Max Wraps"] = true L["Maximum Duration"] = true L["Maximum Level"] = true +L["Maximum tick rate allowed for tag updates per second."] = true L["Maximum Time Left"] = true L["Media"] = true L["Medium"] = true @@ -1182,6 +1178,8 @@ L["Officer"] = true L["Offset of the powerbar to the healthbar, set to 0 to disable."] = true L["Offset"] = true L["On Cooldown"] = true +L["On Me"] = true +L["On Pet"] = true L["On screen positions for different elements."] = true L["Only Free Slots"] = true L["Only highlight the aura that originated from you and not others."] = true @@ -1600,6 +1598,7 @@ L["Tab Panels"] = true L["Tab Selector"] = true L["Tabard Frame"] = true L["Table"] = true +L["Tag Update Rate"] = true L["Tagged NPC"] = true L["TALENTS"] = "Talents" L["Talking Head Backdrop"] = true @@ -1618,6 +1617,7 @@ L["Target Indicator Color"] = true L["Target Info"] = true L["Target Marker Icon"] = true L["Target On Mouse-Down"] = true +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = true L["Target"] = true L["Target/Low Health Indicator"] = true diff --git a/ElvUI_Options/Locales/koKR.lua b/ElvUI_Options/Locales/koKR.lua index bdb0e2b015..5ba4cc54ea 100644 --- a/ElvUI_Options/Locales/koKR.lua +++ b/ElvUI_Options/Locales/koKR.lua @@ -16,12 +16,6 @@ L["LEFT"] = "왼쪽" L["RIGHT"] = "오른쪽" L["TOP"] = "위쪽" -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = true -L["On Pet"] = true -L["Tag Update Rate"] = true -L["Maximum tick rate allowed for tag updates per second."] = true L["%s and then %s"] = "%s 이후 %s" L["24-Hour Time"] = "24시제로 표시" L["2D"] = "이미지" @@ -131,7 +125,6 @@ L["Ascending or Descending order."] = "오름차순 또는 내림차순." L["Ascending"] = "오름차순" L["Assigned Icon"] = "아이콘 지정" L["Assist Frames"] = "지원공격 전담 프레임" ---L["Assist Target"] = "지원공격 대상" L["Assist"] = "지원 공격" L["At what point should the text be displayed. Set to -1 to disable."] = "이 값보다 시간이 낮아지면 글자가 표시됩니다.\n\n-1로 설정하면 이 기능을 사용하지 않습니다." L["Attach Text To"] = "텍스트 첨부" @@ -242,9 +235,9 @@ L["Bottom Panel"] = "하단 패널 표시" L["Bottom Right"] = "하단 오른쪽" L["Bottom to Top"] = "상단 아래쪽으로 이동" L["Bottom"] = "하단" -L["Buffs"] = "오라<버프>" L["BUFFOPTIONS_LABEL"] = "강화 및 약화 효과" L["Buffs on Debuffs"] = "디버프의 버프" +L["Buffs"] = "오라<버프>" L["Button Flash"] = "버튼 플래시" L["Button Height"] = "버튼 높이" L["Button Settings"] = "버튼 설정" @@ -254,8 +247,8 @@ L["Button Width"] = "버튼 너비" L["Buttons Per Row"] = "한 줄당 버튼 수" L["Buttons"] = "버튼 수" L["By Type"] = "종류에 따라서" -L["Calendar"] = "달력" L["Calendar Frame"] = "달력 프레임" +L["Calendar"] = "달력" L["Camera Distance Scale"] = "3d 모델 크기" L["Camera Spin"] = true L["Camera"] = "시야" @@ -443,7 +436,6 @@ L["Cursor Anchor"] = "툴팁을 마우스에 표시" L["CURSOR"] = "커서" L["CURSOR_LEFT"] = "커서 왼쪽" L["CURSOR_RIGHT"] = "커서 오른쪽" -L["CUSTOM"] = "사용자 지정" L["Custom Backdrop"] = "배경 개인설정" L["Custom Color"] = "색상 개인설정" L["Custom Currency"] = "화폐 개인설정" @@ -459,6 +451,7 @@ L["Custom Texts"] = "글자 개인설정" L["Custom Texture"] = "텍스처 개인설정" L["Custom Timestamp Color"] = "시간표시 색상 개인설정" L["CUSTOM"] = "개인설정" +L["CUSTOM"] = "사용자 지정" L["Customization"] = "사용자정의(개인설정)" L["Cutaway Bars"] = "소모된 자원 보기" L["DAMAGER"] = "공격 전담" @@ -474,6 +467,7 @@ L["DEATH_RECAP_TITLE"] = "죽은 원인 보기" L["Debuff Highlighting"] = "해제가능한 약화효과 강조" L["Debuffs"] = "오라<디버프>" L["Debug Tools"] = "오류 확인 창" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "소숫점 자릿수" L["Decode Text"] = "문자 해독" L["Decode"] = "해독" @@ -605,7 +599,6 @@ L["Energy/Mana Regen Tick"] = "기력/마나 재생 틱" L["Engineering"] = "기계공학" L["Enhanced PVP Messages"] = "향상된 PVP 메시지" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = "착용" L["Error decoding data. Import string may be corrupted!"] = "데이터 해독에 오류. 문자열 가져오기가 오염된 것 같습니다!" L["Error exporting profile!"] = "프로필 내보내기 오류!" @@ -656,8 +649,8 @@ L["Flyout Options"] = "플라이아웃 버튼 옵션" -- ActionBars.lua L:231 No L["Flyout Size"] = "플라이아웃 버튼 크기" -- ActionBars.lua L:234 No translation command L["Flyout Spacing"] = "플라이아웃 버튼 간격" -- ActionBars.lua L:235 No translation command L["Focus Cast Key"] = "주시대상 케스팅 키" -L["FOCUS"] = "집중" L["Focus"] = "주시" +L["FOCUS"] = "집중" L["Focused Glow"] = "주시 대상 후광효과" L["FocusTarget"] = "주시 대상" L["Font Group"] = "글꼴 그룹" @@ -755,8 +748,8 @@ L["Health"] = "생명력" L["Height Multiplier"] = "배경 세로길이 배율" L["Height of the objective tracker. Increase size to be able to see more objectives."] = "퀘스트프레임의 길이를 결정합니다." L["Height"] = "세로 길이" -L["Help"] = "도움말" L["Help Frame"] = "도움말 프레임" +L["Help"] = "도움말" L["Herbalism"] = "약초 채집" L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true L["HH:MM Threshold"] = "시:분 표시 변경 값(분)" @@ -897,8 +890,8 @@ L["Ignore mouse events."] = "아이콘이 마우스에 전혀 반응하지 않 L["Ignored Items (Global)"] = true L["Ignored Items (Profile)"] = true L["Import Now"] = "지금 가져오기" -L["Import"] = "입력" L["Import Profile"] = "프로필 가져오기" +L["Import"] = "입력" L["Importing"] = "가져올 것" L["In Combat Label"] = "전투중 표시이름" L["In Combat"] = "전투 중" @@ -1007,16 +1000,16 @@ L["Left Panel Width"] = "왼쪽 패널 너비" L["Left Position"] = "왼쪽 위치" L["Left Shift"] = "왼쪽 Shift" L["Left to Right"] = "왼쪽에서 오른쪽으로" -L["Left"] = true -L["LEVEL_BOSS"] = "대상이 BOSS인 경우 -1로 설정하고 비활성화하려면 0으로 설정하십시오." L["Left"] = "왼쪽" +L["Left"] = true L["Level"] = "레벨" +L["LEVEL_BOSS"] = "대상이 BOSS인 경우 -1로 설정하고 비활성화하려면 0으로 설정하십시오." L["LF Guild Frame"] = "길드 찾기 창" L["LFG Queue"] = "파티찾기 표시기" L["LFG_TITLE"] = "파티 찾기" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = "표시줄 수를 제한해 최종적으로 보여줄 오라의 총 개수를 제한합니다." L["Lines"] = "선" -L["Particles"] = "입자" L["Link to the latest development version."] = "최신 개발 버전으로 연결" L["Link to the latest PTR version."] = "최신 PTR(태스트 버전) 버전에 대한 링크" L["List of words to color in chat if found in a message. If you wish to add multiple words you must separate the word with a comma. To search for your current name you can use %MYNAME%.\n\nExample:\n%MYNAME%, ElvUI, RBGs, Tank"] = "이 곳에 강조하고자 하는 단어를 적으면 모든 대화내용에서 해당 단어를 발견 시 색깔을 입혀 강조합니다. 쉼표(,) 로 구분해서 작성하세요.\n\n내 이름을 강조하고 싶으면 |cff2eb7e4%MYNAME%|r 을 사용하면 됩니다." @@ -1080,6 +1073,7 @@ L["Max Overflow"] = "오버힐 보기" L["Max Wraps"] = "표시줄 최대 수" L["Maximum Duration"] = "지속시간 제한" L["Maximum Level"] = "최대 레벨" +L["Maximum tick rate allowed for tag updates per second."] = true L["Maximum Time Left"] = "현재 남은 시간" L["Media"] = "미디어" L["Medium"] = "중간" @@ -1204,6 +1198,8 @@ L["Officer"] = "관리자" L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "디자인 설정을 무시하고 자원바를 생명력바 뒤로 겹친 후, 드러남 정도를 결정합니다.\n\n0으로 설정하면 겹치지 않고 디자인 설정대로 배치합니다." L["Offset"] = "생명력바와 겹쳐 표시" L["On Cooldown"] = "재사용 대기시간 켜기" +L["On Me"] = true +L["On Pet"] = true L["On screen positions for different elements."] = "다른 요소에 대한 화면 위치." L["Only Free Slots"] = "남은 공간만" L["Only highlight the aura that originated from you and not others."] = "오로지 자신에게서 시작된 오라(버프/디버프)만을 강조합니다." @@ -1251,6 +1247,7 @@ L["Panels"] = "패널" L["Parchment Remover"] = "양피지배경 제거" L["Parent"] = "프레임 연결" L["Particles"] = "입자" +L["Particles"] = "입자" L["Party / Raid"] = "파티&레이드 채널로" L["Party Frames"] = "파티 프레임" L["Party Indicator"] = "파티 표시" @@ -1266,8 +1263,8 @@ L["Percentage amount for vertical overlap of Nameplates."] = "이름표의 수 L["Perks"] = true L["Personal"] = "개인의" L["Pet Battle"] = "애완동물대전 관련" -L["Pet Group"] = "팻 구룹" L["Pet Experience"] = "팻 경험치" +L["Pet Group"] = "팻 구룹" L["Pet Happiness"] = "팻 행복도" L["Pet"] = "펫(소환수)" L["Petition Frame"] = "GM 요청 창" @@ -1625,6 +1622,7 @@ L["Tab Panels"] = "패널 탭 설정" L["Tab Selector"] = "창이름 탭 선택" L["Tabard Frame"] = "휘장 프레임" L["Table"] = "테이블" +L["Tag Update Rate"] = true L["Tagged NPC"] = "선점된 유닛" L["TALENTS"] = "특성" L["Talking Head Backdrop"] = "말머리 배경" @@ -1643,6 +1641,7 @@ L["Target Indicator Color"] = "타겟 지정 색상" L["Target Info"] = "대상선택 정보" L["Target Marker Icon"] = "대상 아이콘 저정" L["Target On Mouse-Down"] = "마우스를 누를 때 작동" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "마우스 뗄 때가 아닌, 마우스 누를 때 대상 유닛을 지정합니다.\n|cffff3333참고:|r Clique가 활성화된 경우 이 옵션은 ElvUI 프레임이 Clique에서 블랙리스트에 포함되지 않은 경우에만 영향을 미칩니다." L["Target"] = "대상" L["Target/Low Health Indicator"] = "낮은 생명력 대상 표시방법" @@ -1746,12 +1745,12 @@ L["TIMESTAMPS_LABEL"] = "대화 시각" L["Title will only appear if Name Only is enabled or triggered in a Style Filter."] = "명칭(예:과일상인)은 -이름만- 옵션으로 선택되거나 스타일 필터로 활성화된 경우 표시됩니다." L["Title"] = "명칭(호칭)" L["Toggle 24-hour mode for the time datatext."] = "시간을 24시제 표기법으로 표시합니다. 체크 해제 시 오전/오후 로 표시합니다." +L["Toggle Anchors"] = "프레임 이동 모드" L["Toggle Off While In Combat"] = "전투 중 비활성화" L["Toggle On While In Combat"] = "전투 중 활성화" L["Toggle showing of the left and right chat panels."] = "패널의 배경 표시 여부를 결정합니다." L["Toggle the camera spin on the AFK screen."] = true L["Toggle the chat tab panel backdrop."] = "패널 상단에 위치한 탭 부분의 표시 여부를 결정합니다." -L["Toggle Anchors"] = "프레임 이동 모드" L["Tooltip Body"] = "툴팁 설명 본문" L["Tooltip Header"] = "툴팁 제목" L["Tooltip Lines"] = "툴팁 줄수" @@ -1762,12 +1761,12 @@ L["Top Right"] = "상단 오른쪽" L["Top to Bottom"] = "위에서 아래로" L["Top"] = "상단 중앙" L["Torghast Buffs Position"] = "토르가스 버프 위치" +L["Totem Bar"] = "토템 바" +L["Totem Tracker"] = "토템 추적기" L["TOTEM_AIR"] = "바람의 토템" L["TOTEM_EARTH"] = "대지의 토템" L["TOTEM_FIRE"] = "불의 토템" L["TOTEM_WATER"] = "물의 토템" -L["Totem Bar"] = "토템 바" -L["Totem Tracker"] = "토템 추적기" L["Totems"] = "토템" L["Tracked Quests Only"] = "추적 중인 퀘스트만" L["Tracking"] = "추적" diff --git a/ElvUI_Options/Locales/ptBR.lua b/ElvUI_Options/Locales/ptBR.lua index 7df994c99f..f9d12f7340 100644 --- a/ElvUI_Options/Locales/ptBR.lua +++ b/ElvUI_Options/Locales/ptBR.lua @@ -16,12 +16,6 @@ L["LEFT"] = true L["RIGHT"] = true L["TOP"] = true -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = "Em Mim" -L["On Pet"] = "Em Pet" -L["Tag Update Rate"] = "Taxa de actualização da Tags." -L["Maximum tick rate allowed for tag updates per second."] = "Taxa máxima de tick permitida para atualizações de Tags por segundo." L["%s and then %s"] = "%s e depois %s" L["24-Hour Time"] = "24 horas" L["2D"] = "2D" @@ -464,6 +458,7 @@ L["DEATH_RECAP_TITLE"] = "Recapitular morte" L["Debuff Highlighting"] = "Destacar debuffs" L["Debuffs on Buffs"] = true L["Debug Tools"] = "Ferramentas de Depuração" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "Tamanho do Decimal" L["Decode Text"] = "Decodificar Texto" L["Decode"] = true @@ -595,7 +590,6 @@ L["Energy/Mana Regen Tick"] = true L["Engineering"] = "Engenharia" L["Enhanced PVP Messages"] = "Melhorias nas mensagens PVP" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "Erro ao decodificar os dados. A string de importação pode estar corrompida!" L["Error exporting profile!"] = "Erro ao exportar perfil!" @@ -882,8 +876,8 @@ L["Ignore mouse events."] = "Ignorar eventos do mouse (rato)." L["Ignored Items (Global)"] = true L["Ignored Items (Profile)"] = true L["Import Now"] = "Importar Agora" -L["Import"] = true L["Import Profile"] = true +L["Import"] = true L["Importing"] = "Importando" L["In Combat Label"] = true L["In Combat"] = true @@ -997,6 +991,7 @@ L["LEVEL_BOSS"] = "Coloque level -1 para unidades Boss ou coloque 0 para disabil L["LF Guild Frame"] = "Localizador de Guildas" L["LFG Queue"] = "Fila de LFG" L["LFG_TITLE"] = "Procurando grupo" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = "Limitar o número de linhas ou colunas." L["Lines"] = true L["Link to the latest development version."] = "Link para a última versão de desenvolvimento." @@ -1061,6 +1056,7 @@ L["Max Overflow"] = true L["Max Wraps"] = "Enrolamentos Máximos" L["Maximum Duration"] = "Duração Máxima" L["Maximum Level"] = "Level Máximo" +L["Maximum tick rate allowed for tag updates per second."] = "Taxa máxima de tick permitida para atualizações de Tags por segundo." L["Maximum Time Left"] = "Máximo de Tempo Restante" L["Media"] = "Mídia" L["Medium"] = true @@ -1184,6 +1180,8 @@ L["Officer"] = true L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "A distância entre barra de poder e a barra de vida, definir 0 para desactivar." L["Offset"] = "Distância" L["On Cooldown"] = "Durante Tempo de Recarga" +L["On Me"] = "Em Mim" +L["On Pet"] = "Em Pet" L["On screen positions for different elements."] = true L["Only Free Slots"] = true L["Only highlight the aura that originated from you and not others."] = true @@ -1602,6 +1600,7 @@ L["Tab Panels"] = true L["Tab Selector"] = true L["Tabard Frame"] = "Tabardo" L["Table"] = true +L["Tag Update Rate"] = "Taxa de actualização da Tags." L["Tagged NPC"] = true L["TALENTS"] = "Talentos" L["Talking Head Backdrop"] = true @@ -1620,6 +1619,7 @@ L["Target Indicator Color"] = "Indicador da Cor do Alvo" L["Target Info"] = "Informações do Alvo" L["Target Marker Icon"] = true L["Target On Mouse-Down"] = "Selecionar ao Pressionar o Mouse" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = true L["Target"] = "Alvo" L["Target/Low Health Indicator"] = "Indicador de Alvo/Vida Baixa" diff --git a/ElvUI_Options/Locales/ruRU.lua b/ElvUI_Options/Locales/ruRU.lua index 0f6e49bef0..4dc5b283c6 100644 --- a/ElvUI_Options/Locales/ruRU.lua +++ b/ElvUI_Options/Locales/ruRU.lua @@ -16,12 +16,6 @@ L["LEFT"] = "Слева" L["RIGHT"] = "Справа" L["TOP"] = "Вверху" -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = "Выпадающие списки" -L["On Me"] = "На мне" -L["On Pet"] = "На питомце" -L["Tag Update Rate"] = "Частота обновления тэгов" -L["Maximum tick rate allowed for tag updates per second."] = "Максимальный тикрейт обновлений тэгов." L["%s and then %s"] = "%s, а затем %s" L["24-Hour Time"] = "24х часовой формат" L["2D"] = "2D" --Doesn't need translation @@ -293,8 +287,8 @@ L["Choose UIPARENT to prevent it from hiding with the unitframe."] = "Выбер L["Choose What To Export"] = "Выберите что экспортировать" L["Choose when you want the tooltip to show in combat. If a modifier is chosen, then you need to hold that down to show the tooltip."] = "Если модификатор выбран, подсказка будет отображаться в бою только при ее нажатии." L["Choose when you want the tooltip to show. If a modifier is chosen, then you need to hold that down to show the tooltip."] = "Выберите, когда Вы хотите видеть подсказку. Если выбран модификатор, то подсказка будет показана только, если он зажат." -L["Chromie Time Frame"] = "Время Хроми" L["Choosing Settings %s. This will reload the UI.\n\n Are you sure?"] = "Применяются настройки %s. Это перезагрузит интерфейс.\n\n Вы уверены?" +L["Chromie Time Frame"] = "Время Хроми" L["Clamp nameplates to the top of the screen when outside of view."] = "Собирать индикаторы на верхней границе экрана, когда их юнит вне поля зрения." L["Clamp Nameplates"] = "Собирать индикаторы" L["Class Backdrop"] = "Фон по классу" @@ -469,6 +463,7 @@ L["Debuff Colors"] = "Цвета дебаффов" L["Debuff Highlighting"] = "Подсветка дебаффов" L["Debuffs on Buffs"] = "Дебаффы над баффами" L["Debug Tools"] = "Инструменты отладки" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "Десятичные доли" L["Decode Text"] = "Декодировать" L["Decode"] = "Декодировать" @@ -602,7 +597,6 @@ L["Energy/Mana Regen Tick"] = "Метка восстановления маны/ L["Engineering"] = "Инженерия" L["Enhanced PVP Messages"] = "Улучшенные PvP сообщения" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = "Надето" L["Error decoding data. Import string may be corrupted!"] = "Ошибка при кодировании. Импортируемая строка может быть повреждена!" L["Error exporting profile!"] = "Ошибка при экспорте профиля!" @@ -681,8 +675,8 @@ L["FRIENDLY_NPC"] = "Дружественный НИП" L["FRIENDLY_PLAYER"] = "Дружественный игрок" L["Friends"] = "Друзья" L["From Me"] = "Мои" -L["Full Bar"] = "Обычная полоска" L["From Pet"] = "Питомца" +L["Full Bar"] = "Обычная полоска" L["Full Overlay"] = "Полное наложение" L["Full Time"] = "Время полностью" L["Full"] = "Полный" @@ -1005,6 +999,7 @@ L["LEVEL_BOSS"] = "Установите на -1 для боссов или 0 д L["LF Guild Frame"] = "Поиск гильдии" L["LFG Queue"] = "Очередь" L["LFG_TITLE"] = "Поиск группы" +L["Library Dropdown"] = "Выпадающие списки" L["Limit the number of rows or columns."] = "Определяет максимальное количество рядов/столбцов." L["Lines"] = "Линии" L["Link to the latest development version."] = "Ссылка на последнюю альфа версию." @@ -1068,6 +1063,7 @@ L["Max Overflow"] = "Макс. переполнение" L["Max Wraps"] = "Максимум рядов" L["Maximum Duration"] = "Максимальная длительность" L["Maximum Level"] = "Максимальный уровень" +L["Maximum tick rate allowed for tag updates per second."] = "Максимальный тикрейт обновлений тэгов." L["Maximum Time Left"] = "Максимум оставшегося времени" L["Media"] = "Медиа" L["Medium"] = "Средний" @@ -1191,6 +1187,8 @@ L["Officer"] = "Офицер" L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "Смещение полосы ресурсов относительно полосы здоровья. Установите на 0 для отключения." L["Offset"] = "Смещение" L["On Cooldown"] = "Восстанавливается" +L["On Me"] = "На мне" +L["On Pet"] = "На питомце" L["On screen positions for different elements."] = "Положение различных элементов на экране." L["Only Free Slots"] = "Только свободные слоты" L["Only highlight the aura that originated from you and not others."] = "Подсвечивать только ауры, наложенные лично Вами." @@ -1293,8 +1291,8 @@ L["Prefer Target Color"] = "Предпочитать цвет цели" L["Prevent the same messages from displaying in chat more than once within this set amount of seconds, set to zero to disable."] = "Предотвращает появление одинаковых сообщения в чате чаще указанного количества секунд. Установите на 0 для отключения." L["Primary Texture"] = "Основная текстура" L["Priority"] = "Приоритет" -L["Private Auras"] = "Личные ауры" L["Private (Character Settings)"] = "Private (Настройки персонажа)" +L["Private Auras"] = "Личные ауры" L["Private"] = true --Not sure if worth translating L["Profession Bags"] = "Сумки профессий" L["Profession Quality"] = "Профессии: качество" @@ -1612,6 +1610,7 @@ L["Tab Panels"] = "Панели вкладок" L["Tab Selector"] = "Выделение вкладки" L["Tabard Frame"] = "Создание накидки" L["Table"] = "Таблица" +L["Tag Update Rate"] = "Частота обновления тэгов" L["Tagged NPC"] = "Чужой НИП" L["TALENTS"] = "Таланты" L["Talking Head Backdrop"] = "Фон говорящей головы" @@ -1630,6 +1629,7 @@ L["Target Indicator Color"] = "Цвет индикатора цели" L["Target Info"] = "Информация о цели" L["Target Marker Icon"] = "Метка цели" L["Target On Mouse-Down"] = "Выделение при нажатии" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Выделять цели при нажатии, а не отпускании кнопки мыши.\n|cffff3333Внимание:|r Если включен Clique, то опция будет работать только если рамки ElvUI не заигнорены в нем." L["Target"] = "Цель" L["Target/Low Health Indicator"] = "Индикатор цели" diff --git a/ElvUI_Options/Locales/trTR.lua b/ElvUI_Options/Locales/trTR.lua index 211fc15539..0f15c21597 100644 --- a/ElvUI_Options/Locales/trTR.lua +++ b/ElvUI_Options/Locales/trTR.lua @@ -16,12 +16,6 @@ L["LEFT"] = true L["RIGHT"] = true L["TOP"] = true -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = true -L["On Pet"] = true -L["Tag Update Rate"] = true -L["Maximum tick rate allowed for tag updates per second."] = true L["%s and then %s"] = "%s ve ardından %s" L["24-Hour Time"] = "24 Saatlik Zaman" L["2D"] = true @@ -464,6 +458,7 @@ L["DEATH_RECAP_TITLE"] = "Olum Ozeti" L["Debuff Highlighting"] = "Zayiflatici Vurgulamasi" L["Debuffs on Buffs"] = true L["Debug Tools"] = "Hata Ayiklama Araclari" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "Ondalik Uzunlugu" L["Decode Text"] = "Metnin Kodunu Coz" L["Decode"] = true @@ -595,7 +590,6 @@ L["Energy/Mana Regen Tick"] = true L["Engineering"] = "Muhendislik" L["Enhanced PVP Messages"] = "Gelistirilmis PVP Mesajlari" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "Veri kodu cozulurken hata olustu. Ice aktarma dizesi bozulmus olabilir!" L["Error exporting profile!"] = "Profil disa aktarilirken hata olustu!" @@ -882,8 +876,8 @@ L["Ignore mouse events."] = "Fare olaylarini yoksay." L["Ignored Items (Global)"] = true L["Ignored Items (Profile)"] = true L["Import Now"] = "simdi Ice Aktar" -L["Import"] = true L["Import Profile"] = true +L["Import"] = true L["Importing"] = "Ice Aktariyor" L["In Combat Label"] = true L["In Combat"] = "Catismada" @@ -997,6 +991,7 @@ L["LEVEL_BOSS"] = "Patron birimleri için seviyeyi -1'e veya devre dışı bıra L["LF Guild Frame"] = "Lonca Ariyorum Cercevesi" L["LFG Queue"] = "LFG Sirasi" L["LFG_TITLE"] = "Grup Arıyorum" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = "Satir veya sutun sayisini sinirlayin." L["Lines"] = "Cizgiler" L["Link to the latest development version."] = "En son gelistirme surumune baglanti." @@ -1060,6 +1055,7 @@ L["Max Overflow"] = "Maksimum Tasma" L["Max Wraps"] = "Maksimum Sarma" L["Maximum Duration"] = "Maksimum Sure" L["Maximum Level"] = "Maksimum seviye" +L["Maximum tick rate allowed for tag updates per second."] = true L["Maximum Time Left"] = "Maksimum kalan sure" L["Media"] = "Medya" L["Medium"] = "Orta" @@ -1183,6 +1179,8 @@ L["Officer"] = "Yetkili" L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "Guc cubugunun saglik cubuguna kaymasi, devre disi birakmak icin 0'a ayarlayin." L["Offset"] = "Ofset" L["On Cooldown"] = "Soguma suresinde" +L["On Me"] = true +L["On Pet"] = true L["On screen positions for different elements."] = "Farkli ogeler icin ekran konumlari." L["Only Free Slots"] = "Yalnizca ucretsiz Slotlar" L["Only highlight the aura that originated from you and not others."] = "Baskalarindan degil, yalnizca sizden gelen aurayi vurgulayin." @@ -1602,6 +1600,7 @@ L["Tab Panels"] = true L["Tab Selector"] = "Sekme Secici" L["Tabard Frame"] = "Cubbe Cercevesi" L["Table"] = "Masa" +L["Tag Update Rate"] = true L["Tagged NPC"] = "Etiketli NPC" L["TALENTS"] = "Yetenekler" L["Talking Head Backdrop"] = "Konusan Kafa Arka Plani" @@ -1620,6 +1619,7 @@ L["Target Indicator Color"] = "Hedef Gosterge Rengi" L["Target Info"] = "Hedef Bilgisi" L["Target Marker Icon"] = "Hedef Isaretleyici Ikonu" L["Target On Mouse-Down"] = "Fare Asagi uzerinde Hedef" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Hedef birimleri fare yukari degil asagi konumdayken hedefleyin.\n|cffff3333Not:|r Clique etkinlestirilirse, bu secenek yalnizca ElvUI cercevelerini Clique'de kara listeye alinmamissa etkiler." L["Target"] = "Hedef" L["Target/Low Health Indicator"] = "Hedef/Dusuk Saglik Gostergesi" diff --git a/ElvUI_Options/Locales/zhCN.lua b/ElvUI_Options/Locales/zhCN.lua index a9f2e98ec4..90c8f27ec7 100644 --- a/ElvUI_Options/Locales/zhCN.lua +++ b/ElvUI_Options/Locales/zhCN.lua @@ -16,12 +16,6 @@ L["LEFT"] = true L["RIGHT"] = true L["TOP"] = true -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = true -L["On Pet"] = true -L["Tag Update Rate"] = true -L["Maximum tick rate allowed for tag updates per second."] = true L["%s and then %s"] = "%s 于 %s" L["24-Hour Time"] = "24小时制" L["2D"] = "2D" @@ -464,6 +458,7 @@ L["DEATH_RECAP_TITLE"] = "死亡摘要" L["Debuff Highlighting"] = "减益光环加亮显示" L["Debuffs on Buffs"] = true L["Debug Tools"] = "除错工具" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "小数位数" L["Decode Text"] = "解码文字" L["Decode"] = true @@ -595,7 +590,6 @@ L["Energy/Mana Regen Tick"] = true L["Engineering"] = "工程" L["Enhanced PVP Messages"] = "PVP增强信息" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "解码错误.导入的字符串可能已损坏！" L["Error exporting profile!"] = "导出配置文件失败" @@ -882,8 +876,8 @@ L["Ignore mouse events."] = "忽略鼠标事件" L["Ignored Items (Global)"] = true L["Ignored Items (Profile)"] = true L["Import Now"] = "现在导入" -L["Import"] = true L["Import Profile"] = true +L["Import"] = true L["Importing"] = "正在导入" L["In Combat Label"] = true L["In Combat"] = "在战斗中" @@ -997,6 +991,7 @@ L["LEVEL_BOSS"] = "对首领请设置为-1, 或者设为0以禁用." L["LF Guild Frame"] = "寻求公会" L["LFG Queue"] = "随机队列" L["LFG_TITLE"] = "寻求组队" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = "最大行数或列数" L["Lines"] = "行数" L["Link to the latest development version."] = "最新开发版链接" @@ -1061,6 +1056,7 @@ L["Max Overflow"] = "最大治疗吸收盾" L["Max Wraps"] = "每行最大数" L["Maximum Duration"] = "最大持续时间" L["Maximum Level"] = "最高等级" +L["Maximum tick rate allowed for tag updates per second."] = true L["Maximum Time Left"] = "最大时间剩余" L["Media"] = "材质" L["Medium"] = "中" @@ -1184,6 +1180,8 @@ L["Officer"] = "官员" L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "偏移能量条与生命条的位置, 设为0代表停用" L["Offset"] = "偏移" L["On Cooldown"] = "冷却中" +L["On Me"] = true +L["On Pet"] = true L["On screen positions for different elements."] = "屏幕上各元素的位置" L["Only Free Slots"] = "仅可用槽" L["Only highlight the aura that originated from you and not others."] = "仅突出你自己的光环而不是别人的" @@ -1602,6 +1600,7 @@ L["Tab Panels"] = true L["Tab Selector"] = "选项卡选择器" L["Tabard Frame"] = "战袍" L["Table"] = "表" +L["Tag Update Rate"] = true L["Tagged NPC"] = "标记的NPC" L["TALENTS"] = "天赋" L["Talking Head Backdrop"] = "剧情对话框背景" @@ -1620,6 +1619,7 @@ L["Target Indicator Color"] = "目标指示器颜色" L["Target Info"] = "目标信息" L["Target Marker Icon"] = "目标标记图标" L["Target On Mouse-Down"] = "鼠标按下设为目标" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "鼠标按下而不是鼠标抬起时的目标单位。\n|cffff3333注意：|r 如果启用了 Clique，则此选项仅影响未在 Clique 中列入黑名单的 ElvUI 框架。" L["Target"] = "目标" L["Target/Low Health Indicator"] = "目标指示器" diff --git a/ElvUI_Options/Locales/zhTW.lua b/ElvUI_Options/Locales/zhTW.lua index 976417f430..b0dc17d8c6 100644 --- a/ElvUI_Options/Locales/zhTW.lua +++ b/ElvUI_Options/Locales/zhTW.lua @@ -16,12 +16,6 @@ L["LEFT"] = true L["RIGHT"] = true L["TOP"] = true -L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." -L["Library Dropdown"] = true -L["On Me"] = true -L["On Pet"] = true -L["Tag Update Rate"] = true -L["Maximum tick rate allowed for tag updates per second."] = true L["%s and then %s"] = "%s 與 %s" L["24-Hour Time"] = "24小時制" L["2D"] = "2D" @@ -464,6 +458,7 @@ L["DEATH_RECAP_TITLE"] = "死亡回顧" L["Debuff Highlighting"] = "減益光環加亮顯示" L["Debuffs on Buffs"] = true L["Debug Tools"] = "除錯工具" +L["DEBUG_DESC"] = "Disable all addons (including Plugins) except ElvUI. During the same session, this can be clicked to reenable them." L["Decimal Length"] = "小數位數" L["Decode Text"] = "解碼文字" L["Decode"] = true @@ -595,7 +590,6 @@ L["Energy/Mana Regen Tick"] = true L["Engineering"] = "工程學" L["Enhanced PVP Messages"] = "PVP增強信息" L["Equipped Item"] = true -L["Target Reticle"] = true L["Equipped"] = true L["Error decoding data. Import string may be corrupted!"] = "解碼錯誤.導出字符串可能已損壞！" L["Error exporting profile!"] = "導出配置文件失敗" @@ -882,8 +876,8 @@ L["Ignore mouse events."] = "忽略滑鼠事件." L["Ignored Items (Global)"] = true L["Ignored Items (Profile)"] = true L["Import Now"] = "現在導入" -L["Import"] = true L["Import Profile"] = true +L["Import"] = true L["Importing"] = "正在導入" L["In Combat Label"] = true L["In Combat"] = "在戰鬥中" @@ -996,6 +990,7 @@ L["LEVEL_BOSS"] = "為團隊首領框架設定等級為 -1, 也可以設定為 0 L["LF Guild Frame"] = "尋求公會" L["LFG Queue"] = "隨機隊列" L["LFG_TITLE"] = "尋求組隊" +L["Library Dropdown"] = true L["Limit the number of rows or columns."] = "最大行數或列數." L["Lines"] = "行數" L["Link to the latest development version."] = "最新開發版連結" @@ -1059,6 +1054,7 @@ L["Max Overflow"] = "最大治療吸收盾" L["Max Wraps"] = "每行最大數" L["Maximum Duration"] = "最大持續時間" L["Maximum Level"] = "最高等級" +L["Maximum tick rate allowed for tag updates per second."] = true L["Maximum Time Left"] = "最大時間剩餘" L["Media"] = "材質" L["Medium"] = "中" @@ -1182,6 +1178,8 @@ L["Officer"] = "幹部" L["Offset of the powerbar to the healthbar, set to 0 to disable."] = "偏移能量條與生命條的位置, 設定為 0 禁用此功能." L["Offset"] = "偏移" L["On Cooldown"] = "冷卻中" +L["On Me"] = true +L["On Pet"] = true L["On screen positions for different elements."] = "不同的元件在螢幕上的位置" L["Only Free Slots"] = "僅空餘槽位" L["Only highlight the aura that originated from you and not others."] = "僅顯著顯示你自己施放的光環." @@ -1601,6 +1599,7 @@ L["Tab Panels"] = true L["Tab Selector"] = "頁籤選擇器" L["Tabard Frame"] = "外袍" L["Table"] = "表" +L["Tag Update Rate"] = true L["Tagged NPC"] = "標記的NPC" L["TALENTS"] = "天賦" L["Talking Head Backdrop"] = "特寫框架背景" @@ -1619,6 +1618,7 @@ L["Target Indicator Color"] = "目標指示器顏色" L["Target Info"] = "目標信息" L["Target Marker Icon"] = "目標標記圖示" L["Target On Mouse-Down"] = "滑鼠按下設為目標" +L["Target Reticle"] = true L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "按下滑鼠時設為目標, 而不是鬆開滑鼠按鍵時.\n|cffff3333注意:|r 如果已啟用 Clique, 這個選項只有影響那些不在 Clique 裡黑名單的 ElvUI 框架." L["Target"] = "目標" L["Target/Low Health Indicator"] = "目標指示器" From a82feea45e27ef3b41388826d7d6db119f60ef1b Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 17:32:17 -0500 Subject: [PATCH 46/70] new sign --- ElvUI_Options/Core/UnitFrames.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_Options/Core/UnitFrames.lua b/ElvUI_Options/Core/UnitFrames.lua index 55f2f4051f..8e4414efcf 100644 --- a/ElvUI_Options/Core/UnitFrames.lua +++ b/ElvUI_Options/Core/UnitFrames.lua @@ -601,7 +601,7 @@ local function GetOptionsTable_Fader(updateFunc, groupName, numUnits) config.args.power = ACH:Toggle(L["Power"], nil, 16, nil, nil, nil, nil, nil, disabledOrRanged) config.args.vehicle = ACH:Toggle(L["Vehicle"], nil, 17, nil, nil, nil, nil, nil, disabledOrRanged) config.args.casting = ACH:Toggle(L["Casting"], nil, 18, nil, nil, nil, nil, nil, disabledOrRanged) - config.args.dynamicflight = ACH:Toggle(L["Dynamic Flight"], nil, 19, nil, nil, nil, nil, nil, disabledOrRanged) + config.args.dynamicflight = ACH:Toggle(E.NewSign..L["Dynamic Flight"], nil, 19, nil, nil, nil, nil, nil, disabledOrRanged) config.args.spacer2 = ACH:Spacer(30, 'full') config.args.delay = ACH:Range(L["Fade Out Delay"], nil, 31, { min = 0, max = 3, step = 0.01 }, nil, nil, nil, disabledOrRanged) From bd1edf422349ae06c290f379e8c34a6b2ac04d65 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 18:23:52 -0500 Subject: [PATCH 47/70] class color update reticleColor --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 51fff9accb..fa996592f9 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -298,6 +298,7 @@ function AB:PositionAndSizeBar(barName) RegisterStateDriver(bar, 'page', page) bar:SetAttribute('page', page) + local reticleColor = E:UpdateClassColor(AB.db.targetReticleColor) local pages = enabled and AB:ActivePages(page) or nil for i = 1, NUM_ACTIONBAR_BUTTONS do lastButton = bar.buttons[i-1] @@ -320,8 +321,7 @@ function AB:PositionAndSizeBar(barName) local targetReticle = button.TargetReticleAnimFrame if targetReticle then - local base = AB.db.targetReticleColor - targetReticle.Base:SetVertexColor(base.r, base.g, base.b) + targetReticle.Base:SetVertexColor(reticleColor.r, reticleColor.g, reticleColor.b) end AB:HandleButtonState(button, i, vehicleIndex, pages) From 3a12751e4ba4704ad69d30cc8f1ccdbf7c6533dd Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 20:18:23 -0500 Subject: [PATCH 48/70] swap this back to test --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index fa996592f9..d2260d5618 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -91,7 +91,7 @@ AB.barDefaults = { do -- https://github.com/Gethe/wow-ui-source/blob/6eca162dbca161e850b735bd5b08039f96caf2df/Interface/FrameXML/OverrideActionBar.lua#L136 - local fullConditions = (E.Retail or E.Wrath) and format('[vehicleui][possessbar] %d; [overridebar] %d;', GetVehicleBarIndex(), GetOverrideBarIndex()) or '' + local fullConditions = (E.Retail or E.Wrath) and format('[overridebar] %d; [vehicleui][possessbar] %d;', GetOverrideBarIndex(), GetVehicleBarIndex()) or '' AB.barDefaults.bar1.conditions = fullConditions..format('[shapeshift] %d; [bar:2] 2; [bar:3] 3; [bar:4] 4; [bar:5] 5; [bar:6] 6; [bonusbar:5] 11;', GetTempShapeshiftBarIndex()) end From 5dfea15897ebd3c7a1a1b56816b2ff99a53bbbd2 Mon Sep 17 00:00:00 2001 From: Simpy Date: Mon, 13 Nov 2023 21:54:04 -0500 Subject: [PATCH 49/70] ace3 editbox to use elvui variant for focus select --- ElvUI/Core/Modules/Skins/Ace3.lua | 2 +- .../AceConfigDialog-3.0/AceConfigDialog-3.0.lua | 4 ++-- ElvUI_Libraries/Core/Ace3/AceGUI-3.0/AceGUI-3.0.xml | 2 +- ...et-EditBox.lua => AceGUIWidget-EditBox-ElvUI.lua} | 12 +++++++++++- ElvUI_Options/Core/Tags.lua | 3 +++ 5 files changed, 18 insertions(+), 5 deletions(-) rename ElvUI_Libraries/Core/Ace3/AceGUI-3.0/widgets/{AceGUIWidget-EditBox.lua => AceGUIWidget-EditBox-ElvUI.lua} (97%) diff --git a/ElvUI/Core/Modules/Skins/Ace3.lua b/ElvUI/Core/Modules/Skins/Ace3.lua index 0ac4d5580c..387814047a 100644 --- a/ElvUI/Core/Modules/Skins/Ace3.lua +++ b/ElvUI/Core/Modules/Skins/Ace3.lua @@ -269,7 +269,7 @@ function S:Ace3_RegisterAsWidget(widget) button:SetParent(frame.backdrop) text:SetParent(frame.backdrop) button:HookScript('OnClick', S.Ace3_SkinDropdown) - elseif TYPE == 'EditBox' then + elseif TYPE == 'EditBox' or TYPE == 'EditBox-ElvUI' then S:Ace3_SkinEditBox(widget.editbox, widget.button) elseif TYPE == 'Button' or TYPE == 'Button-ElvUI' then S:Ace3_SkinButton(widget.frame) diff --git a/ElvUI_Libraries/Core/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/ElvUI_Libraries/Core/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua index 0711b48904..1a23c8d4e7 100644 --- a/ElvUI_Libraries/Core/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua +++ b/ElvUI_Libraries/Core/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua @@ -7,7 +7,7 @@ local LibStub = LibStub local gui = LibStub("AceGUI-3.0") local reg = LibStub("AceConfigRegistry-3.0-ElvUI") -local MAJOR, MINOR = "AceConfigDialog-3.0-ElvUI", 88 +local MAJOR, MINOR = "AceConfigDialog-3.0-ElvUI", 89 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not AceConfigDialog then return end @@ -1216,7 +1216,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin control:SetCallback("OnClick",ActivateControl) elseif v.type == "input" then - control = CreateControl(v.dialogControl or v.control, v.multiline and "MultiLineEditBox-ElvUI" or "EditBox") + control = CreateControl(v.dialogControl or v.control, v.multiline and "MultiLineEditBox-ElvUI" or "EditBox-ElvUI") if v.multiline and control.SetNumLines then control:SetNumLines(tonumber(v.multiline) or 4) diff --git a/ElvUI_Libraries/Core/Ace3/AceGUI-3.0/AceGUI-3.0.xml b/ElvUI_Libraries/Core/Ace3/AceGUI-3.0/AceGUI-3.0.xml index 1c68a86e98..f768128818 100644 --- a/ElvUI_Libraries/Core/Ace3/AceGUI-3.0/AceGUI-3.0.xml +++ b/ElvUI_Libraries/Core/Ace3/AceGUI-3.0/AceGUI-3.0.xml @@ -17,7 +17,7 @@