diff --git a/WeakAuras/BuffTrigger2.lua b/WeakAuras/BuffTrigger2.lua index 63504a9..630b523 100644 --- a/WeakAuras/BuffTrigger2.lua +++ b/WeakAuras/BuffTrigger2.lua @@ -1079,6 +1079,10 @@ local function TriggerInfoApplies(triggerInfo, unit) end end + if triggerInfo.hostility and WeakAuras.GetPlayerReaction(unit) ~= triggerInfo.hostility then + return false + end + if triggerInfo.unit == "group" then local isPet = WeakAuras.UnitIsPet(unit) if triggerInfo.includePets == "PetsOnly" and not isPet then @@ -1872,10 +1876,12 @@ end Private.LibGroupTalentsWrapper.Register(function(unit) Private.StartProfileSystem("bufftrigger2") + local deactivatedTriggerInfos = {} RecheckActiveForUnitType("group", unit, deactivatedTriggerInfos) - RecheckActiveForUnitType("group", unit .. "pet", deactivatedTriggerInfos) + RecheckActiveForUnitType("group", WeakAuras.unitToPetUnit[unit], deactivatedTriggerInfos) DeactivateScanFuncs(deactivatedTriggerInfos) + Private.StopProfileSystem("bufftrigger2") end) @@ -2482,7 +2488,7 @@ function BuffTrigger.Add(data) local effectiveIgnoreSelf = (groupTrigger or trigger.unit == "nameplate") and trigger.ignoreSelf local effectiveRaidRole = groupTrigger and trigger.useRaidRole and trigger.raid_role or nil local effectiveClass = groupTrigger and trigger.useClass and trigger.class - local effectiveSpecId = groupTrigger and trigger.useActualSpec and trigger.actualSpec + local effectiveSpecId = groupTrigger and trigger.useActualSpec and trigger.actualSpec or nil local effectiveIgnoreDead = groupTrigger and trigger.ignoreDead local effectiveIgnoreDisconnected = groupTrigger and trigger.ignoreDisconnected local effectiveIgnoreInvisible = groupTrigger and trigger.ignoreInvisible diff --git a/WeakAuras/Init.lua b/WeakAuras/Init.lua index c40f157..07ff058 100644 --- a/WeakAuras/Init.lua +++ b/WeakAuras/Init.lua @@ -52,6 +52,7 @@ do "LibDBIcon-1.0", "LibGetFrame-1.0", "LibSerialize", + "LibGroupTalents-1.0", } for _, lib in ipairs(StandAloneLibs) do if not lib then diff --git a/WeakAuras/LibGroupTalentsWrapper.lua b/WeakAuras/LibGroupTalentsWrapper.lua index 3a77f8f..72c8b7a 100644 --- a/WeakAuras/LibGroupTalentsWrapper.lua +++ b/WeakAuras/LibGroupTalentsWrapper.lua @@ -2,8 +2,11 @@ if not WeakAuras.IsLibsOK() then return end local AddonName, Private = ... -local timer = WeakAuras.timer; -local eventLock = false +-- Lua APIs +local unpack = unpack + +-- WoW APIs +local UnitName, UnitIsUnit, UnitClass, GetNumGroupMembers = UnitName, UnitIsUnit, UnitClass, GetNumGroupMembers local nameToGlyphs = {} local nameToSpecMap = {} @@ -23,60 +26,47 @@ Private.LibGroupTalentsWrapper = { local LibGroupTalents = LibStub("LibGroupTalents-1.0") if LibGroupTalents then - local frame = CreateFrame("Frame") - frame:RegisterEvent("PLAYER_LOGIN") - frame:RegisterEvent("RAID_ROSTER_UPDATE") - frame:RegisterEvent("PARTY_MEMBERS_CHANGED") + --- LibGroupTalents callback for talents and glyphs + function Private.LibGroupTalentsWrapper:LibGroupTalentsCallback(_, _, unit) + if not unit then + return + end - local function ProcessEvent() - eventLock = false + local unitName = UnitName(unit) local ownName = UnitName("player") - nameToUnitMap = {} - nameToUnitMap[ownName] = "player" - - local numMembers + local numMembers = GetNumGroupMembers() local units if IsInRaid() then - numMembers = GetNumGroupMembers() units = WeakAuras.raidUnits else - numMembers = GetNumPartyMembers() units = WeakAuras.partyUnits end for i = 1, numMembers do - local unit = units[i] - local name = UnitName(unit) - nameToUnitMap[name] = unit - end - - for name in pairs(nameToSpecMap) do - if not nameToUnitMap[name] then - nameToSpecMap[name] = nil - nameToGlyphs[name] = nil + local groupUnit = units[i] + if groupUnit then + local groupUnitName = UnitName(groupUnit) + if groupUnitName then + nameToUnitMap[groupUnitName] = groupUnit + end end end - end + nameToUnitMap[ownName] = "player" - frame:SetScript("OnEvent", function() - if not eventLock then - eventLock = true - timer:ScheduleTimer(ProcessEvent, 1.5) + for storedName in pairs(nameToSpecMap) do + if not nameToUnitMap[storedName] then + nameToSpecMap[storedName] = nil + nameToGlyphs[storedName] = nil + end end - end) - --- LibGroupTalents callback for talents and glyphs - function Private.LibGroupTalentsWrapper:LibGroupTalentsCallback(_, _, unit) - local unitName = UnitName(unit) - - -- Update specialization data local specInfo = { LibGroupTalents:GetUnitTalentSpec(unit) } - if specInfo and #specInfo > 0 then - nameToSpecMap[unitName] = specInfo + local class = select(2, UnitClass(unit)) + if specInfo and #specInfo > 0 and class then + nameToSpecMap[unitName] = class .. specInfo[1] end - -- Update glyphs local glyphs = { LibGroupTalents:GetUnitGlyphs(unit) } if glyphs and #glyphs > 0 then nameToGlyphs[unitName] = {} @@ -85,9 +75,10 @@ if LibGroupTalents then end end - -- Notify subscribers - for _, f in ipairs(subscribers) do - f(nameToUnitMap[unitName]) + if nameToUnitMap[unitName] then + for _, f in ipairs(subscribers) do + f(nameToUnitMap[unitName]) + end end end @@ -99,12 +90,17 @@ if LibGroupTalents then function Private.LibGroupTalentsWrapper.SpecForUnit(unit) local unitName = UnitName(unit) - if nameToSpecMap[unitName] and nameToSpecMap[unitName][1] then - return nameToSpecMap[unitName] and nameToSpecMap[unitName][1] + local class = select(2, UnitClass(unit)) + + if nameToSpecMap[unitName] then + return nameToSpecMap[unitName] end - if UnitIsUnit(unit, "player") then - return LibGroupTalents:GetUnitTalentSpec(unit) + if UnitIsUnit(unit, "player") and class then + local specInfo = LibGroupTalents:GetUnitTalentSpec(unit) + if specInfo and #specInfo > 0 then + return class .. specInfo[1] + end end end @@ -126,14 +122,14 @@ if LibGroupTalents then function Private.LibGroupTalentsWrapper.CheckGlyphForUnit(unit, glyphId) local unitName = UnitName(unit) if nameToGlyphs[unitName] and nameToGlyphs[unitName][glyphId] then - return true + return true end if UnitIsUnit(unit, "player") then local glyphs = { LibGroupTalents:GetUnitGlyphs(unit) } for _, id in ipairs(glyphs) do if id == glyphId then - return true + return true end end end diff --git a/WeakAuras/Locales/deDE.lua b/WeakAuras/Locales/deDE.lua index 032801f..34c2697 100644 --- a/WeakAuras/Locales/deDE.lua +++ b/WeakAuras/Locales/deDE.lua @@ -1669,7 +1669,7 @@ L["Requested display not authorized"] = "Angeforderte Anzeige ist nicht autorisi L["Requesting display information from %s ..."] = "Requesting display information from %s ..." L["Require Valid Target"] = "Erfordert gültiges Ziel" --[[Translation missing --]] -L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." --[[Translation missing --]] L["Resilience (%)"] = "Resilience (%)" --[[Translation missing --]] @@ -2338,4 +2338,30 @@ L["Zoom"] = "Zoom" --[[Translation missing --]] L["Zoom Animation"] = "Zoom Animation" L["Zul'Gurub"] = "Zul'Gurub" - +L["Affliction"] = "Gebrechen" +L["Arcane"] = "Arkan" +L["Arms"] = "Waffen" +L["Assassination"] = "Meucheln" +L["Balance"] = "Gleichgewicht" +L["Beast Mastery"] = "Tierherrschaft" +L["Blood"] = "Blut" +L["Combat"] = "Kampf" +L["Demonology"] = "Dämonologie" +L["Destruction"] = "Zerstörung" +L["Discipline"] = "Disziplin" +L["Elemental"] = "Elementar" +L["Enhancement"] = "Verstärkung" +L["Feral Combat"] = "Wilder Kampf" +L["Fire"] = "Feuer" +L["Frost"] = "Frost" +L["Fury"] = "Furor" +L["Holy"] = "Heilig" +L["Hybrid"] = "Hybride" +L["Marksmanship"] = "Treffsicherheit" +L["Protection"] = "Schutz" +L["Restoration"] = "Wiederherstellung" +L["Retribution"] = "Vergeltung" +L["Shadow"] = "Schatten" +L["Subtlety"] = "Täuschung" +L["Survival"] = "Überleben" +L["Unholy"] = "Unheilig" diff --git a/WeakAuras/Locales/enUS.lua b/WeakAuras/Locales/enUS.lua index e91ca51..a9c5c7a 100644 --- a/WeakAuras/Locales/enUS.lua +++ b/WeakAuras/Locales/enUS.lua @@ -1105,7 +1105,7 @@ L["Requested display does not exist"] = "Requested display does not exist" L["Requested display not authorized"] = "Requested display not authorized" L["Requesting display information from %s ..."] = "Requesting display information from %s ..." L["Require Valid Target"] = "Require Valid Target" -L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." L["Resilience (%)"] = "Resilience (%)" L["Resilience Rating"] = "Resilience Rating" L["Resist"] = "Resist" @@ -1519,7 +1519,33 @@ L["Zone Name"] = "Zone Name" L["Zoom"] = "Zoom" L["Zoom Animation"] = "Zoom Animation" L["Zul'Gurub"] = "Zul'Gurub" - +L["Affliction"] = "Affliction" +L["Arcane"] = "Arcane" +L["Arms"] = "Arms" +L["Assassination"] = "Assassination" +L["Balance"] = "Balance" +L["Beast Mastery"] = "Beast Mastery" +L["Blood"] = "Blood" +L["Combat"] = "Combat" +L["Demonology"] = "Demonology" +L["Destruction"] = "Destruction" +L["Discipline"] = "Discipline" +L["Elemental"] = "Elemental" +L["Enhancement"] = "Enhancement" +L["Feral Combat"] = "Feral Combat" +L["Fire"] = "Fire" +L["Frost"] = "Frost" +L["Fury"] = "Fury" +L["Holy"] = "Holy" +L["Hybrid"] = "Hybrid" +L["Marksmanship"] = "Marksmanship" +L["Protection"] = "Protection" +L["Restoration"] = "Restoration" +L["Retribution"] = "Retribution" +L["Shadow"] = "Shadow" +L["Subtlety"] = "Subtlety" +L["Survival"] = "Survival" +L["Unholy"] = "Unholy" -- Make missing translations available setmetatable(WeakAuras.L, {__index = function(self, key) diff --git a/WeakAuras/Locales/esES.lua b/WeakAuras/Locales/esES.lua index 5518af4..b8dd665 100644 --- a/WeakAuras/Locales/esES.lua +++ b/WeakAuras/Locales/esES.lua @@ -1051,7 +1051,7 @@ L["Requested display does not exist"] = "El aura requerida no existe" L["Requested display not authorized"] = "El aura requerida no está autorizada" L["Requesting display information from %s ..."] = "Solicitando información de visualización de %s..." L["Require Valid Target"] = "Requiere Objetivo Válido" -L["Requires syncing the specialization via LibSpecialization."] = "Requiere sincronizar la especialización mediante LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Requiere sincronizar la especialización mediante LibGroupTalents." L["Resilience (%)"] = "Temple (%)" L["Resilience Rating"] = "Índice de temple" L["Resist"] = "Resistir" @@ -1457,4 +1457,30 @@ L["Zone Name"] = "Nombre de zona" L["Zoom"] = "Zoom" L["Zoom Animation"] = "Animación de zoom" L["Zul'Gurub"] = "Zul'Gurub" - +L["Affliction"] = "Aflicción" +L["Arcane"] = "Arcano" +L["Arms"] = "Armas" +L["Assassination"] = "Asesinato" +L["Balance"] = "Equilibrio" +L["Beast Mastery"] = "Dominio de bestias" +L["Blood"] = "Sangre" +L["Combat"] = "Combate" +L["Demonology"] = "Demonología" +L["Destruction"] = "Destrucción" +L["Discipline"] = "Disciplina" +L["Elemental"] = "Elemental" +L["Enhancement"] = "Mejora" +L["Feral Combat"] = "Combate Feral" +L["Fire"] = "Fuego" +L["Frost"] = "Escarcha" +L["Fury"] = "Furia" +L["Holy"] = "Sagrado" +L["Hybrid"] = "Híbrido" +L["Marksmanship"] = "Puntería" +L["Protection"] = "Protección" +L["Restoration"] = "Restauración" +L["Retribution"] = "Reprensión" +L["Shadow"] = "Sombras" +L["Subtlety"] = "Sutileza" +L["Survival"] = "Supervivencia" +L["Unholy"] = "Profano" diff --git a/WeakAuras/Locales/esMX.lua b/WeakAuras/Locales/esMX.lua index e44f3dd..3a25e0e 100644 --- a/WeakAuras/Locales/esMX.lua +++ b/WeakAuras/Locales/esMX.lua @@ -1052,7 +1052,7 @@ L["Requested display does not exist"] = "El aura requerida no existe" L["Requested display not authorized"] = "El aura requerida no está autorizada" L["Requesting display information from %s ..."] = "Solicitando información de visualización de %s..." L["Require Valid Target"] = "Requiere Objetivo Válido" -L["Requires syncing the specialization via LibSpecialization."] = "Requiere sincronizar la especialización mediante LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Requiere sincronizar la especialización mediante LibGroupTalents." L["Resilience (%)"] = "Temple (%)" L["Resilience Rating"] = "Índice de temple" L["Resist"] = "Resistir" @@ -1458,4 +1458,30 @@ L["Zone Name"] = "Nombre de zona" L["Zoom"] = "Zoom" L["Zoom Animation"] = "Animación de zoom" L["Zul'Gurub"] = "Zul'Gurub" - +L["Affliction"] = "Aflicción" +L["Arcane"] = "Arcano" +L["Arms"] = "Armas" +L["Assassination"] = "Asesinato" +L["Balance"] = "Balance" +L["Beast Mastery"] = "Bestias" +L["Blood"] = "Sangre" +L["Combat"] = "Combate" +L["Demonology"] = "Demonología" +L["Destruction"] = "Destrucción" +L["Discipline"] = "Disciplina" +L["Elemental"] = "Elemental" +L["Enhancement"] = "Mejora" +L["Feral Combat"] = "Combate feral" +L["Fire"] = "Fuego" +L["Frost"] = "Escarcha" +L["Fury"] = "Furia" +L["Holy"] = "Sagrado" +L["Hybrid"] = "Híbrido" +L["Marksmanship"] = "Puntería" +L["Protection"] = "Protección" +L["Restoration"] = "Restauración" +L["Retribution"] = "Reprensión" +L["Shadow"] = "Sombra" +L["Subtlety"] = "Sutileza" +L["Survival"] = "Supervivencia" +L["Unholy"] = "Profano" diff --git a/WeakAuras/Locales/frFR.lua b/WeakAuras/Locales/frFR.lua index 2285340..4ec0279 100644 --- a/WeakAuras/Locales/frFR.lua +++ b/WeakAuras/Locales/frFR.lua @@ -1509,7 +1509,7 @@ L["Requested display not authorized"] = "L'affichage demandé n'est pas autoris L["Requesting display information from %s ..."] = "Demande des informations de l'affichage depuis %s ..." L["Require Valid Target"] = "Exige une cible valide" --[[Translation missing --]] -L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." --[[Translation missing --]] L["Resilience (%)"] = "Resilience (%)" --[[Translation missing --]] @@ -2128,4 +2128,30 @@ L["Zoom"] = "Zoom" --[[Translation missing --]] L["Zoom Animation"] = "Zoom Animation" L["Zul'Gurub"] = "Zul'Gurub" - +L["Affliction"] = "Affliction" +L["Arcane"] = "Arcane" +L["Arms"] = "Armes" +L["Assassination"] = "Assassinat" +L["Balance"] = "Equilibre" +L["Beast Mastery"] = "Maîtrise des bêtes" +L["Blood"] = "Sang" +L["Combat"] = "Combat" +L["Demonology"] = "Démonologie" +L["Destruction"] = "Destruction" +L["Discipline"] = "Discipline" +L["Elemental"] = "Elémentaire" +L["Enhancement"] = "Amélioration" +L["Feral Combat"] = "Combat farouche" +L["Fire"] = "Feu" +L["Frost"] = "Givre" +L["Fury"] = "Fureur" +L["Holy"] = "Sacré" +L["Hybrid"] = "Hybride" +L["Marksmanship"] = "Précision" +L["Protection"] = "Protection" +L["Restoration"] = "Restauration" +L["Retribution"] = "Vindicte" +L["Shadow"] = "Ombre" +L["Subtlety"] = "Finesse" +L["Survival"] = "Survie" +L["Unholy"] = "Impie" diff --git a/WeakAuras/Locales/itIT.lua b/WeakAuras/Locales/itIT.lua index cd408ad..c177524 100644 --- a/WeakAuras/Locales/itIT.lua +++ b/WeakAuras/Locales/itIT.lua @@ -1832,7 +1832,7 @@ L["Requesting display information from %s ..."] = "Requesting display informatio --[[Translation missing --]] L["Require Valid Target"] = "Require Valid Target" --[[Translation missing --]] -L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." --[[Translation missing --]] L["Resilience (%)"] = "Resilience (%)" --[[Translation missing --]] @@ -2637,4 +2637,30 @@ L["Zoom"] = "Zoom" L["Zoom Animation"] = "Zoom Animation" --[[Translation missing --]] L["Zul'Gurub"] = "Zul'Gurub" - +L["Affliction"] = "Affliction" +L["Arcane"] = "Arcane" +L["Arms"] = "Arms" +L["Assassination"] = "Assassination" +L["Balance"] = "Balance" +L["Beast Mastery"] = "Beast Mastery" +L["Blood"] = "Blood" +L["Combat"] = "Combat" +L["Demonology"] = "Demonology" +L["Destruction"] = "Destruction" +L["Discipline"] = "Discipline" +L["Elemental"] = "Elemental" +L["Enhancement"] = "Enhancement" +L["Feral Combat"] = "Feral Combat" +L["Fire"] = "Fire" +L["Frost"] = "Frost" +L["Fury"] = "Fury" +L["Holy"] = "Holy" +L["Hybrid"] = "Hybrid" +L["Marksmanship"] = "Marksmanship" +L["Protection"] = "Protection" +L["Restoration"] = "Restoration" +L["Retribution"] = "Retribution" +L["Shadow"] = "Shadow" +L["Subtlety"] = "Subtlety" +L["Survival"] = "Survival" +L["Unholy"] = "Unholy" diff --git a/WeakAuras/Locales/koKR.lua b/WeakAuras/Locales/koKR.lua index 66baa76..b1f09cf 100644 --- a/WeakAuras/Locales/koKR.lua +++ b/WeakAuras/Locales/koKR.lua @@ -1105,7 +1105,7 @@ L["Requested display does not exist"] = "요청한 디스플레이가 존재하 L["Requested display not authorized"] = "요청한 디스플레이가 올바르지 않습니다" L["Requesting display information from %s ..."] = "%s의 디스플레이 정보 요청 중 ..." L["Require Valid Target"] = "유효한 대상 필요" -L["Requires syncing the specialization via LibSpecialization."] = "LibSpecialization을 통해 전문화를 동기화해야 합니다." +L["Requires syncing the specialization via LibGroupTalents."] = "LibGroupTalents을 통해 전문화를 동기화해야 합니다." L["Resilience (%)"] = "탄력 (%)" L["Resilience Rating"] = "탄력도" L["Resist"] = "저항" @@ -1514,4 +1514,30 @@ L["Zone Name"] = "지역 이름" L["Zoom"] = "확대" L["Zoom Animation"] = "확대 애니메이션" L["Zul'Gurub"] = "줄구룹" - +L["Affliction"] = "고통" +L["Arcane"] = "비전" +L["Arms"] = "무기" +L["Assassination"] = "암살" +L["Balance"] = "조화" +L["Beast Mastery"] = "야수" +L["Blood"] = "혈기" +L["Combat"] = "전투" +L["Demonology"] = "악마" +L["Destruction"] = "파괴" +L["Discipline"] = "수양" +L["Elemental"] = "정기" +L["Enhancement"] = "고양" +L["Feral Combat"] = "야성" +L["Fire"] = "화염" +L["Frost"] = "냉기" +L["Fury"] = "분노" +L["Holy"] = "신성" +L["Hybrid"] = "하이브리드" +L["Marksmanship"] = "사격" +L["Protection"] = "방어" +L["Restoration"] = "복원" +L["Retribution"] = "징벌" +L["Shadow"] = "암흑" +L["Subtlety"] = "잠행" +L["Survival"] = "생존" +L["Unholy"] = "부정" diff --git a/WeakAuras/Locales/ptBR.lua b/WeakAuras/Locales/ptBR.lua index 4bec05c..702619d 100644 --- a/WeakAuras/Locales/ptBR.lua +++ b/WeakAuras/Locales/ptBR.lua @@ -1828,7 +1828,7 @@ L["Requested display not authorized"] = "Exibição requerida não autorizada" L["Requesting display information from %s ..."] = "Requesting display information from %s ..." L["Require Valid Target"] = "Requer um alvo válido" --[[Translation missing --]] -L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." --[[Translation missing --]] L["Resilience (%)"] = "Resilience (%)" --[[Translation missing --]] @@ -2562,4 +2562,30 @@ L["Zoom"] = "Zoom" L["Zoom Animation"] = "Zoom Animation" --[[Translation missing --]] L["Zul'Gurub"] = "Zul'Gurub" - +L["Affliction"] = "Affliction" +L["Arcane"] = "Arcane" +L["Arms"] = "Arms" +L["Assassination"] = "Assassination" +L["Balance"] = "Balance" +L["Beast Mastery"] = "Beast Mastery" +L["Blood"] = "Blood" +L["Combat"] = "Combat" +L["Demonology"] = "Demonology" +L["Destruction"] = "Destruction" +L["Discipline"] = "Discipline" +L["Elemental"] = "Elemental" +L["Enhancement"] = "Enhancement" +L["Feral Combat"] = "Feral Combat" +L["Fire"] = "Fire" +L["Frost"] = "Frost" +L["Fury"] = "Fury" +L["Holy"] = "Holy" +L["Hybrid"] = "Hybrid" +L["Marksmanship"] = "Marksmanship" +L["Protection"] = "Protection" +L["Restoration"] = "Restoration" +L["Retribution"] = "Retribution" +L["Shadow"] = "Shadow" +L["Subtlety"] = "Subtlety" +L["Survival"] = "Survival" +L["Unholy"] = "Unholy" diff --git a/WeakAuras/Locales/ruRU.lua b/WeakAuras/Locales/ruRU.lua index 83472a5..1645894 100644 --- a/WeakAuras/Locales/ruRU.lua +++ b/WeakAuras/Locales/ruRU.lua @@ -1083,7 +1083,7 @@ L["Requested display does not exist"] = "Запрошенная индикаци L["Requested display not authorized"] = "Запрошенная индикация не разрешена" L["Requesting display information from %s ..."] = "Запрос информации об индикации от %s ..." L["Require Valid Target"] = "Требуется допустимая цель" -L["Requires syncing the specialization via LibSpecialization."] = "Требуется синхронизация специализации через LibSpecialization." +L["Requires syncing the specialization via LibGroupTalents."] = "Требуется синхронизация специализации через LibGroupTalents." L["Resilience (%)"] = "Устойчивость (%)" --[[Translation missing --]] L["Resilience Rating"] = "Resilience Rating" @@ -1503,4 +1503,30 @@ L["Zone Name"] = "Название игровой зоны" L["Zoom"] = "Масштаб" L["Zoom Animation"] = "Анимация масштаба" L["Zul'Gurub"] = "Зул'Гуруб" - +L["Affliction"] = "Колдовство" +L["Arcane"] = "Тайная магия" +L["Arms"] = "Оружие" +L["Assassination"] = "Убийство" +L["Balance"] = "Баланс" +L["Beast Mastery"] = "Чувство зверя" +L["Blood"] = "Кровь" +L["Combat"] = "Бой" +L["Demonology"] = "Демонология" +L["Destruction"] = "Разрушение" +L["Discipline"] = "Послушание" +L["Elemental"] = "Укрощение стихии" +L["Enhancement"] = "Совершенствование" +L["Feral Combat"] = "Сила зверя" +L["Fire"] = "Огонь" +L["Frost"] = "Лед" +L["Fury"] = "Неистовство" +L["Holy"] = "Свет" +L["Hybrid"] = "Гибрид" +L["Marksmanship"] = "Стрельба" +L["Protection"] = "Защита" +L["Restoration"] = "Исцеление" +L["Retribution"] = "Возмездие" +L["Shadow"] = "Темная магия" +L["Subtlety"] = "Скрытность" +L["Survival"] = "Выживание" +L["Unholy"] = "Нечестивость" diff --git a/WeakAuras/Locales/zhCN.lua b/WeakAuras/Locales/zhCN.lua index 0099b50..db30adf 100644 --- a/WeakAuras/Locales/zhCN.lua +++ b/WeakAuras/Locales/zhCN.lua @@ -1113,7 +1113,7 @@ L["Requested display does not exist"] = "请求接收的图示不存在" L["Requested display not authorized"] = "请求接收的图示没有授权" L["Requesting display information from %s ..."] = "请求来 %s 的图示信息" L["Require Valid Target"] = "需要有效目标" -L["Requires syncing the specialization via LibSpecialization."] = "需要通过LibSpecialization同步专精。" +L["Requires syncing the specialization via LibGroupTalents."] = "需要通过LibGroupTalents同步专精。" L["Resilience (%)"] = "韧性 (%)" L["Resilience Rating"] = "韧性等级" L["Resist"] = "抵抗" @@ -1523,4 +1523,30 @@ L["Zone Name"] = "地图名称" L["Zoom"] = "缩放" L["Zoom Animation"] = "缩放动画" L["Zul'Gurub"] = "祖尔格拉布" - +L["Affliction"] = "痛苦" +L["Arcane"] = "奥术" +L["Arms"] = "武器" +L["Assassination"] = "刺杀" +L["Balance"] = "平衡" +L["Beast Mastery"] = "野兽控制" +L["Blood"] = "鲜血" +L["Combat"] = "战斗" +L["Demonology"] = "恶魔学识" +L["Destruction"] = "毁灭" +L["Discipline"] = "戒律" +L["Elemental"] = "元素战斗" +L["Enhancement"] = "增强" +L["Feral Combat"] = "野性战斗" +L["Fire"] = "火焰" +L["Frost"] = "冰霜" +L["Fury"] = "狂怒" +L["Holy"] = "神圣" +L["Hybrid"] = "混合" +L["Marksmanship"] = "射击" +L["Protection"] = "防护" +L["Restoration"] = "恢复" +L["Retribution"] = "惩戒" +L["Shadow"] = "暗影魔法" +L["Subtlety"] = "敏锐" +L["Survival"] = "生存技能" +L["Unholy"] = "邪恶" diff --git a/WeakAuras/Locales/zhTW.lua b/WeakAuras/Locales/zhTW.lua index f6b9dac..0436175 100644 --- a/WeakAuras/Locales/zhTW.lua +++ b/WeakAuras/Locales/zhTW.lua @@ -1077,7 +1077,7 @@ L["Requested display does not exist"] = "需求的提醒效果不存在" L["Requested display not authorized"] = "需求的提醒效果沒有授權" L["Requesting display information from %s ..."] = "正在請求來自於 %s 的顯示資訊..." L["Require Valid Target"] = "需要有效目標" -L["Requires syncing the specialization via LibSpecialization."] = "需要透由LibSpecialization同步專精。" +L["Requires syncing the specialization via LibGroupTalents."] = "需要透由LibGroupTalents同步專精。" L["Resilience (%)"] = "韌性 (%)" L["Resilience Rating"] = "韌性等級" L["Resist"] = "抵抗" @@ -1488,4 +1488,30 @@ L["Zone Name"] = "區域名稱" L["Zoom"] = "縮放" L["Zoom Animation"] = "縮放動畫" L["Zul'Gurub"] = "祖爾格拉布" - +L["Affliction"] = "痛苦" +L["Arcane"] = "秘法" +L["Arms"] = "武器" +L["Assassination"] = "刺殺" +L["Balance"] = "平衡" +L["Beast Mastery"] = "野獸控制" +L["Blood"] = "血魄" +L["Combat"] = "戰鬥" +L["Demonology"] = "惡魔學識" +L["Destruction"] = "毀滅" +L["Discipline"] = "戒律" +L["Elemental"] = "元素" +L["Enhancement"] = "增強" +L["Feral Combat"] = "野性戰鬥" +L["Fire"] = "火焰" +L["Frost"] = "冰霜" +L["Fury"] = "狂怒" +L["Holy"] = "神聖" +L["Hybrid"] = "混合" +L["Marksmanship"] = "射擊" +L["Protection"] = "防護" +L["Restoration"] = "恢復" +L["Retribution"] = "懲戒" +L["Shadow"] = "暗影" +L["Subtlety"] = "敏銳" +L["Survival"] = "生存" +L["Unholy"] = "穢邪" diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua index 7d67aec..12b1245 100644 --- a/WeakAuras/Prototypes.lua +++ b/WeakAuras/Prototypes.lua @@ -1576,7 +1576,7 @@ Private.event_prototypes = { values = "spec_types_all", store = true, conditionType = "select", - desc = L["Requires syncing the specialization via LibSpecialization."], + desc = L["Requires syncing the specialization via LibGroupTalents."], }, { name = "classification", @@ -2099,7 +2099,7 @@ Private.event_prototypes = { enable = function(trigger) return trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party" end, - desc = L["Requires syncing the specialization via LibSpecialization."], + desc = L["Requires syncing the specialization via LibGroupTalents."], }, { name = "raid_role", @@ -2470,7 +2470,7 @@ Private.event_prototypes = { enable = function(trigger) return trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party" end, - desc = L["Requires syncing the specialization via LibSpecialization."], + desc = L["Requires syncing the specialization via LibGroupTalents."], }, { name = "raid_role", diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua index d74d2a8..f9ed913 100644 --- a/WeakAuras/Types.lua +++ b/WeakAuras/Types.lua @@ -3252,50 +3252,40 @@ WeakAuras.StopMotion.animation_types = { progress = L["Progress"] } -Private.spec_types_all = { - -- Death Knight - L["Blood"], - L["Frost"], - L["Unholy"], - -- Druid - L["Balance"], - L["Feral Combat"], - L["Guardian"], - L["Restoration"], - -- Hunter - L["Beast Mastery"], - L["Marksmanship"], - L["Survival"], - -- Mage - L["Arcane"], - L["Fire"], - L["Frost"], - -- Paladin - L["Holy"], - L["Protection"], - L["Retribution"], - -- Priest - L["Discipline"], - L["Holy"], - L["Shadow"], - -- Rogue - L["Assassination"], - L["Combat"], - L["Subtlety"], - -- Shaman - L["Elemental"], - L["Enhancement"], - L["Restoration"], - -- Warlock - L["Affliction"], - L["Demonology"], - L["Destruction"], - -- Warrior - L["Arms"], - L["Fury"], - L["Protection"], +local classIcons = { + DRUID = "Interface\\Icons\\Ability_Druid_Maul", + HUNTER = "Interface\\Icons\\INV_Weapon_Bow_07", + MAGE = "Interface\\Icons\\INV_Staff_13", + PALADIN = "Interface\\Icons\\INV_Hammer_01", + PRIEST = "Interface\\Icons\\INV_Staff_30", + ROGUE = "Interface\\Icons\\INV_ThrowingKnife_04", + SHAMAN = "Interface\\Icons\\Spell_Nature_BloodLust", + WARLOCK = "Interface\\Icons\\Spell_Nature_FaerieFire", + WARRIOR = "Interface\\Icons\\INV_Sword_27", + DEATHKNIGHT = "Interface\\Icons\\Spell_Deathknight_ClassIcon", } +local specs = { + DEATHKNIGHT = { L["Blood"], L["Frost"], L["Unholy"] }, + DRUID = { L["Balance"], L["Feral Combat"], L["Guardian"], L["Restoration"] }, + HUNTER = { L["Beast Mastery"], L["Marksmanship"], L["Survival"] }, + MAGE = { L["Arcane"], L["Fire"], L["Frost"] }, + PALADIN = { L["Holy"], L["Protection"], L["Retribution"] }, + PRIEST = { L["Discipline"], L["Holy"], L["Shadow"] }, + ROGUE = { L["Assassination"], L["Combat"], L["Subtlety"] }, + SHAMAN = { L["Elemental"], L["Enhancement"], L["Restoration"] }, + WARLOCK = { L["Affliction"], L["Demonology"], L["Destruction"] }, + WARRIOR = { L["Arms"], L["Fury"], L["Protection"] } +} + +Private.spec_types_all = {} +for class, specList in pairs(specs) do + for _, specName in ipairs(specList) do + Private.spec_types_all[class .. specName] = "|T" .. classIcons[class] .. ":0|t |c" .. + WA_GetClassColor(class) .. specName .. "|r" + end +end + Private.talent_types_specific = {} Private.talents_ids = { DEATHKNIGHT = {{48979,48997,49182,48978,49004,55107,48982,48987,49467,48985,49145,49015,48977,49006,49005,48988,53137,49027,49016,50365,62905,49018,55233,49189,55050,49023,61154,49028}, {49175,49455,49042,55061,49140,49226,50880,49039,51468,51123,49149,49137,49186,49471,49796,55610,49024,49188,50040,49203,50384,65661,54639,51271,49200,49143,50187,49202,49184}, {51745,48962,55129,49036,48963,49588,48965,49013,51459,49158,49146,49219,55620,49194,49220,49223,55666,49224,49208,52143,66799,51052,50391,63560,49032,49222,49217,51099,55090,50117,49206}}, diff --git a/WeakAurasOptions/BuffTrigger2.lua b/WeakAurasOptions/BuffTrigger2.lua index 62ef79d..02057f5 100644 --- a/WeakAurasOptions/BuffTrigger2.lua +++ b/WeakAurasOptions/BuffTrigger2.lua @@ -715,7 +715,7 @@ local function GetBuffTriggerOptions(data, triggernum) type = "toggle", width = WeakAuras.normalWidth, name = L["Filter by Specialization"], - desc = L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"], + desc = L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"], order = 66.3, hidden = function() return not (trigger.type == "aura2" and (trigger.unit == "group" or trigger.unit == "raid" or trigger.unit == "party")) @@ -725,7 +725,7 @@ local function GetBuffTriggerOptions(data, triggernum) type = "multiselect", width = WeakAuras.normalWidth, name = L["Actual Spec"], - desc = L["Requires syncing the specialization via LibSpecialization."], + desc = L["Requires syncing the specialization via LibGroupTalents."], values = OptionsPrivate.Private.spec_types_all, hidden = function() return not (trigger.type == "aura2" diff --git a/WeakAurasOptions/Locales/deDE.lua b/WeakAurasOptions/Locales/deDE.lua index 559f7cb..0e8786b 100644 --- a/WeakAurasOptions/Locales/deDE.lua +++ b/WeakAurasOptions/Locales/deDE.lua @@ -858,8 +858,6 @@ Falls die Zahl als Dezimalzahl (z.B. 0.5), Bruch (z.B. 1/2) oder Prozentsatz (z. L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" --[[Translation missing --]] L["LibSharedMedia"] = "LibSharedMedia" - --[[Translation missing --]] - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "Limit" --[[Translation missing --]] L["Line"] = "Line" @@ -1126,9 +1124,9 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] L["Require unit from trigger"] = "Require unit from trigger" L["Required for Activation"] = "Benötigt zur Aktivierung" --[[Translation missing --]] - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "Requires LibSpecialization, that is e.g. a up-to date WeakAuras version" + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version" --[[Translation missing --]] - L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." + L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." --[[Translation missing --]] L["Reset all options to their default values."] = "Reset all options to their default values." L["Reset Entry"] = "Eintrag zurücksetzen" @@ -1582,31 +1580,5 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom"] = "Zoom" L["Zoom In"] = "Einzoomen" L["Zoom Out"] = "Auszoomen" - L["Affliction"] = "Gebrechen" - L["Arcane"] = "Arkan" - L["Arms"] = "Waffen" - L["Assassination"] = "Meucheln" - L["Balance"] = "Gleichgewicht" - L["Beast Mastery"] = "Tierherrschaft" - L["Blood"] = "Blut" - L["Combat"] = "Kampf" - L["Demonology"] = "Dämonologie" - L["Destruction"] = "Zerstörung" - L["Discipline"] = "Disziplin" - L["Elemental"] = "Elementar" - L["Enhancement"] = "Verstärkung" - L["Feral Combat"] = "Wilder Kampf" - L["Fire"] = "Feuer" - L["Frost"] = "Frost" - L["Fury"] = "Furor" - L["Holy"] = "Heilig" - L["Hybrid"] = "Hybride" - L["Marksmanship"] = "Treffsicherheit" - L["Protection"] = "Schutz" - L["Restoration"] = "Wiederherstellung" - L["Retribution"] = "Vergeltung" - L["Shadow"] = "Schatten" - L["Subtlety"] = "Täuschung" - L["Survival"] = "Überleben" - L["Unholy"] = "Unheilig" + diff --git a/WeakAurasOptions/Locales/enUS.lua b/WeakAurasOptions/Locales/enUS.lua index e0b0548..044bff0 100644 --- a/WeakAurasOptions/Locales/enUS.lua +++ b/WeakAurasOptions/Locales/enUS.lua @@ -409,30 +409,3 @@ L["Z Offset"] = "Z Offset" L["Zoom"] = "Zoom" L["Zoom In"] = "Zoom In" L["Zoom Out"] = "Zoom Out" -L["Affliction"] = "Affliction" -L["Arcane"] = "Arcane" -L["Arms"] = "Arms" -L["Assassination"] = "Assassination" -L["Balance"] = "Balance" -L["Beast Mastery"] = "Beast Mastery" -L["Blood"] = "Blood" -L["Combat"] = "Combat" -L["Demonology"] = "Demonology" -L["Destruction"] = "Destruction" -L["Discipline"] = "Discipline" -L["Elemental"] = "Elemental" -L["Enhancement"] = "Enhancement" -L["Feral Combat"] = "Feral Combat" -L["Fire"] = "Fire" -L["Frost"] = "Frost" -L["Fury"] = "Fury" -L["Holy"] = "Holy" -L["Hybrid"] = "Hybrid" -L["Marksmanship"] = "Marksmanship" -L["Protection"] = "Protection" -L["Restoration"] = "Restoration" -L["Retribution"] = "Retribution" -L["Shadow"] = "Shadow" -L["Subtlety"] = "Subtlety" -L["Survival"] = "Survival" -L["Unholy"] = "Unholy" \ No newline at end of file diff --git a/WeakAurasOptions/Locales/esES.lua b/WeakAurasOptions/Locales/esES.lua index 3b2ee7f..3cd044a 100644 --- a/WeakAurasOptions/Locales/esES.lua +++ b/WeakAurasOptions/Locales/esES.lua @@ -579,7 +579,6 @@ Con |cFF00CC00>= 0|r se activará siempre.]=] L["LibDispel: Simpy"] = "LibDispel: Simpy" L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" L["LibSharedMedia"] = "LibSharedMedia" - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "Límite" L["Line"] = "Línea" L["Linear Texture %s"] = "Textura lineal de %s" @@ -747,8 +746,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d L["Report bugs on our issue tracker."] = "Informa de los errores en nuestro rastreador de problemas." L["Require unit from trigger"] = "Requiere unidad del activador" L["Required for Activation"] = "Necesario para la activación" - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "Requiere LibSpecialization, es decir, una versión actualizada de WeakAuras." - L["Requires syncing the specialization via LibSpecialization."] = "Requiere sincronizar la especialización mediante LibSpecialization." + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "Requiere LibGroupTalents, es decir, una versión actualizada de WeakAuras." + L["Requires syncing the specialization via LibGroupTalents."] = "Requiere sincronizar la especialización mediante LibGroupTalents." L["Reset all options to their default values."] = "Restablece todas las opciones a sus valores por defecto." L["Reset Entry"] = "Restablecer entrada" L["Reset to Defaults"] = "Restablecer valores" @@ -1036,30 +1035,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom"] = "Ampliación" L["Zoom In"] = "Acercar" L["Zoom Out"] = "Alejar" - L["Affliction"] = "Aflicción" - L["Arcane"] = "Arcano" - L["Arms"] = "Armas" - L["Assassination"] = "Asesinato" - L["Balance"] = "Equilibrio" - L["Beast Mastery"] = "Dominio de bestias" - L["Blood"] = "Sangre" - L["Combat"] = "Combate" - L["Demonology"] = "Demonología" - L["Destruction"] = "Destrucción" - L["Discipline"] = "Disciplina" - L["Elemental"] = "Elemental" - L["Enhancement"] = "Mejora" - L["Feral Combat"] = "Combate Feral" - L["Fire"] = "Fuego" - L["Frost"] = "Escarcha" - L["Fury"] = "Furia" - L["Holy"] = "Sagrado" - L["Hybrid"] = "Híbrido" - L["Marksmanship"] = "Puntería" - L["Protection"] = "Protección" - L["Restoration"] = "Restauración" - L["Retribution"] = "Reprensión" - L["Shadow"] = "Sombras" - L["Subtlety"] = "Sutileza" - L["Survival"] = "Supervivencia" - L["Unholy"] = "Profano" + diff --git a/WeakAurasOptions/Locales/esMX.lua b/WeakAurasOptions/Locales/esMX.lua index ff20eea..4439dd3 100644 --- a/WeakAurasOptions/Locales/esMX.lua +++ b/WeakAurasOptions/Locales/esMX.lua @@ -579,7 +579,6 @@ Con |cFF00CC00>= 0|r se activará siempre.]=] L["LibDispel: Simpy"] = "LibDispel: Simpy" L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" L["LibSharedMedia"] = "LibSharedMedia" - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "Límite" L["Line"] = "Línea" L["Linear Texture %s"] = "Textura lineal de %s" @@ -747,8 +746,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d L["Report bugs on our issue tracker."] = "Informa de los errores en nuestro rastreador de problemas." L["Require unit from trigger"] = "Requiere unidad del activador" L["Required for Activation"] = "Necesario para la activación" - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "Requiere LibSpecialization, es decir, una versión actualizada de WeakAuras." - L["Requires syncing the specialization via LibSpecialization."] = "Requiere sincronizar la especialización mediante LibSpecialization." + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "Requiere LibGroupTalents, es decir, una versión actualizada de WeakAuras." + L["Requires syncing the specialization via LibGroupTalents."] = "Requiere sincronizar la especialización mediante LibGroupTalents." L["Reset all options to their default values."] = "Restablece todas las opciones a sus valores por defecto." L["Reset Entry"] = "Restablecer entrada" L["Reset to Defaults"] = "Restablecer valores" @@ -1036,30 +1035,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom"] = "Ampliación" L["Zoom In"] = "Acercar" L["Zoom Out"] = "Alejar" - L["Affliction"] = "Aflicción" - L["Arcane"] = "Arcano" - L["Arms"] = "Armas" - L["Assassination"] = "Asesinato" - L["Balance"] = "Balance" - L["Beast Mastery"] = "Bestias" - L["Blood"] = "Sangre" - L["Combat"] = "Combate" - L["Demonology"] = "Demonología" - L["Destruction"] = "Destrucción" - L["Discipline"] = "Disciplina" - L["Elemental"] = "Elemental" - L["Enhancement"] = "Mejora" - L["Feral Combat"] = "Combate feral" - L["Fire"] = "Fuego" - L["Frost"] = "Escarcha" - L["Fury"] = "Furia" - L["Holy"] = "Sagrado" - L["Hybrid"] = "Híbrido" - L["Marksmanship"] = "Puntería" - L["Protection"] = "Protección" - L["Restoration"] = "Restauración" - L["Retribution"] = "Reprensión" - L["Shadow"] = "Sombra" - L["Subtlety"] = "Sutileza" - L["Survival"] = "Supervivencia" - L["Unholy"] = "Profano" + diff --git a/WeakAurasOptions/Locales/frFR.lua b/WeakAurasOptions/Locales/frFR.lua index 3d748d7..88fa89d 100644 --- a/WeakAurasOptions/Locales/frFR.lua +++ b/WeakAurasOptions/Locales/frFR.lua @@ -796,8 +796,6 @@ Si cette case est cochée, ce séparateur inclura du texte. Sinon, ce sera juste L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" --[[Translation missing --]] L["LibSharedMedia"] = "LibSharedMedia" - --[[Translation missing --]] - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "Limite" --[[Translation missing --]] L["Line"] = "Line" @@ -1025,9 +1023,9 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] L["Require unit from trigger"] = "Require unit from trigger" L["Required for Activation"] = "Requis pour l'activation" --[[Translation missing --]] - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "Requires LibSpecialization, that is e.g. a up-to date WeakAuras version" + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version" --[[Translation missing --]] - L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." + L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." L["Reset all options to their default values."] = "Réinitialiser toutes les options à leurs valeurs par défaut." --[[Translation missing --]] L["Reset Entry"] = "Reset Entry" @@ -1445,30 +1443,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom"] = "Zoom" L["Zoom In"] = "Zoom avant" L["Zoom Out"] = "Zoom arrière" - L["Affliction"] = "Affliction" - L["Arcane"] = "Arcane" - L["Arms"] = "Armes" - L["Assassination"] = "Assassinat" - L["Balance"] = "Equilibre" - L["Beast Mastery"] = "Maîtrise des bêtes" - L["Blood"] = "Sang" - L["Combat"] = "Combat" - L["Demonology"] = "Démonologie" - L["Destruction"] = "Destruction" - L["Discipline"] = "Discipline" - L["Elemental"] = "Elémentaire" - L["Enhancement"] = "Amélioration" - L["Feral Combat"] = "Combat farouche" - L["Fire"] = "Feu" - L["Frost"] = "Givre" - L["Fury"] = "Fureur" - L["Holy"] = "Sacré" - L["Hybrid"] = "Hybride" - L["Marksmanship"] = "Précision" - L["Protection"] = "Protection" - L["Restoration"] = "Restauration" - L["Retribution"] = "Vindicte" - L["Shadow"] = "Ombre" - L["Subtlety"] = "Finesse" - L["Survival"] = "Survie" - L["Unholy"] = "Impie" + diff --git a/WeakAurasOptions/Locales/itIT.lua b/WeakAurasOptions/Locales/itIT.lua index 6d7577c..93a94f6 100644 --- a/WeakAurasOptions/Locales/itIT.lua +++ b/WeakAurasOptions/Locales/itIT.lua @@ -866,8 +866,6 @@ Bleed classification via LibDispel]=] --[[Translation missing --]] L["LibSharedMedia"] = "LibSharedMedia" --[[Translation missing --]] - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" - --[[Translation missing --]] L["Limit"] = "Limit" --[[Translation missing --]] L["Line"] = "Line" @@ -1190,9 +1188,9 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] --[[Translation missing --]] L["Required for Activation"] = "Required for Activation" --[[Translation missing --]] - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "Requires LibSpecialization, that is e.g. a up-to date WeakAuras version" + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version" --[[Translation missing --]] - L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." + L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." --[[Translation missing --]] L["Reset all options to their default values."] = "Reset all options to their default values." --[[Translation missing --]] @@ -1763,30 +1761,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom In"] = "Zoom In" --[[Translation missing --]] L["Zoom Out"] = "Zoom Out" - L["Affliction"] = "Affliction" - L["Arcane"] = "Arcane" - L["Arms"] = "Arms" - L["Assassination"] = "Assassination" - L["Balance"] = "Balance" - L["Beast Mastery"] = "Beast Mastery" - L["Blood"] = "Blood" - L["Combat"] = "Combat" - L["Demonology"] = "Demonology" - L["Destruction"] = "Destruction" - L["Discipline"] = "Discipline" - L["Elemental"] = "Elemental" - L["Enhancement"] = "Enhancement" - L["Feral Combat"] = "Feral Combat" - L["Fire"] = "Fire" - L["Frost"] = "Frost" - L["Fury"] = "Fury" - L["Holy"] = "Holy" - L["Hybrid"] = "Hybrid" - L["Marksmanship"] = "Marksmanship" - L["Protection"] = "Protection" - L["Restoration"] = "Restoration" - L["Retribution"] = "Retribution" - L["Shadow"] = "Shadow" - L["Subtlety"] = "Subtlety" - L["Survival"] = "Survival" - L["Unholy"] = "Unholy" + diff --git a/WeakAurasOptions/Locales/koKR.lua b/WeakAurasOptions/Locales/koKR.lua index 5d83ada..20c8f0a 100644 --- a/WeakAurasOptions/Locales/koKR.lua +++ b/WeakAurasOptions/Locales/koKR.lua @@ -616,7 +616,6 @@ Bleed classification via LibDispel]=] ] = [=[여러 속성 중 해제가 되는 L["LibDispel: Simpy"] = "LibDispel: Simpy" L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" L["LibSharedMedia"] = "LibSharedMedia" - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "제한" L["Line"] = "줄" L["Linear Texture %s"] = "직선형 텍스처 %s" @@ -793,8 +792,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트 L["Report bugs on our issue tracker."] = "이슈 트래커에 버그를 제보해 주세요." L["Require unit from trigger"] = "활성 조건에서 유닛 필요" L["Required for Activation"] = "활성화에 필요" - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "LibSpecialization이 필요합니다. 예를 들면 최신 WeakAuras 버전으로 업데이트하면 됩니다" - L["Requires syncing the specialization via LibSpecialization."] = "LibSpecialization을 통해 전문화를 동기화해야 합니다." + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "LibGroupTalents이 필요합니다. 예를 들면 최신 WeakAuras 버전으로 업데이트하면 됩니다" + L["Requires syncing the specialization via LibGroupTalents."] = "LibGroupTalents을 통해 전문화를 동기화해야 합니다." L["Reset all options to their default values."] = "모든 옵션을 기본값으로 재설정하십시오." L["Reset Entry"] = "항목 초기화" L["Reset to Defaults"] = "기본값으로 재설정" @@ -1080,30 +1079,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom"] = "확대" L["Zoom In"] = "확대" L["Zoom Out"] = "축소" - L["Affliction"] = "고통" - L["Arcane"] = "비전" - L["Arms"] = "무기" - L["Assassination"] = "암살" - L["Balance"] = "조화" - L["Beast Mastery"] = "야수" - L["Blood"] = "혈기" - L["Combat"] = "전투" - L["Demonology"] = "악마" - L["Destruction"] = "파괴" - L["Discipline"] = "수양" - L["Elemental"] = "정기" - L["Enhancement"] = "고양" - L["Feral Combat"] = "야성" - L["Fire"] = "화염" - L["Frost"] = "냉기" - L["Fury"] = "분노" - L["Holy"] = "신성" - L["Hybrid"] = "하이브리드" - L["Marksmanship"] = "사격" - L["Protection"] = "방어" - L["Restoration"] = "복원" - L["Retribution"] = "징벌" - L["Shadow"] = "암흑" - L["Subtlety"] = "잠행" - L["Survival"] = "생존" - L["Unholy"] = "부정" + diff --git a/WeakAurasOptions/Locales/ptBR.lua b/WeakAurasOptions/Locales/ptBR.lua index 8bb5655..ade3a23 100644 --- a/WeakAurasOptions/Locales/ptBR.lua +++ b/WeakAurasOptions/Locales/ptBR.lua @@ -927,8 +927,6 @@ Bleed classification via LibDispel]=] --[[Translation missing --]] L["LibSharedMedia"] = "LibSharedMedia" --[[Translation missing --]] - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" - --[[Translation missing --]] L["Limit"] = "Limit" --[[Translation missing --]] L["Line"] = "Line" @@ -1218,9 +1216,9 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] L["Require unit from trigger"] = "Require unit from trigger" L["Required for Activation"] = "Requerido para Ativar" --[[Translation missing --]] - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "Requires LibSpecialization, that is e.g. a up-to date WeakAuras version" + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version" --[[Translation missing --]] - L["Requires syncing the specialization via LibSpecialization."] = "Requires syncing the specialization via LibSpecialization." + L["Requires syncing the specialization via LibGroupTalents."] = "Requires syncing the specialization via LibGroupTalents." --[[Translation missing --]] L["Reset all options to their default values."] = "Reset all options to their default values." --[[Translation missing --]] @@ -1737,30 +1735,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom In"] = "Zoom In" --[[Translation missing --]] L["Zoom Out"] = "Zoom Out" - L["Affliction"] = "Affliction" - L["Arcane"] = "Arcane" - L["Arms"] = "Arms" - L["Assassination"] = "Assassination" - L["Balance"] = "Balance" - L["Beast Mastery"] = "Beast Mastery" - L["Blood"] = "Blood" - L["Combat"] = "Combat" - L["Demonology"] = "Demonology" - L["Destruction"] = "Destruction" - L["Discipline"] = "Discipline" - L["Elemental"] = "Elemental" - L["Enhancement"] = "Enhancement" - L["Feral Combat"] = "Feral Combat" - L["Fire"] = "Fire" - L["Frost"] = "Frost" - L["Fury"] = "Fury" - L["Holy"] = "Holy" - L["Hybrid"] = "Hybrid" - L["Marksmanship"] = "Marksmanship" - L["Protection"] = "Protection" - L["Restoration"] = "Restoration" - L["Retribution"] = "Retribution" - L["Shadow"] = "Shadow" - L["Subtlety"] = "Subtlety" - L["Survival"] = "Survival" - L["Unholy"] = "Unholy" + diff --git a/WeakAurasOptions/Locales/ruRU.lua b/WeakAurasOptions/Locales/ruRU.lua index 5a277b3..20442b5 100644 --- a/WeakAurasOptions/Locales/ruRU.lua +++ b/WeakAurasOptions/Locales/ruRU.lua @@ -602,7 +602,6 @@ Bleed classification via LibDispel]=] ] = "Фильтровать только L["LibDispel: Simpy"] = "LibDispel: Simpy" L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" L["LibSharedMedia"] = "LibSharedMedia" - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "Лимит" L["Line"] = "Строка" L["Linear Texture %s"] = "Линейная текстура %s" @@ -770,8 +769,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Время L["Report bugs on our issue tracker."] = "Сообщите об ошибках на наш баг-трекер." L["Require unit from trigger"] = "Требуется единица от триггера" L["Required for Activation"] = "Необходимо для активации" - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "Требуется LibSpecialization, т.е. актуальная версия WeakAuras" - L["Requires syncing the specialization via LibSpecialization."] = "Требуется синхронизация специализации через LibSpecialization." + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "Требуется LibGroupTalents, т.е. актуальная версия WeakAuras" + L["Requires syncing the specialization via LibGroupTalents."] = "Требуется синхронизация специализации через LibGroupTalents." L["Reset all options to their default values."] = "Возвращает всем параметрам значения по умолчанию, заданные автором." L["Reset Entry"] = "Сбросить запись" L["Reset to Defaults"] = "Сбросить настройки" @@ -1074,30 +1073,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom"] = "Масштаб" L["Zoom In"] = "Увеличение" L["Zoom Out"] = "Уменьшение" - L["Affliction"] = "Колдовство" - L["Arcane"] = "Тайная магия" - L["Arms"] = "Оружие" - L["Assassination"] = "Убийство" - L["Balance"] = "Баланс" - L["Beast Mastery"] = "Чувство зверя" - L["Blood"] = "Кровь" - L["Combat"] = "Бой" - L["Demonology"] = "Демонология" - L["Destruction"] = "Разрушение" - L["Discipline"] = "Послушание" - L["Elemental"] = "Укрощение стихии" - L["Enhancement"] = "Совершенствование" - L["Feral Combat"] = "Сила зверя" - L["Fire"] = "Огонь" - L["Frost"] = "Лед" - L["Fury"] = "Неистовство" - L["Holy"] = "Свет" - L["Hybrid"] = "Гибрид" - L["Marksmanship"] = "Стрельба" - L["Protection"] = "Защита" - L["Restoration"] = "Исцеление" - L["Retribution"] = "Возмездие" - L["Shadow"] = "Темная магия" - L["Subtlety"] = "Скрытность" - L["Survival"] = "Выживание" - L["Unholy"] = "Нечестивость" + diff --git a/WeakAurasOptions/Locales/zhCN.lua b/WeakAurasOptions/Locales/zhCN.lua index 51bfd9b..805a992 100644 --- a/WeakAurasOptions/Locales/zhCN.lua +++ b/WeakAurasOptions/Locales/zhCN.lua @@ -600,7 +600,6 @@ Bleed classification via LibDispel]=] ] = "仅过滤给定类型的可驱散的 L["LibDispel: Simpy"] = "LibDispel: Simpy" L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" L["LibSharedMedia"] = "LibSharedMedia" - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "限制" L["Line"] = "行" L["Linear Texture %s"] = "线性材质%s" @@ -774,8 +773,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件发 L["Report bugs on our issue tracker."] = "在我们的问题追踪器里回报故障。" L["Require unit from trigger"] = "需要在触发器中指定单位" L["Required for Activation"] = "激活需要的条件" - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "需要LibSpecialization,可从最新的WeakAuras版本中获取。" - L["Requires syncing the specialization via LibSpecialization."] = "需要通过LibSpecialization同步专精。" + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "需要LibGroupTalents,可从最新的WeakAuras版本中获取。" + L["Requires syncing the specialization via LibGroupTalents."] = "需要通过LibGroupTalents同步专精。" L["Reset all options to their default values."] = "重置所有选项为默认值" L["Reset Entry"] = "重置条目" L["Reset to Defaults"] = "重置为默认" @@ -1068,30 +1067,4 @@ WeakAuras总是在状态被标记为已改变,或者一个框体被添加、 L["Zoom"] = "缩放" L["Zoom In"] = "放大" L["Zoom Out"] = "缩小" - L["Affliction"] = "痛苦" - L["Arcane"] = "奥术" - L["Arms"] = "武器" - L["Assassination"] = "刺杀" - L["Balance"] = "平衡" - L["Beast Mastery"] = "野兽控制" - L["Blood"] = "鲜血" - L["Combat"] = "战斗" - L["Demonology"] = "恶魔学识" - L["Destruction"] = "毁灭" - L["Discipline"] = "戒律" - L["Elemental"] = "元素战斗" - L["Enhancement"] = "增强" - L["Feral Combat"] = "野性战斗" - L["Fire"] = "火焰" - L["Frost"] = "冰霜" - L["Fury"] = "狂怒" - L["Holy"] = "神圣" - L["Hybrid"] = "混合" - L["Marksmanship"] = "射击" - L["Protection"] = "防护" - L["Restoration"] = "恢复" - L["Retribution"] = "惩戒" - L["Shadow"] = "暗影魔法" - L["Subtlety"] = "敏锐" - L["Survival"] = "生存技能" - L["Unholy"] = "邪恶" + diff --git a/WeakAurasOptions/Locales/zhTW.lua b/WeakAurasOptions/Locales/zhTW.lua index 4b6a944..4df59ea 100644 --- a/WeakAurasOptions/Locales/zhTW.lua +++ b/WeakAurasOptions/Locales/zhTW.lua @@ -594,7 +594,6 @@ Bleed classification via LibDispel]=] ] = "只過濾被 LibDispel 分類為流 L["LibDispel: Simpy"] = "LibDispel: Simpy" L["LibSerialize: Sanjo"] = "LibSerialize: Sanjo" L["LibSharedMedia"] = "LibSharedMedia" - L["LibSpecialization: Funkeh"] = "LibSpecialization: Funkeh" L["Limit"] = "限制" L["Line"] = "線" L["Linear Texture %s"] = "線性材質 %s" @@ -768,8 +767,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件發 L["Report bugs on our issue tracker."] = "請在我們的問題追蹤網頁回報 bug。" L["Require unit from trigger"] = "需要來自觸發的單位" L["Required for Activation"] = "啟用需要" - L["Requires LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "需要 LibSpecialization,也就是最新的 WeakAuras 版本" - L["Requires syncing the specialization via LibSpecialization."] = "需要透由LibSpecialization同步專精。" + L["Requires LibGroupTalents, that is e.g. a up-to date WeakAuras version"] = "需要 LibGroupTalents,也就是最新的 WeakAuras 版本" + L["Requires syncing the specialization via LibGroupTalents."] = "需要透由LibGroupTalents同步專精。" L["Reset all options to their default values."] = "重置所有選項,恢復成預設值。" L["Reset Entry"] = "重置項目" L["Reset to Defaults"] = "重置為預設值" @@ -1056,30 +1055,4 @@ WeakAuras will always run custom grow code if you include 'changed' in this list L["Zoom"] = "縮放" L["Zoom In"] = "放大" L["Zoom Out"] = "縮小" - L["Affliction"] = "痛苦" - L["Arcane"] = "秘法" - L["Arms"] = "武器" - L["Assassination"] = "刺殺" - L["Balance"] = "平衡" - L["Beast Mastery"] = "野獸控制" - L["Blood"] = "血魄" - L["Combat"] = "戰鬥" - L["Demonology"] = "惡魔學識" - L["Destruction"] = "毀滅" - L["Discipline"] = "戒律" - L["Elemental"] = "元素" - L["Enhancement"] = "增強" - L["Feral Combat"] = "野性戰鬥" - L["Fire"] = "火焰" - L["Frost"] = "冰霜" - L["Fury"] = "狂怒" - L["Holy"] = "神聖" - L["Hybrid"] = "混合" - L["Marksmanship"] = "射擊" - L["Protection"] = "防護" - L["Restoration"] = "恢復" - L["Retribution"] = "懲戒" - L["Shadow"] = "暗影" - L["Subtlety"] = "敏銳" - L["Survival"] = "生存" - L["Unholy"] = "穢邪" + diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua index f604110..1b11f20 100644 --- a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua +++ b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua @@ -458,7 +458,6 @@ function OptionsPrivate.CreateFrame() .. "• " .. L["LibDeflate: Yoursafety"] .. "\n" .. "• " .. L["LibDispel: Simpy"] .. "\n" .. "• " .. L["LibSerialize: Sanjo"] .. "\n" - .. "• " .. L["LibSpecialization: Funkeh"] .. "\n" .. "• " .. L["Our translators (too many to name)"] .. "\n" .. "• " .. L["And our Patreons, Discord Regulars and Subscribers, and Friends of the Addon:"] .. "\n"