5.20.0

WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasToolbarButton.lua

@@ -3,7 +3,7 @@ if not WeakAuras.IsLibsOK() then return end
 ToolbarButton Widget, based on AceGUI Button
 Graphical Button.
 -------------------------------------------------------------------------------]]
-local Type, Version = "WeakAurasToolbarButton", 6
+local Type, Version = "WeakAurasToolbarButton", 7
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -51,6 +51,7 @@ local methods = {
     self:SetText()
     self.hTex:SetVertexColor(1, 1, 1, 0.1)
     self:SetSmallFont(false)
+    self.text:SetTextColor(GameFontNormal:GetTextColor())
   end,
 
   -- ["OnRelease"] = nil,
@@ -72,8 +73,14 @@ local methods = {
     self.disabled = disabled
     if disabled then
       self.frame:Disable()
+      self.text:SetTextColor(0.5, 0.5, 0.5)
     else
       self.frame:Enable()
+      if self.smallFont then
+        self.text:SetTextColor(GameFontNormalSmall:GetTextColor())
+      else
+        self.text:SetTextColor(GameFontNormal:GetTextColor())
+      end
     end
   end,
 
@@ -94,6 +101,7 @@ local methods = {
     end
   end,
   ["SetSmallFont"] = function(self, small)
+    self.smallFont = small
     if small then
       self.text:SetFontObject("GameFontNormalSmall")
     else

WeakAurasOptions/AuthorOptions.lua

@@ -2500,8 +2500,6 @@ local function mergeOptions(mergedOptions, data, options, config, prepath, paren
           break
         end
       end
-    else
-      nextInsert = #mergedOptions + 1
     end
     -- now we know at what point to add nextToMerge
     if shouldMerge then
@@ -2557,6 +2555,7 @@ local function mergeOptions(mergedOptions, data, options, config, prepath, paren
         end
       end
     else
+      nextInsert = #mergedOptions + 1
       -- can't merge, should insert instead
       local newOption = CopyTable(nextToMerge)
       initReferences(newOption, data, options, i, config, path, parent)

WeakAurasOptions/Changelog.lua

@@ -4,19 +4,73 @@ local AddonName = ...
 local OptionsPrivate = select(2, ...)
 
 OptionsPrivate.changelog = {
-  versionString = '5.19.12',
-  dateString = '2025-06-17',
-  fullChangeLogUrl = 'https://github.com/WeakAuras/WeakAuras2/compare/5.19.11...5.19.12',
+  versionString = '5.20.0',
+  dateString = '2025-07-21',
+  fullChangeLogUrl = 'https://github.com/WeakAuras/WeakAuras2/compare/5.19.12...5.20.0',
   highlightText = [==[
-- Bugfixes and performance improvements]==],  commitText = [==[Stanzilla (2):
+- **Added Undo & Redo Framework:** This lays the groundwork for undoing and redoing all aura edits. While the feature is still in development, you can test it now on URL edits. To enable it, type `/wa feature enable undo`.
+- **New default formatters**: Setting `%unit` or `%guid` or `%p` will now auto select proper formatting options
+- **Mists of Pandaria Updates:** Lots of Template updates and bug fixes to WA features.
+- **Performance and Stability:** Addressed various bugs.]==],  commitText = [==[InfusOnWoW (16):
 
-- chore(toc): bump version for retail patch 11.5.7
+- Update Atlas File List from wago.tools
+- Update Discord List
+- Mop templates: Druid, Monk, DK, Warlock and Paladin Update
+- Don't announce destroyng an empty universe
+- Update WeakAurasModelPaths from wago.tools
+- Update Discord List
+- Update Atlas File List from wago.tools
+- Mists: Add Power/Stagger trigger
+- Don't send watch trigger events while Options are open
+- Text: Call UpdateProgress so that relative animations work
+- Progress Settings: Adjust on moving/deleting triggers
+- Range Trigger: Fix progress source setting
+- Add Default Formatters for text replacements
+- Fix locale on english realms
+- Update Discord List
+- Update Discord List
+
+Stanzilla (3):
+
+- Update WeakAurasModelPaths from wago.tools
+- Update WeakAurasModelPaths from wago.tools
 - Update WeakAurasModelPaths from wago.tools
 
-mrbuds (2):
+emptyrivers (2):
 
-- Health trigger: add absorb options on Mists
-- Don't trigger partyX unit event with the filter :group when in raid
+- always advance mergeOptions pointer to the end if no merge is found
+- undo & redo support (#4863)
+
+github-actions[bot] (2):
+
+- Update Discord List (#5943)
+- Update WeakAurasModelPaths from wago.tools (#5944)
+
+mopstats (1):
+
+- Add pet battle events for mop (#5938)
+
+mrbuds (19):
+
+- LibSpecialization tiny update
+- LibSpecialization update
+- Mists rogue templates
+- Mists priest templates
+- Load the Time Machine on Mists
+- Mists mage templates
+- Mists shaman templates
+- Fix Mists talent known trigger
+- Add missing shaman talents
+- Fix Glyph data on first load
+- Mists use a dedicated file for modelpaths
+- Remove missing "Blizzard Alerts" textures on Mists
+- timed format default set time_dynamic_threshold = 3
+- default color for guid
+- Fix formatter type test
+- Allow default formatter to have sub formatter options
+- Mists Template: Hunter
+- Mists Template: Warrior
+- Fix error with talent tree on 11.2.0 beta
 
 ]==]
 }

WeakAurasOptions/InformationOptions.lua

@@ -69,13 +69,16 @@ function OptionsPrivate.GetInformationOptions(data)
       return sameURL and commonURL or ""
     end,
     set = function(info, v)
+      OptionsPrivate.Private.TimeMachine:StartTransaction()
       for child in traverseForUrl(data) do
-        child.url = v
-        WeakAuras.Add(child)
-        OptionsPrivate.ClearOptions(child.id)
+        OptionsPrivate.Private.TimeMachine:Append({
+          uid = child.uid,
+          actionType = "set",
+          path = {"url"},
+          payload = v
+        })
       end
-
-      WeakAuras.ClearAndUpdateOptions(data.id)
+      OptionsPrivate.Private.TimeMachine:Commit()
     end,
     desc = sameURL and "" or desc,
     order = order

WeakAurasOptions/Locales/deDE.lua

@@ -983,6 +983,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "Reciprocal TRIGGER:# requests will be ignored!"
 	--[[Translation missing --]]
+	L["Redo"] = "Redo"
+	--[[Translation missing --]]
 	L["Regions of type \"%s\" are not supported."] = "Regions of type \"%s\" are not supported."
 	L["Remove"] = "Entfernen"
 	--[[Translation missing --]]
@@ -1155,7 +1157,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Stack Info"] = "Stapelinfo"
 	--[[Translation missing --]]
 	L["Stacks - The number of stacks of an aura (usually)"] = "Stacks - The number of stacks of an aura (usually)"
-	L["Stagger"] = "Taumeln"
 	--[[Translation missing --]]
 	L["Standby"] = "Standby"
 	L["Star"] = "Stern"
@@ -1302,6 +1303,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger Combination"] = "Trigger Combination"
 	--[[Translation missing --]]
 	L["Type 'select' for '%s' requires a values member'"] = "Type 'select' for '%s' requires a values member'"
+	--[[Translation missing --]]
+	L["Undo"] = "Undo"
 	L["Ungroup"] = "Gruppierung aufheben"
 	--[[Translation missing --]]
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "Unit %s is not a valid unit for RegisterUnitEvent"

WeakAurasOptions/Locales/enUS.lua

@@ -1,6 +1,6 @@
 if not WeakAuras.IsLibsOK() then return end
 
-if ((GAME_LOCALE or GetLocale()) ~= "enUS") or ((GAME_LOCALE or GetLocale()) ~= "enGB") then
+if ((GAME_LOCALE or GetLocale()) ~= "enUS") and ((GAME_LOCALE or GetLocale()) ~= "enGB") then
   return
 end
 
@@ -683,6 +683,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Re-center X"] = "Re-center X"
 	L["Re-center Y"] = "Re-center Y"
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "Reciprocal TRIGGER:# requests will be ignored!"
+	L["Redo"] = "Redo"
 	L["Regions of type \"%s\" are not supported."] = "Regions of type \"%s\" are not supported."
 	L["Remove"] = "Remove"
 	L["Remove All Sounds"] = "Remove All Sounds"
@@ -794,7 +795,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Spell Selection Filters"] = "Spell Selection Filters"
 	L["Stack Info"] = "Stack Info"
 	L["Stacks - The number of stacks of an aura (usually)"] = "Stacks - The number of stacks of an aura (usually)"
-	L["Stagger"] = "Stagger"
 	L["Standby"] = "Standby"
 	L["Star"] = "Star"
 	L["Start"] = "Start"
@@ -885,6 +885,7 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger %i: %s"] = "Trigger %i: %s"
 	L["Trigger Combination"] = "Trigger Combination"
 	L["Type 'select' for '%s' requires a values member'"] = "Type 'select' for '%s' requires a values member'"
+	L["Undo"] = "Undo"
 	L["Ungroup"] = "Ungroup"
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "Unit %s is not a valid unit for RegisterUnitEvent"
 	L["Unit Count"] = "Unit Count"
@@ -900,8 +901,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Url: %s"] = "Url: %s"
 	L["Use Display Info Id"] = "Use Display Info Id"
 	L["Use SetTransform"] = "Use SetTransform"
-	L["Used in auras:"] = "Used in auras:"
 	L["Used in Auras:"] = "Used in Auras:"
+	L["Used in auras:"] = "Used in auras:"
 	L["Uses Texture Coordinates to rotate the texture."] = "Uses Texture Coordinates to rotate the texture."
 	L["Uses UnitIsVisible() to check if game client has loaded a object for this unit. This distance is around 100 yards. This is polled every second."] = "Uses UnitIsVisible() to check if game client has loaded a object for this unit. This distance is around 100 yards. This is polled every second."
 	L["Value"] = "Value"

WeakAurasOptions/Locales/esES.lua

@@ -143,8 +143,8 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchor Mode"] = "Modo de anclaje"
 	L["Anchor Point"] = "Punto de anclaje"
 	L["Anchored To"] = "Anclado a"
-	L["and"] = "y"
 	L["And "] = "y"
+	L["and"] = "y"
 	L["and %s"] = "y %s"
 	L["and aligned left"] = "y alineado a la izquierda"
 	L["and aligned right"] = "y alineado a la derecha"
@@ -642,6 +642,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d
 	L["Re-center X"] = "Re-centrar X"
 	L["Re-center Y"] = "Re-centrar Y"
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "ACTIVADOR recíproco: # solicitudes serán ignoradas."
+	L["Redo"] = "Rehacer"
 	L["Regions of type \"%s\" are not supported."] = "Las regiones del tipo \"%s\" no son compatibles."
 	L["Remove"] = "Eliminar"
 	L["Remove All Sounds"] = "Eliminar todos los sonidos"
@@ -753,7 +754,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d
 	L["Spell Selection Filters"] = "Filtros de selección de hechizo"
 	L["Stack Info"] = "Información de Acumulaciones"
 	L["Stacks - The number of stacks of an aura (usually)"] = "Acumulaciones - El número de acumulaciones de un aura (usualmente)"
-	L["Stagger"] = "Tambaleo"
 	L["Standby"] = "En espera"
 	L["Star"] = "Estrella"
 	L["Start"] = "Empezar"
@@ -843,6 +843,7 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger %i: %s"] = "Activador %i:%s"
 	L["Trigger Combination"] = "Combinación de activadores"
 	L["Type 'select' for '%s' requires a values member'"] = "Tipo 'select' para '%s' requiere un miembro de valores'"
+	L["Undo"] = "Deshacer"
 	L["Ungroup"] = "Desagrupar"
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "La unidad %s no es una unidad válida para RegisterUnitEvent"
 	L["Unit Count"] = "Recuento de unidad"

WeakAurasOptions/Locales/esMX.lua

@@ -642,6 +642,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d
 	L["Re-center X"] = "Re-centrar X"
 	L["Re-center Y"] = "Re-centrar Y"
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "ACTIVADOR recíproco: # solicitudes serán ignoradas."
+	L["Redo"] = "Rehacer"
 	L["Regions of type \"%s\" are not supported."] = "Las regiones del tipo \"%s\" no son compatibles."
 	L["Remove"] = "Eliminar"
 	L["Remove All Sounds"] = "Eliminar todos los sonidos"
@@ -753,7 +754,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d
 	L["Spell Selection Filters"] = "Filtros de selección de hechizo"
 	L["Stack Info"] = "Información de Acumulaciones"
 	L["Stacks - The number of stacks of an aura (usually)"] = "Acumulaciones - El número de acumulaciones de un aura (usualmente)"
-	L["Stagger"] = "Tambaleo"
 	L["Standby"] = "En espera"
 	L["Star"] = "Estrella"
 	L["Start"] = "Empezar"
@@ -843,6 +843,7 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger %i: %s"] = "Activador %i:%s"
 	L["Trigger Combination"] = "Combinación de activadores"
 	L["Type 'select' for '%s' requires a values member'"] = "Tipo 'select' para '%s' requiere un miembro de valores'"
+	L["Undo"] = "Deshacer"
 	L["Ungroup"] = "Desagrupar"
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "La unidad %s no es una unidad válida para RegisterUnitEvent"
 	L["Unit Count"] = "Recuento de unidad"

WeakAurasOptions/Locales/frFR.lua

@@ -849,6 +849,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Re-center Y"] = "Rec-entrer Y"
 	--[[Translation missing --]]
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "Reciprocal TRIGGER:# requests will be ignored!"
+	--[[Translation missing --]]
+	L["Redo"] = "Redo"
 	L["Regions of type \"%s\" are not supported."] = "Les régions de type \"%s\" ne sont pas prises en charge."
 	L["Remove"] = "Retirer"
 	--[[Translation missing --]]
@@ -1006,7 +1008,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Stack Info"] = "Info de Piles"
 	--[[Translation missing --]]
 	L["Stacks - The number of stacks of an aura (usually)"] = "Stacks - The number of stacks of an aura (usually)"
-	L["Stagger"] = "Report"
 	--[[Translation missing --]]
 	L["Standby"] = "Standby"
 	L["Star"] = "Étoile"
@@ -1144,6 +1145,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger Combination"] = "Trigger Combination"
 	--[[Translation missing --]]
 	L["Type 'select' for '%s' requires a values member'"] = "Type 'select' for '%s' requires a values member'"
+	--[[Translation missing --]]
+	L["Undo"] = "Undo"
 	L["Ungroup"] = "Dissocier"
 	--[[Translation missing --]]
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "Unit %s is not a valid unit for RegisterUnitEvent"
@@ -1166,8 +1169,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Url: %s"] = "Url: %s"
 	L["Use Display Info Id"] = "Utiliser les informations d'identifiant de l'affichage"
 	L["Use SetTransform"] = "Utiliser SetTransform"
-	L["Used in auras:"] = "Utilisé dans les auras:"
 	L["Used in Auras:"] = "Utilisé(e) dans les Auras:"
+	L["Used in auras:"] = "Utilisé dans les auras:"
 	--[[Translation missing --]]
 	L["Uses Texture Coordinates to rotate the texture."] = "Uses Texture Coordinates to rotate the texture."
 	--[[Translation missing --]]

WeakAurasOptions/Locales/itIT.lua

@@ -1039,6 +1039,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "Reciprocal TRIGGER:# requests will be ignored!"
 	--[[Translation missing --]]
+	L["Redo"] = "Redo"
+	--[[Translation missing --]]
 	L["Regions of type \"%s\" are not supported."] = "Regions of type \"%s\" are not supported."
 	--[[Translation missing --]]
 	L["Remove"] = "Remove"
@@ -1261,8 +1263,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["Stacks - The number of stacks of an aura (usually)"] = "Stacks - The number of stacks of an aura (usually)"
 	--[[Translation missing --]]
-	L["Stagger"] = "Stagger"
-	--[[Translation missing --]]
 	L["Standby"] = "Standby"
 	--[[Translation missing --]]
 	L["Star"] = "Star"
@@ -1437,6 +1437,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	--[[Translation missing --]]
 	L["Type 'select' for '%s' requires a values member'"] = "Type 'select' for '%s' requires a values member'"
 	--[[Translation missing --]]
+	L["Undo"] = "Undo"
+	--[[Translation missing --]]
 	L["Ungroup"] = "Ungroup"
 	--[[Translation missing --]]
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "Unit %s is not a valid unit for RegisterUnitEvent"
@@ -1467,10 +1469,10 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	--[[Translation missing --]]
 	L["Use SetTransform"] = "Use SetTransform"
 	--[[Translation missing --]]
-	L["Used in auras:"] = "Used in auras:"
-	--[[Translation missing --]]
 	L["Used in Auras:"] = "Used in Auras:"
 	--[[Translation missing --]]
+	L["Used in auras:"] = "Used in auras:"
+	--[[Translation missing --]]
 	L["Uses Texture Coordinates to rotate the texture."] = "Uses Texture Coordinates to rotate the texture."
 	--[[Translation missing --]]
 	L["Uses UnitIsVisible() to check if game client has loaded a object for this unit. This distance is around 100 yards. This is polled every second."] = "Uses UnitIsVisible() to check if game client has loaded a object for this unit. This distance is around 100 yards. This is polled every second."

WeakAurasOptions/Locales/koKR.lua

@@ -39,7 +39,7 @@ local L = WeakAuras.L
 	L["%s - Main"] = "%s - 메인"
 	L["%s - OnLoad"] = "%s - 활성화 시"
 	L["%s - OnUnload"] = "%s - 비활성화 시"
-	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - #%i 옵션이 %s 키를 갖고 있습니다. 다른 옵션 키를 산택해주세요."
+	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - #%i 옵션이 %s 키를 사용중입니다. 다른 옵션 키를 사용하세요."
 	L["%s - Rotate Animation"] = "%s - 애니메이션 회전"
 	L["%s - Scale Animation"] = "%s - 애니메이션 크기"
 	L["%s - Start"] = "%s - 시작"
@@ -158,8 +158,8 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchor Mode"] = "고정 모드"
 	L["Anchor Point"] = "고정 지점"
 	L["Anchored To"] = "고정 위치:"
-	L["and"] = "그리고"
 	L["And "] = "And"
+	L["and"] = "그리고"
 	L["and %s"] = "and %s"
 	L["and aligned left"] = ", 왼쪽 정렬"
 	L["and aligned right"] = ", 오른쪽 정렬"
@@ -214,7 +214,7 @@ Off Screen]=] ] = "위크오라가 화면 밖에 있습니다"
 	L["Blue Rune"] = "푸른색 룬"
 	L["Blue Sparkle Orb"] = "푸른 불꽃 구슬"
 	L["Border %s"] = "테두리 %s"
-	L["Border Anchor"] = "테두리 고정"
+	L["Border Anchor"] = "테두리 고정점"
 	L["Border Color"] = "테두리색"
 	L["Border in Front"] = "앞쪽 테두리"
 	L["Border Inset"] = "테두리 삽입"
@@ -690,6 +690,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Re-center X"] = "내부 X 좌표"
 	L["Re-center Y"] = "내부 Y 좌표"
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "서로 상응하는 활성 조건 # 요청은 무시됩니다!"
+	L["Redo"] = "다시 실행"
 	L["Regions of type \"%s\" are not supported."] = "\"%s\" 종류의 구역(Region)은 지원하지 않습니다."
 	L["Remove"] = "제거"
 	L["Remove All Sounds"] = "모든 소리 설정 제거"
@@ -702,7 +703,7 @@ 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 LibSpecialization, that is e.g. a up-to date WeakAuras version"] = "LibSpecialization이 필요하며, WeakAuras 버전을 최신으로 유지하면 됩니다."
 	L["Reset all options to their default values."] = "모든 옵션을 기본값으로 초기화합니다."
 	L["Reset Entry"] = "항목 초기화"
 	L["Reset to Defaults"] = "기본값으로 재설정"
@@ -749,7 +750,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Show Icon"] = "아이콘 표시"
 	L["Show If Unit Does Not Exist"] = "유닛이 없으면 표시"
 	L["Show Linear Texture"] = "직진 텍스처 표시"
-	L["Show Matches for"] = "표시할 대상"
+	L["Show Matches for"] = "표시 조건"
 	L["Show Matches for Units"] = "유닛별로 일치하는 조건 표시"
 	L["Show Model"] = "모델 표시"
 	L["Show model of unit "] = "유닛의 모델 표시"
@@ -801,7 +802,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Spell Selection Filters"] = "주문 선정 필터"
 	L["Stack Info"] = "중첩 정보"
 	L["Stacks - The number of stacks of an aura (usually)"] = "중첩 - 오라의 중첩 갯수입니다 (일반적으로)"
-	L["Stagger"] = "계단식 배치"
 	L["Standby"] = "대기 중"
 	L["Star"] = "별"
 	L["Start"] = "시작"
@@ -889,6 +889,7 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger %i: %s"] = "활성 조건 %i: %s"
 	L["Trigger Combination"] = "활성 조건 조합"
 	L["Type 'select' for '%s' requires a values member'"] = "'%s'에서 'select' 유형은 값들의 구성원을 필요로 합니다"
+	L["Undo"] = "실행 취소"
 	L["Ungroup"] = "그룹 해제"
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "%s 유닛은 RegisterUnitEvent에 적합하지 않습니다."
 	L["Unit Count"] = "유닛 수"

WeakAurasOptions/Locales/ptBR.lua

@@ -224,9 +224,9 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchor Mode"] = "Anchor Mode"
 	L["Anchor Point"] = "Ponto da âncora"
 	L["Anchored To"] = "Ancorado a"
+	L["And "] = "E"
 	--[[Translation missing --]]
 	L["and"] = "and"
-	L["And "] = "E"
 	--[[Translation missing --]]
 	L["and %s"] = "and %s"
 	L["and aligned left"] = "e alinhado à esquerda"
@@ -1083,6 +1083,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "Reciprocal TRIGGER:# requests will be ignored!"
 	--[[Translation missing --]]
+	L["Redo"] = "Redo"
+	--[[Translation missing --]]
 	L["Regions of type \"%s\" are not supported."] = "Regions of type \"%s\" are not supported."
 	L["Remove"] = "Remover"
 	--[[Translation missing --]]
@@ -1273,8 +1275,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["Stacks - The number of stacks of an aura (usually)"] = "Stacks - The number of stacks of an aura (usually)"
 	--[[Translation missing --]]
-	L["Stagger"] = "Stagger"
-	--[[Translation missing --]]
 	L["Standby"] = "Standby"
 	--[[Translation missing --]]
 	L["Star"] = "Star"
@@ -1440,6 +1440,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	--[[Translation missing --]]
 	L["Type 'select' for '%s' requires a values member'"] = "Type 'select' for '%s' requires a values member'"
 	--[[Translation missing --]]
+	L["Undo"] = "Undo"
+	--[[Translation missing --]]
 	L["Ungroup"] = "Ungroup"
 	--[[Translation missing --]]
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "Unit %s is not a valid unit for RegisterUnitEvent"

WeakAurasOptions/Locales/ruRU.lua

@@ -148,8 +148,8 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchor Mode"] = "Режим крепления"
 	L["Anchor Point"] = "Точка крепления"
 	L["Anchored To"] = "Прикрепить к"
-	L["and"] = "и"
 	L["And "] = "И "
+	L["and"] = "и"
 	L["and %s"] = "и %s"
 	L["and aligned left"] = "Выранивание по левому краю;"
 	L["and aligned right"] = "Выранивание по правому краю;"
@@ -671,6 +671,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Время
 	L["Re-center X"] = "Рецентрировать по X"
 	L["Re-center Y"] = "Рецентрировать по Y"
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "Ответный TRIGGER:# запрос будет проигнорирован!"
+	--[[Translation missing --]]
+	L["Redo"] = "Redo"
 	L["Regions of type \"%s\" are not supported."] = "Регионы типа \"%s\" не поддерживаются."
 	L["Remove"] = "Удалить"
 	L["Remove All Sounds"] = "Удалить все звуки"
@@ -789,7 +791,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Время
 	L["Spell Selection Filters"] = "Фильтры выбора заклинания"
 	L["Stack Info"] = "Информация о стаках"
 	L["Stacks - The number of stacks of an aura (usually)"] = "Стаки - количество стаков ауры (обычно)"
-	L["Stagger"] = "Выступ (смещение уровня)"
 	L["Standby"] = "Ожидает"
 	L["Star"] = "Звезда"
 	L["Start"] = "Начальная"
@@ -884,6 +885,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger %i: %s"] = "Триггер %i: %s"
 	L["Trigger Combination"] = "Комбинация триггеров"
 	L["Type 'select' for '%s' requires a values member'"] = "Для переменной %s типа select необходимо свойство values."
+	--[[Translation missing --]]
+	L["Undo"] = "Undo"
 	L["Ungroup"] = "Разгруппировать"
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "%s не является допустимой единицей для метода RegisterUnitEvent"
 	L["Unit Count"] = "Количество единиц"
@@ -900,8 +903,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Url: %s"] = "URL-адрес: %s"
 	L["Use Display Info Id"] = "Использовать ID отображения существа"
 	L["Use SetTransform"] = "Использовать ф. SetTransform"
-	L["Used in auras:"] = "Использовано в индикациях:"
 	L["Used in Auras:"] = "Использовано в индикациях:"
+	L["Used in auras:"] = "Использовано в индикациях:"
 	L["Uses Texture Coordinates to rotate the texture."] = "Использует координаты текстуры для её вращения."
 	L["Uses UnitIsVisible() to check if game client has loaded a object for this unit. This distance is around 100 yards. This is polled every second."] = "Использует функцию UnitIsVisible для проверки, может ли клиент игры видеть указанную единицу (загружен ли объект). Не определяет, находится ли единица в поле зрения. Расстояние составляет 100 метров. Опрос происходит каждую секунду."
 	L["Value"] = "Значение"

WeakAurasOptions/Locales/zhCN.lua

@@ -151,8 +151,8 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchor Mode"] = "定位模式"
 	L["Anchor Point"] = "锚点指向"
 	L["Anchored To"] = "对齐到"
-	L["and"] = "和"
 	L["And "] = "和"
+	L["and"] = "和"
 	L["and %s"] = "并且 %s"
 	L["and aligned left"] = "并且左对齐"
 	L["and aligned right"] = "并且右对齐"
@@ -673,6 +673,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件发
 	L["Re-center X"] = "到中心 X 偏移"
 	L["Re-center Y"] = "到中心 Y 偏移"
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "相互的TRIGGER:#请求将被忽略！"
+	--[[Translation missing --]]
+	L["Redo"] = "Redo"
 	L["Regions of type \"%s\" are not supported."] = "%s 区域类型不被支持。"
 	L["Remove"] = "移除"
 	L["Remove All Sounds"] = "移除所有音效"
@@ -784,7 +786,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件发
 	L["Spell Selection Filters"] = "法术选择过滤器"
 	L["Stack Info"] = "层数信息"
 	L["Stacks - The number of stacks of an aura (usually)"] = "堆叠 - 光环的堆叠层数（通常是）"
-	L["Stagger"] = "交错"
 	L["Standby"] = "已就绪"
 	L["Star"] = "星星"
 	L["Start"] = "开始"
@@ -873,6 +874,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger %i: %s"] = "触发器%i：%s"
 	L["Trigger Combination"] = "触发器组合"
 	L["Type 'select' for '%s' requires a values member'"] = "'%s'的类型'select'需要至少一个'values'成员。"
+	--[[Translation missing --]]
+	L["Undo"] = "Undo"
 	L["Ungroup"] = "不分组"
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "单位 %s 并不是 RegisterUnitEvent 的有效单位"
 	L["Unit Count"] = "单位计数"

WeakAurasOptions/Locales/zhTW.lua

@@ -143,8 +143,8 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchor Mode"] = "定位模式"
 	L["Anchor Point"] = "對齊點"
 	L["Anchored To"] = "對齊到"
-	L["and"] = "和"
 	L["And "] = "和 "
+	L["and"] = "和"
 	L["and %s"] = "以及 %s"
 	L["and aligned left"] = "和靠左對齊"
 	L["and aligned right"] = "和靠右對齊"
@@ -663,6 +663,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件發
 	L["Re-center X"] = "重新水平置中"
 	L["Re-center Y"] = "重新垂直置中"
 	L["Reciprocal TRIGGER:# requests will be ignored!"] = "對應的觸發器：# 請求將被忽略！"
+	L["Redo"] = "重做"
 	L["Regions of type \"%s\" are not supported."] = "不支援區域類型 \"%s\"。"
 	L["Remove"] = "移除"
 	L["Remove All Sounds"] = "移除所有音效"
@@ -774,7 +775,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件發
 	L["Spell Selection Filters"] = "法術選擇過濾器"
 	L["Stack Info"] = "堆疊層數資訊"
 	L["Stacks - The number of stacks of an aura (usually)"] = "層數 - 光環的疊加數（通常）"
-	L["Stagger"] = "醉仙緩勁"
 	L["Standby"] = "準備就緒"
 	L["Star"] = "星星"
 	L["Start"] = "開始"
@@ -863,6 +863,7 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Trigger %i: %s"] = "觸發器 %i: %s"
 	L["Trigger Combination"] = "觸發組合"
 	L["Type 'select' for '%s' requires a values member'"] = "'%s' 的類型 'select' 需要 values member"
+	L["Undo"] = "復原"
 	L["Ungroup"] = "解散群組"
 	L["Unit %s is not a valid unit for RegisterUnitEvent"] = "%s 不是 RegisterUnitEvent 的有效單位"
 	L["Unit Count"] = "單位數量"

WeakAurasOptions/OptionsFrames/OptionsFrame.lua

@@ -8,8 +8,8 @@ local pairs, type, error = pairs, type, error
 local _G = _G
 
 -- WoW APIs
-local GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo, UnitName
-  = GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo, UnitName
+local GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo
+  = GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo
 
 local AceGUI = LibStub("AceGUI-3.0")
 local AceConfigDialog = LibStub("AceConfigDialog-3.0")
@@ -88,6 +88,8 @@ local defaultHeight = 665
 local minWidth = 750
 local minHeight = 240
 
+
+
 function OptionsPrivate.CreateFrame()
   CreateFrame("Frame", "WeakAuras_DropDownMenu", nil, "UIDropDownMenuTemplate")
   local frame
@@ -339,7 +341,7 @@ function OptionsPrivate.CreateFrame()
   tipFrame:Hide()
   frame.tipFrame = tipFrame
 
-  local tipPopup = CreateFrame("Frame", "WeakAuras_TipPopup", frame)
+  local tipPopup = CreateFrame("Frame", nil, frame)
   tipPopup:SetFrameStrata("FULLSCREEN")
   tipPopup:SetBackdrop({
     bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
@@ -452,13 +454,13 @@ function OptionsPrivate.CreateFrame()
     local lineLength = 0
     local currentLine = {}
     for _, patreon in ipairs(list) do
-      if lineLength + #patreon + 2 * #currentLine > 130 then
+      if lineLength + #patreon + 2 > 130 then
         tinsert(patreonLines, table.concat(currentLine, ", ") .. ", ")
         currentLine = {}
         tinsert(currentLine, patreon)
-        lineLength = #patreon
+        lineLength = #patreon + 2
       else
-        lineLength = lineLength + #patreon
+        lineLength = lineLength + #patreon + 2
         tinsert(currentLine, patreon)
       end
     end
@@ -485,7 +487,6 @@ function OptionsPrivate.CreateFrame()
   local thanksListCJ = lineWrapDiscordList(OptionsPrivate.Private.DiscordListCJ)
   local thanksListK = lineWrapDiscordList(OptionsPrivate.Private.DiscordListK)
 
-
   local discordButton = addFooter(L["Discord"], [[Interface\AddOns\WeakAuras\Media\Textures\discord.tga]], "https://discord.gg/UXSc7nt",
                                   L["Chat with WeakAuras experts on our Discord server."])
   discordButton:SetParent(tipFrame)
@@ -652,7 +653,85 @@ function OptionsPrivate.CreateFrame()
   -- Toolbar
   local toolbarContainer = CreateFrame("Frame", nil, buttonsContainer.frame)
   toolbarContainer:SetParent(buttonsContainer.frame)
-  toolbarContainer:Hide()
+  -- toolbarContainer:Hide()
+  toolbarContainer:SetPoint("TOPLEFT", buttonsContainer.frame, "TOPLEFT", 30, 30)
+  toolbarContainer:SetPoint("BOTTOMRIGHT", buttonsContainer.frame, "TOPRIGHT", 0, 0)
+
+  local undo = AceGUI:Create("WeakAurasToolbarButton")
+  undo:SetText(L["Undo"])
+  undo:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\upleft")
+  undo:SetCallback("OnClick", function()
+    OptionsPrivate.Private.TimeMachine:StepBackward()
+    frame:FillOptions()
+  end)
+  undo.frame:SetParent(toolbarContainer)
+  if OptionsPrivate.Private.Features:Enabled("undo") then
+    undo.frame:Show()
+  else
+    undo.frame:Hide()
+  end
+  undo:SetPoint("LEFT")
+
+  local redo = AceGUI:Create("WeakAurasToolbarButton")
+  redo:SetText(L["Redo"])
+  redo:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\upright")
+  redo:SetCallback("OnClick", function()
+    OptionsPrivate.Private.TimeMachine:StepForward()
+    frame:FillOptions()
+  end)
+  redo.frame:SetParent(toolbarContainer)
+  if OptionsPrivate.Private.Features:Enabled("undo") then
+    redo.frame:Show()
+  else
+    redo.frame:Hide()
+  end
+  redo:SetPoint("LEFT", undo.frame, "RIGHT", 10, 0)
+  if OptionsPrivate.Private.TimeMachine:DescribeNext() ~= nil then
+    redo.frame:Enable()
+  else
+    redo.frame:Disable()
+  end
+  OptionsPrivate.Private.Features:Subscribe("undo",
+    function()
+      undo.frame:Show()
+      redo.frame:Show()
+    end,
+    function()
+      undo.frame:Hide()
+      redo.frame:Hide()
+    end
+  )
+
+  local tmControls = {
+    undo = undo,
+    redo = redo,
+  }
+
+  function tmControls:Step()
+    -- slightly annoying workaround
+    -- Buttons behave in a strange way if they are disabled inside of the OnClick handler
+    -- where the pushed texture refuses to vanish until the button is enabled & user clicks it again
+    -- so, just disable the button after next frame draw, so it's imperceptible to the user but we're not in the OnClick handler
+    WeakAuras.timer:ScheduleTimer(function()
+      self.undo:SetDisabled(OptionsPrivate.Private.TimeMachine:DescribePrevious() == nil)
+      self.redo:SetDisabled(OptionsPrivate.Private.TimeMachine:DescribeNext() == nil)
+    end, 0)
+  end
+  tmControls:Step()
+  OptionsPrivate.Private.TimeMachine.sub:AddSubscriber("Step", tmControls)
+
+
+  local newButton = AceGUI:Create("WeakAurasToolbarButton")
+  newButton:SetText(L["New Aura"])
+  newButton:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\newaura")
+  newButton.frame:SetParent(toolbarContainer)
+  newButton.frame:Show()
+  newButton:SetPoint("LEFT", redo.frame, "RIGHT", 10, 0)
+  frame.toolbarContainer = toolbarContainer
+
+  newButton:SetCallback("OnClick", function()
+    frame:NewAura()
+  end)
 
   local importButton = AceGUI:Create("WeakAurasToolbarButton")
   importButton:SetText(L["Import"])
@@ -660,20 +739,28 @@ function OptionsPrivate.CreateFrame()
   importButton:SetCallback("OnClick", OptionsPrivate.ImportFromString)
   importButton.frame:SetParent(toolbarContainer)
   importButton.frame:Show()
-  importButton:SetPoint("RIGHT", filterInput, "RIGHT")
-  importButton:SetPoint("BOTTOM", frame, "TOP", 0, -55)
+  importButton:SetPoint("LEFT", newButton.frame, "RIGHT", 10, 0)
 
-  local newButton = AceGUI:Create("WeakAurasToolbarButton")
-  newButton:SetText(L["New Aura"])
-  newButton:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\newaura")
-  newButton.frame:SetParent(toolbarContainer)
-  newButton.frame:Show()
-  newButton:SetPoint("RIGHT", importButton.frame, "LEFT", -10, 0)
-  frame.toolbarContainer = toolbarContainer
-
-  newButton:SetCallback("OnClick", function()
-    frame:NewAura()
+  local lockButton = AceGUI:Create("WeakAurasToolbarButton")
+  lockButton:SetText(L["Lock Positions"])
+  lockButton:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\lockPosition")
+  lockButton:SetCallback("OnClick", function(self)
+    if WeakAurasOptionsSaved.lockPositions then
+      lockButton:SetStrongHighlight(false)
+      lockButton:UnlockHighlight()
+      WeakAurasOptionsSaved.lockPositions = false
+    else
+      lockButton:SetStrongHighlight(true)
+      lockButton:LockHighlight()
+      WeakAurasOptionsSaved.lockPositions = true
+    end
   end)
+  if WeakAurasOptionsSaved.lockPositions then
+    lockButton:LockHighlight()
+  end
+  lockButton.frame:SetParent(toolbarContainer)
+  lockButton.frame:Show()
+  lockButton:SetPoint("LEFT", importButton.frame, "RIGHT", 10, 0)
 
   local magnetButton = AceGUI:Create("WeakAurasToolbarButton")
   magnetButton:SetText(L["Magnetically Align"])
@@ -695,28 +782,8 @@ function OptionsPrivate.CreateFrame()
   end
   magnetButton.frame:SetParent(toolbarContainer)
   magnetButton.frame:Show()
-  magnetButton:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -17, -55)
+  magnetButton:SetPoint("LEFT", lockButton.frame, "RIGHT", 10, 0)
 
-  local lockButton = AceGUI:Create("WeakAurasToolbarButton")
-  lockButton:SetText(L["Lock Positions"])
-  lockButton:SetTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\lockPosition")
-  lockButton:SetCallback("OnClick", function(self)
-    if WeakAurasOptionsSaved.lockPositions then
-      lockButton:SetStrongHighlight(false)
-      lockButton:UnlockHighlight()
-      WeakAurasOptionsSaved.lockPositions = false
-    else
-      lockButton:SetStrongHighlight(true)
-      lockButton:LockHighlight()
-      WeakAurasOptionsSaved.lockPositions = true
-    end
-  end)
-  if WeakAurasOptionsSaved.lockPositions then
-    lockButton:LockHighlight()
-  end
-  lockButton.frame:SetParent(toolbarContainer)
-  lockButton.frame:Show()
-  lockButton:SetPoint("RIGHT", magnetButton.frame, "LEFT", -10, 0)
 
   local loadProgress = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal")
   loadProgress:SetPoint("TOP", buttonsContainer.frame, "TOP", 0, -4)
@@ -728,7 +795,6 @@ function OptionsPrivate.CreateFrame()
     self:UpdateFrameVisible()
   end
 
-
   local buttonsScroll = AceGUI:Create("ScrollFrame")
   buttonsScroll:SetLayout("ButtonsScrollLayout")
   buttonsScroll.width = "fill"

WeakAurasOptions/RegionOptions/Text.lua

@@ -57,6 +57,10 @@ local function createOptions(id, data)
       end,
       set = function(info, v)
         data.displayText = OptionsPrivate.Private.ReplaceLocalizedRaidMarkers(v);
+
+        local metaData = OptionsPrivate.Private.GetAdditionalProperties(data)
+        OptionsPrivate.Private.SetDefaultFormatters(data, data.displayText, "displayText_format_", metaData)
+
         WeakAuras.Add(data);
         WeakAuras.ClearAndUpdateOptions(data.id)
         WeakAuras.UpdateThumbnail(data);

WeakAurasOptions/SubRegionOptions/SubText.lua

@@ -53,6 +53,9 @@ local function createOptions(parentData, data, index, subIndex)
       order = 11,
       set = function(info, v)
         data.text_text = OptionsPrivate.Private.ReplaceLocalizedRaidMarkers(v)
+        local metaData = OptionsPrivate.Private.GetAdditionalProperties(parentData)
+        OptionsPrivate.Private.SetDefaultFormatters(data, data.text_text, "text_text_format_", metaData)
+
         WeakAuras.Add(parentData)
         WeakAuras.ClearAndUpdateOptions(parentData.id)
       end,
@@ -530,7 +533,6 @@ local function createOptions(parentData, data, index, subIndex)
         end
       end
     end
-
     OptionsPrivate.AddTextFormatOption(texts, true, get, addOption, hidden, setHidden, false, listIndex, #list)
   end
 

WeakAurasOptions/TriggerOptions.lua

@@ -222,6 +222,23 @@ local function DeleteConditionsForTrigger(data, triggernum)
   end
 end
 
+local function FixUpProgressSourceAfterDelete(data, triggernum)
+  local function FixUpProgressSource(data)
+    if data.progressSource then
+      local trigger, property = unpack(data.progressSource)
+      if trigger > triggernum then
+        data.progressSource = {trigger - 1, property}
+      end
+    end
+  end
+
+  FixUpProgressSource(data)
+
+  for _, subRegionData in ipairs(data.subRegions) do
+    FixUpProgressSource(subRegionData)
+  end
+end
+
 local function moveTriggerDownConditionCheck(check, i)
   if (check.trigger == i) then
     check.trigger = i + 1;
@@ -244,6 +261,23 @@ local function moveTriggerDownImpl(data, i)
     moveTriggerDownConditionCheck(condition.check, i);
   end
 
+ local function fixUpProgressSource(data)
+    if data.progressSource then
+      local trigger, property = unpack(data.progressSource)
+      if trigger == i then
+        data.progressSource = {i + 1, property}
+      elseif trigger == i + 1 then
+        data.progressSource = {i, property}
+      end
+    end
+  end
+
+  fixUpProgressSource(data)
+
+  for _, subRegionData in ipairs(data.subRegions) do
+    fixUpProgressSource(subRegionData)
+  end
+
   return true;
 end
 
@@ -352,6 +386,7 @@ function OptionsPrivate.AddTriggerMetaFunctions(options, data, triggernum)
               if #child.triggers > 1 and #child.triggers >= triggernum then
                 tremove(child.triggers, triggernum)
                 DeleteConditionsForTrigger(child, triggernum)
+                FixUpProgressSourceAfterDelete(child, triggernum)
                 WeakAuras.Add(child)
                 OptionsPrivate.RemoveCollapsed(collapsedId, "trigger", {triggernum})
                 OptionsPrivate.ClearOptions(child.id)

WeakAurasOptions/VersionCheck.lua

@@ -3,7 +3,7 @@ local Private = select(2, ...)
 
 local L = WeakAuras.L
 
-local optionsVersion = "5.19.12 Beta"
+local optionsVersion = "5.20.0 Beta"
 
 if optionsVersion ~= WeakAuras.versionString then
   local message = string.format(L["The WeakAuras Options Addon version %s doesn't match the WeakAuras version %s. If you updated the addon while the game was running, try restarting World of Warcraft. Otherwise try reinstalling WeakAuras"],

WeakAurasOptions/WeakAurasOptions.lua

@@ -1772,8 +1772,8 @@ function OptionsPrivate.UpdateTextReplacements(frame, data)
       local tempProps = {}
 
       -- Add the properties to the temporary table
-      for name, desc in pairs(triggerProps) do
-        table.insert(tempProps, {triggerNum = triggerNum, name = name, desc = desc})
+      for name, data in pairs(triggerProps) do
+        table.insert(tempProps, {triggerNum = triggerNum, name = name, desc = data.display})
       end
 
       -- Sort the temporary table by name

WeakAurasOptions/WeakAurasOptions.toc

@@ -1,7 +1,7 @@
 ## Interface: 30300
 ## Title: WeakAuras Options
 ## Author: The WeakAuras Team
-## Version: 5.19.12
+## Version: 5.20.0
 ## IconTexture: Interface\AddOns\WeakAuras\Media\Textures\icon.blp
 ## Notes: Options for WeakAuras
 ## Notes-esES: Opciones para WeakAuras