5.19.10

2025-05-31 22:54:39 +02:00
parent 9def6a5ab8
commit bda851552d
58 changed files with 2518 additions and 1671 deletions
@@ -79,13 +79,25 @@ function OptionsPrivate.GetActionOptions(data)
    args = {
      init_header = {
        type = "header",
-        name = L["On Init"],
-        order = 0.005
+        name = L["Custom Functions"],
+        order = 0.1
      },
      init_do_custom = {
        type = "toggle",
-        name = L["Custom"],
-        order = 0.011,
+        name = L["Custom Init"],
+        order = 0.2,
+        width = WeakAuras.doubleWidth
+      },
+      init_do_custom_load = {
+        type = "toggle",
+        name = L["Custom Load"],
+        order = 0.3,
+        width = WeakAuras.doubleWidth
+      },
+      init_do_custom_unload = {
+        type = "toggle",
+        name = L["Custom Unload"],
+        order = 0.4,
        width = WeakAuras.doubleWidth
      },
      -- texteditor added here by AddCodeOption
@@ -1086,7 +1098,12 @@ function OptionsPrivate.GetActionOptions(data)
  -- Text format option helpers

  OptionsPrivate.commonOptions.AddCodeOption(action.args, data, L["Custom Code"], "init", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#on-init",
-                          0.011, function() return not data.actions.init.do_custom end, {"actions", "init", "custom"}, true);
+                          0.21, function() return not data.actions.init.do_custom end, {"actions", "init", "custom"}, true)
+
+  OptionsPrivate.commonOptions.AddCodeOption(action.args, data, L["Custom Code"], "customOnLoad", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#on-load",
+                          0.31, function() return not data.actions.init.do_custom_load end, {"actions", "init", "customOnLoad"}, true)
+  OptionsPrivate.commonOptions.AddCodeOption(action.args, data, L["Custom Code"], "customOnUnload", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#on-unload",
+                          0.41, function() return not data.actions.init.do_custom_unload end, {"actions", "init", "customOnUnload"}, true)

  OptionsPrivate.commonOptions.AddCodeOption(action.args, data, L["Custom Code"], "start_message", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#chat-message---custom-code",
                          5, function() return not (data.actions.start.do_message and (OptionsPrivate.Private.ContainsCustomPlaceHolder(data.actions.start.message) or (data.actions.start.message_type == "WHISPER" and OptionsPrivate.Private.ContainsCustomPlaceHolder(data.actions.start.message_dest)))) end, {"actions", "start", "message_custom"}, false);
@@ -4,31 +4,46 @@ local AddonName = ...
 local OptionsPrivate = select(2, ...)

 OptionsPrivate.changelog = {
-  versionString = '5.19.9',
-  dateString = '2025-04-25',
-  fullChangeLogUrl = 'https://github.com/WeakAuras/WeakAuras2/compare/5.19.8...5.19.9',
+  versionString = '5.19.10',
+  dateString = '2025-05-31',
+  fullChangeLogUrl = 'https://github.com/WeakAuras/WeakAuras2/compare/5.19.9...5.19.10',
  highlightText = [==[
- Currency trigger: Add type checking to guard against unexpected data
- Unit Characteristics trigger: add creature type & family
- TSUHelper: hide __changed from pairs()]==],  commitText = [==[InfusOnWoW (4):
+Fix babelfish.lua writing]==],  commitText = [==[InfusOnWoW (19):

- Bump .toc files
- Icon: If OmniCC or ElvUI are installed hide blizzard cooldown numbers
- Currency trigger: Add type checking to guard against unexpected data
- Unit Characteristics trigger: add creature type & family
- TSUHelper: hide __changed from pairs()
+- Fix babelfish.lua writing
+- Localization: Restore a few accidentally dropped english translations
+- Add a pride month logo and use it in June
+- Guard against duration being 0 leading to division by zero error
+- Revert "State: Don't put the trigger table into the state"
+- Update Atlas File List from wago.tools
+- Update Discord List
+- Update Discord List
+- State: Don't put the trigger table into the state
+- Fix "Negator" localization
+- Boss Mod Trigger: Fix count condition
+- Rework TextEditor's edit error handling
+- Update Discord List
+- Sub Element Anchoring: Make options a bit less confussing
+- Rename "Nameplate Type" to "Hostility"
+- Unit Characteristics/Health/Power trigger
+- On loadstring error, print a better hint where the error comes form
+- Add a onLoad/onUnload custom function
 - Update Discord List

-Stanzilla (2):
+Stanzilla (4):

+- Update WeakAurasModelPaths from wago.tools
+- Update WeakAurasModelPaths from wago.tools
 - Update WeakAurasModelPaths from wago.tools
 - Update WeakAurasModelPaths from wago.tools

-mrbuds (3):
+mrbuds (5):

- Unit Characteristics trigger: add creature type & family (Retail only)
- Textute Atlas Picker: use C_Texture.GetAtlasElements on Retail
- TSUHelper: hide __changed from pairs()
+- Add an "Assisted Combat Next Cast" trigger for 11.1.7
+- Fix typo
+- Use spellId arg of SPELL_UPDATE_COOLDOWN
+- BossMod Announce: fix count condition
+- Fix tooltips with custom code using unitAuraInstanceID

 ]==]
 }
@@ -1410,7 +1410,13 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g
    xOffset = {
      type = "range",
      control = "WeakAurasSpinBox",
-      name = L["X Offset"],
+      name = function()
+        if data.anchor_mode == "area" then
+          return L["Extra Width"]
+        else
+          return L["X Offset"]
+        end
+      end,
      order = 79,
      width = WeakAuras.normalWidth,
      softMin = (-1 * screenWidth),
@@ -1430,7 +1436,13 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g
    yOffset = {
      type = "range",
      control = "WeakAurasSpinBox",
-      name = L["Y Offset"],
+      name = function()
+        if data.anchor_mode == "area" then
+          return L["Extra Height"]
+        else
+          return L["Y Offset"]
+        end
+      end,
      order = 80,
      width = WeakAuras.normalWidth,
      softMin = (-1 * screenHeight),
@@ -1945,7 +1957,7 @@ local function AddCodeOption(args, data, name, prefix, url, order, hiddenFunc, p

      code = "return " .. code;

-      local loadedFunction, errorString = OptionsPrivate.Private.LoadFunction(code, true);
+      local loadedFunction, errorString = OptionsPrivate.Private.LoadFunction(code, data.id, true);

      if not errorString then
        if options.validator then
@@ -38,6 +38,10 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - Benutzerdefinierter Endtext"
 	L["%s - Init Action"] = "%s - Initialisierung"
 	L["%s - Main"] = "%s - Haupt"
+	--[[Translation missing --]]
+	L["%s - OnLoad"] = "%s - OnLoad"
+	--[[Translation missing --]]
+	L["%s - OnUnload"] = "%s - OnUnload"
 	L["%s - Option #%i has the key %s. Please choose a different option key."] = "Die %s - Option #%i hat bereits den Schlüssel %s. Bitte wähle einen anderen Optionsschlüssel."
 	L["%s - Rotate Animation"] = "%s - Rotierungsanimation"
 	L["%s - Scale Animation"] = "%s - Skalierungsanimation"
@@ -356,6 +360,12 @@ Off Screen]=]
 	--[[Translation missing --]]
 	L["Custom Frames"] = "Custom Frames"
 	--[[Translation missing --]]
+	L["Custom Functions"] = "Custom Functions"
+	--[[Translation missing --]]
+	L["Custom Init"] = "Custom Init"
+	--[[Translation missing --]]
+	L["Custom Load"] = "Custom Load"
+	--[[Translation missing --]]
 	L["Custom Options"] = "Custom Options"
 	L["Custom Trigger"] = "Benutzerdefinierter Auslöser"
 	L["Custom trigger event tooltip"] = [=[Wähle die Ereignisse, die den benutzerdefinierten Auslöser aufrufen sollen.
@@ -373,6 +383,8 @@ UNIT_POWER, UNIT_AURA PLAYER_TARGET_CHANGED]=]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Custom Trigger: Ignore Lua Errors on OPTIONS event"
 	--[[Translation missing --]]
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Custom Trigger: Send fake events instead of STATUS event"
+	--[[Translation missing --]]
+	L["Custom Unload"] = "Custom Unload"
 	L["Custom Untrigger"] = "Benutzerdefinierter Umkehrauslöser"
 	--[[Translation missing --]]
 	L["Debug Log"] = "Debug Log"
@@ -877,7 +889,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["ON"] = "ON"
 	L["On Hide"] = "Beim Ausblenden"
-	L["On Init"] = "Beim Initialisieren"
 	L["On Show"] = "Beim Einblenden"
 	--[[Translation missing --]]
 	L["Only Match auras cast by a player (not an npc)"] = "Only Match auras cast by a player (not an npc)"
@@ -37,6 +37,8 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - Finish Custom Text"
 	L["%s - Init Action"] = "%s - Init Action"
 	L["%s - Main"] = "%s - Main"
+	L["%s - OnLoad"] = "%s - OnLoad"
+	L["%s - OnUnload"] = "%s - OnUnload"
 	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - Option #%i has the key %s. Please choose a different option key."
 	L["%s - Rotate Animation"] = "%s - Rotate Animation"
 	L["%s - Scale Animation"] = "%s - Scale Animation"
@@ -166,7 +168,13 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Animates progress changes"] = "Animates progress changes"
 	L["Animation End"] = "Animation End"
 	L["Animation Mode"] = "Animation Mode"
-	L["Animation relative duration description"] = "Animation relative duration description"
+	L["Animation relative duration description"] = [=[The duration of the animation relative to the duration of the display, expressed as a fraction (1/2), percentage (50%), or decimal (0.5).
+|cFFFF0000Note:|r if a display does not have progress (it has a non-timed event trigger, is an aura with no duration, etc.), the animation will not play.
+
+|cFF4444FFFor Example:|r
+If the animation's duration is set to |cFF00CC0010%|r, and the display's trigger is a buff that lasts 20 seconds, the start animation will play for 2 seconds.
+If the animation's duration is set to |cFF00CC0010%|r, and the display's trigger is a buff that has no set duration, no start animation will play (although it would if you specified a duration in seconds)."
+]=]
 	L["Animation Sequence"] = "Animation Sequence"
 	L["Animation Start"] = "Animation Start"
 	L["Any of"] = "Any of"
@@ -265,12 +273,33 @@ Off Screen]=]
 	L["Custom Code"] = "Custom Code"
 	L["Custom Code Viewer"] = "Custom Code Viewer"
 	L["Custom Frames"] = "Custom Frames"
+	L["Custom Functions"] = "Custom Functions"
+	L["Custom Init"] = "Custom Init"
+	L["Custom Load"] = "Custom Load"
 	L["Custom Options"] = "Custom Options"
 	L["Custom Trigger"] = "Custom Trigger"
-	L["Custom trigger event tooltip"] = "Custom trigger event tooltip"
-	L["Custom trigger status tooltip"] = "Custom trigger status tooltip"
+	L["Custom trigger event tooltip"] = [=[Choose which events cause the custom trigger to be checked. Multiple events can be specified using commas or spaces.
+• "UNIT" events can use colons to define which unitIDs will be registered. In addition to UnitIDs Unit types can be used, they include "nameplate", "group", "raid", "party", "arena", "boss".
+• "CLEU" can be used instead of COMBAT_LOG_EVENT_UNFILTERED and colons can be used to separate specific "subEvents" you want to receive.
+• The keyword "TRIGGER" can be used, with colons separating trigger numbers, to have the custom trigger get updated when the specified trigger(s) update.
+
+|cFF4444FFFor example:|r
+UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1
+]=]
+	L["Custom trigger status tooltip"] = [=[Choose which events cause the custom trigger to be checked. Multiple events can be specified using commas or spaces.
+
+• "UNIT" events can use colons to define which unitIDs will be registered. In addition to UnitIDs Unit types can be used, they include "nameplate", "group", "raid", "party", "arena", "boss".
+• "CLEU" can be used instead of COMBAT_LOG_EVENT_UNFILTERED and colons can be used to separate specific "subEvents" you want to receive.
+• The keyword "TRIGGER" can be used, with colons separating trigger numbers, to have the custom trigger get updated when the specified trigger(s) update.
+
+Since this is a status-type trigger, the specified events may be called by WeakAuras without the expected arguments.
+
+|cFF4444FFFor example:|r
+UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1
+]=]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Custom Trigger: Ignore Lua Errors on OPTIONS event"
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Custom Trigger: Send fake events instead of STATUS event"
+	L["Custom Unload"] = "Custom Unload"
 	L["Custom Untrigger"] = "Custom Untrigger"
 	L["Debug Log"] = "Debug Log"
 	L["Debug Log:"] = "Debug Log:"
@@ -404,7 +433,7 @@ Bleed classification via LibDispel]=]
 	L["Glow Type"] = "Glow Type"
 	L["Green Rune"] = "Green Rune"
 	L["Grid direction"] = "Grid direction"
-	L["Group (verb)"] = "Group (verb)"
+	L["Group (verb)"] = "Group"
 	L["Group Alpha"] = "Group Alpha"
 	L[ [=[Group and anchor each auras by frame.

@@ -415,7 +444,17 @@ Bleed classification via LibDispel]=]
 - Nameplates: attach to nameplates per unit.
 - Unit Frames: attach to unit frame buttons per unit.
 - Custom Frames: choose which frame each region should be anchored to.]=]
-	L["Group aura count description"] = "Group aura count description"
+	L["Group aura count description"] = [=[The amount of units of type '%s' which must be affected by one or more of the given auras for the display to trigger.
+If the entered number is a whole number (e.g. 5), the number of affected units will be compared with the entered number.
+If the entered number is a decimal (e.g. 0.5), fraction (e.g. 1/2), or percentage (e.g. 50%%), then that fraction of the %s must be affected.
+
+|cFF4444FFFor example:|r
+|cFF00CC00> 0|r will trigger when any unit of type '%s' is affected
+|cFF00CC00= 100%%|r will trigger when every unit of type '%s' is affected
+|cFF00CC00!= 2|r will trigger when the number of units of type '%s' affected is not exactly 2
+|cFF00CC00<= 0.8|r will trigger when less than 80%% of the units of type '%s' is affected (4 of 5 party members, 8 of 10 or 20 of 25 raid members)
+|cFF00CC00> 1/2|r will trigger when more than half of the units of type '%s' is affected
+]=]
 	L["Group by Frame"] = "Group by Frame"
 	L["Group Description"] = "Group Description"
 	L["Group Icon"] = "Group Icon"
@@ -541,15 +580,18 @@ Bleed classification via LibDispel]=]
 	L["Move Up"] = "Move Up"
 	L["Moving auras: "] = "Moving auras: "
 	L["Multiple Displays"] = "Multiple Displays"
-	L["Multiselect ignored tooltip"] = "Multiselect ignored tooltip"
-	L["Multiselect multiple tooltip"] = "Multiselect multiple tooltip"
-	L["Multiselect single tooltip"] = "Multiselect single tooltip"
+	L["Multiselect ignored tooltip"] = [=[|cFFFF0000Ignored|r - |cFF777777Single|r - |cFF777777Multiple|r
+This option will not be used to determine when this display should load]=]
+	L["Multiselect multiple tooltip"] = [=[|cFF777777Ignored|r - |cFF777777Single|r - |cFF00FF00Multiple|r
+Any number of matching values can be picked]=]
+	L["Multiselect single tooltip"] = [=[|cFF777777Ignored|r - |cFF00FF00Single|r - |cFF777777Multiple|r
+Only a single matching value can be picked]=]
 	L["Must be a power of 2"] = "Must be a power of 2"
 	L["Name - The name of the display (usually an aura name), or the display's ID if there is no dynamic name"] = "Name - The name of the display (usually an aura name), or the display's ID if there is no dynamic name"
 	L["Name Info"] = "Name Info"
 	L["Name Pattern Match"] = "Name Pattern Match"
 	L["Name:"] = "Name:"
-	L["Negator"] = "Negator"
+	L["Negator"] = "Not"
 	L["New Aura"] = "New Aura"
 	L["New Template"] = "New Template"
 	L["New Value"] = "New Value"
@@ -587,7 +629,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Okay"] = "Okay"
 	L["ON"] = "ON"
 	L["On Hide"] = "On Hide"
-	L["On Init"] = "On Init"
 	L["On Show"] = "On Show"
 	L["Only Match auras cast by a player (not an npc)"] = "Only Match auras cast by a player (not an npc)"
 	L["Only match auras cast by people other than the player or their pet"] = "Only match auras cast by people other than the player or their pet"
@@ -690,7 +731,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Shadow Color"] = "Shadow Color"
 	L["Shadow X Offset"] = "Shadow X Offset"
 	L["Shadow Y Offset"] = "Shadow Y Offset"
-	L["Shift-click to create chat link"] = "Shift-click to create chat link"
+	L["Shift-click to create chat link"] = "Shift-click to create a |cFF8800FF[Chat Link]"
 	L["Show \"Edge\""] = "Show \"Edge\""
 	L["Show \"Swipe\""] = "Show \"Swipe\""
 	L["Show and Clone Settings"] = "Show and Clone Settings"
@@ -859,8 +900,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"
@@ -37,6 +37,8 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - Texto personalizado de terminación"
 	L["%s - Init Action"] = "%s - Iniciar acción"
 	L["%s - Main"] = "%s - Principal"
+	L["%s - OnLoad"] = "%s - Cargar"
+	L["%s - OnUnload"] = "%s - Descargar"
 	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - La opción #%i tiene un clave %s. Por favor selecciona un clave diferente."
 	L["%s - Rotate Animation"] = "%s - Rotar animación"
 	L["%s - Scale Animation"] = "%s - Redimensionar animación"
@@ -141,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"
@@ -261,12 +263,16 @@ Off Screen]=] ] = "El aura está fuera de la pantalla"
 	L["Custom Code"] = "Código Personalizado"
 	L["Custom Code Viewer"] = "Visor de código personalizado"
 	L["Custom Frames"] = "Marcos personalizados"
+	L["Custom Functions"] = "Funciones personalizadas"
+	L["Custom Init"] = "Inicialización personalizada"
+	L["Custom Load"] = "Carga personalizada"
 	L["Custom Options"] = "Opciones personalizadas"
 	L["Custom Trigger"] = "Activador personalizado"
 	L["Custom trigger event tooltip"] = "Información sobre eventos de activador personalizado"
 	L["Custom trigger status tooltip"] = "Información sobre el estado del activador personalizado"
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Activador personalizado: ignorar errores de Lua en el evento OPCIONES"
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Activador personalizado: enviar eventos falsos en lugar del evento STATUS"
+	L["Custom Unload"] = "Descarga personalizada"
 	L["Custom Untrigger"] = "No-activador personalizado"
 	L["Debug Log"] = "Registro de depuración"
 	L["Debug Log:"] = "Registro de depuración:"
@@ -582,7 +588,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d
 	L["Okay"] = "Aceptar"
 	L["ON"] = "ACTIVO"
 	L["On Hide"] = "Ocultar"
-	L["On Init"] = "Al iniciar"
 	L["On Show"] = "Mostrar"
 	L["Only Match auras cast by a player (not an npc)"] = "Coincidir solo con auras lanzadas por un jugador (no un pnj)"
 	L["Only match auras cast by people other than the player or their pet"] = "Coincidir solo con auras lanzadas por personas que no sean el jugador o su mascota."
@@ -37,6 +37,8 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - Texto personalizado de terminación"
 	L["%s - Init Action"] = "%s - Iniciar acción"
 	L["%s - Main"] = "%s - Principal"
+	L["%s - OnLoad"] = "%s - Cargar"
+	L["%s - OnUnload"] = "%s - Descargar"
 	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - La opción #%i tiene un clave %s. Por favor selecciona un clave diferente."
 	L["%s - Rotate Animation"] = "%s - Rotar animación"
 	L["%s - Scale Animation"] = "%s - Redimensionar animación"
@@ -261,12 +263,16 @@ Off Screen]=] ] = "Aura está fuera de la pantalla"
 	L["Custom Code"] = "Código Personalizado"
 	L["Custom Code Viewer"] = "Visor de código personalizado"
 	L["Custom Frames"] = "Marcos personalizados"
+	L["Custom Functions"] = "Funciones personalizadas"
+	L["Custom Init"] = "Inicialización personalizada"
+	L["Custom Load"] = "Carga personalizada"
 	L["Custom Options"] = "Opciones personalizadas"
 	L["Custom Trigger"] = "Activador personalizado"
 	L["Custom trigger event tooltip"] = "Información sobre eventos de activador personalizado"
 	L["Custom trigger status tooltip"] = "Información sobre el estado del activador personalizado"
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Activador personalizado: ignorar errores de Lua en el evento OPCIONES"
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Activador personalizado: enviar eventos falsos en lugar del evento STATUS"
+	L["Custom Unload"] = "Descarga personalizada"
 	L["Custom Untrigger"] = "No-activador personalizado"
 	L["Debug Log"] = "Registro de depuración"
 	L["Debug Log:"] = "Registro de depuración:"
@@ -582,7 +588,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Ocurrencia d
 	L["Okay"] = "Aceptar"
 	L["ON"] = "ACTIVO"
 	L["On Hide"] = "Ocultar"
-	L["On Init"] = "Al iniciar"
 	L["On Show"] = "Mostrar"
 	L["Only Match auras cast by a player (not an npc)"] = "Coincidir solo con auras lanzadas por un jugador (no un pnj)"
 	L["Only match auras cast by people other than the player or their pet"] = "Coincidir solo con auras lanzadas por personas que no sean el jugador o su mascota."
@@ -853,8 +858,8 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Url: %s"] = "URL: %s"
 	L["Use Display Info Id"] = "Utilizar ID de información de la visualización"
 	L["Use SetTransform"] = "Utilizar SetTransform"
-	L["Used in Auras:"] = "Utilizado en auras:"
 	L["Used in auras:"] = "Utilizado en auras:"
+	L["Used in Auras:"] = "Utilizado en auras:"
 	L["Uses Texture Coordinates to rotate the texture."] = "Utiliza coordenadas de textura para rotar la textura."
 	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."] = "Utiliza UnitIsVisible() para comprobar si el cliente del juego ha cargado un objeto para esta unidad. Esta distancia es de unos 100 metros. Esto se encuesta cada segundo."
 	L["Value"] = "Valor"
@@ -10,14 +10,14 @@ local L = WeakAuras.L
 	L[" and |cFFFF0000mirrored|r"] = "et  |cFFFF0000mirrored|r"
 	L["-- Do not remove this comment, it is part of this aura: "] = "-- Ne supprimez pas ce commentaire, il fait partie de cette aura :"
 	L[" rotated |cFFFF0000%s|r degrees"] = "degrés de |cFFFF0000%s|r  rotation"
-	L["% - To show a percent sign"] = "% - Pour afficher un symbole de pourcentage"
+	L["% - To show a percent sign"] = "% - Pour afficher un signe de pourcentage"
 	L["% of Progress"] = "% de progression"
 	L["%d |4aura:auras; added"] = "%d |4aura:auras; ajoutée(s)"
 	L["%d |4aura:auras; deleted"] = "%d |4aura:auras; supprimée(s)"
 	L["%d |4aura:auras; modified"] = "%d |4aura:auras; modifiée(s)"
 	L["%d |4aura:auras; with meta data modified"] = "%d |4aura:auras; avec métadonnées modifiées"
 	L["%d displays loaded"] = "%d affichages chargés"
-	L["%d displays not loaded"] = "%d affichages non chargés"
+	L["%d displays not loaded"] = "%d affichages non chargé"
 	L["%d displays on standby"] = "%d affichages en attente"
 	L["%i auras selected"] = "%i auras sélectionnées"
 	L["%i."] = "%i."
@@ -37,6 +37,10 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - Terminer le texte personnalisé"
 	L["%s - Init Action"] = "%s - Initialiser l'action"
 	L["%s - Main"] = "%s - Principal"
+	--[[Translation missing --]]
+	L["%s - OnLoad"] = "%s - OnLoad"
+	--[[Translation missing --]]
+	L["%s - OnUnload"] = "%s - OnUnload"
 	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - L'option #%i est actuellement attribuée à la touche %s. Veuillez choisir une touche différente."
 	L["%s - Rotate Animation"] = "%s - Rotation de l'animation"
 	L["%s - Scale Animation"] = "%s - Animation de l'échelle"
@@ -107,9 +111,7 @@ local L = WeakAuras.L
 	L["|cFFffcc00Font Flags:|r |cFFFF0000%s|r and shadow |c%sColor|r with offset |cFFFF0000%s/%s|r%s%s"] = "|cFFffcc00Font Flags:|r |cFFFF0000%s|r and shadow |c%sColor|r with offset |cFFFF0000%s/%s|r%s%s"
 	--[[Translation missing --]]
 	L["|cFFffcc00Font Flags:|r |cFFFF0000%s|r and shadow |c%sColor|r with offset |cFFFF0000%s/%s|r%s%s%s"] = "|cFFffcc00Font Flags:|r |cFFFF0000%s|r and shadow |c%sColor|r with offset |cFFFF0000%s/%s|r%s%s%s"
-	--[[Translation missing --]]
-	L["|cffffcc00Format Options|r"] = "|cffffcc00Format Options|r"
-	--[[Translation missing --]]
+	L["|cffffcc00Format Options|r"] = "|cffffcc00Options de formatage|r"
 	L[ [=[• |cff00ff00Player|r, |cff00ff00Target|r, |cff00ff00Focus|r, and |cff00ff00Pet|r correspond directly to those individual unitIDs.
 • |cff00ff00Specific Unit|r lets you provide a specific valid unitID to watch.
 |cffff0000Note|r: The game will not fire events for all valid unitIDs, making some untrackable by this trigger.
@@ -118,15 +120,7 @@ local L = WeakAuras.L
 • |cffffff00Multi-target|r attempts to use the Combat Log events, rather than unitID, to track affected units.
 |cffff0000Note|r: Without a direct relationship to actual unitIDs, results may vary.

-|cffffff00*|r Yellow Unit settings can match multiple units and will default to being active even while no affected units are found without a Unit Count or Match Count setting.]=] ] = [=[• |cff00ff00Player|r, |cff00ff00Target|r, |cff00ff00Focus|r, and |cff00ff00Pet|r correspond directly to those individual unitIDs.
-• |cff00ff00Specific Unit|r lets you provide a specific valid unitID to watch.
-|cffff0000Note|r: The game will not fire events for all valid unitIDs, making some untrackable by this trigger.
-• |cffffff00Party|r, |cffffff00Raid|r, |cffffff00Boss|r, |cffffff00Arena|r, and |cffffff00Nameplate|r can match multiple corresponding unitIDs.
-• |cffffff00Smart Group|r adjusts to your current group type, matching just the "player" when solo, "party" units (including "player") in a party or "raid" units in a raid.
-• |cffffff00Multi-target|r attempts to use the Combat Log events, rather than unitID, to track affected units.
-|cffff0000Note|r: Without a direct relationship to actual unitIDs, results may vary.
-
-|cffffff00*|r Yellow Unit settings can match multiple units and will default to being active even while no affected units are found without a Unit Count or Match Count setting.]=]
+|cffffff00*|r Yellow Unit settings can match multiple units and will default to being active even while no affected units are found without a Unit Count or Match Count setting.]=] ] = "• |cff00ff00Joueur|r, |cff00ff00Cible|r, |cff00ff00Focalisation|r et |cff00ff00Familier|r correspondent directement à ces identifiants d’unité (unitIDs) individuels. • |cff00ff00Unité spécifique|r permet d’indiquer un identifiant d’unité valide à surveiller. |cffff0000Remarque|r : Le jeu ne déclenche pas d’événements pour tous les identifiants d’unité valides, ce qui rend certains non détectables par ce déclencheur. • |cffffff00Groupe|r, |cffffff00Raid|r, |cffffff00Boss|r, |cffffff00Arène|r et |cffffff00Plaque de nom|r peuvent correspondre à plusieurs identifiants d’unité associés. • |cffffff00Groupe intelligent|r s’adapte à votre type de groupe actuel : il correspond uniquement au \"joueur\" en solo, aux unités \"groupe\" (y compris \"joueur\") en groupe, ou aux unités \"raid\" en raid. • |cffffff00Cibles multiples|r tente d’utiliser les événements du journal de combat (Combat Log), plutôt que les unitIDs, pour suivre les unités affectées. |cffff0000Remarque|r : En l’absence de lien direct avec des unitIDs réels, les résultats peuvent varier. |cffffff00\\*|r Les paramètres d’unité en jaune peuvent correspondre à plusieurs unités et seront actifs par défaut même si aucune unité affectée n’est détectée, sauf si un paramètre de nombre d’unités ou de correspondance est défini."
 	L["A 20x20 pixels icon"] = "Une icône de 20x20 pixels"
 	L["A 32x32 pixels icon"] = "Une icône de 32x32 pixels"
 	L["A 40x40 pixels icon"] = "Une icône de 40x40 pixels"
@@ -174,8 +168,7 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchored To"] = "Ancré à"
 	L["And "] = "Et"
 	L["and"] = "et"
-	--[[Translation missing --]]
-	L["and %s"] = "and %s"
+	L["and %s"] = "et %s"
 	L["and aligned left"] = "et aligné à gauche"
 	L["and aligned right"] = "et aligné à droite"
 	--[[Translation missing --]]
@@ -209,7 +202,7 @@ Si la durée de l'animation est définie à |cFF00CC0010%|r, et le déclencheur
 	L["Area"] = "Area"
 	L["At a position a bit left of Left HUD position."] = "Une position à gauche de la Position ATH Gauche."
 	L["At a position a bit left of Right HUD position"] = "Une position à droite de la Position ATH Droite."
-	L["At the same position as Blizzard's spell alert"] = "À la même position que l'alerte de sort de Blizzard."
+	L["At the same position as Blizzard's spell alert"] = "À la même position que l'alerte de sort de Blizzard"
 	--[[Translation missing --]]
 	L["Attach to Foreground"] = "Attach to Foreground"
 	--[[Translation missing --]]
@@ -329,6 +322,12 @@ Off Screen]=]
 	--[[Translation missing --]]
 	L["Custom Code Viewer"] = "Custom Code Viewer"
 	L["Custom Frames"] = "Cadres personnalisés"
+	--[[Translation missing --]]
+	L["Custom Functions"] = "Custom Functions"
+	--[[Translation missing --]]
+	L["Custom Init"] = "Custom Init"
+	--[[Translation missing --]]
+	L["Custom Load"] = "Custom Load"
 	L["Custom Options"] = "Options personnalisées"
 	L["Custom Trigger"] = "Déclencheur personnalisé"
 	L["Custom trigger event tooltip"] = [=[
@@ -350,6 +349,8 @@ UNIT_POWER, UNIT_AURA PLAYER_TARGET_CHANGED
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Custom Trigger: Ignore Lua Errors on OPTIONS event"
 	--[[Translation missing --]]
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Custom Trigger: Send fake events instead of STATUS event"
+	--[[Translation missing --]]
+	L["Custom Unload"] = "Custom Unload"
 	L["Custom Untrigger"] = "Désactivation personnalisée"
 	--[[Translation missing --]]
 	L["Debug Log"] = "Debug Log"
@@ -374,7 +375,7 @@ UNIT_POWER, UNIT_AURA PLAYER_TARGET_CHANGED
 	--[[Translation missing --]]
 	L["Discord"] = "Discord"
 	L["Display Name"] = "Nom de l'affichage"
-	L["Display Text"] = "Texte d'affichage"
+	L["Display Text"] = "Afficher le texte"
 	L["Displays a text, works best in combination with other displays"] = "Affiche du texte, fonctionne mieux en combinaison avec d'autres affichages."
 	L["Distribute Horizontally"] = "Distribuer horizontalement"
 	L["Distribute Vertically"] = "Distribuer verticalement"
@@ -667,7 +668,7 @@ Si cette case est cochée, ce séparateur inclura du texte. Sinon, ce sera juste
 	--[[Translation missing --]]
 	L["Invalid type for '%s'. Expected 'bool', 'number', 'select', 'string', 'timer' or 'elapsedTimer'."] = "Invalid type for '%s'. Expected 'bool', 'number', 'select', 'string', 'timer' or 'elapsedTimer'."
 	L["Invalid type for property '%s' in '%s'. Expected '%s'"] = "Type non valide pour la propriété '%s' dans '%s'. Attendu '%s'."
-	L["Inverse Slant"] = "Inverser l'Inclinaison"
+	L["Inverse Slant"] = "Inclinaison inversée"
 	--[[Translation missing --]]
 	L["Invert the direction of progress"] = "Invert the direction of progress"
 	--[[Translation missing --]]
@@ -809,7 +810,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["ON"] = "ON"
 	L["On Hide"] = "Au masquage"
-	L["On Init"] = "À l'initialisation"
 	L["On Show"] = "A l'affichage"
 	--[[Translation missing --]]
 	L["Only Match auras cast by a player (not an npc)"] = "Only Match auras cast by a player (not an npc)"
@@ -949,9 +949,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	L["Shadow X Offset"] = "Décalage X de l'ombre"
 	L["Shadow Y Offset"] = "Décalage Y de l'ombre"
 	L["Shift-click to create chat link"] = "Maj-Clic pour créer un lien de discussion"
-	--[[Translation missing --]]
-	L["Show \"Edge\""] = "Show \"Edge\""
-	L["Show \"Swipe\""] = "Afficher le \"balayage\""
+	L["Show \"Edge\""] = "Afficher le \"Bord\""
+	L["Show \"Swipe\""] = "Afficher le \"Balayage\""
 	--[[Translation missing --]]
 	L["Show and Clone Settings"] = "Show and Clone Settings"
 	L["Show Border"] = "Afficher l'encadrement"
@@ -1159,7 +1158,7 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["Toggle the visibility of all non-loaded displays"] = "Change la visibilité de tous les affichages non-chargés"
 	L["Toggle the visibility of this display"] = "Activer/Désactiver la visibilité de cet affichage"
 	L["Tooltip Content"] = "Contenu de l'info-bulle"
-	L["Tooltip on Mouseover"] = "Infobulle à la souris"
+	L["Tooltip on Mouseover"] = "Info-bulle à la souris"
 	L["Tooltip Pattern Match"] = "Correspondance de modèle de l'info-bulle"
 	L["Tooltip Text"] = "Texte de l'Info-bulle."
 	L["Tooltip Value"] = "Valeur de l'info-bulle"
@@ -40,6 +40,10 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - Termina il Testo Personalizzato"
 	L["%s - Init Action"] = "%s - Azione di Inizializzazione"
 	L["%s - Main"] = "%s - Principale"
+	--[[Translation missing --]]
+	L["%s - OnLoad"] = "%s - OnLoad"
+	--[[Translation missing --]]
+	L["%s - OnUnload"] = "%s - OnUnload"
 	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - L'opzione #%i ha la chiave %s. Scegli una chiave di opzione diversa."
 	L["%s - Rotate Animation"] = "%s - Ruota Animazione"
 	L["%s - Scale Animation"] = "%s - Scala Animazione"
@@ -151,8 +155,8 @@ Enable this setting if you want this timer to be hidden, or when using a WeakAur
 	L["Anchor Mode"] = "Anchor Mode"
 	L["Anchor Point"] = "Punto di ancoraggio"
 	L["Anchored To"] = "Ancorato a"
-	L["And "] = "E"
 	L["and"] = "e"
+	L["And "] = "E"
 	L["and %s"] = "e %s"
 	L["and aligned left"] = "e allineato a sinistra"
 	L["and aligned right"] = "e allineato a destra"
@@ -280,18 +284,43 @@ Off Screen]=] ] = "L'aura è fuori dallo schermo"
 	--[[Translation missing --]]
 	L["Custom Frames"] = "Custom Frames"
 	--[[Translation missing --]]
+	L["Custom Functions"] = "Custom Functions"
+	--[[Translation missing --]]
+	L["Custom Init"] = "Custom Init"
+	--[[Translation missing --]]
+	L["Custom Load"] = "Custom Load"
+	--[[Translation missing --]]
 	L["Custom Options"] = "Custom Options"
 	--[[Translation missing --]]
 	L["Custom Trigger"] = "Custom Trigger"
 	--[[Translation missing --]]
-	L["Custom trigger event tooltip"] = "Custom trigger event tooltip"
+	L["Custom trigger event tooltip"] = [=[Choose which events cause the custom trigger to be checked. Multiple events can be specified using commas or spaces.
+• "UNIT" events can use colons to define which unitIDs will be registered. In addition to UnitIDs Unit types can be used, they include "nameplate", "group", "raid", "party", "arena", "boss".
+• "CLEU" can be used instead of COMBAT_LOG_EVENT_UNFILTERED and colons can be used to separate specific "subEvents" you want to receive.
+• The keyword "TRIGGER" can be used, with colons separating trigger numbers, to have the custom trigger get updated when the specified trigger(s) update.
+
+|cFF4444FFFor example:|r
+UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1
+]=]
 	--[[Translation missing --]]
-	L["Custom trigger status tooltip"] = "Custom trigger status tooltip"
+	L["Custom trigger status tooltip"] = [=[Choose which events cause the custom trigger to be checked. Multiple events can be specified using commas or spaces.
+
+• "UNIT" events can use colons to define which unitIDs will be registered. In addition to UnitIDs Unit types can be used, they include "nameplate", "group", "raid", "party", "arena", "boss".
+• "CLEU" can be used instead of COMBAT_LOG_EVENT_UNFILTERED and colons can be used to separate specific "subEvents" you want to receive.
+• The keyword "TRIGGER" can be used, with colons separating trigger numbers, to have the custom trigger get updated when the specified trigger(s) update.
+
+Since this is a status-type trigger, the specified events may be called by WeakAuras without the expected arguments.
+
+|cFF4444FFFor example:|r
+UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1
+]=]
 	--[[Translation missing --]]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Custom Trigger: Ignore Lua Errors on OPTIONS event"
 	--[[Translation missing --]]
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Custom Trigger: Send fake events instead of STATUS event"
 	--[[Translation missing --]]
+	L["Custom Unload"] = "Custom Unload"
+	--[[Translation missing --]]
 	L["Custom Untrigger"] = "Custom Untrigger"
 	--[[Translation missing --]]
 	L["Debug Log"] = "Debug Log"
@@ -549,7 +578,7 @@ Bleed classification via LibDispel]=]
 	--[[Translation missing --]]
 	L["Grid direction"] = "Grid direction"
 	--[[Translation missing --]]
-	L["Group (verb)"] = "Group (verb)"
+	L["Group (verb)"] = "Group"
 	--[[Translation missing --]]
 	L["Group Alpha"] = "Group Alpha"
 	--[[Translation missing --]]
@@ -563,7 +592,17 @@ Bleed classification via LibDispel]=]
 - Unit Frames: attach to unit frame buttons per unit.
 - Custom Frames: choose which frame each region should be anchored to.]=]
 	--[[Translation missing --]]
-	L["Group aura count description"] = "Group aura count description"
+	L["Group aura count description"] = [=[The amount of units of type '%s' which must be affected by one or more of the given auras for the display to trigger.
+If the entered number is a whole number (e.g. 5), the number of affected units will be compared with the entered number.
+If the entered number is a decimal (e.g. 0.5), fraction (e.g. 1/2), or percentage (e.g. 50%%), then that fraction of the %s must be affected.
+
+|cFF4444FFFor example:|r
+|cFF00CC00> 0|r will trigger when any unit of type '%s' is affected
+|cFF00CC00= 100%%|r will trigger when every unit of type '%s' is affected
+|cFF00CC00!= 2|r will trigger when the number of units of type '%s' affected is not exactly 2
+|cFF00CC00<= 0.8|r will trigger when less than 80%% of the units of type '%s' is affected (4 of 5 party members, 8 of 10 or 20 of 25 raid members)
+|cFF00CC00> 1/2|r will trigger when more than half of the units of type '%s' is affected
+]=]
 	--[[Translation missing --]]
 	L["Group by Frame"] = "Group by Frame"
 	--[[Translation missing --]]
@@ -815,11 +854,14 @@ Bleed classification via LibDispel]=]
 	--[[Translation missing --]]
 	L["Multiple Displays"] = "Multiple Displays"
 	--[[Translation missing --]]
-	L["Multiselect ignored tooltip"] = "Multiselect ignored tooltip"
+	L["Multiselect ignored tooltip"] = [=[|cFFFF0000Ignored|r - |cFF777777Single|r - |cFF777777Multiple|r
+This option will not be used to determine when this display should load]=]
 	--[[Translation missing --]]
-	L["Multiselect multiple tooltip"] = "Multiselect multiple tooltip"
+	L["Multiselect multiple tooltip"] = [=[|cFF777777Ignored|r - |cFF777777Single|r - |cFF00FF00Multiple|r
+Any number of matching values can be picked]=]
 	--[[Translation missing --]]
-	L["Multiselect single tooltip"] = "Multiselect single tooltip"
+	L["Multiselect single tooltip"] = [=[|cFF777777Ignored|r - |cFF00FF00Single|r - |cFF777777Multiple|r
+Only a single matching value can be picked]=]
 	--[[Translation missing --]]
 	L["Must be a power of 2"] = "Must be a power of 2"
 	--[[Translation missing --]]
@@ -831,7 +873,7 @@ Bleed classification via LibDispel]=]
 	--[[Translation missing --]]
 	L["Name:"] = "Name:"
 	--[[Translation missing --]]
-	L["Negator"] = "Negator"
+	L["Negator"] = "Not"
 	--[[Translation missing --]]
 	L["New Aura"] = "New Aura"
 	--[[Translation missing --]]
@@ -889,8 +931,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["On Hide"] = "On Hide"
 	--[[Translation missing --]]
-	L["On Init"] = "On Init"
-	--[[Translation missing --]]
 	L["On Show"] = "On Show"
 	--[[Translation missing --]]
 	L["Only Match auras cast by a player (not an npc)"] = "Only Match auras cast by a player (not an npc)"
@@ -1095,7 +1135,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["Shadow Y Offset"] = "Shadow Y Offset"
 	--[[Translation missing --]]
-	L["Shift-click to create chat link"] = "Shift-click to create chat link"
+	L["Shift-click to create chat link"] = "Shift-click to create a |cFF8800FF[Chat Link]"
 	--[[Translation missing --]]
 	L["Show \"Edge\""] = "Show \"Edge\""
 	--[[Translation missing --]]
@@ -1427,10 +1467,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."
@@ -12,10 +12,10 @@ local L = WeakAuras.L
 	L[" rotated |cFFFF0000%s|r degrees"] = "|cFFFF0000%s|r도 회전"
 	L["% - To show a percent sign"] = "% - 백분율 기호 표시"
 	L["% of Progress"] = "진행 %"
-	L["%d |4aura:auras; added"] = "%d개의 위크오라가 추가됐습니다"
-	L["%d |4aura:auras; deleted"] = "%d개의 위크오라가 삭제됐습니다"
-	L["%d |4aura:auras; modified"] = "%d개의 위크오라가 변경됐습니다"
-	L["%d |4aura:auras; with meta data modified"] = "%d개의 위크오라가 메타 데이터가 변경됐습니다"
+	L["%d |4aura:auras; added"] = "%d개의 위크오라가 추가됨"
+	L["%d |4aura:auras; deleted"] = "%d개의 위크오라가 삭제됨"
+	L["%d |4aura:auras; modified"] = "%d개의 위크오라가 변경됨"
+	L["%d |4aura:auras; with meta data modified"] = "%d개의 위크오라가 메타 데이터와 함께 변경됨"
 	L["%d displays loaded"] = "디스플레이 %d개 불러옴"
 	L["%d displays not loaded"] = "디스플레이 %d개 불러오지 않음"
 	L["%d displays on standby"] = "디스플레이 %d개 대기 중"
@@ -28,15 +28,17 @@ local L = WeakAuras.L
 	L["%s - Condition Custom Chat %s"] = "%s - 조건 사용자 정의 대화 %s"
 	L["%s - Condition Custom Check %s"] = "%s - 조건 사용자 정의 검사 %s"
 	L["%s - Condition Custom Code %s"] = "%s - 조건 사용자 정의 코드 %s"
-	L["%s - Custom Anchor"] = "%s - 사용자 정의 위치 부착"
-	L["%s - Custom Grow"] = "%s - 사용자 정의 확장 방식"
+	L["%s - Custom Anchor"] = "%s - 사용자 정의 위치 고정"
+	L["%s - Custom Grow"] = "%s - 사용자 정의 그룹 확장"
 	L["%s - Custom Sort"] = "%s - 사용자 정의 정렬"
 	L["%s - Custom Text"] = "%s - 사용자 정의 텍스트"
 	L["%s - Finish"] = "%s - 종료"
 	L["%s - Finish Action"] = "%s - 종료시 동작"
 	L["%s - Finish Custom Text"] = "%s - 사용자 정의 텍스트 종료"
-	L["%s - Init Action"] = "%s - 초기 시작시 동작"
+	L["%s - Init Action"] = "%s - 초기 동작"
 	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 - Rotate Animation"] = "%s - 애니메이션 회전"
 	L["%s - Scale Animation"] = "%s - 애니메이션 크기"
@@ -213,13 +215,13 @@ Off Screen]=] ] = "위크오라가 화면 밖에 있습니다"
 	L["Blue Sparkle Orb"] = "푸른 불꽃 구슬"
 	L["Border %s"] = "테두리 %s"
 	L["Border Anchor"] = "테두리 고정"
-	L["Border Color"] = "테두리 색깔"
+	L["Border Color"] = "테두리색"
 	L["Border in Front"] = "앞쪽 테두리"
 	L["Border Inset"] = "테두리 삽입"
 	L["Border Offset"] = "테두리 위치 조정"
 	L["Border Settings"] = "테두리 설정"
 	L["Border Size"] = "테두리 크기"
-	L["Border Style"] = "테두리 모양"
+	L["Border Style"] = "테두리 스타일"
 	L["Bracket Matching"] = "괄호 맞춤"
 	L["Browse Wago, the largest collection of auras."] = "세상에서 가장 큰 위크오라 모음 사이트 Wago를 둘러보세요."
 	L["By default this shows the information from the trigger selected via dynamic information. The information from a specific trigger can be shown via e.g. %2.p."] = "기본값으로 동적 정보를 통해 선택된 활성 조건의 정보를 표시합니다. 특정 활성 조건의 정보 표시는 %2.p 같은 식으로 할 수 있습니다."
@@ -229,9 +231,9 @@ Off Screen]=] ] = "위크오라가 화면 밖에 있습니다"
 	L["Case Insensitive"] = "대소문자 구분 안함"
 	L["Cast by a Player Character"] = "플레이어 캐릭터가 시전"
 	L["Categories to Update"] = "업데이트할 카테고리"
-	L["Changelog"] = "업데이트 정보"
+	L["Changelog"] = "업데이트 내역"
 	L["Chat with WeakAuras experts on our Discord server."] = "우리의 Discord 서버에서 WeakAuras 전문가들과 이야기를 나누어 보세요."
-	L["Check On..."] = "검사 기준..."
+	L["Check On..."] = "상태 확인 시점..."
 	L["Check out our wiki for a large collection of examples and snippets."] = "방대한 사례와 스니펫 모음을 보려면 위키를 확인하세요."
 	L["Children:"] = "자식 위크오라:"
 	L["Choose"] = "선택"
@@ -277,9 +279,12 @@ Off Screen]=] ] = "위크오라가 화면 밖에 있습니다"
 	L["Custom Code"] = "사용자 정의 코드"
 	L["Custom Code Viewer"] = "사용자 정의 코드 뷰어"
 	L["Custom Frames"] = "사용자 정의 프레임"
+	L["Custom Functions"] = "사용자 정의 함수"
+	L["Custom Init"] = "사용자 정의 초기 동작"
+	L["Custom Load"] = "사용자 정의 활성화"
 	L["Custom Options"] = "사용자 정의 옵션"
 	L["Custom Trigger"] = "사용자 정의 활성 조건"
-	L["Custom trigger event tooltip"] = [=[사용자 정의 활성 조건을 확인할 이벤트를 선택하세요. 쉼표나 공백으로 여러 이벤트를 지정할 수 있습니다.
+	L["Custom trigger event tooltip"] = [=[사용자 정의 활성 조건 확인에 사용할 이벤트를 선택하세요. 쉼표나 공백으로 여러 이벤트를 지정할 수 있습니다.

 • "UNIT" 이벤트는 콜론을 사용해 등록할 유닛 ID를 정할 수 있습니다.
 "nameplate", "group", "raid", "party", "arena", "boss"와 같은 유닛 유형을 유닛ID로 사용할 수 있습니다.
@@ -288,7 +293,7 @@ Off Screen]=] ] = "위크오라가 화면 밖에 있습니다"

 |cFF4444FF예시:|r
 UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1]=]
-	L["Custom trigger status tooltip"] = [=[사용자 정의 활성 조건을 확인할 이벤트를 선택하세요. 쉼표나 공백으로 여러 이벤트를 지정할 수 있습니다.
+	L["Custom trigger status tooltip"] = [=[사용자 정의 활성 조건 확인에 사용할 이벤트를 선택하세요. 쉼표나 공백으로 여러 이벤트를 지정할 수 있습니다.

 • "UNIT" 이벤트는 콜론을 사용해 등록할 유닛 ID를 정할 수 있습니다.
 "nameplate", "group", "raid", "party", "arena", "boss"와 같은 유닛 유형을 유닛ID로 사용할 수 있습니다.
@@ -301,6 +306,7 @@ UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:S
 UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1]=]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "사용자 정의 활성 조건: OPTIONS 이벤트에서 Lua 오류 무시"
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "사용자 정의 활성 조건: STATUS 이벤트 대신 가짜 이벤트 보내기"
+	L["Custom Unload"] = "사용자 정의 비활성화"
 	L["Custom Untrigger"] = "사용자 정의 비활성 조건"
 	L["Debug Log"] = "디버그 로그"
 	L["Debug Log:"] = "디버그 로그:"
@@ -324,7 +330,7 @@ UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:S
 	L["Distribute Vertically"] = "세로 분산 배치"
 	L["Do not group this display"] = "이 디스플레이를 그룹에 넣지 않습니다"
 	L["Do you want to enable updates for this aura"] = "이 위크오라의 업데이트를 활성화 할까요?"
-	L["Do you want to ignore updates for this aura"] = "이 위크오라의 업데이트를 무시할까요?"
+	L["Do you want to ignore updates for this aura"] = "이 위크오라의 업데이트를 무시하고 싶으면 체크하세요"
 	L["Documentation"] = "참고 문서"
 	L["Done"] = "완료"
 	L["Drag to move"] = "드래그로 이동"
@@ -630,7 +636,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Okay"] = "확인"
 	L["ON"] = "켜짐"
 	L["On Hide"] = "숨겨질 때"
-	L["On Init"] = "초기 실행 시"
 	L["On Show"] = "표시될 때"
 	L["Only Match auras cast by a player (not an npc)"] = "(NPC가 아닌) 플레이어가 시전한 오라만 걸러냅니다"
 	L["Only match auras cast by people other than the player or their pet"] = "나 또는 내 소환수 말고 다른 사람이 시전한 오라만 걸러냅니다"
@@ -710,7 +715,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Rotate Text"] = "텍스트 회전"
 	L["Rotation Mode"] = "회전 모드"
 	L["Row Space"] = "행 간격"
-	L["Row Width"] = "행 넓이"
+	L["Row Width"] = "행 너비"
 	L["Rows"] = "행"
 	L["Run on..."] = "실행 조건..."
 	L["Same"] = "전경과 동일"
@@ -730,7 +735,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Set Thumbnail Icon"] = "썸네일 아이콘을 설정합니다"
 	L["Sets the anchored frame as the aura's parent, causing the aura to inherit attributes such as visibility and scale."] = "위치가 고정된 프레임을 위크오라의 부모로 설정하여 외관이나 크기 등의 속성을 상속받도록 합니다."
 	L["Settings"] = "설정"
-	L["Shadow Color"] = "그림자 색깔"
+	L["Shadow Color"] = "그림자색"
 	L["Shadow X Offset"] = "그림자 X 위치 조정"
 	L["Shadow Y Offset"] = "그림자 Y 위치 조정"
 	L["Shift-click to create chat link"] = "Shift+클릭으로 대화창 링크 생성"
@@ -815,7 +820,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Templates could not be loaded, the addon is %s"] = "템플릿을 불러올 수 없습니다. 애드온은 %s입니다."
 	L["Temporary Group"] = "임시 그룹"
 	L["Text %s"] = "텍스트 %s"
-	L["Text Color"] = "텍스트 색깔"
+	L["Text Color"] = "텍스트색"
 	L["Text Settings"] = "텍스트 설정"
 	L["Texture %s"] = "텍스처 %s"
 	L["Texture Info"] = "텍스처 정보"
@@ -825,8 +830,8 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[이벤트
 	L["Texture X Offset"] = "텍스처 X 위치 조정"
 	L["Texture Y Offset"] = "텍스처 Y 위치 조정"
 	L["Thanks"] = "감사 인사"
-	L["The addon ElvUI is enabled. It might add cooldown numbers to the swipe. You can configure these in the ElvUI settings"] = "ElvUI 애드온이 활성화 되었습니다. 회전 애니메이션에 쿨타임 시간이 표시됩니다. ElvUI 설정에서 조정할 수 있습니다"
-	L["The addon OmniCC is enabled. It might add cooldown numbers to the swipe. You can configure these in the OmniCC settings"] = "OmniCC 애드온이 활성화 되었습니다. 회전 애니메이션에 쿨타임 시간이 표시됩니다. OmniCC 설정에서 조정할 수 있습니다"
+	L["The addon ElvUI is enabled. It might add cooldown numbers to the swipe. You can configure these in the ElvUI settings"] = "ElvUI 애드온을 사용중이므로 회전 애니메이션에 쿨타임 시간이 표시될 것입니다. 시간 텍스트는 ElvUI 설정에서 조정할 수 있습니다"
+	L["The addon OmniCC is enabled. It might add cooldown numbers to the swipe. You can configure these in the OmniCC settings"] = "OmniCC 애드온을 사용중이므로 회전 애니메이션에 쿨타임 시간이 표시될 것입니다. 시간 텍스트는 OmniCC 설정에서 조정할 수 있습니다"
 	L["The duration of the animation in seconds."] = "애니메이션 지속시간 (초)"
 	L["The duration of the animation in seconds. The finish animation does not start playing until after the display would normally be hidden."] = "애니메이션의 초단위 지속시간입니다. 종료 애니메이션은 일반적으로는 디스플레이가 숨겨지기 전까진 재생을 시작하지 않습니다."
 	L["The group and all direct children will share the same base frame level."] = "이 그룹과 모든 직속 자식 위크오라는 같은 기반의 프레임 레벨을 공유합니다."
@@ -935,11 +940,11 @@ Upgrade your version of WeakAuras or wait for next release before installing thi
 	L["You are about to delete a trigger. |cFFFF0000This cannot be undone!|r Would you like to continue?"] = "이 활성 조건을 삭제하려고 합니다. |cFFFF0000이는 되돌릴 수 없습니다!|r 계속할까요?"
 	L[ [=[You can add a comma-separated list of state values here that (when changed) WeakAuras should also run the Anchor Code on.

-WeakAuras will always run custom anchor code if you include 'changed' in this list, or when a region is added, removed, or re-ordered.]=] ] = "이곳에 스테이트 값들의 목록을 쉼표로 구분해서 넣을 수 있으며 (changed가 발동하면) WeakAuras가 위치 고정 코드를 실행하게 됩니다. 이 목록에 'changed'가 들어있거나 구역(region)이 추가, 삭제, 재정렬시 WeakAuras가 사용자 정의 고정 코드를 실행합니다."
+WeakAuras will always run custom anchor code if you include 'changed' in this list, or when a region is added, removed, or re-ordered.]=] ] = "이곳에 State 테이블 값들을 쉼표로 구분해서 목록으로 만들어 넣을 수 있으며 (값이 바뀔 때) WeakAuras가 위치 고정 코드를 실행하게 됩니다. 이 목록에 테이블 값 'changed'를 넣을 경우 또는 구역(region)이 추가, 삭제, 재정렬 될 때 WeakAuras는 반드시 사용자 정의 고정 코드를 실행합니다."
 	L[ [=[You can add a comma-separated list of state values here that (when changed) WeakAuras should also run the Grow Code on.

-WeakAuras will always run custom grow code if you include 'changed' in this list, or when a region is added, removed, or re-ordered.]=] ] = "이곳에 스테이트 값들의 목록을 쉼표로 구분해서 넣을 수 있으며 (changed가 발동하면) WeakAuras가 그룹 확장 코드를 실행하게 됩니다. 이 목록에 'changed'가 들어있거나 구역(region)이 추가, 삭제, 재정렬시 WeakAuras가 사용자 정의 그룹 확장 코드를 실행합니다."
-	L["You can add a comma-separated list of state values here that (when changed) WeakAuras should also run the sort code on.WeakAuras will always run custom sort code if you include 'changed' in this list, or when a region is added, removed."] = "이곳에 스테이트 값들의 목록을 쉼표로 구분해서 넣을 수 있으며 (changed가 발동하면) WeakAuras가 정렬 코드를 실행하게 됩니다. 이 목록에 'changed'가 들어있거나 구역(region)이 추가, 삭제, 재정렬시 WeakAuras가 사용자 정의 정렬 코드를 실행합니다."
+WeakAuras will always run custom grow code if you include 'changed' in this list, or when a region is added, removed, or re-ordered.]=] ] = "이곳에 State 테이블 값들을 쉼표로 구분해서 목록으로 만들어 넣을 수 있으며 (값이 바뀔 때) WeakAuras가 그룹 확장 코드를 실행하게 됩니다. 이 목록에 테이블 값 'changed'를 넣을 경우 또는 구역(region)이 추가, 삭제, 재정렬 될 때 WeakAuras는 반드시 사용자 정의 그룹 확장 코드를 실행합니다."
+	L["You can add a comma-separated list of state values here that (when changed) WeakAuras should also run the sort code on.WeakAuras will always run custom sort code if you include 'changed' in this list, or when a region is added, removed."] = "이곳에 State 테이블 값들을 쉼표로 구분해서 목록으로 만들어 넣을 수 있으며 (값이 바뀔 때) WeakAuras가 정렬 코드를 실행하게 됩니다. 이 목록에 테이블 값 'changed'를 넣을 경우 또는 구역(region)이 추가, 삭제, 재정렬 될 때 WeakAuras는 반드시 사용자 정의 정렬 코드를 실행합니다."
 	L["Your Saved Snippets"] = "저장된 스니펫"
 	L["Z Offset"] = "Z 위치 조정"
 	L["Z Rotation"] = "Z 회전"
@@ -61,6 +61,10 @@ local L = WeakAuras.L
 	L["%s - Init Action"] = "%s - Init Action"
 	--[[Translation missing --]]
 	L["%s - Main"] = "%s - Main"
+	--[[Translation missing --]]
+	L["%s - OnLoad"] = "%s - OnLoad"
+	--[[Translation missing --]]
+	L["%s - OnUnload"] = "%s - OnUnload"
 	L["%s - Option #%i has the key %s. Please choose a different option key."] = "%s - Option #%i possui a chave %s. Por favor, selecione uma opção diferente de chave."
 	--[[Translation missing --]]
 	L["%s - Rotate Animation"] = "%s - Rotate Animation"
@@ -392,17 +396,42 @@ Off Screen]=] ] = "Aura está fora da tela"
 	--[[Translation missing --]]
 	L["Custom Frames"] = "Custom Frames"
 	--[[Translation missing --]]
+	L["Custom Functions"] = "Custom Functions"
+	--[[Translation missing --]]
+	L["Custom Init"] = "Custom Init"
+	--[[Translation missing --]]
+	L["Custom Load"] = "Custom Load"
+	--[[Translation missing --]]
 	L["Custom Options"] = "Custom Options"
 	L["Custom Trigger"] = "Gatilho personalizado"
 	--[[Translation missing --]]
-	L["Custom trigger event tooltip"] = "Custom trigger event tooltip"
+	L["Custom trigger event tooltip"] = [=[Choose which events cause the custom trigger to be checked. Multiple events can be specified using commas or spaces.
+• "UNIT" events can use colons to define which unitIDs will be registered. In addition to UnitIDs Unit types can be used, they include "nameplate", "group", "raid", "party", "arena", "boss".
+• "CLEU" can be used instead of COMBAT_LOG_EVENT_UNFILTERED and colons can be used to separate specific "subEvents" you want to receive.
+• The keyword "TRIGGER" can be used, with colons separating trigger numbers, to have the custom trigger get updated when the specified trigger(s) update.
+
+|cFF4444FFFor example:|r
+UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1
+]=]
 	--[[Translation missing --]]
-	L["Custom trigger status tooltip"] = "Custom trigger status tooltip"
+	L["Custom trigger status tooltip"] = [=[Choose which events cause the custom trigger to be checked. Multiple events can be specified using commas or spaces.
+
+• "UNIT" events can use colons to define which unitIDs will be registered. In addition to UnitIDs Unit types can be used, they include "nameplate", "group", "raid", "party", "arena", "boss".
+• "CLEU" can be used instead of COMBAT_LOG_EVENT_UNFILTERED and colons can be used to separate specific "subEvents" you want to receive.
+• The keyword "TRIGGER" can be used, with colons separating trigger numbers, to have the custom trigger get updated when the specified trigger(s) update.
+
+Since this is a status-type trigger, the specified events may be called by WeakAuras without the expected arguments.
+
+|cFF4444FFFor example:|r
+UNIT_POWER_UPDATE:player, UNIT_AURA:nameplate:group PLAYER_TARGET_CHANGED CLEU:SPELL_CAST_SUCCESS TRIGGER:3:1
+]=]
 	--[[Translation missing --]]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Custom Trigger: Ignore Lua Errors on OPTIONS event"
 	--[[Translation missing --]]
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Custom Trigger: Send fake events instead of STATUS event"
 	--[[Translation missing --]]
+	L["Custom Unload"] = "Custom Unload"
+	--[[Translation missing --]]
 	L["Custom Untrigger"] = "Custom Untrigger"
 	--[[Translation missing --]]
 	L["Debug Log"] = "Debug Log"
@@ -630,7 +659,7 @@ Bleed classification via LibDispel]=]
 	--[[Translation missing --]]
 	L["Grid direction"] = "Grid direction"
 	--[[Translation missing --]]
-	L["Group (verb)"] = "Group (verb)"
+	L["Group (verb)"] = "Group"
 	--[[Translation missing --]]
 	L["Group Alpha"] = "Group Alpha"
 	--[[Translation missing --]]
@@ -644,7 +673,17 @@ Bleed classification via LibDispel]=]
 - Unit Frames: attach to unit frame buttons per unit.
 - Custom Frames: choose which frame each region should be anchored to.]=]
 	--[[Translation missing --]]
-	L["Group aura count description"] = "Group aura count description"
+	L["Group aura count description"] = [=[The amount of units of type '%s' which must be affected by one or more of the given auras for the display to trigger.
+If the entered number is a whole number (e.g. 5), the number of affected units will be compared with the entered number.
+If the entered number is a decimal (e.g. 0.5), fraction (e.g. 1/2), or percentage (e.g. 50%%), then that fraction of the %s must be affected.
+
+|cFF4444FFFor example:|r
+|cFF00CC00> 0|r will trigger when any unit of type '%s' is affected
+|cFF00CC00= 100%%|r will trigger when every unit of type '%s' is affected
+|cFF00CC00!= 2|r will trigger when the number of units of type '%s' affected is not exactly 2
+|cFF00CC00<= 0.8|r will trigger when less than 80%% of the units of type '%s' is affected (4 of 5 party members, 8 of 10 or 20 of 25 raid members)
+|cFF00CC00> 1/2|r will trigger when more than half of the units of type '%s' is affected
+]=]
 	--[[Translation missing --]]
 	L["Group by Frame"] = "Group by Frame"
 	--[[Translation missing --]]
@@ -877,11 +916,14 @@ Bleed classification via LibDispel]=]
 	L["Moving auras: "] = "Moving auras: "
 	L["Multiple Displays"] = "Múltiplos displays"
 	--[[Translation missing --]]
-	L["Multiselect ignored tooltip"] = "Multiselect ignored tooltip"
+	L["Multiselect ignored tooltip"] = [=[|cFFFF0000Ignored|r - |cFF777777Single|r - |cFF777777Multiple|r
+This option will not be used to determine when this display should load]=]
 	--[[Translation missing --]]
-	L["Multiselect multiple tooltip"] = "Multiselect multiple tooltip"
+	L["Multiselect multiple tooltip"] = [=[|cFF777777Ignored|r - |cFF777777Single|r - |cFF00FF00Multiple|r
+Any number of matching values can be picked]=]
 	--[[Translation missing --]]
-	L["Multiselect single tooltip"] = "Multiselect single tooltip"
+	L["Multiselect single tooltip"] = [=[|cFF777777Ignored|r - |cFF00FF00Single|r - |cFF777777Multiple|r
+Only a single matching value can be picked]=]
 	--[[Translation missing --]]
 	L["Must be a power of 2"] = "Must be a power of 2"
 	--[[Translation missing --]]
@@ -942,7 +984,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["ON"] = "ON"
 	L["On Hide"] = "Quando sumir"
-	L["On Init"] = "No início"
 	L["On Show"] = "Quando mostrar"
 	--[[Translation missing --]]
 	L["Only Match auras cast by a player (not an npc)"] = "Only Match auras cast by a player (not an npc)"
@@ -1125,7 +1166,7 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=]
 	--[[Translation missing --]]
 	L["Shadow Y Offset"] = "Shadow Y Offset"
 	--[[Translation missing --]]
-	L["Shift-click to create chat link"] = "Shift-click to create chat link"
+	L["Shift-click to create chat link"] = "Shift-click to create a |cFF8800FF[Chat Link]"
 	--[[Translation missing --]]
 	L["Show \"Edge\""] = "Show \"Edge\""
 	--[[Translation missing --]]
@@ -7,7 +7,7 @@ end
 local L = WeakAuras.L

 -- WeakAuras/Options
-	L[" and |cFFFF0000mirrored|r"] = "и |cFFFF0000mirrored|r"
+	L[" and |cFFFF0000mirrored|r"] = "и |cFFFF0000отражать|r"
 	L["-- Do not remove this comment, it is part of this aura: "] = "-- Не удаляйте этот комментарий! Он является частью кода индикации "
 	L[" rotated |cFFFF0000%s|r degrees"] = "; Поворот %.4g"
 	L["% - To show a percent sign"] = "% — отображение знака процента"
@@ -37,6 +37,10 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - Сообщение в чат при скрытии"
 	L["%s - Init Action"] = "%s - Действие при инициализации"
 	L["%s - Main"] = "%s - Основная"
+	--[[Translation missing --]]
+	L["%s - OnLoad"] = "%s - OnLoad"
+	--[[Translation missing --]]
+	L["%s - OnUnload"] = "%s - OnUnload"
 	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 анимация масштаба"
@@ -267,6 +271,12 @@ Off Screen]=] ] = [=[Индикация за
 	L["Custom Code"] = "Свой код"
 	L["Custom Code Viewer"] = "Средство просмотра кода"
 	L["Custom Frames"] = "Свои кадры"
+	--[[Translation missing --]]
+	L["Custom Functions"] = "Custom Functions"
+	--[[Translation missing --]]
+	L["Custom Init"] = "Custom Init"
+	--[[Translation missing --]]
+	L["Custom Load"] = "Custom Load"
 	L["Custom Options"] = "Свои параметры"
 	L["Custom Trigger"] = "Свой триггер"
 	L["Custom trigger event tooltip"] = [=[Напишите события, которые будут вызывать проверку вашего триггера. Несколько событий должны быть разделены запятыми или пробелами.
@@ -280,6 +290,8 @@ UNIT_POWER  UNIT_AURA, PLAYER_TARGET_CHANGED]=]
 UNIT_POWER  UNIT_AURA, PLAYER_TARGET_CHANGED]=]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "Свой триггер: игнорировать ошибки Lua при событии OPTIONS"
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "Свой триггер: отправлять фиктивные события вместо события STATUS"
+	--[[Translation missing --]]
+	L["Custom Unload"] = "Custom Unload"
 	L["Custom Untrigger"] = "Свой детриггер"
 	L["Debug Log"] = "Журнал отладки"
 	L["Debug Log:"] = "Журнал отладки:"
@@ -605,7 +617,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = "Время
 	L["Okay"] = "Ок"
 	L["ON"] = "ВКЛ."
 	L["On Hide"] = "При скрытии"
-	L["On Init"] = "При инициализации"
 	L["On Show"] = "При появлении"
 	L["Only Match auras cast by a player (not an npc)"] = "Эффект применён каким-либо игроком, а не NPC"
 	L["Only match auras cast by people other than the player or their pet"] = "Эффекты, применённые другими людьми, но не игроком или его питомцем"
@@ -37,6 +37,8 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - 结束自定义文本"
 	L["%s - Init Action"] = "%s - 初始动作"
 	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 - Rotate Animation"] = "%s - 旋转动画"
 	L["%s - Scale Animation"] = "%s - 缩放动画"
@@ -267,6 +269,10 @@ Off Screen]=] ] = "光环在屏幕外"
 	L["Custom Code"] = "自定义代码"
 	L["Custom Code Viewer"] = "自定义代码查看器"
 	L["Custom Frames"] = "自定义框架"
+	--[[Translation missing --]]
+	L["Custom Functions"] = "Custom Functions"
+	L["Custom Init"] = "自定义初始化"
+	L["Custom Load"] = "自定义已载入"
 	L["Custom Options"] = "自定义选项"
 	L["Custom Trigger"] = "自定义触发器"
 	L["Custom trigger event tooltip"] = [=[选择用于检查自定义触发器的事件。
@@ -282,6 +288,7 @@ UNIT_POWER, UNIT_AURA PLAYER_TARGET_CHANGED]=]
 UNIT_POWER, UNIT_AURA PLAYER_TARGET_CHANGED]=]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "自定义触发器：忽略OPTIONS事件的Lua错误"
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "自定义触发器：发送虚假事件而不是STATUS事件"
+	L["Custom Unload"] = "自定义未载入"
 	L["Custom Untrigger"] = "自定义取消触发器"
 	L["Debug Log"] = "调试日志"
 	L["Debug Log:"] = "调试日志："
@@ -609,7 +616,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件发
 	L["Okay"] = "好"
 	L["ON"] = "开启"
 	L["On Hide"] = "图示隐藏时"
-	L["On Init"] = "初始化时"
 	L["On Show"] = "图示显示时"
 	L["Only Match auras cast by a player (not an npc)"] = "只匹配由玩家（而不是NPC）施放的光环"
 	L["Only match auras cast by people other than the player or their pet"] = "只匹配由不是玩家自身或宠物施放的光环"
@@ -37,6 +37,8 @@ local L = WeakAuras.L
 	L["%s - Finish Custom Text"] = "%s - 結束自訂文字"
 	L["%s - Init Action"] = "%s - 初始動作"
 	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 已經有 key %s。請選擇另一個不同的選項 key。"
 	L["%s - Rotate Animation"] = "%s - 旋轉動畫"
 	L["%s - Scale Animation"] = "%s - 縮放動畫"
@@ -141,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"] = "和靠右對齊"
@@ -261,6 +263,9 @@ Off Screen]=] ] = [=[提醒效果
 	L["Custom Code"] = "自訂程式碼"
 	L["Custom Code Viewer"] = "自訂程式碼檢視器"
 	L["Custom Frames"] = "自訂框架"
+	L["Custom Functions"] = "自訂功能"
+	L["Custom Init"] = "自訂初始化"
+	L["Custom Load"] = "自訂載入"
 	L["Custom Options"] = "自訂選項"
 	L["Custom Trigger"] = "自訂觸發"
 	L["Custom trigger event tooltip"] = [=[選擇自訂觸發要檢查的事件。
@@ -276,6 +281,7 @@ UNIT_POWER, UNIT_AURA PLAYER_TARGET_CHANGED]=]
 UNIT_POWER, UNIT_AURA PLAYER_TARGET_CHANGED]=]
 	L["Custom Trigger: Ignore Lua Errors on OPTIONS event"] = "自訂觸發: 忽略 OPTIONS 事件的 Lua 錯誤"
 	L["Custom Trigger: Send fake events instead of STATUS event"] = "自訂觸發: 發送假的事件而不是 STATUS 事件"
+	L["Custom Unload"] = "自訂未載入"
 	L["Custom Untrigger"] = "自訂取消觸發"
 	L["Debug Log"] = "偵錯紀錄"
 	L["Debug Log:"] = "偵錯紀錄："
@@ -603,7 +609,6 @@ every 3 events starting from 2nd and ending at 11th: 2-11/3]=] ] = [=[事件發
 	L["Okay"] = "確認"
 	L["ON"] = "開啟"
 	L["On Hide"] = "消失時"
-	L["On Init"] = "初始化時"
 	L["On Show"] = "出現時"
 	L["Only Match auras cast by a player (not an npc)"] = "只符合玩家 (非 NPC) 施放的光環"
 	L["Only match auras cast by people other than the player or their pet"] = "只符合玩家或他們的寵物以外的人施放的光環"
@@ -110,7 +110,16 @@ function OptionsPrivate.CreateFrame()
  frame:SetResizable(true)
  frame:SetMinResize(minWidth, minHeight)
  frame:SetFrameStrata("DIALOG")
-  frame.PortraitContainer.portrait:SetTexture([[Interface\AddOns\WeakAuras\Media\Textures\logo_256_round.tga]])
+
+  local now = time()
+  local y = date("*t", now).year
+  local inJune = now >= time{year=y, month=6, day=1, hour=0} and now < time{year=y, month=7, day=1, hour=0}
+  if inJune then
+    frame.PortraitContainer.portrait:SetTexture([[Interface\AddOns\WeakAuras\Media\Textures\logo_256_round_pride.tga]])
+  else
+    frame.PortraitContainer.portrait:SetTexture([[Interface\AddOns\WeakAuras\Media\Textures\logo_256_round.tga]])
+  end
+
  frame.window = "default"

  local xOffset, yOffset
@@ -508,7 +517,7 @@ function OptionsPrivate.CreateFrame()
  end

  local awesomeWotlkButton
-  if not WeakAuras.isAwesomeEnabled() then
+  if not WeakAuras.IsAwesomeEnabled() then
    awesomeWotlkButton = addFooter("Awesome WotLK", [[Interface\AddOns\WeakAuras\Media\Textures\GitHub.tga]], "https://github.com/FrostAtom/awesome_wotlk/releases",
                                    L["Unlock nameplate anchoring & units in WeakAuras with the Awesome WotLK client patch"])
    awesomeWotlkButton:SetParent(tipFrame)
@@ -157,6 +157,7 @@ local function ConstructTextEditor(frame)
  group:SetLayout("flow")

  local editor = AceGUI:Create("MultiLineEditBox")
+  editor.editBox.group = group
  editor:SetFullWidth(true)
  editor:SetFullHeight(true)
  editor:DisableButton(true)
@@ -504,7 +505,7 @@ local function ConstructTextEditor(frame)
  editor.editBox.timeMachine = {}
  editor.editBox.timeMachinePos = 1
  local TimeMachineMaximumRollback = 10
-
+  --[[ Doesn't exist, we need a workaround for that
  editor.editBox:HookScript(
    "OnKeyDown",
    function(self, key)
@@ -539,10 +540,35 @@ local function ConstructTextEditor(frame)
      end
    end
  )
+  ]]

  editor.editBox:HookScript(
    "OnTextChanged",
    function(self, userInput)
+      local str = editor.editBox:GetText()
+      if not str or str:trim() == "" or editor.combinedText == true then
+        self.group.editorError:SetText("")
+      else
+        local func, errorString
+        if (self.group.enclose) then
+          func, errorString = OptionsPrivate.Private.LoadFunction("return function() " .. str .. "\n end", self.group.data.id, true)
+        else
+          func, errorString = OptionsPrivate.Private.LoadFunction("return " .. str, self.group.data.id, true)
+        end
+        if not errorString and self.group.validator then
+          errorString = self.group.validator(func)
+        end
+        if errorString then
+          if self.url then
+            helpButton:Show()
+          end
+          self.group.editorError:Show()
+          self.group.editorError:SetText(errorString)
+        else
+          self.group.editorError:SetText("")
+        end
+      end
+
      if not userInput then return end
      if self.skipOnTextChanged then
        self.skipOnTextChanged = false
@@ -596,6 +622,7 @@ local function ConstructTextEditor(frame)
  editorError:SetTextColor(1, 0, 0)
  editorError:SetPoint("LEFT", helpButton, "RIGHT", 0, 4)
  editorError:SetPoint("RIGHT", settings_frame, "LEFT")
+  group.editorError = editorError

  local editorLine = CreateFrame("EditBox", nil, group.frame, "WA_InputBoxTemplate")
  -- Set script on enter pressed..
@@ -658,6 +685,8 @@ local function ConstructTextEditor(frame)
    self.reloadOptions = reloadOptions
    self.setOnParent = setOnParent
    self.url = url
+    self.enclose = enclose
+    self.validator = validator
    if url then
      helpButton:Show()
    else
@@ -694,36 +723,6 @@ local function ConstructTextEditor(frame)
        -- catch it so that escape doesn't default to losing focus (after which another escape would close config)
      end
    )
-    self.oldOnTextChanged = editor.editBox:GetScript("OnTextChanged")
-    editor.editBox:SetScript(
-      "OnTextChanged",
-      function(...)
-        local str = editor.editBox:GetText()
-        if not str or str:trim() == "" or editor.combinedText == true then
-          editorError:SetText("")
-        else
-          local func, errorString
-          if (enclose) then
-            func, errorString = OptionsPrivate.Private.LoadFunction("return function() " .. str .. "\n end", true)
-          else
-            func, errorString = OptionsPrivate.Private.LoadFunction("return " .. str, true)
-          end
-          if not errorString and validator then
-            errorString = validator(func)
-          end
-          if errorString then
-            if self.url then
-              helpButton:Show()
-            end
-            editorError:Show()
-            editorError:SetText(errorString)
-          else
-            editorError:SetText("")
-          end
-        end
-        self.oldOnTextChanged(...)
-      end
-    )

    if setOnParent then
      editor:SetText(OptionsPrivate.Private.ValueFromPath(data, path) or "")
@@ -767,7 +766,6 @@ local function ConstructTextEditor(frame)
  end

  function group.CancelClose(self)
-    editor.editBox:SetScript("OnTextChanged", self.oldOnTextChanged)
    editor:ClearFocus()
    frame:HideTip()
    frame.window = "default"
@@ -827,7 +825,6 @@ local function ConstructTextEditor(frame)

    WeakAuras.ClearAndUpdateOptions(self.data.id)

-    editor.editBox:SetScript("OnTextChanged", self.oldOnTextChanged)
    editor:ClearFocus()

    frame.window = "default"
@@ -73,7 +73,10 @@ local function scamCheck(codes, data)
  if (data.actions) then
    if data.actions.init then
      addCode(codes, L["%s - Init Action"]:format(data.id), data.actions.init.custom, data.actions.init.do_custom)
+      addCode(codes, L["%s - OnLoad"]:format(data.id), data.actions.init.customOnLoad, data.actions.init.do_custom_load)
+      addCode(codes, L["%s - OnUnload"]:format(data.id), data.actions.init.customOnUnload, data.actions.init.do_custom_unload)
    end
+
    if data.actions.start then
      addCode(codes, L["%s - Start Action"]:format(data.id), data.actions.start.custom, data.actions.start.do_custom)
      addCode(codes, L["%s - Start Custom Text"]:format(data.id), data.actions.start.message_custom, data.actions.start.do_message)
@@ -175,7 +175,7 @@ local function createOptions(id, data)
          ["UNITFRAME"] = L["Unit Frames"],
          ["CUSTOM"] = L["Custom Frames"]
        }
-        if WeakAuras.isAwesomeEnabled() then
+        if WeakAuras.IsAwesomeEnabled() then
          v["NAMEPLATE"] = L["Nameplates"]
        end
        return v
@@ -3,7 +3,7 @@ local Private = select(2, ...)

 local L = WeakAuras.L

-local optionsVersion = "5.19.9"
+local optionsVersion = "5.19.10"

 if optionsVersion .. " Beta" ~= 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"],
@@ -1,7 +1,7 @@
 ## Interface: 30300
 ## Title: WeakAuras Options
 ## Author: The WeakAuras Team
-## Version: 5.19.9
+## Version: 5.19.10
 ## Notes: Options for WeakAuras
 ## Notes-esES: Opciones para WeakAuras
 ## Notes-esMX: Opciones para WeakAuras