Quantcast

Doubled the width of the Obtain panel, and replaced the following localization strings with their counterparts in GlobalStrings.lua:

torhal [11-24-09 - 06:08]
Doubled the width of the Obtain panel, and replaced the following localization strings with their counterparts in GlobalStrings.lua:
Replaced L["Display"] with _G.DISPLAY
Replaced L["Ok"] with _G.OKAY
Replaced L["Filter"] with _G.FILTER
Replaced L["Filters"] with _G.FILTERS
Replaced L["Version"] with _G.GAME_VERSION_LABEL
Replaced L["Name"] with _G.NAME
Replaced L["World Map"] with _G.WORLD_MAP
Replaced L["Font Size"] with _G.FONT_SIZE
Replaced L["Off"] with _G.OFF
Replaced L["Mouse"] with _G.MOUSE_LABEL
Replaced L["Reputation"] with _G.REPUTATION
Replaced L["General"] with _G.GENERAL
Replaced L["Player Type"] with _G.ROLE
Replaced L["Misc"] and L["Miscellaneous"] with _G.MISCELLANEOUS
Replaced L["Search"] with _G.SEARCH
Replaced L["Reset"] with _G.RESET
Replaced L["Skill"] with _G.SKILL
Replaced L["Faction"] with _G.FACTION
Replaced L["Instance"] with _G.INSTANCE
Replaced L["Raid"] with _G.RAID
Replaced L["PVP"] with _G.PVP
Replaced L["Old World"] with _G.EXPANSION_NAME0
Replaced L["Burning Crusade"] with _G.EXPANSION_NAME1
Replaced L["Lich King"] with _G.EXPANSION_NAME2
Replaced L["Armor"] with _G.ARMOR and _G.ARMOR_COLON
Replaced L["Tanks"] with _G.TANK
Replaced L["Melee DPS"] with _G.MELEE
Replaced L["Caster DPS"] with _G.DAMAGER
Replaced L["Healers"] with _G.HEALER
Removed the unused localizations L["Apply"] and L["APPLY_DESC"], and L["Wrath of the Lich King"].
Filename
ARLConfig.lua
ARLFrame.lua
AckisRecipeList.lua
Locals/testenUS.lua
diff --git a/ARLConfig.lua b/ARLConfig.lua
index 527c693..54e9c85 100644
--- a/ARLConfig.lua
+++ b/ARLConfig.lua
@@ -73,7 +73,7 @@ local function fullOptions()
 						version = {
 							order	= 11,
 							type	= "description",
-							name	= L["Version"] .. addon.version .. "\n",
+							name	= _G.GAME_VERSION_LABEL .. ": " .. addon.version .. "\n",
 						},
 						run = {
 							order	= 12,
@@ -176,9 +176,21 @@ local function fullOptions()
 							type	= "select",
 							name	= L["Sorting"],
 							desc	= L["SORTING_DESC"],
-							get		= function() return addon.db.profile.sorting end,
-							set		= function(info,name) addon.db.profile.sorting = name end,
-							values	= function() return {Name = L["Name"], SkillAsc = L["Skill (Asc)"], SkillDesc = L["Skill (Desc)"], Acquisition = L["Acquisition"], Location = L["Location"]} end,
+							get	= function()
+									  return addon.db.profile.sorting
+								  end,
+							set	= function(info, name)
+									  addon.db.profile.sorting = name
+								  end,
+							values	= function()
+									  return {
+										  Name = _G.NAME,
+										  SkillAsc = L["Skill (Asc)"],
+										  SkillDesc = L["Skill (Desc)"],
+										  Acquisition = L["Acquisition"],
+										  Location = L["Location"]
+									  }
+								  end,
 						},
 					},
 				},
@@ -230,7 +242,7 @@ local function giveMap()
 				worldmap = {
 					order	= 3,
 					type	= "toggle",
-					name	= L["World Map"],
+					name	= _G.WORLD_MAP,
 					desc	= L["WORLDMAP_DESC"],
 					disabled = tomtomsupport,
 					get		= function() return addon.db.profile.worldmap end,
@@ -551,7 +563,7 @@ local function giveDisplay()
 				fontsize = {
 					order	= 4,
 					type	= "range",
-					name	= L["Font Size"],
+					name	= _G.FONT_SIZE,
 					desc	= L["FONT_SIZE_DESC"],
 					min		= 6,
 					max		= 20,
@@ -612,18 +624,43 @@ local function giveDisplay()
 					type	= "select",
 					name	= L["Tooltip (Acquire) Position"],
 					desc	= L["ACQUIRETOOLTIPPOSITION_DESC"],
-					get		= function() return addon.db.profile.acquiretooltiplocation end,
-					set		= function(info,name) addon.db.profile.acquiretooltiplocation = name end,
-					values	= function() return {Right = L["Right"], Left = L["Left"], Top = L["Top"], Bottom = L["Bottom"], Off = L["Off"], Mouse = L["Mouse"]} end,
+					get	= function()
+							  return addon.db.profile.acquiretooltiplocation
+						  end,
+					set	= function(info, name)
+							  addon.db.profile.acquiretooltiplocation = name
+						  end,
+					values	= function()
+							  return {
+								  Right = L["Right"],
+								  Left = L["Left"],
+								  Top = L["Top"],
+								  Bottom = L["Bottom"],
+								  Off = _G.OFF,
+								  Mouse = _G.MOUSE_LABEL
+							  }
+						  end,
 				},
 				spelltooltiplocation = {
 					order	= 22,
 					type	= "select",
 					name	= L["Tooltip (Recipe) Position"],
 					desc	= L["SPELLTOOLTIPPOSITION_DESC"],
-					get		= function() return addon.db.profile.spelltooltiplocation end,
-					set		= function(info,name) addon.db.profile.spelltooltiplocation = name end,
-					values	= function() return {Right = L["Right"], Left = L["Left"], Top = L["Top"], Bottom = L["Bottom"], Off = L["Off"]} end,
+					get	= function()
+							  return addon.db.profile.spelltooltiplocation
+						  end,
+					set	= function(info,name)
+							  addon.db.profile.spelltooltiplocation = name
+						  end,
+					values	= function()
+							  return {
+								  Right = L["Right"],
+								  Left = L["Left"],
+								  Top = L["Top"],
+								  Bottom = L["Bottom"],
+								  Off = _G.OFF
+							  }
+						  end,
 				},
 			},
 		}
diff --git a/ARLFrame.lua b/ARLFrame.lua
index 4edfe30..3beff7a 100644
--- a/ARLFrame.lua
+++ b/ARLFrame.lua
@@ -106,7 +106,7 @@ local ARL_ExpGeneralOptCB, ARL_ExpObtainOptCB, ARL_ExpBindingOptCB, ARL_ExpItemO
 -------------------------------------------------------------------------------
 StaticPopupDialogs["ARL_NOTSCANNED"] = {
 	text = L["NOTSCANNED"],
-	button1 = L["Ok"],
+	button1 = _G.OKAY,
 	timeout = 0,
 	exclusive = 1,
 	whileDead = 1,
@@ -115,7 +115,7 @@ StaticPopupDialogs["ARL_NOTSCANNED"] = {

 StaticPopupDialogs["ARL_ALLFILTERED"] = {
 	text = L["ALL_FILTERED"],
-	button1 = L["Ok"],
+	button1 = _G.OKAY,
 	timeout = 0,
 	exclusive = 1,
 	whileDead = 1,
@@ -124,7 +124,7 @@ StaticPopupDialogs["ARL_ALLFILTERED"] = {

 StaticPopupDialogs["ARL_ALLKNOWN"] = {
 	text = L["ARL_ALLKNOWN"],
-	button1 = L["Ok"],
+	button1 = _G.OKAY,
 	timeout = 0,
 	exclusive = 1,
 	whileDead = 1,
@@ -133,7 +133,7 @@ StaticPopupDialogs["ARL_ALLKNOWN"] = {

 StaticPopupDialogs["ARL_ALLEXCLUDED"] = {
 	text = L["ARL_ALLEXCLUDED"],
-	button1 = L["Ok"],
+	button1 = _G.OKAY,
 	timeout = 0,
 	exclusive = 1,
 	whileDead = 1,
@@ -142,7 +142,7 @@ StaticPopupDialogs["ARL_ALLEXCLUDED"] = {

 StaticPopupDialogs["ARL_SEARCHFILTERED"] = {
 	text = L["ARL_SEARCHFILTERED"],
-	button1 = L["Ok"],
+	button1 = _G.OKAY,
 	timeout = 0,
 	exclusive = 1,
 	whileDead = 1,
@@ -326,7 +326,7 @@ function MainPanel:UpdateTitle()
 				total = total + 1
 			end
 		end
-		self.title_bar:SetFormattedText(addon:Normal("ARL (v.%s) - %s (%d/%d %s)"), addon.version, Player["Profession"], active, total, L["Filters"])
+		self.title_bar:SetFormattedText(addon:Normal("ARL (v.%s) - %s (%d/%d %s)"), addon.version, Player["Profession"], active, total, _G.FILTERS)
 	else
 		self.title_bar:SetFormattedText(addon:Normal("ARL (v.%s) - %s"), addon.version, Player["Profession"])
 	end
@@ -1040,11 +1040,11 @@ local function GenerateTooltipContent(owner, rIndex)
 	local recipe_entry = addon.recipe_list[rIndex]
 	local spellLink = recipe_entry["RecipeLink"]

-	if acquireTooltipLocation == L["Off"] then
+	if acquireTooltipLocation == _G.OFF then
 		QTip:Release(arlTooltip)

 		-- If we have the spell link tooltip, anchor it to MainPanel instead so it shows
-		if spellTooltipLocation ~= L["Off"] and spellLink then
+		if spellTooltipLocation ~= _G.OFF and spellLink then
 			SetSpellTooltip(MainPanel, spellTooltipLocation, spellLink)
 		else
 			arlSpellTooltip:Hide()
@@ -1306,7 +1306,7 @@ local function GenerateTooltipContent(owner, rIndex)
 			end
 			clr1 = addon:hexcolor("REP")
 			clr2 = addon:hexcolor("NORMAL")
-			ttAdd(0, -1, 0, L["Reputation"], clr1, repname, clr2)
+			ttAdd(0, -1, 0, _G.REPUTATION, clr1, repname, clr2)

 			local rStr = ""
 			if (rplvl == 0) then
@@ -1430,7 +1430,7 @@ local function GenerateTooltipContent(owner, rIndex)
 	arlTooltip:Show()

 	-- If we have the spell link tooltip, link it to the acquire tooltip.
-	if spellTooltipLocation ~= L["Off"] and spellLink then
+	if spellTooltipLocation ~= _G.OFF and spellLink then
 		SetSpellTooltip(arlTooltip, spellTooltipLocation, spellLink)
 	else
 		arlSpellTooltip:Hide()
@@ -1573,13 +1573,13 @@ end

 -- Some variables I want to use in creating the GUI later... (ZJ 8/26/08)
 local ExpButtonText = {
-	L["General"],		-- 1
+	_G.GENERAL,		-- 1
 	L["Obtain"],		-- 2
 	L["Binding"],		-- 3
 	L["Item"],		-- 4
-	L["Player Type"],	-- 5
-	L["Reputation"],	-- 6
-	L["Misc"]		-- 7
+	_G.ROLE,	-- 5
+	_G.REPUTATION,		-- 6
+	_G.MISCELLANEOUS
 }

 local function HideARL_ExpOptCB(ignorevalue)
@@ -1701,7 +1701,7 @@ do
 		-- 2	ARL_ExpObtainOptCB			Obtain Filters
 		-- 3	ARL_ExpBindingOptCB			Binding Filters
 		-- 4	ARL_ExpItemOptCB			Item Filters
-		-- 5	ARL_ExpPlayerOptCB			Player Type Filters
+		-- 5	ARL_ExpPlayerOptCB			Role Filters
 		-- 6	ARL_ExpRepOptCB				Reputation Filters
 		-- 7	ARL_ExpMiscOptCB			Miscellaneous Filters

@@ -1846,13 +1846,13 @@ do
 		if ChangeFilters then
 			-- Depending on which panel we're showing, either display one column
 			-- or two column
-			if ((panel == 3) or (panel == 4) or (panel == 7)) then
+			if panel == 2 or panel == 3 or panel == 4 or panel == 7 then
 				addon.flyTexture:ClearAllPoints()
 				addon.Flyaway:SetWidth(FLYAWAY_DOUBLE_WIDTH)
 				addon.flyTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\fly_2col]])
 				addon.flyTexture:SetAllPoints(addon.Flyaway)
 				addon.flyTexture:SetTexCoord(0, (FLYAWAY_DOUBLE_WIDTH/256), 0, (FLYAWAY_HEIGHT/512))
-			elseif ((panel == 1) or (panel == 2) or (panel == 5) or (panel == 6)) then
+			elseif ((panel == 1) or (panel == 5) or (panel == 6)) then
 				addon.flyTexture:ClearAllPoints()
 				addon.Flyaway:SetWidth(FLYAWAY_SINGLE_WIDTH)
 				addon.flyTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\fly_1col]])
@@ -1970,7 +1970,7 @@ local function SetSortName()
 	local sort_type = addon.db.profile.sorting

 	if sort_type == "Name" then
-		ARL_DD_SortText:SetText(L["Sort"] .. ": " .. L["Name"])
+		ARL_DD_SortText:SetText(L["Sort"] .. ": " .. _G.NAME)
 	elseif sort_type == "SkillAsc" then
 		ARL_DD_SortText:SetText(L["Sort"] .. ": " .. L["Skill (Asc)"])
 	elseif sort_type == "SkillDesc" then
@@ -2451,7 +2451,7 @@ function addon:InitializeFrame()

 	local ARL_SearchButton = GenericCreateButton("ARL_SearchButton", MainPanel,
 						     25, 74, "TOPLEFT", ARL_DD_Sort, "BOTTOMRIGHT", 1, 4, "GameFontDisableSmall",
-						     "GameFontHighlightSmall", L["Search"], "CENTER", L["SEARCH_DESC"], 1)
+						     "GameFontHighlightSmall", _G.SEARCH, "CENTER", L["SEARCH_DESC"], 1)
 	ARL_SearchButton:Disable()
 	ARL_SearchButton:SetScript("OnClick",
 				   function(this)
@@ -2712,7 +2712,7 @@ function addon:InitializeFrame()
 	-------------------------------------------------------------------------------
 	local ARL_ResetButton = GenericCreateButton("ARL_ResetButton", MainPanel,
 						    25, 90, "TOPRIGHT", ARL_FilterButton, "BOTTOMRIGHT", 0, -2, "GameFontNormalSmall",
-						    "GameFontHighlightSmall", L["Reset"], "CENTER", L["RESET_DESC"], 1)
+						    "GameFontHighlightSmall", _G.RESET, "CENTER", L["RESET_DESC"], 1)
 	ARL_ResetButton:SetScript("OnClick",
 				  function()
 					  local filterdb = addon.db.profile.filters
@@ -2836,11 +2836,11 @@ function addon:InitializeFrame()

 	local ARL_LevelCB = CreateFrame("CheckButton", "ARL_LevelCB", addon.Fly_General, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_LevelCB, addon.Fly_General, L["SKILL_DESC"], "skill", 2, 1, 0)
-	ARL_LevelCBText:SetText(L["Skill"])
+	ARL_LevelCBText:SetText(_G.SKILL)

 	local ARL_FactionCB = CreateFrame("CheckButton", "ARL_FactionCB", addon.Fly_General, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_FactionCB, addon.Fly_General, L["FACTION_DESC"], "faction", 3, 1, 0)
-	ARL_FactionCBText:SetText(L["Faction"])
+	ARL_FactionCBText:SetText(_G.FACTION)

 	local ARL_KnownCB = CreateFrame("CheckButton", "ARL_KnownCB", addon.Fly_General, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_KnownCB, addon.Fly_General, L["KNOWN_DESC"], "known", 4, 1, 0)
@@ -2951,11 +2951,11 @@ function addon:InitializeFrame()
 	-------------------------------------------------------------------------------
 	local ARL_InstanceCB = CreateFrame("CheckButton", "ARL_InstanceCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_InstanceCB, addon.Fly_Obtain, L["INSTANCE_DESC"], "instance", 1, 1, 0)
-	ARL_InstanceCBText:SetText(L["Instance"])
+	ARL_InstanceCBText:SetText(_G.INSTANCE)

 	local ARL_RaidCB = CreateFrame("CheckButton", "ARL_RaidCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_RaidCB, addon.Fly_Obtain, L["RAID_DESC"], "raid", 2, 1, 0)
-	ARL_RaidCBText:SetText(L["Raid"])
+	ARL_RaidCBText:SetText(_G.RAID)

 	local ARL_QuestCB = CreateFrame("CheckButton", "ARL_QuestCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_QuestCB, addon.Fly_Obtain, L["QUEST_DESC"], "quest", 3, 1, 0)
@@ -2975,7 +2975,7 @@ function addon:InitializeFrame()

 	local ARL_PVPCB = CreateFrame("CheckButton", "ARL_PVPCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_PVPCB, addon.Fly_Obtain, L["PVP_DESC"], "pvp", 7, 1, 0)
-	ARL_PVPCBText:SetText(L["PVP"])
+	ARL_PVPCBText:SetText(_G.PVP)

 	local ARL_DiscoveryCB = CreateFrame("CheckButton", "ARL_DiscoveryCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_DiscoveryCB, addon.Fly_Obtain, L["DISCOVERY_DESC"], "discovery", 8, 1, 0)
@@ -2991,15 +2991,15 @@ function addon:InitializeFrame()

 	local ARL_OriginalWoWCB = CreateFrame("CheckButton", "ARL_OriginalWoWCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_OriginalWoWCB, addon.Fly_Obtain, L["ORIGINAL_WOW_DESC"], "originalwow", 12, 1, 0)
-	ARL_OriginalWoWCBText:SetText(L["Old World"])
+	ARL_OriginalWoWCBText:SetText(_G.EXPANSION_NAME0)

 	local ARL_BCCB = CreateFrame("CheckButton", "ARL_BCCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_BCCB, addon.Fly_Obtain, L["BC_WOW_DESC"], "bc", 13, 1, 0)
-	ARL_BCCBText:SetText(L["Burning Crusade"])
+	ARL_BCCBText:SetText(_G.EXPANSION_NAME1)

 	local ARL_WrathCB = CreateFrame("CheckButton", "ARL_WrathCB", addon.Fly_Obtain, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_WrathCB, addon.Fly_Obtain, L["LK_WOW_DESC"], "wrath", 14, 1, 0)
-	ARL_WrathCBText:SetText(L["Lich King"])
+	ARL_WrathCBText:SetText(_G.EXPANSION_NAME2)

 	addon.Fly_Binding = CreateFrame("Frame", "ARL_Fly_Binding", addon.Flyaway)
 	addon.Fly_Binding:SetWidth(FLYAWAY_LARGE)
@@ -3051,8 +3051,8 @@ function addon:InitializeFrame()
 	-------------------------------------------------------------------------------
 	local ARL_ArmorButton = GenericCreateButton("ARL_ArmorButton", addon.Fly_Item,
 						    20, 105, "TOPLEFT", addon.Fly_Item, "TOPLEFT", -2, -4, "GameFontHighlight",
-						    "GameFontHighlightSmall", L["Armor"], "LEFT", L["ARMOR_TEXT_DESC"], 0)
-	ARL_ArmorButton:SetText(L["Armor"] .. ":")
+						    "GameFontHighlightSmall", _G.ARMOR, "LEFT", L["ARMOR_TEXT_DESC"], 0)
+	ARL_ArmorButton:SetText(_G.ARMOR_COLON)
 	ARL_ArmorButton:SetHighlightTexture("Interface\\Buttons\\UI-PlusButton-Hilight")
 	ARL_ArmorButton:RegisterForClicks("LeftButtonUp", "RightButtonUp")
 	ARL_ArmorButton:SetScript("OnClick",
@@ -3248,19 +3248,19 @@ function addon:InitializeFrame()

 	local ARL_PlayerTankCB = CreateFrame("CheckButton", "ARL_PlayerTankCB", addon.Fly_Player, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_PlayerTankCB, addon.Fly_Player, L["TANKS_DESC"], "tank", 1, 1, 0)
-	ARL_PlayerTankCBText:SetText(L["Tanks"])
+	ARL_PlayerTankCBText:SetText(_G.TANK)

 	local ARL_PlayerMeleeCB = CreateFrame("CheckButton", "ARL_PlayerMeleeCB", addon.Fly_Player, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_PlayerMeleeCB, addon.Fly_Player, L["MELEE_DPS_DESC"], "melee", 2, 1, 0)
-	ARL_PlayerMeleeCBText:SetText(L["Melee DPS"])
+	ARL_PlayerMeleeCBText:SetText(_G.MELEE)

 	local ARL_PlayerHealerCB = CreateFrame("CheckButton", "ARL_PlayerHealerCB", addon.Fly_Player, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_PlayerHealerCB, addon.Fly_Player, L["HEALERS_DESC"], "healer", 3, 1, 0)
-	ARL_PlayerHealerCBText:SetText(L["Healers"])
+	ARL_PlayerHealerCBText:SetText(_G.HEALER)

 	local ARL_PlayerCasterCB = CreateFrame("CheckButton", "ARL_PlayerCasterCB", addon.Fly_Player, "UICheckButtonTemplate")
 	Generic_MakeCheckButton(ARL_PlayerCasterCB, addon.Fly_Player, L["CASTER_DPS_DESC"], "caster", 4, 1, 0)
-	ARL_PlayerCasterCBText:SetText(L["Caster DPS"])
+	ARL_PlayerCasterCBText:SetText(_G.DAMAGER)

 	addon.Fly_Rep = CreateFrame("Frame", "ARL_Fly_Rep", addon.Flyaway)
 	addon.Fly_Rep:SetWidth(FLYAWAY_SMALL)
@@ -3365,8 +3365,8 @@ function addon:InitializeFrame()

 	local ARL_Rep_OWButton = GenericCreateButton("ARL_Rep_OWButton", addon.Fly_Rep_OW,
 						     20, 140, "TOPLEFT", addon.Fly_Rep_OW, "TOPLEFT", -2, -4, "GameFontHighlight",
-						     "GameFontHighlightSmall", L["Reputation"], "LEFT", L["REP_TEXT_DESC"], 0)
-	ARL_Rep_OWButton:SetText(L["Reputation"] .. ":")
+						     "GameFontHighlightSmall", _G.REPUTATION, "LEFT", L["REP_TEXT_DESC"], 0)
+	ARL_Rep_OWButton:SetText(_G.REPUTATION .. ":")
 	ARL_Rep_OWButton:SetHighlightTexture("Interface\\Buttons\\UI-PlusButton-Hilight")
 	ARL_Rep_OWButton:RegisterForClicks("LeftButtonUp", "RightButtonUp")
 	ARL_Rep_OWButton:SetScript("OnClick",
@@ -3438,8 +3438,8 @@ function addon:InitializeFrame()

 	local ARL_Rep_BCButton = GenericCreateButton("ARL_Rep_OWButton", addon.Fly_Rep_BC,
 						     20, 140, "TOPLEFT", addon.Fly_Rep_BC, "TOPLEFT", -2, -4, "GameFontHighlight",
-						     "GameFontHighlightSmall", L["Reputation"], "LEFT", L["REP_TEXT_DESC"], 0)
-	ARL_Rep_BCButton:SetText(L["Reputation"] .. ":")
+						     "GameFontHighlightSmall", _G.REPUTATION, "LEFT", L["REP_TEXT_DESC"], 0)
+	ARL_Rep_BCButton:SetText(_G.REPUTATION .. ":")
 	ARL_Rep_BCButton:SetHighlightTexture("Interface\\Buttons\\UI-PlusButton-Hilight")
 	ARL_Rep_BCButton:RegisterForClicks("LeftButtonUp", "RightButtonUp")
 	ARL_Rep_BCButton:SetScript("OnClick",
@@ -3583,8 +3583,8 @@ function addon:InitializeFrame()

 	local ARL_Rep_LKButton = GenericCreateButton("ARL_Rep_OWButton", addon.Fly_Rep_LK,
 						     20, 140, "TOPLEFT", addon.Fly_Rep_LK, "TOPLEFT", -2, -4, "GameFontHighlight",
-						     "GameFontHighlightSmall", L["Reputation"], "LEFT", L["REP_TEXT_DESC"], 0)
-	ARL_Rep_LKButton:SetText(L["Reputation"] .. ":")
+						     "GameFontHighlightSmall", _G.REPUTATION, "LEFT", L["REP_TEXT_DESC"], 0)
+	ARL_Rep_LKButton:SetText(_G.REPUTATION .. ":")
 	ARL_Rep_LKButton:SetHighlightTexture("Interface\\Buttons\\UI-PlusButton-Hilight")
 	ARL_Rep_LKButton:RegisterForClicks("LeftButtonUp", "RightButtonUp")
 	ARL_Rep_LKButton:SetScript("OnClick",
@@ -3723,7 +3723,7 @@ function addon:InitializeFrame()
 	addon.Fly_Misc:Hide()

 	local ARL_MiscText = addon.Fly_Misc:CreateFontString("ARL_MiscText", "OVERLAY", "GameFontHighlight")
-	ARL_MiscText:SetText(L["Miscellaneous"] .. ":")
+	ARL_MiscText:SetText(_G.MISCELLANEOUS .. ":")
 	ARL_MiscText:SetPoint("TOPLEFT", addon.Fly_Misc, "TOPLEFT", 5, -8)
 	ARL_MiscText:SetHeight(14)
 	ARL_MiscText:SetWidth(150)
@@ -3856,7 +3856,7 @@ function addon:InitializeFrame()
 		["ammo"]		= { cb = ARL_WeaponAmmoCB,		svroot = filterdb.item.weapon },
 		["gun"]			= { cb = ARL_WeaponGunCB,		svroot = filterdb.item.weapon },
 		------------------------------------------------------------------------------------------------
-		-- Player Type Options
+		-- Role Options
 		------------------------------------------------------------------------------------------------
 		["tank"]		= { cb = ARL_PlayerTankCB,		svroot = filterdb.player },
 		["melee"]		= { cb = ARL_PlayerMeleeCB,		svroot = filterdb.player },
@@ -4297,7 +4297,7 @@ do
 				local rep_vendor = addon.vendor_list[v["RepVendor"]]

 				if CheckDisplayFaction(rep_vendor["Faction"]) then
-					t.text = pad .. addon:Rep(L["Reputation"] .. " : ") .. addon.reputation_list[v["ID"]]["Name"]
+					t.text = pad .. addon:Rep(_G.REPUTATION .. " : ") .. addon.reputation_list[v["ID"]]["Name"]
 					tinsert(self.entries, entry_index, t)
 					entry_index = entry_index + 1

diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua
index c3985e7..e3d5815 100644
--- a/AckisRecipeList.lua
+++ b/AckisRecipeList.lua
@@ -1407,7 +1407,7 @@ end
 function addon:ChatCommand(input)

 	-- Open About panel if there's no parameters or if we do /arl about
-	if (not input) or (input and input:trim() == "") or (input == strlower(L["Sorting"])) or (input == strlower(L["Sort"]))  or (input == strlower(L["Display"])) then
+	if not input or (input and input:trim() == "") or input == strlower(L["Sorting"]) or input == strlower(L["Sort"])  or input == strlower(_G.DISPLAY) then
 		InterfaceOptionsFrame_OpenToCategory(self.optionsFrame)
 	elseif (input == strlower(L["About"])) then
 		if (self.optionsFrame["About"]) then
@@ -1417,7 +1417,7 @@ function addon:ChatCommand(input)
 		end
 	elseif (input == strlower(L["Profile"])) then
 		InterfaceOptionsFrame_OpenToCategory(self.optionsFrame["Profiles"])
-	elseif (input == strlower(L["Filter"])) then
+	elseif (input == strlower(_G.FILTER)) then
 		InterfaceOptionsFrame_OpenToCategory(self.optionsFrame["Filters"])
 	elseif (input == strlower(L["Documentation"])) then
 		InterfaceOptionsFrame_OpenToCategory(self.optionsFrame["Documentation"])
diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua
index 7c7900d..eaf7068 100644
--- a/Locals/testenUS.lua
+++ b/Locals/testenUS.lua
@@ -32,25 +32,22 @@ local L = LibStub("AceLocale-3.0"):NewLocale(MODNAME, "enUS", true)
 if not L then return end

 -- General strings
-L["Filters"]				= true
-L["Ok"]						= true

 -- Command line options
-L["Profile"]				= true
-L["Filter"]					= true
+L["Profile"]			= true

 -- Config Options
-L["About"]					= true
-L["Main Options"]			= true
+L["About"]			= true
+L["Main Options"]		= true
 L["General Options"]		= true
 L["Display Options"]		= true
 L["Main Filter Options"]	= true
 L["Sorting Options"]		= true
 L["Profile Options"]		= true
 L["Tooltip Options"]		= true
-L["Map Options"]			= true
+L["Map Options"]		= true
 L["ARL Documentation"]		= true
-L["Documentation"]			= true
+L["Documentation"]		= true

 -- Config UI Elements and their associated descriptions
 L["MAIN_OPTIONS_DESC"]		= "Main configuration options"
@@ -58,26 +55,26 @@ L["Scan"]					= true
 L["SCAN_RECIPES_DESC"]		= [[Scans an open tradeskill for missing recipes.
 Shift-click to generate a text dump.
 Alt-click to remove all waypoints from the mini-map and world map.]]
-L["Text Dump"]				= true
-L["TEXT_DUMP_DESC"]			= "Displays all recipes in a comma separated value format which can be copied and pasted into another client."
+L["Text Dump"]			= true
+L["TEXT_DUMP_DESC"]		= "Displays all recipes in a comma separated value format which can be copied and pasted into another client."
 L["View Exclusion List"]	= true
 L["Clear Exclusion List"]	= true
 L["Reset All Filters"]		= true
 L["Scan Button Position"]	= true
-L["SCANBUTTONPOSITION_DESC"] = "Allows you to customize where the scan button is placed on the tradeskill frame."
-L["VIEW_EXCLUSION_LIST_DESC"] = "Prints out a list of all recipes on the exclusion list."
-L["CLEAR_EXCLUSION_LIST_DESC"] = "Removes all recipes from the exclusion list."
-L["MAINFILTER_OPTIONS_DESC"] = "Allows you to specify how ARL handles different filters."
+L["SCANBUTTONPOSITION_DESC"]	= "Allows you to customize where the scan button is placed on the tradeskill frame."
+L["VIEW_EXCLUSION_LIST_DESC"]	= "Prints out a list of all recipes on the exclusion list."
+L["CLEAR_EXCLUSION_LIST_DESC"]	= "Removes all recipes from the exclusion list."
+L["MAINFILTER_OPTIONS_DESC"]	= "Allows you to specify how ARL handles different filters."
 L["DISPLAY_OPTIONS_DESC"]	= "Allows you to customize how the GUI behaves."
 L["SORTING_OPTIONS_DESC"]	= "Allows you to customize the way displayed recipes are sorted."
-L["ARL_DOC_DESC"]			= "Documentation for Ackis Recipe List"
+L["ARL_DOC_DESC"]		= "Documentation for Ackis Recipe List"

 -- UI Documentation
-L["Using Filters"]			= true
+L["Using Filters"]		= true
 L["USING_FILTERS_DESC"]		= [[Filters may be toggled on or off.  There are two types of filters: one which will prevent the recipe from showing up at all, and one which will prevent a specific type of acquire information from showing up.
 With the first type of filter, these match the proprieties of the recipe (ie: binding).  If you toggle ARL to not show BoP recipes, no recipes that are BoP will show up in the scan.  The second type of filter deals with acquire information.  If a recipe is available as a mob drop, or from a vendor and you toggle to not show vendor recipes, the recipe will still show up but vendor information will be hidden for it.  The reason is that there is still another way to acquire this recipe (mob drop) so it should still be included in the scan.
 Please note that the tooltips will always hide the opposite faction methods of acquiring a recipe.  This has been done to save space in the tooltip since they can get quite large.]]
-L["Reporting Bugs"]			= true
+L["Reporting Bugs"]		= true
 L["REPORTING_BUGS_DESC"]	= [[When reporting a bug, please make sure you do the following:
 1) Download the latest version, available from http://www.wowace.com/projects/arl/files/
 2) Make sure there is not a bug report filed for your issue already.  You can check these at http://www.wowace.com/projects/arl/tickets/
@@ -86,16 +83,16 @@ L["REPORTING_BUGS_DESC"]	= [[When reporting a bug, please make sure you do the f
 5) If your problem is not listed and you are using the latest version verify your addon settings.  Verify filters, profiles, etc.
 6) You have found a bug that no one has reported before.  Create a new ticket at http://www.wowace.com/projects/arl/tickets/ with a descriptive heading about the problem.  In the ticket make sure you include the error message that you received (just the error message, I don't need a listing of the addons you use), the recipe/profession you were working with, and any other info that you think may help.
 When posting a bug report, do NOT include all of the addons from swatter.  This just makes it difficult to read.  If you want a good error reporting mod, get BugSack.  Do not post errors/missing recipes in the comments, or send them to me via a PM.  Post them as a ticket which I can address and track easily.]]
-L["Common Issues"]			= true
+L["Common Issues"]		= true
 L["COMMON_ISSUES_DESC"]		= [[Please refer to these common issues before submitting a bug report.
 1) Recipe X does not show up! - Check your filter settings to make sure that the recipe is not being filtered.
 2) Inscription is missing so many glyphs! Why aren't they listed?  Turn off your 'classes' filter.  By default (and due to popular request) ARL will only show recipes which your class can use and most glyphs are not usable by your class.
 3) I don't want to see opposite faction recipes! Turn on the factions filter.  This will set it up to only display your factions obtainable recipes.  If something still shows up and it shouldn't, please submit a bug report.]]
 L["Exclusion Issues"]		= true
 L["EXCLUSION_ISSUES_DESC"]	= "To add a recipe to the exclusion (ignore) list, just alt-click on it from the recipe window.  To get this recipe back, open up the ARL options and set the toggle of \"Show Excluded Recipes\" to be on.  This will show all the recipes you've excluded in your scan during your next scan.  Once you have done this, Alt Click on the recipe again to remove it from the exclusion list."
-L["Map Issues"]				= true
+L["Map Issues"]			= true
 L["MAP_ISSUES_DESC"]		= "ARL relies on TomTom to add icons and waypoints to the World Map and the Mini-map.  You can customize these by going to the ARL configuration menu and scrolling to the display options.  If you do not have TomTom installed, nothing will be added.  Auto-adding icons is disabled by default."
-L["Game Commands"]			= true
+L["Game Commands"]		= true
 L["GAME_COMMANDS_DESC"]		= [[Command Line:
 Ackis Recipe List has recently changed to use a GUI for change parameters.  Type /arl to open up the GUI.  Acceptable commands include:
 - /arl about
@@ -145,74 +142,58 @@ L["Include Filtered"]		= true
 L["FILTERCOUNT_DESC"]		= "Include filtered recipes in the count of total recipes."
 L["Include Excluded"]		= true
 L["EXCLUDECOUNT_DESC"]		= "Include excluded recipes in the count of total recipes."
-L["Close GUI"]				= "Close with Tradeskill UI"
-L["CLOSEGUI_DESC"]			= "Close the ARL window when the crafting window is closed."
+L["Close GUI"]			= "Close with Tradeskill UI"
+L["CLOSEGUI_DESC"]		= "Close the ARL window when the crafting window is closed."
 L["Display Exclusions"]		= true
 L["DISPLAY_EXCLUSION_DESC"]	= "Display recipes that are in the exclusion list."
 L["Reset Window Position"]	= true
 L["RESET_WINDOW_DESC"]		= "Resets the ARL GUI to default position."
-L["UI_SCALE_DESC"]			= "Changes the scale of the UI. Ranges from .5 to 1.5 (1 is default)"
-L["Tooltip Scale"]			= true
+L["UI_SCALE_DESC"]		= "Changes the scale of the UI. Ranges from .5 to 1.5 (1 is default)"
+L["Tooltip Scale"]		= true
 L["TOOLTIP_SCALE_DESC"]		= "Changes the scale of the ARL tooltip. Ranges from .5 to 1.5 (.9 is default)"
-L["Tooltip (Recipe) Position"] = true
-L["SPELLTOOLTIPPOSITION_DESC"] = "Changes the location of the tooltip containing the recipe information."
-L["Tooltip (Acquire) Position"] = true
+L["Tooltip (Recipe) Position"]	= true
+L["SPELLTOOLTIPPOSITION_DESC"]	= "Changes the location of the tooltip containing the recipe information."
+L["Tooltip (Acquire) Position"]	= true
 L["ACQUIRETOOLTIPPOSITION_DESC"] = "Changes the location of the tooltip containing the acquire information."
-L["Font Size"]				= true
-L["FONT_SIZE_DESC"]			= "Changes the size of the fonts for ARL."
-L["Sorting"]				= true
-L["Sort"]					= true
-L["Display"]				= true
-L["SORTING_DESC"]			= "Change the way in which displayed recipes are sorted."
+L["FONT_SIZE_DESC"]		= "Changes the size of the fonts for ARL."
+L["Sorting"]			= true
+L["Sort"]			= true
+L["SORTING_DESC"]		= "Change the way in which displayed recipes are sorted."
 L["TOOLTIP_OPTIONS_DESC"]	= "Allows you to specify how the tooltips for ARL behave.  The acquire tooltip lists the different information on how to acquire the recipe, whereas the spell tooltip lists the recipe information itself."
 L["MAP_OPTIONS_DESC"]		= "Allows you to change how ARL integrates into the world map and into the mini-map."
-L["Version"]				= "Version: "
-L["Right"]					= true
-L["Left"]					= true
-L["Off"]					= true
-L["Top"]					= true
-L["Bottom"]					= true
-L["Top Right"]				= true
-L["Top Left"]				= true
-L["Bottom Right"]			= true
-L["Bottom Left"]			= true
-L["Mouse"]					= true
-L["Name"]					= true
-L["Skill (Asc)"]			= true
-L["Skill (Desc)"]			= true
-L["Location"]				= true
-L["Acquisition"]			= true
+L["Right"]			= true
+L["Left"]			= true
+L["Top"]			= true
+L["Bottom"]			= true
+L["Top Right"]			= true
+L["Top Left"]			= true
+L["Bottom Right"]		= true
+L["Bottom Left"]		= true
+L["Skill (Asc)"]		= true
+L["Skill (Desc)"]		= true
+L["Location"]			= true
+L["Acquisition"]		= true
 L["Unhandled Recipe"]		= true
-L["World Map"]				= true
-L["Mini Map"]				= true
-L["WORLDMAP_DESC"]			= "Do you want missing vendor recipes to appear on the world map."
-L["MINIMAP_DESC"]			= "Do you want missing vendor recipes to appear on the mini map."
+L["Mini Map"]			= true
+L["WORLDMAP_DESC"]		= "Do you want missing vendor recipes to appear on the world map."
+L["MINIMAP_DESC"]		= "Do you want missing vendor recipes to appear on the mini map."
 L["Clear Waypoints"]		= true
 L["CLEAR_WAYPOINTS_DESC"]	= "Remove all ARL waypoints from TomTom."
-L["Hide Pop-Up"]			= true
-L["HIDEPOPUP_DESC"]			= "Prevents pop-ups notifying you why the scan window is empty from showing.  Pop-ups will always show for the first time after a new version has been added."
-L["Auto Scan Map"]			= true
+L["Hide Pop-Up"]		= true
+L["HIDEPOPUP_DESC"]		= "Prevents pop-ups notifying you why the scan window is empty from showing.  Pop-ups will always show for the first time after a new version has been added."
+L["Auto Scan Map"]		= true
 L["AUTOSCANMAP_DESC"]		= "Auto show all waypoints when doing a recipe scan."
-L["MAP_TRAINER_DESC"] = "Display trainers on the map."
-L["MAP_VENDOR_DESC"] = "Display vendors on the map."
-L["MAP_MONSTER_DESC"] = "Display monsters on the map."
-L["MAP_QUEST_DESC"] = "Display quests on the map."
+L["MAP_TRAINER_DESC"]		= "Display trainers on the map."
+L["MAP_VENDOR_DESC"]		= "Display vendors on the map."
+L["MAP_MONSTER_DESC"]		= "Display monsters on the map."
+L["MAP_QUEST_DESC"]		= "Display quests on the map."

 -- Filter Config Options
 L["Filtering Options"]		= true
-L["General"]				= true
-L["Obtain"]					= true
-L["Binding"]				= true
-L["Item"]					= true
-L["Armor"]					= true
-L["Weapon"]					= true
-L["Player Type"]			= true
-L["Reputation"]				= true
-L["Old World"]				= true
-L["Burning Crusade"]		= true
-L["Wrath of the Lich King"]	= true
-L["Misc"]					= true
-L["Lich King"]              = true
+L["Obtain"]			= true
+L["Binding"]			= true
+L["Item"]			= true
+L["Weapon"]			= true

 -- Filter Configuration Descriptions
 L["FILTERING_OPTIONS_DESC"]					= "Allows you to customize which recipes are filtered."
@@ -240,17 +221,15 @@ L["Lich King Rep. Filtering Options"]		= true
 L["FILTERING_WOTLK_DESC"]					= "Configuration for which Wrath of the Lich King Reputation reward recipes are included in the scan."
 L["REP_TEXT_DESC"]							= [[Left-click here to select all reputation filters.
 Right-click here to deselect all reputation filters.]]
-L["Miscellaneous"]							= true
 L["FILTERING_MISC_DESC"]					= "Configuration for miscellaneous options which are also present in the display options."
 L["ORIGINAL_WOW_DESC"] = "Recipes available with the original game."
-L["BC_WOW_DESC"] = "Recipes available with the Burning Crusade."
-L["LK_WOW_DESC"] = "Recipes available with the Wrath of the Lich King."
+L["BC_WOW_DESC"] = "Recipes available with The Burning Crusade."
+L["LK_WOW_DESC"] = "Recipes available with Wrath of the Lich King."
 L["Alt-Tradeskills"] = true
 L["ALT_TRADESKILL_DESC"] = "This will display a list of alts which have had trade skills scanned.  Clicking on the alt's name will output the tradeskill to chat."
 L["Other Realms"] = true

 -- General Filter UI Elements and their associated descriptions
-L["Faction"]				= true
 L["FACTION_DESC"]			= "Include both horde and alliance faction recipes in the scan."
 L["Classes"]				= true
 L["CLASS_DESC"]				= "Include this class in the scan.  This will filter on two factors: 1) Can the class use the recipe and 2) can the class learn the recipe."
@@ -258,31 +237,27 @@ L["CLASS_TEXT_DESC"]		= [[Left-click here to select all classes.
 Right-click here to select your own class.]]
 L["Specialties"]			= true
 L["SPECIALTY_DESC"]			= "Include all trade-skill specialties in the scan."
-L["Skill"]					= true
 L["SKILL_DESC"]				= "Include all recipes in the scan, regardless of your current skill level."
-L["Show Known"]					= true
+L["Show Known"]				= true
 L["KNOWN_DESC"]				= "Include all known recipes in the scan."
-L["Show Unknown"]				= true
+L["Show Unknown"]			= true
 L["UNKNOWN_DESC"]			= "Include all unknown recipes in the scan."

 -- Obtain Filter UI Elements and their associated descriptions
-L["Instance"]				= true
 L["INSTANCE_DESC"]			= "Recipes obtained from (5 man) instances should be included in the scan."
-L["Raid"]					= true
 L["RAID_DESC"]				= "Recipes obtained in raids (ie: Molten Core, Serpent Shrine Cavern, etc.) should be included in the scan."
-L["Quest"]					= true
+L["Quest"]				= true
 L["QUEST_DESC"]				= "Recipes obtained as quest rewards should be included in the scan."
 L["SEASONAL_DESC"]			= "Recipes obtained in world events should be included in the scan."
 L["Trainer"]				= true
 L["TRAINER_DESC"]			= "Recipes learned from trainers should be included in the scan."
 L["Vendor"]					= true
 L["VENDOR_DESC"]			= "Recipes purchased from vendors should be included in the scan."
-L["PVP"]					= true
 L["PVP_DESC"]				= "Recipes obtained through PVP should be included in the scan."
 L["Discovery"]				= true
 L["DISCOVERY_DESC"]			= "Recipes obtained through Discovery should be included in the scan."
 L["World Drop"]				= true
-L["WORLD_DROP_DESC"]		= "Recipes that are World Drops should be included in the scan."
+L["WORLD_DROP_DESC"]			= "Recipes that are World Drops should be included in the scan."
 L["Mob Drop"]				= true
 L["MOB_DROP_DESC"]			= "Recipes that are Mob Drops should be included in the scan."

@@ -303,7 +278,7 @@ L["RECIPE_BOA_DESC"]		= "Recipes that are Bind to Account should be included in
 -- Item - Armor UI Elements and their associated descriptions
 L["ARMOR_TEXT_DESC"]		= [[Left-click here to select all armor filters.
 Right-click here to deselect all armor filters.]]
-L["Cloth"]					= true
+L["Cloth"]				= true
 L["CLOTH_DESC"]				= "Recipes that make cloth items should be included in the scan."
 L["Leather"]				= true
 L["LEATHER_DESC"]			= "Recipes that make leather items should be included in the scan."
@@ -357,13 +332,9 @@ L["Gun"]					= true
 L["GUN_DESC"]				= "Recipes that make guns should be included in the scan."

 -- Player Type Filtering UI Elements and their associated descriptions
-L["Melee DPS"]				= true
 L["MELEE_DPS_DESC"]			= "Recipes that are used by melee dps players should be included in the scan."
-L["Tanks"]					= true
 L["TANKS_DESC"]				= "Recipes that are used by tank players should be included in the scan."
-L["Caster DPS"]				= true
-L["CASTER_DPS_DESC"]		= "Recipes that are used by casting dps players should be included in the scan."
-L["Healers"]				= true
+L["CASTER_DPS_DESC"]			= "Recipes that are used by casting dps players should be included in the scan."
 L["HEALERS_DESC"]			= "Recipes that are used by healer players should be included in the scan."

 -- Reputation Filtering UI Elements and their associated description
@@ -378,16 +349,12 @@ L["EXPANDALL"]				= "+ All"
 L["EXPANDALL_DESC"]			= "Expand all recipes listed below."
 L["CONTRACTALL"]			= "- All"
 L["CONTRACTALL_DESC"]		= "Minimize all recipes listed below."
-L["Search"]					= true
 L["SEARCH_DESC"]			= "Filter to recipes that contain text at left."
 L["SEARCH_BOX_DESC"]		= "Enter text to search"
 L["CLEAR_DESC"]				= "Clear the search text box."
-L["Close"]					= "Exit"
+L["Close"]				= "Exit"
 L["CLOSE_DESC"]				= "Close the Ackis Recipe List Window."
-L["Reset"]					= true
 L["RESET_DESC"]				= "Reset All Filters to default values."
-L["Apply"]					= true
-L["APPLY_DESC"]				= "Apply the above selected filters to the recipe list"
 L["NOT_YET_SCANNED"]		= "Not yet scanned!"

 -- Common Tool tip Strings (where different from above)