big update

ElvUI_Config/ActionBars.lua

@@ -88,7 +88,7 @@ local function BuildABConfig()
 				desc = L["The button you must hold down in order to drag an ability to another action button."],
 				disabled = function() return (not E.private.actionbar.enable or not E.db.actionbar.lockActionBars) end,
 				values = {
-					["NONE"] = NONE,
+					["NONE"] = L["None"],
 					["SHIFT"] = "SHIFT_KEY",
 					["ALT"] = "ALT_KEY",
 					["CTRL"] = "CTRL_KEY"
@@ -175,7 +175,7 @@ local function BuildABConfig()
 						name = L["Font Outline"],
 						desc = L["Set the font outline."],
 						values = {
-							["NONE"] = NONE,
+							["NONE"] = L["None"],
 							["OUTLINE"] = "OUTLINE",
 							["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 							["THICKOUTLINE"] = "THICKOUTLINE"

ElvUI_Config/Auras.lua

@@ -167,7 +167,7 @@ E.Options.args.auras = {
 					desc = L["Set the font outline."],
 					type = "select",
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["OUTLINE"] = "OUTLINE",
 						["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 						["THICKOUTLINE"] = "THICKOUTLINE"

ElvUI_Config/Bags.lua

@@ -129,7 +129,7 @@ E.Options.args.bags = {
 							name = L["Font Outline"],
 							set = function(info, value) E.db.bags.countFontOutline = value B:UpdateCountDisplay() end,
 							values = {
-								["NONE"] = NONE,
+								["NONE"] = L["None"],
 								["OUTLINE"] = "OUTLINE",
 								["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 								["THICKOUTLINE"] = "THICKOUTLINE"
@@ -225,7 +225,7 @@ E.Options.args.bags = {
 							disabled = function() return not E.db.bags.itemLevel end,
 							set = function(info, value) E.db.bags.itemLevelFontOutline = value B:UpdateItemLevelDisplay() end,
 							values = {
-								["NONE"] = NONE,
+								["NONE"] = L["None"],
 								["OUTLINE"] = "OUTLINE",
 								["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 								["THICKOUTLINE"] = "THICKOUTLINE"

ElvUI_Config/Chat.lua

@@ -170,7 +170,7 @@ E.Options.args.chat = {
 					name = L["Chat Timestamps"],
 					desc = "OPTION_TOOLTIP_TIMESTAMPS",
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["%I:%M "] = "03:27",
 						["%I:%M:%S "] = "03:27:32",
 						["%I:%M %p "] = "03:27 PM",
@@ -415,7 +415,7 @@ E.Options.args.chat = {
 					desc = L["Set the font outline."],
 					type = "select",
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["OUTLINE"] = "OUTLINE",
 						["MONOCHROMEOUTLINE"] = "MONOCHROMEOUTLINE",
 						["THICKOUTLINE"] = "THICKOUTLINE"
@@ -439,7 +439,7 @@ E.Options.args.chat = {
 					desc = L["Set the font outline."],
 					type = "select",
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["OUTLINE"] = "OUTLINE",
 						["MONOCHROMEOUTLINE"] = "MONOCHROMEOUTLINE",
 						["THICKOUTLINE"] = "THICKOUTLINE"

ElvUI_Config/Core.lua

@@ -23,7 +23,7 @@ local AC = LibStub("AceConfig-3.0")
 local ACD = LibStub("AceConfigDialog-3.0")
 local ACR = LibStub("AceConfigRegistry-3.0")
 
-AC.RegisterOptionsTable(E, "ElvUI", E.Options)
+AC:RegisterOptionsTable("ElvUI", E.Options)
 ACD:SetDefaultSize("ElvUI", DEFAULT_WIDTH, DEFAULT_HEIGHT)
 
 function E:RefreshGUI()
@@ -35,7 +35,7 @@ E.Options.args = {
 	ElvUI_Header = {
 		order = 1,
 		type = "header",
-		name = L["Version"] .. format(": |cff99ff33%s|r", E.version),
+		name = L["Version"]..format(": |cff99ff33%s|r", E.version),
 		width = "full"
 	},
 	LoginMessage = {
@@ -125,19 +125,22 @@ local DEVELOPERS = {
 	"Haste",
 	"Nightcracker",
 	"Omega1970",
-	"Hydrazine"
+	"Hydrazine",
+	"Blazeflack",
+	"|cffff7d0aMerathilis|r",
+	"|cFF8866ccSimpy|r"
 }
 
 local TESTERS = {
 	"Tukui Community",
 	"|cffF76ADBSarah|r - For Sarahing",
 	"Affinity",
+	"Azilroka",
 	"Modarch",
 	"Bladesdruid",
 	"Tirain",
 	"Phima",
 	"Veiled",
-	"Blazeflack",
 	"Repooc",
 	"Darth Predator",
 	"Alex",
@@ -174,7 +177,7 @@ E.Options.args.credits = {
 		text = {
 			order = 1,
 			type = "description",
-			name = L["ELVUI_CREDITS"] .. "\n\n" .. L["Coding:"] .. DEVELOPER_STRING .. "\n\n" .. L["Testing:"] .. TESTER_STRING .. "\n\n" .. L["Donations:"] .. DONATOR_STRING
+			name = L["ELVUI_CREDITS"].."\n\n"..L["Coding:"]..DEVELOPER_STRING.."\n\n"..L["Testing:"]..TESTER_STRING.."\n\n"..L["Donations:"]..DONATOR_STRING
 		}
 	}
 }
@@ -274,7 +277,7 @@ local function ExportImport_Open(mode)
 				label1:SetText(L["Error exporting profile!"])
 			else
 				label1:SetText(format("%s: %s%s|r", L["Exported"], E.media.hexvaluecolor, profileTypeItems[profileType]))
-				if(profileType == "profile") then
+				if profileType == "profile" then
 					label2:SetText(format("%s: %s%s|r", L["Profile Name"], E.media.hexvaluecolor, profileKey))
 				end
 			end
@@ -288,17 +291,14 @@ local function ExportImport_Open(mode)
 
 		box.editBox:SetScript("OnChar", function() box:SetText(exportString) box.editBox:HighlightText() end)
 		box.editBox:SetScript("OnTextChanged", function()
-			if this then
-				box:SetText(exportString)
-				this:HighlightText()
-			end
-
+			box:SetText(exportString)
+			box.editBox:HighlightText()
+	
 			box.scrollFrame:UpdateScrollChildRect()
-			box.scrollFrame:SetVerticalScroll(box.scrollFrame:GetVerticalScrollRange())
 		end)
 	elseif mode == "import" then
 		frame:SetTitle(L["Import Profile"])
-		local importButton = AceGUI:Create("Button")
+		local importButton = AceGUI:Create("Button-ElvUI")
 		importButton:SetDisabled(true)
 		importButton:SetText(L["Import Now"])
 		importButton:SetAutoWidth(true)
@@ -317,7 +317,7 @@ local function ExportImport_Open(mode)
 		end)
 		frame:AddChild(importButton)
 
-		local decodeButton = AceGUI:Create("Button")
+		local decodeButton = AceGUI:Create("Button-ElvUI")
 		decodeButton:SetDisabled(true)
 		decodeButton:SetText(L["Decode Text"])
 		decodeButton:SetAutoWidth(true)
@@ -398,14 +398,14 @@ local function ExportImport_Open(mode)
 end
 
 E.Options.args.profiles = LibStub("AceDBOptions-3.0"):GetOptionsTable(E.data)
-AC.RegisterOptionsTable(E, "ElvProfiles", E.Options.args.profiles)
+AC:RegisterOptionsTable("ElvProfiles", E.Options.args.profiles)
 E.Options.args.profiles.order = -10
 
 if not E.Options.args.profiles.plugins then
 	E.Options.args.profiles.plugins = {}
 end
 
-E.Options.args.profiles.plugins["ElvUI"] = {
+E.Options.args.profiles.plugins.ElvUI = {
 	spacer = {
 		order = 89,
 		type = "description",
@@ -418,27 +418,24 @@ E.Options.args.profiles.plugins["ElvUI"] = {
 	},
 	distributeProfile = {
 		order = 91,
+		type = "execute",
 		name = L["Share Current Profile"],
 		desc = L["Sends your current profile to your target."],
-		type = "execute",
 		func = function()
 			if (GetNumPartyMembers() <= 0 or GetNumPartyMembers() <= 0) then
 				E:Print(L["You must be in a group."])
 				return
 			end
-
-			if not UnitExists("target") or not UnitIsPlayer("target") or not UnitIsFriend("player", "target") or UnitIsUnit("player", "target") then
-				E:Print(L["You must be targeting a player."])
-				return
-			end
-
 			if not (UnitInParty("target") or UnitInRaid("target")) then
 				E:Print(L["You must be targeting a player within your group."])
 				return
 			end
-
+			if not UnitExists("target") or not UnitIsPlayer("target") or not UnitIsFriend("player", "target") or UnitIsUnit("player", "target") then
+				E:Print(L["You must be targeting a player."])
+				return
+			end
 			local name, server = UnitName("target")
-			if name and not server or server == "" then
+			if name and (not server or server == "") then
 				D:Distribute(name)
 			elseif server then
 				D:Distribute(name, true)
@@ -455,24 +452,21 @@ E.Options.args.profiles.plugins["ElvUI"] = {
 				E:Print(L["You must be in a group."])
 				return
 			end
-
-			if not UnitExists("target") or not UnitIsPlayer("target") or not UnitIsFriend("player", "target") or UnitIsUnit("player", "target") then
-				E:Print(L["You must be targeting a player."])
-				return
-			end
-
 			if not (UnitInParty("target") or UnitInRaid("target")) then
 				E:Print(L["You must be targeting a player within your group."])
 				return
 			end
-
+			if not UnitExists("target") or not UnitIsPlayer("target") or not UnitIsFriend("player", "target") or UnitIsUnit("player", "target") then
+				E:Print(L["You must be targeting a player."])
+				return
+			end
 			local name, server = UnitName("target")
-			if name and not server or server == "" then
+			if name and (not server or server == "") then
 				D:Distribute(name, false, true)
 			elseif server then
 				D:Distribute(name, true, true)
 			end
-		end,
+		end
 	},
 	spacer2 = {
 		order = 93,
@@ -491,4 +485,4 @@ E.Options.args.profiles.plugins["ElvUI"] = {
 		name = L["Import Profile"],
 		func = function() ExportImport_Open("import") end
 	}
-}
+}

ElvUI_Config/DataBars.lua

@@ -25,7 +25,7 @@ E.Options.args.databars = {
 			get = function(info) return mod.db.experience[ info[getn(info)] ] end,
 			set = function(info, value) mod.db.experience[ info[getn(info)] ] = value; mod:UpdateExperienceDimensions() end,
 			type = "group",
-			name = XPBAR_LABEL,
+			name = L["XP Bar"],
 			args = {
 				enable = {
 					order = 0,
@@ -74,7 +74,7 @@ E.Options.args.databars = {
 				},
 				textSize = {
 					order = 7,
-					name = FONT_SIZE,
+					name = L["Font Size"],
 					type = "range",
 					min = 6, max = 33, step = 1
 				},
@@ -83,7 +83,7 @@ E.Options.args.databars = {
 					type = "select",
 					name = L["Font Outline"],
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["OUTLINE"] = "OUTLINE",
 						["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 						["THICKOUTLINE"] = "THICKOUTLINE"
@@ -95,7 +95,7 @@ E.Options.args.databars = {
 					name = L["Text Format"],
 					width = "double",
 					values = {
-						NONE = NONE,
+						NONE = L["None"],
 						PERCENT = L["Percent"],
 						CUR = L["Current"],
 						REM = L["Remaining"],
@@ -170,7 +170,7 @@ E.Options.args.databars = {
 					type = "select",
 					name = L["Font Outline"],
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["OUTLINE"] = "OUTLINE",
 						["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 						["THICKOUTLINE"] = "THICKOUTLINE"
@@ -182,7 +182,7 @@ E.Options.args.databars = {
 					name = L["Text Format"],
 					width = "double",
 					values = {
-						NONE = NONE,
+						NONE = L["None"],
 						CUR = L["Current"],
 						REM = L["Remaining"],
 						PERCENT = L["Percent"],

ElvUI_Config/General.lua

@@ -7,9 +7,8 @@ local _G = _G
 local getn = table.getn
 --WoW API / Variables
 local FCF_GetNumActiveChatFrames = FCF_GetNumActiveChatFrames
-local NONE, FONT_SIZE, COLOR, DISABLE = NONE, FONT_SIZE, COLOR, DISABLE
-local PLAYER, LOOT = PLAYER, LOOT
-local SAY, CHAT_MSG_EMOTE = SAY, CHAT_MSG_EMOTE
+
+_G.GetLocale = function() return GAME_LOCALE end
 
 local function GetChatWindowInfo()
 	local ChatTabInfo = {}
@@ -23,48 +22,27 @@ local function GetChatWindowInfo()
 end
 
 E.Options.args.general = {
-	type = "group",
-	name = GENERAL,
 	order = 1,
+	type = "group",
+	name = L["General"],
 	childGroups = "tab",
 	get = function(info) return E.db.general[ info[getn(info)] ] end,
 	set = function(info, value) E.db.general[ info[getn(info)] ] = value end,
 	args = {
-		versionCheck = {
-			order = 1,
-			type = "toggle",
-			name = L["Version Check"],
-			get = function(info) return E.global.general.versionCheck end,
-			set = function(info, value) E.global.general.versionCheck = value end
-		},
-		spacer = {
-			order = 2,
-			type = "description",
-			name = "",
-			width = "full",
-		},
 		intro = {
-			order = 3,
+			order = 1,
 			type = "description",
 			name = L["ELVUI_DESC"],
 		},
 		general = {
-			order = 4,
+			order = 2,
 			type = "group",
-			name = GENERAL,
+			name = L["General"],
 			args = {
 				generalHeader = {
 					order = 1,
 					type = "header",
-					name = GENERAL,
-				},
-				pixelPerfect = {
-					order = 2,
-					type = "toggle",
-					name = L["Thin Border Theme"],
-					desc = L["The Thin Border Theme option will change the overall apperance of your UI. Using Thin Border Theme is a slight performance increase over the traditional layout."],
-					get = function(info) return E.private.general.pixelPerfect end,
-					set = function(info, value) E.private.general.pixelPerfect = value E:StaticPopup_Show("PRIVATE_RL") end
+					name = L["General"],
 				},
 				messageRedirect = {
 					order = 2,
@@ -79,12 +57,12 @@ E.Options.args.general = {
 					name = L["Announce Interrupts"],
 					desc = L["Announce when you interrupt a spell to the specified chat channel."],
 					values = {
-						["NONE"] = NONE,
-						["SAY"] = SAY,
+						["NONE"] = L["None"],
+						["SAY"] = L["Say"],
 						["PARTY"] = L["Party Only"],
 						["RAID"] = L["Party / Raid"],
 						["RAID_ONLY"] = L["Raid Only"],
-						["EMOTE"] = CHAT_MSG_EMOTE
+						["EMOTE"] = L["Emote"]
 					}
 				},
 				autoRepair = {
@@ -93,33 +71,42 @@ E.Options.args.general = {
 					name = L["Auto Repair"],
 					desc = L["Automatically repair using the following method when visiting a merchant."],
 					values = {
-						["NONE"] = NONE,
-						["PLAYER"] = PLAYER
+						["NONE"] = L["None"],
+						["GUILD"] = L["Guild"],
+						["PLAYER"] = L["Player"]
 					}
 				},
-				autoAcceptInvite = {
+				pixelPerfect = {
 					order = 5,
 					type = "toggle",
+					name = L["Thin Border Theme"],
+					desc = L["The Thin Border Theme option will change the overall apperance of your UI. Using Thin Border Theme is a slight performance increase over the traditional layout."],
+					get = function(info) return E.private.general.pixelPerfect end,
+					set = function(info, value) E.private.general.pixelPerfect = value E:StaticPopup_Show("PRIVATE_RL") end
+				},
+				autoAcceptInvite = {
+					order = 6,
+					type = "toggle",
 					name = L["Accept Invites"],
 					desc = L["Automatically accept invites from guild/friends."]
 				},
 				autoRoll = {
-					order = 6,
+					order = 7,
 					type = "toggle",
-					name = L["Auto Greed/DE"],
-					desc = L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."],
+					name = L["Auto Greed"],
+					desc = L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."],
 					disabled = function() return not E.private.general.lootRoll end
 				},
 				loot = {
-					order = 7,
+					order = 8,
 					type = "toggle",
-					name = LOOT,
+					name = L["Loot"],
 					desc = L["Enable/Disable the loot frame."],
 					get = function(info) return E.private.general.loot end,
 					set = function(info, value) E.private.general.loot = value E:StaticPopup_Show("PRIVATE_RL") end
 				},
 				lootRoll = {
-					order = 8,
+					order = 9,
 					type = "toggle",
 					name = L["Loot Roll"],
 					desc = L["Enable/Disable the loot roll frame."],
@@ -127,7 +114,7 @@ E.Options.args.general = {
 					set = function(info, value) E.private.general.lootRoll = value E:StaticPopup_Show("PRIVATE_RL") end
 				},
 				lootUnderMouse = {
-					order = 9,
+					order = 10,
 					type = "toggle",
 					name = L["Loot Under Mouse"],
 					desc = L["Enable/Disable loot frame under the mouse cursor."],
@@ -136,21 +123,21 @@ E.Options.args.general = {
 					disabled = function() return not E.private.general.loot end
 				},
 				eyefinity = {
-					order = 10,
+					order = 11,
+					type = "toggle",
 					name = L["Multi-Monitor Support"],
 					desc = L["Attempt to support eyefinity/nvidia surround."],
-					type = "toggle",
 					get = function(info) return E.global.general.eyefinity end,
 					set = function(info, value) E.global.general[ info[getn(info)] ] = value E:StaticPopup_Show("GLOBAL_RL") end
 				},
 				hideErrorFrame = {
-					order = 11,
+					order = 12,
 					type = "toggle",
 					name = L["Hide Error Text"],
 					desc = L["Hides the red error text at the top of the screen while in combat."]
 				},
 				bottomPanel = {
-					order = 12,
+					order = 13,
 					type = "toggle",
 					name = L["Bottom Panel"],
 					desc = L["Display a panel across the bottom of the screen. This is for cosmetic only."],
@@ -158,7 +145,7 @@ E.Options.args.general = {
 					set = function(info, value) E.db.general.bottomPanel = value E:GetModule("Layout"):BottomPanelVisibility() end
 				},
 				topPanel = {
-					order = 13,
+					order = 14,
 					type = "toggle",
 					name = L["Top Panel"],
 					desc = L["Display a panel across the top of the screen. This is for cosmetic only."],
@@ -166,7 +153,7 @@ E.Options.args.general = {
 					set = function(info, value) E.db.general.topPanel = value E:GetModule("Layout"):TopPanelVisibility() end
 				},
 				afk = {
-					order = 14,
+					order = 15,
 					type = "toggle",
 					name = L["AFK Mode"],
 					desc = L["When you go AFK display the AFK screen."],
@@ -174,7 +161,7 @@ E.Options.args.general = {
 					set = function(info, value) E.db.general.afk = value E:GetModule("AFK"):Toggle() end
 				},
 				enhancedPvpMessages = {
-					order = 15,
+					order = 16,
 					type = "toggle",
 					name = L["Enhanced PVP Messages"],
 					desc = L["Display battleground messages in the middle of the screen."],
@@ -189,24 +176,39 @@ E.Options.args.general = {
 				},
 				autoScale = {
 					order = 17,
+					type = "toggle",
 					name = L["Auto Scale"],
 					desc = L["Automatically scale the User Interface based on your screen resolution"],
-					type = "toggle",
 					get = function(info) return E.global.general.autoScale end,
 					set = function(info, value) E.global.general[ info[getn(info)] ] = value E:StaticPopup_Show("GLOBAL_RL") end
 				},
 				minUiScale = {
 					order = 18,
+					type = "description",
+					name = ""
+				},
+				minUiScale = {
+					order = 19,
 					type = "range",
 					name = L["Lowest Allowed UI Scale"],
 					min = 0.32, max = 0.64, step = 0.01,
 					get = function(info) return E.global.general.minUiScale end,
 					set = function(info, value) E.global.general.minUiScale = value E:StaticPopup_Show("GLOBAL_RL") end
 				},
+				decimalLength = {
+					order = 20,
+					type = "range",
+					name = L["Decimal Length"],
+					desc = L["Controls the amount of decimals used in values displayed on elements like NamePlates and UnitFrames."],
+					min = 0, max = 4, step = 1,
+					get = function(info) return E.db.general.decimalLength end,
+					set = function(info, value) E.db.general.decimalLength = value; E:StaticPopup_Show("GLOBAL_RL") end
+				},
 				numberPrefixStyle = {
-					order = 19,
+					order = 21,
 					type = "select",
-					name = L["Number Prefix"],
+					name = L["Unit Prefix Style"],
+					desc = L["The unit prefixes you want to use when values are shortened in ElvUI. This is mostly used on UnitFrames."],
 					get = function(info) return E.db.general.numberPrefixStyle end,
 					set = function(info, value) E.db.general.numberPrefixStyle = value E:StaticPopup_Show("CONFIG_RL") end,
 					values = {
@@ -217,19 +219,29 @@ E.Options.args.general = {
 						["GERMAN"] = "German (Tsd, Mio, Mrd)"
 					}
 				},
-				decimalLength = {
-					order = 20,
-					type = "range",
-					name = L["Decimal Length"],
-					desc = L["Controls the amount of decimals used in values displayed on elements like NamePlates and UnitFrames."],
-					min = 0, max = 4, step = 1,
-					get = function(info) return E.db.general.decimalLength end,
-					set = function(info, value) E.db.general.decimalLength = value E:StaticPopup_Show("GLOBAL_RL") end
-  				}
+				GameLocale = {
+					order = 22,
+					type = "select",
+					name = L["Change Language"],
+					desc = L["Change the ElvUI option to a different language."],
+					get = function(info) return GAME_LOCALE end,
+					set = function(info, value) GAME_LOCALE = value E:StaticPopup_Show("PRIVATE_RL") end,
+					values = {
+						["enUS"] = "English (enUS/enGB)",
+						["esES"] = "Spanish (esES/esMX)",
+						["ptBR"] = "Portuguese (ptBR)",
+						["frFR"] = "French (frFR)",
+						["deDE"] = "German (deDE)",
+						["koKR"] = "Korean (koKR)",
+						["zhCN"] = "Chinese (zhCN)",
+						["zhTW"] = "Taiwanese (zhTW)",
+						["ruRU"] = "Russian (ruRU)"
+					}
+				}
 			}
 		},
 		media = {
-			order = 5,
+			order = 3,
 			type = "group",
 			name = L["Media"],
 			get = function(info) return E.db.general[ info[getn(info)] ] end,
@@ -240,31 +252,43 @@ E.Options.args.general = {
 					type = "header",
 					name = L["Fonts"]
 				},
-				fontSize = {
-					order = 2,
-					type = "range",
-					name = FONT_SIZE,
-					desc = L["Set the font size for everything in UI. Note: This doesn't effect somethings that have their own seperate options (UnitFrame Font, Datatext Font, ect..)"],
-					min = 4, max = 33, step = 1,
-					set = function(info, value) E.db.general[ info[getn(info)] ] = value E:UpdateMedia() E:UpdateFontTemplates() end
-				},
 				font = {
-					order = 3,
+					order = 2,
 					type = "select", dialogControl = "LSM30_Font",
 					name = L["Default Font"],
 					desc = L["The font that the core of the UI will use."],
 					values = AceGUIWidgetLSMlists.font,
 					set = function(info, value) E.db.general[ info[getn(info)] ] = value E:UpdateMedia() E:UpdateFontTemplates() end,
 				},
-				applyFontToAll = {
+				fontSize = {
+					order = 3,
+					type = "range",
+					name = L["Font Size"],
+					desc = L["Set the font size for everything in UI. Note: This doesn't effect somethings that have their own seperate options (UnitFrame Font, Datatext Font, ect..)"],
+					min = 4, max = 33, step = 1,
+					set = function(info, value) E.db.general[ info[getn(info)] ] = value E:UpdateMedia() E:UpdateFontTemplates() end
+				},
+				fontStyle = {
 					order = 4,
+					type = "select",
+					name = L["Font Outline"],
+					values = {
+						["NONE"] = L["None"],
+						["OUTLINE"] = "OUTLINE",
+						["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
+						["THICKOUTLINE"] = "THICKOUTLINE"
+					},
+					set = function(info, value) E.db.general[ info[getn(info)] ] = value E:UpdateMedia() E:UpdateFontTemplates() end
+				},
+				applyFontToAll = {
+					order = 5,
 					type = "execute",
 					name = L["Apply Font To All"],
 					desc = L["Applies the font and font size settings throughout the entire user interface. Note: Some font size settings will be skipped due to them having a smaller font size by default."],
 					func = function() E:StaticPopup_Show("APPLY_FONT_WARNING") end
 				},
 				dmgfont = {
-					order = 5,
+					order = 6,
 					type = "select", dialogControl = "LSM30_Font",
 					name = L["CombatText Font"],
 					desc = L["The font that combat text will use. |cffFF0000WARNING: This requires a game restart or re-log for this change to take effect.|r"],
@@ -273,7 +297,7 @@ E.Options.args.general = {
 					set = function(info, value) E.private.general[ info[getn(info)] ] = value E:UpdateMedia() E:UpdateFontTemplates() E:StaticPopup_Show("PRIVATE_RL") end
 				},
 				namefont = {
-					order = 6,
+					order = 7,
 					type = "select", dialogControl = "LSM30_Font",
 					name = L["Name Font"],
 					desc = L["The font that appears on the text above players heads. |cffFF0000WARNING: This requires a game restart or re-log for this change to take effect.|r"],
@@ -282,7 +306,7 @@ E.Options.args.general = {
 					set = function(info, value) E.private.general[ info[getn(info)] ] = value E:UpdateMedia() E:UpdateFontTemplates() E:StaticPopup_Show("PRIVATE_RL") end
 				},
 				replaceBlizzFonts = {
-					order = 7,
+					order = 8,
 					type = "toggle",
 					name = L["Replace Blizzard Fonts"],
 					desc = L["Replaces the default Blizzard fonts on various panels and frames with the fonts chosen in the Media section of the ElvUI config. NOTE: Any font that inherits from the fonts ElvUI usually replaces will be affected as well if you disable this. Enabled by default."],
@@ -290,17 +314,17 @@ E.Options.args.general = {
 					set = function(info, value) E.private.general[ info[getn(info)] ] = value E:StaticPopup_Show("PRIVATE_RL") end
 				},
 				texturesHeaderSpacing = {
-					order = 8,
+					order = 9,
 					type = "description",
 					name = " "
 				},
 				texturesHeader = {
-					order = 9,
+					order = 10,
 					type = "header",
 					name = L["Textures"]
 				},
 				normTex = {
-					order = 10,
+					order = 11,
 					type = "select", dialogControl = "LSM30_Statusbar",
 					name = L["Primary Texture"],
 					desc = L["The texture that will be used mainly for statusbars."],
@@ -320,7 +344,7 @@ E.Options.args.general = {
 					end
 				},
 				glossTex = {
-					order = 11,
+					order = 12,
 					type = "select", dialogControl = "LSM30_Statusbar",
 					name = L["Secondary Texture"],
 					desc = L["This texture will get used on objects like chat windows and dropdown menus."],
@@ -333,7 +357,7 @@ E.Options.args.general = {
 					end
 				},
 				applyTextureToAll = {
-					order = 12,
+					order = 13,
 					type = "execute",
 					name = L["Apply Texture To All"],
 					desc = L["Applies the primary texture to all statusbars."],
@@ -343,19 +367,27 @@ E.Options.args.general = {
 						E:UpdateAll(true)
 					end
 				},
+				cropIcon = {
+					order = 14,
+					type = "toggle",
+					name = L["Crop Icons"],
+					desc = L["This is for Customized Icons in your Interface/Icons folder."],
+					get = function(info) return E.db.general[ info[getn(info)] ] end,
+					set = function(info, value) E.db.general[ info[getn(info)] ] = value; E:StaticPopup_Show("PRIVATE_RL") end
+				},
 				colorsHeaderSpacing = {
-					order = 13,
+					order = 15,
 					type = "description",
 					name = " "
 				},
 				colorsHeader = {
-					order = 14,
+					order = 16,
 					type = "header",
-					name = COLOR
+					name = L["Colors"]
 				},
 				bordercolor = {
+					order = 17,
 					type = "color",
-					order = 15,
 					name = L["Border Color"],
 					desc = L["Main border color of the UI."],
 					hasAlpha = false,
@@ -372,8 +404,8 @@ E.Options.args.general = {
 					end,
 				},
 				backdropcolor = {
+					order = 18,
 					type = "color",
-					order = 32,
 					name = L["Backdrop Color"],
 					desc = L["Main backdrop color of the UI."],
 					hasAlpha = false,
@@ -390,8 +422,8 @@ E.Options.args.general = {
 					end
 				},
 				backdropfadecolor = {
+					order = 19,
 					type = "color",
-					order = 33,
 					name = L["Backdrop Faded Color"],
 					desc = L["Backdrop color of transparent frames"],
 					hasAlpha = true,
@@ -409,8 +441,8 @@ E.Options.args.general = {
 					end
 				},
 				valuecolor = {
+					order = 20,
 					type = "color",
-					order = 34,
 					name = L["Value Color"],
 					desc = L["Color some texts use."],
 					hasAlpha = false,
@@ -429,7 +461,7 @@ E.Options.args.general = {
 			}
 		},
 		classCache = {
-			order = 6,
+			order = 4,
 			type = "group",
 			name = L["Class Cache"],
 			args = {
@@ -449,20 +481,8 @@ E.Options.args.general = {
 						CC:ToggleModule()
 					end
 				},
-				classCacheStoreInDB = {
-					order = 3,
-					type = "toggle",
-					name = L["Store cache in DB"],
-					desc = L["If cache stored in DB it will be available between game sessions but increase memory usage.\nIn other way it will be wiped on relog or UI reload."],
-					get = function(info) return E.db.general.classCacheStoreInDB end,
-					set = function(info, value)
-						E.db.general.classCacheStoreInDB = value
-						CC:SwitchCacheType()
-					end,
-					disabled = function() return not E.private.general.classCache end
-				},
 				classCacheRequestInfo = {
-					order = 4,
+					order = 3,
 					type = "toggle",
 					name = L["Request info for class cache"],
 					desc = L["Use LibWho to cache class info"],
@@ -472,41 +492,61 @@ E.Options.args.general = {
 					end,
 					disabled = function() return not E.private.general.classCache end
 				},
-				wipeClassCacheGlobal = {
-					order = 5,
-					type = "execute",
-					name = L["Wipe DB Cache"],
-					buttonElvUI = true,
-					func = function()
-						CC:WipeCache(true)
-						GameTooltip:Hide()
-					end,
-					disabled = function() return not CC:GetCacheSize(true) end
-				},
-				wipeClassCacheLocal = {
-					order = 6,
-					type = "execute",
-					name = L["Wipe Session Cache"],
-					buttonElvUI = true,
-					func = function()
-						CC:WipeCache()
-						GameTooltip:Hide()
-					end,
-					disabled = function() return not CC:GetCacheSize() end
+				cache = {
+					order = 4,
+					type = "group",
+					name = L["Cache"],
+					guiInline = true,
+					args = {
+						classCacheStoreInDB = {
+							order = 1,
+							type = "toggle",
+							name = L["Store cache in DB"],
+							desc = L["If cache stored in DB it will be available between game sessions but it will increase memory usage.\nIn other way it will be wiped on relog or UI reload."],
+							get = function(info) return E.db.general.classCacheStoreInDB end,
+							set = function(info, value)
+								E.db.general.classCacheStoreInDB = value
+								CC:SwitchCacheType()
+							end,
+							disabled = function() return not E.private.general.classCache end
+						},
+						wipeClassCacheGlobal = {
+							order = 2,
+							type = "execute",
+							name = L["Wipe DB Cache"],
+							buttonElvUI = true,
+							func = function()
+								CC:WipeCache(true)
+								GameTooltip:Hide()
+							end,
+							disabled = function() return not CC:GetCacheSize(true) end
+						},
+						wipeClassCacheLocal = {
+							order = 3,
+							type = "execute",
+							name = L["Wipe Session Cache"],
+							buttonElvUI = true,
+							func = function()
+								CC:WipeCache()
+								GameTooltip:Hide()
+							end,
+							disabled = function() return not CC:GetCacheSize() end
+						}
+					}
 				}
 			}
 		},
 		--[[totems = {
-			order = 7,
+			order = 5,
 			type = "group",
-			name = TUTORIAL_TITLE47,
+			name = L["Totem Bar"],
 			get = function(info) return E.db.general.totems[ info[getn(info)] ] end,
 			set = function(info, value) E.db.general.totems[ info[getn(info)] ] = value E:GetModule("Totems"):PositionAndSize() end,
 			args = {
 				header = {
 					order = 1,
 					type = "header",
-					name = TUTORIAL_TITLE47
+					name = L["Totem Bar"]
 				},
 				enable = {
 					order = 2,
@@ -619,7 +659,7 @@ E.Options.args.general = {
 			}
 		},
 		chatBubbles = {
-			order = 9,
+			order = 6,
 			type = "group",
 			name = L["Chat Bubbles"],
 			args = {
@@ -639,7 +679,7 @@ E.Options.args.general = {
 						["backdrop"] = L["Skin Backdrop"],
 						["nobackdrop"] = L["Remove Backdrop"],
 						["backdrop_noborder"] = L["Skin Backdrop (No Borders)"],
-						["disabled"] = DISABLE
+						["disabled"] = L["Disable"]
 					}
 				},
 				name = {
@@ -654,7 +694,7 @@ E.Options.args.general = {
 				spacer = {
 					order = 4,
 					type = "description",
-					name = " ",
+					name = ""
 				},
 				font = {
 					order = 5,
@@ -669,7 +709,7 @@ E.Options.args.general = {
 				fontSize = {
 					order = 6,
 					type = "range",
-					name = FONT_SIZE,
+					name = L["Font Size"],
 					get = function(info) return E.private.general.chatBubbleFontSize end,
 					set = function(info, value) E.private.general.chatBubbleFontSize = value E:StaticPopup_Show("PRIVATE_RL") end,
 					min = 4, max = 33, step = 1,
@@ -683,7 +723,7 @@ E.Options.args.general = {
 					set = function(info, value) E.private.general.chatBubbleFontOutline = value E:StaticPopup_Show("PRIVATE_RL") end,
 					disabled = function() return E.private.general.chatBubbles == "disabled" end,
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["OUTLINE"] = "OUTLINE",
 						["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 						["THICKOUTLINE"] = "THICKOUTLINE",
@@ -691,47 +731,37 @@ E.Options.args.general = {
 				}
 			}
 		},
-		watchFrame = {
-			order = 10,
-			type = "group",
-			name = L["Watch Frame"],
-			get = function(info) return E.db.general[ info[getn(info)] ] end,
-			set = function(info, value) E.db.general[ info[getn(info)] ] = value end,
-			args = {
-				watchFrameHeader = {
-					order = 1,
-					type = "header",
-					name = L["Watch Frame"],
-				},
-				watchFrameHeight = {
-					order = 2,
-					type = "range",
-					name = L["Watch Frame Height"],
-					desc = L["Height of the watch tracker. Increase size to be able to see more objectives."],
-					min = 400, max = E.screenheight, step = 1,
-					set = function(info, value) E.db.general[ info[getn(info)] ] = value E:GetModule("Blizzard"):SetWatchFrameHeight() end
-				}
-			}
-		},
 		--[[threatGroup = {
-			order = 11,
+			order = 7,
 			type = "group",
 			name = L["Threat"],
 			args = {
 				threatHeader = {
-					order = 40,
+					order = 1,
 					type = "header",
 					name = L["Threat"]
 				},
+				threatLibStatus = {
+					order = 2,
+					type = "description",
+					image = function() return E:GetModule("Threat"):GetLibStatus() and READY_CHECK_READY_TEXTURE or READY_CHECK_NOT_READY_TEXTURE, 30, 26 end,
+					name = function()
+						if E:GetModule("Threat"):GetLibStatus() then
+							return L["Library Threat-2.0 found."]
+						else
+							return L["Library Threat-2.0 not found. If you want to use Threat module install Omen or separate Threat-2.0 library."]
+						end
+					end
+				},
 				threatEnable = {
-					order = 41,
+					order = 3,
 					type = "toggle",
 					name = L["Enable"],
 					get = function(info) return E.db.general.threat.enable end,
-					set = function(info, value) E.db.general.threat.enable = value E:GetModule("Threat"):ToggleEnable()end
+					set = function(info, value) E.db.general.threat.enable = value E:GetModule("Threat"):ToggleEnable() end
 				},
 				threatPosition = {
-					order = 42,
+					order = 4,
 					type = "select",
 					name = L["Position"],
 					desc = L["Adjust the position of the threat bar to either the left or right datatext panels."],
@@ -740,17 +770,48 @@ E.Options.args.general = {
 						["RIGHTCHAT"] = L["Right Chat"]
 					},
 					get = function(info) return E.db.general.threat.position end,
-					set = function(info, value) E.db.general.threat.position = value E:GetModule("Threat"):UpdatePosition() end
+					set = function(info, value) E.db.general.threat.position = value E:GetModule("Threat"):UpdatePosition() end,
+					disabled = function() return not E.db.general.threat.enable end
+				},
+				spacer = {
+					order = 5,
+					type = "description",
+					name = ""
+				},
+				threatTextfont = {
+					order = 6,
+					type = "select", dialogControl = "LSM30_Font",
+					name = L["Font"],
+					values = AceGUIWidgetLSMlists.font,
+					get = function(info) return E.db.general.threat.textfont end,
+					set = function(info, value) E.db.general.threat.textfont = value E:GetModule("Threat"):UpdatePosition() end,
+					disabled = function() return not E.db.general.threat.enable end
 				},
 				threatTextSize = {
-					order = 43,
-					name = FONT_SIZE,
+					order = 7,
 					type = "range",
+					name = L["Font Size"],
 					min = 6, max = 22, step = 1,
 					get = function(info) return E.db.general.threat.textSize end,
-					set = function(info, value) E.db.general.threat.textSize = value E:GetModule("Threat"):UpdatePosition() end
+					set = function(info, value) E.db.general.threat.textSize = value E:GetModule("Threat"):UpdatePosition() end,
+					disabled = function() return not E.db.general.threat.enable end
+				},
+				threatTextOutline = {
+					order = 8,
+					type = "select",
+					name = L["Font Outline"],
+					desc = L["Set the font outline."],
+					values = {
+						["NONE"] = L["None"],
+						["OUTLINE"] = "OUTLINE",
+						["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
+						["THICKOUTLINE"] = "THICKOUTLINE"
+					},
+					get = function(info) return E.db.general.threat.textOutline end,
+					set = function(info, value) E.db.general.threat.textOutline = value E:GetModule("Threat"):UpdatePosition() end,
+					disabled = function() return not E.db.general.threat.enable end
 				}
 			}
 		}--]]
 	}
-}
+}

ElvUI_Config/Locales/Chinese_Config.lua

@@ -387,13 +387,13 @@ L["AFK Mode"] = "离开模式"
 L["Announce Interrupts"] = "打断通告"
 L["Announce when you interrupt a spell to the specified chat channel."] = "在指定对话频道通知打断信息"
 L["Attempt to support eyefinity/nvidia surround."] = "尝试支持eyefinity/nvidia surround"
-L["Auto Greed/DE"] = "自动贪婪/分解"
+L["Auto Greed"] = "自动贪婪/分解"
 L["Auto Repair"] = "自动修理"
 L["Auto Scale"] = "自动缩放"
 L["Automatically accept invites from guild/friends."] = "自动接受工会或好友的邀请"
 L["Automatically repair using the following method when visiting a merchant."] = "使用以下方式来自动修理装备"
 L["Automatically scale the User Interface based on your screen resolution"] = "依据屏幕分辨率度自动缩放介面"
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "当你满级时, 自动选择贪婪或分解绿色物品"
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "当你满级时, 自动选择贪婪或分解绿色物品"
 L["Automatically vendor gray items when visiting a vendor."] = "当访问商人时自动出售灰色物品"
 L["Bottom Panel"] = "底部面板"
 L["Chat Bubbles Style"] = "聊天气泡样式"

ElvUI_Config/Locales/English_Config.lua

@@ -376,13 +376,13 @@ L["AFK Mode"] = true;
 L["Announce Interrupts"] = true;
 L["Announce when you interrupt a spell to the specified chat channel."] = true;
 L["Attempt to support eyefinity/nvidia surround."] = true;
-L["Auto Greed/DE"] = true;
+L["Auto Greed"] = true;
 L["Auto Repair"] = true;
 L["Auto Scale"] = true;
 L["Automatically accept invites from guild/friends."] = true;
 L["Automatically repair using the following method when visiting a merchant."] = true;
 L["Automatically scale the User Interface based on your screen resolution"] = true;
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = true;
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = true;
 L["Automatically vendor gray items when visiting a vendor."] = true;
 L["Bottom Panel"] = true;
 L["Chat Bubbles Style"] = true;

ElvUI_Config/Locales/French_Config.lua

@@ -387,13 +387,13 @@ L["AFK Mode"] = "Mode AFK"
 L["Announce Interrupts"] = "Annoncer les Interruptions"
 L["Announce when you interrupt a spell to the specified chat channel."] = "Annonce quand vous interrompez un sort dans le canal de chat spécifié."
 L["Attempt to support eyefinity/nvidia surround."] = "Tente de supporter eyefinity/nvidia surround."
-L["Auto Greed/DE"] = "Dez / Cupidité Auto"
+L["Auto Greed"] = "Dez / Cupidité Auto"
 L["Auto Repair"] = "Réparation automatique"
 L["Auto Scale"] = "Échelle Automatique"
 L["Automatically accept invites from guild/friends."] = "Accepter automatiquement les invitations venant d'amis / joueurs de la Guilde."
 L["Automatically repair using the following method when visiting a merchant."] = "Répare automatiquement votre équipement chez le marchand selon le mode de réparation sélectionné."
 L["Automatically scale the User Interface based on your screen resolution"] = "Redimensionne automatiquement l'Interface Utilisateur en fonction de votre résolution d'écran."
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "Choisi automatiquement la cupidité ou le désenchantement (quand il est disponible) sur les objets inhabituels (vert). Ceci ne fonctionne que si vous êtes au niveau maximum."
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "Choisi automatiquement la cupidité ou le désenchantement (quand il est disponible) sur les objets inhabituels (vert). Ceci ne fonctionne que si vous êtes au niveau maximum."
 L["Automatically vendor gray items when visiting a vendor."] = "Vendre automatiquement les objets gris quand vous rendez visite à un marchand."
 L["Bottom Panel"] = "Bandeau en bas"
 L["Chat Bubbles Style"] = "Style des bulles de discussion"

ElvUI_Config/Locales/German_Config.lua

@@ -387,13 +387,13 @@ L["AFK Mode"] = "AFK Modus"
 L["Announce Interrupts"] = "Unterbrechungen ankündigen"
 L["Announce when you interrupt a spell to the specified chat channel."] = "Melde über den angegebenen Chatkanal einen unterbrochenen Zauber."
 L["Attempt to support eyefinity/nvidia surround."] = "Versucht Eyefinity/NVIDIA Surround zu unterstützen"
-L["Auto Greed/DE"] = "Auto-Gier/DE"
+L["Auto Greed"] = "Auto-Gier/DE"
 L["Auto Repair"] = "Auto-Reparatur"
 L["Auto Scale"] = "Auto-Skalierung"
 L["Automatically accept invites from guild/friends."] = "Automatisch Einladungen von Gildenmitgliedern/Freunden akzeptieren"
 L["Automatically repair using the following method when visiting a merchant."] = "Repariere automatisch deine Ausrüstungsgegenstände, wenn du eine der folgenden Methoden auswählst."
 L["Automatically scale the User Interface based on your screen resolution"] = "Automatische Skalierung des Interfaces, angepasst an deine Bildschirmeinstellung"
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "Automatisch Gier oder Entzauberung auf Gegenstände von grüner Qualität wählen (sofern verfügbar). Das funktioniert nur, wenn du die maximale Stufe erreicht hast."
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "Automatisch Gier oder Entzauberung auf Gegenstände von grüner Qualität wählen (sofern verfügbar). Das funktioniert nur, wenn du die maximale Stufe erreicht hast."
 L["Automatically vendor gray items when visiting a vendor."] = "Automatischer Verkauf von grauen Gegenständen bei einem Händlerbesuch."
 L["Bottom Panel"] = "Untere Leiste"
 L["Chat Bubbles Style"] = "Sprechblasen Stil"

ElvUI_Config/Locales/Korean_Config.lua

@@ -435,13 +435,13 @@ L["AFK Mode"] = "자리비움 모드"
 L["Announce Interrupts"] = "차단 성공시 알림"
 L["Announce when you interrupt a spell to the specified chat channel."] = "주문 차단에 성공하면 여기에서 설정한 채널로 차단성공을 알립니다."
 L["Attempt to support eyefinity/nvidia surround."] = "다중모니터 기술인 아이피니티 기능이나 nvidia 서라운드 기능 지원을 적용합니다."
-L["Auto Greed/DE"] = "자동 차비/추출 선택"
+L["Auto Greed"] = "자동 차비/추출 선택"
 L["Auto Repair"] = "자동 수리"
 L["Auto Scale"] = "UI크기 자동조절"
 L["Automatically accept invites from guild/friends."] = "길드원이나 친구가 플레이어를 파티를 초대하면 자동으로 수락합니다."
 L["Automatically repair using the following method when visiting a merchant."] = "수리가 가능한 상점을 열면 이 옵션에서 선택한 자금으로 장비를 자동 수리합니다."
 L["Automatically scale the User Interface based on your screen resolution"] = "현재의 화면 해상도에 따라 자동으로 UI의 크기를 조절합니다."
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "녹템 주사위창이 뜨면 자동으로 차비나 마력추출을 선택합니다. 이 기능은 오로지 만렙 캐릭터에서만 동작합니다."
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "녹템 주사위창이 뜨면 자동으로 차비나 마력추출을 선택합니다. 이 기능은 오로지 만렙 캐릭터에서만 동작합니다."
 L["Automatically vendor gray items when visiting a vendor."] = "상점이 열리면 잡동사니를 자동으로 판매합니다."
 L["Bottom Panel"] = "하단 패널 표시"
 L["Chat Bubbles Style"] = "말풍선 디자인"

ElvUI_Config/Locales/Portuguese_Config.lua

@@ -387,13 +387,13 @@ L["AFK Mode"] = true;
 L["Announce Interrupts"] = "Anunciar Interrupções"
 L["Announce when you interrupt a spell to the specified chat channel."] = "Anunciar quando interromper um feitiço para o canal de bate-papo especificado."
 L["Attempt to support eyefinity/nvidia surround."] = true;
-L["Auto Greed/DE"] = "Escolher Ganância/Desencantar automaticamente"
+L["Auto Greed"] = "Escolher Ganância/Desencantar automaticamente"
 L["Auto Repair"] = "Reparar automaticamente"
 L["Auto Scale"] = "Dimensionar automaticamente"
 L["Automatically accept invites from guild/friends."] = "Aceitar convites de pessoas da lista de amigos ou guilda automaticamente"
 L["Automatically repair using the following method when visiting a merchant."] = "Reparar automaticamente usando o seguinte método ao visitar um vendedor."
 L["Automatically scale the User Interface based on your screen resolution"] = "Dimensionar automaticamente a interface com base na sua resolução do ecrã (monitor)."
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "Selecionar automaticamente ganância ou desencantar (quando disponível) em itens de qualidade verde. Funciona apenas se estiver no nível máximo."
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "Selecionar automaticamente ganância ou desencantar (quando disponível) em itens de qualidade verde. Funciona apenas se estiver no nível máximo."
 L["Automatically vendor gray items when visiting a vendor."] = "Vender itens cinzentos automaticamente quando visitar um vendedor"
 L["Bottom Panel"] = "Painel Infeior"
 L["Chat Bubbles Style"] = "Estilo dos Balões de Fala"

ElvUI_Config/Locales/Russian_Config.lua

@@ -387,13 +387,13 @@ L["AFK Mode"] = "Режим АФК"
 L["Announce Interrupts"] = "Объявлять о прерываниях"
 L["Announce when you interrupt a spell to the specified chat channel."] = "Объявлять о прерванных Вами заклинаниях в указанный канал чата."
 L["Attempt to support eyefinity/nvidia surround."] = "Пытаться поддерживать eyefinity/nvidia surround"
-L["Auto Greed/DE"] = "Авто. не откажусь/распылить"
+L["Auto Greed"] = "Авто. не откажусь/распылить"
 L["Auto Repair"] = "Автоматический ремонт"
 L["Auto Scale"] = "Автоматический масштаб"
 L["Automatically accept invites from guild/friends."] = "Автоматически принимать приглашения в группу от друзей и гильдии."
 L["Automatically repair using the following method when visiting a merchant."] = "Автоматически чинить экипировку за счет выбранного источника при посещении торговца."
 L["Automatically scale the User Interface based on your screen resolution"] = "Автоматически масштабировать UI в зависимости от вашего разрешения"
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "Автоматически выбирать \"не откажусь\" или \"распылить\" (когда доступно) при розыгрыше предметов зеленого качества. Эта опция работает, только если вы максимального уровня."
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "Автоматически выбирать \"не откажусь\" или \"распылить\" (когда доступно) при розыгрыше предметов зеленого качества. Эта опция работает, только если вы максимального уровня."
 L["Automatically vendor gray items when visiting a vendor."] = "Автоматически продавать предметы серого качества при посещении торговца."
 L["Bottom Panel"] = "Нижняя панель"
 L["Chat Bubbles Style"] = "Стиль облачков сообщений"

ElvUI_Config/Locales/Spanish_Config.lua

@@ -387,13 +387,13 @@ L["AFK Mode"] = true;
 L["Announce Interrupts"] = "Anunciar Interrupciones"
 L["Announce when you interrupt a spell to the specified chat channel."] = "Anunciar cuando interrumpas un hechizo en el canal especificado."
 L["Attempt to support eyefinity/nvidia surround."] = true;
-L["Auto Greed/DE"] = "Codicia/Desencantar Automático"
+L["Auto Greed"] = "Codicia/Desencantar Automático"
 L["Auto Repair"] = "Reparación Automática"
 L["Auto Scale"] = "Escalado Automático"
 L["Automatically accept invites from guild/friends."] = "Aceptar de forma automática invitaciones de la hermandad/amigos."
 L["Automatically repair using the following method when visiting a merchant."] = "Repara de forma automática usando el siguiente método cuando visites un comerciante."
 L["Automatically scale the User Interface based on your screen resolution"] = "Escala de forma automática la interfaz de usuario dependiendo de la resolución de pantalla"
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "Tira codicia o desencanta (si se puede) automáticamente para los objetos verdes. Esto sólo funciona si ya tienes el nivel máximo."
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "Tira codicia o desencanta (si se puede) automáticamente para los objetos verdes. Esto sólo funciona si ya tienes el nivel máximo."
 L["Automatically vendor gray items when visiting a vendor."] = "Vender automáticamente los objetos grises al visitar al vendedor."
 L["Bottom Panel"] = "Panel Inferior"
 L["Chat Bubbles Style"] = true;

ElvUI_Config/Locales/Taiwanese_Config.lua

@@ -387,13 +387,13 @@ L["AFK Mode"] = "離開模式"
 L["Announce Interrupts"] = "斷法通告"
 L["Announce when you interrupt a spell to the specified chat channel."] = "在指定對話頻道通知斷法信息."
 L["Attempt to support eyefinity/nvidia surround."] = true;
-L["Auto Greed/DE"] = "自動貪婪/分解"
+L["Auto Greed"] = "自動貪婪/分解"
 L["Auto Repair"] = "自動修裝"
 L["Auto Scale"] = "自動縮放"
 L["Automatically accept invites from guild/friends."] = "自動接受公會成員/朋友的組隊邀請."
 L["Automatically repair using the following method when visiting a merchant."] = "與商人對話時，透過下列方式自動修復裝備."
 L["Automatically scale the User Interface based on your screen resolution"] = "依螢幕解析度自動縮放 UI 介面."
-L["Automatically select greed or disenchant (when available) on green quality items. This will only work if you are the max level."] = "當你的等級達到滿級時, 自動選擇貪婪或分解綠色物品."
+L["Automatically select greed (when available) on green quality items. This will only work if you are the max level."] = "當你的等級達到滿級時, 自動選擇貪婪或分解綠色物品."
 L["Automatically vendor gray items when visiting a vendor."] = "當訪問商人時自動出售灰色物品."
 L["Bottom Panel"] = "底部面板"
 L["Chat Bubbles Style"] = "聊天氣泡樣式"

ElvUI_Config/Maps.lua

@@ -182,7 +182,7 @@ E.Options.args.maps = {
 							set = function(info, value) E.db.general.minimap.locationFontOutline = value; MM:Update_ZoneText(); end,
 							disabled = function() return not E.private.general.minimap.enable; end,
 							values = {
-								["NONE"] = NONE,
+								["NONE"] = L["None"],
 								["OUTLINE"] = "OUTLINE",
 								["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 								["THICKOUTLINE"] = "THICKOUTLINE"

ElvUI_Config/ModuleControl.lua

@@ -6,11 +6,6 @@ local CP = E:GetModule("CopyProfile");
 --Cache global variables
 --Lua functions
 local getn = table.getn
---WoW API / Variables
-local XPBAR_LABEL = XPBAR_LABEL
-local REPUTATION = REPUTATION
-local MINIMAP_LABEL = MINIMAP_LABEL
-local COLOR = COLOR
 
 --Actionbars
 local function CreateActionbarsConfig()
@@ -133,7 +128,7 @@ local function CreateDatatbarsConfig()
 	config.args.experience = {
 		order = 2,
 		type = "toggle",
-		name = XPBAR_LABEL,
+		name = L["XP Bar"],
 		get = function(info) return E.global.profileCopy.databars[ info[getn(info)] ] end,
 		set = function(info, value) E.global.profileCopy.databars[ info[getn(info)] ] = value end
 	}

ElvUI_Config/Nameplates.lua

@@ -832,7 +832,7 @@ E.Options.args.nameplate = {
 							name = L["Font Outline"],
 							desc = L["Set the font outline."],
 							values = {
-								["NONE"] = NONE,
+								["NONE"] = L["None"],
 								["OUTLINE"] = "OUTLINE",
 								["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 								["THICKOUTLINE"] = "THICKOUTLINE"

ElvUI_Config/Tooltip.lua

@@ -93,7 +93,7 @@ E.Options.args.tooltip = {
 						["BAGS_ONLY"] = L["Bags Only"],
 						["BANK_ONLY"] = L["Bank Only"],
 						["BOTH"] = L["Both"],
-						["NONE"] = NONE
+						["NONE"] = L["None"]
 					}
 				},
 				colorAlpha = {
@@ -122,7 +122,7 @@ E.Options.args.tooltip = {
 							name = L["Font Outline"],
 							type = "select",
 							values = {
-								["NONE"] = NONE,
+								["NONE"] = L["None"],
 								["OUTLINE"] = "OUTLINE",
 								["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 								["THICKOUTLINE"] = "THICKOUTLINE"
@@ -304,7 +304,7 @@ E.Options.args.tooltip = {
 					type = "select",
 					name = L["Font Outline"],
 					values = {
-						["NONE"] = NONE,
+						["NONE"] = L["None"],
 						["OUTLINE"] = "OUTLINE",
 						["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 						["THICKOUTLINE"] = "THICKOUTLINE"

ElvUI_Config/UnitFrames.lua

@@ -50,7 +50,7 @@ local threatValues = {
 	["ICONRIGHT"] = L["Icon: RIGHT"],
 	["ICONTOP"] = L["Icon: TOP"],
 	["ICONBOTTOM"] = L["Icon: BOTTOM"],
-	["NONE"] = NONE
+	["NONE"] = L["None"]
 }
 
 local petAnchors = {
@@ -1190,7 +1190,7 @@ local function GetOptionsTable_RaidDebuff(updateFunc, groupName)
 				type = "select",
 				name = L["Font Outline"],
 				values = {
-					["NONE"] = NONE,
+					["NONE"] = L["None"],
 					["OUTLINE"] = "OUTLINE",
 					["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 					["THICKOUTLINE"] = "THICKOUTLINE"
@@ -1501,7 +1501,7 @@ local function CreateCustomTextGroup(unit, objectName)
 				name = L["Font Outline"],
 				desc = L["Set the font outline."],
 				values = {
-					["NONE"] = NONE,
+					["NONE"] = L["None"],
 					["OUTLINE"] = "OUTLINE",
 					["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 					["THICKOUTLINE"] = "THICKOUTLINE"
@@ -1838,7 +1838,7 @@ E.Options.args.unitframe = {
 							name = L["Debuff Highlighting"],
 							desc = L["Color the unit healthbar if there is a debuff that can be dispelled by you."],
 							values = {
-								["NONE"] = NONE,
+								["NONE"] = L["None"],
 								["GLOW"] = L["Glow"],
 								["FILL"] = L["Fill"]
 							}
@@ -1862,7 +1862,7 @@ E.Options.args.unitframe = {
 							name = L["Blacklist Modifier"],
 							desc = L["You need to hold this modifier down in order to blacklist an aura by right-clicking the icon. Set to None to disable the blacklist functionality."],
 							values = {
-								["NONE"] = NONE,
+								["NONE"] = L["None"],
 								["SHIFT"] = SHIFT_KEY,
 								["ALT"] = ALT_KEY,
 								["CTRL"] = CTRL_KEY
@@ -1927,7 +1927,7 @@ E.Options.args.unitframe = {
 									name = L["Font Outline"],
 									desc = L["Set the font outline."],
 									values = {
-										["NONE"] = NONE,
+										["NONE"] = L["None"],
 										["OUTLINE"] = "OUTLINE",
 										["MONOCHROMEOUTLINE"] = "MONOCROMEOUTLINE",
 										["THICKOUTLINE"] = "THICKOUTLINE"