From 5f341ae1e1f9be5fdf791540cf51354492cc3d0e Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 20 Aug 2022 10:43:04 -0700
Subject: [PATCH] Fix translate dump of mgdb/encdb/pkmdb

EntityInstructionBuilder ctor triggers pkm fetch, which is a null ref on translate dump
Since there's nothing to translate in this user control, just translate before ctor.
---
 PKHeX.WinForms/Resources/text/lang_de.txt    | 6 ++++--
 PKHeX.WinForms/Resources/text/lang_en.txt    | 6 ++++--
 PKHeX.WinForms/Resources/text/lang_es.txt    | 6 ++++--
 PKHeX.WinForms/Resources/text/lang_fr.txt    | 6 ++++--
 PKHeX.WinForms/Resources/text/lang_it.txt    | 6 ++++--
 PKHeX.WinForms/Resources/text/lang_ja.txt    | 6 ++++--
 PKHeX.WinForms/Resources/text/lang_ko.txt    | 6 ++++--
 PKHeX.WinForms/Resources/text/lang_zh.txt    | 6 ++++--
 PKHeX.WinForms/Subforms/SAV_Database.cs      | 3 +--
 PKHeX.WinForms/Subforms/SAV_Encounters.cs    | 3 +--
 PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs | 3 +--
 11 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt
index 6447dabbf..2e48ddc0f 100644
--- a/PKHeX.WinForms/Resources/text/lang_de.txt
+++ b/PKHeX.WinForms/Resources/text/lang_de.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=Änderungen
 About.Tab_Shortcuts=Shortcuts
 BatchEditor.B_Add=Hinzufügen
 BatchEditor.B_Go=Ausführen
-BatchEditor.L_PropType=EigenschaftTyp
-BatchEditor.L_PropValue=EigenschaftWert
 BatchEditor.RB_Boxes=Boxen
 BatchEditor.RB_Party=Team
 BatchEditor.RB_Path=Ordner...
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=Statuswesen auf Wesen beim Import anwenden
 LocalizedDescription.AutoLoadSaveOnStartup=Spielstand beim Programmstart automatisch erkennen
 LocalizedDescription.BAKEnabled=Automatische Spielstand Backups aktiviert
 LocalizedDescription.BAKPrompt=Wurde das "Backup erstellen" Pop-Up bereits vom Benutzer gesehen?
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=Überprüft Spitznamen und Trainer Namen nach anstößigen Wörtern. Hierfür wird die interne Liste des Nintendo 3DS verwendet.
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Versteckt nicht erhältliche Pokémon, wenn diese nicht in den Spielstand importiert werden können.
 LocalizedDescription.FlagIllegal=Illegale Pokémon in den Boxen markieren
 LocalizedDescription.ForceHaXOnLaunch=HaX Modus beim Programmstart erzwingen
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Deckkraft des Hintergrunds d
 LocalizedDescription.ShowEncounterOpacityStripe=Deckkraft der Begegnungs Typen Streifen Schicht.
 LocalizedDescription.ShowEncounterThicknessStripe=Anzahl der Pixel des farbigen Streifens der Begegnungs Typen.
 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Choice for which sprite building mode to use.
 LocalizedDescription.TryDetectRecentSave=Finde automatisch den zuletzt geöffneten Spielstand beim Öffnen einer neuen Datei.
 LocalizedDescription.Unicode=Unicode
@@ -540,6 +541,7 @@ SAV_Encounters.L_Move2=Attacke 2:
 SAV_Encounters.L_Move3=Attacke 3:
 SAV_Encounters.L_Move4=Attacke 4:
 SAV_Encounters.L_Version=OT Version:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=Spezies:
 SAV_Encounters.Menu_Close=Datei
 SAV_Encounters.Menu_Exit=&Schließen
diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt
index 1ec2aa3a4..4facfac6c 100644
--- a/PKHeX.WinForms/Resources/text/lang_en.txt
+++ b/PKHeX.WinForms/Resources/text/lang_en.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=Changelog
 About.Tab_Shortcuts=Shortcuts
 BatchEditor.B_Add=Add
 BatchEditor.B_Go=Run
-BatchEditor.L_PropType=PropertyType
-BatchEditor.L_PropValue=PropertyValue
 BatchEditor.RB_Boxes=Boxes
 BatchEditor.RB_Party=Party
 BatchEditor.RB_Path=Folder...
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=Apply StatNature to Nature on Import
 LocalizedDescription.AutoLoadSaveOnStartup=Automatically Detect Save File on Program Startup
 LocalizedDescription.BAKEnabled=Automatic Save File Backups Enabled
 LocalizedDescription.BAKPrompt=Tracks if the "Create Backup" prompt has been issued to the user.
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=Checks player given Nicknames and Trainer Names for profanity. Bad words will be flagged using the 3DS console's regex lists.
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them.
 LocalizedDescription.FlagIllegal=Flag Illegal Slots in Save File
 LocalizedDescription.ForceHaXOnLaunch=Force HaX mode on Program Launch
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty
 LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer.
 LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe.
 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Choice for which sprite building mode to use.
 LocalizedDescription.TryDetectRecentSave=Automatically locates the most recently saved Save File when opening a new file.
 LocalizedDescription.Unicode=Unicode
@@ -536,6 +537,7 @@ SAV_Encounters.L_Move2=Move 2:
 SAV_Encounters.L_Move3=Move 3:
 SAV_Encounters.L_Move4=Move 4:
 SAV_Encounters.L_Version=OT Version:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=Species:
 SAV_Encounters.Menu_Close=File
 SAV_Encounters.Menu_Exit=&Close
diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt
index 29a8cb326..e2ab45f2e 100644
--- a/PKHeX.WinForms/Resources/text/lang_es.txt
+++ b/PKHeX.WinForms/Resources/text/lang_es.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=Registro de cambios
 About.Tab_Shortcuts=Accesos directos
 BatchEditor.B_Add=Añadir
 BatchEditor.B_Go=Ejecutar
-BatchEditor.L_PropType=PropertyType
-BatchEditor.L_PropValue=PropertyValue
 BatchEditor.RB_Boxes=Cajas
 BatchEditor.RB_Party=Equipo
 BatchEditor.RB_Path=Carpeta...
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=Aplicar StatNature a la naturaleza al importar
 LocalizedDescription.AutoLoadSaveOnStartup=Detectar automáticamente el archivo de guardado al iniciar el programa
 LocalizedDescription.BAKEnabled=Respaldo Automático de archivos de guardado habilitado
 LocalizedDescription.BAKPrompt=Realiza un seguimiento si el usuario recibe el mensaje "Crear copia de seguridad".
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=Chequear los Motes y los Nombres de Entrenador por profanidad. Las palabras prohibidas serán detectadas utilizando la lista de la consola 3DS.
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Ocultar Especie no disponible si la partida cargada no puede importarla.
 LocalizedDescription.FlagIllegal=Detectar ilegal
 LocalizedDescription.ForceHaXOnLaunch=Forzar el modo HaX al Inicio de Programa
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty
 LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer.
 LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe.
 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Choice for which sprite building mode to use.
 LocalizedDescription.TryDetectRecentSave=Localiza automáticamente el archivo de guardado más reciente al abrir un nuevo archivo.
 LocalizedDescription.Unicode=Unicode
@@ -536,6 +537,7 @@ SAV_Encounters.L_Move2=Mov. 2:
 SAV_Encounters.L_Move3=Mov. 3:
 SAV_Encounters.L_Move4=Mov. 4:
 SAV_Encounters.L_Version=Version del EO:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=Especie:
 SAV_Encounters.Menu_Close=Archivo
 SAV_Encounters.Menu_Exit=Cerrar
diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt
index 777248a06..94eb0127b 100644
--- a/PKHeX.WinForms/Resources/text/lang_fr.txt
+++ b/PKHeX.WinForms/Resources/text/lang_fr.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=Suivi de changements
 About.Tab_Shortcuts=Raccourcis
 BatchEditor.B_Add=Ajouter
 BatchEditor.B_Go=Courrir
-BatchEditor.L_PropType=PropertyType
-BatchEditor.L_PropValue=PropertyValue
 BatchEditor.RB_Boxes=Boîtes
 BatchEditor.RB_Party=Équipe
 BatchEditor.RB_Path=Dossier...
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=Appliquer StatNature à la nature lors de l'imp
 LocalizedDescription.AutoLoadSaveOnStartup=Automatically Detect Save File on Program Startup
 LocalizedDescription.BAKEnabled=Automatic Save File Backups Enabled
 LocalizedDescription.BAKPrompt=Tracks if the "Create Backup" prompt has been issued to the user.
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=Checks player given Nicknames and Trainer Names for profanity. Bad words will be flagged using the 3DS console's regex lists.
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them.
 LocalizedDescription.FlagIllegal=Marquer les Pokémon illégaux dans la sauvegarde
 LocalizedDescription.ForceHaXOnLaunch=Force HaX mode on Program Launch
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty
 LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer.
 LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe.
 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Choice for which sprite building mode to use.
 LocalizedDescription.TryDetectRecentSave=Automatically locates the most recently saved Save File when opening a new file.
 LocalizedDescription.Unicode=Unicode
@@ -540,6 +541,7 @@ SAV_Encounters.L_Move2=Move 2:
 SAV_Encounters.L_Move3=Move 3:
 SAV_Encounters.L_Move4=Move 4:
 SAV_Encounters.L_Version=OT Version:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=Species:
 SAV_Encounters.Menu_Close=File
 SAV_Encounters.Menu_Exit=&Close
diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt
index 1eec2d4bc..bddb12f20 100644
--- a/PKHeX.WinForms/Resources/text/lang_it.txt
+++ b/PKHeX.WinForms/Resources/text/lang_it.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=Log modifiche
 About.Tab_Shortcuts=Scorciatoie
 BatchEditor.B_Add=Aggiungi
 BatchEditor.B_Go=Avvia
-BatchEditor.L_PropType=TipoProprietà
-BatchEditor.L_PropValue=ValoreProprietà
 BatchEditor.RB_Boxes=Box
 BatchEditor.RB_Party=Squadra
 BatchEditor.RB_Path=Cartella...
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=Applica la Natura delle Statistiche alla Natura
 LocalizedDescription.AutoLoadSaveOnStartup=Rileva automaticamente il tipo del Salvtaggio durante l'Avvio.
 LocalizedDescription.BAKEnabled=Backup automatico dei File di Salvataggio attivo.
 LocalizedDescription.BAKPrompt=Controlla se è stato chiesto all'utente di Creare un Backup.
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=Controlla la volgarità di Soprannomi e Nomi Allenatore. Parole proibite saranno segnalate utilizzando gli elenchi di espressione del 3DS.
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Nascondi specie non disponibili se il salvatggio caricato non è in grado di importarli.
 LocalizedDescription.FlagIllegal=Segnala Slot Illegali nel Salvataggio
 LocalizedDescription.ForceHaXOnLaunch=Forza l'avvio del programma in modalità HaX
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacità per lo sfondo del T
 LocalizedDescription.ShowEncounterOpacityStripe=Opacità per la barra del Tipo di Incontro.
 LocalizedDescription.ShowEncounterThicknessStripe=Spessore dei Pixel da mostrare per la barra del Tipo di Incontro.
 LocalizedDescription.ShowExperiencePercent=Mostra una piccola barra per indicare la percentuale di progresso di Aumento Livello
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Quale modalità di costruzione sprite utilizzare
 LocalizedDescription.TryDetectRecentSave=Localizza automaticamente l'ultimo File salvato quando apri un nuovo File.
 LocalizedDescription.Unicode=Unicode
@@ -540,6 +541,7 @@ SAV_Encounters.L_Move2=Mossa 2:
 SAV_Encounters.L_Move3=Mossa 3:
 SAV_Encounters.L_Move4=Mossa 4:
 SAV_Encounters.L_Version=Versione AO:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=Specie:
 SAV_Encounters.Menu_Close=File
 SAV_Encounters.Menu_Exit=&Chiudi
diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt
index 9c0c04717..101211db5 100644
--- a/PKHeX.WinForms/Resources/text/lang_ja.txt
+++ b/PKHeX.WinForms/Resources/text/lang_ja.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=Changelog
 About.Tab_Shortcuts=Shortcuts
 BatchEditor.B_Add=追加
 BatchEditor.B_Go=実行
-BatchEditor.L_PropType=PropertyType
-BatchEditor.L_PropValue=PropertyValue
 BatchEditor.RB_Boxes=Boxes
 BatchEditor.RB_Party=Party
 BatchEditor.RB_Path=フォルダ
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=Apply StatNature to Nature on Import
 LocalizedDescription.AutoLoadSaveOnStartup=Automatically Detect Save File on Program Startup
 LocalizedDescription.BAKEnabled=Automatic Save File Backups Enabled
 LocalizedDescription.BAKPrompt=Tracks if the "Create Backup" prompt has been issued to the user.
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=Checks player given Nicknames and Trainer Names for profanity. Bad words will be flagged using the 3DS console's regex lists.
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them.
 LocalizedDescription.FlagIllegal=不整合を表示
 LocalizedDescription.ForceHaXOnLaunch=Force HaX mode on Program Launch
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty
 LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer.
 LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe.
 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Choice for which sprite building mode to use.
 LocalizedDescription.TryDetectRecentSave=Automatically locates the most recently saved Save File when opening a new file.
 LocalizedDescription.Unicode=Unicode
@@ -540,6 +541,7 @@ SAV_Encounters.L_Move2=Move 2:
 SAV_Encounters.L_Move3=Move 3:
 SAV_Encounters.L_Move4=Move 4:
 SAV_Encounters.L_Version=OT Version:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=Species:
 SAV_Encounters.Menu_Close=File
 SAV_Encounters.Menu_Exit=&Close
diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt
index 1f287cfc0..fc38efb1a 100644
--- a/PKHeX.WinForms/Resources/text/lang_ko.txt
+++ b/PKHeX.WinForms/Resources/text/lang_ko.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=변경 사항
 About.Tab_Shortcuts=간편 사용법
 BatchEditor.B_Add=추가
 BatchEditor.B_Go=실행
-BatchEditor.L_PropType=PropertyType
-BatchEditor.L_PropValue=PropertyValue
 BatchEditor.RB_Boxes=박스
 BatchEditor.RB_Party=파티
 BatchEditor.RB_Path=폴더...
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=임포트시 자연에 StatNature 적용
 LocalizedDescription.AutoLoadSaveOnStartup=Automatically Detect Save File on Program Startup
 LocalizedDescription.BAKEnabled=세이브 파일 자동 백업 사용
 LocalizedDescription.BAKPrompt=Tracks if the "Create Backup" prompt has been issued to the user.
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=Checks player given Nicknames and Trainer Names for profanity. Bad words will be flagged using the 3DS console's regex lists.
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them.
 LocalizedDescription.FlagIllegal=세이브 파일에서 적법하지 않은 포켓몬 표시
 LocalizedDescription.ForceHaXOnLaunch=프로그램 시작 시 HaX 모드 강제 사용
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty
 LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer.
 LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe.
 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Choice for which sprite building mode to use.
 LocalizedDescription.TryDetectRecentSave=Automatically locates the most recently saved Save File when opening a new file.
 LocalizedDescription.Unicode=유니코드 사용
@@ -536,6 +537,7 @@ SAV_Encounters.L_Move2=기술 2:
 SAV_Encounters.L_Move3=기술 3:
 SAV_Encounters.L_Move4=기술 4:
 SAV_Encounters.L_Version=어버이 버전:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=종류:
 SAV_Encounters.Menu_Close=파일
 SAV_Encounters.Menu_Exit=닫기(&C)
diff --git a/PKHeX.WinForms/Resources/text/lang_zh.txt b/PKHeX.WinForms/Resources/text/lang_zh.txt
index 38c2a083c..5a87068db 100644
--- a/PKHeX.WinForms/Resources/text/lang_zh.txt
+++ b/PKHeX.WinForms/Resources/text/lang_zh.txt
@@ -74,8 +74,6 @@ About.Tab_Changelog=更新日志
 About.Tab_Shortcuts=快捷键
 BatchEditor.B_Add=增加
 BatchEditor.B_Go=运行
-BatchEditor.L_PropType=类型
-BatchEditor.L_PropValue=值
 BatchEditor.RB_Boxes=盒子
 BatchEditor.RB_Party=队伍
 BatchEditor.RB_Path=文件夹...
@@ -91,7 +89,9 @@ LocalizedDescription.ApplyNature=在导入时将修正性格应用于性格
 LocalizedDescription.AutoLoadSaveOnStartup=在程序启动时自动加载存档文件
 LocalizedDescription.BAKEnabled=自动保存文件备份已启用
 LocalizedDescription.BAKPrompt=记录是否向用户发送过“创建备份”提示。
+LocalizedDescription.CheckActiveHandler=Checks the last loaded player save file data and Current Handler state to determine if the Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.CheckWordFilter=检查昵称和训练家名称是否存在违禁词。违禁词会根据3DS的正则列表规则标记。
+LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value.
 LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them.
 LocalizedDescription.FlagIllegal=标记不合法
 LocalizedDescription.ForceHaXOnLaunch=程序启动时强制HaX模式
@@ -135,6 +135,7 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty
 LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer.
 LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe.
 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress
+LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID.
 LocalizedDescription.SpritePreference=Choice for which sprite building mode to use.
 LocalizedDescription.TryDetectRecentSave=打开新存档时，自动定位到上次保存的存档地址。
 LocalizedDescription.Unicode=使用Unicode显示性别符号，禁用时使用ASCII
@@ -536,6 +537,7 @@ SAV_Encounters.L_Move2=招式2:
 SAV_Encounters.L_Move3=招式3:
 SAV_Encounters.L_Move4=招式4:
 SAV_Encounters.L_Version=来源版本:
+SAV_Encounters.L_Viewed=Last Viewed: {0}
 SAV_Encounters.Label_Species=种类:
 SAV_Encounters.Menu_Close=文件
 SAV_Encounters.Menu_Exit=关闭(&C)
diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs
index 25f906391..9e198a9f7 100644
--- a/PKHeX.WinForms/Subforms/SAV_Database.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Database.cs
@@ -25,6 +25,7 @@ public partial class SAV_Database : Form
     public SAV_Database(PKMEditor f1, SAVEditor saveditor)
     {
         InitializeComponent();
+        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
         var UC_Builder = new EntityInstructionBuilder(() => f1.PreparePKM())
         {
             Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right,
@@ -34,8 +35,6 @@ public SAV_Database(PKMEditor f1, SAVEditor saveditor)
         };
         Tab_Advanced.Controls.Add(UC_Builder);
 
-        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
-
         SAV = saveditor.SAV;
         BoxView = saveditor;
         PKME_Tabs = f1;
diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
index b3bc2aad0..8e2562c12 100644
--- a/PKHeX.WinForms/Subforms/SAV_Encounters.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
@@ -26,6 +26,7 @@ public partial class SAV_Encounters : Form
     public SAV_Encounters(PKMEditor f1, TrainerDatabase db)
     {
         InitializeComponent();
+        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
         var UC_Builder = new EntityInstructionBuilder(() => f1.PreparePKM())
         {
             Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right,
@@ -35,8 +36,6 @@ public SAV_Encounters(PKMEditor f1, TrainerDatabase db)
         };
         Tab_Advanced.Controls.Add(UC_Builder);
 
-        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
-
         PKME_Tabs = f1;
         Trainers = db;
 
diff --git a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
index 88c27ed1f..a77e73a4e 100644
--- a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
+++ b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
@@ -24,6 +24,7 @@ public partial class SAV_MysteryGiftDB : Form
     public SAV_MysteryGiftDB(PKMEditor tabs, SAVEditor sav)
     {
         InitializeComponent();
+        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
         var UC_Builder = new EntityInstructionBuilder(() => tabs.PreparePKM())
         {
             Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right,
@@ -33,8 +34,6 @@ public SAV_MysteryGiftDB(PKMEditor tabs, SAVEditor sav)
         };
         Tab_Advanced.Controls.Add(UC_Builder);
 
-        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
-
         SAV = sav.SAV;
         BoxView = sav;
         PKME_Tabs = tabs;