Quantcast

- Updated esES and esMX localization files with provided data from maylisdalan on CurseForge.

HonorGoG [01-10-24 - 01:08]
- Updated esES and esMX localization files with provided data from maylisdalan on CurseForge.
- Updated all localizations to include missing Classic data as localization files are now for all versions of Titan Panel.
Filename
Titan/locale/Localization.BR.lua
Titan/locale/Localization.CN.lua
Titan/locale/Localization.DE.lua
Titan/locale/Localization.ES.lua
Titan/locale/Localization.FR.lua
Titan/locale/Localization.IT.lua
Titan/locale/Localization.KR.lua
Titan/locale/Localization.MX.lua
Titan/locale/Localization.RU.lua
Titan/locale/Localization.TW.lua
Titan/locale/Localization.lua
diff --git a/Titan/locale/Localization.BR.lua b/Titan/locale/Localization.BR.lua
index da7eb7f..9ec80cb 100644
--- a/Titan/locale/Localization.BR.lua
+++ b/Titan/locale/Localization.BR.lua
@@ -233,7 +233,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "Adjusts the frame strata for the "..T
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Avançado";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Entering World";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Change value (usually increase) if frames do not adjust when entering / leaving world or an instance.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Vehicle";
@@ -241,6 +241,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Change value (usually increase) if fra

 L["TITAN_AUTOHIDE_TOOLTIP"] = "Toggles " .. TITAN_PANEL .. " auto-Ocultar on/off feature";

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Ammo: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Thrown: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Ammo/Thrown: ";
+L["TITAN_AMMO_TOOLTIP"] = "Equipped Ammo/Thrown Count";
+L["TITAN_AMMO_MENU_TEXT"] = "Ammo/Thrown";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "Refresh Display";
+L["TITAN_AMMO_BULLET_NAME"] = "Show Ammo Name";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "Bolsas: ";
 L["TITAN_BAG_TOOLTIP"] = "Informações de Bolsas";
@@ -253,8 +266,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "Exibir Espaços Usados";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Exibir Espaços Disponíveis";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Exibir Tooltip Detalhada";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignorar Contêineres";
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignore ammo pouch slots";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignore shard bags";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignorar Bolsas de Profissão";
-
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Soul Pouch", "Small Soul Pouch", "Box of Souls", "Felcloth Bag", "Core Felcloth Bag", "Ebon Shadowbag", "Abyssal Bag"};
+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_PROF_BAG_ENCHANTING"] = {
 "Saco de Magitrama Encantado", "Bolsa de Runatrama Encantada", "Algibeira do Encantador", "Grande Bolsa de Encantamentos", "Bolsa de Fogo Místico",
 "Bolsa Misteriosa", "Bolsa Sobrenatural", "Bolsa Tarde Encantadora - Exclusividade \"Lepos'Tiche\""};
@@ -315,6 +331,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Localização da Casa";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Estalagem: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Localização";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Exibir Zone Text";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Exibir Coordinates on World Map";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursor: %s";
@@ -360,6 +377,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "Exibir Dificuldade da Masmorra/Raid
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "Configurar Dificuldade da Masmorra";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "Configurar Dificuldade da Raide";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "Automático (Baseado no Grupo)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -437,6 +472,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Est. Gains: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "XP Gains To Level (at %s XP gained last): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Exibir Estimated XP Gains To Level";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Conserto",
diff --git a/Titan/locale/Localization.CN.lua b/Titan/locale/Localization.CN.lua
index b6c7430..92d4e4f 100644
--- a/Titan/locale/Localization.CN.lua
+++ b/Titan/locale/Localization.CN.lua
@@ -231,13 +231,26 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "设置"..TITAN_PANEL.."的框架是
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "高级";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "当你遇到页面框架出错时更改计时器.".."\n"; --??
+L["TITAN_PANEL_MENU_ADV_DESC"] = "当你遇到页面框架出错时更改计时器.".."\n"; --??
 L["TITAN_PANEL_MENU_ADV_PEW"] = "登陆界面"; --??
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "当你登陆登出游戏或者进出副本时遇到页面框架出错时更改设定值(通常是增大).";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "坐骑";
 L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "当你上下坐骑遇到页面框架出错时更改设定值(通常是增大).";

 L["TITAN_AUTOHIDE_TOOLTIP"] = "控制"..TITAN_PANEL.."自动隐藏 开/关";
+
+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "弹药: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "投掷武器: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "弹药/投掷武器: ";
+L["TITAN_AMMO_TOOLTIP"] = "已装备的弹药和投掷武器计数";
+L["TITAN_AMMO_MENU_TEXT"] = "弹药/投掷武器";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "刷新";
+L["TITAN_AMMO_BULLET_NAME"] = "显示弹药名称";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";

 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "背包: ";
@@ -251,8 +264,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "显示已用空间";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "显示可用空间";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "显示详细的提示信息";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "忽略容器";
-L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "忽略专业技能包";
-
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "忽略弹药包空间";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "忽略灵魂袋空间";
+L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "忽略各专业背包空间";
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"灵魂袋", "小灵魂袋", "灵魂箱", "恶魔布包", "熔火恶魔布包", "黑色暗影背包", "深渊背包"};
+L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"裂蹄牛皮箭袋", "座狼皮箭袋", "龙筋箭袋", "蛛魔强固箭袋", "千羽箭袋", "结缔皮箭袋", "鹰身人皮箭袋", "雷布里的箭袋", "快捷箭袋", "重型箭袋", "守夜人箭袋", "狩猎箭袋", "中型箭袋", "轻皮箭袋", "小箭袋", "轻型箭袋", "走私者的弹药包", "龙鳞弹药包", "结缔皮弹药包", "虚空鳞片弹药包", "豺狼人皮弹药包", "厚皮弹药包", "重皮弹药包", "守夜人的弹药包", "中型弹药包", "猎枪弹药包", "轻皮弹药包", "小型弹药包"};
 L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
 "魔化魔纹布包", "魔化符文布包", "附魔师之袋", "大附魔袋", "魔焰背包",
 "神秘背包", "异界之袋", "“马车——限定款”附魔之夜手提包"};
@@ -272,14 +288,6 @@ L["TITAN_BAG_PROF_BAG_MINING"] = {
 L["TITAN_BAG_PROF_BAG_FISHING"] = {"捕鱼大师的工具箱"};
 L["TITAN_BAG_PROF_BAG_COOKING"] = {"便携式冷柜", "Advanced Refrigeration Unit"};

--- Classic
-L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "忽略弹药包空间";
-L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "忽略灵魂袋空间";
-L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "忽略各专业背包空间";
-L["TITAN_BAG_SHARD_BAG_NAMES"] = {"灵魂袋", "小灵魂袋", "灵魂箱", "恶魔布包", "熔火恶魔布包", "黑色暗影背包", "深渊背包"};
-L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"裂蹄牛皮箭袋", "座狼皮箭袋", "龙筋箭袋", "蛛魔强固箭袋", "千羽箭袋", "结缔皮箭袋", "鹰身人皮箭袋", "雷布里的箭袋", "快捷箭袋", "重型箭袋", "守夜人箭袋", "狩猎箭袋", "中型箭袋", "轻皮箭袋", "小箭袋", "轻型箭袋", "走私者的弹药包", "龙鳞弹药包", "结缔皮弹药包", "虚空鳞片弹药包", "豺狼人皮弹药包", "厚皮弹药包", "重皮弹药包", "守夜人的弹药包", "中型弹药包", "猎枪弹药包", "轻皮弹药包", "小型弹药包"};
---
-
 L["TITAN_CLOCK_TOOLTIP"] = "时钟";
 L["TITAN_CLOCK_TOOLTIP_VALUE"] = "与服务器的时差: ";
 L["TITAN_CLOCK_TOOLTIP_LOCAL_TIME"] = "本地时间: ";
@@ -321,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "炉石位置";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "旅店: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "坐标";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "显示区域信息";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "在世界地图上显示坐标";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "鼠标位置(X,Y): %s";
@@ -366,6 +375,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "显示副本难度";
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "设置五人副本难度";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "设置团队副本难度";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "自动设定(基于队伍类型)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -443,6 +470,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "预估获得经验: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "升级所需杀怪数 (基于最后杀怪所获%s点经验): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "显示升级所需(基于最后一次所获经验)";

+L["TITAN_REGEN_MENU_TEXT"] = "恢复"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "恢复速度"
+L["TITAN_REGEN_MENU_SHOW2"] = "生命值"
+L["TITAN_REGEN_MENU_SHOW3"] = "法力值"
+L["TITAN_REGEN_MENU_SHOW4"] = "显示百分比"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "生命值: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = "法力值: "
+L["TITAN_REGEN_TOOLTIP1"] = "生命值: \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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "法力值: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "最快生命回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "最慢生命回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "最快法力回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "最慢法力回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "上次战斗法力回复值: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "修理",
diff --git a/Titan/locale/Localization.DE.lua b/Titan/locale/Localization.DE.lua
index 547b36c..396291a 100644
--- a/Titan/locale/Localization.DE.lua
+++ b/Titan/locale/Localization.DE.lua
@@ -231,7 +231,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "Legt die Frame-Strata f\195\188r die
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Erweitert";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "\195\182ndere die Timereinstellungen nur, wenn es mit den Frameanordnungen Probleme gibt.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "\195\182ndere die Timereinstellungen nur, wenn es mit den Frameanordnungen Probleme gibt.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Betrete Spielwelt";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "\195\182ndere die Werte nur (normalerweise erh\195\182hen), wenn die Rahmen nach Betreten oder Verlassen der Spielwelt oder Instanzen nicht korrekt angezeigt werden.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Fahrzeug";
@@ -239,6 +239,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "\195\182ndere die Werte nur (normalerw

 L["TITAN_AUTOHIDE_TOOLTIP"] = "Leiste automatisch ausblenden";

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Munition: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Geworfen: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Munition/Geworfen: ";
+L["TITAN_AMMO_TOOLTIP"] = "Angelegte Munition/Geworfen Z\195\164hler";
+L["TITAN_AMMO_MENU_TEXT"] = "Munition/Geworfen";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "Aktualisiere Display"; --SENSITY
+L["TITAN_AMMO_BULLET_NAME"] = "Show Ammo Name";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "Taschen: ";
 L["TITAN_BAG_TOOLTIP"] = "Taschenbenutzung";
@@ -251,7 +264,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "Bereits belegte Pl\195\164tze anzeigen";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Noch verf\195\188gbare Pl\195\164tze anzeigen";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Zeige detaillierten Tooltip";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignoriere Slots";
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Pl\195\164tze des Munitionsbeutels ignorieren";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignoriere Splittertaschen";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignoriere Berufs-Taschen";
+L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"Grollhufbalgk\195\182cher", "Worgbalgk\195\182cher", "Uraltes in Sehnen eingewickeltes Laminablatt", "K\195\182cher der tausend Federn", "K\195\182cher aus Knotenhautleder", "K\195\182cher aus Harpyienhaut", "Ribblys K\195\182cher", "Schnellziehk\195\182cher", "Schwerer K\195\182cher", "K\195\182cher der Nachtwache", "Jagdk\195\182cher", "Mittlerer K\195\182cher", "Leichter Lederk\195\182cher", "Kleiner K\195\182cher", "Leichter K\195\182cher", "Munitionsbeutel des Schmugglers", "Munitionsbeutel aus Knotenhautleder", "Munitionsbeutel aus Netherschuppen", "Schulterg\195\188rtel aus Gnollhaut", "Ribblys Schulterg\195\188rtel", "Dicker Ledermunitionsbeutel", "Schwerer Ledermunitionsbeutel", "Schulterg\195\188rtel der Nachtwache", "Mittlerer Geschossbeutel", "Jagdmunitionssack" ,"Kleiner Ledermunitionsbeutel", "Kleiner Geschossbeutel", "Kleiner Munitionsbeutel", "Verst\195\164rkter nerubischer K\195\182cher", "Drachenschuppenmunitionsbeutel"};
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Seelenbeutel", "Kleiner Seelenbeutel", "Seelenkasten", "Teufelsstofftasche", "Kernteufelsstofftasche", "Schwarzschattentasche", "Abgr\195\188ndige Tasche"};
 L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
 "Enchanted Mageweave Pouch", "Enchanted Runecloth Bag", "Enchanter's Satchel", "Big Bag of Enchantment", "Spellfire Bag",
 "Mysterious Bag", "Otherworldly Bag", "\"Carriage - Exclusive\" Enchanting Evening Purse"};
@@ -270,13 +287,6 @@ L["TITAN_BAG_PROF_BAG_MINING"] = {
 "Mining Sack", "Reinforced Mining Bag", "Mammoth Mining Bag", "\"Carriage - Christina\" Precious Metal Bag"};
 L["TITAN_BAG_PROF_BAG_FISHING"] = {"Lure Master Tackle Box"};
 L["TITAN_BAG_PROF_BAG_COOKING"] = {"Portable Refrigerator"};
--- Classic
-L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Pl\195\164tze des Munitionsbeutels ignorieren";
-L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignoriere Splittertaschen";
-L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignoriere Berufs-Taschen";
-L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"Grollhufbalgk\195\182cher", "Worgbalgk\195\182cher", "Uraltes in Sehnen eingewickeltes Laminablatt", "K\195\182cher der tausend Federn", "K\195\182cher aus Knotenhautleder", "K\195\182cher aus Harpyienhaut", "Ribblys K\195\182cher", "Schnellziehk\195\182cher", "Schwerer K\195\182cher", "K\195\182cher der Nachtwache", "Jagdk\195\182cher", "Mittlerer K\195\182cher", "Leichter Lederk\195\182cher", "Kleiner K\195\182cher", "Leichter K\195\182cher", "Munitionsbeutel des Schmugglers", "Munitionsbeutel aus Knotenhautleder", "Munitionsbeutel aus Netherschuppen", "Schulterg\195\188rtel aus Gnollhaut", "Ribblys Schulterg\195\188rtel", "Dicker Ledermunitionsbeutel", "Schwerer Ledermunitionsbeutel", "Schulterg\195\188rtel der Nachtwache", "Mittlerer Geschossbeutel", "Jagdmunitionssack" ,"Kleiner Ledermunitionsbeutel", "Kleiner Geschossbeutel", "Kleiner Munitionsbeutel", "Verst\195\164rkter nerubischer K\195\182cher", "Drachenschuppenmunitionsbeutel"};
-L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Seelenbeutel", "Kleiner Seelenbeutel", "Seelenkasten", "Teufelsstofftasche", "Kernteufelsstofftasche", "Schwarzschattentasche", "Abgr\195\188ndige Tasche"};
---

 L["TITAN_CLOCK_TOOLTIP"] = "Uhr";
 L["TITAN_CLOCK_TOOLTIP_VALUE"] = "Momentane Zeitverschiebung: ";
@@ -319,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Heimatort: ";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Gasthaus: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Position";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Zonentext in der Leiste anzeigen";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Koordinaten auf der Weltkarte anzeigen";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Mauszeiger (X,Y): %s";
@@ -326,15 +337,6 @@ L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Spieler (X,Y): %s";
 L["TITAN_LOCATION_NO_COORDS"] = "Keine Koordinaten";
 L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"] = "Zeige Gebutsname über der Minimap";
 L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"] = "Aktualisiere Weltkarte bei Zonenwechsel";
--- Classic
-L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
-L["TITAN_LOCATION_MENU_MAP_COORDS_TITLE"] = "Coordinates Location on Map";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_1"] = "Top Left";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_2"] = "Top Right";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_3"] = "Bottom Left";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_4"] = "Bottom";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_5"] = "Bottom Right";
---

 L["TITAN_FPS_FORMAT"] = "%.2f";
 L["TITAN_FPS_BUTTON_LABEL"] = "FPS: ";
@@ -373,6 +375,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "Zeige Dungeon-/Schlachtzug-Schwieri
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "Lege Dungeon-Schwierigkeit fest";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "Lege Schlachtzugschwierigkeit fest";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "Auto (gruppenbasiert)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.1f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -450,6 +470,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Ca. XP-Boni: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "XP-Boni bis Levelaufstieg (bei %s XP zuletzt): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Zeige ungef\195\164hre XP Boni bis zum Levelaufstieg";

+L["TITAN_REGEN_MENU_TEXT"] = "Regeneration"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"]     = "Regenerationsrate"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "Als Prozentsatz"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Gesundheit: \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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Beste HP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Schlechteste HP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Beste MP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Schlechteste MP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regeneration im letzten Kampf: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Reparieren",
diff --git a/Titan/locale/Localization.ES.lua b/Titan/locale/Localization.ES.lua
index a7fb155..5af4de2 100644
--- a/Titan/locale/Localization.ES.lua
+++ b/Titan/locale/Localization.ES.lua
@@ -28,9 +28,9 @@ L["TITAN_USE_PERIOD"] = "Use punto como separador numérico";
 L["TITAN_PANEL_ERROR_DUP_PLUGIN"] = " aparece duplicado. Esto puede hacer que Titan Panel falle, por favor, corrija el problema."
 L["TITAN_PANEL_ERROR_PROF_DELCURRENT"] = "No puedes borrar el perfil actual.";
 local TITAN_PANEL_WARNING = GREEN_FONT_COLOR_CODE.."Aviso : "..FONT_COLOR_CODE_CLOSE
-local TITAN_PANEL_RELOAD_TEXT = "Si deseas continuar con esta operación, pulsa 'Aceptar' (se recargará tu interface), de lo contrario pulsa 'Cancelar' o la tecla 'Escape'."
+local TITAN_PANEL_RELOAD_TEXT = "Si deseas continuar con esta operación, pulsa 'Aceptar' (se recargará tu interfaz), de lo contrario pulsa 'Cancelar' o la tecla 'Escape'."
 L["TITAN_PANEL_RESET_WARNING"] = TITAN_PANEL_WARNING
-.."Esta opción reseteará la configuración de tus barras y panel a los valores por defecto, y recreará tu perfil actual."
+.."Esta opción restablecerá la configuración de tus barras y panel a los valores por defecto, y recreará tu perfil actual."
 ..TITAN_PANEL_RELOAD_TEXT
 L["TITAN_PANEL_RELOAD"] = TITAN_PANEL_WARNING
 .."Esto recargará "..TITAN_PANEL.."."
@@ -42,7 +42,7 @@ L["TITAN_PANEL_ATTEMPTS_DESC"] = "Los siguientes plugins han solicitado ser acti
 L["TITAN_PANEL_ATTEMPTS_TYPE"] = "Tipo"
 L["TITAN_PANEL_ATTEMPTS_CATEGORY"] = "Categoría"
 L["TITAN_PANEL_ATTEMPTS_BUTTON"] = "Nombre del botón"
-L["TITAN_PANEL_ATTEMPTS_STATUS"] = "Estatus"
+L["TITAN_PANEL_ATTEMPTS_STATUS"] = "Estado"
 L["TITAN_PANEL_ATTEMPTS_ISSUE"] = "Incidencia"
 L["TITAN_PANEL_ATTEMPTS_NOTES"] = "Notas"
 L["TITAN_PANEL_ATTEMPTS_TABLE"] = "Indice"
@@ -61,15 +61,15 @@ L["TITAN_PANEL_REGISTER_END"] = "Proceso de registro completado."

 -- slash command help
 L["TITAN_PANEL_SLASH_RESET_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/titan {reset | reset tipfont/tipalpha/panelscale/spacing}";
-L["TITAN_PANEL_SLASH_RESET_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset: |cffffffffResetea "..TITAN_PANEL.." a sus valores y posiciones por defecto.";
-L["TITAN_PANEL_SLASH_RESET_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipfont: |cffffffffResetea la escala de la fuente en los tooltips a su valor por defecto.";
-L["TITAN_PANEL_SLASH_RESET_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipalpha: |cffffffffResetea la transparencia de los tooltips a su valor por defecto.";
-L["TITAN_PANEL_SLASH_RESET_4"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset panelscale: |cffffffffResetea la escala de "..TITAN_PANEL.." a su valor por defecto.";
-L["TITAN_PANEL_SLASH_RESET_5"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset spacing: |cffffffffResetea el espaciado de los botones de "..TITAN_PANEL.." a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset: |cffffffffRestablece "..TITAN_PANEL.." a sus valores y posiciones por defecto.";
+L["TITAN_PANEL_SLASH_RESET_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipfont: |cffffffffRestablece la escala de la fuente en los tooltips a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipalpha: |cffffffffRestablece la transparencia de los tooltips a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_4"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset panelscale: |cffffffffRestablece la escala de "..TITAN_PANEL.." a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_5"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset spacing: |cffffffffRestablece el espaciado de los botones de "..TITAN_PANEL.." a su valor por defecto.";
 L["TITAN_PANEL_SLASH_GUI_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/titan {gui control/trans/skin}";
-L["TITAN_PANEL_SLASH_GUI_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui control: |cffffffffAbre el interface de control para "..TITAN_PANEL..".";
-L["TITAN_PANEL_SLASH_GUI_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui trans: |cffffffffAbre el interface de control de transarencia.";
-L["TITAN_PANEL_SLASH_GUI_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui skin: |cffffffffAbre el interface de control de Skin.";
+L["TITAN_PANEL_SLASH_GUI_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui control: |cffffffffAbre la interfaz de control para "..TITAN_PANEL..".";
+L["TITAN_PANEL_SLASH_GUI_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui trans: |cffffffffAbre la interfaz de control de transarencia.";
+L["TITAN_PANEL_SLASH_GUI_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui skin: |cffffffffAbre la interfaz de control de Skin.";
 L["TITAN_PANEL_SLASH_PROFILE_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/titan {profile use <profile>}";
 L["TITAN_PANEL_SLASH_PROFILE_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."profile use <nombre> <servidor>: |cffffffffActiva el perfil grabado.";
 L["TITAN_PANEL_SLASH_PROFILE_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."<nombre>: |cffffffffpuede ser tanto un nombre de personaje como el nombre de un perfil personalizado."
@@ -84,10 +84,10 @@ L["TITAN_PANEL_SLASH_ALL_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/tit
 L["TITAN_PANEL_SLASH_ALL_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."<topic>: |cffffffffreset/gui/profile/silent/orderhall/help ";

 -- slash command responses
-L["TITAN_PANEL_SLASH_RESP1"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de la fuente en los tooltips de Titan Panel ha sido reseteada.";
-L["TITAN_PANEL_SLASH_RESP2"] = LIGHTYELLOW_FONT_COLOR_CODE.."La transparencia de los tooltips de Titan Panel ha sido reseteada.";
-L["TITAN_PANEL_SLASH_RESP3"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de Titan Panel ha sido reseteada.";
-L["TITAN_PANEL_SLASH_RESP4"] = LIGHTYELLOW_FONT_COLOR_CODE.."El espaciado de los botones de Titan Panel ha sido reseteado.";
+L["TITAN_PANEL_SLASH_RESP1"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de la fuente en los tooltips de Titan Panel ha sido restableceda.";
+L["TITAN_PANEL_SLASH_RESP2"] = LIGHTYELLOW_FONT_COLOR_CODE.."La transparencia de los tooltips de Titan Panel ha sido restableceda.";
+L["TITAN_PANEL_SLASH_RESP3"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de Titan Panel ha sido restableceda.";
+L["TITAN_PANEL_SLASH_RESP4"] = LIGHTYELLOW_FONT_COLOR_CODE.."El espaciado de los botones de Titan Panel ha sido restablecedo.";

 -- global profile locale
 L["TITAN_PANEL_GLOBAL"] = "Global";
@@ -105,7 +105,7 @@ L["TITAN_PANEL_MENU_TITLE"] = TITAN_PANEL;
 L["TITAN_PANEL_MENU_HIDE"] = "Ocultar";
 L["TITAN_PANEL_MENU_CUSTOMIZE"] = "Personalizar";
 L["TITAN_PANEL_MENU_IN_COMBAT_LOCKDOWN"] = "(En combate)";
-L["TITAN_PANEL_MENU_RELOADUI"] = "(Recargar UI)";
+L["TITAN_PANEL_MENU_RELOADUI"] = "(Recargar IU)";
 L["TITAN_PANEL_MENU_SHOW_COLORED_TEXT"] = "Mostrar texto en color";
 L["TITAN_PANEL_MENU_SHOW_ICON"] = "Mostrar icono";
 L["TITAN_PANEL_MENU_SHOW_LABEL_TEXT"] = "Mostrar etiqueta de texto";
@@ -116,9 +116,9 @@ L["TITAN_PANEL_MENU_DISPLAY_BAR"] = "Mostrar barra superior";
 L["TITAN_PANEL_MENU_DISPLAY_BOTH"] = "Mostrar ambas barras";
 L["TITAN_PANEL_MENU_DISABLE_PUSH"] = "Desactivar ajuste de pantalla";
 L["TITAN_PANEL_MENU_DISABLE_MINIMAP_PUSH"] = "Desactivar ajuste de minimapa";
-L["TITAN_PANEL_MENU_DISABLE_LOGS"] = "Ajuste automático de log";
+L["TITAN_PANEL_MENU_DISABLE_LOGS"] = "Ajuste automático de registro";
 L["TITAN_PANEL_MENU_DISABLE_BAGS"] = "Ajuste automático de bolsas";
-L["TITAN_PANEL_MENU_DISABLE_TICKET"] = "Ajuste automático de la ventana de tickets";
+L["TITAN_PANEL_MENU_DISABLE_TICKET"] = "Ajuste automático de la ventana de boletos";
 L["TITAN_PANEL_MENU_BUILTINS"] = "De serie en Titan";
 L["TITAN_PANEL_MENU_LEFT_SIDE"] = "Lado izquierdo";
 L["TITAN_PANEL_MENU_RIGHT_SIDE"] = "Lado derecho";
@@ -128,7 +128,7 @@ L["TITAN_PANEL_MENU_PROFILE_CUSTOM"] = "Personalizado";
 L["TITAN_PANEL_MENU_PROFILE_DELETED"] = " ha sido borrado.";
 L["TITAN_PANEL_MENU_PROFILE_SERVERS"] = "Servidor";
 L["TITAN_PANEL_MENU_PROFILE_CHARS"] = "Personaje";
-L["TITAN_PANEL_MENU_PROFILE_RELOADUI"] = "Se recargará tu interface en cuanto pulses 'Ok' para poder grabar tu perfil personalizado.";
+L["TITAN_PANEL_MENU_PROFILE_RELOADUI"] = "Se recargará tu interfaz en cuanto pulses 'Ok' para poder grabar tu perfil personalizado.";
 L["TITAN_PANEL_MENU_PROFILE_SAVE_CUSTOM_TITLE"] = "Introduce un nombre para tu perfil personalizado::\n(20 carácteres máximo, sin espacios, diferencia entre mayúsculas y minúsculas)";
 L["TITAN_PANEL_MENU_PROFILE_SAVE_PENDING"] = "La configuración actual del panel se va a grabar en el perfil llamado: ";
 L["TITAN_PANEL_MENU_PROFILE_ALREADY_EXISTS"] = "El nombre de perfil introducido ya existe. ¿Estás seguro de que quieres sobreescribirlo? Pulsa 'Aceptar' si lo deseas, de lo contrario pulsa 'Cancelar' o la tecla 'Escape'.";
@@ -167,8 +167,8 @@ L["TITAN_PANEL_MENU_FONT"] = "Fuente";
 L["TITAN_PANEL_MENU_LSM_FONTS"] = "Fuente del Panel"
 L["TITAN_PANEL_MENU_ENABLED"] = "Activado";
 L["TITAN_PANEL_MENU_DISABLED"] = "Desactivado";
-L["TITAN_PANEL_SHIFT_LEFT"] = "Mayus-Izdo.";
-L["TITAN_PANEL_SHIFT_RIGHT"] = "Mayus-Dcho.";
+L["TITAN_PANEL_SHIFT_LEFT"] = "Mayús-Izdo.";
+L["TITAN_PANEL_SHIFT_RIGHT"] = "Mayús-Dcho.";
 L["TITAN_PANEL_MENU_SHOW_PLUGIN_TEXT"] = "Mostrar texto del plugin";
 L["TITAN_PANEL_MENU_LDB_TREAT"] = "Tratar como origen de datos";
 L["TITAN_PANEL_MENU_LDB_SLAP"] = "Si necesitas usar esto solicítale al autor que cambie el tipo LDB";
@@ -202,14 +202,14 @@ L["TITAN_TRANS_AUX_BAR_DESC"] = "Establece la transparencia para la Barra Auxili
 L["TITAN_TRANS_TOOLTIP_DESC"] = "Establece la transparencia para los tooltips de varios plugins.";
 L["TITAN_UISCALE_MENU_TEXT"] = "Escala y Fuentes de "..TITAN_PANEL;
 L["TITAN_UISCALE_MENU_TEXT_SHORT"] = "Escala y Fuentes";
-L["TITAN_UISCALE_CONTROL_TITLE_UI"] = "Escala del interface";
+L["TITAN_UISCALE_CONTROL_TITLE_UI"] = "Escala de la interfaz";
 L["TITAN_UISCALE_CONTROL_TITLE_PANEL"] = "Escala de "..TITAN_PANEL;
 L["TITAN_UISCALE_CONTROL_TITLE_BUTTON"] = "Espaciado de los botones";
 L["TITAN_UISCALE_CONTROL_TITLE_ICON"] = "Espaciado de iconos";
 L["TITAN_UISCALE_CONTROL_TOOLTIP_TOOLTIPFONT"] = "Tamaño de la fuente de los tooltips";
 L["TITAN_UISCALE_TOOLTIP_DISABLE_TEXT"] = "Desactivar tamaño de la fuente de los tooltips";
-L["TITAN_UISCALE_MENU_DESC"] = "Controla varios aspectos del interface y "..TITAN_PANEL..".";
-L["TITAN_UISCALE_SLIDER_DESC"] = "Establece la escala de todo el interface.";
+L["TITAN_UISCALE_MENU_DESC"] = "Controla varios aspectos de la interfaz y "..TITAN_PANEL..".";
+L["TITAN_UISCALE_SLIDER_DESC"] = "Establece la escala de toda la interfaz.";
 L["TITAN_UISCALE_PANEL_SLIDER_DESC"] = "Establece la escala para los distintos botones e iconos de "..TITAN_PANEL..".";
 L["TITAN_UISCALE_BUTTON_SLIDER_DESC"] = "Ajusta el espacio entre los plugins del lado izquierdo.";
 L["TITAN_UISCALE_ICON_SLIDER_DESC"] = "Ajusta el espacio entre los iconos de los plugins del lado derecho.";
@@ -224,7 +224,7 @@ L["TITAN_SKINS_MAIN_DESC"] = "Se asume que todos los skins personalizados están
 L["TITAN_SKINS_LIST_TITLE"] = "Lista de skins";
 L["TITAN_SKINS_SET_DESC"] = "Elige que skin quieres para las barras "..TITAN_PANEL..".";
 L["TITAN_SKINS_SET_HEADER"] = "Establece skin de "..TITAN_PANEL;
-L["TITAN_SKINS_RESET_HEADER"] = "Resetea el skin de "..TITAN_PANEL;
+L["TITAN_SKINS_RESET_HEADER"] = "Restablece el skin de "..TITAN_PANEL;
 L["TITAN_SKINS_NEW_HEADER"] = "Añadir nuevo skin";
 L["TITAN_SKINS_NAME_TITLE"] = "Nombre de skin";
 L["TITAN_SKINS_NAME_DESC"] = "Introduce un nombre para tu nuevo skin. Se usará en la lista desplegable de skins.";
@@ -239,8 +239,8 @@ L["TITAN_SKINS_REMOVE_BUTTON"] = "Eliminar";
 L["TITAN_SKINS_REMOVE_BUTTON_DESC"] = "Elimina el skin selecionado de la lista de skins disponibles para el Panel.";
 L["TITAN_SKINS_REMOVE_NOTES"] = "Serás el único responsable si eliminas cualquier skin personalizado no deseado "
 	.." del directorio de instalación de "..TITAN_PANEL..". Los addons no pueden añadir o eliminar archivos."
-L["TITAN_SKINS_RESET_DEFAULTS_TITLE"] = "Resetear lista";
-L["TITAN_SKINS_RESET_DEFAULTS_DESC"] = "Resetea la lista de skins a sus valores por defecto, los skins incluidos de serie.";
+L["TITAN_SKINS_RESET_DEFAULTS_TITLE"] = "Restablecer lista";
+L["TITAN_SKINS_RESET_DEFAULTS_DESC"] = "Restablece la lista de skins a sus valores por defecto, los skins incluidos de serie.";
 L["TITAN_PANEL_MENU_LSM_FONTS_DESC"] = "Elige el tipo de letra utilizado por los diferentes plugins en las barras "..TITAN_PANEL..".";
 L["TITAN_PANEL_MENU_FONT_SIZE"] = "Tamaño de la fuente";
 L["TITAN_PANEL_MENU_FONT_SIZE_DESC"] = "Establece el tamaño para el tipo de letra de "..TITAN_PANEL..".";
@@ -257,6 +257,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Cambia el valor (habitualmente increme

 L["TITAN_AUTOHIDE_TOOLTIP"] = "Activar/Desactivar la característica de auto-ocultación de "..TITAN_PANEL;

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Munición: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Arrojadiza: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Munición/Arrojadiza: ";
+L["TITAN_AMMO_TOOLTIP"] = "Contador de munición/arrojadiza equipada";
+L["TITAN_AMMO_MENU_TEXT"] = "Munición/Arrojadiza";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "Actualizar información";
+L["TITAN_AMMO_BULLET_NAME"] = "Mostrar nombre de la munición";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "Bolsas: ";
 L["TITAN_BAG_TOOLTIP"] = "Uso de bolsas";
@@ -270,13 +283,10 @@ L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Mostrar huecos libres";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Mostrar tooltip detallado";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignorar bolsas";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignorar bolsas de profesión";
--- Classic
 L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignorar bolsas de munición";
 L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignorar bolsas de almas";
 L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Faltriquera de almas", "Bolsa de tela vil", "Bolsa de tela vil del Núcleo", "Bolsa de las Sombras de ébano", "Faltriquera de almas pequeña", "Caja de almas"};
 L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"munición", "Carcaj", "Bandolera", "pólvora", "lámina"};
---
-
 L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
 "Faltriquera de tejido mágico encantada","Bolsa de paño rúnico encantada","Cartera de encantador","Bolsa de encantamiento grande","Bolsa de fuego de hechizo","Bolsa misteriosa","Bolsa de otro mundo","Bolso de noche encantador \"Trasportín exclusivo\""};
 L["TITAN_BAG_PROF_BAG_ENGINEERING"] = {
@@ -301,7 +311,7 @@ L["TITAN_CLOCK_TOOLTIP_SERVER_TIME"] = "Hora del servidor: ";
 L["TITAN_CLOCK_TOOLTIP_SERVER_ADJUSTED_TIME"] = "Hora del servidor ajustada: ";
 L["TITAN_CLOCK_TOOLTIP_HINT1"] = "Consejo: Click-Izq. ajusta el horario"
 L["TITAN_CLOCK_TOOLTIP_HINT2"] = "y el formato de tiempo 12/24H.";
-L["TITAN_CLOCK_TOOLTIP_HINT3"] = "Sift + Click-Izq. para activar y desactivar el calendario.";
+L["TITAN_CLOCK_TOOLTIP_HINT3"] = "Shift + Click-Izq. para activar y desactivar el calendario.";
 L["TITAN_CLOCK_CONTROL_TOOLTIP"] = "Ajuste horario: ";
 L["TITAN_CLOCK_CONTROL_TITLE"] = "Ajuste horario";
 L["TITAN_CLOCK_CONTROL_HIGH"] = "+12";
@@ -330,26 +340,26 @@ L["TITAN_LOCATION_TOOLTIP_HINTS_1"] = "Consejo: Shift + Click-Izq. para poner la
 L["TITAN_LOCATION_TOOLTIP_HINTS_2"] = "en el chat de mensajes.";
 L["TITAN_LOCATION_TOOLTIP_ZONE"] = "Zona: ";
 L["TITAN_LOCATION_TOOLTIP_SUBZONE"] = "Subzona: ";
-L["TITAN_LOCATION_TOOLTIP_PVPINFO"] = "Info PVP: ";
-L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Ubicación de mi casa";
+L["TITAN_LOCATION_TOOLTIP_PVPINFO"] = "Info JcJ: ";
+L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Ubicación de mi hogar";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Posada: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Ubicación";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Mostrar texto de zona";
-L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Mostrar coordenadas en el mapamundi";
+L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Mostrar coordenadas en el mapa del mundo";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursor(X,Y): %s";
 L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Jugador(X,Y): %s";
 L["TITAN_LOCATION_NO_COORDS"] = "Sin Coordenadas";
 L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"] = "Mostrar el nombre de la ubicación sobre el minimapa";
-L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"] = "Actualizar mapamundi cuando cambia la zona";
+L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"] = "Actualizar mapa del mundo cuando cambia la zona";

 L["TITAN_FPS_FORMAT"] = "%.1f";
-L["TITAN_FPS_BUTTON_LABEL"] = "FPS: ";
-L["TITAN_FPS_MENU_TEXT"] = "FPS";
-L["TITAN_FPS_TOOLTIP_CURRENT_FPS"] = "FPS actuales: ";
-L["TITAN_FPS_TOOLTIP_AVG_FPS"] = "FPS de nedia: ";
-L["TITAN_FPS_TOOLTIP_MIN_FPS"] = "FPS mínimos: ";
-L["TITAN_FPS_TOOLTIP_MAX_FPS"] = "FPS máximos: ";
+L["TITAN_FPS_BUTTON_LABEL"] = "IPS: ";
+L["TITAN_FPS_MENU_TEXT"] = "IPS";
+L["TITAN_FPS_TOOLTIP_CURRENT_FPS"] = "IPS actuales: ";
+L["TITAN_FPS_TOOLTIP_AVG_FPS"] = "IPS de media: ";
+L["TITAN_FPS_TOOLTIP_MIN_FPS"] = "IPS mínimos: ";
+L["TITAN_FPS_TOOLTIP_MAX_FPS"] = "IPS máximos: ";
 L["TITAN_FPS_TOOLTIP"] = "Imágenes por segundo";

 L["TITAN_LATENCY_FORMAT"] = "%d".."ms";
@@ -362,15 +372,15 @@ L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_IN"] = "Ancho de banda entrante: ";
 L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_OUT"] = "Ancho de banda de salida: ";
 L["TITAN_LATENCY_MENU_TEXT"] = "Latencia";

-L["TITAN_LOOTTYPE_BUTTON_LABEL"] = "Saqueo: ";
+L["TITAN_LOOTTYPE_BUTTON_LABEL"] = "Botín: ";
 L["TITAN_LOOTTYPE_FREE_FOR_ALL"] = "Libre para todos";
 L["TITAN_LOOTTYPE_ROUND_ROBIN"] = "Por turnos";
 L["TITAN_LOOTTYPE_MASTER_LOOTER"] = "Maestro despojador";
 L["TITAN_LOOTTYPE_GROUP_LOOT"] = "Botín de grupo";
 L["TITAN_LOOTTYPE_NEED_BEFORE_GREED"] = "Necesidad antes que codicia";
 L["TITAN_LOOTTYPE_PERSONAL"] = "Personal";
-L["TITAN_LOOTTYPE_TOOLTIP"] = "Tipo de saqueo";
-L["TITAN_LOOTTYPE_MENU_TEXT"] = "Tipo de saqueo";
+L["TITAN_LOOTTYPE_TOOLTIP"] = "Tipo de botín";
+L["TITAN_LOOTTYPE_MENU_TEXT"] = "Tipo de botín";
 L["TITAN_LOOTTYPE_RANDOM_ROLL_LABEL"] = "Tirar dados";
 L["TITAN_LOOTTYPE_TOOLTIP_HINT1"] = "Consejo: Click-Izq. para tirar dados.";
 L["TITAN_LOOTTYPE_TOOLTIP_HINT2"] = "Seleccione el valor de la tirada de dados con el menu de Click-Dcho.";
@@ -380,6 +390,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "Mostrar dificultad de Mazmorra/Band
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "Establecer dificultad de Mazmorra";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "Establecer dificultad de Banda";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "Auto (según grupo)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -457,6 +485,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Gananc. Est.: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Ganancias de XP para subir (a %s XP ganados la útltima vez): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Mostrar ganancias de XP estimadas para subir";

+L["TITAN_REGEN_MENU_TEXT"] = "Regeneración"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Ratios de regeneración"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "Como porcentaje"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Salud: \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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Maná: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Mejor regeneración de HP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Peor regeneración de HP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Mejor regeneración de MP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Peor regeneración de MP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "Regeneración de MP en último combate: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Reparación",
@@ -513,7 +556,7 @@ L["TITAN_REPAIR_REPORT_COST_CHAT"] = "El coste de la reparación ha sido "
 L["TITAN_GOLD_TOOLTIPTEXT"] = "Oro total en";
 L["TITAN_GOLD_ITEMNAME"] = "Titan Gold";
 L["TITAN_GOLD_CLEAR_DATA_TEXT"] = "Limpiar base de datos";
-L["TITAN_GOLD_RESET_SESS_TEXT"] = "Resetear sesión actual";
+L["TITAN_GOLD_RESET_SESS_TEXT"] = "Restablecer sesión actual";
 L["TITAN_GOLD_DB_CLEARED"] = "Titan Gold - Base de datos limpiada.";
 L["TITAN_GOLD_SESSION_RESET"] = "Titan Gold - Sesión reiniciada.";
 L["TITAN_GOLD_MENU_TEXT"] = "Oro";
diff --git a/Titan/locale/Localization.FR.lua b/Titan/locale/Localization.FR.lua
index 08bbbc9..4715942 100644
--- a/Titan/locale/Localization.FR.lua
+++ b/Titan/locale/Localization.FR.lua
@@ -235,7 +235,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "Ajuste l'altitude des frames pour les
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Avancé";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Changez les timers uniquement si vous avez des problèmes avec l'ajustement des frames.".."\n"; -- ??
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Changez les timers uniquement si vous avez des problèmes avec l'ajustement des frames.".."\n"; -- ??
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Entrée dans le monde";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Utiliser (généralement en augmentant) si les frames ne s'ajustent pas lors de chargement du monde (ou d'une instance).";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Véhicule";
@@ -243,6 +243,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Utiliser (généralement en augmentant

 L["TITAN_AUTOHIDE_TOOLTIP"] = "Changer l'affichage automatique du panneau on/off";

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Munitions : ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Armes de jet : ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Munitions/Jet : ";
+L["TITAN_AMMO_TOOLTIP"] = "Nombre de Munitions/Armes de jet";
+L["TITAN_AMMO_MENU_TEXT"] = "Munitions/Armes de jet";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "Rafra\195\174chir l'affichage";
+L["TITAN_AMMO_BULLET_NAME"] = "Montrer le nom des munitions";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "Sacs : ";
 L["TITAN_BAG_TOOLTIP"] = "Utilisation des sacs";
@@ -256,13 +269,10 @@ L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Montrer les emplacements libres";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Afficher les détails";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignorer les sacs de métiers";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignorer les emplacements des sacs spécifiques aux métiers";
--- Classic
 L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignorer les emplacements des sacs de munitions";
 L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignorer les emplacements des sacs de fragments d'\195\162me";
 L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"Cartouchi\195\168re","Carquois","Giberne","Munitions","Balles","Lames","Besace des Veilleurs","Feuille d'Ancien cousue de tendons"};
 L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Petite bourse d'\195\162me","Bo\195\174te d'\195\162mes","Bourse d'\195\162me","Sac en gangr\195\169toffe","Ombresac d'\195\169b\195\168ne","Sac en gangr\195\169toffe du Magma", "Sac abyssal"};
---
-
 L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
 "Bourse enchantée en tisse-mage","Sac de soirée enchanteur en exclusivité pour La Tannée","Sac enchanté en étoffe runique","Sacoche d'enchanteur","Grand sac d'enchantement","Sac du feu-sorcier","Sac mystérieux","Sac surnaturel"};
 L["TITAN_BAG_PROF_BAG_ENGINEERING"] = {
@@ -321,6 +331,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Position du foyer";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Auberge : ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Position";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Montrer le texte de la zone";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Montrer les coordonnées sur la carte du monde";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Curseur : %s";
@@ -366,6 +377,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "Afficher la difficulté du donjon/r
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "Changer la difficulté du donjon";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "Changer la difficulté du raid";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "Auto (basé sur le groupe)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."Mo";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."Ko";
@@ -443,6 +472,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Est. des gains : ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Gains d'XP pour passer de niveau (à %s XP gagné): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "les estimations de gains d'XP pour monter";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Taux de regen"
+L["TITAN_REGEN_MENU_SHOW2"] = "Sant\195\169 (HP)"
+L["TITAN_REGEN_MENU_SHOW3"] = "Mana (MP)"
+L["TITAN_REGEN_MENU_SHOW4"] = "Double d\195\169cimale"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Sant\195\169 (HP): \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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana (MP): \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Meilleur Regen HP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Plus mauvais Regen HP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Meilleur Regen MP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Plus mauvais Regen MP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "Regen MP du dernier combat: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Réparation",
diff --git a/Titan/locale/Localization.IT.lua b/Titan/locale/Localization.IT.lua
index d6b4055..5d8fa6b 100644
--- a/Titan/locale/Localization.IT.lua
+++ b/Titan/locale/Localization.IT.lua
@@ -230,7 +230,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "Adjusts the frame strata for the "..T
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Avanzate";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Modifica i timer solo se hai problemi con finestre che non si posizionano correttamente.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Modifica i timer solo se hai problemi con finestre che non si posizionano correttamente.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Ingresso nel mondo";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Modifica valore (di solito aumenta) se le finestre non si posizionano quando entri / esci dal mondo o da un istanza.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Veicolo";
@@ -238,6 +238,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Modifica valore (di solito aumenta) se

 L["TITAN_AUTOHIDE_TOOLTIP"] = "Attiva/Disattiva la funzione Auto-Nascondi di "..TITAN_PANEL;

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Ammo: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Thrown: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Ammo/Thrown: ";
+L["TITAN_AMMO_TOOLTIP"] = "Equipped Ammo/Thrown Count";
+L["TITAN_AMMO_MENU_TEXT"] = "Ammo/Thrown";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "Refresh Display";
+L["TITAN_AMMO_BULLET_NAME"] = "Show Ammo Name";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "Zaino: ";
 L["TITAN_BAG_TOOLTIP"] = "Info Zaino";
@@ -250,8 +263,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "Mostra spazi usati";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Mostra spazi disponibili";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Mostra tooltip dettagliato";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignora contenitori";
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignore ammo pouch slots";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignore shard bags";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignora zaini delle professioni";
-
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Soul Pouch", "Small Soul Pouch", "Box of Souls", "Felcloth Bag", "Core Felcloth Bag", "Ebon Shadowbag", "Abyssal Bag"};
+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_PROF_BAG_ENCHANTING"] = {
 "Borsa di Telamagica Incantata", "Borsa di Telarunica Incantata", "Zaino da Incantatore", "Sacca Grande da Incantatore",
 "Sacca di Fuocoincanto", "Sacca Misteriosa", "Sacca Ultraterrena", "Borsetta da Incantatore \"Esclusiva\" di Dolce Gabbata"};
@@ -313,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Home Location";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Inn: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Località";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Mostra testo zona";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Mostra coordinate sulla mappa";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursore: %s";
@@ -358,6 +375,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "Mostra difficoltà Scorreria/Incurs
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "Imposta difficoltà Scorreria";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "Imposta difficoltà Incursione";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "Auto (in base al gruppo)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -435,6 +470,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Incrementi PE da ott.: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Incrementi PE al prossimo lv. (%s PE ottenuti l'ultima volta): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Mostra incrementi PE al prossimo lv";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Riparazione",
diff --git a/Titan/locale/Localization.KR.lua b/Titan/locale/Localization.KR.lua
index df3c9f2..cd14020 100644
--- a/Titan/locale/Localization.KR.lua
+++ b/Titan/locale/Localization.KR.lua
@@ -231,7 +231,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "타이탄의 프레임 레벨을 조
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Advanced";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "월드 진이붕";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Change value (usually increase) if frames do not adjust when entering / leaving world or an instance.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "탈 것";
@@ -239,6 +239,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Change value (usually increase) if fra

 L["TITAN_AUTOHIDE_TOOLTIP"] = "패널 자동 숨김을 전환합니다.";

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Ammo: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Thrown: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Ammo/Thrown: ";
+L["TITAN_AMMO_TOOLTIP"] = "Equipped Ammo/Thrown Count";
+L["TITAN_AMMO_MENU_TEXT"] = "Ammo/Thrown";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "Refresh Display";
+L["TITAN_AMMO_BULLET_NAME"] = "Show Ammo Name";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "가방: ";
 L["TITAN_BAG_TOOLTIP"] = "가방 정보";
@@ -251,8 +264,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "사용한 공간 표시";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "남은 공간 표시";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "상세 툴팁 표시";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "특수 가방 제외";
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignore ammo pouch slots";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignore shard bags";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "전문기술 가방 제외";
-
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Soul Pouch", "Small Soul Pouch", "Box of Souls", "Felcloth Bag", "Core Felcloth Bag", "Ebon Shadowbag", "Abyssal Bag"};
+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_PROF_BAG_ENCHANTING"] = {
 "마력 깃든 마법매듭 가방", "마력 깃든 룬매듭 가방", "마법부여사의 가방", "큰 마법용품 가방", "마법불꽃 가방",
 "불가사의한 가방", "다른 세상의 가방", "\"나르지 독점 상품\" 마법부여 나들이 지갑"};
@@ -313,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "여관 위치";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "여관: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "좌표";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "지역 표시";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "세계 지도에 좌표 표시";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "커서(X,Y): %s";
@@ -357,6 +374,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "공격대/던전 난이도 표시";
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "던전 난이도 설정";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "공격대 난이도 설정";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "자동 (파티 기본)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -434,6 +469,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "획득: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "레벨당 획득한 경험치 (최근 획득한 경험치 %s 기준): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "레벨당 경험치 획득 표시";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "수리",
diff --git a/Titan/locale/Localization.MX.lua b/Titan/locale/Localization.MX.lua
index e830202..19ad342 100644
--- a/Titan/locale/Localization.MX.lua
+++ b/Titan/locale/Localization.MX.lua
@@ -28,9 +28,9 @@ L["TITAN_USE_PERIOD"] = "Use punto como separador numérico";
 L["TITAN_PANEL_ERROR_DUP_PLUGIN"] = " aparece duplicado. Esto puede hacer que Titan Panel falle, por favor, corrija el problema."
 L["TITAN_PANEL_ERROR_PROF_DELCURRENT"] = "No puedes borrar el perfil actual.";
 local TITAN_PANEL_WARNING = GREEN_FONT_COLOR_CODE.."Aviso : "..FONT_COLOR_CODE_CLOSE
-local TITAN_PANEL_RELOAD_TEXT = "Si deseas continuar con esta operación, pulsa 'Aceptar' (se recargará tu interface), de lo contrario pulsa 'Cancelar' o la tecla 'Escape'."
+local TITAN_PANEL_RELOAD_TEXT = "Si deseas continuar con esta operación, pulsa 'Aceptar' (se recargará tu interfaz), de lo contrario pulsa 'Cancelar' o la tecla 'Escape'."
 L["TITAN_PANEL_RESET_WARNING"] = TITAN_PANEL_WARNING
-.."Esta opción reseteará la configuración de tus barras y panel a los valores por defecto, y recreará tu perfil actual."
+.."Esta opción restablecerá la configuración de tus barras y panel a los valores por defecto, y recreará tu perfil actual."
 ..TITAN_PANEL_RELOAD_TEXT
 L["TITAN_PANEL_RELOAD"] = TITAN_PANEL_WARNING
 .."Esto recargará "..TITAN_PANEL.."."
@@ -42,7 +42,7 @@ L["TITAN_PANEL_ATTEMPTS_DESC"] = "Los siguientes plugins han solicitado ser acti
 L["TITAN_PANEL_ATTEMPTS_TYPE"] = "Tipo"
 L["TITAN_PANEL_ATTEMPTS_CATEGORY"] = "Categoría"
 L["TITAN_PANEL_ATTEMPTS_BUTTON"] = "Nombre del botón"
-L["TITAN_PANEL_ATTEMPTS_STATUS"] = "Estatus"
+L["TITAN_PANEL_ATTEMPTS_STATUS"] = "Estado"
 L["TITAN_PANEL_ATTEMPTS_ISSUE"] = "Incidencia"
 L["TITAN_PANEL_ATTEMPTS_NOTES"] = "Notas"
 L["TITAN_PANEL_ATTEMPTS_TABLE"] = "Indice"
@@ -61,15 +61,15 @@ L["TITAN_PANEL_REGISTER_END"] = "Proceso de registro completado."

 -- slash command help
 L["TITAN_PANEL_SLASH_RESET_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/titan {reset | reset tipfont/tipalpha/panelscale/spacing}";
-L["TITAN_PANEL_SLASH_RESET_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset: |cffffffffResetea "..TITAN_PANEL.." a sus valores y posiciones por defecto.";
-L["TITAN_PANEL_SLASH_RESET_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipfont: |cffffffffResetea la escala de la fuente en los tooltips a su valor por defecto.";
-L["TITAN_PANEL_SLASH_RESET_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipalpha: |cffffffffResetea la transparencia de los tooltips a su valor por defecto.";
-L["TITAN_PANEL_SLASH_RESET_4"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset panelscale: |cffffffffResetea la escala de "..TITAN_PANEL.." a su valor por defecto.";
-L["TITAN_PANEL_SLASH_RESET_5"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset spacing: |cffffffffResetea el espaciado de los botones de "..TITAN_PANEL.." a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset: |cffffffffRestablece "..TITAN_PANEL.." a sus valores y posiciones por defecto.";
+L["TITAN_PANEL_SLASH_RESET_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipfont: |cffffffffRestablece la escala de la fuente en los tooltips a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset tipalpha: |cffffffffRestablece la transparencia de los tooltips a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_4"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset panelscale: |cffffffffRestablece la escala de "..TITAN_PANEL.." a su valor por defecto.";
+L["TITAN_PANEL_SLASH_RESET_5"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."reset spacing: |cffffffffRestablece el espaciado de los botones de "..TITAN_PANEL.." a su valor por defecto.";
 L["TITAN_PANEL_SLASH_GUI_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/titan {gui control/trans/skin}";
-L["TITAN_PANEL_SLASH_GUI_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui control: |cffffffffAbre el interface de control para "..TITAN_PANEL..".";
-L["TITAN_PANEL_SLASH_GUI_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui trans: |cffffffffAbre el interface de control de transarencia.";
-L["TITAN_PANEL_SLASH_GUI_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui skin: |cffffffffAbre el interface de control de Skin.";
+L["TITAN_PANEL_SLASH_GUI_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui control: |cffffffffAbre la interfaz de control para "..TITAN_PANEL..".";
+L["TITAN_PANEL_SLASH_GUI_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui trans: |cffffffffAbre la interfaz de control de transarencia.";
+L["TITAN_PANEL_SLASH_GUI_3"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."gui skin: |cffffffffAbre la interfaz de control de Skin.";
 L["TITAN_PANEL_SLASH_PROFILE_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/titan {profile use <profile>}";
 L["TITAN_PANEL_SLASH_PROFILE_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."profile use <nombre> <servidor>: |cffffffffActiva el perfil grabado.";
 L["TITAN_PANEL_SLASH_PROFILE_2"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."<nombre>: |cffffffffpuede ser tanto un nombre de personaje como el nombre de un perfil personalizado."
@@ -84,10 +84,10 @@ L["TITAN_PANEL_SLASH_ALL_0"] = LIGHTYELLOW_FONT_COLOR_CODE.."Uso: |cffffffff/tit
 L["TITAN_PANEL_SLASH_ALL_1"] = " - "..LIGHTYELLOW_FONT_COLOR_CODE.."<topic>: |cffffffffreset/gui/profile/silent/orderhall/help ";

 -- slash command responses
-L["TITAN_PANEL_SLASH_RESP1"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de la fuente en los tooltips de Titan Panel ha sido reseteada.";
-L["TITAN_PANEL_SLASH_RESP2"] = LIGHTYELLOW_FONT_COLOR_CODE.."La transparencia de los tooltips de Titan Panel ha sido reseteada.";
-L["TITAN_PANEL_SLASH_RESP3"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de Titan Panel ha sido reseteada.";
-L["TITAN_PANEL_SLASH_RESP4"] = LIGHTYELLOW_FONT_COLOR_CODE.."El espaciado de los botones de Titan Panel ha sido reseteado.";
+L["TITAN_PANEL_SLASH_RESP1"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de la fuente en los tooltips de Titan Panel ha sido restableceda.";
+L["TITAN_PANEL_SLASH_RESP2"] = LIGHTYELLOW_FONT_COLOR_CODE.."La transparencia de los tooltips de Titan Panel ha sido restableceda.";
+L["TITAN_PANEL_SLASH_RESP3"] = LIGHTYELLOW_FONT_COLOR_CODE.."La escala de Titan Panel ha sido restableceda.";
+L["TITAN_PANEL_SLASH_RESP4"] = LIGHTYELLOW_FONT_COLOR_CODE.."El espaciado de los botones de Titan Panel ha sido restablecedo.";

 -- global profile locale
 L["TITAN_PANEL_GLOBAL"] = "Global";
@@ -105,7 +105,7 @@ L["TITAN_PANEL_MENU_TITLE"] = TITAN_PANEL;
 L["TITAN_PANEL_MENU_HIDE"] = "Ocultar";
 L["TITAN_PANEL_MENU_CUSTOMIZE"] = "Personalizar";
 L["TITAN_PANEL_MENU_IN_COMBAT_LOCKDOWN"] = "(En combate)";
-L["TITAN_PANEL_MENU_RELOADUI"] = "(Recargar UI)";
+L["TITAN_PANEL_MENU_RELOADUI"] = "(Recargar IU)";
 L["TITAN_PANEL_MENU_SHOW_COLORED_TEXT"] = "Mostrar texto en color";
 L["TITAN_PANEL_MENU_SHOW_ICON"] = "Mostrar icono";
 L["TITAN_PANEL_MENU_SHOW_LABEL_TEXT"] = "Mostrar etiqueta de texto";
@@ -116,9 +116,9 @@ L["TITAN_PANEL_MENU_DISPLAY_BAR"] = "Mostrar barra superior";
 L["TITAN_PANEL_MENU_DISPLAY_BOTH"] = "Mostrar ambas barras";
 L["TITAN_PANEL_MENU_DISABLE_PUSH"] = "Desactivar ajuste de pantalla";
 L["TITAN_PANEL_MENU_DISABLE_MINIMAP_PUSH"] = "Desactivar ajuste de minimapa";
-L["TITAN_PANEL_MENU_DISABLE_LOGS"] = "Ajuste automático de log";
+L["TITAN_PANEL_MENU_DISABLE_LOGS"] = "Ajuste automático de registro";
 L["TITAN_PANEL_MENU_DISABLE_BAGS"] = "Ajuste automático de bolsas";
-L["TITAN_PANEL_MENU_DISABLE_TICKET"] = "Ajuste automático de la ventana de tickets";
+L["TITAN_PANEL_MENU_DISABLE_TICKET"] = "Ajuste automático de la ventana de boletos";
 L["TITAN_PANEL_MENU_BUILTINS"] = "De serie en Titan";
 L["TITAN_PANEL_MENU_LEFT_SIDE"] = "Lado izquierdo";
 L["TITAN_PANEL_MENU_RIGHT_SIDE"] = "Lado derecho";
@@ -128,7 +128,7 @@ L["TITAN_PANEL_MENU_PROFILE_CUSTOM"] = "Personalizado";
 L["TITAN_PANEL_MENU_PROFILE_DELETED"] = " ha sido borrado.";
 L["TITAN_PANEL_MENU_PROFILE_SERVERS"] = "Servidor";
 L["TITAN_PANEL_MENU_PROFILE_CHARS"] = "Personaje";
-L["TITAN_PANEL_MENU_PROFILE_RELOADUI"] = "Se recargará tu interface en cuanto pulses 'Ok' para poder grabar tu perfil personalizado.";
+L["TITAN_PANEL_MENU_PROFILE_RELOADUI"] = "Se recargará tu interfaz en cuanto pulses 'Ok' para poder grabar tu perfil personalizado.";
 L["TITAN_PANEL_MENU_PROFILE_SAVE_CUSTOM_TITLE"] = "Introduce un nombre para tu perfil personalizado::\n(20 carácteres máximo, sin espacios, diferencia entre mayúsculas y minúsculas)";
 L["TITAN_PANEL_MENU_PROFILE_SAVE_PENDING"] = "La configuración actual del panel se va a grabar en el perfil llamado: ";
 L["TITAN_PANEL_MENU_PROFILE_ALREADY_EXISTS"] = "El nombre de perfil introducido ya existe. ¿Estás seguro de que quieres sobreescribirlo? Pulsa 'Aceptar' si lo deseas, de lo contrario pulsa 'Cancelar' o la tecla 'Escape'.";
@@ -167,8 +167,8 @@ L["TITAN_PANEL_MENU_FONT"] = "Fuente";
 L["TITAN_PANEL_MENU_LSM_FONTS"] = "Fuente del Panel"
 L["TITAN_PANEL_MENU_ENABLED"] = "Activado";
 L["TITAN_PANEL_MENU_DISABLED"] = "Desactivado";
-L["TITAN_PANEL_SHIFT_LEFT"] = "Mayus-Izdo.";
-L["TITAN_PANEL_SHIFT_RIGHT"] = "Mayus-Dcho.";
+L["TITAN_PANEL_SHIFT_LEFT"] = "Mayús-Izdo.";
+L["TITAN_PANEL_SHIFT_RIGHT"] = "Mayús-Dcho.";
 L["TITAN_PANEL_MENU_SHOW_PLUGIN_TEXT"] = "Mostrar texto del plugin";
 L["TITAN_PANEL_MENU_LDB_TREAT"] = "Tratar como origen de datos";
 L["TITAN_PANEL_MENU_LDB_SLAP"] = "Si necesitas usar esto solicítale al autor que cambie el tipo LDB";
@@ -202,14 +202,14 @@ L["TITAN_TRANS_AUX_BAR_DESC"] = "Establece la transparencia para la Barra Auxili
 L["TITAN_TRANS_TOOLTIP_DESC"] = "Establece la transparencia para los tooltips de varios plugins.";
 L["TITAN_UISCALE_MENU_TEXT"] = "Escala y Fuentes de "..TITAN_PANEL;
 L["TITAN_UISCALE_MENU_TEXT_SHORT"] = "Escala y Fuentes";
-L["TITAN_UISCALE_CONTROL_TITLE_UI"] = "Escala del interface";
+L["TITAN_UISCALE_CONTROL_TITLE_UI"] = "Escala de la interfaz";
 L["TITAN_UISCALE_CONTROL_TITLE_PANEL"] = "Escala de "..TITAN_PANEL;
 L["TITAN_UISCALE_CONTROL_TITLE_BUTTON"] = "Espaciado de los botones";
 L["TITAN_UISCALE_CONTROL_TITLE_ICON"] = "Espaciado de iconos";
 L["TITAN_UISCALE_CONTROL_TOOLTIP_TOOLTIPFONT"] = "Tamaño de la fuente de los tooltips";
 L["TITAN_UISCALE_TOOLTIP_DISABLE_TEXT"] = "Desactivar tamaño de la fuente de los tooltips";
-L["TITAN_UISCALE_MENU_DESC"] = "Controla varios aspectos del interface y "..TITAN_PANEL..".";
-L["TITAN_UISCALE_SLIDER_DESC"] = "Establece la escala de todo el interface.";
+L["TITAN_UISCALE_MENU_DESC"] = "Controla varios aspectos de la interfaz y "..TITAN_PANEL..".";
+L["TITAN_UISCALE_SLIDER_DESC"] = "Establece la escala de toda la interfaz.";
 L["TITAN_UISCALE_PANEL_SLIDER_DESC"] = "Establece la escala para los distintos botones e iconos de "..TITAN_PANEL..".";
 L["TITAN_UISCALE_BUTTON_SLIDER_DESC"] = "Ajusta el espacio entre los plugins del lado izquierdo.";
 L["TITAN_UISCALE_ICON_SLIDER_DESC"] = "Ajusta el espacio entre los iconos de los plugins del lado derecho.";
@@ -224,7 +224,7 @@ L["TITAN_SKINS_MAIN_DESC"] = "Se asume que todos los skins personalizados están
 L["TITAN_SKINS_LIST_TITLE"] = "Lista de skins";
 L["TITAN_SKINS_SET_DESC"] = "Elige que skin quieres para las barras "..TITAN_PANEL..".";
 L["TITAN_SKINS_SET_HEADER"] = "Establece skin de "..TITAN_PANEL;
-L["TITAN_SKINS_RESET_HEADER"] = "Resetea el skin de "..TITAN_PANEL;
+L["TITAN_SKINS_RESET_HEADER"] = "Restablece el skin de "..TITAN_PANEL;
 L["TITAN_SKINS_NEW_HEADER"] = "Añadir nuevo skin";
 L["TITAN_SKINS_NAME_TITLE"] = "Nombre de skin";
 L["TITAN_SKINS_NAME_DESC"] = "Introduce un nombre para tu nuevo skin. Se usará en la lista desplegable de skins.";
@@ -239,8 +239,8 @@ L["TITAN_SKINS_REMOVE_BUTTON"] = "Eliminar";
 L["TITAN_SKINS_REMOVE_BUTTON_DESC"] = "Elimina el skin selecionado de la lista de skins disponibles para el Panel.";
 L["TITAN_SKINS_REMOVE_NOTES"] = "Serás el único responsable si eliminas cualquier skin personalizado no deseado "
 	.." del directorio de instalación de "..TITAN_PANEL..". Los addons no pueden añadir o eliminar archivos."
-L["TITAN_SKINS_RESET_DEFAULTS_TITLE"] = "Resetear lista";
-L["TITAN_SKINS_RESET_DEFAULTS_DESC"] = "Resetea la lista de skins a sus valores por defecto, los skins incluidos de serie.";
+L["TITAN_SKINS_RESET_DEFAULTS_TITLE"] = "Restablecer lista";
+L["TITAN_SKINS_RESET_DEFAULTS_DESC"] = "Restablece la lista de skins a sus valores por defecto, los skins incluidos de serie.";
 L["TITAN_PANEL_MENU_LSM_FONTS_DESC"] = "Elige el tipo de letra utilizado por los diferentes plugins en las barras "..TITAN_PANEL..".";
 L["TITAN_PANEL_MENU_FONT_SIZE"] = "Tamaño de la fuente";
 L["TITAN_PANEL_MENU_FONT_SIZE_DESC"] = "Establece el tamaño para el tipo de letra de "..TITAN_PANEL..".";
@@ -249,7 +249,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "Establece la prioridad de visionado d
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Avanzado";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Cambia el retraso tras eventos sólo si tienes problemas de desajuste con los marcos.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Cambia el retraso tras eventos sólo si tienes problemas de desajuste con los marcos.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Entrando en el reino";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Cambia el valor (habitualmente incrementándolo) si los marcos no se ajustan al entrar o salir del reino o de una instancia.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Vehículo";
@@ -269,8 +269,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "Mostrar huecos usados";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Mostrar huecos libres";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Mostrar tooltip detallado";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignorar bolsas";
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignorar bolsas de munición";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignorar bolsas de almas";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignorar bolsas de profesión";
-
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Faltriquera de almas", "Bolsa de tela vil", "Bolsa de tela vil del Núcleo", "Bolsa de las Sombras de ébano", "Faltriquera de almas pequeña", "Caja de almas"};
+L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"munición", "Carcaj", "Bandolera", "pólvora", "lámina"};
 L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
 "Faltriquera de tejido mágico encantada","Bolsa de paño rúnico encantada","Cartera de encantador","Bolsa de encantamiento grande","Bolsa de fuego de hechizo","Bolsa misteriosa","Bolsa de otro mundo","Bolso de noche encantador \"Trasportín exclusivo\""};
 L["TITAN_BAG_PROF_BAG_ENGINEERING"] = {
@@ -287,12 +290,6 @@ L["TITAN_BAG_PROF_BAG_MINING"] = {
 "Saco de minero","Bolsa de minero reforzada","Bolsa de minero descomunal","Bolsa de metal precioso \"Trasportín Christina\"", "Bolsa pulida de minería"};
 L["TITAN_BAG_PROF_BAG_FISHING"] = {"Caja de aparejos \"Maestro del Cebo\""};
 L["TITAN_BAG_PROF_BAG_COOKING"] = {"Refrigerador portátil", "Unidad de refrigeración avanzada"};
--- Classic
-L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignorar bolsas de munición";
-L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignorar bolsas de almas";
-L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Faltriquera de almas", "Bolsa de tela vil", "Bolsa de tela vil del Núcleo", "Bolsa de las Sombras de ébano", "Faltriquera de almas pequeña", "Caja de almas"};
-L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"munición", "Carcaj", "Bandolera", "pólvora", "lámina"};
---

 L["TITAN_CLOCK_TOOLTIP"] = "Reloj";
 L["TITAN_CLOCK_TOOLTIP_VALUE"] = "Ajuste horario: ";
@@ -301,7 +298,7 @@ L["TITAN_CLOCK_TOOLTIP_SERVER_TIME"] = "Hora del servidor: ";
 L["TITAN_CLOCK_TOOLTIP_SERVER_ADJUSTED_TIME"] = "Hora del servidor ajustada: ";
 L["TITAN_CLOCK_TOOLTIP_HINT1"] = "Consejo: Click-Izq. ajusta el horario"
 L["TITAN_CLOCK_TOOLTIP_HINT2"] = "y el formato de tiempo 12/24H.";
-L["TITAN_CLOCK_TOOLTIP_HINT3"] = "Sift + Click-Izq. para activar y desactivar el calendario.";
+L["TITAN_CLOCK_TOOLTIP_HINT3"] = "Shift + Click-Izq. para activar y desactivar el calendario.";
 L["TITAN_CLOCK_CONTROL_TOOLTIP"] = "Ajuste horario: ";
 L["TITAN_CLOCK_CONTROL_TITLE"] = "Ajuste horario";
 L["TITAN_CLOCK_CONTROL_HIGH"] = "+12";
@@ -330,26 +327,26 @@ L["TITAN_LOCATION_TOOLTIP_HINTS_1"] = "Consejo: Shift + Click-Izq. para poner la
 L["TITAN_LOCATION_TOOLTIP_HINTS_2"] = "en el chat de mensajes.";
 L["TITAN_LOCATION_TOOLTIP_ZONE"] = "Zona: ";
 L["TITAN_LOCATION_TOOLTIP_SUBZONE"] = "Subzona: ";
-L["TITAN_LOCATION_TOOLTIP_PVPINFO"] = "Info PVP: ";
-L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Ubicación de mi casa";
+L["TITAN_LOCATION_TOOLTIP_PVPINFO"] = "Info JcJ: ";
+L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Ubicación de mi hogar";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Posada: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Ubicación";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Mostrar texto de zona";
-L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Mostrar coordenadas en el mapamundi";
+L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Mostrar coordenadas en el mapa del mundo";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursor(X,Y): %s";
 L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"] = "Jugador(X,Y): %s";
 L["TITAN_LOCATION_NO_COORDS"] = "Sin Coordenadas";
 L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"] = "Mostrar el nombre de la ubicación sobre el minimapa";
-L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"] = "Actualizar mapamundi cuando cambia la zona";
+L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"] = "Actualizar mapa del mundo cuando cambia la zona";

 L["TITAN_FPS_FORMAT"] = "%.1f";
-L["TITAN_FPS_BUTTON_LABEL"] = "FPS: ";
-L["TITAN_FPS_MENU_TEXT"] = "FPS";
-L["TITAN_FPS_TOOLTIP_CURRENT_FPS"] = "FPS actuales: ";
-L["TITAN_FPS_TOOLTIP_AVG_FPS"] = "FPS de nedia: ";
-L["TITAN_FPS_TOOLTIP_MIN_FPS"] = "FPS mínimos: ";
-L["TITAN_FPS_TOOLTIP_MAX_FPS"] = "FPS máximos: ";
+L["TITAN_FPS_BUTTON_LABEL"] = "IPS: ";
+L["TITAN_FPS_MENU_TEXT"] = "IPS";
+L["TITAN_FPS_TOOLTIP_CURRENT_FPS"] = "IPS actuales: ";
+L["TITAN_FPS_TOOLTIP_AVG_FPS"] = "IPS de media: ";
+L["TITAN_FPS_TOOLTIP_MIN_FPS"] = "IPS mínimos: ";
+L["TITAN_FPS_TOOLTIP_MAX_FPS"] = "IPS máximos: ";
 L["TITAN_FPS_TOOLTIP"] = "Imágenes por segundo";

 L["TITAN_LATENCY_FORMAT"] = "%d".."ms";
@@ -362,15 +359,15 @@ L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_IN"] = "Ancho de banda entrante: ";
 L["TITAN_LATENCY_TOOLTIP_BANDWIDTH_OUT"] = "Ancho de banda de salida: ";
 L["TITAN_LATENCY_MENU_TEXT"] = "Latencia";

-L["TITAN_LOOTTYPE_BUTTON_LABEL"] = "Saqueo: ";
+L["TITAN_LOOTTYPE_BUTTON_LABEL"] = "Botín: ";
 L["TITAN_LOOTTYPE_FREE_FOR_ALL"] = "Libre para todos";
 L["TITAN_LOOTTYPE_ROUND_ROBIN"] = "Por turnos";
 L["TITAN_LOOTTYPE_MASTER_LOOTER"] = "Maestro despojador";
 L["TITAN_LOOTTYPE_GROUP_LOOT"] = "Botín de grupo";
 L["TITAN_LOOTTYPE_NEED_BEFORE_GREED"] = "Necesidad antes que codicia";
 L["TITAN_LOOTTYPE_PERSONAL"] = "Personal";
-L["TITAN_LOOTTYPE_TOOLTIP"] = "Tipo de saqueo";
-L["TITAN_LOOTTYPE_MENU_TEXT"] = "Tipo de saqueo";
+L["TITAN_LOOTTYPE_TOOLTIP"] = "Tipo de botín";
+L["TITAN_LOOTTYPE_MENU_TEXT"] = "Tipo de botín";
 L["TITAN_LOOTTYPE_RANDOM_ROLL_LABEL"] = "Tirar dados";
 L["TITAN_LOOTTYPE_TOOLTIP_HINT1"] = "Consejo: Click-Izq. para tirar dados.";
 L["TITAN_LOOTTYPE_TOOLTIP_HINT2"] = "Seleccione el valor de la tirada de dados con el menu de Click-Dcho.";
@@ -380,6 +377,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "Mostrar dificultad de Mazmorra/Band
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "Establecer dificultad de Mazmorra";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "Establecer dificultad de Banda";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "Auto (según grupo)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -457,6 +472,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Gananc. Est.: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Ganancias de XP para subir (a %s XP ganados la útltima vez): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Mostrar ganancias de XP estimadas para subir";

+L["TITAN_REGEN_MENU_TEXT"] = "Regeneración"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Ratios de regeneración"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "Como porcentaje"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Salud: \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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Maná: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Mejor regeneración de HP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Peor regeneración de HP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Mejor regeneración de MP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Peor regeneración de MP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "Regeneración de MP en último combate: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Reparación",
@@ -513,7 +543,7 @@ L["TITAN_REPAIR_REPORT_COST_CHAT"] = "El coste de la reparación ha sido "
 L["TITAN_GOLD_TOOLTIPTEXT"] = "Oro total en";
 L["TITAN_GOLD_ITEMNAME"] = "Titan Gold";
 L["TITAN_GOLD_CLEAR_DATA_TEXT"] = "Limpiar base de datos";
-L["TITAN_GOLD_RESET_SESS_TEXT"] = "Resetear sesión actual";
+L["TITAN_GOLD_RESET_SESS_TEXT"] = "Restablecer sesión actual";
 L["TITAN_GOLD_DB_CLEARED"] = "Titan Gold - Base de datos limpiada.";
 L["TITAN_GOLD_SESSION_RESET"] = "Titan Gold - Sesión reiniciada.";
 L["TITAN_GOLD_MENU_TEXT"] = "Oro";
diff --git a/Titan/locale/Localization.RU.lua b/Titan/locale/Localization.RU.lua
index 9d3df13..94a23ca 100644
--- a/Titan/locale/Localization.RU.lua
+++ b/Titan/locale/Localization.RU.lua
@@ -231,7 +231,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "Регулировка слоя фр
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Дополнительно";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Изменить таймеры, только если у вас возникли проблемы с подстройкой фреймов.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Изменить таймеры, только если у вас возникли проблемы с подстройкой фреймов.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Вход в мир";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Изменить значение (обычно повысить) если фреймы не подстраиваются при входе / выходе в мир или подземелье.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Транспорт";
@@ -239,6 +239,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Изменить значение (о

 L["TITAN_AUTOHIDE_TOOLTIP"] = "Авто-скрытие панели вкл/выкл";

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Боеприпасы: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "Бросок: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "Боеприпасов/Бросок: ";
+L["TITAN_AMMO_TOOLTIP"] = "Число доступных Боеприпасов/Бросков";
+L["TITAN_AMMO_MENU_TEXT"] = "Боеприпасы/Броски";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "Обновление отображения";
+L["TITAN_AMMO_BULLET_NAME"] = "Отображать название боеприпасов";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "Сумки: ";
 L["TITAN_BAG_TOOLTIP"] = "Использование сумок";
@@ -251,8 +264,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "Показывать исп. сумки";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Показывать доступные слоты";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Отображать подробную подсказку";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Игнорировать сумки";
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Игнорировать подсумок";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Игнорировать сумки осколков";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Игнорировать сумки для профф";
-
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Мешок душ","Малая сума душ","Коробка душ","Сумка из ткани Скверны","Сумка из сердцевинной ткани Скверны","Черная сумка теней","Сумка Бездны"};
+L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"Колчан из шкуры копытня", "Колчан из шкуры ворга", "Древняя перетянутая жилами ламина", "Колчан тысячи оперений", "Колчан из узловатой кожи", "Колчан из шкуры гарпии", "Колчан Риббли", "Колчан быстрой тетивы", "Тяжелый колчан", "Колчан Ночного Дозора", "Охотничий колчан", "Средний колчан", "Колчан из тонкой кожи", "Небольшой колчан", "Легкий колчан", "Подсумок контрабандиста", "Подсумок из узловатой кожи", "Подсумок из чешуи дракона Пустоты", "Нагрудный патронташ из кожи гнолла", "Нагрудный патронташ Риббли", "Подсумок из плотной кожи", "Подсумок из толстой кожи", "Нагрудный патронташ Ночного Дозора", "Средний патронташ", "Охотничья сумка для боеприпасов", "Небольшой кожаный подсумок", "Небольшой патронташ", "Небольшой подсумок", "Подсумок из драконьей чешуи", "Усиленный нерубский колчан"};
 L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
 "Зачарованный мешочек из магической ткани", "Зачарованная сумка из рунической ткани", "Сумка зачаровывателя", "Большая зачарованная сумка", "Сумка из огненной чароткани", "Таинственная котомка",
 "Трансцендентная сумка", "\"Дилижанс - Эксклюзив\" - очаровательный коктейльный ридикюль"};
@@ -271,15 +287,6 @@ L["TITAN_BAG_PROF_BAG_MINING"] = {
 "Шахтерский мешок", "Укрепленная шахтерская сумка", "Шахтерская сумка из шкуры мамонта", "\"Дилижанс - Кристина\" - дорогостоящая металлическая сумка", "Burnished Mining Bag"};
 L["TITAN_BAG_PROF_BAG_FISHING"] = {"Ящик для рыболовной снасти мастера приманки"};
 L["TITAN_BAG_PROF_BAG_COOKING"] = {"Portable Refrigerator", "Advanced Refrigeration Unit"};
--- Classic
-L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Игнорировать подсумок";
-L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Игнорировать сумки осколков";
-L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Мешок душ","Малая сума душ","Коробка душ","Сумка из ткани Скверны","Сумка из сердцевинной ткани Скверны","Черная сумка теней","Сумка Бездны"};
-L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"Колчан из шкуры копытня", "Колчан из шкуры ворга", "Древняя перетянутая жилами ламина", "Колчан тысячи оперений", "Колчан из узловатой кожи", "Колчан из шкуры гарпии", "Колчан Риббли", "Колчан быстрой тетивы", "Тяжелый колчан", "Колчан Ночного Дозора", "Охотничий колчан", "Средний колчан", "Колчан из тонкой кожи", "Небольшой колчан", "Легкий колчан", "Подсумок контрабандиста", "Подсумок из узловатой кожи", "Подсумок из чешуи дракона Пустоты", "Нагрудный патронташ из кожи гнолла", "Нагрудный патронташ Риббли", "Подсумок из плотной кожи", "Подсумок из толстой кожи", "Нагрудный патронташ Ночного Дозора", "Средний патронташ", "Охотничья сумка для боеприпасов", "Небольшой кожаный подсумок", "Небольшой патронташ", "Небольшой подсумок", "Подсумок из драконьей чешуи", "Усиленный нерубский колчан"};
-L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
-"Зачарованный мешочек из магической ткани", "Зачарованная сумка из рунической ткани", "Сумка зачаровывателя", "Большая зачарованная сумка", "Сумка из огненной чароткани", "Таинственная котомка",
-}
---

 L["TITAN_CLOCK_TOOLTIP"] = "Часы";
 L["TITAN_CLOCK_TOOLTIP_VALUE"] = "Часовое смещение: ";
@@ -322,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Место дома";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Дом: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Координаты";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Показывать зону";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Показывать координаты на мировой карте";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Курсор(X,Y): %s";
@@ -367,6 +375,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "Сложность рейда/по
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "Установить сложность подземелья";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "Установить сложность рейда";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "Авто (пологаясь на группу)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."мб";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -444,6 +470,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Получение опыта: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Опыта до уровня (%s опыта в последний раз): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Показать необходимый опыт до уровня";

+L["TITAN_REGEN_MENU_TEXT"] = "Регенерация"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Информация о регенерации"
+L["TITAN_REGEN_MENU_SHOW2"] = "ЗД"
+L["TITAN_REGEN_MENU_SHOW3"] = "МН"
+L["TITAN_REGEN_MENU_SHOW4"] = "в процентах"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "ЗД: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " МН: "
+L["TITAN_REGEN_TOOLTIP1"] = "Здоровье: \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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Мана: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Лучшая регенерация ЗД: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Худшая регенерация ЗД: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Лучшая регенерация МН: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Худшая регенерация МН: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "Регенерация МН в последней схватке: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Ремонт",
diff --git a/Titan/locale/Localization.TW.lua b/Titan/locale/Localization.TW.lua
index 0aff136..939b94f 100644
--- a/Titan/locale/Localization.TW.lua
+++ b/Titan/locale/Localization.TW.lua
@@ -231,7 +231,7 @@ L["TITAN_PANEL_MENU_FRAME_STRATA_DESC"] = "為泰坦條設置是否顯示在最
 -- /end localization strings for AceConfigDialog-3.0

 L["TITAN_PANEL_MENU_ADV"] = "Advanced";
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Entering World";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Change value (usually increase) if frames do not adjust when entering / leaving world or an instance.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Vehicle";
@@ -239,6 +239,19 @@ L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Change value (usually increase) if fra

 L["TITAN_AUTOHIDE_TOOLTIP"] = "自動隱藏 開/關";

+L["TITAN_AMMO_FORMAT"] = "%d";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "彈藥: ";
+L["TITAN_AMMO_BUTTON_LABEL_THROWN"] = "投擲: ";
+L["TITAN_AMMO_BUTTON_LABEL_AMMO_THROWN"] = "彈藥/投擲: ";
+L["TITAN_AMMO_TOOLTIP"] = "已裝備 彈藥/投擲 數量";
+L["TITAN_AMMO_MENU_TEXT"] = "彈藥/投擲";
+L["TITAN_AMMO_BUTTON_NOAMMO"] = "--";
+L["TITAN_AMMO_MENU_REFRESH"] = "重新整理";
+L["TITAN_AMMO_BULLET_NAME"] = "顯示彈藥名稱";
+L["TITAN_AMMO_THROWN"] = "Thrown";
+L["TITAN_AMMO_GUN"] = "Bullets";
+L["TITAN_AMMO_BOW"] = "Arrows";
+
 L["TITAN_BAG_FORMAT"] = "%d/%d";
 L["TITAN_BAG_BUTTON_LABEL"] = "背包: ";
 L["TITAN_BAG_TOOLTIP"] = "背包";
@@ -251,8 +264,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "顯示已使用空間";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "顯示剩餘空間";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "顯示詳細提示訊息";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "忽略容器";
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "忽略彈藥袋的空間";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "忽略靈魂碎片包空間";
 L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "忽略專業背包空間";
-
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"靈魂袋", "小靈魂袋", "靈魂盒", "惡魔布包", "熔核惡魔布包", "黑檀暗影包", "深淵包"};
+L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"裂蹄皮箭袋", "座狼皮箭袋", "龍筋箭袋", "奈幽強化箭袋", "千羽箭袋", "境外皮箭袋", "鷹身人皮箭袋", "雷布里的箭袋", "快捷箭袋", "重型箭袋", "守夜人箭袋", "狩獵箭袋", "中型箭袋", "輕皮箭袋", "小箭袋", "輕型箭袋", "走私者彈藥包", "境外皮彈藥包", "虛空鱗彈藥袋", "豺狼人皮彈藥包", "雷布里的油布包", "厚皮彈藥包", "重皮彈藥包", "守夜人的彈藥包", "中型彈藥袋", "獵槍彈藥包", "皮質小彈藥包", "小型彈藥袋", "小型彈藥包"};
 L["TITAN_BAG_PROF_BAG_ENCHANTING"] = {
 "Enchanted Mageweave Pouch", "Enchanted Runecloth Bag", "Enchanter's Satchel", "Big Bag of Enchantment", "Spellfire Bag",
 "Mysterious Bag", "Otherworldly Bag", "\"Carriage - Exclusive\" Enchanting Evening Purse"};
@@ -271,12 +287,6 @@ L["TITAN_BAG_PROF_BAG_MINING"] = {
 "Mining Sack", "Reinforced Mining Bag", "Mammoth Mining Bag", "\"Carriage - Christina\" Precious Metal Bag", "Burnished Mining Bag"};
 L["TITAN_BAG_PROF_BAG_FISHING"] = {"Lure Master Tackle Box"};
 L["TITAN_BAG_PROF_BAG_COOKING"] = {"Portable Refrigerator", "Advanced Refrigeration Unit"};
--- Classic
-L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "忽略彈藥袋的空間";
-L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "忽略靈魂碎片包空間";
-L["TITAN_BAG_SHARD_BAG_NAMES"] = {"靈魂袋", "小靈魂袋", "靈魂盒", "惡魔布包", "熔核惡魔布包", "黑檀暗影包", "深淵包"};
-L["TITAN_BAG_AMMO_POUCH_NAMES"] = {"裂蹄皮箭袋", "座狼皮箭袋", "龍筋箭袋", "奈幽強化箭袋", "千羽箭袋", "境外皮箭袋", "鷹身人皮箭袋", "雷布里的箭袋", "快捷箭袋", "重型箭袋", "守夜人箭袋", "狩獵箭袋", "中型箭袋", "輕皮箭袋", "小箭袋", "輕型箭袋", "走私者彈藥包", "境外皮彈藥包", "虛空鱗彈藥袋", "豺狼人皮彈藥包", "雷布里的油布包", "厚皮彈藥包", "重皮彈藥包", "守夜人的彈藥包", "中型彈藥袋", "獵槍彈藥包", "皮質小彈藥包", "小型彈藥袋", "小型彈藥包"};
---

 L["TITAN_CLOCK_TOOLTIP"] = "時鐘";
 L["TITAN_CLOCK_TOOLTIP_VALUE"] = "時差值: ";
@@ -319,6 +329,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "爐石設定位置";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "旅館: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "位置";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "顯示區域文字";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "顯示座標在世界地圖上";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "游標(X,Y): %s";
@@ -364,6 +375,24 @@ L["TITAN_LOOTTYPE_SHOWDUNGEONDIFF_LABEL"] = "顯示副本難度";
 L["TITAN_LOOTTYPE_SETDUNGEONDIFF_LABEL"] = "設置五人副本難度";
 L["TITAN_LOOTTYPE_SETRAIDDIFF_LABEL"] = "設置團隊副本難度";
 L["TITAN_LOOTTYPE_AUTODIFF_LABEL"] = "自動設定 (基於隊伍類型)";
+-- Tracker part
+L["BtnRoll"]  = "Roll" -- button
+L["BtnPass"]  = "Pass" -- button
+L["BtnClear"] = "Start" -- button (was 'Clear')
+L["BtnAnnounce"] = "Result" -- button (was 'Announce')
+L["BtnNotRolled"] = "Remind" -- button (was 'Not Rolled')
+L["TextPass"] = "pass" -- string to search for when player passes on loot
+L["MsgNotRolled"] = "Reminder sent." -- nag players who have not rolled
+L["MsgClosing"] = "Closing tracker window." -- when leader closes tracker
+L["TxtLine"] = "------------------------------------------------------------------------------------------------------"
+L["MsgNbRolls"] = "%d Roll(s)" -- number of rolls at bottom of frame
+L["MsgRollCleared"] = "MsgRollCleared" -- sent when BtnClear is clicked
+L["MsgStart"] = "New roll starting now! Type '/rnd' or '%s'"
+L["MsgBar"] = "==============================" -- used as part of start message to players
+L["MsgAnnounce"] = "%s won with a roll of %d."
+L["RaidPass"]="'/raid pass'" -- used to 'end' NotRolledNag message
+L["PartyPass"]="'/party pass'" -- used to 'end' NotRolledNag message
+L["NotRolledNag"]="{star} Please type '/roll' or 'pass' " -- cannot use L["TextPass"] here ????

 L["TITAN_MEMORY_FORMAT"] = "%.3f".."MB";
 L["TITAN_MEMORY_FORMAT_KB"] = "%d".."KB";
@@ -440,7 +469,22 @@ L["TITAN_XP_GAIN_PATTERN"] = "(.*)死亡,你獲得(%d+)點經驗。";
 L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "預估獲得經驗: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "升級所需擊殺數(基於最後擊殺獲得的%s點經驗): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "顯示升級所需(基於最後所獲經驗)";
-
+
+L["TITAN_REGEN_MENU_TEXT"] = "角色恢復速度"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"]	= "恢復速率"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "顯示百分比"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "生命值: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = "法力值: "
+L["TITAN_REGEN_TOOLTIP1"] = "生命: \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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "法力: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "最高 HP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "最低 HP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "最高 MP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "最低 MP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "上一場戰鬥的 MP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 -- Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "裝備耐久度",
diff --git a/Titan/locale/Localization.lua b/Titan/locale/Localization.lua
index bbbf297..2506f33 100644
--- a/Titan/locale/Localization.lua
+++ b/Titan/locale/Localization.lua
@@ -268,13 +268,11 @@ L["TITAN_PANEL_MENU_ADV_PLUGINS_DESC"] = "Shows start and end of Registration pr
 L["TITAN_PANEL_MENU_ADV_NOTES"] = "Notes";
 L["TITAN_PANEL_MENU_ADV_NOTES_PLUGIN"] = "Plugin Notes";

--- Classic
-L["TITAN_PANEL_MENU_ADV01_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
+L["TITAN_PANEL_MENU_ADV_DESC"] = "Change Timers only if you experience issues with frames not adjusting.".."\n";
 L["TITAN_PANEL_MENU_ADV_PEW"] = "Entering World";
 L["TITAN_PANEL_MENU_ADV_PEW_DESC"] = "Change value (usually increase) if frames do not adjust when entering / leaving world or an instance.";
 L["TITAN_PANEL_MENU_ADV_VEHICLE"] = "Vehicle";
 L["TITAN_PANEL_MENU_ADV_VEHICLE_DESC"] = "Change value (usually increase) if frames do not adjust when entering / leaving vehicle.";
---

 L["TITAN_AMMO_FORMAT"] = "%d";
 L["TITAN_AMMO_BUTTON_LABEL_AMMO"] = "Ammo: ";
@@ -307,8 +305,11 @@ L["TITAN_BAG_MENU_SHOW_USED_SLOTS"] = "Show Used Slots";
 L["TITAN_BAG_MENU_SHOW_AVAILABLE_SLOTS"] = "Show Available Slots";
 L["TITAN_BAG_MENU_SHOW_DETAILED"] = "Show Detailed Tooltip";
 L["TITAN_BAG_MENU_IGNORE_SLOTS"] = "Ignore Containers";
-L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignore Profession Bags";
-
+L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignore ammo bags";
+L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignore shard bags";
+L["TITAN_BAG_MENU_IGNORE_PROF_BAGS_SLOTS"] = "Ignore profession bags";
+L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Soul Pouch", "Small Soul Pouch", "Box of Souls", "Felcloth Bag", "Core Felcloth Bag", "Ebon Shadowbag", "Abyssal Bag"};
+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_PROF_BAG_ENCHANTING"] = {
 "Enchanted Mageweave Pouch", "Enchanted Runecloth Bag", "Enchanter's Satchel", "Big Bag of Enchantment", "Spellfire Bag",
 "Mysterious Bag", "Otherworldly Bag", "\"Carriage - Exclusive\" Enchanting Evening Purse"};
@@ -328,13 +329,6 @@ L["TITAN_BAG_PROF_BAG_MINING"] = {
 L["TITAN_BAG_PROF_BAG_FISHING"] = {"Lure Master Tackle Box"};
 L["TITAN_BAG_PROF_BAG_COOKING"] = {"Portable Refrigerator", "Advanced Refrigeration Unit"};

--- Classic
-L["TITAN_BAG_MENU_IGNORE_AMMO_POUCH_SLOTS"] = "Ignore ammo bags";
-L["TITAN_BAG_SHARD_BAG_NAMES"] = {"Soul Pouch", "Small Soul Pouch", "Box of Souls", "Felcloth Bag", "Core Felcloth Bag", "Ebon Shadowbag", "Abyssal Bag"};
-L["TITAN_BAG_MENU_IGNORE_SHARD_BAGS_SLOTS"] = "Ignore shard bags";
-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_CLOCK_TOOLTIP"] = "Clock";
 L["TITAN_CLOCK_TOOLTIP_VALUE"] = "Server Offset Hour Value: ";
 L["TITAN_CLOCK_TOOLTIP_LOCAL_TIME"] = "Local Time: ";
@@ -376,6 +370,7 @@ L["TITAN_LOCATION_TOOLTIP_HOMELOCATION"] = "Home Location";
 L["TITAN_LOCATION_TOOLTIP_INN"] = "Inn: ";
 L["TITAN_LOCATION_MENU_TEXT"] = "Location";
 L["TITAN_LOCATION_MENU_SHOW_ZONE_ON_PANEL_TEXT"] = "Show Zone Text";
+L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_MAP_TEXT"] = "Show Coordinates on World Map";
 L["TITAN_LOCATION_MENU_SHOW_COORDS_ON_PANEL_TEXT"] = "Show Text Coordinates";
 L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"] = "Cursor: %s";
@@ -384,16 +379,6 @@ L["TITAN_LOCATION_NO_COORDS"] = "No Coords";
 L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"] = "Show Location Name Above Minimap";
 L["TITAN_LOCATION_MENU_UPDATE_WORLD_MAP"] = "Update World Map When Zone Changes";

--- Classic
-L["TITAN_LOCATION_MENU_SHOW_SUBZONE_ON_PANEL_TEXT"] = "Show Only Subzone Text";
-L["TITAN_LOCATION_MENU_MAP_COORDS_TITLE"] = "Coordinates Location on Map";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_1"] = "Top Left";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_2"] = "Top Right";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_3"] = "Bottom Left";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_4"] = "Bottom";
-L["TITAN_LOCATION_MENU_MAP_COORDS_LOC_5"] = "Bottom Right";
---
-
 L["TITAN_FPS_FORMAT"] = "%.1f";
 L["TITAN_FPS_BUTTON_LABEL"] = "FPS: ";
 L["TITAN_FPS_MENU_TEXT"] = "FPS";
@@ -529,6 +514,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Est. Gains: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "XP Gains To Level (at %s XP gained last): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Show Estimated XP Gains To Level";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+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..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \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..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Repair",
@@ -649,19 +649,3 @@ L["TITAN_VOLUME_CONTROL_LOW"] = "Low";
 L["TITAN_VOLUME_MENU_TEXT"] = "Volume Control";
 L["TITAN_VOLUME_MENU_AUDIO_OPTIONS_LABEL"] = "Show Sound/Voice Options" ;
 L["TITAN_VOLUME_MENU_OVERRIDE_BLIZZ_SETTINGS"] = "Override Blizzard Volume Settings";
-
-L["TITAN_REGEN_MENU_TEXT"] = "Regen"
-L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
-L["TITAN_REGEN_MENU_SHOW2"] = "HP"
-L["TITAN_REGEN_MENU_SHOW3"] = "MP"
-L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
-L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
-L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
-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..")";
-L["TITAN_REGEN_TOOLTIP2"] = "Mana: \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..")";
-L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
-L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
-L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
-L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
-L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
-