Quantcast

- Purge of unused strings from enUS localization.

HonorGoG [01-21-24 - 00:11]
- Purge of unused strings from enUS localization.
- Modified TITAN_<something> entries to TITAN_PANEL_<something> within enUS localization.
- Modified TITAN_REGEN_MENU_SHOW[2-4] to more descriptive names within enUS localization.
- Sorted entries for enUS localization for better lookup functionality for coders.
Filename
Titan/TitanAutoHide.lua
Titan/TitanConfig.lua
Titan/TitanGlobal.lua
Titan/TitanUtils.lua
Titan/locale/Localization.lua
TitanGold/TitanGold.lua
TitanPerformance/TitanPerformance.lua
TitanRegen/TitanClassicRegen.lua
TitanRegen/TitanRegen.lua
TitanXP/TitanXP.lua
diff --git a/Titan/TitanAutoHide.lua b/Titan/TitanAutoHide.lua
index 3d64047..5661c4b 100644
--- a/Titan/TitanAutoHide.lua
+++ b/Titan/TitanAutoHide.lua
@@ -53,7 +53,7 @@ function Titan_AutoHide_OnLoad(self)
 		category = "Built-ins",
 		version = TITAN_VERSION,
 		menuText = "AutoHide_"..bar,
-		tooltipTitle = L["TITAN_AUTOHIDE_TOOLTIP"],
+		tooltipTitle = L["TITAN_PANEL_AUTOHIDE_TOOLTIP"],
 		savedVariables = {
 			DisplayOnRightSide = 1,
 			ForceBar = bar,
diff --git a/Titan/TitanConfig.lua b/Titan/TitanConfig.lua
index 63c0b7b..aab633d 100644
--- a/Titan/TitanConfig.lua
+++ b/Titan/TitanConfig.lua
@@ -151,10 +151,10 @@ TITAN_PANEL_CONFIG = {
 		plugins			= L["TITAN_PANEL_MENU_PLUGINS"],
 		profiles		= L["TITAN_PANEL_MENU_PROFILES"],
 		tooltips		= L["TITAN_PANEL_MENU_OPTIONS_SHORT"],
-		scale			= L["TITAN_UISCALE_MENU_TEXT_SHORT"],
-		trans			= L["TITAN_TRANS_MENU_TEXT_SHORT"],
+		scale			= L["TITAN_PANEL_UISCALE_MENU_TEXT_SHORT"],
+		trans			= L["TITAN_PANEL_TRANS_MENU_TEXT_SHORT"],
 		skins			= L["TITAN_PANEL_MENU_TEXTURE_SETTINGS"],
-		skinscust		= L["TITAN_SKINS_OPTIONS_CUSTOM"],
+		skinscust		= L["TITAN_PANEL_SKINS_OPTIONS_CUSTOM"],
 		extras			= L["TITAN_PANEL_EXTRAS_SHORT"],
 		attempts		= L["TITAN_PANEL_ATTEMPTS_SHORT"],
 		advanced		= L["TITAN_PANEL_MENU_ADV"],
@@ -168,31 +168,31 @@ TITAN_PANEL_CONFIG = {

 -- Titan local helper funcs
 local function TitanPanel_GetTitle()
-	return TitanUtils_GetAddOnMetadata(TITAN_ID, "Title") or L["TITAN_NA"];
+	return TitanUtils_GetAddOnMetadata(TITAN_ID, "Title") or L["TITAN_PANEL_NA"];
 end

 local function TitanPanel_GetAuthor()
-	return TitanUtils_GetAddOnMetadata(TITAN_ID, "Author") or L["TITAN_NA"];
+	return TitanUtils_GetAddOnMetadata(TITAN_ID, "Author") or L["TITAN_PANEL_NA"];
 end

 local function TitanPanel_GetCredits()
-	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Credits") or L["TITAN_NA"];
+	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Credits") or L["TITAN_PANEL_NA"];
 end

 local function TitanPanel_GetCategory()
-	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Category") or L["TITAN_NA"];
+	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Category") or L["TITAN_PANEL_NA"];
 end

 local function TitanPanel_GetEmail()
-	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Email") or L["TITAN_NA"];
+	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Email") or L["TITAN_PANEL_NA"];
 end

 local function TitanPanel_GetWebsite()
-	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Website") or L["TITAN_NA"];
+	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-Website") or L["TITAN_PANEL_NA"];
 end

 local function TitanPanel_GetLicense()
-	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-License") or L["TITAN_NA"];
+	return TitanUtils_GetAddOnMetadata(TITAN_ID, "X-License") or L["TITAN_PANEL_NA"];
 end

 -- helper functions
@@ -349,42 +349,42 @@ local titan_entry = {
 			}
 		},
 		confinfodesc = {
-			name = L["TITAN_ABOUT"],
+			name = L["TITAN_PANEL_ABOUT"],
 			order = 7,
 			type = "group", inline = true,
 			args = {
 				confversiondesc = {
 				order = 1,
 				type = "description",
-				name = "|cffffd700"..L["TITAN_ABOUT_VERSION"]..": "
+				name = "|cffffd700"..L["TITAN_PANEL_ABOUT_VERSION"]..": "
 					.._G["GREEN_FONT_COLOR_CODE"]..TitanPanel_GetVersion(),
 				cmdHidden = true
 				},
 				confauthordesc = {
 					order = 2,
 					type = "description",
-					name = "|cffffd700"..L["TITAN_ABOUT_AUTHOR"]..": "
+					name = "|cffffd700"..L["TITAN_PANEL_ABOUT_AUTHOR"]..": "
 						.."|cffff8c00"..TitanPanel_GetAuthor(),
 					cmdHidden = true
 				},
 				confcreditsdesc = {
 					order = 3,
 					type = "description",
-					name = "|cffffd700"..L["TITAN_ABOUT_CREDITS"]..": "
+					name = "|cffffd700"..L["TITAN_PANEL_ABOUT_CREDITS"]..": "
 						.._G["HIGHLIGHT_FONT_COLOR_CODE"]..TitanPanel_GetCredits(),
 					cmdHidden = true
 				},
 				confcatdesc = {
 					order = 4,
 					type = "description",
-					name = "|cffffd700"..L["TITAN_ABOUT_CATEGORY"]..": "
+					name = "|cffffd700"..L["TITAN_PANEL_ABOUT_CATEGORY"]..": "
 						.._G["HIGHLIGHT_FONT_COLOR_CODE"]..TitanPanel_GetCategory(),
 					cmdHidden = true
 				},
 				confemaildesc = {
 					order = 5,
 					type = "description",
-					name = "|cffffd700"..L["TITAN_ABOUT_EMAIL"]..": "
+					name = "|cffffd700"..L["TITAN_PANEL_ABOUT_EMAIL"]..": "
 						.._G["HIGHLIGHT_FONT_COLOR_CODE"]..TitanPanel_GetEmail(),
 					cmdHidden = true
 				},
@@ -392,7 +392,7 @@ local titan_entry = {
 				confwebsitedesc = {
 					order = 6,
 					type = "description",
-					name = "|cffffd700"..L["TITAN_ABOUT_WEB"]..": "
+					name = "|cffffd700"..L["TITAN_PANEL_ABOUT_WEB"]..": "
 						.._G["HIGHLIGHT_FONT_COLOR_CODE"]..TitanPanel_GetWebsite(),
 					cmdHidden = true
 				},
@@ -400,7 +400,7 @@ local titan_entry = {
 				conflicensedesc = {
 					order = 7,
 					type = "description",
-					name = "|cffffd700"..L["TITAN_ABOUT_LICENSE"]..": "
+					name = "|cffffd700"..L["TITAN_PANEL_ABOUT_LICENSE"]..": "
 						.._G["HIGHLIGHT_FONT_COLOR_CODE"]..TitanPanel_GetLicense(),
 					cmdHidden = true
 				},
@@ -508,7 +508,7 @@ local function TitanUpdateAdj(t, pos)
 		position = position + 1 -- offset
 		args[f_name].args.offset = {
 			type = "range", width = "full",
-			name = "Vertical Adjustment", --L["TITAN_TRANS_MENU_TEXT_SHORT"],
+			name = "Vertical Adjustment", --L["TITAN_PANEL_TRANS_MENU_TEXT_SHORT"],
 			order = position,
 			min = -200, max = 0, step = 1,
 			get = function(info)
@@ -741,14 +741,14 @@ local function TitanUpdateConfigBars(t, pos)
 					TitanPanel_SetBarTexture(frame_str)
 				end,
 				values = {
-					[Titan_Panel.SKIN] = L["TITAN_SKINS_TITLE"],
+					[Titan_Panel.SKIN] = L["TITAN_PANEL_SKINS_TITLE"],
 					[Titan_Panel.COLOR] = COLOR,
 				},
 			}
 			position = position + 1 -- Title divider
 			args[v.name].args.skintitle = {
 				type = "header",
-				name = L["TITAN_SKINS_TITLE"],
+				name = L["TITAN_PANEL_SKINS_TITLE"],
 				order = position, width = "full",
 			}
 			position = position + 1 -- Skin select
@@ -810,7 +810,7 @@ local function TitanUpdateConfigBars(t, pos)
 			position = position + 1 -- transparency
 			args[v.name].args.trans = {
 				type = "range", width = "full",
-				name = L["TITAN_TRANS_MENU_TEXT_SHORT"],
+				name = L["TITAN_PANEL_TRANS_MENU_TEXT_SHORT"],
 				order = position,
 				min = 0, max = 1, step = 0.01,
 				get = function(info)
@@ -903,7 +903,7 @@ local optionsGlobals = {
 				end
 			end,
 			values = {
-				[Titan_Panel.SKIN] = L["TITAN_SKINS_TITLE"],
+				[Titan_Panel.SKIN] = L["TITAN_PANEL_SKINS_TITLE"],
 				[Titan_Panel.COLOR] = COLOR,
 				[Titan_Panel.NONE] = NONE,
 			},
@@ -911,12 +911,12 @@ local optionsGlobals = {
 		confskindesc = {
 			order = 20, width = "full",
 			type = "description",
-			name = L["TITAN_SKINS_TITLE"],
+			name = L["TITAN_PANEL_SKINS_TITLE"],
 		},
 		setskinglobal = {
 			order = 21, type = "select", width = "30",
-			name = " ", --L["TITAN_SKINS_LIST_TITLE"],
-			desc = L["TITAN_SKINS_SET_DESC"],
+			name = " ", --L["TITAN_PANEL_SKINS_LIST_TITLE"],
+			desc = L["TITAN_PANEL_SKINS_SET_DESC"],
 			get = function() return TitanBarDataVars["Global"].skin.path end,
 			set = function(_,v)
 				TitanBarDataVars["Global"].skin.path = v --TitanPanelSetVar("TexturePath", v);
@@ -1335,7 +1335,7 @@ local function TitanUpdateConfigAddons()
 					type = "description",
 					name = L["TITAN_PANEL_MENU_ADV_NOTES"],
 					order = 61,
-				name = _G["GREEN_FONT_COLOR_CODE"]..L["TITAN_NONE"].."|r",
+				name = _G["GREEN_FONT_COLOR_CODE"]..L["TITAN_PANEL_NONE"].."|r",
 				cmdHidden = true,
 				}
 			end
@@ -1862,18 +1862,18 @@ DESC: Local table to hold the Titan options that allow a user to adjust:
 :DESC
 --]]
 local optionsUIScale = {
-	name = TITAN_PANEL_CONFIG.topic.scale, --L["TITAN_UISCALE_MENU_TEXT"],
+	name = TITAN_PANEL_CONFIG.topic.scale, --L["TITAN_PANEL_UISCALE_MENU_TEXT"],
 	type = "group",
 	args = {
 		confdesc = {
 			order = 1,
 			type = "description",
-			name = L["TITAN_UISCALE_MENU_DESC"].."\n",
+			name = L["TITAN_PANEL_UISCALE_MENU_DESC"].."\n",
 			cmdHidden = true
 		},
 		uiscale = {
-			name = L["TITAN_UISCALE_CONTROL_TITLE_UI"],
-			desc = L["TITAN_UISCALE_SLIDER_DESC"],
+			name = L["TITAN_PANEL_UISCALE_CONTROL_TITLE_UI"],
+			desc = L["TITAN_PANEL_UISCALE_SLIDER_DESC"],
 			order = 2, type = "range", width = "full",
 			min = 0.64, max = 1, step = 0.01,
 			get = function() return UIParent:GetScale() end,
@@ -1883,8 +1883,8 @@ local optionsUIScale = {
 			end,
 		},
 		panelscale = {
-			name = L["TITAN_UISCALE_CONTROL_TITLE_PANEL"],
-			desc = L["TITAN_UISCALE_PANEL_SLIDER_DESC"],
+			name = L["TITAN_PANEL_UISCALE_CONTROL_TITLE_PANEL"],
+			desc = L["TITAN_PANEL_UISCALE_PANEL_SLIDER_DESC"],
 			order = 3, type = "range", width = "full",
 			min = 0.75, max = 1.25, step = 0.01,
 			get = function() return TitanPanelGetVar("Scale") end,
@@ -1902,8 +1902,8 @@ local optionsUIScale = {
 			end,
 		},
 		buttonspacing = {
-			name = L["TITAN_UISCALE_CONTROL_TITLE_BUTTON"],
-			desc = L["TITAN_UISCALE_BUTTON_SLIDER_DESC"],
+			name = L["TITAN_PANEL_UISCALE_CONTROL_TITLE_BUTTON"],
+			desc = L["TITAN_PANEL_UISCALE_BUTTON_SLIDER_DESC"],
 			order = 4, type = "range", width = "full",
 			min = 5, max = 80, step = 1,
 			get = function() return TitanPanelGetVar("ButtonSpacing") end,
@@ -1913,8 +1913,8 @@ local optionsUIScale = {
 			end,
 		},
 		iconspacing = { -- right side plugins
-			name = L["TITAN_UISCALE_CONTROL_TITLE_ICON"],
-			desc = L["TITAN_UISCALE_ICON_SLIDER_DESC"],
+			name = L["TITAN_PANEL_UISCALE_CONTROL_TITLE_ICON"],
+			desc = L["TITAN_PANEL_UISCALE_ICON_SLIDER_DESC"],
 			order = 5, type = "range", width = "full",
 			min = 0, max = 20, step = 1,
 			get = function() return TitanPanelGetVar("IconSpacing") end,
@@ -1934,8 +1934,8 @@ local optionsUIScale = {
 			name = "Tooltip", --L["TITAN_PANEL_MENU_GLOBAL_SKIN_TITLE"],
 		},
 		tooltipfont = {
-			name = L["TITAN_UISCALE_CONTROL_TOOLTIP_TOOLTIPFONT"],
-			desc = L["TITAN_UISCALE_TOOLTIP_SLIDER_DESC"],
+			name = L["TITAN_PANEL_UISCALE_CONTROL_TOOLTIP_TOOLTIPFONT"],
+			desc = L["TITAN_PANEL_UISCALE_TOOLTIP_SLIDER_DESC"],
 			order = 21, type = "range", width = "full",
 			min = 0.5, max = 1.3, step = 0.01,
 			get = function() return TitanPanelGetVar("TooltipFont") end,
@@ -1944,8 +1944,8 @@ local optionsUIScale = {
 			end,
 		},
 		tooltipfontdisable = {
-			name = L["TITAN_UISCALE_TOOLTIP_DISABLE_TEXT"],
-			desc = L["TITAN_UISCALE_DISABLE_TOOLTIP_DESC"],
+			name = L["TITAN_PANEL_UISCALE_TOOLTIP_DISABLE_TEXT"],
+			desc = L["TITAN_PANEL_UISCALE_DISABLE_TOOLTIP_DESC"],
 			order = 22, type = "toggle", width = "full",
 			get = function() return TitanPanelGetVar("DisableTooltipFont") end,
 			set = function()
@@ -2136,7 +2136,7 @@ local function TitanPanel_AddNewSkin(skinname, skinpath)
 	if not skinname or not skinpath then return end

 	-- name cannot be empty or "None", path cannot be empty
-	if skinname == "" or skinname == L["TITAN_NONE"] or skinpath == "" then
+	if skinname == "" or skinname == L["TITAN_PANEL_NONE"] or skinpath == "" then
 		return
 	end

@@ -2167,13 +2167,13 @@ DESC: Local table to hold the Titan custom skins options that allow a user to ad
 :DESC
 --]]
 local optionsSkinsCustom = {
-	name = TITAN_PANEL_CONFIG.topic.skinscust, --L["TITAN_SKINS_TITLE_CUSTOM"],
+	name = TITAN_PANEL_CONFIG.topic.skinscust, --L["TITAN_PANEL_SKINS_TITLE_CUSTOM"],
 	type = "group",
 	args = {
 		confdesc = {
 			order = 1,
 			type = "description",
-			name = L["TITAN_SKINS_MAIN_DESC"].."\n",
+			name = L["TITAN_PANEL_SKINS_MAIN_DESC"].."\n",
 			cmdHidden = true
 		},
 		nulloption1 = {
@@ -2185,20 +2185,20 @@ local optionsSkinsCustom = {
 		addskinheader = {
 			order = 10,
 			type = "header",
-			name = L["TITAN_SKINS_NEW_HEADER"],
+			name = L["TITAN_PANEL_SKINS_NEW_HEADER"],
 		},
 		newskinname = {
 			order = 11,
-			name = L["TITAN_SKINS_NAME_TITLE"],
-			desc = L["TITAN_SKINS_NAME_DESC"],
+			name = L["TITAN_PANEL_SKINS_NAME_TITLE"],
+			desc = L["TITAN_PANEL_SKINS_NAME_DESC"],
 			type = "input", width = "full",
 			get = function() return TitanSkinName end,
 			set = function(_,v) TitanSkinName = v end,
 		},
 		newskinpath = {
 			order = 12,
-			name = L["TITAN_SKINS_PATH_TITLE"],
-			desc = L["TITAN_SKINS_PATH_DESC"],
+			name = L["TITAN_PANEL_SKINS_PATH_TITLE"],
+			desc = L["TITAN_PANEL_SKINS_PATH_DESC"],
 			type = "input", width = "full",
 			get = function() return TitanSkinPath end,
 			set = function(_,v) TitanSkinPath = TitanSkinsCustomPath..v..TitanSkinsPathEnd end,
@@ -2206,8 +2206,8 @@ local optionsSkinsCustom = {
 		},
 		addnewskin = {
 			order = 13,
-			name = L["TITAN_SKINS_ADD_HEADER"], type = "execute",
-			desc = L["TITAN_SKINS_ADD_DESC"],
+			name = L["TITAN_PANEL_SKINS_ADD_HEADER"], type = "execute",
+			desc = L["TITAN_PANEL_SKINS_ADD_DESC"],
 			func = function()
 				if TitanSkinName ~= "" and TitanSkinPath ~= "" then
 					TitanPanel_AddNewSkin(TitanSkinName, TitanSkinPath)
@@ -2227,12 +2227,12 @@ local optionsSkinsCustom = {
 		removeskinheader = {
 			order = 20,
 			type = "header",
-			name = L["TITAN_SKINS_REMOVE_HEADER"],
+			name = L["TITAN_PANEL_SKINS_REMOVE_HEADER"],
 		},
 		removeskinlist = {
 			order = 21, type = "select", width = "full",
-			name = L["TITAN_SKINS_REMOVE_HEADER"],
-			desc = L["TITAN_SKINS_REMOVE_DESC"],
+			name = L["TITAN_PANEL_SKINS_REMOVE_HEADER"],
+			desc = L["TITAN_PANEL_SKINS_REMOVE_DESC"],
 			get = function() return TitanSkinToRemove end,
 			set = function(_,v)
 				TitanSkinToRemove = v
@@ -2252,9 +2252,9 @@ local optionsSkinsCustom = {
 					end
 				end
 				if TitanSkinToRemove ~= "None" then
-					Skinlist["None"] = "|cff19ff19"..L["TITAN_NONE"].."|r"
+					Skinlist["None"] = "|cff19ff19"..L["TITAN_PANEL_NONE"].."|r"
 				else
-					Skinlist["None"] = "|cffffff9a"..L["TITAN_NONE"].."|r"
+					Skinlist["None"] = "|cffffff9a"..L["TITAN_PANEL_NONE"].."|r"
 				end
 				table.sort(Skinlist, function(a, b)
 					return string.lower(TitanSkins[a].name)
@@ -2265,8 +2265,8 @@ local optionsSkinsCustom = {
 		},
 		removeskin = {
 			order = 22, type = "execute",
-			name = L["TITAN_SKINS_REMOVE_BUTTON"],
-			desc = L["TITAN_SKINS_REMOVE_BUTTON_DESC"],
+			name = L["TITAN_PANEL_SKINS_REMOVE_BUTTON"],
+			desc = L["TITAN_PANEL_SKINS_REMOVE_BUTTON_DESC"],
 			func = function()
 			if TitanSkinToRemove == "None" then return end
 			local k, v;
@@ -2290,12 +2290,12 @@ local optionsSkinsCustom = {
 			resetskinhdear = {
 			order = 200,
 			type = "header",
-			name = L["TITAN_SKINS_RESET_HEADER"],
+			name = L["TITAN_PANEL_SKINS_RESET_HEADER"],
 			},
 			defaultskins = {
 				order = 201,
-				name = L["TITAN_SKINS_RESET_DEFAULTS_TITLE"], type = "execute",
-				desc = L["TITAN_SKINS_RESET_DEFAULTS_DESC"],
+				name = L["TITAN_PANEL_SKINS_RESET_DEFAULTS_TITLE"], type = "execute",
+				desc = L["TITAN_PANEL_SKINS_RESET_DEFAULTS_DESC"],
 				func = function()
 					TitanSkins = TitanSkinsDefault;
 					BuildSkins()
@@ -2304,7 +2304,7 @@ local optionsSkinsCustom = {
 		notes_delete = {
 			order = 999,
 			type = "description",
-			name = "\n\n"..L["TITAN_SKINS_REMOVE_NOTES"].."\n",
+			name = "\n\n"..L["TITAN_PANEL_SKINS_REMOVE_NOTES"].."\n",
 			cmdHidden = true
 		},
 	}
@@ -2865,7 +2865,7 @@ function TitanUpdateConfig(action)
 	end
 	if action == "nuke" then
 		local nuked = {
-			name = "Titan could not initialize properly.", --L["TITAN_DEBUG"],
+			name = "Titan could not initialize properly.", --L["TITAN_PANEL_DEBUG"],
 			type = "group",
 			args = {}
 		}
diff --git a/Titan/TitanGlobal.lua b/Titan/TitanGlobal.lua
index 12a0c20..5b4326d 100644
--- a/Titan/TitanGlobal.lua
+++ b/Titan/TitanGlobal.lua
@@ -9,7 +9,7 @@ DESC: This file contains the global variables and constants used throughout Tita
 Titan_Panel = {} -- begin the slow journey to a smaller _G footprint


-TITAN_DEBUG_ARRAY_MAX = 100
+TITAN_PANEL_DEBUG_ARRAY_MAX = 100
 TITAN_PANEL_NONMOVABLE_PLUGINS = {};
 TITAN_PANEL_MENU_FUNC_HIDE = "TitanPanelRightClickMenu_Hide";
 TitanPlugins = {};  -- Used by plugins
diff --git a/Titan/TitanUtils.lua b/Titan/TitanUtils.lua
index aec47b9..de26799 100644
--- a/Titan/TitanUtils.lua
+++ b/Titan/TitanUtils.lua
@@ -586,7 +586,7 @@ local function GetTimeParts(s)
 	local minutes = 0
 	local seconds = 0
 	if not s or (s < 0) then
-		seconds = L["TITAN_NA"]
+		seconds = L["TITAN_PANEL_NA"]
 	else
 		days = floor(s/24/60/60); s = mod(s, 24*60*60);
 		hours = floor(s/60/60); s = mod(s, 60*60);
@@ -608,17 +608,17 @@ function TitanUtils_GetEstTimeText(s)
 	local days, hours, minutes, seconds = GetTimeParts(s)
 	local fracdays = days + (hours/24);
 	local frachours = hours + (minutes/60);
-	if seconds == L["TITAN_NA"] then
-		timeText = L["TITAN_NA"];
+	if seconds == L["TITAN_PANEL_NA"] then
+		timeText = L["TITAN_PANEL_NA"];
 	else
 		if (days ~= 0) then
-			timeText = timeText..format("%4.1f"..L["TITAN_DAYS_ABBR"].." ", fracdays);
+			timeText = timeText..format("%4.1f"..L["TITAN_PANEL_DAYS_ABBR"].." ", fracdays);
 		elseif (days ~= 0 or hours ~= 0) then
-			timeText = timeText..format("%4.1f"..L["TITAN_HOURS_ABBR"].." ", frachours);
+			timeText = timeText..format("%4.1f"..L["TITAN_PANEL_HOURS_ABBR"].." ", frachours);
 		elseif (days ~= 0 or hours ~= 0 or minutes ~= 0) then
-			timeText = timeText..format("%d"..L["TITAN_MINUTES_ABBR"].." ", minutes);
+			timeText = timeText..format("%d"..L["TITAN_PANEL_MINUTES_ABBR"].." ", minutes);
 		else
-			timeText = timeText..format("%d"..L["TITAN_SECONDS_ABBR"], seconds);
+			timeText = timeText..format("%d"..L["TITAN_PANEL_SECONDS_ABBR"], seconds);
 		end
 	end
 	return timeText;
@@ -632,13 +632,13 @@ OUT: string - string with localized days, hours, minutes, and seconds using comm
 --]]
 function TitanUtils_GetFullTimeText(s)
 	local days, hours, minutes, seconds = GetTimeParts(s)
-	if seconds == L["TITAN_NA"] then
-		return L["TITAN_NA"];
+	if seconds == L["TITAN_PANEL_NA"] then
+		return L["TITAN_PANEL_NA"];
 	else
-		return format("%d"..L["TITAN_DAYS_ABBR"]
-			..", %2d"..L["TITAN_HOURS_ABBR"]
-			..", %2d"..L["TITAN_MINUTES_ABBR"]
-			..", %2d"..L["TITAN_SECONDS_ABBR"],
+		return format("%d"..L["TITAN_PANEL_DAYS_ABBR"]
+			..", %2d"..L["TITAN_PANEL_HOURS_ABBR"]
+			..", %2d"..L["TITAN_PANEL_MINUTES_ABBR"]
+			..", %2d"..L["TITAN_PANEL_SECONDS_ABBR"],
 				days, hours, minutes, seconds);
 	end
 end
@@ -652,19 +652,19 @@ OUT: string - string with localized days, hours, minutes, and seconds using spac
 function TitanUtils_GetAbbrTimeText(s) -- Used by plugins
 	local timeText = "";
 	local days, hours, minutes, seconds = GetTimeParts(s)
-	if seconds == L["TITAN_NA"] then
-		timeText = L["TITAN_NA"];
+	if seconds == L["TITAN_PANEL_NA"] then
+		timeText = L["TITAN_PANEL_NA"];
 	else
 		if (days ~= 0) then
-			timeText = timeText..format("%d"..L["TITAN_DAYS_ABBR"].." ", days);
+			timeText = timeText..format("%d"..L["TITAN_PANEL_DAYS_ABBR"].." ", days);
 		end
 		if (days ~= 0 or hours ~= 0) then
-			timeText = timeText..format("%d"..L["TITAN_HOURS_ABBR"].." ", hours);
+			timeText = timeText..format("%d"..L["TITAN_PANEL_HOURS_ABBR"].." ", hours);
 		end
 		if (days ~= 0 or hours ~= 0 or minutes ~= 0) then
-			timeText = timeText..format("%d"..L["TITAN_MINUTES_ABBR"].." ", minutes);
+			timeText = timeText..format("%d"..L["TITAN_PANEL_MINUTES_ABBR"].." ", minutes);
 		end
-		timeText = timeText..format("%d"..L["TITAN_SECONDS_ABBR"], seconds);
+		timeText = timeText..format("%d"..L["TITAN_PANEL_SECONDS_ABBR"], seconds);
 	end
 	return timeText;
 end
@@ -2438,7 +2438,7 @@ end
 --[[
 local function Debug_array(message)
 local idx = TitanDebugArray.index
-	TitanDebugArray.index = mod(TitanDebugArray.index + 1, TITAN_DEBUG_ARRAY_MAX)
+	TitanDebugArray.index = mod(TitanDebugArray.index + 1, TITAN_PANEL_DEBUG_ARRAY_MAX)
 	TitanDebugArray.lines[TitanDebugArray.index] = (date("%m/%d/%y %H:%M:%S".." : ")..message)
 end
 --]]
@@ -2450,7 +2450,7 @@ OUT:
 - string containing the version
 --]]
 function TitanPanel_GetVersion()
-	return tostring(TitanUtils_GetAddOnMetadata(TITAN_ID, "Version")) or L["TITAN_NA"];
+	return tostring(TitanUtils_GetAddOnMetadata(TITAN_ID, "Version")) or L["TITAN_PANEL_NA"];
 end
 --[[ Titan
 NAME: TitanPrint
@@ -2463,7 +2463,7 @@ OUT:
 --]]
 function TitanPrint(message, msg_type)
 	local dtype = ""
-	local pre = TitanUtils_GetGoldText(L["TITAN_PRINT"]..": ")
+	local pre = TitanUtils_GetGoldText(L["TITAN_PANEL_PRINT"]..": ")
 	local msg = ""
 	if msg_type == "error" then
 		dtype = TitanUtils_GetRedText("Error: ")
@@ -2509,7 +2509,7 @@ function TitanDebug(debug_message, debug_type)
 	end

 	msg =
-		TitanUtils_GetGoldText(L["TITAN_DEBUG"].." ")
+		TitanUtils_GetGoldText(L["TITAN_PANEL_DEBUG"].." ")
 		..time_stamp
 		..dtype
 --		..TitanUtils_GetBlueText(debug_message)
diff --git a/Titan/locale/Localization.lua b/Titan/locale/Localization.lua
index 3d29a34..5a76eb2 100644
--- a/Titan/locale/Localization.lua
+++ b/Titan/locale/Localization.lua
@@ -4,27 +4,13 @@ local TITAN_PANEL = "Titan Panel";
 local TITAN_PANEL_RELOAD_TEXT = "If you wish to continue with this operation, push 'Accept' (your UI will reload), otherwise push 'Cancel' or the 'Escape' key."
 local TITAN_PANEL_WARNING = GREEN_FONT_COLOR_CODE.."Warning : "..FONT_COLOR_CODE_CLOSE

-L["TITAN_ABOUT_AUTHOR"] = "Author";
-L["TITAN_ABOUT_CATEGORY"] = "Category";
-L["TITAN_ABOUT_CREDITS"] = "Credits";
-L["TITAN_ABOUT_EMAIL"] = "E-mail";
-L["TITAN_ABOUT_LICENSE"] = "License";
-L["TITAN_ABOUT_VERSION"] = "Version";
-L["TITAN_ABOUT_WEB"] = "Website";
-L["TITAN_ABOUT"] = "About";
-L["TITAN_AMMO_BOW"] = "Arrows";
 L["TITAN_AMMO_BULLET_NAME"] = "Show Ammo Name";
-L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Ammo/Thrown: ";
 L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Ammo: ";
 L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Thrown: ";
 L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
 L["TITAN_AMMO_FORMAT"] = "%d";
-L["TITAN_AMMO_GUN"] = "Bullets";
-L["TITAN_AMMO_MENU_REFRESH"] = "Refresh Display";
 L["TITAN_AMMO_MENU_TEXT"] = "Ammo/Thrown";
-L["TITAN_AMMO_THROWN"] = "Thrown";
 L["TITAN_AMMO_TOOLTIP"] = "Equipped Ammo/Thrown Count";
-L["TITAN_AUTOHIDE_TOOLTIP"] = "Toggles "..TITAN_PANEL.." auto-hide on/off feature";
 L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"Clefthoof Hide Quiver", "Worg Hide Quiver", "Ancient Sinew Wrapped Lamina", "Nerubian Reinforced Quiver", "Quiver of a Thousand Feathers", "Knothide Quiver", "Harpy Hide Quiver", "Ribbly's Quiver", "Quickdraw Quiver", "Heavy Quiver", "Quiver of the Night Watch", "Hunting Quiver", "Medium Quiver", "Light Leather Quiver", "Small Quiver", "Light Quiver", "Smuggler's Ammo Pouch", "Dragonscale Ammo Pouch", "Knothide Ammo Pouch", "Netherscale Ammo Pouch", "Gnoll Skin Bandolier", "Ribbly's Bandolier", "Thick Leather Ammo Pouch", "Heavy Leather Ammo Pouch", "Bandolier of the Night Watch", "Medium Shot Pouch", "Hunting Ammo Sack", "Small Leather Ammo Pouch", "Small Shot Pouch", "Small Ammo Pouch"};
 L["TITAN_BAG_BACKPACK"] = "Backpack";
 L["TITAN_BAG_BUTTON_LABEL"] = "Bags: ";
@@ -53,7 +39,6 @@ L["TITAN_BAG_TAINT_TEXT"] = "Feature : Opening of Bags is disabled until taint i
 L["TITAN_BAG_TOOLTIP_HINTS"] = "Hint: Left-click to open all bags.";
 L["TITAN_BAG_TOOLTIP"] = "Bags Info";
 L["TITAN_BAG_USED_SLOTS"] = "Used Slots";
-L["TITAN_CLOCK_CHECKBUTTON_TOOLTIP"] = "Toggles the time display between 12-hour and 24-hour format";
 L["TITAN_CLOCK_CHECKBUTTON"] = "24H Fmt";
 L["TITAN_CLOCK_CONTROL_HIGH"] = "+12";
 L["TITAN_CLOCK_CONTROL_LOW"] = "-12";
@@ -61,7 +46,6 @@ L["TITAN_CLOCK_CONTROL_TITLE"] = "Offset";
 L["TITAN_CLOCK_CONTROL_TOOLTIP"] = "Server Hour Offset: ";
 L["TITAN_CLOCK_MENU_DISPLAY_ON_RIGHT_SIDE"] = "Display on Right Side";
 L["TITAN_CLOCK_MENU_HIDE_CALENDAR"] = "Hide Calendar Button";
-L["TITAN_CLOCK_MENU_HIDE_GAMETIME"] = "Hide Time/Calendar Button";
 L["TITAN_CLOCK_MENU_HIDE_MAPTIME"] = "Hide Time Button";
 L["TITAN_CLOCK_MENU_LOCAL_TIME"] = "Show Local Time (L)";
 L["TITAN_CLOCK_MENU_SERVER_ADJUSTED_TIME"] = "Show Server Adjusted Time (A)";
@@ -75,24 +59,12 @@ L["TITAN_CLOCK_TOOLTIP_SERVER_ADJUSTED_TIME"] = "Adjusted Server Time: ";
 L["TITAN_CLOCK_TOOLTIP_SERVER_TIME"] = "Server Time: ";
 L["TITAN_CLOCK_TOOLTIP_VALUE"] = "Server Offset Hour Value: ";
 L["TITAN_CLOCK_TOOLTIP"] = "Clock";
-L["TITAN_DAYS_ABBR"] = "d";
-L["TITAN_DAYS"] = "days";
-L["TITAN_DEBUG"] = "<Titan>";
-L["TITAN_FPS_BUTTON_LABEL"] = "FPS: ";
-L["TITAN_FPS_FORMAT"] = "%.1f";
-L["TITAN_FPS_MENU_TEXT"] = "FPS";
-L["TITAN_FPS_TOOLTIP_AVG_FPS"] = "Average FPS: ";
-L["TITAN_FPS_TOOLTIP_CURRENT_FPS"] = "Current FPS: ";
-L["TITAN_FPS_TOOLTIP_MAX_FPS"] = "Maximum FPS: ";
-L["TITAN_FPS_TOOLTIP_MIN_FPS"] = "Minimum FPS: ";
-L["TITAN_FPS_TOOLTIP"] = "Frames Per Second";
 L["TITAN_GOLD_ALL"] = "All Servers";
 L["TITAN_GOLD_CLEAR_DATA_TEXT"] = "Clear Database";
 L["TITAN_GOLD_CLEAR_DATA_WARNING"] = GREEN_FONT_COLOR_CODE.."Warning: "..FONT_COLOR_CODE_CLOSE.."This setting will wipe your Titan Gold database. ".."If you wish to continue with this operation, push 'Accept', otherwise push 'Cancel' or the 'Escape' key.";
 L["TITAN_GOLD_COIN_ICONS"] = "Show Icon Labels";
 L["TITAN_GOLD_COIN_LABELS"] = "Show Text Labels";
 L["TITAN_GOLD_COIN_NONE"] = "Show No Labels";
-L["TITAN_GOLD_COLORS"] = "Show Gold Colors";
 L["TITAN_GOLD_COPPER"] = "c";
 L["TITAN_GOLD_DB_CLEARED"] = "Titan Gold - Database Cleared.";
 L["TITAN_GOLD_DELETE_PLAYER"] = "Delete Toon";
@@ -119,10 +91,7 @@ L["TITAN_GOLD_SILVER"] = "s";
 L["TITAN_GOLD_SORT_BY"] = "Sort By";
 L["TITAN_GOLD_START_GOLD"] = "Starting Gold";
 L["TITAN_GOLD_STATS_TITLE"] = "Session Statistics";
-L["TITAN_GOLD_STATUS_PLAYER_HIDE"] = "Hidden";
-L["TITAN_GOLD_STATUS_PLAYER_SHOW"] = "Visible";
 L["TITAN_GOLD_TOGGLE_ALL_TEXT"] = "Display Server Gold";
-L["TITAN_GOLD_TOGGLE_GPH_HIDE"] = "Hide Gold Per Hour";
 L["TITAN_GOLD_TOGGLE_GPH_SHOW"] = "Display Gold Per Hour";
 L["TITAN_GOLD_TOGGLE_PLAYER_TEXT"] = "Display Player Gold";
 L["TITAN_GOLD_TOGGLE_SORT_GOLD"] = "Sort Table By Gold";
@@ -131,19 +100,6 @@ L["TITAN_GOLD_TOOLTIP_DISPLAY_OPTIONS"] = "Tooltip Display Options";
 L["TITAN_GOLD_TOOLTIP"] = "Gold Info";
 L["TITAN_GOLD_TOOLTIPTEXT"] = "Total Gold on";
 L["TITAN_GOLD_TTL_GOLD"] = "Total Gold";
-L["TITAN_HOURS_ABBR"] = "h";
-L["TITAN_HOURS"] = "hours";
-L["TITAN_KILOBITS_PER_SECOND"] = "kbps"
-L["TITAN_KILOBYTES_PER_SECOND"] = "KB/s";
-L["TITAN_LATENCY_BANDWIDTH_FORMAT"] = "%.3f ".."KB/s";
-L["TITAN_LATENCY_BUTTON_LABEL"] = "Latency: ";
-L["TITAN_LATENCY_FORMAT"] = "%d".."ms";
-L["TITAN_LATENCY_MENU_TEXT"] = "Latency";
-L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_IN"] = "Bandwidth In: ";
-L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_OUT"] = "Bandwidth Out: ";
-L["TITAN_LATENCY_TOOLTIP_LATENCY_HOME"] = "Realm Latency (home): ";
-L["TITAN_LATENCY_TOOLTIP_LATENCY_WORLD"] = "Game Latency (world): ";
-L["TITAN_LATENCY_TOOLTIP"] = "Network Status";
 L["TITAN_LOCATION_BUTTON_LABEL"] = "Loc: ";
 L["TITAN_LOCATION_FORMAT_COORD_LABEL"] = "Coordinate Format";
 L["TITAN_LOCATION_FORMAT_LABEL"] = "(xx , yy)";
@@ -166,7 +122,6 @@ L["TITAN_LOCATION_TOOLTIP_HINTS_1"] = "Hint: Shift + left-click to add location"
 L["TITAN_LOCATION_TOOLTIP_HINTS_2"] = "info to the chat message.";
 L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Home Location";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Inn: ";
-L["TITAN_LOCATION_TOOLTIP_PVPINFO"] = "PVP Info: ";
 L["TITAN_LOCATION_TOOLTIP_SUBZONE"] = "SubZone: ";
 L["TITAN_LOCATION_TOOLTIP_ZONE"] = "Zone: ";
 L["TITAN_LOCATION_TOOLTIP"] = "Location Info";
@@ -199,26 +154,19 @@ L["TITAN_LOOTTYPE_TRACKER_MSGCLOSING"] = "Closing tracker window." -- when leade
 L["TITAN_LOOTTYPE_TRACKER_MSGNBROLLS"] = "%d Roll(s)" -- number of rolls at bottom of frame
 L["TITAN_LOOTTYPE_TRACKER_MSGNOTROLLED"] = "Reminder sent." -- nag players who have not rolled
 L["TITAN_LOOTTYPE_TRACKER_MSGSTART"] = "New roll starting now! Type '/rnd' or '%s'"
-L["TITAN_LOOTTYPE_TRACKER_NOTROLLEDNAG"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????
-L["TITAN_LOOTTYPE_TRACKER_PARTYPASS"]="'/party pass'" -- used to 'end' NotRolledNag message
-L["TITAN_LOOTTYPE_TRACKER_RAIDPASS"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["TITAN_LOOTTYPE_TRACKER_NOTROLLEDNAG"] = "{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????
+L["TITAN_LOOTTYPE_TRACKER_PARTYPASS"] = "'/party pass'" -- used to 'end' NotRolledNag message
+L["TITAN_LOOTTYPE_TRACKER_RAIDPASS"] = "'/raid pass'" -- used to 'end' NotRolledNag message
 L["TITAN_LOOTTYPE_TRACKER_TEXTPASS"] = "pass" -- string to search for when player passes on loot
 L["TITAN_LOOTTYPE_TRACKER_TXTLINE"] = "------------------------------------------------------------------------------------------------------"
-L["TITAN_MEGABYTE"] = "MB";
-L["TITAN_MEMORY_BUTTON_LABEL"] = "Memory: ";
-L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
-L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
-L["TITAN_MEMORY_KBMB_LABEL"] = "KB/MB";
-L["TITAN_MEMORY_RATE_FORMAT"] = "%.3f".."KB/s";
-L["TITAN_MEMORY_TOOLTIP_CURRENT_MEMORY"] = "Current: ";
-L["TITAN_MEMORY_TOOLTIP_INCREASING_RATE"] = "Increasing Rate: ";
-L["TITAN_MEMORY_TOOLTIP_INITIAL_MEMORY"] = "Initial: ";
-L["TITAN_MEMORY_TOOLTIP"] = "Memory Usage";
-L["TITAN_MILLISECOND"] = "ms";
-L["TITAN_MINUTES_ABBR"] = "m";
-L["TITAN_MINUTES"] = "minutes";
-L["TITAN_NA"] = "N/A";
-L["TITAN_NONE"] = "None";
+L["TITAN_PANEL_ABOUT_AUTHOR"] = "Author";
+L["TITAN_PANEL_ABOUT_CATEGORY"] = "Category";
+L["TITAN_PANEL_ABOUT_CREDITS"] = "Credits";
+L["TITAN_PANEL_ABOUT_EMAIL"] = "E-mail";
+L["TITAN_PANEL_ABOUT_LICENSE"] = "License";
+L["TITAN_PANEL_ABOUT_VERSION"] = "Version";
+L["TITAN_PANEL_ABOUT_WEB"] = "Website";
+L["TITAN_PANEL_ABOUT"] = "About";
 L["TITAN_PANEL_ATTEMPTS_BUTTON"] = "Button Name"
 L["TITAN_PANEL_ATTEMPTS_CATEGORY"] = "Category"
 L["TITAN_PANEL_ATTEMPTS_DESC"] = "The plugins below requested to be registered with "..TITAN_PANEL..".\n".."Please send any issues to the plugin author."
@@ -229,15 +177,22 @@ L["TITAN_PANEL_ATTEMPTS_STATUS"] = "Status"
 L["TITAN_PANEL_ATTEMPTS_TABLE"] = "Table index"
 L["TITAN_PANEL_ATTEMPTS_TYPE"] = "Type"
 L["TITAN_PANEL_ATTEMPTS"] = TITAN_PANEL.." Attempts"
+L["TITAN_PANEL_AUTOHIDE_TOOLTIP"] = "Toggles "..TITAN_PANEL.." auto-hide on/off feature";
 L["TITAN_PANEL_CHARS_DESC"] = "These are characters with configuration data."
-L["TITAN_PANEL_CHARS"] = "Characters"
-L["TITAN_PANEL_CONFIG_MAIN_LABEL"] = "Information display bar addon. Allows users to add data feed or launcher plugins on a control panel placed on the top and/or bottom of the screen.";
-L["TITAN_PANEL_ERROR_PROF_DELCURRENT"] = "You may not delete your current profile.";
+L["TITAN_PANEL_DAYS_ABBR"] = "d";
+L["TITAN_PANEL_DEBUG"] = "<Titan>";
 L["TITAN_PANEL_EXTRAS_DELETE_BUTTON"] = "Delete config data"
 L["TITAN_PANEL_EXTRAS_DELETE_MSG"] = "configuration entry has been removed."
 L["TITAN_PANEL_EXTRAS_DESC"] = "These are plugins with configuration data that are not currently loaded.\n".."These are safe to delete."
 L["TITAN_PANEL_EXTRAS_SHORT"] = "Extras"
 L["TITAN_PANEL_EXTRAS"] = TITAN_PANEL.." Extras"
+L["TITAN_PANEL_FPS_BUTTON_LABEL"] = "FPS: ";
+L["TITAN_PANEL_FPS_FORMAT"] = "%.1f";
+L["TITAN_PANEL_FPS_TOOLTIP_AVG_FPS"] = "Average FPS: ";
+L["TITAN_PANEL_FPS_TOOLTIP_CURRENT_FPS"] = "Current FPS: ";
+L["TITAN_PANEL_FPS_TOOLTIP_MAX_FPS"] = "Maximum FPS: ";
+L["TITAN_PANEL_FPS_TOOLTIP_MIN_FPS"] = "Minimum FPS: ";
+L["TITAN_PANEL_FPS_TOOLTIP"] = "Frames Per Second";
 L["TITAN_PANEL_GLOBAL_ERR_1"] = "You may not load a profile when a global profile is in use";
 L["TITAN_PANEL_GLOBAL_PROFILE"] = "Global Profile";
 L["TITAN_PANEL_GLOBAL_RESET_PART"] = "resetting options";
@@ -245,9 +200,26 @@ L["TITAN_PANEL_GLOBAL_USE_AS"] = "Use as Global Profile";
 L["TITAN_PANEL_GLOBAL_USE_DESC"] = "Use a global profile for all characters";
 L["TITAN_PANEL_GLOBAL_USE"] = "Use Global Profile";
 L["TITAN_PANEL_GLOBAL"] = "Global";
-L["TITAN_PANEL_MAIN_MENU_BAR_ADJ_DESC"] = "Adjust Main Menu Bar left or right";
-L["TITAN_PANEL_MAIN_MENU_BAR_ADJ"] = "<  Horizontal Adjustment  >";
-L["TITAN_PANEL_MAIN_MENU_BAR"] = "Main Menu Bar Adjustment";
+L["TITAN_PANEL_HOURS_ABBR"] = "h";
+L["TITAN_PANEL_KILOBYTES_PER_SECOND"] = "KB/s";
+L["TITAN_PANEL_LATENCY_BANDWIDTH_FORMAT"] = "%.3f ".."KB/s";
+L["TITAN_PANEL_LATENCY_BUTTON_LABEL"] = "Latency: ";
+L["TITAN_PANEL_LATENCY_FORMAT"] = "%d".."ms";
+L["TITAN_PANEL_LATENCY_TOOLTIP_BANDWIDTH_IN"] = "Bandwidth In: ";
+L["TITAN_PANEL_LATENCY_TOOLTIP_BANDWIDTH_OUT"] = "Bandwidth Out: ";
+L["TITAN_PANEL_LATENCY_TOOLTIP_LATENCY_HOME"] = "Realm Latency (home): ";
+L["TITAN_PANEL_LATENCY_TOOLTIP_LATENCY_WORLD"] = "Game Latency (world): ";
+L["TITAN_PANEL_LATENCY_TOOLTIP"] = "Network Status";
+L["TITAN_PANEL_MEGABYTE"] = "MB";
+L["TITAN_PANEL_MEMORY_BUTTON_LABEL"] = "Memory: ";
+L["TITAN_PANEL_MEMORY_FORMAT_KB"] = "%d".."KB";
+L["TITAN_PANEL_MEMORY_FORMAT"] = "%.3f".."MB";
+L["TITAN_PANEL_MEMORY_KBMB_LABEL"] = "KB/MB";
+L["TITAN_PANEL_MEMORY_RATE_FORMAT"] = "%.3f".."KB/s";
+L["TITAN_PANEL_MEMORY_TOOLTIP_CURRENT_MEMORY"] = "Current: ";
+L["TITAN_PANEL_MEMORY_TOOLTIP_INCREASING_RATE"] = "Increasing Rate: ";
+L["TITAN_PANEL_MEMORY_TOOLTIP_INITIAL_MEMORY"] = "Initial: ";
+L["TITAN_PANEL_MEMORY_TOOLTIP"] = "Memory Usage";
 L["TITAN_PANEL_MENU_ADV_BUFF_DESC"] = "Adjust Buff icons only as needed. This will override the Titan default adjustment.";
 L["TITAN_PANEL_MENU_ADV_BUFF"] = "Buff Icon Vertical Adjustment";
 L["TITAN_PANEL_MENU_ADV_CUSTOM_DESC"] = "Custom label text to show.";
@@ -282,11 +254,7 @@ L["TITAN_PANEL_MENU_CHANGE_HISTORY"] = "Recent".." "..(CHANGE or "Change").." ".
 L["TITAN_PANEL_MENU_COMMAND"] = (COMMAND or "Command")
 L["TITAN_PANEL_MENU_CONFIGURATION"] = "Configuration";
 L["TITAN_PANEL_MENU_DELETE_SETTINGS"] = "Delete";
-L["TITAN_PANEL_MENU_DISABLE_BAGS"] = "Automatic Bag Adjust";
-L["TITAN_PANEL_MENU_DISABLE_LOGS"] = "Automatic Log Adjust";
-L["TITAN_PANEL_MENU_DISABLE_MINIMAP_PUSH"] = "Disable Minimap Adjust";
 L["TITAN_PANEL_MENU_DISABLE_PUSH"] = "Disable Screen Adjust";
-L["TITAN_PANEL_MENU_DISABLE_TICKET"] = "Automatic Ticket Frame Adjust";
 L["TITAN_PANEL_MENU_DISABLED"] = "Disabled";
 L["TITAN_PANEL_MENU_DISPLAY_BAR"] = "Show Bar";
 L["TITAN_PANEL_MENU_DISPLAY_ON_BAR"] = "Choose which bar the plugin is displayed";
@@ -311,11 +279,9 @@ L["TITAN_PANEL_MENU_LOCK_BUTTONS"] = "Lock Buttons";
 L["TITAN_PANEL_MENU_LSM_FONTS_DESC"] = "Select the font type for the various plugins on the "..TITAN_PANEL.." Bars.";
 L["TITAN_PANEL_MENU_LSM_FONTS"] = "Panel Font"
 L["TITAN_PANEL_MENU_MANAGE_SETTINGS"] = "Manage";
-L["TITAN_PANEL_MENU_OPTIONS_AUX_BARS"] = TITAN_PANEL.." Bottom Bars";
 L["TITAN_PANEL_MENU_OPTIONS_BARS_ALL"] = "Bars - "..(ALL or "All")
 L["TITAN_PANEL_MENU_OPTIONS_BARS"] = "Bars"
 L["TITAN_PANEL_MENU_OPTIONS_FRAMES"] = "Frames";
-L["TITAN_PANEL_MENU_OPTIONS_MAIN_BARS"] = TITAN_PANEL.." Top Bars";
 L["TITAN_PANEL_MENU_OPTIONS_SHORT"] = "Tooltips and Frames";
 L["TITAN_PANEL_MENU_OPTIONS_TOOLTIPS"] = "Tooltips";
 L["TITAN_PANEL_MENU_OPTIONS"] = TITAN_PANEL.." Tooltips and Frames";
@@ -353,13 +319,40 @@ L["TITAN_PANEL_MENU_TOP_BARS"] = "Top Bars"
 L["TITAN_PANEL_MENU_TOP"] = "Top"
 L["TITAN_PANEL_MENU_TOP2"] = "Top 2"
 L["TITAN_PANEL_MENU_VERSION_SHOWN"] = "Show Plugin Versions";
+L["TITAN_PANEL_MILLISECOND"] = "ms";
+L["TITAN_PANEL_MINUTES_ABBR"] = "m";
+L["TITAN_PANEL_NA"] = "N/A";
+L["TITAN_PANEL_NONE"] = "None";
 L["TITAN_PANEL_OPTIONS"] = "Options";
+L["TITAN_PANEL_PRINT"] = "Titan";
 L["TITAN_PANEL_REGISTER_END"] = "Registration process done."
 L["TITAN_PANEL_REGISTER_START"] = "Register "..TITAN_PANEL.." plugins..."
 L["TITAN_PANEL_RELOAD"] = TITAN_PANEL_WARNING.."This will reload "..TITAN_PANEL..". "..TITAN_PANEL_RELOAD_TEXT
 L["TITAN_PANEL_RESET_WARNING"] = TITAN_PANEL_WARNING.."This setting will reset your bar(s) and "..TITAN_PANEL.." settings to default values and will recreate your current profile. "..TITAN_PANEL_RELOAD_TEXT
+L["TITAN_PANEL_SECONDS_ABBR"] = "s";
 L["TITAN_PANEL_SHIFT_LEFT"] = "Shift Left";
 L["TITAN_PANEL_SHIFT_RIGHT"] = "Shift Right";
+L["TITAN_PANEL_SKINS_ADD_DESC"] = "Adds a new skin to the list of available skins for "..TITAN_PANEL..".";
+L["TITAN_PANEL_SKINS_ADD_HEADER"] = "Add Skin";
+L["TITAN_PANEL_SKINS_LIST_TITLE"] = "Skin List";
+L["TITAN_PANEL_SKINS_MAIN_DESC"] = "All custom skins are assumed to be in: \n".."..\\AddOns\\Titan\\Artwork\\Custom\\<Skin Folder>\\ ".."\n".."\n"..TITAN_PANEL.." and custom skins are stored under the Custom folder."
+L["TITAN_PANEL_SKINS_NAME_DESC"] = "Enter a name for your new skin. It will be used in the skin dropdown lists.";
+L["TITAN_PANEL_SKINS_NAME_TITLE"] = "Skin Name"
+L["TITAN_PANEL_SKINS_NEW_HEADER"] = "Add New Skin";
+L["TITAN_PANEL_SKINS_OPTIONS_CUSTOM"] = "Skins - Custom";
+L["TITAN_PANEL_SKINS_PATH_DESC"] = "<Skin Folder> under the "..TITAN_PANEL.." install. See the example above."
+L["TITAN_PANEL_SKINS_PATH_TITLE"] = "<Skin Folder>"
+L["TITAN_PANEL_SKINS_REMOVE_BUTTON_DESC"] = "Removes the selected custom skin.";
+L["TITAN_PANEL_SKINS_REMOVE_BUTTON"] = "Remove";
+L["TITAN_PANEL_SKINS_REMOVE_DESC"] = "Select a custom skin to remove."
+L["TITAN_PANEL_SKINS_REMOVE_HEADER"] = "Remove Skin";
+L["TITAN_PANEL_SKINS_REMOVE_NOTES"] = "You are responsible for removing any unwanted custom skins ".."from the "..TITAN_PANEL.." install folder. Addons can not add or remove files."
+L["TITAN_PANEL_SKINS_RESET_DEFAULTS_DESC"] = "Resets the skin list to the default "..TITAN_PANEL.." skins.";
+L["TITAN_PANEL_SKINS_RESET_DEFAULTS_TITLE"] = "Reset to Defaults";
+L["TITAN_PANEL_SKINS_RESET_HEADER"] = "Reset "..TITAN_PANEL.." Skins";
+L["TITAN_PANEL_SKINS_SET_DESC"] = "Select a skin for the "..TITAN_PANEL.." bars.";
+L["TITAN_PANEL_SKINS_TITLE_CUSTOM"] = TITAN_PANEL.." Custom Skins";
+L["TITAN_PANEL_SKINS_TITLE"] = TITAN_PANEL.." Skins";
 L["TITAN_PANEL_SLASH_ALL_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Usage: |r|cffffffff/titan <topic>|r";
 L["TITAN_PANEL_SLASH_ALL_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."<topic>: |r|cffffffffreset/gui/profile/silent/orderhall/help |r";
 L["TITAN_PANEL_SLASH_GUI_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Usage: |r|cffffffff/titan {gui control/trans/skin}|r";
@@ -386,6 +379,24 @@ L["TITAN_PANEL_SLASH_RESP3"] = LIGHTYELLOW_FONT_COLOR_CODE..TITAN_PANEL.." scale
 L["TITAN_PANEL_SLASH_RESP4"] = LIGHTYELLOW_FONT_COLOR_CODE..TITAN_PANEL.." button spacing has been reset.";
 L["TITAN_PANEL_SLASH_SILENT_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Usage: |r|cffffffff/titan {silent}|r";
 L["TITAN_PANEL_SLASH_SILENT_1"] = LIGHTYELLOW_FONT_COLOR_CODE.."silent: |r|cffffffffToggles "..TITAN_PANEL.." to load silently.|r";
+L["TITAN_PANEL_TRANS_MENU_TEXT_SHORT"] = "Transparency";
+L["TITAN_PANEL_UISCALE_BUTTON_SLIDER_DESC"] = "Adjusts the space between left-side plugins.";
+L["TITAN_PANEL_UISCALE_CONTROL_TITLE_BUTTON"] = "Button Spacing";
+L["TITAN_PANEL_UISCALE_CONTROL_TITLE_ICON"] = "Icon Spacing";
+L["TITAN_PANEL_UISCALE_CONTROL_TITLE_PANEL"] = TITAN_PANEL.." Scale";
+L["TITAN_PANEL_UISCALE_CONTROL_TITLE_UI"] = "UI Scale";
+L["TITAN_PANEL_UISCALE_CONTROL_TOOLTIP_TOOLTIPFONT"] = "Tooltip Font Scale";
+L["TITAN_PANEL_UISCALE_DISABLE_TOOLTIP_DESC"] = "Disables "..TITAN_PANEL.." Tooltip Font Scale Control.";
+L["TITAN_PANEL_UISCALE_ICON_SLIDER_DESC"] = "Adjusts the space between right-side plugins.";
+L["TITAN_PANEL_UISCALE_MENU_DESC"] = "Controls various aspects of the UI and "..TITAN_PANEL..".";
+L["TITAN_PANEL_UISCALE_MENU_TEXT_SHORT"] = "Scale and Font";
+L["TITAN_PANEL_UISCALE_MENU_TEXT"] = TITAN_PANEL.." Scale and Font";
+L["TITAN_PANEL_UISCALE_PANEL_SLIDER_DESC"] = "Sets the scale for the various "..TITAN_PANEL.." buttons and icons.";
+L["TITAN_PANEL_UISCALE_SLIDER_DESC"] = "Sets the scale of your entire UI.";
+L["TITAN_PANEL_UISCALE_TOOLTIP_DISABLE_TEXT"] = "Disable Tooltip Font Scale";
+L["TITAN_PANEL_UISCALE_TOOLTIP_SLIDER_DESC"] = "Adjusts the scale for the tooltip of the various plugins.";
+L["TITAN_PANEL_USE_COMMA"] = "Use comma";
+L["TITAN_PANEL_USE_PERIOD"] = "Use period";
 L["TITAN_PANEL_VERSION_INFO"] = "|cffffd700 by the |cffff8c00"..TITAN_PANEL.." Development Team";
 L["TITAN_PANEL"] = "Titan Panel";
 L["TITAN_PERFORMANCE_ADDON_CPU_USAGE_LABEL"] = "Addon CPU Usage";
@@ -413,12 +424,11 @@ L["TITAN_PERFORMANCE_MENU_SHOW_MEMORY"] = "Show Memory";
 L["TITAN_PERFORMANCE_MENU_TEXT"] = "Performance";
 L["TITAN_PERFORMANCE_TOOLTIP_HINT"] = "Hint: Left-click to force a garbage collection.";
 L["TITAN_PERFORMANCE_TOOLTIP"] = "Performance Info";
-L["TITAN_PRINT"] = "Titan";
 L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
 L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
-L["TITAN_REGEN_MENU_SHOW2"] = "HP"
-L["TITAN_REGEN_MENU_SHOW3"] = "MP"
-L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_MENU_HP"] = "HP"
+L["TITAN_REGEN_MENU_MP"] = "MP"
+L["TITAN_REGEN_MENU_PERCENT"] = "As Percentage"
 L["TITAN_REGEN_MENU_TEXT"] = "Regen"
 L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
 L["TITAN_REGEN_TOOLTIP1"] = "Health: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
@@ -431,9 +441,7 @@ L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_C
 L["TITAN_REPAIR_CANNOT_AFFORD"] = "You cannot afford to repair, at this time."
 L["TITAN_REPAIR_GBANK_NOMONEY"] = "Guild Bank can't afford the repair cost, or you can't withdraw that much."
 L["TITAN_REPAIR_GBANK_NORIGHTS"] = "You are either not in a guild or you don't have permission to use the guild bank to repair your items."
-L["TITAN_REPAIR_GBANK_TOTAL"] = "Guild Bank Funds :"
 L["TITAN_REPAIR_GBANK_USEFUNDS"] = "Use Guild Bank Funds"
-L["TITAN_REPAIR_GBANK_WITHDRAW"] = "Guild Bank Withdrawal Allowed :"
 L["TITAN_REPAIR_LOCALE_AUTOREPITEMLABEL"] = "Auto Repair All Items";
 L["TITAN_REPAIR_LOCALE_AUTOREPLABEL"] = "Auto-Repair";
 L["TITAN_REPAIR_LOCALE_BUTTON"] = "Durability: ";
@@ -471,58 +479,8 @@ L["TITAN_REPAIR_REPORT_COST_CHAT"] = "Repair cost was "
 L["TITAN_REPAIR_REPORT_COST_MENU"] = "Report Repair Cost to Chat"
 L["TITAN_REPAIR_SHOW_TOTAL"] = "Show Total";
 L["TITAN_REPAIR"] = "Titan Repair"
-L["TITAN_SECONDS_ABBR"] = "s";
-L["TITAN_SECONDS"] = "seconds";
-L["TITAN_SKINS_ADD_DESC"] = "Adds a new skin to the list of available skins for "..TITAN_PANEL..".";
-L["TITAN_SKINS_ADD_HEADER"] = "Add Skin";
-L["TITAN_SKINS_LIST_TITLE"] = "Skin List";
-L["TITAN_SKINS_MAIN_DESC"] = "All custom skins are assumed to be in: \n".."..\\AddOns\\Titan\\Artwork\\Custom\\<Skin Folder>\\ ".."\n".."\n"..TITAN_PANEL.." and custom skins are stored under the Custom folder."
-L["TITAN_SKINS_NAME_DESC"] = "Enter a name for your new skin. It will be used in the skin dropdown lists.";
-L["TITAN_SKINS_NAME_TITLE"] = "Skin Name"
-L["TITAN_SKINS_NEW_HEADER"] = "Add New Skin";
-L["TITAN_SKINS_OPTIONS_CUSTOM"] = "Skins - Custom";
-L["TITAN_SKINS_PATH_DESC"] = "<Skin Folder> under the "..TITAN_PANEL.." install. See the example above."
-L["TITAN_SKINS_PATH_TITLE"] = "<Skin Folder>"
-L["TITAN_SKINS_REMOVE_BUTTON_DESC"] = "Removes the selected custom skin.";
-L["TITAN_SKINS_REMOVE_BUTTON"] = "Remove";
-L["TITAN_SKINS_REMOVE_DESC"] = "Select a custom skin to remove."
-L["TITAN_SKINS_REMOVE_HEADER"] = "Remove Skin";
-L["TITAN_SKINS_REMOVE_NOTES"] = "You are responsible for removing any unwanted custom skins ".."from the "..TITAN_PANEL.." install folder. Addons can not add or remove files."
-L["TITAN_SKINS_RESET_DEFAULTS_DESC"] = "Resets the skin list to the default "..TITAN_PANEL.." skins.";
-L["TITAN_SKINS_RESET_DEFAULTS_TITLE"] = "Reset to Defaults";
-L["TITAN_SKINS_RESET_HEADER"] = "Reset "..TITAN_PANEL.." Skins";
-L["TITAN_SKINS_SET_DESC"] = "Select a skin for the "..TITAN_PANEL.." bars.";
-L["TITAN_SKINS_SET_HEADER"] = "Set "..TITAN_PANEL.." Skin";
-L["TITAN_SKINS_TITLE_CUSTOM"] = TITAN_PANEL.." Custom Skins";
-L["TITAN_SKINS_TITLE"] = TITAN_PANEL.." Skins";
-L["TITAN_TRANS_AUX_CONTROL_TITLE"] = "Auxiliary Bar";
-L["TITAN_TRANS_CONTROL_TITLE_TOOLTIP"] = "Tooltip";
-L["TITAN_TRANS_MAIN_CONTROL_TITLE"] = "Main Bar";
-L["TITAN_TRANS_MENU_DESC"] = "Adjust transparency for the "..TITAN_PANEL.." bars and tooltip.";
-L["TITAN_TRANS_MENU_TEXT_SHORT"] = "Transparency";
-L["TITAN_TRANS_MENU_TEXT"] = TITAN_PANEL.." Transparency";
-L["TITAN_TRANS_TOOLTIP_DESC"] = "Sets transparency for the tooltip of the various plugins.";
-L["TITAN_UISCALE_BUTTON_SLIDER_DESC"] = "Adjusts the space between left-side plugins.";
-L["TITAN_UISCALE_CONTROL_TITLE_BUTTON"] = "Button Spacing";
-L["TITAN_UISCALE_CONTROL_TITLE_ICON"] = "Icon Spacing";
-L["TITAN_UISCALE_CONTROL_TITLE_PANEL"] = TITAN_PANEL.." Scale";
-L["TITAN_UISCALE_CONTROL_TITLE_UI"] = "UI Scale";
-L["TITAN_UISCALE_CONTROL_TOOLTIP_TOOLTIPFONT"] = "Tooltip Font Scale";
-L["TITAN_UISCALE_DISABLE_TOOLTIP_DESC"] = "Disables "..TITAN_PANEL.." Tooltip Font Scale Control.";
-L["TITAN_UISCALE_ICON_SLIDER_DESC"] = "Adjusts the space between right-side plugins.";
-L["TITAN_UISCALE_MENU_DESC"] = "Controls various aspects of the UI and "..TITAN_PANEL..".";
-L["TITAN_UISCALE_MENU_TEXT_SHORT"] = "Scale and Font";
-L["TITAN_UISCALE_MENU_TEXT"] = TITAN_PANEL.." Scale and Font";
-L["TITAN_UISCALE_PANEL_SLIDER_DESC"] = "Sets the scale for the various "..TITAN_PANEL.." buttons and icons.";
-L["TITAN_UISCALE_SLIDER_DESC"] = "Sets the scale of your entire UI.";
-L["TITAN_UISCALE_TOOLTIP_DISABLE_TEXT"] = "Disable Tooltip Font Scale";
-L["TITAN_UISCALE_TOOLTIP_SLIDER_DESC"] = "Adjusts the scale for the tooltip of the various plugins.";
-L["TITAN_USE_COMMA"] = "Use comma";
-L["TITAN_USE_PERIOD"] = "Use period";
 L["TITAN_VOLUME_AMBIENCE_CONTROL_TITLE"] = "Ambience";
 L["TITAN_VOLUME_AMBIENCE_TOOLTIP_VALUE"] = "Ambience Sound Volume: ";
-L["TITAN_VOLUME_CONTROL_HIGH"] = "High";
-L["TITAN_VOLUME_CONTROL_LOW"] = "Low";
 L["TITAN_VOLUME_CONTROL_TITLE"] = "Volume Control";
 L["TITAN_VOLUME_CONTROL_TOOLTIP"] = "Volume Control: ";
 L["TITAN_VOLUME_DIALOG_CONTROL_TITLE"] = "Dialog";
diff --git a/TitanGold/TitanGold.lua b/TitanGold/TitanGold.lua
index b96c9f6..d262821 100644
--- a/TitanGold/TitanGold.lua
+++ b/TitanGold/TitanGold.lua
@@ -891,7 +891,7 @@ local function DisplayOptions()

 	-- Use comma or period as separater on gold
 	local info = {};
-	info.text = L["TITAN_USE_COMMA"];
+	info.text = L["TITAN_PANEL_USE_COMMA"];
 	info.checked = TitanGetVar(TITAN_GOLD_ID, "UseSeperatorComma");
 	info.func = function()
 		Seperator("UseSeperatorComma")
@@ -899,7 +899,7 @@ local function DisplayOptions()
 	TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel());

 	local info = {};
-	info.text = L["TITAN_USE_PERIOD"];
+	info.text = L["TITAN_PANEL_USE_PERIOD"];
 	info.checked = TitanGetVar(TITAN_GOLD_ID, "UseSeperatorPeriod");
 	info.func = function()
 		Seperator("UseSeperatorPeriod")
diff --git a/TitanPerformance/TitanPerformance.lua b/TitanPerformance/TitanPerformance.lua
index ed196e9..61c3513 100644
--- a/TitanPerformance/TitanPerformance.lua
+++ b/TitanPerformance/TitanPerformance.lua
@@ -171,7 +171,7 @@ function TitanPanelPerformanceButton_GetButtonText(id)

 	-- FPS text
 	if ( showFPS ) then
-		local fpsText = format(L["TITAN_FPS_FORMAT"], button.fps);
+		local fpsText = format(L["TITAN_PANEL_FPS_FORMAT"], button.fps);
 		if ( TitanGetVar(TITAN_PERFORMANCE_ID, "ShowColoredText") ) then
 			color = TitanUtils_GetThresholdColor(TITAN_FPS_THRESHOLD_TABLE, button.fps);
 			fpsRichText = TitanUtils_GetColoredText(fpsText, color);
@@ -183,7 +183,7 @@ function TitanPanelPerformanceButton_GetButtonText(id)
 	-- Latency text
 	latencyRichText = ""
 	if ( showLatency ) then
-		local latencyText = format(L["TITAN_LATENCY_FORMAT"], button.latencyHome);
+		local latencyText = format(L["TITAN_PANEL_LATENCY_FORMAT"], button.latencyHome);
 		if ( TitanGetVar(TITAN_PERFORMANCE_ID, "ShowColoredText") ) then
 			color = TitanUtils_GetThresholdColor(TITAN_LATENCY_THRESHOLD_TABLE, button.latencyHome);
 			latencyRichText = TitanUtils_GetColoredText(latencyText, color);
@@ -193,7 +193,7 @@ function TitanPanelPerformanceButton_GetButtonText(id)
 	end

 	if ( showWorldLatency  ) then
-		local latencyWorldText = format(L["TITAN_LATENCY_FORMAT"], button.latencyWorld);
+		local latencyWorldText = format(L["TITAN_PANEL_LATENCY_FORMAT"], button.latencyWorld);
 		if ( showLatency ) then
 			latencyRichText = latencyRichText.."/"
 		end
@@ -207,34 +207,34 @@ function TitanPanelPerformanceButton_GetButtonText(id)

 	-- Memory text
 	if ( showMemory ) then
-		local memoryText = format(L["TITAN_MEMORY_FORMAT"], button.memory/1024);
+		local memoryText = format(L["TITAN_PANEL_MEMORY_FORMAT"], button.memory/1024);
 		memoryRichText = TitanUtils_GetHighlightText(memoryText);
 	end

 	if ( showFPS ) then
 		if ( showLatency or showWorldLatency ) then
 			if ( showMemory ) then
-				return L["TITAN_FPS_BUTTON_LABEL"], fpsRichText, L["TITAN_LATENCY_BUTTON_LABEL"], latencyRichText, L["TITAN_MEMORY_BUTTON_LABEL"], memoryRichText;
+				return L["TITAN_PANEL_FPS_BUTTON_LABEL"], fpsRichText, L["TITAN_PANEL_LATENCY_BUTTON_LABEL"], latencyRichText, L["TITAN_PANEL_MEMORY_BUTTON_LABEL"], memoryRichText;
 			else
-				return L["TITAN_FPS_BUTTON_LABEL"], fpsRichText, L["TITAN_LATENCY_BUTTON_LABEL"], latencyRichText;
+				return L["TITAN_PANEL_FPS_BUTTON_LABEL"], fpsRichText, L["TITAN_PANEL_LATENCY_BUTTON_LABEL"], latencyRichText;
 			end
 		else
 			if ( showMemory ) then
-				return L["TITAN_FPS_BUTTON_LABEL"], fpsRichText, L["TITAN_MEMORY_BUTTON_LABEL"], memoryRichText;
+				return L["TITAN_PANEL_FPS_BUTTON_LABEL"], fpsRichText, L["TITAN_PANEL_MEMORY_BUTTON_LABEL"], memoryRichText;
 			else
-				return L["TITAN_FPS_BUTTON_LABEL"], fpsRichText;
+				return L["TITAN_PANEL_FPS_BUTTON_LABEL"], fpsRichText;
 			end
 		end
 	else
 		if ( showLatency or showWorldLatency ) then
 			if ( showMemory ) then
-				return L["TITAN_LATENCY_BUTTON_LABEL"], latencyRichText, L["TITAN_MEMORY_BUTTON_LABEL"], memoryRichText;
+				return L["TITAN_PANEL_LATENCY_BUTTON_LABEL"], latencyRichText, L["TITAN_PANEL_MEMORY_BUTTON_LABEL"], memoryRichText;
 			else
-				return L["TITAN_LATENCY_BUTTON_LABEL"], latencyRichText;
+				return L["TITAN_PANEL_LATENCY_BUTTON_LABEL"], latencyRichText;
 			end
 		else
 			if ( showMemory ) then
-				return L["TITAN_MEMORY_BUTTON_LABEL"], memoryRichText;
+				return L["TITAN_PANEL_MEMORY_BUTTON_LABEL"], memoryRichText;
 			else
 				return;
 			end
@@ -305,9 +305,9 @@ local function Stats_UpdateAddonsList(self, watchingCPU)
 				local incrate = "";
 				incrate = format("(%.2f%%)", diff);
 				if (showAddonRate == 1) then
-					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format("%.3f",addon.value)..L["TITAN_MILLISECOND"].." "..GREEN_FONT_COLOR_CODE..incrate);
+					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format("%.3f",addon.value)..L["TITAN_PANEL_MILLISECOND"].." "..GREEN_FONT_COLOR_CODE..incrate);
 				else
-					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format("%.3f",addon.value)..L["TITAN_MILLISECOND"]);
+					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format("%.3f",addon.value)..L["TITAN_PANEL_MILLISECOND"]);
 				end
 			else
 				local diff = addon.value - (memUsageSinceGC[addon.name])
@@ -316,26 +316,26 @@ local function Stats_UpdateAddonsList(self, watchingCPU)
 				end
 				local incrate = "";
 				if diff > 0 then
-					incrate = format("(+%.2f) "..L["TITAN_KILOBYTES_PER_SECOND"], diff);
+					incrate = format("(+%.2f) "..L["TITAN_PANEL_KILOBYTES_PER_SECOND"], diff);
 				end
 				if (showAddonRate == 1) then
 					if TitanGetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType") == 1 then
-					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_MEMORY_FORMAT"], addon.value/1000).." "..GREEN_FONT_COLOR_CODE..incrate)
+					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_PANEL_MEMORY_FORMAT"], addon.value/1000).." "..GREEN_FONT_COLOR_CODE..incrate)
 					else
 						if addon.value > 1000 then
-							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_MEMORY_FORMAT"], addon.value/1000).." "..GREEN_FONT_COLOR_CODE..incrate)
+							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_PANEL_MEMORY_FORMAT"], addon.value/1000).." "..GREEN_FONT_COLOR_CODE..incrate)
 						else
-							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_MEMORY_FORMAT_KB"], addon.value).." "..GREEN_FONT_COLOR_CODE..incrate)
+							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_PANEL_MEMORY_FORMAT_KB"], addon.value).." "..GREEN_FONT_COLOR_CODE..incrate)
 						end
 					end
 				else
 					if TitanGetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType") == 1 then
-					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_MEMORY_FORMAT"], addon.value/1000))
+					GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_PANEL_MEMORY_FORMAT"], addon.value/1000))
 					else
 						if addon.value > 1000 then
-							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_MEMORY_FORMAT"], addon.value/1000))
+							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_PANEL_MEMORY_FORMAT"], addon.value/1000))
 						else
-							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_MEMORY_FORMAT_KB"], addon.value))
+							GameTooltip:AddDoubleLine(NORMAL_FONT_COLOR_CODE..addon.name," |cffffffff"..format(L["TITAN_PANEL_MEMORY_FORMAT_KB"], addon.value))
 						end
 					end
 				end
@@ -345,15 +345,15 @@ local function Stats_UpdateAddonsList(self, watchingCPU)
 		GameTooltip:AddLine(' ')

 		if(watchingCPU) then
-			GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_CPU_USAGE_LABEL"], format("%.3f",total)..L["TITAN_MILLISECOND"])
+			GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_CPU_USAGE_LABEL"], format("%.3f",total)..L["TITAN_PANEL_MILLISECOND"])
 		else
 			if TitanGetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType") == 1 then
-			GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_MEM_USAGE_LABEL"],format(L["TITAN_MEMORY_FORMAT"], total/1000))
+			GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_MEM_USAGE_LABEL"],format(L["TITAN_PANEL_MEMORY_FORMAT"], total/1000))
 			else
 				if total > 1000 then
-					GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_MEM_USAGE_LABEL"], format(L["TITAN_MEMORY_FORMAT"], total/1000))
+					GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_MEM_USAGE_LABEL"], format(L["TITAN_PANEL_MEMORY_FORMAT"], total/1000))
 				else
-					GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_MEM_USAGE_LABEL"], format(L["TITAN_MEMORY_FORMAT_KB"], total))
+					GameTooltip:AddDoubleLine(LIGHTYELLOW_FONT_COLOR_CODE..L["TITAN_PERFORMANCE_ADDON_TOTAL_MEM_USAGE_LABEL"], format(L["TITAN_PANEL_MEMORY_FORMAT_KB"], total))
 				end
 			end
 		end
@@ -377,38 +377,38 @@ function TitanPanelPerformanceButton_SetTooltip()

 	-- FPS tooltip
 	if ( showFPS ) then
-		local fpsText = format(L["TITAN_FPS_FORMAT"], button.fps);
-		local avgFPSText = format(L["TITAN_FPS_FORMAT"], button.avgFPS);
-		local minFPSText = format(L["TITAN_FPS_FORMAT"], button.minFPS);
-		local maxFPSText = format(L["TITAN_FPS_FORMAT"], button.maxFPS);
+		local fpsText = format(L["TITAN_PANEL_FPS_FORMAT"], button.fps);
+		local avgFPSText = format(L["TITAN_PANEL_FPS_FORMAT"], button.avgFPS);
+		local minFPSText = format(L["TITAN_PANEL_FPS_FORMAT"], button.minFPS);
+		local maxFPSText = format(L["TITAN_PANEL_FPS_FORMAT"], button.maxFPS);

 		GameTooltip:AddLine("\n");
-		GameTooltip:AddLine(TitanUtils_GetHighlightText(L["TITAN_FPS_TOOLTIP"]));
-		GameTooltip:AddDoubleLine(L["TITAN_FPS_TOOLTIP_CURRENT_FPS"], TitanUtils_GetHighlightText(fpsText));
-		GameTooltip:AddDoubleLine(L["TITAN_FPS_TOOLTIP_AVG_FPS"], TitanUtils_GetHighlightText(avgFPSText));
-		GameTooltip:AddDoubleLine(L["TITAN_FPS_TOOLTIP_MIN_FPS"], TitanUtils_GetHighlightText(minFPSText));
-		GameTooltip:AddDoubleLine(L["TITAN_FPS_TOOLTIP_MAX_FPS"], TitanUtils_GetHighlightText(maxFPSText));
+		GameTooltip:AddLine(TitanUtils_GetHighlightText(L["TITAN_PANEL_FPS_TOOLTIP"]));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_FPS_TOOLTIP_CURRENT_FPS"], TitanUtils_GetHighlightText(fpsText));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_FPS_TOOLTIP_AVG_FPS"], TitanUtils_GetHighlightText(avgFPSText));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_FPS_TOOLTIP_MIN_FPS"], TitanUtils_GetHighlightText(minFPSText));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_FPS_TOOLTIP_MAX_FPS"], TitanUtils_GetHighlightText(maxFPSText));
 	end

 	-- Latency tooltip
 	if ( showLatency or showWorldLatency ) then
-		local latencyText = format(L["TITAN_LATENCY_FORMAT"], button.latencyHome);
-		local latencyWorldText = format(L["TITAN_LATENCY_FORMAT"], button.latencyWorld);
-		local bandwidthInText = format(L["TITAN_LATENCY_BANDWIDTH_FORMAT"], button.bandwidthIn);
-		local bandwidthOutText = format(L["TITAN_LATENCY_BANDWIDTH_FORMAT"], button.bandwidthOut);
+		local latencyText = format(L["TITAN_PANEL_LATENCY_FORMAT"], button.latencyHome);
+		local latencyWorldText = format(L["TITAN_PANEL_LATENCY_FORMAT"], button.latencyWorld);
+		local bandwidthInText = format(L["TITAN_PANEL_LATENCY_BANDWIDTH_FORMAT"], button.bandwidthIn);
+		local bandwidthOutText = format(L["TITAN_PANEL_LATENCY_BANDWIDTH_FORMAT"], button.bandwidthOut);

 		GameTooltip:AddLine("\n");
-		GameTooltip:AddLine(TitanUtils_GetHighlightText(L["TITAN_LATENCY_TOOLTIP"]));
-		if showLatency then GameTooltip:AddDoubleLine(L["TITAN_LATENCY_TOOLTIP_LATENCY_HOME"], TitanUtils_GetHighlightText(latencyText)); end
-		if showWorldLatency then GameTooltip:AddDoubleLine(L["TITAN_LATENCY_TOOLTIP_LATENCY_WORLD"], TitanUtils_GetHighlightText(latencyWorldText)); end
-		GameTooltip:AddDoubleLine(L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_IN"], TitanUtils_GetHighlightText(bandwidthInText));
-		GameTooltip:AddDoubleLine(L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_OUT"], TitanUtils_GetHighlightText(bandwidthOutText));
+		GameTooltip:AddLine(TitanUtils_GetHighlightText(L["TITAN_PANEL_LATENCY_TOOLTIP"]));
+		if showLatency then GameTooltip:AddDoubleLine(L["TITAN_PANEL_LATENCY_TOOLTIP_LATENCY_HOME"], TitanUtils_GetHighlightText(latencyText)); end
+		if showWorldLatency then GameTooltip:AddDoubleLine(L["TITAN_PANEL_LATENCY_TOOLTIP_LATENCY_WORLD"], TitanUtils_GetHighlightText(latencyWorldText)); end
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_LATENCY_TOOLTIP_BANDWIDTH_IN"], TitanUtils_GetHighlightText(bandwidthInText));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_LATENCY_TOOLTIP_BANDWIDTH_OUT"], TitanUtils_GetHighlightText(bandwidthOutText));
 	end

 	-- Memory tooltip
 	if ( showMemory ) then
-		local memoryText = format(L["TITAN_MEMORY_FORMAT"], button.memory/1024);
-		local initialMemoryText = format(L["TITAN_MEMORY_FORMAT"], button.initialMemory/1024);
+		local memoryText = format(L["TITAN_PANEL_MEMORY_FORMAT"], button.memory/1024);
+		local initialMemoryText = format(L["TITAN_PANEL_MEMORY_FORMAT"], button.initialMemory/1024);
 		local sessionTime = time() - button.startSessionTime;
 		local rateRichText, timeToGCRichText, rate, timeToGC, color;
 		if ( sessionTime == 0 ) then
@@ -416,17 +416,17 @@ function TitanPanelPerformanceButton_SetTooltip()
 		else
 			rate = (button.memory - button.initialMemory) / sessionTime;
 			color = TitanUtils_GetThresholdColor(TITAN_MEMORY_RATE_THRESHOLD_TABLE, rate);
-			rateRichText = TitanUtils_GetColoredText(format(L["TITAN_MEMORY_RATE_FORMAT"], rate), color);
+			rateRichText = TitanUtils_GetColoredText(format(L["TITAN_PANEL_MEMORY_RATE_FORMAT"], rate), color);
 		end
 		if ( button.memory == button.initialMemory ) then
 			timeToGCRichText = TitanUtils_GetHighlightText("N/A");
 		end

 		GameTooltip:AddLine("\n");
-		GameTooltip:AddLine(TitanUtils_GetHighlightText(L["TITAN_MEMORY_TOOLTIP"]));
-		GameTooltip:AddDoubleLine(L["TITAN_MEMORY_TOOLTIP_CURRENT_MEMORY"], TitanUtils_GetHighlightText(memoryText));
-		GameTooltip:AddDoubleLine(L["TITAN_MEMORY_TOOLTIP_INITIAL_MEMORY"], TitanUtils_GetHighlightText(initialMemoryText));
-		GameTooltip:AddDoubleLine(L["TITAN_MEMORY_TOOLTIP_INCREASING_RATE"], rateRichText);
+		GameTooltip:AddLine(TitanUtils_GetHighlightText(L["TITAN_PANEL_MEMORY_TOOLTIP"]));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_MEMORY_TOOLTIP_CURRENT_MEMORY"], TitanUtils_GetHighlightText(memoryText));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_MEMORY_TOOLTIP_INITIAL_MEMORY"], TitanUtils_GetHighlightText(initialMemoryText));
+		GameTooltip:AddDoubleLine(L["TITAN_PANEL_MEMORY_TOOLTIP_INCREASING_RATE"], rateRichText);
 	end

 	if ( showAddonMemory == 1 ) then
@@ -546,13 +546,13 @@ print("TPref"
 		if TitanPanelRightClickMenu_GetDropdMenuValue() == "AddonMemoryFormat" then
 			TitanPanelRightClickMenu_AddTitle(L["TITAN_PERFORMANCE_ADDON_MEM_FORMAT_LABEL"], TitanPanelRightClickMenu_GetDropdownLevel());
 			info = {};
-			info.text = L["TITAN_MEGABYTE"];
+			info.text = L["TITAN_PANEL_MEGABYTE"];
 			info.checked = function() if TitanGetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType") == 1 then return true else return nil end
 			end
 			info.func = function() TitanSetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType", 1) end
 			TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel());
 			info = {};
-			info.text = L["TITAN_MEMORY_KBMB_LABEL"];
+			info.text = L["TITAN_PANEL_MEMORY_KBMB_LABEL"];
 			info.checked = function() if TitanGetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType") == 2 then return true else return nil end
 			end
 			info.func = function() TitanSetVar(TITAN_PERFORMANCE_ID, "AddonMemoryType", 2) end
diff --git a/TitanRegen/TitanClassicRegen.lua b/TitanRegen/TitanClassicRegen.lua
index 1c59391..cb578a4 100644
--- a/TitanRegen/TitanClassicRegen.lua
+++ b/TitanRegen/TitanClassicRegen.lua
@@ -252,13 +252,13 @@ function TitanPanelRightClickMenu_PrepareRegenMenu()
 	TitanPanelRightClickMenu_AddTitle(TitanPlugins[id].menuText);

 	info = {};
-	info.text = L["TITAN_REGEN_MENU_SHOW2"];
+	info.text = L["TITAN_REGEN_MENU_HP"];
 	info.func = TitanRegen_ShowHPRegen;
 	info.checked = TitanGetVar(TITAN_REGEN_ID,"ShowHPRegen");
 	L_UIDropDownMenu_AddButton(info);

 	info = {};
-	info.text = L["TITAN_REGEN_MENU_SHOW4"];
+	info.text = L["TITAN_REGEN_MENU_PERCENT"];
 	info.func = TitanRegen_ShowPercentage;
 	info.checked = TitanGetVar(TITAN_REGEN_ID,"ShowPercentage");
 	L_UIDropDownMenu_AddButton(info);
diff --git a/TitanRegen/TitanRegen.lua b/TitanRegen/TitanRegen.lua
index a460f0e..d5ba770 100644
--- a/TitanRegen/TitanRegen.lua
+++ b/TitanRegen/TitanRegen.lua
@@ -276,7 +276,7 @@ function TitanPanelRightClickMenu_PrepareRegenMenu()
 	TitanPanelRightClickMenu_AddTitle(TitanPlugins[id].menuText);

 	info = {};
-	info.text = L["TITAN_REGEN_MENU_SHOW2"];
+	info.text = L["TITAN_REGEN_MENU_HP"];
 	info.func = function()
 		TitanToggleVar(TITAN_REGEN_ID, "ShowHPRegen");
 		TitanPanelButton_UpdateButton(TITAN_REGEN_ID);
@@ -285,7 +285,7 @@ function TitanPanelRightClickMenu_PrepareRegenMenu()
 	L_UIDropDownMenu_AddButton(info);

 	info = {};
-	info.text = L["TITAN_REGEN_MENU_SHOW4"];
+	info.text = L["TITAN_REGEN_MENU_PERCENT"];
 	info.func = function()
 		TitanToggleVar(TITAN_REGEN_ID, "ShowPercentage");
 		TitanPanelButton_UpdateButton(TITAN_REGEN_ID);
diff --git a/TitanXP/TitanXP.lua b/TitanXP/TitanXP.lua
index d2540d8..e74010f 100644
--- a/TitanXP/TitanXP.lua
+++ b/TitanXP/TitanXP.lua
@@ -437,14 +437,14 @@ function TitanPanelRightClickMenu_PrepareXPMenu()
 	TitanPanelRightClickMenu_AddSpacer();

 	local info = {};
-	info.text = L["TITAN_USE_COMMA"];
+	info.text = L["TITAN_PANEL_USE_COMMA"];
 	info.checked = TitanGetVar(TITAN_XP_ID, "UseSeperatorComma");
 	info.func = function()
 		Seperator("UseSeperatorComma")
 	end
 	TitanPanelRightClickMenu_AddButton(info, TitanPanelRightClickMenu_GetDropdownLevel());
 	local info = {};
-	info.text = L["TITAN_USE_PERIOD"];
+	info.text = L["TITAN_PANEL_USE_PERIOD"];
 	info.checked = TitanGetVar(TITAN_XP_ID, "UseSeperatorPeriod");
 	info.func = function()
 		Seperator("UseSeperatorPeriod")