Update zhTW locales

ElvUI/ElvUI-Mainline.toc → ElvUI/ElvUI_Mainline.toc

@@ -1,4 +1,4 @@
-## Interface: 90100
+## Interface: 90105
 ## Author: Elv, Simpy
 ## Version: 12.44
 ## Title: |cff1784d1ElvUI|r

ElvUI/Modules/DataTexts/Guild.lua

@@ -11,7 +11,6 @@ local GetGuildInfo = GetGuildInfo
 local GetGuildRosterInfo = GetGuildRosterInfo
 local GetGuildRosterMOTD = GetGuildRosterMOTD
 local GetMouseFocus = GetMouseFocus
-local GetNumGuildApplicants = GetNumGuildApplicants
 local GetNumGuildMembers = GetNumGuildMembers
 local GetQuestDifficultyColor = GetQuestDifficultyColor
 local C_GuildInfo_GuildRoster = C_GuildInfo.GuildRoster
@@ -234,10 +233,9 @@ local function OnEnter(_, _, noUpdate)
 	SortGuildTable(shiftDown)
 
 	local guildName, guildRank = GetGuildInfo('player')
-	local applicants = GetNumGuildApplicants()
 
 	if guildName and guildRank then
-		DT.tooltip:AddDoubleLine(format(guildInfoString, guildName), format(guildInfoString2..(applicants > 0 and ' |cFFFFFFFF(|cff33ff33%d|r|cFFFFFFFF)|r' or ''), online, total, applicants), tthead.r, tthead.g, tthead.b, tthead.r, tthead.g, tthead.b)
+		DT.tooltip:AddDoubleLine(format(guildInfoString, guildName), format(guildInfoString2, online, total), tthead.r, tthead.g, tthead.b, tthead.r, tthead.g, tthead.b)
 		DT.tooltip:AddLine(guildRank, unpack(tthead))
 	end
 

ElvUI/Modules/Skins/Blizzard/BlizzardOptions.lua

@@ -472,9 +472,9 @@ function S:BlizzardOptions()
 	S:HandleButton(_G.AudioOptionsVoicePanel.TestInputDevice.ToggleTest)
 
 	local VUMeter = _G.AudioOptionsVoicePanelTestInputDevice.VUMeter
-	VUMeter:SetBackdrop()
 	VUMeter.Status:CreateBackdrop()
 	VUMeter.Status:SetStatusBarTexture(E.media.normTex)
+	VUMeter.NineSlice:Hide()
 	E:RegisterStatusBar(VUMeter.Status)
 
 	-- PushToTalk KeybindButton - Wow 8.0

ElvUI/Modules/Skins/Blizzard/Collectables.lua

@@ -1,5 +1,6 @@
 local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
 local S = E:GetModule('Skins')
+local TT = E:GetModule('Tooltip')
 
 local _G = _G
 local select = select
@@ -317,23 +318,7 @@ local function SkinPetFrame()
 	_G.PetJournalPetCardPetInfoIcon:SetTexCoord(unpack(E.TexCoords))
 
 	if E.private.skins.blizzard.tooltip then
-		local tt = _G.PetJournalPrimaryAbilityTooltip
-		if tt.Delimiter1 then
-			tt.Delimiter1:SetTexture()
-			tt.Delimiter2:SetTexture()
-		end
-
-		tt.Background:SetTexture()
-		tt.BorderTop:SetTexture()
-		tt.BorderTopLeft:SetTexture()
-		tt.BorderTopRight:SetTexture()
-		tt.BorderLeft:SetTexture()
-		tt.BorderRight:SetTexture()
-		tt.BorderBottom:SetTexture()
-		tt.BorderBottomRight:SetTexture()
-		tt.BorderBottomLeft:SetTexture()
-
-		tt:SetTemplate('Transparent')
+		TT:SetStyle(_G.PetJournalPrimaryAbilityTooltip)
 	end
 
 	for i=1, 6 do

ElvUI/Modules/Skins/Blizzard/Communities.lua

@@ -340,8 +340,8 @@ function S:Blizzard_Communities()
 	CommunitiesFrame.GuildMemberDetailFrame:ClearAllPoints()
 	CommunitiesFrame.GuildMemberDetailFrame:Point('TOPLEFT', CommunitiesFrame, 'TOPRIGHT', -1, -30)
 
-	CommunitiesFrame.GuildMemberDetailFrame.NoteBackground:SetTemplate('Transparent')
-	CommunitiesFrame.GuildMemberDetailFrame.OfficerNoteBackground:SetTemplate('Transparent')
+	CommunitiesFrame.GuildMemberDetailFrame.NoteBackground.NineSlice:SetTemplate('Transparent')
+	CommunitiesFrame.GuildMemberDetailFrame.OfficerNoteBackground.NineSlice:SetTemplate('Transparent')
 	S:HandleCloseButton(CommunitiesFrame.GuildMemberDetailFrame.CloseButton)
 	S:HandleButton(CommunitiesFrame.GuildMemberDetailFrame.RemoveButton)
 	S:HandleButton(CommunitiesFrame.GuildMemberDetailFrame.GroupInviteButton)
@@ -591,12 +591,6 @@ function S:Blizzard_Communities()
 	closeButton = select(3, _G.CommunitiesGuildLogFrame:GetChildren()) -- swap local variable
 	S:HandleButton(closeButton)
 
-	-- Recruitment Info
-	local RecruitmentFrame = _G.CommunitiesGuildRecruitmentFrame
-	RecruitmentFrame:StripTextures()
-	RecruitmentFrame:SetTemplate('Transparent')
-	_G.CommunitiesGuildRecruitmentFrameInset:StripTextures(false)
-
 	-- Recruitment Dialog
 	local RecruitmentDialog = _G.CommunitiesFrame.RecruitmentDialog
 	RecruitmentDialog:StripTextures()
@@ -614,43 +608,6 @@ function S:Blizzard_Communities()
 	S:HandleButton(RecruitmentDialog.Cancel)
 	S:HandleScrollBar(RecruitmentDialog.RecruitmentMessageFrame.RecruitmentMessageInput.ScrollBar)
 
-	-- CheckBoxes
-	local CommunitiesGuildRecruitmentFrameRecruitment = _G.CommunitiesGuildRecruitmentFrameRecruitment
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.InterestFrame.QuestButton)
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.InterestFrame.DungeonButton)
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.InterestFrame.RaidButton)
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.InterestFrame.PvPButton)
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.InterestFrame.RPButton)
-
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.AvailabilityFrame.WeekdaysButton)
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.AvailabilityFrame.WeekendsButton)
-
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.RolesFrame.TankButton.checkButton)
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.RolesFrame.HealerButton.checkButton)
-	S:HandleCheckBox(CommunitiesGuildRecruitmentFrameRecruitment.RolesFrame.DamagerButton.checkButton)
-
-	S:HandleCloseButton(_G.CommunitiesGuildRecruitmentFrameCloseButton)
-
-	S:HandleButton(CommunitiesGuildRecruitmentFrameRecruitment.ListGuildButton)
-
-	-- Tabs
-	for i = 1, 2 do
-		S:HandleTab(_G['CommunitiesGuildRecruitmentFrameTab'..i])
-	end
-
-	CommunitiesGuildRecruitmentFrameRecruitment.CommentFrame.CommentInputFrame:StripTextures()
-	S:HandleEditBox(CommunitiesGuildRecruitmentFrameRecruitment.CommentFrame.CommentInputFrame)
-
-	-- Recruitment Request
-	local CommunitiesGuildRecruitmentFrameApplicants = _G.CommunitiesGuildRecruitmentFrameApplicants
-	S:HandleButton(CommunitiesGuildRecruitmentFrameApplicants.InviteButton)
-	S:HandleButton(CommunitiesGuildRecruitmentFrameApplicants.MessageButton)
-	S:HandleButton(CommunitiesGuildRecruitmentFrameApplicants.DeclineButton)
-
-	for i = 1, 5 do
-		_G['CommunitiesGuildRecruitmentFrameApplicantsContainerButton'..i]:SetBackdrop()
-	end
-
 	-- Notification Settings Dialog
 	local NotificationSettings = _G.CommunitiesFrame.NotificationSettingsDialog
 	NotificationSettings:StripTextures()

ElvUI/Modules/Skins/Blizzard/Debug.lua

@@ -52,8 +52,7 @@ end
 local function SkinTableAttributeDisplay(frame)
 	frame:StripTextures()
 	frame:SetTemplate('Transparent')
-	frame.ScrollFrameArt:StripTextures()
-	frame.ScrollFrameArt:SetTemplate('Transparent')
+	frame.ScrollFrameArt.NineSlice:SetTemplate('Transparent')
 	S:HandleCloseButton(frame.CloseButton)
 	frame.OpenParentButton:ClearAllPoints()
 	frame.OpenParentButton:Point('TOPLEFT', frame, 'TOPLEFT', 2, -2)

ElvUI/Modules/Skins/Blizzard/Garrison.lua

@@ -622,24 +622,19 @@ end
 local function SkinFollowerTooltip(frame)
 	if not frame then return end
 
-	S:HandleTooltipBorderedFrame(frame)
+	frame.NineSlice:SetTemplate('Transparent')
 end
 
 local function SkinAbilityTooltip(frame)
 	if not frame then return end
 
-	for i = 1, 9 do
-		select(i, frame:GetRegions()):Hide()
-	end
-
-	local icon = frame.Icon
-	icon:SetTexCoord(unpack(E.TexCoords))
 	if not frame.border then
 		frame.border = CreateFrame('Frame', nil, frame)
 		S:HandleIcon(frame.Icon, frame.border)
 	end
 
-	frame:SetTemplate('Transparent')
+	frame.Icon:SetTexCoord(unpack(E.TexCoords))
+	frame.NineSlice:SetTemplate('Transparent')
 end
 
 function S:GarrisonTooltips()

ElvUI/Modules/Skins/Blizzard/GuildBank.lua

@@ -4,73 +4,74 @@ local S = E:GetModule('Skins')
 local _G = _G
 local unpack = unpack
 
+local NUM_SLOTS_PER_GUILDBANK_GROUP = 14
+local NUM_GUILDBANK_ICONS_PER_ROW = 10
+local NUM_GUILDBANK_ICON_ROWS = 9
+local NUM_GUILDBANK_COLUMNS = 7
+local NUM_GUILDBANK_ICONS_SHOWN = NUM_GUILDBANK_ICONS_PER_ROW * NUM_GUILDBANK_ICON_ROWS
+
 function S:Blizzard_GuildBankUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.gbank) then return end
 
 	_G.GuildBankFrame:StripTextures()
 	_G.GuildBankFrame:SetTemplate('Transparent')
 	S:HandleCloseButton(_G.GuildBankFrame.CloseButton)
+	_G.GuildBankFrame.Emblem:Kill()
+	_G.GuildBankFrame.MoneyFrameBG:StripTextures()
 
-	_G.GuildBankEmblemFrame:StripTextures(true)
-	_G.GuildBankMoneyFrameBackground:Kill()
-	S:HandleScrollBar(_G.GuildBankPopupScrollFrameScrollBar)
-	S:HandleButton(_G.GuildBankFrameDepositButton, true)
-	S:HandleButton(_G.GuildBankFrameWithdrawButton, true)
+	S:HandleButton(_G.GuildBankFrame.DepositButton, true)
+	S:HandleButton(_G.GuildBankFrame.WithdrawButton, true)
 	S:HandleButton(_G.GuildBankInfoSaveButton, true)
-	S:HandleButton(_G.GuildBankFramePurchaseButton, true)
+	S:HandleButton(_G._G.GuildBankFrame.BuyInfo.PurchaseButton, true)
 
-	_G.GuildBankFrameWithdrawButton:Point('RIGHT', _G.GuildBankFrameDepositButton, 'LEFT', -2, 0)
+	_G.GuildBankFrame.WithdrawButton:Point('RIGHT', _G.GuildBankFrame.DepositButton, 'LEFT', -2, 0)
 	_G.GuildBankInfoScrollFrame:Point('TOPLEFT', _G.GuildBankInfo, 'TOPLEFT', -10, 12)
 	_G.GuildBankInfoScrollFrame:StripTextures()
 	_G.GuildBankInfoScrollFrame:Width(_G.GuildBankInfoScrollFrame:GetWidth() - 8)
 	_G.GuildBankTransactionsScrollFrame:StripTextures()
 
-	_G.GuildBankFrameBlackBG:CreateBackdrop('Transparent', nil, nil, nil, nil, nil, nil, nil, 1)
-	_G.GuildBankFrameBlackBG.backdrop:Point('TOPLEFT', _G.GuildBankFrameBlackBG, 'TOPLEFT', 4, 0)
-	_G.GuildBankFrameBlackBG.backdrop:Point('BOTTOMRIGHT', _G.GuildBankFrameBlackBG, 'BOTTOMRIGHT', -3, 3)
+	_G.GuildBankFrame.BlackBG:CreateBackdrop('Transparent', nil, nil, nil, nil, nil, nil, nil, 1)
+	_G.GuildBankFrame.BlackBG.backdrop:Point('TOPLEFT', _G.GuildBankFrame.BlackBG, 'TOPLEFT', 4, 0)
+	_G.GuildBankFrame.BlackBG.backdrop:Point('BOTTOMRIGHT', _G.GuildBankFrame.BlackBG, 'BOTTOMRIGHT', -3, 3)
 
 	S:HandleScrollBar(_G.GuildBankTransactionsScrollFrameScrollBar)
 	S:HandleScrollBar(_G.GuildBankInfoScrollFrameScrollBar)
 	_G.GuildBankTransactionsScrollFrameScrollBar:ClearAllPoints()
-	_G.GuildBankTransactionsScrollFrameScrollBar:Point('TOPRIGHT', _G.GuildBankFrameBlackBG.backdrop, 'TOPRIGHT', -4, -21)
-	_G.GuildBankTransactionsScrollFrameScrollBar:Point('BOTTOMRIGHT', _G.GuildBankFrameBlackBG.backdrop, 'BOTTOMRIGHT', -4, 21)
+	_G.GuildBankTransactionsScrollFrameScrollBar:Point('TOPRIGHT', _G.GuildBankFrame.BlackBG.backdrop, 'TOPRIGHT', -4, -21)
+	_G.GuildBankTransactionsScrollFrameScrollBar:Point('BOTTOMRIGHT', _G.GuildBankFrame.BlackBG.backdrop, 'BOTTOMRIGHT', -4, 21)
 	_G.GuildBankInfoScrollFrameScrollBar:ClearAllPoints()
-	_G.GuildBankInfoScrollFrameScrollBar:Point('TOPRIGHT', _G.GuildBankFrameBlackBG.backdrop, 'TOPRIGHT', -4, -21)
-	_G.GuildBankInfoScrollFrameScrollBar:Point('BOTTOMRIGHT', _G.GuildBankFrameBlackBG.backdrop, 'BOTTOMRIGHT', -4, 21)
-
-	for i = 1, _G.NUM_GUILDBANK_COLUMNS do
-		_G['GuildBankColumn'..i]:StripTextures()
-
-		for x = 1, _G.NUM_SLOTS_PER_GUILDBANK_GROUP do
-			local button = _G['GuildBankColumn'..i..'Button'..x]
-			local icon = _G['GuildBankColumn'..i..'Button'..x..'IconTexture']
-			local texture = _G['GuildBankColumn'..i..'Button'..x..'NormalTexture']
-			if texture then
-				texture:SetTexture()
-			end
-
-			button:StyleButton()
-			button:SetTemplate(nil, true)
-
-			icon:SetInside()
-			icon:SetTexCoord(unpack(E.TexCoords))
-			S:HandleIconBorder(button.IconBorder)
-		end
-	end
+	_G.GuildBankInfoScrollFrameScrollBar:Point('TOPRIGHT', _G.GuildBankFrame.BlackBG.backdrop, 'TOPRIGHT', -4, -21)
+	_G.GuildBankInfoScrollFrameScrollBar:Point('BOTTOMRIGHT', _G.GuildBankFrame.BlackBG.backdrop, 'BOTTOMRIGHT', -4, 21)
 
-	for i = 1, _G.MAX_GUILDBANK_TABS do
-		local button = _G['GuildBankTab'..i..'Button']
-		local texture = _G['GuildBankTab'..i..'ButtonIconTexture']
-		_G['GuildBankTab'..i]:StripTextures(true)
+	for i=1, _G.MAX_GUILDBANK_TABS do
+		local tab = _G['GuildBankTab'..i]
+		tab:StripTextures()
 
+		local button = tab.Button
+		local icon = button.IconTexture
+		local texture = icon:GetTexture()
 		button:StripTextures()
 		button:StyleButton(true)
 		button:SetTemplate(nil, true)
+		icon:SetTexture(texture)
+		icon:SetTexCoord(unpack(E.TexCoords))
+		icon:SetInside()
+	end
+
+	for i = 1, NUM_GUILDBANK_COLUMNS do
+		local column = _G.GuildBankFrame['Column'..i]
+		column:StripTextures()
+
+		for x = 1, NUM_SLOTS_PER_GUILDBANK_GROUP do
+			local button = column['Button'..x]
+			button:StripTextures()
+			button:SetTemplate('Transparent')
 
-		button.searchOverlay:SetColorTexture(0, 0, 0, 0.8)
+			button.icon:SetInside()
+			button.icon:SetTexCoord(unpack(E.TexCoords))
 
-		texture:SetInside()
-		texture:SetTexCoord(unpack(E.TexCoords))
+			S:HandleIconBorder(button.IconBorder)
+		end
 	end
 
 	for i = 1, 4 do
@@ -84,10 +85,7 @@ function S:Blizzard_GuildBankUI()
 	GuildItemSearchBox.searchIcon:Kill()
 	GuildItemSearchBox:SetTemplate()
 
-	_G.GuildBankPopupFrame:Show() --Toggle the frame in order to create the necessary button elements
-	_G.GuildBankPopupFrame:Hide()
-
-	S:HandleIconSelectionFrame(_G.GuildBankPopupFrame, _G.NUM_GUILDBANK_ICONS_SHOWN, 'GuildBankPopupButton', 'GuildBankPopup')
+	S:HandleIconSelectionFrame(_G.GuildBankPopupFrame, NUM_GUILDBANK_ICONS_SHOWN, 'GuildBankPopupButton', 'GuildBankPopup')
 end
 
 S:AddCallbackForAddon('Blizzard_GuildBankUI')

ElvUI/Modules/Skins/Blizzard/ItemUpgrade.lua

@@ -2,52 +2,62 @@ local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateD
 local S = E:GetModule('Skins')
 
 local _G = _G
-local unpack = unpack
 local hooksecurefunc = hooksecurefunc
-local GetItemUpgradeItemInfo = GetItemUpgradeItemInfo
-local BAG_ITEM_QUALITY_COLORS = BAG_ITEM_QUALITY_COLORS
+
+local function Update(frame)
+	if frame.upgradeInfo then
+		frame.UpgradeItemButton:GetPushedTexture():SetColorTexture(0.9, 0.8, 0.1, 0.3)
+	else
+		frame.UpgradeItemButton:GetNormalTexture():SetInside()
+	end
+end
 
 function S:Blizzard_ItemUpgradeUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.itemUpgrade) then return end
 
-	local ItemUpgradeFrame = _G.ItemUpgradeFrame
-	S:HandlePortraitFrame(ItemUpgradeFrame)
-
-	local ItemButton = ItemUpgradeFrame.ItemButton
-	ItemButton:SetTemplate()
-	ItemButton.Frame:SetTexture('')
-	ItemButton:SetPushedTexture('')
-	S:HandleItemButton(ItemButton)
-
-	local Highlight = ItemButton:GetHighlightTexture()
-	Highlight:SetColorTexture(1, 1, 1, .25)
-
-	hooksecurefunc('ItemUpgradeFrame_Update', function()
-		local icon, _, quality = GetItemUpgradeItemInfo()
-		if icon then
-			ItemButton.IconTexture:SetTexCoord(unpack(E.TexCoords))
-			local color = BAG_ITEM_QUALITY_COLORS[quality or 1]
-			ItemButton.backdrop:SetBackdropBorderColor(color.r, color.g, color.b)
-		else
-			ItemButton.IconTexture:SetTexture('')
-			ItemButton.backdrop:SetBackdropBorderColor(0, 0, 0)
-		end
-	end)
-
-	local UpgradeDropDown = ItemUpgradeFrame.UpgradeLevelDropDown.DropDownMenu
-	S:HandleDropDownBox(UpgradeDropDown, 115)
-
-	local TextFrame = ItemUpgradeFrame.TextFrame
-	TextFrame:StripTextures()
-	TextFrame:CreateBackdrop('Transparent')
-	TextFrame.backdrop:Point('TOPLEFT', ItemButton.IconTexture, 'TOPRIGHT', 3, 1)
-	TextFrame.backdrop:Point('BOTTOMRIGHT', -6, 2)
-
-	_G.ItemUpgradeFrameMoneyFrame:StripTextures()
-	S:HandleIcon(_G.ItemUpgradeFrameMoneyFrame.Currency.icon)
-	S:HandleButton(_G.ItemUpgradeFrameUpgradeButton, true)
-	ItemUpgradeFrame.FinishedGlow:Kill()
-	ItemUpgradeFrame.ButtonFrame:DisableDrawLayer('BORDER')
+	local frame = _G.ItemUpgradeFrame
+	_G.ItemUpgradeFrameBg:Hide()
+	_G.ItemUpgradeFramePortrait:Hide()
+	_G.ItemUpgradeFramePlayerCurrenciesBorder:StripTextures()
+
+	frame:CreateBackdrop('Transparent')
+	frame.backdrop.Center:SetDrawLayer('BACKGROUND', -2)
+	frame.UpgradeCostFrame.BGTex:StripTextures()
+
+	frame.NineSlice:Hide()
+	frame.TitleBg:Hide()
+	frame.TopTileStreaks:Hide()
+	frame.BottomBG:CreateBackdrop('Transparent')
+	frame.ItemInfo.UpgradeTo:SetFontObject('GameFontHighlightMedium')
+
+	local button = frame.UpgradeItemButton
+	button:StripTextures()
+	button:SetTemplate()
+	button:StyleButton(nil, true)
+	button:GetNormalTexture():SetInside()
+
+	button.icon:SetInside(button)
+	S:HandleIcon(button.icon)
+
+	if E.private.skins.parchmentRemoverEnable then
+		frame.BottomBGShadow:Hide()
+		frame.BottomBG:Hide()
+		frame.TopBG:Hide()
+
+		local holder = button.ButtonFrame
+		holder:StripTextures()
+		holder:CreateBackdrop('Transparent')
+		holder.backdrop.Center:SetDrawLayer('BACKGROUND', -1)
+	else
+		frame.TopBG:CreateBackdrop('Transparent')
+	end
+
+	hooksecurefunc(frame, 'Update', Update)
+
+	S:HandleIconBorder(button.IconBorder)
+	S:HandleButton(frame.UpgradeButton, true)
+	S:HandleDropDownBox(frame.ItemInfo.Dropdown, 130)
+	S:HandleCloseButton(_G.ItemUpgradeFrameCloseButton)
 end
 
 S:AddCallbackForAddon('Blizzard_ItemUpgradeUI')

ElvUI/Modules/Skins/Blizzard/LFG.lua

@@ -507,19 +507,20 @@ function S:LookingForGroupFrames()
 	LFGListFrame.EntryCreation.ListGroupButton:Point('BOTTOMRIGHT', -6, 3)
 	S:HandleEditBox(LFGListFrame.EntryCreation.Description)
 
-	S:HandleEditBox(LFGListFrame.EntryCreation.Name)
 	S:HandleEditBox(LFGListFrame.EntryCreation.ItemLevel.EditBox)
-	S:HandleEditBox(LFGListFrame.EntryCreation.HonorLevel.EditBox)
+	S:HandleEditBox(LFGListFrame.EntryCreation.MythicPlusRating.EditBox)
+	S:HandleEditBox(LFGListFrame.EntryCreation.Name)
+	S:HandleEditBox(LFGListFrame.EntryCreation.PVPRating.EditBox)
 	S:HandleEditBox(LFGListFrame.EntryCreation.VoiceChat.EditBox)
 
 	S:HandleDropDownBox(_G.LFGListEntryCreationActivityDropDown)
 	S:HandleDropDownBox(_G.LFGListEntryCreationGroupDropDown)
-	S:HandleDropDownBox(_G.LFGListEntryCreationCategoryDropDown, 330)
 
 	S:HandleCheckBox(LFGListFrame.EntryCreation.ItemLevel.CheckButton)
-	S:HandleCheckBox(LFGListFrame.EntryCreation.HonorLevel.CheckButton)
-	S:HandleCheckBox(LFGListFrame.EntryCreation.VoiceChat.CheckButton)
+	S:HandleCheckBox(LFGListFrame.EntryCreation.MythicPlusRating.CheckButton)
 	S:HandleCheckBox(LFGListFrame.EntryCreation.PrivateGroup.CheckButton)
+	S:HandleCheckBox(LFGListFrame.EntryCreation.PVPRating.CheckButton)
+	S:HandleCheckBox(LFGListFrame.EntryCreation.VoiceChat.CheckButton)
 
 	LFGListFrame.EntryCreation.ActivityFinder.Dialog:StripTextures()
 	LFGListFrame.EntryCreation.ActivityFinder.Dialog:SetTemplate('Transparent')
@@ -638,7 +639,6 @@ function S:LookingForGroupFrames()
 	S:HandleButton(LFGListFrame.ApplicationViewer.NameColumnHeader, true)
 	S:HandleButton(LFGListFrame.ApplicationViewer.RoleColumnHeader, true)
 	S:HandleButton(LFGListFrame.ApplicationViewer.ItemLevelColumnHeader, true)
-	S:HandleButton(LFGListFrame.ApplicationViewer.DungeonScoreColumnHeader, true)
 	LFGListFrame.ApplicationViewer.NameColumnHeader:ClearAllPoints()
 	LFGListFrame.ApplicationViewer.NameColumnHeader:Point('BOTTOMLEFT', LFGListFrame.ApplicationViewer.Inset, 'TOPLEFT', 0, 1)
 	LFGListFrame.ApplicationViewer.NameColumnHeader.Label:FontTemplate()
@@ -648,9 +648,6 @@ function S:LookingForGroupFrames()
 	LFGListFrame.ApplicationViewer.ItemLevelColumnHeader:ClearAllPoints()
 	LFGListFrame.ApplicationViewer.ItemLevelColumnHeader:Point('LEFT', LFGListFrame.ApplicationViewer.RoleColumnHeader, 'RIGHT', 1, 0)
 	LFGListFrame.ApplicationViewer.ItemLevelColumnHeader.Label:FontTemplate()
-	LFGListFrame.ApplicationViewer.DungeonScoreColumnHeader:ClearAllPoints()
-	LFGListFrame.ApplicationViewer.DungeonScoreColumnHeader:Point('LEFT', LFGListFrame.ApplicationViewer.ItemLevelColumnHeader, 'RIGHT', 1, 0)
-	LFGListFrame.ApplicationViewer.DungeonScoreColumnHeader.Label:FontTemplate()
 	LFGListFrame.ApplicationViewer.PrivateGroup:FontTemplate()
 
 	S:HandleButton(LFGListFrame.ApplicationViewer.RefreshButton)

ElvUI/Modules/Skins/Blizzard/Macro.lua

@@ -7,17 +7,20 @@ local format = format
 local HideUIPanel = HideUIPanel
 local ShowUIPanel = ShowUIPanel
 
+local NUM_ICONS_PER_ROW = 10
+local NUM_ICON_ROWS = 9
+local NUM_MACRO_ICONS_SHOWN = NUM_ICONS_PER_ROW * NUM_ICON_ROWS
+
 function S:Blizzard_MacroUI()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.macro) then return end
 
 	local MacroFrame = _G.MacroFrame
 	S:HandlePortraitFrame(MacroFrame)
 	MacroFrame:Width(360)
 
-	_G.MacroFrameTextBackground:StripTextures()
-	_G.MacroFrameTextBackground:SetTemplate('Transparent')
 	_G.MacroButtonScrollFrame:StripTextures()
 	_G.MacroButtonScrollFrame:SetTemplate('Transparent')
+	_G.MacroFrameTextBackground.NineSlice:SetTemplate('Transparent')
 
 	S:HandleScrollBar(_G.MacroButtonScrollFrameScrollBar)
 	S:HandleScrollBar(_G.MacroFrameScrollFrameScrollBar)
@@ -82,28 +85,8 @@ function S:Blizzard_MacroUI()
 	--Icon selection frame
 	ShowUIPanel(MacroFrame) --Toggle frame to create necessary variables needed for popup frame
 	HideUIPanel(MacroFrame)
-	local MacroPopupFrame = _G.MacroPopupFrame
-	MacroPopupFrame:Show() --Toggle the frame in order to create the necessary button elements
-	MacroPopupFrame:Hide()
-
-	-- Popout Frame
-	S:HandleButton(MacroPopupFrame.BorderBox.OkayButton)
-	local cancel_btn = MacroPopupFrame.BorderBox.CancelButton
-	S:HandleButton(cancel_btn)
-	cancel_btn:ClearAllPoints()
-	cancel_btn:Point('RIGHT', MacroPopupFrame.BorderBox, 'BOTTOMRIGHT', -5, 15)
-	S:HandleScrollBar(_G.MacroPopupScrollFrameScrollBar)
-	S:HandleEditBox(_G.MacroPopupEditBox)
-	_G.MacroPopupNameLeft:SetTexture()
-	_G.MacroPopupNameMiddle:SetTexture()
-	_G.MacroPopupNameRight:SetTexture()
-
-	S:HandleIconSelectionFrame(MacroPopupFrame, _G.NUM_MACRO_ICONS_SHOWN, 'MacroPopupButton', 'MacroPopup')
-
-	MacroPopupFrame:HookScript('OnShow', function(s)
-		s:ClearAllPoints()
-		s:Point('TOPLEFT', MacroFrame, 'TOPRIGHT', 2, 0)
-	end)
+
+	S:HandleIconSelectionFrame(_G.MacroPopupFrame, NUM_MACRO_ICONS_SHOWN, 'MacroPopupButton', 'MacroPopup')
 end
 
 S:AddCallbackForAddon('Blizzard_MacroUI')

ElvUI/Modules/Skins/Blizzard/PetBattle.lua

@@ -1,5 +1,6 @@
 local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
 local S = E:GetModule('Skins')
+local TT = E:GetModule('Tooltip')
 
 local pairs, unpack = pairs, unpack
 
@@ -36,27 +37,6 @@ local function SkinPetButton(self, bf)
 	end
 end
 
-local function SkinPetTooltip(tt)
-	tt.Background:SetTexture()
-	tt.BorderTop:SetTexture()
-	tt.BorderTopLeft:SetTexture()
-	tt.BorderTopRight:SetTexture()
-	tt.BorderLeft:SetTexture()
-	tt.BorderRight:SetTexture()
-	tt.BorderBottom:SetTexture()
-	tt.BorderBottomRight:SetTexture()
-	tt.BorderBottomLeft:SetTexture()
-
-	if tt.Delimiter1 then
-		tt.Delimiter1:SetTexture()
-	end
-	if tt.Delimiter2 then
-		tt.Delimiter2:SetTexture()
-	end
-
-	tt:SetTemplate('Transparent')
-end
-
 function S:PetBattleFrame()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.petbattleui) then return end
 
@@ -250,11 +230,11 @@ function S:PetBattleFrame()
 
 	-- TOOLTIPS SKINNING
 	if E.private.skins.blizzard.tooltip then
-		SkinPetTooltip(_G.BattlePetTooltip)
-		SkinPetTooltip(_G.PetBattlePrimaryAbilityTooltip)
-		SkinPetTooltip(_G.PetBattlePrimaryUnitTooltip)
-		SkinPetTooltip(_G.FloatingBattlePetTooltip)
-		SkinPetTooltip(_G.FloatingPetBattleAbilityTooltip)
+		TT:SetStyle(_G.BattlePetTooltip)
+		TT:SetStyle(_G.PetBattlePrimaryAbilityTooltip)
+		TT:SetStyle(_G.PetBattlePrimaryUnitTooltip)
+		TT:SetStyle(_G.FloatingBattlePetTooltip)
+		TT:SetStyle(_G.FloatingPetBattleAbilityTooltip)
 
 		-- BATTLEPET RARITY COLOR
 		hooksecurefunc('BattlePetToolTip_Show', function(_, _, rarity)

ElvUI/Modules/Skins/Skins.lua

@@ -1084,58 +1084,70 @@ function S:HandleGarrisonPortrait(portrait)
 	end
 end
 
--- Interface\SharedXML\SharedUIPanelTemplatex.xml - line 780
-function S:HandleTooltipBorderedFrame(frame)
-	assert(frame, 'doesnt exist!')
+do
+	local function selectionOffset(frame)
+		local point, _, relativePoint, xOffset = frame:GetPoint()
+		if xOffset <= 0 then
+			frame:ClearAllPoints()
+			frame:Point(point, frame == _G.MacroPopupFrame and _G.MacroFrame, relativePoint, strfind(point, 'LEFT') and 4 or -4, 0)
+		end
+	end
 
-	if frame.BorderTopLeft then frame.BorderTopLeft:Hide() end
-	if frame.BorderTopRight then frame.BorderTopRight:Hide() end
+	function S:HandleIconSelectionFrame(frame, numIcons, buttonNameTemplate, frameNameOverride)
+		assert(frame, 'HandleIconSelectionFrame: frame argument missing')
+		assert(numIcons and type(numIcons) == 'number', 'HandleIconSelectionFrame: numIcons argument missing or not a number')
+		assert(buttonNameTemplate and type(buttonNameTemplate) == 'string', 'HandleIconSelectionFrame: buttonNameTemplate argument missing or not a string')
 
-	if frame.BorderBottomLeft then frame.BorderBottomLeft:Hide() end
-	if frame.BorderBottomRight then frame.BorderBottomRight:Hide() end
+		if frame.isSkinned then return end
 
-	if frame.BorderTop then frame.BorderTop:Hide() end
-	if frame.BorderBottom then frame.BorderBottom:Hide() end
-	if frame.BorderLeft then frame.BorderLeft:Hide() end
-	if frame.BorderRight then frame.BorderRight:Hide() end
+		frame:Show() -- spawn the info so we can skin the buttons
+		if frame.Update then frame:Update() end -- guild bank popup has update function
+		frame:Hide() -- can hide it right away
 
-	if frame.Background then frame.Background:Hide() end
+		frame:HookScript('OnShow', selectionOffset) -- place it off to the side of parent with correct offsets
 
-	frame:CreateBackdrop('Transparent')
-end
+		local frameName = frameNameOverride or frame:GetName() --We need override in case Blizzard fucks up the naming (guild bank)
+		local scrollFrame = frame.ScrollFrame or _G[frameName..'ScrollFrame']
+		local editBox = frame.EditBox or _G[frameName..'EditBox']
+		local cancel = frame.CancelButton or frame.BorderBox.CancelButton or _G[frameName..'Cancel']
+		local okay = frame.OkayButton or frame.BorderBox.OkayButton or _G[frameName..'Okay']
 
-function S:HandleIconSelectionFrame(frame, numIcons, buttonNameTemplate, frameNameOverride)
-	assert(frame, 'HandleIconSelectionFrame: frame argument missing')
-	assert(numIcons and type(numIcons) == 'number', 'HandleIconSelectionFrame: numIcons argument missing or not a number')
-	assert(buttonNameTemplate and type(buttonNameTemplate) == 'string', 'HandleIconSelectionFrame: buttonNameTemplate argument missing or not a string')
+		frame:StripTextures()
+		frame:SetTemplate('Transparent')
+		frame:Height(frame:GetHeight() + 10)
+		frame.BorderBox:StripTextures()
 
-	local frameName = frameNameOverride or frame:GetName() --We need override in case Blizzard fucks up the naming (guild bank)
-	local scrollFrame = _G[frameName..'ScrollFrame']
-	local editBox = _G[frameName..'EditBox']
+		cancel:ClearAllPoints()
+		cancel:SetPoint('BOTTOMRIGHT', frame, -4, 4)
+		S:HandleButton(cancel)
 
-	frame:StripTextures()
-	frame.BorderBox:StripTextures()
-	scrollFrame:StripTextures()
-	editBox:DisableDrawLayer('BACKGROUND') -- Removes textures around it
+		okay:ClearAllPoints()
+		okay:SetPoint('RIGHT', cancel, 'LEFT', -10, 0)
+		S:HandleButton(okay)
 
-	frame:CreateBackdrop('Transparent')
-	frame:Height(frame:GetHeight() + 10)
-	scrollFrame:Height(scrollFrame:GetHeight() + 10)
+		editBox:DisableDrawLayer('BACKGROUND') -- Removes textures around it
+		S:HandleEditBox(editBox)
 
-	for i = 1, numIcons do
-		local button = _G[buttonNameTemplate..i]
-		if button then
-			button:StripTextures()
-			button:CreateBackdrop()
-			button:StyleButton(true)
+		scrollFrame:StripTextures()
+		scrollFrame:Height(scrollFrame:GetHeight() + 10)
+		S:HandleScrollBar(scrollFrame.ScrollBar)
 
-			local icon = _G[buttonNameTemplate..i..'Icon']
-			if icon then
-				icon:SetTexCoord(unpack(E.TexCoords))
-				icon:Point('TOPLEFT', 1, -1)
-				icon:Point('BOTTOMRIGHT', -1, 1)
+		for i = 1, numIcons do
+			local button = _G[buttonNameTemplate..i]
+			if button then
+				button:StripTextures()
+				button:SetTemplate()
+				button:StyleButton(nil, true)
+
+				local icon = button.Icon or _G[buttonNameTemplate..i..'Icon']
+				if icon then
+					icon:SetTexCoord(unpack(E.TexCoords))
+					icon:SetInside(button.backdrop)
+				end
 			end
 		end
+
+		frame.isSkinned = true
 	end
 end
 

ElvUI/Modules/Tooltip/Tooltip.lua

@@ -693,17 +693,20 @@ function TT:GameTooltip_ShowStatusBar(tt)
 	if not tt or not tt.statusBarPool or tt:IsForbidden() then return end
 
 	local sb = tt.statusBarPool:GetNextActive()
-	if (not sb or not sb.Text) or sb.backdrop then return end
+	if not (sb and sb.Text and sb.NineSlice) or sb.NineSlice.template then return end
 
-	sb:StripTextures()
-	sb:CreateBackdrop(nil, nil, true)
+	sb.NineSlice:SetTemplate(nil, nil, true)
 	sb:SetStatusBarTexture(E.media.normTex)
 end
 
-function TT:SetStyle(tt)
-	if not tt or (tt == E.ScanTooltip or tt.IsEmbedded or not tt.SetTemplate or not tt.SetBackdrop) or tt:IsForbidden() then return end
-	tt.customBackdropAlpha = TT.db.colorAlpha
-	tt:SetTemplate('Transparent')
+function TT:SetStyle(tt, _, isEmbedded)
+	if not tt or (tt == E.ScanTooltip or isEmbedded or tt.IsEmbedded or not tt.NineSlice) or tt:IsForbidden() then return end
+
+	if tt.Delimiter1 then tt.Delimiter1:SetTexture() end
+	if tt.Delimiter2 then tt.Delimiter2:SetTexture() end
+
+	tt.NineSlice.customBackdropAlpha = TT.db.colorAlpha
+	tt.NineSlice:SetTemplate('Transparent')
 end
 
 function TT:MODIFIER_STATE_CHANGED()

ElvUI_OptionsUI/ElvUI_OptionsUI-Mainline.toc → ElvUI_OptionsUI/ElvUI_OptionsUI_Mainline.toc

@@ -1,4 +1,4 @@
-## Interface: 90100
+## Interface: 90105
 ## Author: Elv
 ## Version: 1.07
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bOptionsUI|r

ElvUI_OptionsUI/Locales/zhTW.lua

@@ -1,12 +1,12 @@
 -- Traditional Chinese localization file for zhTW.
 local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "zhTW")
 
-L["Copy Primary Texture"] = true
-L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
+L["Copy Primary Texture"] = "複製主要材質"
+L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = "使用主要材質來替換單位框架及血條的狀態條材質設定."
 L["# Displayed Auras"] = "顯示光環的數量"
 L["%s and then %s"] = "%s 與 %s"
-L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
-L["|cffFF0000Warning:|r Enable and Number of Groups are managed by Smart Raid Filter. Disable Smart Raid Filter in (UnitFrames - General) to change these settings."] = true
+L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = "|cffFF0000警告:|r 點擊下拉選單中的箭頭來查看列表."
+L["|cffFF0000Warning:|r Enable and Number of Groups are managed by Smart Raid Filter. Disable Smart Raid Filter in (UnitFrames - General) to change these settings."] = "|cffFF0000警告:|r 框架的開啟/關閉以及小隊編號功能正在由智能團隊過濾進行管理. 可以在 (單位框架 - 一般設定) 中停用智能團隊過濾後手動修改這些設定."
 L["|cffFF0000Warning:|r This causes updates to happen at a fraction of a second."] = "|cffFF0000警告:|r 這將導致一秒中更新多次。"
 L["24-Hour Time"] = "24小時制"
 L["2D"] = "2D"
@@ -24,7 +24,7 @@ L["Add a spell to the filter."] = "添加一個技能到過濾器"
 L["Add an item or search syntax to the ignored list. Items matching the search syntax will be ignored."] = "增加一個物品或是搜尋語法到忽略清單. 符合搜尋語法的物品將會被忽略"
 L["Add Currency ID"] = "添加貨幣 ID"
 L["Add Current"] = "添加貨幣"
-L["Add Instance ID"] = "添加副本ID"
+L["Add Instance ID"] = "添加副本 ID"
 L["Add Item or Search Syntax"] = "增加物品或是搜尋語法"
 L["Add Map ID"] = "添加地圖ID"
 L["Add Name or NPC ID"] = "添加姓名或 NPC ID"
@@ -93,8 +93,8 @@ L["Are you sure you want to reset General settings?"] = "你確定你要重置
 L["Are you sure you want to reset NamePlates settings?"] = "你確定你要重置姓名板的設定?"
 L["Are you sure you want to reset Tooltip settings?"] = "你確定你要重置提示的設定?"
 L["Are you sure you want to reset UnitFrames settings?"] = "你確定你要重置單位框架的設定?"
-L["Arrow Scale"] = true
-L["Arrow Spacing"] = true
+L["Arrow Scale"] = "箭頭縮放"
+L["Arrow Spacing"] = "箭頭間隔"
 L["Ascending or Descending order."] = "升序或降序"
 L["Ascending"] = "升序"
 L["Assist Frames"] = "助理框架"
@@ -104,7 +104,7 @@ L["Attach Text To"] = "文字附著於"
 L["Attach To"] = "附加到"
 L["Attempt to create URL links inside the chat."] = "對話視窗出現網址時建立連結."
 L["Attempt to support eyefinity/nvidia surround."] = "嘗試支援 Eyefinity/NVIDIA Surround."
-L["Attempts to center UI elements in a 16:9 format for ultrawide monitors"] = true
+L["Attempts to center UI elements in a 16:9 format for ultrawide monitors"] = "嘗試在超寬螢幕中以 16:9 格式置中 UI 元素."
 L["Aura Bars"] = "光環條"
 L["Aura Filters"] = "光環過濾器"
 L["Aura Speed"] = "光環速度"
@@ -201,7 +201,7 @@ L["Cart / Flag / Orb / Assassin Bounty"] = "推車/旗/球/刺客賞金"
 L["Cast Bar"] = "施法條"
 L["Cast Time Format"] = "施法時間格式"
 L["Castbar"] = "施法條"
-L["Casted by Player Only"] = true
+L["Casted by Player Only"] = "僅玩家施放"
 L["Casting"] = "施法"
 L["Center"] = "置中"
 L["Change settings for the display of the location text that is on the minimap."] = "改變小地圖所在位置文字的顯示設定."
@@ -261,8 +261,8 @@ L["Color Override"] = "顏色覆蓋"
 L["Color power by classcolor or reaction."] = "以威脅值顯示能量."
 L["Color power by color selection."] = "以色彩選擇器顯示能量."
 L["Color power by threat status."] = "以威脅值顯示能量."
-L["Color Score"] = true
-L["Color score based on Blizzards API."] = true
+L["Color Score"] = "彩色分數"
+L["Color score based on Blizzards API."] = "使用 Blizzard API 提供的信息上色分數."
 L["Color some texts use."] = "數值(非文字)使用的顏色"
 L["Color Tanked"] = "被坦住的顏色"
 L["Color the health backdrop by class or reaction."] = "生命條背景色以職業色顯示."
@@ -301,7 +301,7 @@ L["Cooldown Text"] = "冷卻文字"
 L["Cooldowns"] = "冷卻"
 L["Copy Chat Lines"] = "複製聊天記錄"
 L["Copy From"] = "複製自"
-L["Copy settings from %s. This will overwrite %s profile.\n\n Are you sure?"] = true
+L["Copy settings from %s. This will overwrite %s profile.\n\n Are you sure?"] = "從 %s 複製設定. 這將覆蓋配置文件 %s.\n\n 確定要這麽做麼?"
 L["Copy settings from another unit."] = "從其他框架中複製設置"
 L["Copy settings from"] = "複製設置"
 L["Core |cff1784d1ElvUI|r options."] = "核心 |cff1784d1ElvUI|r 選項"
@@ -408,7 +408,7 @@ L["Display Style"] = "顯示格式"
 L["Display Target"] = "顯示目標"
 L["Display Text"] = "顯示文本"
 L["Display the castbar icon inside the castbar."] = "在施法條內顯示圖標"
-L["Display the current Mythic+ Dungeon Score."] = true
+L["Display the current Mythic+ Dungeon Score."] = "顯示當前傳奇鑰石地城分數."
 L["Display the hyperlink tooltip while hovering over a hyperlink."] = "滑鼠懸停在超鏈接上時顯示鏈接提示框."
 L["Display the junk icon on all grey items that can be vendored."] = "在所有可販賣的灰色物品上顯示垃圾圖示"
 L["Display the name of the unit on the chat bubble. This will not work if backdrop is disabled or when you are in an instance."] = "在聊天氣泡上顯示人物名稱. 當背景被停用或是在副本內時此功能無法運作"
@@ -424,7 +424,7 @@ L["Display tick marks on the castbar for channelled spells. This will adjust aut
 L["Displayed Currency"] = "顯示的金額"
 L["Displays a detailed report of every item sold when enabled."] = "當啟用時顯示一個有關於每個物品賣價的詳細報告"
 L["Displays item level on equippable items."] = "在可裝備物品上顯示裝備等級"
-L["Displays item level on equippable items."] = true
+L["Displays item level on equippable items."] = "在可裝備物品上顯示裝備等級"
 L["Don't display auras that are longer than this duration (in seconds). Set to zero to disable."] = "不顯示高於此時間(單位:秒)的光環. 設置為0以禁用"
 L["Don't display auras that are shorter than this duration (in seconds). Set to zero to disable."] = "不顯示低於此時間(單位:秒)的光環. 設置為0以禁用"
 L["Donations:"] = "捐款: "
@@ -492,7 +492,7 @@ L["Filter Type"] = "過濾器類型"
 L["Filters are not allowed to have commas in their name. Stripping commas from filter name."] = "過濾器名字稱內不允許有逗號. 清除過濾器名稱內的逗號"
 L["Filters Page"] = "過濾器介面"
 L["Flash"] = "閃光"
-L["Flash Threshold"] = true
+L["Flash Threshold"] = "閃光閾值"
 L["Fluid Position Buffs on Debuffs"] = "增益流動定位在減益上"
 L["Fluid Position Debuffs on Buffs"] = "減益流動定位在增益上"
 L["Flyout Direction"] = "飛出方向"
@@ -524,7 +524,7 @@ L["Friendly"] = "友好"
 L["Full Overlay"] = "完全覆蓋"
 L["Full"] = "滿"
 L["Gems"] = "寶石"
-L["Gender"] = true
+L["Gender"] = "性別"
 L["General"] = "一般設定"
 L["Global (Account Settings)"] = "全域(賬號設置)"
 L["Global Fade Transparency"] = "全局漸隱透明度"
@@ -577,14 +577,14 @@ L["Hide Below Max Level"] = "滿等前隱藏"
 L["Hide Both"] = "全部隱藏"
 L["Hide Castbar text. Useful if your power height is very low or if you use power offset."] = "隱藏施法條文字"
 L["Hide Cooldown Bling"] = "隱藏冷卻閃光"
-L["Hide Copy Button"] = true
+L["Hide Copy Button"] = "隱藏複製按鍵"
 L["Hide Delay"] = "隱藏延遲"
 L["Hide Error Text"] = "隱藏錯誤文字"
 L["Hide Frame"] = "隱藏框架"
 L["Hide In Combat"] = "戰鬥中隱藏"
 L["Hide In Vehicle"] = "騎乘時隱藏"
-L["Hide Keybind Text"] = true
-L["Hide Macro Text"] = true
+L["Hide Keybind Text"] = "隱藏按鍵綁定文字"
+L["Hide Macro Text"] = "隱藏巨集文字"
 L["Hide Outside PvP"] = "PvP外隱藏"
 L["Hide specific sections in the datatext tooltip."] = "在資訊文字提示上隱藏特定區塊"
 L["Hide Spell Name"] = "隱藏法術名字"
@@ -685,7 +685,7 @@ L["Ignored Items and Search Syntax (Global)"] = "忽略的物品與搜尋語法
 L["Ignored Items and Search Syntax (Profile)"] = "忽略的物品與搜尋語法 (個人)"
 L["Import Now"] = "現在導入"
 L["Importing"] = "正在導入"
-L["Inactivity Timer"] = true
+L["Inactivity Timer"] = "不活躍計時器"
 L["Index"] = "索引"
 L["Indicate whether buffs you cast yourself should be separated before or after."] = "將你自身施放的增益放於整體增益最前方或或最後方."
 L["Individual Units"] = "獨立單位"
@@ -820,8 +820,8 @@ L["Movers"] = "移動器"
 L["Multi-Monitor Support"] = "多顯示器支援"
 L["Multiply the backdrops height or width by this value. This is usefull if you wish to have more than one bar behind a backdrop."] = "根據此值增加背景的高度或寬度. 一般用來設定在一個背景框裡放置多條快捷列."
 L["Must be in group with the player if he isn't on the same server as you."] = "如果不是同一服務器, 那他必需和你在同一隊伍中."
-L["Mythic+ Data"] = true
-L["Mythic+ Score"] = true
+L["Mythic+ Data"] = "M+ 數據"
+L["Mythic+ Score"] = "M+ 分數"
 L["Name Color"] = "姓名顏色"
 L["Name Font"] = "名稱字體"
 L["Name Only"] = "僅姓名"
@@ -1014,7 +1014,7 @@ L["Replaces the default Blizzard fonts on various panels and frames with the fon
 L["Reposition Window"] = "重置窗口位置"
 L["Require All"] = "要求全部"
 L["Require holding the Alt key down to move cursor or cycle through messages in the editbox."] = "開啟該選項使你在查看聊天歷史記錄時需要按住Alt+上下鍵,如果關閉則直接按上下鍵即可"
-L["Reset Action Paging"] = true
+L["Reset Action Paging"] = "重置動作翻頁"
 L["Reset all frames to their original positions."] = "重設所有框架至預設位置."
 L["Reset Anchors"] = "重置位置"
 L["Reset Aura Filters"] = "重置光環過濾器"
@@ -1058,7 +1058,7 @@ L["Search for a spell name inside of a filter."] = "在過濾器內搜尋一個
 L["Search Syntax"] = "搜尋語法"
 L["Secondary Texture"] = "次要材質"
 L["Seconds"] = "秒"
-L["Securely Tanking"] = true
+L["Securely Tanking"] = "安全坦住"
 L["Select a profile to copy from/to."] = "選擇一個設定文件來當作複製的來源或目標"
 L["Select a unit to copy settings from."] = "選擇從哪單位複制."
 L["Select Filter"] = "選擇過濾器"
@@ -1121,7 +1121,7 @@ L["Show New Item Glow"] = "顯示新物品發光"
 L["Show Over Absorbs"] = "顯示滿血吸收盾"
 L["Show PvP Badge Indicator if available"] = "如果可用，將會顯示PvP的陣營勛章"
 L["Show Quality Color"] = "顯示品質圖標"
-L["Show QuestXP"] = true
+L["Show QuestXP"] = "顯示任務經驗"
 L["Show Scrap Icon"] = "顯示分解圖標"
 L["Show Special Bags Color"] = "顯示特殊種類背包的顏色"
 L["Show the castbar icon desaturated if a spell is not interruptible."] = "在法術不可被打斷時顯示去色圖標。"
@@ -1210,7 +1210,7 @@ L["TargetTarget"] = "目標的目標"
 L["TargetTargetTarget"] = "目標的目標的目標"
 L["Testing:"] = "測試："
 L["Text Color"] = "文字顔色"
-L["Text Fade"] = true
+L["Text Fade"] = "文字漸隱"
 L["Text Font Size"] = "字體大小"
 L["Text Format"] = "文字格式"
 L["Text Options"] = "文字選項"
@@ -1230,7 +1230,7 @@ L["The direction the auras will grow and then the direction they will grow after
 L["The display format of the currency icons that get displayed below the main bag. (You have to be watching a currency for this to display)"] = "背包主框架下方的兌換通貨圖示顯示格式.需先設定監控特定兌換通貨, 才會顯示於背包框架."
 L["The display format of the money text that is shown at the top of the main bag."] = "在背包主框架上方的金幣顯示格式"
 L["The display format of the money text that is shown in the gold datatext and its tooltip."] = "在信息文字中顯示的金錢格式"
-L["The durability percent that the datatext will start flashing.  Set to -1 to disable"] = true
+L["The durability percent that the datatext will start flashing.  Set to -1 to disable"] = "開始閃光的耐久度百分比. 設定 -1 以停用"
 L["The first button anchors itself to this point on the bar."] = "快捷列第一個按鈕的所在位置."
 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"] = "玩家頭頂姓名的字體. |cffFF0000警告: 你需要重新開啟遊戲或重新登錄才能使用此功能.|r"
 L["The font that combat text will use. |cffFF0000WARNING: This requires a game restart or re-log for this change to take effect.|r"] = "戰鬥資訊將使用此字體, |​​cffFF0000警告:需重啟遊戲或重新登入才可使此變更生效.|r"
@@ -1308,7 +1308,7 @@ L["Top Panel"] = "頂部面板"
 L["Top Right"] = "右上"
 L["Top to Bottom"] = "頂部至底部"
 L["Top"] = "上"
-L["Torghast Buffs Position"] = true
+L["Torghast Buffs Position"] = "托伽司增益位置"
 L["Totems"] = "圖騰"
 L["Trainer Frame"] = "訓練師"
 L["Transparency level when not in combat, no target exists, full health, not casting, and no focus target exists."] = "當非戰鬥, 沒有目標, 滿血, 未施法且沒有焦點目標存在時的透明度"
@@ -1317,7 +1317,7 @@ L["Triggers"] = "觸發器"
 L["Trivial"] = "低等級(灰色)"
 L["Turtle Color"] = "減傷類的顏色"
 L["Tutorials"] = "教學"
-L["Ultrawide Support"] = true
+L["Ultrawide Support"] = "超寬螢幕支援"
 L["Under Health Threshold"] = "低於血量閾值"
 L["Under Power Threshold"] = "低於能量閾值"
 L["Unfriendly"] = "不友好"
@@ -1418,7 +1418,7 @@ L["Zone Ability"] = "要塞技能"
 L["Zone Name"] = "地區名"
 
 ----------------------------------
-L["BlizzardNameplate"] = true
+L["BlizzardNameplate"] = "暴雪血條"
 L["blockCastByPlayers"] = "[屏蔽] 玩家施放的"
 L["blockDispellable"] = "[屏蔽] 可驅散的"
 L["blockNoDuration"] = "[屏蔽] 永久的"