WoWInterface SVN MorgDKP

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 37 to Rev 36
    ↔ Reverse comparison
  •

Rev 37 → Rev 36

trunk/MorgDKP/MorgDKP-ruRU.lua File deleted \ No newline at end of file
trunk/MorgDKP/MorgDKP.lua
16,7 → 16,7
 
MorgDKP = AceLibrary("AceAddon-2.0"):new("AceEvent-2.0", "AceHook-2.1", "AceConsole-2.0","AceComm-2.0", "AceDB-2.0")
 
MorgDKP.version = "7.03"
MorgDKP.version = "7.02"
MorgDKP.commPrefix = "MorgDKP"
MorgDKP.commVersion = 6.2
 
trunk/MorgDKP/MorgDKP.toc
1,6 → 1,6
## Interface: 20400
## Author: Morgalm & Fryguy
## Title: MorgDKP - |cffffffffv|r|cff00ff007.03|r
## Title: MorgDKP - |cffffffffv|r|cff00ff007.02|r
## Notes: Inspects all members of raid and saves in database, as well as lists people's dkp values
## DefaultState: 1
## SavedVariables: MorgDKPDB, MorgDKPFuBarDB
29,9 → 29,7
 
MorgDKP-enUS.lua
MorgDKP-deDE.lua
MorgDKP-ruRU.lua
MorgDKP.lua
 
DKPInfo.lua
ItemData.lua
 
trunk/MorgDKP/libs/AceConsole-2.0/AceConsole-2.0.lua
21,8 → 21,6
 
if not AceLibrary:HasInstance("AceOO-2.0") then error(MAJOR_VERSION .. " requires AceOO-2.0.") end
 
local WotLK = not not ToggleAchievementFrame
 
-- #AUTODOC_NAMESPACE AceConsole
 
local MAP_ONOFF, USAGE, IS_CURRENTLY_SET_TO, IS_NOW_SET_TO, IS_NOT_A_VALID_OPTION_FOR, IS_NOT_A_VALID_VALUE_FOR, NO_OPTIONS_AVAILABLE, OPTION_HANDLER_NOT_FOUND, OPTION_HANDLER_NOT_VALID, OPTION_IS_DISABLED, KEYBINDING_USAGE, DEFAULT_CONFIRM_MESSAGE
2378,38 → 2376,17
local handler
if type(options) == "function" then
handler = options
local found = false
for k,v in pairs(_G) do
if handler == v then
local k = k
if WotLK then
handler = function(chatFrame, msg)
return _G[k](msg)
end
else
handler = function(msg)
return _G[k](msg)
end
handler = function(msg)
return _G[k](msg)
end
found = true
break
end
end
if WotLK and not found then
local oldHandler = handler
handler = function(chatFrame, msg)
oldHandler(msg)
end
end
else
if WotLK then
function handler(chatFrame, msg)
handlerFunc(self, chat, msg, options)
end
else
function handler(msg)
handlerFunc(self, chat, msg, options)
end
function handler(msg)
handlerFunc(self, chat, msg, options)
end
end
 
trunk/MorgDKP/libs/Babble-Class-2.2/Babble-Class-2.2.lua
181,7 → 181,7
["ROGUE"] = "P\195\173cara",
}
end)
-- Translater: GriffonHeart (updater: StingerSoft)
 
BabbleClass:RegisterTranslations("ruRU", function()
return {
["Warlock"] = "Чернокнижник",
195,7 → 195,9
["Rogue"] = "Разбойник",
 
["WARLOCK"] = "Чернокнижница",
["WARRIOR"] = "Воительница",
["HUNTER"] = "Охотница",
["MAGE"] = "Волшебница",
["PRIEST"] = "Жрица",
["SHAMAN"] = "Шаманка",
["ROGUE"] = "Разбойница",
trunk/MorgDKP/libs/FuBarPlugin-2.0/FuBarPlugin-2.0.lua
198,11 → 198,11
CLOSE = "Cerrar"
CLOSE_DESC = "Cierra el men\195\186."
elseif GetLocale() == "ruRU" then
SHOW_ICON = "Показывать иконку"
SHOW_ICON = "Показ иконки"
SHOW_ICON_DESC = "Показывать иконку плагина на панели."
SHOW_TEXT = "Показывать текст"
SHOW_TEXT = "Показ текста"
SHOW_TEXT_DESC = "Показывать текст плагина на панели."
SHOW_COLORED_TEXT = "Показывать цветной текст"
SHOW_COLORED_TEXT = "Показ цветового текста"
SHOW_COLORED_TEXT_DESC = "Позволить плагину использовать его цвета в тексте."
DETACH_TOOLTIP = "Отделить подсказку"
DETACH_TOOLTIP_DESC = "Отделить всплывающую подсказку от панели."
214,7 → 214,7
POSITION_RIGHT = "Справа"
POSITION_CENTER = "По центру"
ATTACH_TO_MINIMAP = "Закрепить у мини-карты"
ATTACH_TO_MINIMAP_DESC = "Закрепить плагин у мини-карты, вместо панели."
ATTACH_TO_MINIMAP_DESC = "Закрепить плагин у мини-карты вместо панели."
HIDE_FUBAR_PLUGIN = "Скрыть плагин"
HIDE_FUBAR_PLUGIN_CMD = "Скрыть"
HIDE_FUBAR_PLUGIN_DESC = "Скрыть плагин с панели или мини-карты, но оставить аддон в рабочем состоянии."
trunk/MorgDKP/libs/AceAddon-2.0/AceAddon-2.0.lua
11,8 → 11,6
License: LGPL v2.1
]]
 
local WotLK = select(4,GetBuildInfo()) >= 30000
 
local MAJOR_VERSION = "AceAddon-2.0"
local MINOR_VERSION = "$Revision$"
 
950,14 → 948,7
AceAddon:RegisterEvent("ADDON_LOADED", "ADDON_LOADED")
local names = {}
for i = 1, GetNumAddOns() do
if WotLK then
if not IsAddOnLoaded(i) then
local name, _,_, enabled, loadable = GetAddOnInfo(i)
if enabled and loadable then names[name] = true end
end
else
if IsAddOnLoaded(i) then names[GetAddOnInfo(i)] = true end
end
if IsAddOnLoaded(i) then names[GetAddOnInfo(i)] = true end
end
self.possibleNames = names
table.insert(AceAddon.nextAddon, self)
trunk/MorgDKP/libs/LibBabble-Boss-3.0/LibBabble-Boss-3.0.lua
457,43 → 457,17
["The Illidari Council"] = true,
["Veras Darkshadow"] = true,
 
--Borean Tundra
--The Eye of Eternity
["Malygos"] = true,
--The Nexus
["Anomalus"] = true,
["Grand Magus Telestra"] = true,
["Keristrasza"] = true,
["Ormorok the Tree-Shaper"] = true,
--The Oculus
["Drakos the Interrogator"] = true,
["Ley-Guardian Eregos"] = true,
["Mage-Lord Urom"] = true,
["Varos Cloudstrider"] = true,
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = true,
["Epoch Hunter"] = true,
["Lieutenant Drake"] = true,
--The Culling of Stratholme
["Meathook"] = true,
["Chrono-Lord Epoch"] = true,
["Mal'Ganis"] = true,
["Salramm the Fleshcrafter"] = true,
--The Black Morass
["Aeonus"] = true,
["Chrono Lord Deja"] = true,
["Medivh"] = true,
["Temporus"] = true,
 
--Chamber of Aspects
--The Obsidian Sanctum
["Sartharion"] = true,
["Shadron"] = true,
["Tenebron"] = true,
["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = true,
556,17 → 530,6
["Tendris Warpwood"] = true,
["Tsu'zee"] = true,
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
["Elder Nadox"] = true,
["Herald Volazj"]= true,
["Jedoga Shadowseeker"] = true,
["Prince Taldaram"] = true,
--Azjol-Nerub
["Anub'arak"] = true,
["Hadronox"] = true,
["Krik'thir the Gatewatcher"] = true,
 
--Gnomeregan
["Crowd Pummeler 9-60"] = true,
["Dark Iron Ambassador"] = true,
576,13 → 539,6
["Techbot"] = true,
["Viscous Fallout"] = true,
 
--Grizzly Hills
--Drak'Tharon Keep
["King Dred"] = true,
["Novos the Summoner"] = true,
["The Prophet Tharon'ja"] = true,
["Trollgore"] = true,
 
--Gruul's Lair
["Blindeye the Seer"] = true,
["Gruul the Dragonkiller"] = true,
611,19 → 567,6
["Warbringer O'mrogg"] = true,
["Warchief Kargath Bladefist"] = true,
 
--Howling Fjord
--Utgarde Keep
["Constructor & Controller"] = true, --these are one encounter, so we do this as an encounter name
["Dalronn the Controller"] = true,
["Ingvar the Plunderer"] = true,
["Prince Keleseth"] = true,
["Skarvald the Constructor"] = true,
--Utgarde Pinnacle
["Skadi the Ruthless"] = true,
["King Ymiron"] = true,
["Svala Sorrowgrave"] = true,
["Gortok Palehoof"] = true,
 
--Hyjal Summit
["Anetheron"] = true,
["Archimonde"] = true,
930,27 → 873,6
["Obsidian Sentinel"] = true,
["Revelosh"] = true,
 
-- Ulduar
-- Halls of Lightning
["General Bjarngrim"] = true,
["Ionar"] = true,
["Loken"] = true,
["Volkhan"] = true,
-- Halls of Stone
["Krystallus"] = true,
["Maiden of Grief"] = true,
["Sjonnir the Ironshaper"] = true,
["The Tribunal of Ages"] = true,
 
-- The Violet Hold
["Cyanigosa"] = true,
["Erekem"] = true,
["Ichoron"] = true,
["Lavanthor"] = true,
["Moragg"] = true,
["Xevozz"] = true,
["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = true,
["Deviate Faerie Dragon"] = true,
1010,13 → 932,6
["Zerillis"] = true,
["Zul'Farrak Dead Hero"] = true,
 
-- Zul'Drak
-- Gundrak
["Drakkari Colossus"] = true,
["Gal'darah"] = true,
["Moorabi"] = true,
["Slad'ran"] = true,
 
--Zul'Gurub
["Bloodlord Mandokir"] = true,
["Gahz'ranka"] = true,
1191,43 → 1106,17
["The Illidari Council"] = "Rat der Illidari",
["Veras Darkshadow"] = "Veras Schwarzschatten",
 
--Borean Tundra
--The Eye of Eternity
--["Malygos"] = true,
--The Nexus
--["Anomalus"] = true,
--["Grand Magus Telestra"] = true,
--["Keristrasza"] = true,
--["Ormorok the Tree-Shaper"] = true,
--The Oculus
--["Drakos the Interrogator"] = true,
--["Ley-Guardian Eregos"] = true,
--["Mage-Lord Urom"] = true,
--["Varos Cloudstrider"] = true,
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "Kapitän Skarloc",
["Epoch Hunter"] = "Epochenjäger",
["Lieutenant Drake"] = "Leutnant Drach",
--The Culling of Stratholme
--["Meathook"] = true,
--["Chrono-Lord Epoch"] = true,
--["Mal'Ganis"] = true,
--["Salramm the Fleshcrafter"] = true,
--The Black Morass
["Aeonus"] = "Aeonus",
["Chrono Lord Deja"] = "Chronolord Deja",
["Medivh"] = "Medivh",
["Temporus"] = "Temporus",
 
--Chamber of Aspects
--The Obsidian Sanctum
--["Sartharion"] = true,
--["Shadron"] = true,
--["Tenebron"] = true,
--["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "Elitesoldat des Echsenkessels",
1290,17 → 1179,6
["Tendris Warpwood"] = "Tendris Wucherborke",
["Tsu'zee"] = "Tsu'zee",
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
--["Elder Nadox"] = true,
--["Herald Volazj"]= true,
--["Jedoga Shadowseeker"] = true,
--["Prince Taldaram"] = true,
--Azjol-Nerub
--["Anub'arak"] = true,
--["Hadronox"] = true,
--["Krik'thir the Gatewatcher"] = true,
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "Meuteverprügler 9-60",
["Dark Iron Ambassador"] = "Botschafter der Dunkeleisenzwerge",
1310,13 → 1188,6
["Techbot"] = "Techbot",
["Viscous Fallout"] = "Verflüssigte Ablagerung",
 
--Grizzly Hills
--Draktharon Keep
--["King Dred"] = true,
--["Novos the Summoner"] = true,
--["The Prophet Tharon'ja"] = true,
--["Trollgore"] = true,
 
--Gruul's Lair
["Blindeye the Seer"] = "Blindauge der Seher",
["Gruul the Dragonkiller"] = "Gruul der Drachenschlächter",
1345,19 → 1216,6
["Warbringer O'mrogg"] = "Kriegshetzer O'mrogg",
["Warchief Kargath Bladefist"] = "Kriegshäuptling Kargath Messerfaust",
 
--Howling Fjord
--Utgarde Keep
--["Constructor & Controller"] = true, --these are one encounter, so we do this as an encounter name
--["Dalronn the Controller"] = true,
--["Ingvar the Plunderer"] = true,
--["Prince Keleseth"] = true,
--["Skarvald the Constructor"] = true,
--Utgarde Pinnacle
--["Skadi the Ruthless"] = true,
--["King Ymiron"] = true,
--["Svala Sorrowgrave"] = true,
--["Gortok Palehoof"] = true,
 
--Hyjal Summit
["Anetheron"] = "Anetheron",
["Archimonde"] = "Archimonde",
1664,27 → 1522,6
["Obsidian Sentinel"] = "Obsidianschildwache",
["Revelosh"] = "Revelosh",
 
-- Ulduar
-- Halls of Lightning
--["General Bjarngrim"] = true,
--["Ionar"] = true,
--["Loken"] = true,
--["Volkhan"] = true,
-- Halls of Stone
--["Krystallus"] = true,
--["Maiden of Grief"] = true,
--["Sjonnir the Ironshaper"] = true,
--["The Tribunal of Ages"] = true,
 
-- The Violet Hold
--["Cyanigosa"] = true,
--["Erekem"] = true,
--["Ichoron"] = true,
--["Lavanthor"] = true,
--["Moragg"] = true,
--["Xevozz"] = true,
--["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = "Boahn",
["Deviate Faerie Dragon"] = "Deviatfeendrache",
1744,13 → 1581,6
["Zerillis"] = "Zerillis",
["Zul'Farrak Dead Hero"] = "Untoter Held aus Zul'Farrak",
 
-- Zul'Drak
-- Gundrak
--["Drakkari Colossus"] = true,
--["Gal'darah"] = true,
--["Moorabi"] = true,
--["Slad'ran"] = true,
 
--Zul'Gurub
["Bloodlord Mandokir"] = "Blutfürst Mandokir",
["Gahz'ranka"] = "Gahz'ranka",
1922,43 → 1752,17
["The Illidari Council"] = "Le conseil illidari",
["Veras Darkshadow"] = "Veras Ombrenoir",
 
--Borean Tundra
--The Eye of Eternity
["Malygos"] = "Malygos",
--The Nexus
["Anomalus"] = "Anomalus",
["Grand Magus Telestra"] = "Grand magus Telestra",
["Keristrasza"] = "Keristrasza",
["Ormorok the Tree-Shaper"] = "Ormorok le Sculpte-arbre",
--The Oculus
["Drakos the Interrogator"] = "Drakos l'Interrogateur",
["Ley-Guardian Eregos"] = "Gardien-tellurique Eregos",
["Mage-Lord Urom"] = "Seigneur-mage Urom",
["Varos Cloudstrider"] = "Varos Arpentenuée",
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "Capitaine Skarloc",
["Epoch Hunter"] = "Chasseur d'époques",
["Lieutenant Drake"] = "Lieutenant Drake",
--The Culling of Stratholme
["Meathook"] = "Grancrochet",
["Chrono-Lord Epoch"] = "Chronoseigneur Epoch",
["Mal'Ganis"] = "Mal'Ganis",
["Salramm the Fleshcrafter"] = "Salramm le Façonneur de chair",
--The Black Morass
["Aeonus"] = "Aeonus",
["Chrono Lord Deja"] = "Chronoseigneur Déjà",
["Medivh"] = "Medivh",
["Temporus"] = "Temporus",
 
--Chamber of Aspects
--The Obsidian Sanctum
--["Sartharion"] = true,
--["Shadron"] = true,
--["Tenebron"] = true,
--["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "Elite de Glissecroc",
2021,17 → 1825,6
["Tendris Warpwood"] = "Tendris Crochebois",
["Tsu'zee"] = "Tsu'zee",
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
["Elder Nadox"] = "Ancien Nadox",
["Herald Volazj"]= "Héraut Volazj",
["Jedoga Shadowseeker"] = "Jedoga Cherchelombre",
["Prince Taldaram"] = "Prince Taldaram",
--Azjol-Nerub
["Anub'arak"] = "Anub'arak",
["Hadronox"] = "Hadronox",
["Krik'thir the Gatewatcher"] = "Krik'thir le Gardien de porte",
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "Faucheur de foule 9-60",
["Dark Iron Ambassador"] = "Ambassadeur Sombrefer",
2041,13 → 1834,6
["Techbot"] = "Techbot",
["Viscous Fallout"] = "Retombée visqueuse",
 
--Grizzly Hills
--Drak'Tharon Keep
["King Dred"] = "Roi Dred",
["Novos the Summoner"] = "Novos l'Invocateur",
["The Prophet Tharon'ja"] = "Le prophète Tharon'ja",
["Trollgore"] = "Trollétripe",
 
--Gruul's Lair
["Blindeye the Seer"] = "Oeillaveugle le Voyant",
["Gruul the Dragonkiller"] = "Gruul le Tue-dragon",
2076,19 → 1862,6
["Warbringer O'mrogg"] = "Porteguerre O'mrogg",
["Warchief Kargath Bladefist"] = "Chef de guerre Kargath Lamepoing",
 
--Howling Fjord
--Utgarde Keep
["Constructor & Controller"] = "Constructeur & Contrôleur", --these are one encounter, so we do this as an encounter name
["Dalronn the Controller"] = "Dalronn le Contrôleur",
["Ingvar the Plunderer"] = "Ingvar le Pilleur",
["Prince Keleseth"] = "Prince Keleseth",
["Skarvald the Constructor"] = "Skarvald le Constructeur",
--Utgarde Pinnacle
["Skadi the Ruthless"] = "Skadi le Brutal",
["King Ymiron"] = "Roi Ymiron",
["Svala Sorrowgrave"] = "Svala Tristetombe",
["Gortok Palehoof"] = "Gortok Pâle-sabot",
 
--Hyjal Summit
["Anetheron"] = "Anetheron",
["Archimonde"] = "Archimonde",
2395,27 → 2168,6
["Obsidian Sentinel"] = "Sentinelle d'obsidienne",
["Revelosh"] = "Revelosh",
 
-- Ulduar
-- Halls of Lightning
["General Bjarngrim"] = "Général Bjarngrim",
["Ionar"] = "Ionar",
["Loken"] = "Loken",
["Volkhan"] = "Volkhan",
-- Halls of Stone
["Krystallus"] = "Krystallus",
["Maiden of Grief"] = "Damoiselle de peine",
["Sjonnir the Ironshaper"] = "Sjonnir le Sculptefer",
--["The Tribunal of Ages"] = true,
 
-- The Violet Hold
--["Cyanigosa"] = true,
--["Erekem"] = true,
--["Ichoron"] = true,
--["Lavanthor"] = true,
--["Moragg"] = true,
--["Xevozz"] = true,
--["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = "Boahn",
["Deviate Faerie Dragon"] = "Dragon féérique déviant",
2475,13 → 2227,6
["Zerillis"] = "Zerillis",
["Zul'Farrak Dead Hero"] = "Héros mort de Zul'Farrak",
 
-- Zul'Drak
-- Gundrak
["Drakkari Colossus"] = "Colosse drakkari",
["Gal'darah"] = "Gal'darah",
["Moorabi"] = "Moorabi",
["Slad'ran"] = "Slad'ran",
 
--Zul'Gurub
["Bloodlord Mandokir"] = "Seigneur sanglant Mandokir",
["Gahz'ranka"] = "Gahz'ranka",
2653,43 → 2398,17
["The Illidari Council"] = "伊利达雷议会",
["Veras Darkshadow"] = "维尔莱斯·深影",
 
--Borean Tundra
--The Eye of Eternity
--["Malygos"] = true,
--The Nexus
--["Anomalus"] = true,
--["Grand Magus Telestra"] = true,
--["Keristrasza"] = true,
--["Ormorok the Tree-Shaper"] = true,
--The Oculus
--["Drakos the Interrogator"] = true,
--["Ley-Guardian Eregos"] = true,
--["Mage-Lord Urom"] = true,
--["Varos Cloudstrider"] = true,
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "斯卡洛克上尉",
["Epoch Hunter"] = "时空猎手",
["Lieutenant Drake"] = "德拉克中尉",
--The Culling of Stratholme
--["Meathook"] = true,
--["Chrono-Lord Epoch"] = true,
--["Mal'Ganis"] = true,
--["Salramm the Fleshcrafter"] = true,
--The Black Morass
["Aeonus"] = "埃欧努斯",
["Chrono Lord Deja"] = "时空领主德亚",
["Medivh"] = "麦迪文",
["Temporus"] = "坦普卢斯",
 
--Chamber of Aspects
--The Obsidian Sanctum
--["Sartharion"] = true,
--["Shadron"] = true,
--["Tenebron"] = true,
--["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "盘牙精英",
2752,17 → 2471,6
["Tendris Warpwood"] = "特迪斯·扭木",
["Tsu'zee"] = "苏斯",
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
--["Elder Nadox"] = true,
--["Herald Volazj"]= true,
--["Jedoga Shadowseeker"] = true,
--["Prince Taldaram"] = true,
--Azjol-Nerub
--["Anub'arak"] = true,
--["Hadronox"] = true,
--["Krik'thir the Gatewatcher"] = true,
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "群体打击者9-60",
["Dark Iron Ambassador"] = "黑铁大师",
2772,13 → 2480,6
["Techbot"] = "尖端机器人",
["Viscous Fallout"] = "粘性辐射尘",
 
--Grizzly Hills
--Draktharon Keep
--["King Dred"] = true,
--["Novos the Summoner"] = true,
--["The Prophet Tharon'ja"] = true,
--["Trollgore"] = true,
 
--Gruul's Lair
["Blindeye the Seer"] = "盲眼先知",
["Gruul the Dragonkiller"] = "屠龙者格鲁尔",
2807,19 → 2508,6
["Warbringer O'mrogg"] = "战争使者沃姆罗格",
["Warchief Kargath Bladefist"] = "酋长卡加斯·刃拳",
 
--Howling Fjord
--Utgarde Keep
--["Constructor & Controller"] = true, --these are one encounter, so we do this as an encounter name
--["Dalronn the Controller"] = true,
--["Ingvar the Plunderer"] = true,
--["Prince Keleseth"] = true,
--["Skarvald the Constructor"] = true,
--Utgarde Pinnacle
--["Skadi the Ruthless"] = true,
--["King Ymiron"] = true,
--["Svala Sorrowgrave"] = true,
--["Gortok Palehoof"] = true,
 
--Hyjal Summit
["Anetheron"] = "安纳塞隆",
["Archimonde"] = "阿克蒙德",
3126,27 → 2814,6
["Obsidian Sentinel"] = "黑曜石哨兵",
["Revelosh"] = "鲁维罗什",
 
-- Ulduar
-- Halls of Lightning
--["General Bjarngrim"] = true,
--["Ionar"] = true,
--["Loken"] = true,
--["Volkhan"] = true,
-- Halls of Stone
--["Krystallus"] = true,
--["Maiden of Grief"] = true,
--["Sjonnir the Ironshaper"] = true,
--["The Tribunal of Ages"] = true,
 
-- The Violet Hold
--["Cyanigosa"] = true,
--["Erekem"] = true,
--["Ichoron"] = true,
--["Lavanthor"] = true,
--["Moragg"] = true,
--["Xevozz"] = true,
--["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = "博艾恩",
["Deviate Faerie Dragon"] = "变异精灵龙",
3206,13 → 2873,6
["Zerillis"] = "泽雷利斯",
["Zul'Farrak Dead Hero"] = "祖尔法拉克阵亡英雄",
 
-- Zul'Drak
-- Gundrak
--["Drakkari Colossus"] = true,
--["Gal'darah"] = true,
--["Moorabi"] = true,
--["Slad'ran"] = true,
 
--Zul'Gurub
["Bloodlord Mandokir"] = "血领主曼多基尔",
["Gahz'ranka"] = "加兹兰卡",
3384,43 → 3044,17
["The Illidari Council"] = "伊利達瑞議事",
["Veras Darkshadow"] = "維拉斯·深影",
 
--Borean Tundra
--The Eye of Eternity
["Malygos"] = "瑪里苟斯",
--The Nexus
["Anomalus"] = "艾諾瑪路斯",
["Grand Magus Telestra"] = "大魔導師特雷斯翠",
["Keristrasza"] = "凱瑞史卓莎",
["Ormorok the Tree-Shaper"] = "『樹木造形者』歐爾莫洛克",
--The Oculus
["Drakos the Interrogator"] = "『審問者』德拉高斯",
["Ley-Guardian Eregos"] = "地脈守護者伊瑞茍斯",
["Mage-Lord Urom"] = "法師領主厄隆",
["Varos Cloudstrider"] = "瓦羅斯·雲行者",
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "史卡拉克上尉",
["Epoch Hunter"] = "紀元狩獵者",
["Lieutenant Drake"] = "中尉崔克",
--The Culling of Stratholme
["Meathook"] = "肉鉤",
["Chrono-Lord Epoch"] = "紀元時間領主",
["Mal'Ganis"] = "瑪爾加尼斯",
["Salramm the Fleshcrafter"] = "『血肉工匠』塞歐朗姆",
--The Black Morass
["Aeonus"] = "艾奧那斯",
["Chrono Lord Deja"] = "時間領主迪賈",
["Medivh"] = "麥迪文",
["Temporus"] = "坦普拉斯",
 
--Chamber of Aspects
--The Obsidian Sanctum
--["Sartharion"] = true,
--["Shadron"] = true,
--["Tenebron"] = true,
--["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "盤牙精英",
3484,17 → 3118,6
["Tendris Warpwood"] = "特迪斯·扭木",
["Tsu'zee"] = "蘇斯",
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
--["Elder Nadox"] = true,
["Herald Volazj"]= "信使沃菈齊",
["Jedoga Shadowseeker"] = "潔杜佳·尋影者",
["Prince Taldaram"] = "泰爾達朗王子",
--Azjol-Nerub
["Anub'arak"] = "阿努巴拉克",
["Hadronox"] = "哈卓諾克斯",
["Krik'thir the Gatewatcher"] = "『守門者』齊力克西爾",
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "群體打擊者9-60",
["Dark Iron Ambassador"] = "黑鐵大使",
3504,13 → 3127,6
["Techbot"] = "尖端機器人",
["Viscous Fallout"] = "粘性輻射塵",
 
--Grizzly Hills
--Draktharon Keep
["King Dred"] = "崔德國王",
["Novos the Summoner"] = "『召喚者』諾沃司",
["The Prophet Tharon'ja"] = "預言者薩隆杰",
["Trollgore"] = "血角食人妖",
 
--Gruul's Lair
["Blindeye the Seer"] = "先知盲眼",
["Gruul the Dragonkiller"] = "弒龍者戈魯爾",
3539,19 → 3155,6
["Warbringer O'mrogg"] = "戰爭製造者·歐姆拉格",
["Warchief Kargath Bladefist"] = "大酋長卡加斯·刃拳",
 
--Howling Fjord
--Utgarde Keep
--["Constructor & Controller"] = true, --these are one encounter, so we do this as an encounter name
["Dalronn the Controller"] = "『控制者』達隆恩",
["Ingvar the Plunderer"] = "『盜掠者』因格瓦",
["Prince Keleseth"] = "凱雷希斯王子",
["Skarvald the Constructor"] = "『建造者』史卡沃",
--Utgarde Pinnacle
["Skadi the Ruthless"] = "『無情』斯卡迪",
["King Ymiron"] = "依米倫國王",
["Svala Sorrowgrave"] = "司瓦拉禍害使者",
["Gortok Palehoof"] = "戈托克·白蹄",
 
--Hyjal Summit
["Anetheron"] = "安納塞隆",
["Archimonde"] = "阿克蒙德",
3858,27 → 3461,6
["Obsidian Sentinel"] = "黑曜石哨兵",
["Revelosh"] = "魯維羅什",
 
-- Ulduar
-- Halls of Lightning
["General Bjarngrim"] = "賈恩格林將軍",
["Ionar"] = "埃歐納",
["Loken"] = "克羅努斯",
["Volkhan"] = "渥克瀚",
-- Halls of Stone
["Krystallus"] = "克利斯托魯斯",
["Maiden of Grief"] = "悲痛侍女",
["Sjonnir the Ironshaper"] = "『塑鐵者』斯雍尼爾",
--["The Tribunal of Ages"] = true,
 
-- The Violet Hold
--["Cyanigosa"] = true,
--["Erekem"] = true,
--["Ichoron"] = true,
--["Lavanthor"] = true,
--["Moragg"] = true,
--["Xevozz"] = true,
--["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = "博艾恩",
["Deviate Faerie Dragon"] = "變異精靈龍",
3938,13 → 3520,6
["Zerillis"] = "澤雷利斯",
["Zul'Farrak Dead Hero"] = "祖爾法拉克陣亡英雄",
 
-- Zul'Drak
-- Gundrak
--["Drakkari Colossus"] = true,
["Gal'darah"] = "蓋爾達拉",
["Moorabi"] = "慕拉比",
["Slad'ran"] = "史拉德銳",
 
--Zul'Gurub
["Bloodlord Mandokir"] = "血領主曼多基爾",
["Gahz'ranka"] = "加茲蘭卡",
4116,43 → 3691,17
["The Illidari Council"] = "일리다리 의회", -- check
["Veras Darkshadow"] = "베라스 다크섀도",
 
--Borean Tundra
--The Eye of Eternity
["Malygos"] = "말리고스",
--The Nexus
["Anomalus"] = "아노말루스",
["Grand Magus Telestra"] = "대학자 텔레스트라",
["Keristrasza"] = "케리스트라자",
["Ormorok the Tree-Shaper"] = "정원사 오르모로크",
--The Oculus
["Drakos the Interrogator"] = "심문관 드라코스",
["Ley-Guardian Eregos"] = "지맥 수호자 에레고스",
["Mage-Lord Urom"] = "마법사 군주 우롬",
["Varos Cloudstrider"] = "바로스 클라우드스트라이더",
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "경비대장 스칼록",
["Epoch Hunter"] = "시대의 사냥꾼",
["Lieutenant Drake"] = "부관 드레이크",
--The Culling of Stratholme
["Meathook"] = "살덩이고리",
["Chrono-Lord Epoch"] = "시간의 군주 에포크",
["Mal'Ganis"] = "말가니스",
["Salramm the Fleshcrafter"] = "살덩이창조자 살람",
--The Black Morass
["Aeonus"] = "아에누스",
["Chrono Lord Deja"] = "시간의 군주 데자",
["Medivh"] = "메디브",
["Temporus"] = "템퍼루스",
 
--Chamber of Aspects
--The Obsidian Sanctum
--["Sartharion"] = true,
--["Shadron"] = true,
--["Tenebron"] = true,
--["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "갈퀴송곳니 정예병",
4215,17 → 3764,6
["Tendris Warpwood"] = "굽이나무 텐드리스",
["Tsu'zee"] = "츄지",
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
["Elder Nadox"] = "장로 나독스",
["Herald Volazj"]= "사자 볼라즈",
["Jedoga Shadowseeker"] = "어둠추적자 제도가",
["Prince Taldaram"] = "공작 탈다람",
--Azjol-Nerub
["Anub'arak"] = "아눕아락",
["Hadronox"] = "하드로녹스",
["Krik'thir the Gatewatcher"] = "문지기 크릭시르",
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "고철 압축기 9-60",
["Dark Iron Ambassador"] = "검은무쇠단 사절",
4235,13 → 3773,6
["Techbot"] = "첨단로봇",
["Viscous Fallout"] = "방사성 폐기물",
 
--Grizzly Hills
--Draktharon Keep
["King Dred"] = "랩터왕 서슬발톱",
["Novos the Summoner"] = "소환사 노보스",
["The Prophet Tharon'ja"] = "예언자 타론자",
["Trollgore"] = "트롤고어",
 
--Gruul's Lair
["Blindeye the Seer"] = "현자 블라인드아이",
["Gruul the Dragonkiller"] = "용 학살자 그룰",
4270,19 → 3801,6
["Warbringer O'mrogg"] = "돌격대장 오므로그",
["Warchief Kargath Bladefist"] = "대족장 카르가스 블레이드피스트",
 
--Howling Fjord
--Utgarde Keep
["Constructor & Controller"] = "건축가와 감시자", --these are one encounter, so we do this as an encounter name
["Dalronn the Controller"] = "감시자 달론",
["Ingvar the Plunderer"] = "약탈자 앙그바르",
["Prince Keleseth"] = "공작 켈레세스",
["Skarvald the Constructor"] = "건축가 스카발드",
--Utgarde Pinnacle
["Skadi the Ruthless"] = "학살자 스카디",
["King Ymiron"] = "왕 이미론",
["Svala Sorrowgrave"] = "소발라 소로우그레이브",
["Gortok Palehoof"] = "고르톡 페일후프",
 
--Hyjal Summit
["Anetheron"] = "아네테론",
["Archimonde"] = "아키몬드",
4589,27 → 4107,6
["Obsidian Sentinel"] = "흑요석 파수꾼",
["Revelosh"] = "레벨로쉬",
 
-- Ulduar
-- Halls of Lightning
["General Bjarngrim"] = "장군 야르그린",
["Ionar"] = "이오나",
["Loken"] = "로켄",
["Volkhan"] = "볼칸",
-- Halls of Stone
["Krystallus"] = "크리스탈루스",
["Maiden of Grief"] = "고뇌의 여신",
["Sjonnir the Ironshaper"] = "무쇠구체자 쇼니르",
--["The Tribunal of Ages"] = true,
 
-- The Violet Hold
--["Cyanigosa"] = true,
--["Erekem"] = true,
--["Ichoron"] = true,
--["Lavanthor"] = true,
--["Moragg"] = true,
--["Xevozz"] = true,
--["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = "보안",
["Deviate Faerie Dragon"] = "돌연변이 요정용",
4669,13 → 4166,6
["Zerillis"] = "제릴리스",
["Zul'Farrak Dead Hero"] = "줄파락 죽음의 영웅",
 
-- Zul'Drak
-- Gundrak
--["Drakkari Colossus"] = true,
["Gal'darah"] = "갈다라",
["Moorabi"] = "무라비",
["Slad'ran"] = "슬라드란",
 
--Zul'Gurub
["Bloodlord Mandokir"] = "혈군주 만도키르",
["Gahz'ranka"] = "가즈란카",
4847,43 → 4337,17
["The Illidari Council"] = "El concilio Illidari",
["Veras Darkshadow"] = "Veras Darkshadow",
 
--Borean Tundra
--The Eye of Eternity
--["Malygos"] = true,
--The Nexus
--["Anomalus"] = true,
--["Grand Magus Telestra"] = true,
--["Keristrasza"] = true,
--["Ormorok the Tree-Shaper"] = true,
--The Oculus
--["Drakos the Interrogator"] = true,
--["Ley-Guardian Eregos"] = true,
--["Mage-Lord Urom"] = true,
--["Varos Cloudstrider"] = true,
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "Capitán Skarloc",
["Epoch Hunter"] = "Cazador de eras",
["Lieutenant Drake"] = "Teniente Draco",
--The Culling of Stratholme
--["Meathook"] = true,
--["Chrono-Lord Epoch"] = true,
--["Mal'Ganis"] = true,
--["Salramm the Fleshcrafter"] = true,
--The Black Morass
["Aeonus"] = "Aeonus",
["Chrono Lord Deja"] = "Cronolord Deja",
["Medivh"] = "Medivh",
["Temporus"] = "Temporus",
 
--Chamber of Aspects
--The Obsidian Sanctum
--["Sartharion"] = true,
--["Shadron"] = true,
--["Tenebron"] = true,
--["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "Elite Colimillo Torcido",
4931,7 → 4395,7
["Captain Kromcrush"] = "Capit\195\161n Kromcrush",
["Cho'Rush the Observer"] = "Cho'Rush el Observador",
["Guard Fengus"] = "Guardia Fengus",
["Guard Mol'dar"] = "Guardia Mol'dar",
["Guard Mol'dar"] = " Guardia Mol'dar",
["Guard Slip'kik"] = "Guardia Slip'kik",
["King Gordok"] = "Rey Gordok",
["Knot Thimblejack's Cache"] = "Carretilla de Knot Llavededo",
4945,17 → 4409,6
["Tendris Warpwood"] = "Tendris Madeguerra",
["Tsu'zee"] = "Tsu'zee",
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
--["Elder Nadox"] = true,
--["Herald Volazj"]= true,
--["Jedoga Shadowseeker"] = true,
--["Prince Taldaram"] = true,
--Azjol-Nerub
--["Anub'arak"] = true,
--["Hadronox"] = true,
--["Krik'thir the Gatewatcher"] = true,
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "Gopleamasa 9-60",
["Dark Iron Ambassador"] = "Embajador Hierro Negro",
4965,13 → 4418,6
["Techbot"] = "Tecnobot",
["Viscous Fallout"] = "Radiactivo viscoso",
 
--Grizzly Hills
--Draktharon Keep
--["King Dred"] = true,
--["Novos the Summoner"] = true,
--["The Prophet Tharon'ja"] = true,
--["Trollgore"] = true,
 
--Gruul's Lair
["Blindeye the Seer"] = "Ciego el Vidente",
["Gruul the Dragonkiller"] = "Gruul el Asesino de Dragones",
5000,19 → 4446,6
["Warbringer O'mrogg"] = "Belisario O'mrogg",
["Warchief Kargath Bladefist"] = "Jefe de Guerra Garrafilada", -- check
 
--Howling Fjord
--Utgarde Keep
--["Constructor & Controller"] = true, --these are one encounter, so we do this as an encounter name
--["Dalronn the Controller"] = true,
--["Ingvar the Plunderer"] = true,
--["Prince Keleseth"] = true,
--["Skarvald the Constructor"] = true,
--Utgarde Pinnacle
--["Skadi the Ruthless"] = true,
--["King Ymiron"] = true,
--["Svala Sorrowgrave"] = true,
--["Gortok Palehoof"] = true,
 
--Hyjal Summit
["Anetheron"] = "Anetheron",
["Archimonde"] = "Archimonde",
5317,27 → 4750,6
["Obsidian Sentinel"] = "Centinela Obsidiano",
["Revelosh"] = "Revelosh",
 
-- Ulduar
-- Halls of Lightning
--["General Bjarngrim"] = true,
--["Ionar"] = true,
--["Loken"] = true,
--["Volkhan"] = true,
-- Halls of Stone
--["Krystallus"] = true,
--["Maiden of Grief"] = true,
--["Sjonnir the Ironshaper"] = true,
--["The Tribunal of Ages"] = true,
 
-- The Violet Hold
--["Cyanigosa"] = true,
--["Erekem"] = true,
--["Ichoron"] = true,
--["Lavanthor"] = true,
--["Moragg"] = true,
--["Xevozz"] = true,
--["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = "Boahn",
["Deviate Faerie Dragon"] = "Drag\195\179n f\195\169rico descarriado",
5397,13 → 4809,6
["Zerillis"] = "Zerillis",
["Zul'Farrak Dead Hero"] = "H\195\169roe muerto Zul'Farrak",
 
-- Zul'Drak
-- Gundrak
--["Drakkari Colossus"] = true,
--["Gal'darah"] = true,
--["Moorabi"] = true,
--["Slad'ran"] = true,
 
--Zul'Gurub
["Bloodlord Mandokir"] = "Se\195\177or sangriento Mandokir",
["Gahz'ranka"] = "Gahz'ranka",
5434,11 → 4839,11
--Ahn'Qiraj
["Anubisath Defender"] = "Защитник-анубисат",
["Battleguard Sartura"] = "Боевой страж Сартура",
["C'Thun"] = "К'Тун",
["C'Thun"] = "Ка-Тун",
["Emperor Vek'lor"] = "Император Век'лор",
["Emperor Vek'nilash"] = "Император Век'нилаш",
["Eye of C'Thun"] = "Око Ка-Туна",
["Fankriss the Unyielding"] = "Фанкрисс Неприклонный",
["Fankriss the Unyielding"] = "Фанкрисс Непобедимый",
["Lord Kri"] = "Лорд Кри",
["Ouro"] = "Оуро",
["Princess Huhuran"] = "Принцесса Хухуран",
5447,7 → 4852,7
["The Prophet Skeram"] = "Пророк Скерам",
["The Twin Emperors"] = "Близнецы Императора",
["Vem"] = "Вем",
["Viscidus"] = "Нечистотон",
["Viscidus"] = "Фиброзник",
 
--Auchindoun
--Auchenai Crypts
5458,174 → 4863,147
["Pandemonius"] = "Пандемоний",
["Tavarok"] = "Таварок",
--Shadow Labyrinth
["Ambassador Hellmaw"] = "Посол Гиблочрев",
["Blackheart the Inciter"] = "Черносерд Проповедник",
["Grandmaster Vorpil"] = "Великий мастер Ворпил",
["Ambassador Hellmaw"] = "Посланник Адская Глотка",
["Blackheart the Inciter"] = "Подстрекатель Черное Сердце",
["Grandmaster Vorpil"] = "Гроссмейстер Ворпил",
["Murmur"] = "Бормотун",
--Sethekk Halls
["Anzu"] = "Анзу",
["Darkweaver Syth"] = "Темнопряд Сит",
["Darkweaver Syth"] = "Сит Черноплет",
["Talon King Ikiss"] = "Король воронов Айкисс",
 
--Blackfathom Deeps
["Aku'mai"] = "Аку'май",
["Aku'mai"] = "Акумай",
["Baron Aquanis"] = "Барон Акванис",
["Gelihast"] = "Гелихаст",
["Ghamoo-ra"] = "Гхаму-ра",
["Lady Sarevess"] = "Леди Саревесс",
["Old Serra'kis"] = "Старина Серракис",
["Twilight Lord Kelris"] = "Повелитель сумрака Келрис",
-- ["Lorgus Jett"] = "Лоргус Джетт", -- id 12902
["Twilight Lord Kelris"] = "Сумеречный лорд Келрис",
 
--Blackrock Depths
["Ambassador Flamelash"] = "Посол Огнехлыст",
["Ambassador Flamelash"] = "Посланник Огнехлыст",
["Anger'rel"] = "Гневрел",
["Anub'shiah"] = "Ануб'шиа",
["Bael'Gar"] = "Бейл'Гор",
["Chest of The Seven"] = "Сундук Смертных",
["Anub'shiah"] = "Ануб'сиах",
["Bael'Gar"] = "Баэл-Гар",
["Chest of The Seven"] = "Сhest of The Seven",
["Doom'rel"] = "Думрел",
["Dope'rel"] = "Наиглесиас",
["Emperor Dagran Thaurissan"] = "Император Дагран Таурисан",
["Eviscerator"] = "Потрошитель",
["Fineous Darkvire"] = "Точень Темнострой",
["Fineous Darkvire"] = "Финей Темная Сила",
["General Angerforge"] = "Генерал Кузня Гнева",
["Gloom'rel"] = "Глумрел",
["Golem Lord Argelmach"] = "Повелитель големов Аргелмах",
["Gorosh the Dervish"] = "Горош Дервиш",
["Grizzle"] = "Гриззл",
["Hate'rel"] = "Хейтрел",
["Hedrum the Creeper"] = "Хедрум Ползун",
["High Interrogator Gerstahn"] = "Верховный дознаватель Герштан",
["High Priestess of Thaurissan"] = "Верховная жрица Тауриссана",
["Houndmaster Grebmar"] = "Псарь Гребмар",
["Hurley Blackbreath"] = "Харли Пьяглдых",
["Hedrum the Creeper"] = "Хедрум-ползун",
["High Interrogator Gerstahn"] = "Главный следователь Герстан",
["High Priestess of Thaurissan"] = "Верховная жрица Таурисана",
["Houndmaster Grebmar"] = "Псарь Гребмара",
["Hurley Blackbreath"] = "Харли Темнодув",
["Lord Incendius"] = "Лорд Опалитель",
["Lord Roccor"] = "Лорд Роккор",
["Lord Roccor"] = "Владыка Роккор",
["Magmus"] = "Магмус",
["Ok'thor the Breaker"] = "Ок'тор Разрушитель",
["Ok'thor the Breaker"] = "Октор Крушитель",
["Panzor the Invincible"] = "Панцер Непобедимый",
["Phalanx"] = "Фаланкс",
["Plugger Spazzring"] = "Штоппор Наливалс",
["Princess Moira Bronzebeard"] = "Принцесса Мойра Бронзобород",
["Pyromancer Loregrain"] = "Пироман Зерно Мудрости",
["Ribbly Screwspigot"] = "Риббли Крутипроб",
["Seeth'rel"] = "Сит'рел",
["The Seven Dwarves"] = "Темные хранители",
["Phalanx"] = "Фаланга",
["Plugger Spazzring"] = "Стукарь Дурозвон",
["Princess Moira Bronzebeard"] = "Принцесса Мойра Золотая Борода",
["Pyromancer Loregrain"] = "Пиромант Лоргрейн",
["Ribbly Screwspigot"] = "Риббли Винтокран",
["Seeth'rel"] = "Сит-рел",
["The Seven Dwarves"] = "The Seven Dwarves",
["Verek"] = "Верек",
["Vile'rel"] = "Вил-рел",
["Warder Stilgiss"] = "Тюремщик Стилгисс",
["Warder Stilgiss"] = "Надсмотрщик Стилгисс",
 
--Blackrock Spire
--Lower
["Bannok Grimaxe"] = "Баннок Люторез",
["Bannok Grimaxe"] = "Баннок Мрачный Топор",
["Burning Felguard"] = "Пылающий страж Скверны",
["Crystal Fang"] = "Хрустальный Клык",
["Ghok Bashguud"] = "Гок Крепкобив",
["Ghok Bashguud"] = "Гок Башгууд",
["Gizrul the Slavener"] = "Гизрул Поработитель",
["Halycon"] = "Халикон",
["Highlord Omokk"] = "Вождь Омокк",
["Mor Grayhoof"] = "Мор Серое Копыто",
["Mother Smolderweb"] = "Мать Дымная Паутина",
["Overlord Wyrmthalak"] = "Властитель Змейталак",
["Quartermaster Zigris"] = "Интендант Зигрис",
["Shadow Hunter Vosh'gajin"] = "Темная охотница Вос'гаджин",
["Spirestone Battle Lord"] = "Полководец из клана Черной Вершины",
["Spirestone Butcher"] = "Мясник из клана Черной Вершины",
["Spirestone Lord Magus"] = "Лорд-волхв из клана Черной Вершины",
["Urok Doomhowl"] = "Аррок Смертный Вопль",
["Overlord Wyrmthalak"] = "Повелитель Вурмталак",
["Quartermaster Zigris"] = "Квартирмейстер Зигрис",
["Shadow Hunter Vosh'gajin"] = "Пленяющая Духов Восгаджин",
["Spirestone Battle Lord"] = "Полководец Острого Камня",
["Spirestone Butcher"] = "Палач Острого Камня",
["Spirestone Lord Magus"] = "Лорд-маг Острого Камня",
["Urok Doomhowl"] = "Аррок Роковой Вой",
["War Master Voone"] = "Воевода Вун",
--Upper
["General Drakkisath"] = "Генерал Драккисат",
["Goraluk Anvilcrack"] = "Горалук Треснувшая Наковальня",
["Goraluk Anvilcrack"] = "Горалук Разбитая Наковальня",
["Gyth"] = "Гит",
["Jed Runewatcher"] = "Джед Руновед",
["Lord Valthalak"] = "Лорд Вальтхалак",
["Jed Runewatcher"] = "Джед Руногляд",
["Lord Valthalak"] = "Владыка Вальтхалак",
["Pyroguard Emberseer"] = "Пиростраж Углеглаз",
["Solakar Flamewreath"] = "Солакарский огнечервь",
["The Beast"] = "Зверь",
["Warchief Rend Blackhand"] = "Вождь Ренд Чернорук",
["Warchief Rend Blackhand"] = "Вождь Ренд Черная Рука",
 
--Blackwing Lair
["Broodlord Lashlayer"] = "Предводитель драконов Разящий Бич",
["Broodlord Lashlayer"] = "Предводитель драконидов Разящий Бич",
["Chromaggus"] = "Хроммагус",
["Ebonroc"] = "Черноскал",
["Firemaw"] = "Ошнечрев",
["Ebonroc"] = "Эбонрок",
["Firemaw"] = "Огненное Брюхо",
["Flamegor"] = "Пламегор",
["Grethok the Controller"] = "Греток Регулятор",
["Lord Victor Nefarius"] = "Лорд Виктор Нефариус",
["Nefarian"] = "Нефариан",
["Razorgore the Untamed"] = "Бритвосмерт Неукротимый",
["Vaelastrasz the Corrupt"] = "Валестраз Порочный",
["Vaelastrasz the Corrupt"] = "Веластрас Порочный",
 
--Black Temple
["Essence of Anger"] = "Воплощение гнева",
["Essence of Desire"] = "Воплощение желания",
["Essence of Suffering"] = "Воплощение страдания",
["Gathios the Shatterer"] = "Гатиос Изувер",
["Essence of Anger"] = "Сущность гнева",
["Essence of Desire"] = "Сущность желания",
["Essence of Suffering"] = "Сущность страдания",
["Gathios the Shatterer"] = "Гатиос Раскольщик",
["Gurtogg Bloodboil"] = "Гуртогг Кипящая Кровь",
["High Nethermancer Zerevor"] = "Верховный пустомант Зеревор",
["High Warlord Naj'entus"] = "Верховный Полководец Надж'ентус",
["Illidan Stormrage"] = "Иллидан Ярость Бури",
["High Nethermancer Zerevor"] = "Верховный хаомант Зеревор",
["High Warlord Naj'entus"] = "Великий полководец Наджентус",
["Illidan Stormrage"] = "Иллидан Грозовая Ярость",
["Illidari Council"] = "Совет Иллидари",
["Lady Malande"] = "Леди Маланда",
["Mother Shahraz"] = "Матушка Шахраз",
["Reliquary of Souls"] = "Гробница душ",
["Reliquary of Souls"] = "Reliquary of Souls",
["Shade of Akama"] = "Тень Акамы",
["Supremus"] = "Супремус",
["Teron Gorefiend"] = "Терон Кровожад",
["Teron Gorefiend"] = "Терон Жестокосердный",
["The Illidari Council"] = "Совет Иллидари",
["Veras Darkshadow"] = "Верас Глубокий Мрак",
["Veras Darkshadow"] = "Верас Черная Тень",
 
--Borean Tundra
--The Eye of Eternity
--["Malygos"] = true,
--The Nexus
--["Anomalus"] = true,
--["Grand Magus Telestra"] = true,
--["Keristrasza"] = true,
--["Ormorok the Tree-Shaper"] = true,
--The Oculus
--["Drakos the Interrogator"] = true,
--["Ley-Guardian Eregos"] = true,
--["Mage-Lord Urom"] = true,
--["Varos Cloudstrider"] = true,
 
--Caverns of Time
--Old Hillsbrad Foothills
["Captain Skarloc"] = "Капитан Скарлок",
["Epoch Hunter"] = "Охотник Вечности",
["Epoch Hunter"] = "Вечный Охотник",
["Lieutenant Drake"] = "Лейтенант Дрейк",
--The Culling of Stratholme
--["Meathook"] = true,
--["Chrono-Lord Epoch"] = true,
--["Mal'Ganis"] = true,
--["Salramm the Fleshcrafter"] = true,
--The Black Morass
["Aeonus"] = "Эонус",
["Chrono Lord Deja"] = "Повелитель времени Дежа",
["Medivh"] = "Медив",
["Temporus"] = "Темпорус",
 
--Chamber of Aspects
--The Obsidian Sanctum
--["Sartharion"] = true,
--["Shadron"] = true,
--["Tenebron"] = true,
--["Vesperon"] = true,
 
--Coilfang Reservoir
--Serpentshrine Cavern
["Coilfang Elite"] = "Гвардеец Спиралезуба",
["Coilfang Strider"] = "Странник Спиралезуба",
["Fathom-Lord Karathress"] = "Повелитель глубин Каратресс",
["Hydross the Unstable"] = "Гидросс Нестабильный",
["Lady Vashj"] = "Леди Вайш",
["Leotheras the Blind"] = "Леотерас Слепец",
["Morogrim Tidewalker"] = "Морогрим Волноступ",
["Lady Vashj"] = "Леди Вайши",
["Leotheras the Blind"] = "Леотерас Слепой",
["Morogrim Tidewalker"] = "Морогрим Приливный Странник",
["Pure Spawn of Hydross"] = "Чистое порождение Гидросса",
["Shadow of Leotheras"] = "Тень Леотераса",
["Tainted Spawn of Hydross"] = "Оскверненное порождение Гидросса",
["The Lurker Below"] = "Скрытень глубин",
["The Lurker Below"] = "Житель глубин",
["Tidewalker Lurker"] = "Приливный крадень",
--The Slave Pens
["Mennu the Betrayer"] = "Менну Предатель",
5633,15 → 5011,15
["Rokmar the Crackler"] = "Рокмар Трескун",
["Ahune"] = "Ахун",
--The Steamvault
["Hydromancer Thespia"] = "Гидромант Теспия",
["Mekgineer Steamrigger"] = "Мекжинер Паропуск",
["Warlord Kalithresh"] = "Полководец Калитреш",
["Hydromancer Thespia"] = "Гидромант Феспия",
["Mekgineer Steamrigger"] = "Анжинер Паровая Оснастка",
["Warlord Kalithresh"] = "Предводитель Калитреш",
--The Underbog
["Claw"] = "Коготь",
["Ghaz'an"] = "Газ'ан",
["Hungarfen"] = "Голоднец",
["Overseer Tidewrath"] = "Наблюдатель Гнев Прилива", -- who is it?
["Swamplord Musel'ek"] = "Владыка болота Мусел'ек",
["Ghaz'an"] = "Газан",
["Hungarfen"] = "Грибсон",
["Overseer Tidewrath"] = "Наблюдатель Гнев Прилива",
["Swamplord Musel'ek"] = "Владыка болот Мусил-ик",
["The Black Stalker"] = "Черная Охотница",
 
--Dire Maul
5653,58 → 5031,40
["Alzzin the Wildshaper"] = "Алззин Перевертень",
["Hydrospawn"] = "Гидротварь",
["Isalien"] = "Изалиен",
["Lethtendris"] = "Лефтендрис",
["Lethtendris"] = "Летендрис",
["Pimgib"] = "Пимгиб",
["Pusillin"] = "Пузиллин",
["Zevrim Thornhoof"] = "Зеврим Терновое Копыто",
--North
["Captain Kromcrush"] = "Капитан Давигром",
["Cho'Rush the Observer"] = "Чо'Раш Наблюдатель",
["Guard Fengus"] = "Стражник Фенгус",
["Guard Mol'dar"] = "Стражник Мол'дар",
["Guard Slip'kik"] = "Стражник Слип'кик",
["Captain Kromcrush"] = "Капитан Кром-Крушитель",
["Cho'Rush the Observer"] = "Чо-Раш Наблюдатель",
["Guard Fengus"] = "Страж Фенгус",
["Guard Mol'dar"] = "Страж Мол'дар",
["Guard Slip'kik"] = "Страж Слип'кик",
["King Gordok"] = "Король Гордок",
["Knot Thimblejack's Cache"] = "Knot Thimblejack's Cache",
["Stomper Kreeg"] = "Топотун Криг",
--West
["Illyanna Ravenoak"] = "Иллиана Воронья Ольха",
["Immol'thar"] = "Бессмер'тер",
["Lord Hel'nurath"] = "Лорд Хел'нурат",
["Illyanna Ravenoak"] = "Ильянна Вороний Дуб",
["Immol'thar"] = "Иммолтар",
["Lord Hel'nurath"] = "Лорд Хелнурат",
["Magister Kalendris"] = "Магистр Календрис",
["Prince Tortheldrin"] = "Принц Тортелдрин",
["Tendris Warpwood"] = "Тендрис Криводрев",
["Tsu'zee"] = "Цу'зи",
["Tendris Warpwood"] = "Тендрис Кривое Дерево",
["Tsu'zee"] = "Цу-зи",
 
--Dragonblight
-- Ahn'kahet: The Old Kingdom
--["Elder Nadox"] = true,
--["Herald Volazj"]= true,
--["Jedoga Shadowseeker"] = true,
--["Prince Taldaram"] = true,
--Azjol-Nerub
--["Anub'arak"] = true,
--["Hadronox"] = true,
--["Krik'thir the Gatewatcher"] = true,
 
--Gnomeregan
["Crowd Pummeler 9-60"] = "Толпогон 9-60",
["Dark Iron Ambassador"] = "Посол из клана Черного Железа",
["Electrocutioner 6000"] = "Электрошокер 6000",
["Dark Iron Ambassador"] = "Посол Темной Стали",
["Electrocutioner 6000"] = "Электроразитель-6000",
["Grubbis"] = "Грязнюк",
["Mekgineer Thermaplugg"] = "Мекжинер Термоштепсель",
["Techbot"] = "Техбот",
["Viscous Fallout"] = "Липкая муть",
["Mekgineer Thermaplugg"] = "Анжинер Термоштепсель",
["Techbot"] = "Технобот",
["Viscous Fallout"] = "Липкое загрязнение",
 
--Grizzly Hills
--Draktharon Keep
--["King Dred"] = true,
--["Novos the Summoner"] = true,
--["The Prophet Tharon'ja"] = true,
--["Trollgore"] = true,
 
--Gruul's Lair
["Blindeye the Seer"] = "Слепоглаз Провидец",
["Gruul the Dragonkiller"] = "Груул Драконобой",
["Gruul the Dragonkiller"] = "Груул Драконоубийца",
["High King Maulgar"] = "Король Молгар",
["Kiggler the Crazed"] = "Кигглер Безумный",
["Krosh Firehand"] = "Крош Огненная Рука",
5718,31 → 5078,18
["Vazruden"] = "Вазруден",
["Watchkeeper Gargolmar"] = "Начальник стражи Гарголмар",
--Magtheridon's Lair
["Hellfire Channeler"] = "Чаротворец из цитадели Адского Пламени",
["Magtheridon"] = "Магтеридон",
["Hellfire Channeler"] = "Заклинатель Ярого Пламени",
["Magtheridon"] = "Магеридон",
--The Blood Furnace
["Broggok"] = "Броггок",
["Keli'dan the Breaker"] = "Кели'дан Разрушитель",
["The Maker"] = "Мастер",
["Keli'dan the Breaker"] = "Келидан разрушитель",
["The Maker"] = "Созидатель",
--The Shattered Halls
["Blood Guard Porung"] = "Кровавый страж Порунг",
["Grand Warlock Nethekurse"] = "Главный чернокнижник Пустоклят",
["Warbringer O'mrogg"] = "О'мрогг Завоеватель",
["Warchief Kargath Bladefist"] = "Вождь Каргат Острорук",
["Grand Warlock Nethekurse"] = "Великий чернокнижник Черное Проклятие",
["Warbringer O'mrogg"] = "Вестник войны Омрогг",
["Warchief Kargath Bladefist"] = "Вождь Каргат Стальная Рука",
 
--Howling Fjord
--Utgarde Keep
--["Constructor & Controller"] = true, --these are one encounter, so we do this as an encounter name
--["Dalronn the Controller"] = true,
--["Ingvar the Plunderer"] = true,
--["Prince Keleseth"] = true,
--["Skarvald the Constructor"] = true,
--Utgarde Pinnacle
--["Skadi the Ruthless"] = true,
--["King Ymiron"] = true,
--["Svala Sorrowgrave"] = true,
--["Gortok Palehoof"] = true,
 
--Hyjal Summit
["Anetheron"] = "Анетерон",
["Archimonde"] = "Архимонд",
5755,16 → 5102,16
["Attumen the Huntsman"] = "Аттумен Охотник",
["Chess Event"] = "Шахматы",
["Dorothee"] = "Дороти",
["Dust Covered Chest"] = "Пыльный сундук",
["Dust Covered Chest"] = "Dust Covered Chest",
["Grandmother"] = "Бабушка",
["Hyakiss the Lurker"] = "Хиакисс Скрытень",
["Julianne"] = "Джулианна",
["Hyakiss the Lurker"] = "Хиакисс Тенетник",
["Julianne"] = "Джульенна",
["Kil'rek"] = "Килрек",
["King Llane Piece"] = "King Llane Piece",
["Maiden of Virtue"] = "Благочестивая дева",
["Maiden of Virtue"] = "Пресветлая дева",
["Midnight"] = "Полночь",
["Moroes"] = "Мороуз",
["Netherspite"] = "Пустогнев",
["Netherspite"] = "Хаотиан Злобный",
["Nightbane"] = "Ночная Погибель",
["Prince Malchezaar"] = "Принц Малчезар",
["Restless Skeleton"] = "Недремлющий скелет",
5772,25 → 5119,25
["Rokad the Ravager"] = "Рокад Опустошитель",
["Romulo & Julianne"] = "Ромуло и Джульенна",
["Romulo"] = "Ромуло",
["Shade of Aran"] = "Тень Арана",
["Shade of Aran"] = "Призрак Арана",
["Shadikith the Glider"] = "Шадикит Скользящий",
["Strawman"] = "Балбес",
["Terestian Illhoof"] = "Терестиан Больное Копыто",
["The Big Bad Wolf"] = "Злой и страшный серый волк",
["The Crone"] = "Ведьма",
["The Curator"] = "Смотритель",
["The Big Bad Wolf"] = "Серый Волк",
["The Crone"] = "Карга",
["The Curator"] = "Хранитель",
["Tinhead"] = "Медноголовый",
["Tito"] = "Тито",
["Warchief Blackhand Piece"] = "Warchief Blackhand Piece",
 
-- Magisters' Terrace
["Kael'thas Sunstrider"] = "Кель'тас Солнечный Скиталец",
["Kael'thas Sunstrider"] = "Кель Солнечный Скиталец",
["Priestess Delrissa"] = "Жрица Делрисса",
["Selin Fireheart"] = "Селин Огненное Сердце",
["Vexallus"] = "Вексалиус",
 
--Maraudon
["Celebras the Cursed"] = "Селебрас Проклятый",
["Celebras the Cursed"] = "Келебрас Проклятый",
["Gelk"] = "Джелк",
["Kolk"] = "Колк",
["Landslide"] = "Сель",
5799,7 → 5146,7
["Maraudos"] = "Мародос",
["Meshlok the Harvester"] = "Мешлок Жнец",
["Noxxion"] = "Ноксион",
["Princess Theradras"] = "Принцесса Терадрас",
["Princess Theradras"] = "Принцесса Терадраса",
["Razorlash"] = "Бритвохлест",
["Rotgrip"] = "Гнилопасть",
["Tinkerer Gizlock"] = "Ремонтник Гизлок",
5810,70 → 5157,68
["Cache of the Firelord"] = "Cache of the Firelord",
["Garr"] = "Гарр",
["Gehennas"] = "Гееннас",
["Golemagg the Incinerator"] = "Маг-лорд из клана Гордок",
["Golemagg the Incinerator"] = "Големагг Поджигатель",
["Lucifron"] = "Люцифрон",
["Magmadar"] = "Магмадар",
["Majordomo Executus"] = "Мажордом Экзекутус",
["Majordomo Executus"] = "Сенешаль Экзекутус",
["Ragnaros"] = "Рагнарос",
["Shazzrah"] = "Шаззрах",
["Sulfuron Harbinger"] = "Предвестник Сульфурон",
["Sulfuron Harbinger"] = "Сульфуронский мститель",
 
--Naxxramas
["Anub'Rekhan"] = "Ануб'Рекан",
["Anub'Rekhan"] = "Ануб'рекхан",
["Deathknight Understudy"] = "Дублер рыцаря Смерти",
["Feugen"] = "Фойген",
["Four Horsemen Chest"] = "Сундук Четырех Всадников",
["Four Horsemen Chest"] = "Cундук Four Horsemen",
["Gluth"] = "Глут",
["Gothik the Harvester"] = "Готик Жнец",
["Grand Widow Faerlina"] = "Великая вдова Фарлина",
["Grobbulus"] = "Гроббулус",
["Heigan the Unclean"] = "Хейган Нечистивый",
["Grand Widow Faerlina"] = "Великая вдова Фэрлина",
["Grobbulus"] = "Гроббулюс",
["Heigan the Unclean"] = "Хейган Нечистый",
["Highlord Mograine"] = "Верховный лорд Могрейн",
["Instructor Razuvious"] = "Инструктор Разувиус",
["Kel'Thuzad"] = "Кел'Тузад",
["Instructor Razuvious"] = "Наставник Разувиос",
["Kel'Thuzad"] = "Кел-Тузед",
["Lady Blaumeux"] = "Леди Бломе",
["Loatheb"] = "Мерзот",
["Maexxna"] = "Мексна",
["Loatheb"] = "Лоатеб",
["Maexxna"] = "Мэксна",
["Noth the Plaguebringer"] = "Нот Чумной",
["Patchwerk"] = "Лоскутик",
["Sapphiron"] = "Сапфирон",
["Patchwerk"] = "Патчверк",
["Sapphiron"] = "Сафирон",
["Sir Zeliek"] = "Сэр Зелиек",
["Stalagg"] = "Сталагг",
["Thaddius"] = "Таддиус",
["Thane Korth'azz"] = "Тан Кортазз",
["The Four Horsemen"] = "Четыре Всадника",
["The Four Horsemen"] = "The Four Horsemen",
 
--Onyxia's Lair
["Onyxia"] = "Ониксия",
 
--Ragefire Chasm
["Maur Grimtotem"] = "Маур Мрачный Тотем",
["Bazzalan"] = "Баззалан",
["Zelemar the Wrathful"] = "Зелемар Гневный",
["Jergosh the Invoker"] = "Жергош Призыватель Духов",
["Taragaman the Hungerer"] = "Тарагаман Ненасытный",
["Jergosh the Invoker"] = "Джергош Заклинатель",
["Maur Grimtotem"] = "Маур Мрачный Тотем",
["Taragaman the Hungerer"] = "Тарагаман Алчущий",
 
--Razorfen Downs
["Amnennar the Coldbringer"] = "Амненнар Хладовей",
["Amnennar the Coldbringer"] = "Амненнар Хладоносец",
["Glutton"] = "Обжора",
["Mordresh Fire Eye"] = "Мордреш Огненный Глаз",
["Mordresh Fire Eye"] = "Мордреш Огненный Взор",
["Plaguemaw the Rotting"] = "Чумобрюх Гнилой",
["Ragglesnout"] = "Круглорыл",
["Tuten'kash"] = "Тутен'каш",
["Henry Stern"] = "Генри Штерн",
 
--Razorfen Kraul
["Agathelos the Raging"] = "Агателос Свирепый",
["Agathelos the Raging"] = "Агателос Яростный",
["Blind Hunter"] = "Слепой охотник",
["Charlga Razorflank"] = "Чарлга Остробок",
["Charlga Razorflank"] = "Чарлга Острый Бок",
["Death Speaker Jargba"] = "Вестник смерти Джаргба",
["Earthcaller Halmgar"] = "Заклинательница земли Халмгар",
["Overlord Ramtusk"] = "Властитель Таранный Клык",
["Earthcaller Halmgar"] = "Халмгар Зовущий Землю",
["Overlord Ramtusk"] = "Владыка Бараний Клык",
 
--Ruins of Ahn'Qiraj
["Anubisath Guardian"] = "Анубисат-страж",
["Ayamiss the Hunter"] = "Айамисса Охотница",
["Buru the Gorger"] = "Буру Ненасытный",
["Ayamiss the Hunter"] = "Айамисс Охотник",
["Buru the Gorger"] = "Буру Обжора",
["General Rajaxx"] = "Генерал Раджакс",
["Kurinnaxx"] = "Куриннакс",
["Lieutenant General Andorov"] = "Генерал-лейтенант Андоров",
5882,17 → 5227,17
 
--Scarlet Monastery
--Armory
["Herod"] = "Герод",
["Herod"] = "Ирод",
--Cathedral
["High Inquisitor Fairbanks"] = "Верховный инквизитор Фэйрбанкс",
["High Inquisitor Whitemane"] = "Верховный инквизитор Вайтмейн",
["Scarlet Commander Mograine"] = "Командир Могрейн из Алого ордена",
["High Inquisitor Fairbanks"] = "Великий инквизитор Фэрбенкс",
["High Inquisitor Whitemane"] = "Великий инквизитор Белогрив",
["Scarlet Commander Mograine"] = "Командир Алого ордена Могрейн",
--Graveyard
["Azshir the Sleepless"] = "Азшир Неспящий",
["Azshir the Sleepless"] = "Азшир Бессонный",
["Bloodmage Thalnos"] = "Волшебник Крови Талнос",
["Fallen Champion"] = "Павший воитель",
["Interrogator Vishas"] = "Дознаватель Жестокос",
["Ironspine"] = "Железноспин",
["Fallen Champion"] = "Павший защитник",
["Interrogator Vishas"] = "Следователь Вишас",
["Ironspine"] = "Стальной Хребет",
["Headless Horseman"] = "Всадник без головы",
--Library
["Arcanist Doan"] = "Чародей Доан",
5901,16 → 5246,16
--Scholomance
["Blood Steward of Kirtonos"] = "Кровавая прислужница Киртоноса",
["Darkmaster Gandling"] = "Темный магистр Гандлинг",
["Death Knight Darkreaver"] = "Рыцарь смерти Темный Терзатель",
["Death Knight Darkreaver"] = "Темный Губитель, рыцарь Смерти",
["Doctor Theolen Krastinov"] = "Доктор Теолен Крастинов",
["Instructor Malicia"] = "Инструктор Коварница",
["Jandice Barov"] = "Джандис Баров",
["Instructor Malicia"] = "Наставник Малиция",
["Jandice Barov"] = "Джандис Бароу",
["Kirtonos the Herald"] = "Киртонос Глашатай",
["Kormok"] = "Кормок",
["Lady Illucia Barov"] = "Леди Иллюсия Баров",
["Lady Illucia Barov"] = "Леди Иллюция Бароу",
["Lord Alexei Barov"] = "Лорд Алексей Баров",
["Lorekeeper Polkelt"] = "Сказитель Полкелт",
["Marduk Blackpool"] = "Мардук Блэкпул",
["Lorekeeper Polkelt"] = "Хранитель мудрости Полкелт",
["Marduk Blackpool"] = "Мардук Чернопруд",
["Ras Frostwhisper"] = "Рас Снегошепот",
["Rattlegore"] = "Громоклин",
["The Ravenian"] = "Равениан",
5919,67 → 5264,67
--Shadowfang Keep
["Archmage Arugal"] = "Верховный маг Аругал",
["Arugal's Voidwalker"] = "Демон Хаоса Аругала",
["Baron Silverlaine"] = "Барон Сребролен",
["Baron Silverlaine"] = "Барон Сильверлейн",
["Commander Springvale"] = "Командир Ручьедол",
["Deathsworn Captain"] = "Капитан служителей Смерти",
["Deathsworn Captain"] = "Капитан Служителей Смерти",
["Fenrus the Devourer"] = "Фенрус Пожиратель",
["Odo the Blindwatcher"] = "Одо Слепой Страж",
["Razorclaw the Butcher"] = "Остроклык Мясник",
["Wolf Master Nandos"] = "Командир воргенов Нандос",
["Odo the Blindwatcher"] = "Одо Слепостраж",
["Razorclaw the Butcher"] = "Мясник Острокоготь",
["Wolf Master Nandos"] = "Волчарь Нандос",
 
--Stratholme
["Archivist Galford"] = "Архивариус Галфорд",
["Balnazzar"] = "Балназзар",
["Baron Rivendare"] = "Барон Ривендер",
["Archivist Galford"] = "Архивариус Гэлфорд",
["Balnazzar"] = "Бальназар",
["Baron Rivendare"] = "Барон Райвендер",
["Baroness Anastari"] = "Баронесса Анастари",
["Black Guard Swordsmith"] = "Оружейник Черной Стражи",
["Cannon Master Willey"] = "Мастер-канонир Вилли",
["Crimson Hammersmith"] = "Молотобоец из Багрового Легиона",
["Black Guard Swordsmith"] = "Оружейник Черной Гвардии",
["Cannon Master Willey"] = "Канонир мастер Уилли",
["Crimson Hammersmith"] = "Багровый Молотобоец",
["Fras Siabi"] = "Фрас Сиаби",
["Hearthsinger Forresten"] = "Певчий Форрестен",
["Magistrate Barthilas"] = "Мировой судья Бартилас",
["Hearthsinger Forresten"] = "Хартзингер Форрестен",
["Magistrate Barthilas"] = "Судья Бартилас",
["Maleki the Pallid"] = "Малекай Бледный",
["Nerub'enkan"] = "Неруб'энкан",
["Nerub'enkan"] = "Неруб-энкан",
["Postmaster Malown"] = "Почтальон Мэлоун",
["Ramstein the Gorger"] = "Рамштайн Ненасытный",
["Ramstein the Gorger"] = "Рамштейна Яростного",
["Skul"] = "Череп",
["Stonespine"] = "Каменный Гребень",
["The Unforgiven"] = "Непрощенный",
["Timmy the Cruel"] = "Тайлер",
["Timmy the Cruel"] = "Тимми Жестокий",
 
--Sunwell Plateau
["Kalecgos"] = "Калесгос",
["Kalecgos"] = "Калецгос",
["Sathrovarr the Corruptor"] = "Сатроварр Осквернитель",
["Brutallus"] = "Бруталл",
["Felmyst"] = "Пророк Скверны",
["Kil'jaeden"] = "Кил'джеден",
["Felmyst"] = "Сквернотуман",
["Kil'jaeden"] = "Kil'jaeden",
["M'uru"] = "М'ару",
["Entropius"] = "Энтропий",
["The Eredar Twins"] = "The Eredar Twins",
["Lady Sacrolash"] = "Lady Sacrolash",
["Grand Warlock Alythess"] = "Главная чернокнижница Алитесса",
["Grand Warlock Alythess"] = "Grand Warlock Alythess",
 
--Tempest Keep
--The Arcatraz
["Dalliah the Doomsayer"] = "Далия Глашатай Судьбы",
["Harbinger Skyriss"] = "Предвестник Скайрисс",
["Harbinger Skyriss"] = "Вестник Скайрис",
["Warden Mellichar"] = "Страж Мелличар",
["Wrath-Scryer Soccothrates"] = "Провидец Гнева Соккорат",
["Zereketh the Unbound"] = "Зерекет Бездонный",
["Wrath-Scryer Soccothrates"] = "Демон-провидец Соккотрат",
["Zereketh the Unbound"] = "Зерекет Освобожденный",
--The Botanica
["Commander Sarannis"] = "Командир Сараннис",
["High Botanist Freywinn"] = "Верховный ботаник Фрейвин",
["High Botanist Freywinn"] = "Старший ботаник Фрейвин",
["Laj"] = "Ладж",
["Thorngrin the Tender"] = "Скалезуб Скорбный",
["Thorngrin the Tender"] = "Торнгрин Нежный",
["Warp Splinter"] = "Узлодревень",
--The Eye
["Al'ar"] = "Ал'ар",
["Al'ar"] = "Алар",
["Cosmic Infuser"] = "Космический даритель",
["Devastation"] = "Разоритель",
["Grand Astromancer Capernian"] = "Верховный звездочет Каперниан",
["High Astromancer Solarian"] = "Верховный звездочет Солариан",
["Grand Astromancer Capernian"] = "Старший астромант Каперниан",
["High Astromancer Solarian"] = "Верховный астромант Солариан",
["Infinity Blades"] = "Клинки Бесконечности",
["Kael'thas Sunstrider"] = "Кель'тас Солнечный Скиталец",
["Kael'thas Sunstrider"] = "Кель Солнечный Скиталец",
["Lord Sanguinar"] = "Лорд Сангвинар",
["Master Engineer Telonicus"] = "Старший инженер Телоникус",
["Netherstrand Longbow"] = "Длинный лук Берега Хаоса",
5988,46 → 5333,46
["Solarium Priest"] = "Жрец Солариана",
["Staff of Disintegration"] = "Посох Распыления",
["Thaladred the Darkener"] = "Таладред Затемнитель",
["Void Reaver"] = "Страж Бездны",
["Void Reaver"] = "Пустотный разбойник",
["Warp Slicer"] = "Искореженная ломтерезка",
--The Mechanar
["Gatewatcher Gyro-Kill"] = "Страж ворот Точеный Нож",
["Gatewatcher Iron-Hand"] = "Страж ворот Стальная Клешня",
["Mechano-Lord Capacitus"] = "Механо-лорд Конденсарон",
["Nethermancer Sepethrea"] = "Пустомант Сепетрея",
["Gatewatcher Gyro-Kill"] = "Страж ворот Смертекрут",
["Gatewatcher Iron-Hand"] = "Страж ворот Железнорук",
["Mechano-Lord Capacitus"] = "Механический лорд Способие",
["Nethermancer Sepethrea"] = "Хаомант Сепетея",
["Pathaleon the Calculator"] = "Паталеон Вычислитель",
 
--The Deadmines
["Brainwashed Noble"] = "Зомбированный дворянин",
["Captain Greenskin"] = "Капитан Зеленямс",
["Cookie"] = "Пирожок",
["Edwin VanCleef"] = "Эдвин ван Клиф",
["Foreman Thistlenettle"] = "Штейгер Чертополох",
["Brainwashed Noble"] = "Обманутый дворянин",
["Captain Greenskin"] = "Капитан Зеленая Шкура",
["Cookie"] = "Пышка",
["Edwin VanCleef"] = "Эдвин Ван Клиф",
["Foreman Thistlenettle"] = "Старшина Чертополохх",
["Gilnid"] = "Гилнид",
["Marisa du'Paige"] = "Мариса дю Пэж",
["Miner Johnson"] = "Шахтер Джонсон",
["Mr. Smite"] = "Мистер Каюк",
["Mr. Smite"] = "Ударр",
["Rhahk'Zor"] = "Рак'Зор",
["Sneed"] = "Снид",
["Sneed's Shredder"] = "Крошшер Снида",
["Sneed's Shredder"] = "Резак Снида",
 
--The Stockade
["Bazil Thredd"] = "Базиль Тредд",
["Bruegal Ironknuckle"] = "Бругал Железный Кулак",
["Bruegal Ironknuckle"] = "Бругал Железный Шарнир",
["Dextren Ward"] = "Декстрен Вард",
["Hamhock"] = "Хрупконог",
["Kam Deepfury"] = "Кам Гневливый",
["Hamhock"] = "Хэмхок",
["Kam Deepfury"] = "Кэм Темная Ярость",
["Targorr the Dread"] = "Таргорр Ужасный",
 
--The Temple of Atal'Hakkar
["Atal'alarion"] = "Атал'аларион",
["Avatar of Hakkar"] = "Аватара Хаккара",
["Dreamscythe"] = "Жнец Снов",
["Gasher"] = "Ранокол",
["Gasher"] = "Гашер",
["Hazzas"] = "Хаззас",
["Hukku"] = "Хукку",
["Jade"] = "Нефрит",
["Jammal'an the Prophet"] = "Джаммал'ан Пророк",
["Jammal'an the Prophet"] = "Джаммалан Пророк",
["Kazkaz the Unholy"] = "Казказ Нечистый",
["Loro"] = "Лоро",
["Mijan"] = "Миджан",
6038,50 → 5383,29
["Weaver"] = "Ткачик",
["Zekkis"] = "Зеккис",
["Zolo"] = "Золо",
["Zul'Lor"] = "Зул'Лор",
["Zul'Lor"] = "Зул-Лор",
 
--Uldaman
["Ancient Stone Keeper"] = "Древний Хранитель Камня",
["Archaedas"] = "Аркедас",
["Baelog"] = "Бейлог",
["Digmaster Shovelphlange"] = "Мастер Лопаторук",
["Galgann Firehammer"] = "Галганн Огнемолот",
["Ancient Stone Keeper"] = "Древний каменный хранитель",
["Archaedas"] = "Архедас",
["Baelog"] = "Бэлог",
["Digmaster Shovelphlange"] = "Мастер Лопаторукий",
["Galgann Firehammer"] = "Галганн Огненный Молот",
["Grimlok"] = "Гримлок",
["Ironaya"] = "Иронайа",
["Obsidian Sentinel"] = "Обсидиановый часовой",
["Ironaya"] = "Железнайя",
["Obsidian Sentinel"] = "Обсидиановый страж",
["Revelosh"] = "Ревелош",
 
-- Ulduar
-- Halls of Lightning
--["General Bjarngrim"] = true,
--["Ionar"] = true,
--["Loken"] = true,
--["Volkhan"] = true,
-- Halls of Stone
--["Krystallus"] = true,
--["Maiden of Grief"] = true,
--["Sjonnir the Ironshaper"] = true,
--["The Tribunal of Ages"] = true,
 
-- The Violet Hold
--["Cyanigosa"] = true,
--["Erekem"] = true,
--["Ichoron"] = true,
--["Lavanthor"] = true,
--["Moragg"] = true,
--["Xevozz"] = true,
--["Zuramat the Obliterator"] = true,
 
--Wailing Caverns
["Boahn"] = "Боан",
["Deviate Faerie Dragon"] = "Загадочный волшебный дракон",
["Deviate Faerie Dragon"] = "Искаженный лесной дракончик",
["Kresh"] = "Криг",
["Lady Anacondra"] = "Повелительница Анакондра",
["Lady Anacondra"] = "Леди Анакондра",
["Lord Cobrahn"] = "Лорд Кобран",
["Lord Pythas"] = "Лорд Питонас",
["Lord Pythas"] = "Лорд Пифас",
["Lord Serpentis"] = "Лорд Серпентис",
["Mad Magglish"] = "Безумный Магглиш",
["Mutanus the Devourer"] = "Мутанус Пожиратель",
["Mutanus the Devourer"] = "Мутанус-пожиратель",
["Skum"] = "Шкам",
["Trigore the Lasher"] = "Тригор Хлестун",
["Verdan the Everliving"] = "Вердан Бессмертный",
6104,43 → 5428,36
["Ysondre"] = "Исондра",
 
--Zul'Aman
["Akil'zon"] = "Акил'зон",
["Akil'zon"] = "Акилзон",
["Halazzi"] = "Халаззи",
["Jan'alai"] = "Джан'алай",
["Malacrass"] = "Малакрасс",
["Jan'alai"] = "Джаналайя",
["Malacrass"] = "Malacrass",
["Nalorakk"] = "Налоракк",
["Zul'jin"] = "Зул'джин",
["Zul'jin"] = "Зулджин",
["Hex Lord Malacrass"] = "Повелитель проклятий Малакрасс",
 
--Zul'Farrak
["Antu'sul"] = "Анту'сул",
["Chief Ukorz Sandscalp"] = "Вождь Укорз Песчаная Плешь",
["Chief Ukorz Sandscalp"] = "Вождь Укорз Песчаная Проплешина",
["Dustwraith"] = "Пыльный Призрак",
["Gahz'rilla"] = "Газ'рилла",
["Gahz'rilla"] = "Газрилла",
["Hydromancer Velratha"] = "Гидромант Велрата",
["Murta Grimgut"] = "Мурта Мрачнобрюх",
["Nekrum Gutchewer"] = "Некрум Кишкожуй",
["Murta Grimgut"] = "Мурта Мрачное Брюхо",
["Nekrum Gutchewer"] = "Некрум Брюхогрыз",
["Oro Eyegouge"] = "Оро Вырвиглаз",
["Ruuzlu"] = "Руузлу",
["Sandarr Dunereaver"] = "Сандарр Разоритель Барханов",
["Sandarr Dunereaver"] = "Сандарр Барханный Разбойник",
["Sandfury Executioner"] = "Палач из клана Песчаной Бури",
["Sergeant Bly"] = "Сержант Блай",
["Shadowpriest Sezz'ziz"] = "Темный жрец Шезз'зиз",
["Shadowpriest Sezz'ziz"] = "Сумеречный жрец Сезз'зиз",
["Theka the Martyr"] = "Тека Мученик",
["Witch Doctor Zum'rah"] = "Знахарь Зум'рах",
["Zerillis"] = "Зериллис",
["Zul'Farrak Dead Hero"] = "Мертвый Герой Зул'Фаррака",
 
-- Zul'Drak
-- Gundrak
--["Drakkari Colossus"] = true,
--["Gal'darah"] = true,
--["Moorabi"] = true,
--["Slad'ran"] = true,
 
--Zul'Gurub
["Bloodlord Mandokir"] = "Мандокир Повелитель Крови",
["Gahz'ranka"] = "Газ'ранка",
["Bloodlord Mandokir"] = "Мэндокир Повелитель Крови",
["Gahz'ranka"] = "Газранка",
["Gri'lek"] = "Грилек",
["Hakkar"] = "Хаккар",
["Hazza'rah"] = "Хазза'рах",
6149,7 → 5466,7
["High Priestess Arlokk"] = "Верховная жрица Арлокк",
["High Priestess Jeklik"] = "Верховная жрица Джеклик",
["High Priestess Mar'li"] = "Верховная жрица Мар'ли",
["Jin'do the Hexxer"] = "Джин'до Проклинатель",
["Jin'do the Hexxer"] = "Джин'до Наводящий Порчу",
["Renataki"] = "Ренатаки",
["Wushoolay"] = "Вушулай",
 
trunk/MorgDKP/libs/AceComm-2.0/AceComm-2.0.lua
20,8 → 20,6
 
if not AceLibrary:HasInstance("AceOO-2.0") then error(MAJOR_VERSION .. " requires AceOO-2.0") end
 
local WotLK = not not ToggleAchievementFrame
 
local AceOO = AceLibrary("AceOO-2.0")
local AceComm = AceOO.Mixin {
"SendCommMessage",
1947,58 → 1945,30
local notSeenString = '^' .. _G.ERR_CHAT_PLAYER_NOT_FOUND_S:gsub("%%s", "(.-)"):gsub("%%1%$s", "(.-)") .. '$'
local ambiguousString = '^' .. _G.ERR_CHAT_PLAYER_AMBIGUOUS_S:gsub("%%s", "(.-)"):gsub("%%1%$s", "(.-)") .. '$'
local ERR_GUILD_PERMISSIONS = _G.ERR_GUILD_PERMISSIONS
if WotLK then
function AceComm.hooks:ChatFrame_MessageEventHandler(orig, hookSelf, event, ...)
if (event == "CHAT_MSG_CHANNEL" or event == "CHAT_MSG_CHANNEL_LIST") and _G.arg9:find("^AceComm") then
return
elseif event == "CHAT_MSG_SYSTEM" then
local arg1 = _G.arg1
if arg1 == ERR_GUILD_PERMISSIONS then
if recentGuildMessage > GetTime() then
stopGuildMessages = true
return
end
else
local player = arg1:match(notSeenString) or arg1:match(ambiguousString)
if player then
local t = GetTime()
if recentNotSeen[player] and recentNotSeen[player] > t then
recentNotSeen[player] = t + 10
return
else
recentNotSeen[player] = t + 10
end
end
function AceComm.hooks:ChatFrame_MessageEventHandler(orig, event)
if (event == "CHAT_MSG_CHANNEL" or event == "CHAT_MSG_CHANNEL_LIST") and _G.arg9:find("^AceComm") then
return
elseif event == "CHAT_MSG_SYSTEM" then
local arg1 = _G.arg1
if arg1 == ERR_GUILD_PERMISSIONS then
if recentGuildMessage > GetTime() then
stopGuildMessages = true
return
end
end
return orig(hookSelf, event, ...)
end
else
function AceComm.hooks:ChatFrame_MessageEventHandler(orig, event)
if (event == "CHAT_MSG_CHANNEL" or event == "CHAT_MSG_CHANNEL_LIST") and _G.arg9:find("^AceComm") then
return
elseif event == "CHAT_MSG_SYSTEM" then
local arg1 = _G.arg1
if arg1 == ERR_GUILD_PERMISSIONS then
if recentGuildMessage > GetTime() then
stopGuildMessages = true
else
local player = arg1:match(notSeenString) or arg1:match(ambiguousString)
if player then
local t = GetTime()
if recentNotSeen[player] and recentNotSeen[player] > t then
recentNotSeen[player] = t + 10
return
else
recentNotSeen[player] = t + 10
end
else
local player = arg1:match(notSeenString) or arg1:match(ambiguousString)
if player then
local t = GetTime()
if recentNotSeen[player] and recentNotSeen[player] > t then
recentNotSeen[player] = t + 10
return
else
recentNotSeen[player] = t + 10
end
end
end
end
return orig(event)
end
return orig(event)
end
 
function AceComm.hooks:Logout(orig)
2121,41 → 2091,41
 
if not oldLib or not oldLib.hooks or not oldLib.hooks.ChatFrame_MessageEventHandler then
local old_ChatFrame_MessageEventHandler = _G.ChatFrame_MessageEventHandler
function _G.ChatFrame_MessageEventHandler(...)
function _G.ChatFrame_MessageEventHandler(event)
if self.hooks.ChatFrame_MessageEventHandler then
return self.hooks.ChatFrame_MessageEventHandler(self, old_ChatFrame_MessageEventHandler, ...)
return self.hooks.ChatFrame_MessageEventHandler(self, old_ChatFrame_MessageEventHandler, event)
else
return old_ChatFrame_MessageEventHandler(...)
return old_ChatFrame_MessageEventHandler(event)
end
end
end
if not oldLib or not oldLib.hooks or not oldLib.hooks.Logout then
local old_Logout = _G.Logout
function _G.Logout(...)
function _G.Logout()
if self.hooks.Logout then
return self.hooks.Logout(self, old_Logout, ...)
return self.hooks.Logout(self, old_Logout)
else
return old_Logout(...)
return old_Logout()
end
end
end
if not oldLib or not oldLib.hooks or not oldLib.hooks.CancelLogout then
local old_CancelLogout = _G.CancelLogout
function _G.CancelLogout(...)
function _G.CancelLogout()
if self.hooks.CancelLogout then
return self.hooks.CancelLogout(self, old_CancelLogout, ...)
return self.hooks.CancelLogout(self, old_CancelLogout)
else
return old_CancelLogout(...)
return old_CancelLogout()
end
end
end
if not oldLib or not oldLib.hooks or not oldLib.hooks.Quit then
local old_Quit = _G.Quit
function _G.Quit(...)
function _G.Quit()
if self.hooks.Quit then
return self.hooks.Quit(self, old_Quit, ...)
return self.hooks.Quit(self, old_Quit)
else
return old_Quit(...)
return old_Quit()
end
end
end
trunk/MorgDKP/libs/LibBabble-Zone-3.0/LibBabble-Zone-3.0.lua
316,7 → 316,6
["Azeroth"] = true,
["Eastern Kingdoms"] = true,
["Kalimdor"] = true,
["Northrend"] = true,
["Outland"] = true,
["Cosmic map"] = true,
 
509,44 → 508,6
 
["Tirisfal"] = true,
["Sunken Temple"] = true,
 
-- WRATH OF THE LICH KING
-- Zones
["Borean Tundra"] = true,
["Crystalsong Forest"] = true,
["Dalaran"] = true,
["Dragonblight"] = true,
["Grizzly Hills"] = true,
["Howling Fjord"] = true,
["Icecrown"] = true,
["Sholazar Basin"] = true,
["The Storm Peaks"] = true,
["Wintergrasp"] = true,
["Zul'Drak"] = true,
 
-- Instances (and subzones used for displaying these instances)
["Ahn'kahet: The Old Kingdom"] = true,
["Azjol-Nerub"] = true,
["Coldarra"] = true,
["The Culling of Stratholme"] = true,
["Drak'Tharon Keep"] = true,
["The Eye of Eternity"] = true,
["Gundrak"] = true,
["Halls of Lightning"] = true,
["Halls of Stone"] = true,
["The Nexus"] = true,
["The Obsidian Sanctum"] = true,
["The Oculus"] = true,
["Ulduar"] = true,
["Utgarde Keep"] = true,
["Utgarde Pinnacle"] = true,
["The Violet Hold"] = true,
["Wyrmrest Temple"] = true,
 
-- PvP Instances
["Dalaran Sewers"] = true,
["The Ring of Valor"] = true,
["Strand of the Ancients"] = true,
}
 
if GAME_LOCALE == "enUS" then
556,7 → 517,6
["Azeroth"] = "Azeroth",
["Eastern Kingdoms"] = "Östliche Königreiche",
["Kalimdor"] = "Kalimdor",
--["Northrend"] = true,
["Outland"] = "Scherbenwelt",
["Cosmic map"] = "Kosmische Karte",
 
749,51 → 709,12
 
["Tirisfal"] = "Tirisfal",
["Sunken Temple"] = "Versunkener Tempel",
 
-- WRATH OF THE LICH KING
-- Zones
--["Borean Tundra"] = true,
--["Crystalsong Forest"] = true,
--["Dalaran"] = true,
--["Dragonblight"] = true,
--["Grizzly Hills"] = true,
--["Howling Fjord"] = true,
--["Icecrown"] = true,
--["Sholazar Basin"] = true,
--["The Storm Peaks"] = true,
--["Wintergrasp"] = true,
--["Zul'Drak"] = true,
 
-- Instances (and subzones used for displaying these instances)
--["Ahn'kahet: The Old Kingdom"] = true,
--["Azjol-Nerub"] = true,
--["Coldarra"] = true,
--["The Culling of Stratholme"] = true,
--["Drak'Tharon Keep"] = true,
--["The Eye of Eternity"] = true,
--["Gundrak"] = true,
--["Halls of Lightning"] = true,
--["Halls of Stone"] = true,
--["The Nexus"] = true,
--["The Obsidian Sanctum"] = true,
--["The Oculus"] = true,
--["Ulduar"] = true,
--["Utgarde Keep"] = true,
--["Utgarde Pinnacle"] = true,
--["The Violet Hold"] = true,
--["Wyrmrest Temple"] = true,
 
-- PvP Instances
--["Dalaran Sewers"] = true,
--["The Ring of Valor"] = true,
--["Strand of the Ancients"] = true,
}
elseif GAME_LOCALE == "frFR" then
lib:SetCurrentTranslations {
["Azeroth"] = "Azeroth",
["Eastern Kingdoms"] = "Royaumes de l'est",
["Kalimdor"] = "Kalimdor",
["Northrend"] = "Norfendre",
["Outland"] = "Outreterre",
["Cosmic map"] = "Carte cosmique",
 
869,10 → 790,9
["Silithus"] = "Silithus",
["Silverpine Forest"] = "Forêt des Pins argentés",
["The Stockade"] = "La Prison",
["Stonard"] = "Pierrêche",
--["Stonard"] = "",
["Stonetalon Mountains"] = "Les Serres-Rocheuses",
["Stormwind City"] = "Hurlevent",
["Stormwind"] = "Hurlevent",
["Stranglethorn Vale"] = "Vallée de Strangleronce",
["Stratholme"] = "Stratholme",
["Swamp of Sorrows"] = "Marais des Chagrins",
898,7 → 818,6
["Zul'Gurub"] = "Zul'Gurub",
 
["Champions' Hall"] = "Hall des Champions",
["Hall of Champions"] = "Hall des Champions",
["Blade's Edge Arena"] = "Arène des Tranchantes",
["Nagrand Arena"] = "Arène de Nagrand",
["Ruins of Lordaeron"] = "Ruines de Lordaeron",
956,7 → 875,6
["The Eye"] = "L'Œil",
["Eye of the Storm"] = "L'Œil du cyclone",
["Shattrath City"] = "Shattrath",
["Shattrath"] = "Shattrath",
["Karazhan"] = "Karazhan",
["Caverns of Time"] = "Grottes du temps",
["Old Hillsbrad Foothills"] = "Contreforts de Hautebrande d'antan",
971,66 → 889,24
["Magisters' Terrace"] = "Terrasse des Magistères",
 
-- Blade's Edge Plateau
["Forge Camp: Terror"] = "Camp de forge : Terreur",
["Vortex Pinnacle"] = "Cime du vortex",
["Rivendark's Perch"] = "Perchoir de Clivenuit",
["Ogri'la"] = "Ogri'la",
["Obsidia's Perch"] = "Perchoir d'Obsidia",
["Skyguard Outpost"] = "Avant-poste de la Garde-ciel",
["Shartuul's Transporter"] = "Transporteur de Shartuul",
["Forge Camp: Wrath"] = "Camp de forge : Courroux",
["Bash'ir Landing"] = "Point d'ancrage de Bash'ir",
["Crystal Spine"] = "Éperon de cristal",
["Insidion's Perch"] = "Perchoir d'Insidion",
["Furywing's Perch"] = "Perchoir d'Aile-furie",
 
["Tirisfal"] = "Tirisfal",
["Sunken Temple"] = "Temple englouti",
 
-- WRATH OF THE LICH KING
-- Zones
["Borean Tundra"] = "Toundra Boréenne",
["Crystalsong Forest"] = "Forêt du Chant de cristal",
["Dalaran"] = "Dalaran",
["Dragonblight"] = "Désolation des dragons",
["Grizzly Hills"] = "Les Grisonnes",
["Howling Fjord"] = "Fjord Hurlant",
["Icecrown"] = "La Couronne de glace",
["Sholazar Basin"] = "Bassin de Sholazar",
["The Storm Peaks"] = "Les pics Foudroyés",
["Wintergrasp"] = "Joug-d'hiver",
["Zul'Drak"] = "Zul'Drak",
 
-- Instances (and subzones used for displaying these instances)
["Ahn'kahet: The Old Kingdom"] = "Ahn'kahet : l'Ancien royaume",
["Azjol-Nerub"] = "Azjol-Nérub",
["Coldarra"] = "Frimarra",
["The Culling of Stratholme"] = "L'épuration de Stratholme",
["Drak'Tharon Keep"] = "Donjon de Drak'Tharon",
["The Eye of Eternity"] = "L'Œil d'Eternité",
["Gundrak"] = "Gundrak",
["Halls of Lightning"] = "Les salles de Foudre",
["Halls of Stone"] = "Les salles de Pierre",
["The Nexus"] = "Le Nexus",
["The Obsidian Sanctum"] = "Le sanctum Obsidien",
["The Oculus"] = "L'Oculus",
["Ulduar"] = "Ulduar",
["Utgarde Keep"] = "Donjon d'Utgarde",
["Utgarde Pinnacle"] = "Cime d'Utgarde",
["The Violet Hold"] = "Le Fort pourpre",
["Wyrmrest Temple"] = "Temple du Repos du ver",
 
-- PvP Instances
["Dalaran Sewers"] = "Égouts de Dalaran",
["The Ring of Valor"] = "L'Arène des valeureux",
["Strand of the Ancients"] = "Rivage des anciens",
["Forge Camp: Terror"] = "",
["Vortex Pinnacle"] = "",
["Rivendark's Perch"] = "",
["Ogri'la"] = "",
["Obsidia's Perch"] = "",
["Skyguard Outpost"] = "",
["Shartuul's Transporter"] = "",
["Forge Camp: Wrath"] = "",
["Bash'ir Landing"] = "",
["Crystal Spine"] = "",
["Insidion's Perch"] = "",
["Furywing's Perch"] = "",
}
elseif GAME_LOCALE == "zhCN" then
lib:SetCurrentTranslations {
["Azeroth"] = "艾泽拉斯",
["Eastern Kingdoms"] = "东部王国",
["Kalimdor"] = "卡利姆多",
--["Northrend"] = true,
["Outland"] = "外域",
["Cosmic map"] = "全部地图",
 
1223,51 → 1099,12
 
["Tirisfal"] = "提里斯法林地",--TaxiNodesDBC
["Sunken Temple"] = "沉没的神庙",--AreaTableDBC
 
-- WRATH OF THE LICH KING
-- Zones
--["Borean Tundra"] = true,
--["Crystalsong Forest"] = true,
--["Dalaran"] = true,
--["Dragonblight"] = true,
--["Grizzly Hills"] = true,
--["Howling Fjord"] = true,
--["Icecrown"] = true,
--["Sholazar Basin"] = true,
--["The Storm Peaks"] = true,
--["Wintergrasp"] = true,
--["Zul'Drak"] = true,
 
-- Instances (and subzones used for displaying these instances)
--["Ahn'kahet: The Old Kingdom"] = true,
--["Azjol-Nerub"] = true,
--["Coldarra"] = true,
--["The Culling of Stratholme"] = true,
--["Drak'Tharon Keep"] = true,
--["The Eye of Eternity"] = true,
--["Gundrak"] = true,
--["Halls of Lightning"] = true,
--["Halls of Stone"] = true,
--["The Nexus"] = true,
--["The Obsidian Sanctum"] = true,
--["The Oculus"] = true,
--["Ulduar"] = true,
--["Utgarde Keep"] = true,
--["Utgarde Pinnacle"] = true,
--["The Violet Hold"] = true,
--["Wyrmrest Temple"] = true,
 
-- PvP Instances
--["Dalaran Sewers"] = true,
--["The Ring of Valor"] = true,
--["Strand of the Ancients"] = true,
}
elseif GAME_LOCALE == "zhTW" then
lib:SetCurrentTranslations {
["Azeroth"] = "艾澤拉斯",
["Eastern Kingdoms"] = "東部王國",
["Kalimdor"] = "卡林多",
--["Northrend"] = true,
["Outland"] = "外域",
["Cosmic map"] = "宇宙地圖",
 
1346,7 → 1183,6
["Stonard"] = "斯通納德",
["Stonetalon Mountains"] = "石爪山脈",
["Stormwind City"] = "暴風城",
--["Stormwind"] = true,
["Stranglethorn Vale"] = "荊棘谷",
["Stratholme"] = "斯坦索姆",
["Swamp of Sorrows"] = "悲傷沼澤",
1372,7 → 1208,6
["Zul'Gurub"] = "祖爾格拉布",
 
["Champions' Hall"] = "勇士大廳",
--["Hall of Champions"] = true,
["Blade's Edge Arena"] = "劍刃競技場",
["Nagrand Arena"] = "納葛蘭競技場",
["Ruins of Lordaeron"] = "羅德隆廢墟",
1430,7 → 1265,6
["The Eye"] = "風暴要塞",
["Eye of the Storm"] = "暴風之眼",
["Shattrath City"] = "撒塔斯城",
--["Shattrath"] = true,
["Karazhan"] = "卡拉贊",
["Caverns of Time"] = "時光之穴",
["Old Hillsbrad Foothills"] = "希爾斯布萊德丘陵舊址",
1460,51 → 1294,12
 
["Tirisfal"] = "提里斯法林地",
["Sunken Temple"] = "沉沒的神廟",
 
-- WRATH OF THE LICH KING
-- Zones
--["Borean Tundra"] = true,
--["Crystalsong Forest"] = true,
--["Dalaran"] = true,
--["Dragonblight"] = true,
--["Grizzly Hills"] = true,
--["Howling Fjord"] = true,
--["Icecrown"] = true,
--["Sholazar Basin"] = true,
--["The Storm Peaks"] = true,
--["Wintergrasp"] = true,
--["Zul'Drak"] = true,
 
-- Instances (and subzones used for displaying these instances)
--["Ahn'kahet: The Old Kingdom"] = true,
--["Azjol-Nerub"] = true,
--["Coldarra"] = true,
--["The Culling of Stratholme"] = true,
--["Drak'Tharon Keep"] = true,
--["The Eye of Eternity"] = true,
--["Gundrak"] = true,
--["Halls of Lightning"] = true,
--["Halls of Stone"] = true,
--["The Nexus"] = true,
--["The Obsidian Sanctum"] = true,
--["The Oculus"] = true,
--["Ulduar"] = true,
--["Utgarde Keep"] = true,
--["Utgarde Pinnacle"] = true,
--["The Violet Hold"] = true,
--["Wyrmrest Temple"] = true,
 
-- PvP Instances
--["Dalaran Sewers"] = true,
--["The Ring of Valor"] = true,
--["Strand of the Ancients"] = true,
}
elseif GAME_LOCALE == "koKR" then
lib:SetCurrentTranslations {
["Azeroth"] = "아제로스",
["Eastern Kingdoms"] = "동부 왕국",
["Kalimdor"] = "칼림도어",
["Northrend"] = "노스랜드",
["Outland"] = "아웃랜드",
["Cosmic map"] = "세계 지도",
 
1583,7 → 1378,6
["Stonard"] = "스토나드",
["Stonetalon Mountains"] = "돌발톱 산맥",
["Stormwind City"] = "스톰윈드",
["Stormwind"] = "스톰윈드",
["Stranglethorn Vale"] = "가시덤불 골짜기",
["Stratholme"] = "스트라솔름",
["Swamp of Sorrows"] = "슬픔의 늪",
1609,7 → 1403,6
["Zul'Gurub"] = "줄구룹",
 
["Champions' Hall"] = "용사의 전당",
["Hall of Champions"] = "용사의 전당",
["Blade's Edge Arena"] = "칼날 투기장",
["Nagrand Arena"] = "나그란드 투기장",
["Ruins of Lordaeron"] = "로데론의 폐허",
1667,7 → 1460,6
["The Eye"] = "눈", -- check
["Eye of the Storm"] = "폭풍의 눈",
["Shattrath City"] = "샤트라스",
["Shattrath"] = "샤트라스",
["Karazhan"] = "카라잔",
["Caverns of Time"] = "시간의 동굴",
["Old Hillsbrad Foothills"] = "옛 힐스브래드 구릉지",
1694,54 → 1486,12
["Crystal Spine"] = "수정 돌기",
["Insidion's Perch"] = "인시디온의 둥지",
["Furywing's Perch"] = "퓨리윙의 둥지",
 
["Tirisfal"] = "티리스팔",
["Sunken Temple"] = "가라앉은 사원",
 
-- WRATH OF THE LICH KING
-- Zones
["Borean Tundra"] = "북풍의 땅",
["Crystalsong Forest"] = "수정노래 숲",
["Dalaran"] = "달라란",
["Dragonblight"] = "용의 안식처",
["Grizzly Hills"] = "회색 구릉지",
["Howling Fjord"] = "울부짖는 협만",
["Icecrown"] = "얼음왕관",
["Sholazar Basin"] = "숄라자르 분지",
["The Storm Peaks"] = "폭풍우 봉우리",
["Wintergrasp"] = "겨울손아귀",
["Zul'Drak"] = "줄드락",
 
-- Instances (and subzones used for displaying these instances)
--["Ahn'kahet: The Old Kingdom"] = true,
["Azjol-Nerub"] = "아졸네룹",
--["Coldarra"] = true,
--["The Culling of Stratholme"] = true,
["Drak'Tharon Keep"] = "드랙타론 요새",
--["The Eye of Eternity"] = true,
["Gundrak"] = "군드락",
["Halls of Lightning"] = "전격의 전당", -- check
["Halls of Stone"] = "돌의 전당",
["The Nexus"] = "마력의 탑",
--["The Obsidian Sanctum"] = true,
["The Oculus"] = "마력의 눈",
["Ulduar"] = "울두아",
["Utgarde Keep"] = "우트가르드 성채",
["Utgarde Pinnacle"] = "우트가르드 첨탑",
--["The Violet Hold"] = true,
--["Wyrmrest Temple"] = true,
 
-- PvP Instances
--["Dalaran Sewers"] = true,
--["The Ring of Valor"] = true,
--["Strand of the Ancients"] = true,
}
elseif GAME_LOCALE == "esES" then
lib:SetCurrentTranslations {
["Azeroth"] = "Azeroth",
["Eastern Kingdoms"] = "Reinos del Este",
["Kalimdor"] = "Kalimdor",
--["Northrend"] = true,
["Outland"] = "Terrallende",
["Cosmic map"] = "Mapa cósmico",
 
1934,51 → 1684,12
 
["Tirisfal"] = "Tirisfal",
["Sunken Temple"] = "El Templo de Sunken",
 
-- WRATH OF THE LICH KING
-- Zones
--["Borean Tundra"] = true,
--["Crystalsong Forest"] = true,
--["Dalaran"] = true,
--["Dragonblight"] = true,
--["Grizzly Hills"] = true,
--["Howling Fjord"] = true,
--["Icecrown"] = true,
--["Sholazar Basin"] = true,
--["The Storm Peaks"] = true,
--["Wintergrasp"] = true,
--["Zul'Drak"] = true,
 
-- Instances (and subzones used for displaying these instances)
--["Ahn'kahet: The Old Kingdom"] = true,
--["Azjol-Nerub"] = true,
--["Coldarra"] = true,
--["The Culling of Stratholme"] = true,
--["Drak'Tharon Keep"] = true,
--["The Eye of Eternity"] = true,
--["Gundrak"] = true,
--["Halls of Lightning"] = true,
--["Halls of Stone"] = true,
--["The Nexus"] = true,
--["The Obsidian Sanctum"] = true,
--["The Oculus"] = true,
--["Ulduar"] = true,
--["Utgarde Keep"] = true,
--["Utgarde Pinnacle"] = true,
--["The Violet Hold"] = true,
--["Wyrmrest Temple"] = true,
 
-- PvP Instances
--["Dalaran Sewers"] = true,
--["The Ring of Valor"] = true,
--["Strand of the Ancients"] = true,
}
elseif GAME_LOCALE == "esMX" then
lib:SetCurrentTranslations {
["Azeroth"] = "Azeroth",
["Eastern Kingdoms"] = "Reinos del Este",
["Kalimdor"] = "Kalimdor",
--["Northrend"] = true,
["Outland"] = "Terrallende",
["Cosmic map"] = "Mapa cósmico",
 
2171,51 → 1882,12
 
["Tirisfal"] = "Tirisfal",
["Sunken Temple"] = "El Templo de Sunken",
 
-- WRATH OF THE LICH KING
-- Zones
--["Borean Tundra"] = true,
--["Crystalsong Forest"] = true,
--["Dalaran"] = true,
--["Dragonblight"] = true,
--["Grizzly Hills"] = true,
--["Howling Fjord"] = true,
--["Icecrown"] = true,
--["Sholazar Basin"] = true,
--["The Storm Peaks"] = true,
--["Wintergrasp"] = true,
--["Zul'Drak"] = true,
 
-- Instances (and subzones used for displaying these instances)
--["Ahn'kahet: The Old Kingdom"] = true,
--["Azjol-Nerub"] = true,
--["Coldarra"] = true,
--["The Culling of Stratholme"] = true,
--["Drak'Tharon Keep"] = true,
--["The Eye of Eternity"] = true,
--["Gundrak"] = true,
--["Halls of Lightning"] = true,
--["Halls of Stone"] = true,
--["The Nexus"] = true,
--["The Obsidian Sanctum"] = true,
--["The Oculus"] = true,
--["Ulduar"] = true,
--["Utgarde Keep"] = true,
--["Utgarde Pinnacle"] = true,
--["The Violet Hold"] = true,
--["Wyrmrest Temple"] = true,
 
-- PvP Instances
--["Dalaran Sewers"] = true,
--["The Ring of Valor"] = true,
--["Strand of the Ancients"] = true,
}
elseif GAME_LOCALE == "ruRU" then
lib:SetCurrentTranslations {
["Azeroth"] = "Азерот",
["Eastern Kingdoms"] = "Восточные королевства",
["Kalimdor"] = "Калимдор",
--["Northrend"] = true,
["Outland"] = "Запределье",
["Cosmic map"] = "Карта Вселенной",
 
2269,7 → 1941,7
["Hyjal Summit"] = "Вершина Хиджала",
["Ironforge"] = "Стальгорн",
["Loch Modan"] = "Лок Модан",
["Lower Blackrock Spire"] = "Нижний ярус Черной горы",
["Lower Blackrock Spire"] = "Нижний Ярус Черной горы",
["Maraudon"] = "Мародон",
["Menethil Harbor"] = "Гавань Менетил",
["Molten Core"] = "Огненные Недра",
2300,7 → 1972,7
["Swamp of Sorrows"] = "Болото Печали",
["Tanaris"] = "Танарис",
["Teldrassil"] = "Тельдрассил",
["Temple of Ahn'Qiraj"] = "Храм Ан'Кираж",
["Temple of Ahn'Qiraj"] = "Ан'Кираж",
["The Temple of Atal'Hakkar"] = "Храм Атал'Хаккара",
["Theramore Isle"] = "Остров Терамор",
["Thousand Needles"] = "Тысяча Игл",
2309,7 → 1981,7
["Uldaman"] = "Ульдаман",
["Un'Goro Crater"] = "Кратер Ун'Горо",
["Undercity"] = "Подгород",
["Upper Blackrock Spire"] = "Верхний ярус Черной горы",
["Upper Blackrock Spire"] = "Верхний Ярус Черной горы",
["Wailing Caverns"] = "Пещеры Стенаний",
["Warsong Gulch"] = "Ущелье Песни Войны",
["Western Plaguelands"] = "Западное Лихоземье",
2408,46 → 2080,7
 
["Tirisfal"] = "Тирисфальские леса",
["Sunken Temple"] = "Затонувший храм",
 
-- WRATH OF THE LICH KING
-- Zones
--["Borean Tundra"] = true,
--["Crystalsong Forest"] = true,
--["Dalaran"] = true,
--["Dragonblight"] = true,
--["Grizzly Hills"] = true,
--["Howling Fjord"] = true,
--["Icecrown"] = true,
--["Sholazar Basin"] = true,
--["The Storm Peaks"] = true,
--["Wintergrasp"] = true,
--["Zul'Drak"] = true,
 
-- Instances (and subzones used for displaying these instances)
--["Ahn'kahet: The Old Kingdom"] = true,
--["Azjol-Nerub"] = true,
--["Coldarra"] = true,
--["The Culling of Stratholme"] = true,
--["Drak'Tharon Keep"] = true,
--["The Eye of Eternity"] = true,
--["Gundrak"] = true,
--["Halls of Lightning"] = true,
--["Halls of Stone"] = true,
--["The Nexus"] = true,
--["The Obsidian Sanctum"] = true,
--["The Oculus"] = true,
--["Ulduar"] = true,
--["Utgarde Keep"] = true,
--["Utgarde Pinnacle"] = true,
--["The Violet Hold"] = true,
--["Wyrmrest Temple"] = true,
 
-- PvP Instances
--["Dalaran Sewers"] = true,
--["The Ring of Valor"] = true,
--["Strand of the Ancients"] = true,
}
else
error(("%s: Locale %q not supported"):format(MAJOR_VERSION, GAME_LOCALE))
end
 
trunk/MorgDKP/MorgDKP-enUS.lua
248,7 → 248,7
twinks = "Add Twink",
twinksdesc = "Add a player to this raid who is on an alt with DKP under a main. The mod will remember this.\n Format: <alt> <main>",
updatedkp = "Updating DKP Points..",
updatemorgbid = "Please update your MorgBid. http://www3.telus.net/MorgDKP/MorgBid3.7.exe or check in the vent chat window. Thank-you:)",
updatemorgbid = "Please update your MorgBid. http://www3.telus.net/MorgDKP/MorgBid3.6.exe or check in the vent chat window. Thank-you:)",
validname = "You must enter a valid name.",
valuehint = "|c000070ddMousewheel up/Click|r - Increase value.\n|c000070ddMousewheel down/R-Click|r - decrease value.\n|c000070ddSHIFT|r - change value by +/-1\n|c000070ddALT|r - change value by +/-20",
waitlist = "Waitlist",
trunk/MorgDKP/BidQuery.lua
97,7 → 97,7
local hint = L["Bar_Hint_Version"]
local id = nil
self.querytooltips[item] = t
qso = { [3.7] = 1, [3.6] = 2, [3.5] = 3, [3.4] = 4, [3.3] = 5, [3.2] = 6, [2.9] = 7, [2.8] = 8, [2.6] = 9, [2.5] = 10, ["NONE"] = 11}
qso = { [3.6] = 1, [3.5] = 2, [3.4] = 3, [3.3] = 4, [3.2] = 5, [3.1] = 6, [2.9] = 7, [2.8] = 8, [2.6] = 9, [2.5] = 10, ["NONE"] = 11}
self:CreateQueryTooltip(id, item, title, hint)
end