Skip to content

Commit cb4b564

Browse files
authored
Merge pull request #72 from Puresyn/development
Development
2 parents 74071c0 + 0ec6d8c commit cb4b564

30 files changed

+800
-314
lines changed

Assets/Images/MDT-D.tga

4.73 KB
Binary file not shown.

Assets/Images/MDT-N.tga

4.73 KB
Binary file not shown.
50.5 KB
Binary file not shown.
5.68 KB
Binary file not shown.

Core/Localization/Languages.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<!--<Script file='Core\Localization\Localization.esES.lua'/>
77
<Script file='Core\Localization\Localization.esMX.lua'/> -->
88
<Script file='Core\Localization\Localization.itIT.lua'/>
9-
<Script file='Core\Localization\Localization.ruRU.lua'/>
9+
<!--<Script file='Core\Localization\Localization.ruRU.lua'/> -->
1010
<Script file='Core\Localization\Localization.zhTW.lua'/>
1111
<Script file='Core\Localization\Localization.koKR.lua'/>
12-
<Script file='Core\Localization\Localization.zhCN.lua'/>
12+
<!--<Script file='Core\Localization\Localization.zhCN.lua'/> -->
1313
</Ui>

Core/Localization/Localization.deDE.lua

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "Wertungsrechner", text = "Berechne
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "Gib die Schlüsselsteinstufe ein", text = "Gib eine Schlüsselsteinstufe ein, um eine Abschätzung" }
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "Basiswertungssteigerung", text = "der Basiswertungssteigerung zu sehen." }
133133
L.PLAYERFRAME["Characters"] = "Charaktere"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "Instanzwerkzeuge", text = "Verschiedene Werkzeuge für diese Instanz."}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "Keinen Schlüsselstein gefunden", text = "Keinen Schlüsselstein gefunden" }

Core/Localization/Localization.enUS.lua

+4-3
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ L.MAPNAMES[404] = { name = "Neltharus", abbr = "NELT" }
4040
L.MAPNAMES[405] = { name = "Brackenhide Hollow", abbr = "BH" }
4141
L.MAPNAMES[406] = { name = "Halls of Infusion", abbr = "HOI" }
4242
--TWW S1
43-
L.MAPNAMES[503] = { name = "Ara-Kara, City of Echoes", abbr = "CE" }
44-
L.MAPNAMES[502] = { name = "City of Threads", abbr = "CT" }
43+
L.MAPNAMES[503] = { name = "Ara-Kara, City of Echoes", abbr = "CoE" }
44+
L.MAPNAMES[502] = { name = "City of Threads", abbr = "CoT" }
4545
L.MAPNAMES[505] = { name = "The Dawnbreaker", abbr = "DB" }
4646
L.MAPNAMES[501] = { name = "The Stonevault", abbr = "SV" }
47-
L.MAPNAMES[353] = { name = "Siege of Boralus", abbr = "SB" }
47+
L.MAPNAMES[353] = { name = "Siege of Boralus", abbr = "SoB" }
4848
L.MAPNAMES[507] = { name = "The Grim Batol", abbr = "GB" }
4949
L.MAPNAMES[375] = { name = "Mists of Tirna Scithe", abbr = "MTS" }
5050
L.MAPNAMES[376] = { name = "The Necrotic Wake", abbr = "NW" }
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "Rating Calculator", text = "Calcul
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "Enter Key Level", text = "Enter a key level to see"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "Base Rating Gain", text = "your base rating gain prediction."}
133133
L.PLAYERFRAME["Characters"] = "Characters"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "Dungeon Tools", text = "Various tools related to this dungeon."}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "NoKeyFound", text = "No Key Found"}

Core/Localization/Localization.frFR.lua

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "Calcul de cote", text = "Calculer
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "Entrez niveau de clé", text = "Entrez un niveau de clé pour voir"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "Base du gain de cote", text = "la prédiction de la base du gain de cote."}
133133
L.PLAYERFRAME["Characters"] = "Personnages"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "Outils de donjon", text = "Divers outils pour ce donjon."}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "Aucune clé trouvée", text = "Aucune clé trouvée"}

Core/Localization/Localization.itIT.lua

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "Calcolatore della valutazione", te
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "Livello chiave", text = "Inserisci un livello chiave per vedere"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "Guadagno base di punteggio", text = "la previsione del guadagno base di punteggio."}
133133
L.PLAYERFRAME["Characters"] = "Characters"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "Strumenti Spedizione", text = "Vari strumenti relativi a questa spedizione."}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "Nessuna chiave trovata", text = "Nessuna chiave trovata"}

Core/Localization/Localization.koKR.lua

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "점수 계산기", text = "추가
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "쐐기돌 레벨 입력", text = "쐐기돌 레벨을 입력해서 보기"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "기본 획득 점수", text = "기본 획득 점수를 예상합니다."}
133133
L.PLAYERFRAME["Characters"] = "캐릭터"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "던전 도구", text = "이 던전과 관련된 다양한 기능 제공"}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "쐐기돌을 찾을 수 없음", text = "쐐기돌을 찾을 수 없음"}

Core/Localization/Localization.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ elseif (langPref == "deDE") then
4646
elseif (langPref == "itIT") then
4747
-- Localization.itIT.lua
4848
KeyMasterLocals = KM_Localization_itIT
49-
elseif (langPref == "ruRU") then
49+
--[[ elseif (langPref == "ruRU") then
5050
-- Localization.ruRU.lua
5151
KeyMasterLocals = KM_Localization_ruRU
52-
--[[ elseif (langPref == "esES") then
52+
elseif (langPref == "esES") then
5353
-- Localization.esES.lua
5454
KeyMasterLocals = KM_Localization_esES
5555
elseif (langPref == "esMX") then
@@ -65,7 +65,7 @@ elseif (langPref == "koKR") then
6565
-- Localization.koKR.lua
6666
KeyMasterLocals = KM_Localization_koKR
6767
elseif (langPref == "zhCN") then
68-
-- Localization.koKR.lua
68+
-- Localization.zhCN.lua
6969
KeyMasterLocals = KM_Localization_zhCN
7070
else -- Default
7171
-- Localization.enUS.lua

Core/Localization/Localization.ptBR.lua

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "Calculadora", text = "Calcula o ga
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "Nível-chave", text = "Insira o nível da chave para ver"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "Ganho base de pontuação", text = "previsão base de ganho de pontuação."}
133133
L.PLAYERFRAME["Characters"] = "Personagens"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "Ferramentas de Masmorra", text = "Várias ferramentas relacionadas à essa masmorra"}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "Chave não encontrada", text = "Chave não encontrada"}

Core/Localization/Localization.zhCN.lua

+18-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ KM_Localization_zhCN = {}
22
local L = KM_Localization_zhCN
33

44
-- Localization file for "zhCN": 简体中文
5-
-- Translated by: 姜铁憨
5+
-- Translated by: 姜铁憨, gjfLeo
66

77
--[[Notes for Translators: In many locations throughout Key Master, line space is limited. This can cause
88
overlapping or strange text display. Where possible, try to keep the overall length of the string comparable or shorter
@@ -40,14 +40,14 @@ L.MAPNAMES[404] = { name = "Neltharus", abbr = "奈萨" }
4040
L.MAPNAMES[405] = { name = "Brackenhide Hollow", abbr = "蕨皮" }
4141
L.MAPNAMES[406] = { name = "Halls of Infusion", abbr = "注能" }
4242
--TWW S1
43-
L.MAPNAMES[503] = { name = "Ara-Kara, City of Echoes", abbr = "CE" }
44-
L.MAPNAMES[502] = { name = "City of Threads", abbr = "CT" }
45-
L.MAPNAMES[505] = { name = "The Dawnbreaker", abbr = "DB" }
46-
L.MAPNAMES[501] = { name = "The Stonevault", abbr = "SV" }
47-
L.MAPNAMES[353] = { name = "Siege of Boralus", abbr = "SB" }
48-
L.MAPNAMES[507] = { name = "The Grim Batol", abbr = "GB" }
49-
L.MAPNAMES[375] = { name = "Mists of Tirna Scithe", abbr = "MTS" }
50-
L.MAPNAMES[376] = { name = "The Necrotic Wake", abbr = "NW" }
43+
L.MAPNAMES[503] = { name = "Ara-Kara, City of Echoes", abbr = "回响" }
44+
L.MAPNAMES[502] = { name = "City of Threads", abbr = "千丝" }
45+
L.MAPNAMES[505] = { name = "The Dawnbreaker", abbr = "破晨" }
46+
L.MAPNAMES[501] = { name = "The Stonevault", abbr = "矶石" }
47+
L.MAPNAMES[353] = { name = "Siege of Boralus", abbr = "围攻" }
48+
L.MAPNAMES[507] = { name = "The Grim Batol", abbr = "格瑞" }
49+
L.MAPNAMES[375] = { name = "Mists of Tirna Scithe", abbr = "仙林" }
50+
L.MAPNAMES[376] = { name = "The Necrotic Wake", abbr = "通灵" }
5151

5252
L.XPAC = {}
5353
L.XPAC[0] = { enum = "LE_EXPANSION_CLASSIC", desc = "经典旧世" }
@@ -57,9 +57,9 @@ L.XPAC[3] = { enum = "LE_EXPANSION_CATACLYSM", desc = "大地的裂变" }
5757
L.XPAC[4] = { enum = "LE_EXPANSION_MISTS_OF_PANDARIA", desc = "熊猫人之谜" }
5858
L.XPAC[5] = { enum = "LE_EXPANSION_WARLORDS_OF_DRAENOR", desc = "德拉诺之王" }
5959
L.XPAC[6] = { enum = "LE_EXPANSION_LEGION", desc = "军团再临" }
60-
L.XPAC[7] = { enum = "LE_EXPANSION_BATTLE_FOR_AZEROTH", desc = "决战艾泽拉斯" }
61-
L.XPAC[8] = { enum = "LE_EXPANSION_SHADOWLANDS", desc = "暗影之境" }
62-
L.XPAC[9] = { enum = "LE_EXPANSION_DRAGONFLIGHT", desc = "巨龙崛起" }
60+
L.XPAC[7] = { enum = "LE_EXPANSION_BATTLE_FOR_AZEROTH", desc = "争霸艾泽拉斯" }
61+
L.XPAC[8] = { enum = "LE_EXPANSION_SHADOWLANDS", desc = "暗影国度" }
62+
L.XPAC[9] = { enum = "LE_EXPANSION_DRAGONFLIGHT", desc = "巨龙时代" }
6363
L.XPAC[10] = { enum = "LE_EXPANSION_WAR_WITHIN", desc = "地心之战" }
6464

6565
L.MPLUSSEASON = {}
@@ -79,7 +79,7 @@ L.CLICKDRAG = "点击 + 拖动"
7979
L.TOOPEN = "来开启"
8080
L.TOREPOSITION = "来移动位置"
8181
L.EXCLIMATIONPOINT = "!"
82-
L.THISWEEKSAFFIXES = "本周..."
82+
L.THISWEEKSAFFIXES = "本周词缀"
8383
L.YOURRATING = "你的分数"
8484
L.ERRORMESSAGES = "错误提示为"
8585
L.ERRORMESSAGESNOTIFY = "通知:错误提示已启用。"
@@ -124,13 +124,14 @@ L.PARTYFRAME["NoKey"] = { name = "无钥石", text = "无钥石"}
124124
L.PARTYFRAME["NoPartyInfo"] = { text = "在匹配队伍时队伍成员信息不可用。(如地下城查找器, 团队副本查找器,等等。)" }
125125

126126
L.PLAYERFRAME = {}
127-
L.PLAYERFRAME["KeyLevel"] = { name = "钥石层数", text = "用于计算的钥石层数"}
127+
L.PLAYERFRAME["KeyLevel"] = { name = "钥石等级", text = "用于计算的钥石等级"}
128128
L.PLAYERFRAME["Gain"] = { name = "收益", text = "潜在的分数收益。"}
129129
L.PLAYERFRAME["New"] = { name = "", text = "完成此钥石+1后你的分数。"}
130130
L.PLAYERFRAME["RatingCalculator"] = { name = "分数计算器", text = "计算潜在的分数收益。"}
131-
L.PLAYERFRAME["EnterKeyLevel"] = { name = "输入钥石层数", text = "输入一个钥石层数来查看"}
131+
L.PLAYERFRAME["EnterKeyLevel"] = { name = "输入钥石等级", text = "输入一个钥石等级来查看"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "基本分数收益", text = "你的基础分数收益预测。"}
133133
L.PLAYERFRAME["Characters"] = "角色"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "Dungeon Tools", text = "Various tools related to this dungeon."}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "未找到钥石", text = "未找到钥石"}
@@ -154,7 +155,7 @@ L.CONFIGURATIONFRAME["CharacterSettings"] = { name="角色列表过滤", text =
154155
L.CONFIGURATIONFRAME["FilterByServer"] = { name = "当前服务器", text = "只显示当前服务器。" }
155156
L.CONFIGURATIONFRAME["FilterByNoRating"] = { name = "无分数", text = "只显示有分数的角色。" }
156157
L.CONFIGURATIONFRAME["FilterByNoKey"] = { name = "无钥石", text = "只显示有钥石的角色。" }
157-
L.CONFIGURATIONFRAME["FilterByMaxLvl"] = { name = "Max Only", text = "Only show maximum level characters." }
158+
L.CONFIGURATIONFRAME["FilterByMaxLvl"] = { name = "满级", text = "只显示达到最高等级的角色。" }
158159
L.CONFIGURATIONFRAME["Purge"] = { present = "清空", past = "已清空" }
159160

160161
L.ABOUTFRAME = {}
@@ -166,4 +167,4 @@ L.ABOUTFRAME["Translators"] = { text = "译者" }
166167
L.ABOUTFRAME["WhatsNew"] = { text = "显示更新内容"}
167168

168169
L.SYSTEMMESSAGE = {}
169-
L.SYSTEMMESSAGE["NOTICE"] = { text = "Notice: This seasons rating calculations are still being verified."}
170+
L.SYSTEMMESSAGE["NOTICE"] = { text = "注意:本赛季的分数计算仍在验证中。"}

Core/Localization/Localization.zhTW.lua

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "評分計算", text = "計算潛
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "輸入鑰石層數", text = "輸入一個鑰石層數來觀看"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "基礎評分收益", text = "你的基礎評分收益預測。"}
133133
L.PLAYERFRAME["Characters"] = "角色"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "地下城工具", text = "與此地下城相關的各種工具。"}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "未找到鑰石", text = "未找到鑰石"}

Core/Localization/Localization.ruRU.lua Core/PendingLocalizations/Localization.ruRU.lua

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ L.PLAYERFRAME["RatingCalculator"] = { name = "Калькулятор", text = "
131131
L.PLAYERFRAME["EnterKeyLevel"] = { name = "Введите уровень ключа", text = "Введите уровень ключа, чтобы увидеть"}
132132
L.PLAYERFRAME["YourBaseRating"] = { name = "Базовый прирост рейтинга", text = "Ваш базовый прирост рейтинга"}
133133
L.PLAYERFRAME["Characters"] = "Персонажи"
134+
L.PLAYERFRAME["DungeonTools"] = { name = "Dungeon Tools", text = "Various tools related to this dungeon."}
134135

135136
L.CHARACTERINFO = {}
136137
L.CHARACTERINFO["NoKeyFound"] = { name = "Ключ не найден", text = "Ключ не найден"}

Core/UI/CharactersFrame.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,10 @@ end
8787
local function toggleActiveCharacterRow(guid, setActive)
8888
local characterRow = _G["KM_CharacterRow_"..guid]
8989
if not characterRow then
90-
if KeyMaster_C_DB[guid] then
90+
-- removed in 1.3.5 as it only displayed when logging onto sub max level character and clicking a max character for the first time...
91+
--[[ if KeyMaster_C_DB[guid] then
9192
KeyMaster:_ErrorMsg("toggleActiveCharacterRow","CharactersFrame", "Character row not found.")
92-
end
93+
end ]]
9394
return
9495
end
9596
local characterSelectFrame = _G["KM_CharacterSelectFrame"]

0 commit comments

Comments
 (0)