diff --git a/PKHeX.Core/Resources/text/de/lang_de.txt b/PKHeX.Core/Resources/text/de/lang_de.txt
index d89470866..b17ad09d1 100644
--- a/PKHeX.Core/Resources/text/de/lang_de.txt
+++ b/PKHeX.Core/Resources/text/de/lang_de.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Error
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Memory / Amie Editor
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=C-Gear Skin
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Event Flag Editor (ORAS)
-SAV_EventFlagsXY=Event Flag Editor (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Hall of Fame Editor
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -46,7 +44,6 @@ SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Medal Editor
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=Abbrechen
 ErrorWindow.B_Continue=Fortfahren
 ErrorWindow.B_CopyToClipboard=In Zwischenablage kopieren
 ErrorWindow.L_ProvideInfo=Bitte sende diese Information, wenn du den Fehler meldest:
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C-Gear Skin
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=Speichere PGL .JPEG
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=Beerenfeld
 Main.B_OpenBoxLayout=Boxlayout
 Main.B_OpenEventFlags=Event Flags
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=Ruhmeshalle
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=Items
 Main.B_OpenLinkInfo=Link-Daten
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=O-Kräfte
 Main.B_OpenPokeBeans=Pokébohnen
-Main.B_OpenPokeBlocks=Pokériegel
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=Pokédex
-Main.B_OpenPokePuffs=Pofflés
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=Geheimbasis
 Main.B_OpenSuperTraining=Super Training
 Main.B_OpenTrainerInfo=Trainerinfo
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=Wunderkarte
 Main.B_OUTPasserby=Passanten
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=Speichere Box Daten++
 Main.B_VerifyCHK=Prüfsummen
 Main.BTN_History=Erinnerung
@@ -93,26 +100,41 @@ Main.CHK_HackedStats=Gehackte Werte
 Main.CHK_Infected=Infiziert
 Main.CHK_IsEgg=Ist Ei
 Main.CHK_Nicknamed=Spitzname:
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=Ei verfügbar
 Main.GB_CurrentMoves=Aktuelle Attacken
 Main.GB_Daycare=Pension
 Main.GB_EggConditions=Ei-Treff-Bedingungen
 Main.GB_ExtraBytes=Extra Bytes
-Main.GB_Fused=Fused
-Main.GB_GTS=GTS
 Main.GB_Markings=Markierungen
 Main.GB_nOT=Letzter (nicht OT) Handler
 Main.GB_OT=Trainer Informationen
 Main.GB_RelearnMoves=Wiedererlente Attacken
-Main.GB_SUBE=Alter Mann
 Main.L_BattleBox=Kampfbox:
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=Seed
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=Spielsynchro ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=Team:
 Main.L_ReadOnlyOther=Dieser Tab ist nur lesbar.
 Main.L_ReadOnlyPBB=Dieser ist nur lesbar.
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=Secure Value 1:
 Main.L_Secure2=Secure Value 2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=3DS Region:
 Main.Label_Ability=Fähigkeit:
 Main.Label_ATK=Atk:
@@ -135,6 +157,7 @@ Main.Label_EVs=EVs
 Main.Label_EXP=EP:
 Main.Label_Form=Form:
 Main.Label_Friendship=Freundschaft:
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=Item:
 Main.Label_HiddenPowerPrefix=Kraftreserve Typ:
 Main.Label_HP=KP:
@@ -168,6 +191,7 @@ Main.Menu_About=Über PKHeX
 Main.Menu_BatchEditor=Batch Editor
 Main.Menu_Data=Daten
 Main.Menu_Database=PKM Datenbank
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=Dumpe Boxen
 Main.Menu_Exit=Schließen
 Main.Menu_ExportBAK=Exportiere BAK
@@ -180,17 +204,22 @@ Main.Menu_LoadBoxes=Lade Boxen
 Main.Menu_MGDatabase=Wunderkarten Datenbank
 Main.Menu_Open=Öffnen...
 Main.Menu_Options=Optionen
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=Box-Datenreport
 Main.Menu_Save=Speichere PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=Exportiere Kampf-Box in Zwischenablage
 Main.Menu_ShowdownExportParty=Exportiere Team in Zwischenablage
 Main.Menu_ShowdownExportPKM=Exportiere Set in Zwischenablage
 Main.Menu_ShowdownImportPKM=Importiere Set aus Zwischenablage
 Main.Menu_Tools=Werkzeuge
-Main.Menu_Unicode=Unicode
-Main.mnu2View=Zeige
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=Löschen
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=Einstellen
 Main.mnuView=Zeige
 Main.Tab_Attacks=Attacken
@@ -211,7 +240,6 @@ MemoryAmie.GB_Residence=Pokémon has Resided in:
 MemoryAmie.L_Arguments=Deaktiviert ; Nie verlassen ; OT ; Letzte Gen. ; Erinnerungen mit ; Pokémon ; Area ; Item(s) ; Attacke ; Location ;
 MemoryAmie.L_Country=Land
 MemoryAmie.L_CT_Affection=Affection:
-MemoryAmie.L_cT_Affection=Zuneigung:
 MemoryAmie.L_CT_Feeling=Feeling:
 MemoryAmie.L_CT_Friendship=Freundschaft:
 MemoryAmie.L_CT_Quality=Intensity:
@@ -263,10 +291,8 @@ SAV_BoxLayout.B_Cancel=Abbrechen
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=Speichern
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=HG:
 SAV_BoxLayout.L_BoxName=Box Name:
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=Freigeschaltete HG Flags:
 SAV_BoxLayout.L_Unlocked=Freigeschaltet:
 SAV_CGearSkin.B_Cancel=Cancel
 SAV_CGearSkin.B_ExportCGB=Export .cgb
@@ -325,122 +351,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=Abbrechen
-SAV_EventFlagsORAS.B_LoadNew=Load New
-SAV_EventFlagsORAS.B_LoadOld=Load Old
-SAV_EventFlagsORAS.B_Save=Speichern
-SAV_EventFlagsORAS.CHK_CustomFlag=Status:
-SAV_EventFlagsORAS.flag_0172=Cresselia Besiegt
-SAV_EventFlagsORAS.flag_0173=Raikou Besiegt
-SAV_EventFlagsORAS.flag_0174=Entei Besiegt
-SAV_EventFlagsORAS.flag_0175=Suicune Besiegt
-SAV_EventFlagsORAS.flag_0176=Cobalium Besiegt
-SAV_EventFlagsORAS.flag_0177=Terrakium Besiegt
-SAV_EventFlagsORAS.flag_0178=Viridium Besiegt
-SAV_EventFlagsORAS.flag_0179=Selfe Besiegt
-SAV_EventFlagsORAS.flag_0180=Vesprit Besiegt
-SAV_EventFlagsORAS.flag_0181=Tobutz Besiegt
-SAV_EventFlagsORAS.flag_0182=(OR) Reshiram Besiegt
-SAV_EventFlagsORAS.flag_0183=(AS) Zekrom Besiegt
-SAV_EventFlagsORAS.flag_0184=Kyurem Besiegt
-SAV_EventFlagsORAS.flag_0208=(OR) Ho-Oh Besiegt
-SAV_EventFlagsORAS.flag_0209=(AS) Lugia Besiegt
-SAV_EventFlagsORAS.flag_0252=Regigigas Besiegt
-SAV_EventFlagsORAS.flag_0260=Heatran Besiegt
-SAV_EventFlagsORAS.flag_0284=Einzel Statuette
-SAV_EventFlagsORAS.flag_0285=Doppel Statuette
-SAV_EventFlagsORAS.flag_0286=Dreierkampf Statuette
-SAV_EventFlagsORAS.flag_0287=Rotation Statuette
-SAV_EventFlagsORAS.flag_0288=Multi Statuette
-SAV_EventFlagsORAS.flag_0289=Super Singles Freigeschaltet
-SAV_EventFlagsORAS.flag_0290=Super Doubles Freigeschaltet
-SAV_EventFlagsORAS.flag_0291=Super Triples Freigeschaltet
-SAV_EventFlagsORAS.flag_0292=Super Rotation Freigeschaltet
-SAV_EventFlagsORAS.flag_0293=Super Multi Freigeschaltet
-SAV_EventFlagsORAS.flag_0419=(OR) Latias Besiegt
-SAV_EventFlagsORAS.flag_0420=(AS) Latios Besiegt
-SAV_EventFlagsORAS.flag_0647=(AS) Kyogre Besiegt
-SAV_EventFlagsORAS.flag_0648=(OR) Groudon Besiegt
-SAV_EventFlagsORAS.flag_0945=Deoxys Besiegt
-SAV_EventFlagsORAS.flag_0956=Regirock Besiegt
-SAV_EventFlagsORAS.flag_0957=Regice Besiegt
-SAV_EventFlagsORAS.flag_0958=Registeel Besiegt
-SAV_EventFlagsORAS.flag_2811=Raikou Gefangen
-SAV_EventFlagsORAS.flag_2812=Entei Gefangen
-SAV_EventFlagsORAS.flag_2813=Suicune Gefangen
-SAV_EventFlagsORAS.flag_2814=(AS) Lugia Gefangen
-SAV_EventFlagsORAS.flag_2815=(OR) Ho-Oh Gefangen
-SAV_EventFlagsORAS.flag_2816=Selfe Gefangen
-SAV_EventFlagsORAS.flag_2817=Vesprit Gefangen
-SAV_EventFlagsORAS.flag_2818=Tobutz Gefangen
-SAV_EventFlagsORAS.flag_2819=(AS) Dialga Gefangen
-SAV_EventFlagsORAS.flag_2820=(OR) Palkia Gefangen
-SAV_EventFlagsORAS.flag_2821=Heatran Gefangen
-SAV_EventFlagsORAS.flag_2822=Regigigas Gefangen
-SAV_EventFlagsORAS.flag_2823=Giratina Gefangen
-SAV_EventFlagsORAS.flag_2824=Cresselia Gefangen
-SAV_EventFlagsORAS.flag_2825=Cobalium Gefangen
-SAV_EventFlagsORAS.flag_2826=Terrakium Gefangen
-SAV_EventFlagsORAS.flag_2827=Viridium Gefangen
-SAV_EventFlagsORAS.flag_2828=(OR) Boreos Gefangen
-SAV_EventFlagsORAS.flag_2829=(AS) Voltolos Gefangen
-SAV_EventFlagsORAS.flag_2830=(OR) Reshiram Gefangen
-SAV_EventFlagsORAS.flag_2831=(AS) Zekrom Gefangen
-SAV_EventFlagsORAS.flag_2832=Demeteros Gefangen
-SAV_EventFlagsORAS.flag_2833=Kyurem Gefangen
-SAV_EventFlagsORAS.flag_2834=(OR) Latias Gefangen
-SAV_EventFlagsORAS.flag_2835=(AS) Latios Gefangen
-SAV_EventFlagsORAS.flag_2836=Regirock Gefangen
-SAV_EventFlagsORAS.flag_2837=Regice Gefangen
-SAV_EventFlagsORAS.flag_2838=Registeel Gefangen
-SAV_EventFlagsORAS.flag_2839=(OR) Groudon Gefangen
-SAV_EventFlagsORAS.flag_2840=(AS) Kyogre Gefangen
-SAV_EventFlagsORAS.flag_2842=Deoxys Gefangen
-SAV_EventFlagsORAS.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsORAS.GB_Misc=Verschiedenes
-SAV_EventFlagsORAS.GB_Rebattle=Rückkampf
-SAV_EventFlagsORAS.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsORAS.L_Ash=Vulkanasche:
-SAV_EventFlagsORAS.L_Flag=Flag:
-SAV_EventFlagsORAS.L_IsSet=IsSet
-SAV_EventFlagsORAS.L_SkyTower=*Himmelsturm
-SAV_EventFlagsORAS.L_UnSet=UnSet
-SAV_EventFlagsXY.B_Cancel=Abbrechen
-SAV_EventFlagsXY.B_LoadNew=Load New
-SAV_EventFlagsXY.B_LoadOld=Load Old
-SAV_EventFlagsXY.B_Save=Speichern
-SAV_EventFlagsXY.CHK_CustomFlag=Status:
-SAV_EventFlagsXY.flag_0001=Flag1
-SAV_EventFlagsXY.flag_0002=Flag2
-SAV_EventFlagsXY.flag_0003=Flag3
-SAV_EventFlagsXY.flag_0004=Flag4
-SAV_EventFlagsXY.flag_0005=Flag5
-SAV_EventFlagsXY.flag_0114=Zygarde Gefangen
-SAV_EventFlagsXY.flag_0115=Mewtwo Gefangen
-SAV_EventFlagsXY.flag_0285=Einzel Statuette
-SAV_EventFlagsXY.flag_0286=Doppel Statuette
-SAV_EventFlagsXY.flag_0287=Dreifach Statuette
-SAV_EventFlagsXY.flag_0288=Rotation Statuette
-SAV_EventFlagsXY.flag_0289=Multi Statuette
-SAV_EventFlagsXY.flag_0290=Super Einzel Freigeschaltet
-SAV_EventFlagsXY.flag_0291=Super Doppel Freigeschaltet
-SAV_EventFlagsXY.flag_0292=Super Dreifach Freigeschaltet
-SAV_EventFlagsXY.flag_0293=Super Rotation Freigeschaltet
-SAV_EventFlagsXY.flag_0294=Super Multi Freigeschaltet
-SAV_EventFlagsXY.flag_0675=50: Besiege Châtelaine
-SAV_EventFlagsXY.flag_0790=Zygarde Besiegt
-SAV_EventFlagsXY.flag_0963=Mewtwo Besiegt
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=Pokédex Erhalten
-SAV_EventFlagsXY.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsXY.GB_Misc=Etc.
-SAV_EventFlagsXY.GB_Rebattle=Rückkampf
-SAV_EventFlagsXY.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsXY.L_Flag=Flag:
-SAV_EventFlagsXY.L_IsSet=IsSet
-SAV_EventFlagsXY.L_UnSet=UnSet
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -457,7 +367,6 @@ SAV_HallOfFame.L_Shiny=Shillernd:
 SAV_HallOfFame.L_Victory=Eintrag:
 SAV_HallOfFame.Label_EncryptionConstant=Encryption Constant:
 SAV_HallOfFame.Label_Form=Form:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=Item:
 SAV_HallOfFame.Label_MetDate=Datum:
 SAV_HallOfFame.Label_OT=OT:
@@ -494,7 +403,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=Abbrechen
 SAV_Inventory.B_GiveAll=Alle
 SAV_Inventory.B_Save=Speichern
@@ -554,17 +462,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -918,7 +818,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=Haupt
 SAV_SecretBase.f_PKM=Trainer Pokémon
 SAV_SecretBase.GB_Object=Objektplatzierung
-SAV_SecretBase.GB_PKM=PKM
 SAV_SecretBase.L_ATK=ATK
 SAV_SecretBase.L_BaseLocation=Geheimbasisort:
 SAV_SecretBase.L_Blackboard=Schwarzes Brett:
@@ -936,7 +835,6 @@ SAV_SecretBase.L_Index=Index:
 SAV_SecretBase.L_IVs=DVs
 SAV_SecretBase.L_Participant=Participant:
 SAV_SecretBase.L_PKFriendship=Freundschaft:
-SAV_SecretBase.L_PPUps=AP Plus
 SAV_SecretBase.L_PPups=PP Ups
 SAV_SecretBase.L_Rotation=Rotation:
 SAV_SecretBase.L_SpA=SpA
@@ -947,7 +845,6 @@ SAV_SecretBase.L_TeamSlogan=Team Slogan:
 SAV_SecretBase.L_TrName=Trainer Name:
 SAV_SecretBase.L_X=X Koordinate:
 SAV_SecretBase.L_Y=Y Koordinate:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancel
 SAV_SimplePokedex.B_CaughtAll=Caught All
 SAV_SimplePokedex.B_CaughtNone=Caught None
@@ -1058,7 +955,6 @@ SAV_Trainer.L_SinglesC=Einzel:
 SAV_Trainer.L_SkinColor=Hautfarbe:
 SAV_Trainer.L_Socks=Socken:
 SAV_Trainer.L_Started=Spiel Gestartet:
-SAV_Trainer.L_Stats=Werte
 SAV_Trainer.L_Style=Stil:
 SAV_Trainer.L_SuperB=Super
 SAV_Trainer.L_SuperC=Super
@@ -1182,17 +1078,6 @@ SettingsEditor.SetUpdateDex=Ändern Pokédex
 SettingsEditor.SetUpdatePKM=Ändern PKM Info
 SettingsEditor.ShinySprites=Shiny Sprites
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=Abbrechen
-SuperTrain.B_Save=Speichern
-SuperTrain.L_Bags=Sandsäcke
-SuperTrain.L_Records=Rekorde
-SuperTrain.L_Species=Spezies:
-SuperTrain.L_Species2=Spezies
-SuperTrain.L_Time0=Time:
-SuperTrain.L_Time1=Time1
-SuperTrain.L_Time2=Time2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=UNKNOWN
 SuperTrainingEditor.B_All=Alle
 SuperTrainingEditor.B_Cancel=Abbrechen
 SuperTrainingEditor.B_None=Nichts
@@ -1239,4 +1124,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/en/lang_en.txt b/PKHeX.Core/Resources/text/en/lang_en.txt
index 719be6d00..8f315119b 100644
--- a/PKHeX.Core/Resources/text/en/lang_en.txt
+++ b/PKHeX.Core/Resources/text/en/lang_en.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Error
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Memory / Amie Editor
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=C-Gear Skin
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Event Flag Editor (ORAS)
-SAV_EventFlagsXY=Event Flag Editor (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Hall of Fame Editor
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -46,7 +44,6 @@ SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Medal Editor
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=Abort
 ErrorWindow.B_Continue=Continue
 ErrorWindow.B_CopyToClipboard=Copy to Clipboard
 ErrorWindow.L_ProvideInfo=Please provide this information when reporting this error:
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C-Gear Skin
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=Save PGL .JPEG
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=Berry Field
 Main.B_OpenBoxLayout=Box Layout
 Main.B_OpenEventFlags=Event Flags
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=Hall of Fame
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=Items
 Main.B_OpenLinkInfo=Link Data
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=O-Powers
 Main.B_OpenPokeBeans=Poké Beans
-Main.B_OpenPokeBlocks=Pokéblocks
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=Pokédex
-Main.B_OpenPokePuffs=‎Poké Puffs
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=Secret Base
 Main.B_OpenSuperTraining=Super Train
 Main.B_OpenTrainerInfo=Trainer Info
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=Mystery Gift
 Main.B_OUTPasserby=Passerby
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=Save Box Data++
 Main.B_VerifyCHK=Verify Checksums
 Main.BTN_History=Memories
@@ -93,26 +100,41 @@ Main.CHK_HackedStats=Hacked Stats
 Main.CHK_Infected=Infected
 Main.CHK_IsEgg=Is Egg
 Main.CHK_Nicknamed=Nickname:
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=Egg Available
 Main.GB_CurrentMoves=Current Moves
 Main.GB_Daycare=Daycare
 Main.GB_EggConditions=Egg Met Conditions
 Main.GB_ExtraBytes=Extra Bytes
-Main.GB_Fused=Fused
-Main.GB_GTS=GTS
 Main.GB_Markings=Markings
 Main.GB_nOT=Latest (not OT) Handler
 Main.GB_OT=Trainer Information
 Main.GB_RelearnMoves=Relearn Moves
-Main.GB_SUBE=OldMan
 Main.L_BattleBox=Battle Box:
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=Seed
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=Game Sync ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=Party:
 Main.L_ReadOnlyOther=This tab is read only.
 Main.L_ReadOnlyPBB=This is read only.
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=Secure Value 1:
 Main.L_Secure2=Secure Value 2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=3DS Region:
 Main.Label_Ability=Ability:
 Main.Label_ATK=Atk:
@@ -135,6 +157,7 @@ Main.Label_EVs=EVs
 Main.Label_EXP=EXP:
 Main.Label_Form=Form:
 Main.Label_Friendship=Friendship:
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=Held Item:
 Main.Label_HiddenPowerPrefix=Hidden Power Type:
 Main.Label_HP=HP:
@@ -168,6 +191,7 @@ Main.Menu_About=About PKHeX
 Main.Menu_BatchEditor=Batch Editor
 Main.Menu_Data=Data
 Main.Menu_Database=PKM Database
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=Dump Boxes
 Main.Menu_Exit=Quit
 Main.Menu_ExportBAK=Export Backup
@@ -180,17 +204,22 @@ Main.Menu_LoadBoxes=Load Boxes
 Main.Menu_MGDatabase=Mystery Gift Database
 Main.Menu_Open=Open...
 Main.Menu_Options=Options
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=Box Data Report
 Main.Menu_Save=Save PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=Export Battle Box to Clipboard
 Main.Menu_ShowdownExportParty=Export Party to Clipboard
 Main.Menu_ShowdownExportPKM=Export Set to Clipboard
 Main.Menu_ShowdownImportPKM=Import Set from Clipboard
 Main.Menu_Tools=Tools
-Main.Menu_Unicode=Unicode
-Main.mnu2View=View
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=Delete
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=Set
 Main.mnuView=View
 Main.Tab_Attacks=Attacks
@@ -210,7 +239,6 @@ MemoryAmie.GB_M_OT=Memories with Original Trainer
 MemoryAmie.GB_Residence=Pokémon has Resided in:
 MemoryAmie.L_Arguments=Disabled ; Never left ; OT ; Past Gen ; Memories with ; Pokémon ; Area ; Item(s) ; Move ; Location ;
 MemoryAmie.L_Country=Country
-MemoryAmie.L_cT_Affection=Affection:
 MemoryAmie.L_CT_Affection=Affection:
 MemoryAmie.L_CT_Feeling=Feeling:
 MemoryAmie.L_CT_Friendship=Friendship:
@@ -259,10 +287,8 @@ SAV_BoxLayout.B_Cancel=Cancel
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=Save
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=BG:
 SAV_BoxLayout.L_BoxName=Box Name:
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=Unlocked BG Flags:
 SAV_BoxLayout.L_Unlocked=Unlocked:
 SAV_CGearSkin.B_Cancel=Cancel
 SAV_CGearSkin.B_ExportCGB=Export .cgb
@@ -321,122 +347,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=Cancel
-SAV_EventFlagsORAS.B_LoadNew=Load New
-SAV_EventFlagsORAS.B_LoadOld=Load Old
-SAV_EventFlagsORAS.B_Save=Save
-SAV_EventFlagsORAS.CHK_CustomFlag=Status:
-SAV_EventFlagsORAS.flag_0172=Cresselia Defeated
-SAV_EventFlagsORAS.flag_0173=Raikou Defeated
-SAV_EventFlagsORAS.flag_0174=Entei Defeated
-SAV_EventFlagsORAS.flag_0175=Suicune Defeated
-SAV_EventFlagsORAS.flag_0176=Cobalion Defeated
-SAV_EventFlagsORAS.flag_0177=Terrakion Defeated
-SAV_EventFlagsORAS.flag_0178=Virizion Defeated
-SAV_EventFlagsORAS.flag_0179=Uxie Defeated
-SAV_EventFlagsORAS.flag_0180=Mesprit Defeated
-SAV_EventFlagsORAS.flag_0181=Azelf Defeated
-SAV_EventFlagsORAS.flag_0182=(OR) Reshiram Defeated
-SAV_EventFlagsORAS.flag_0183=(AS) Zekrom Defeated
-SAV_EventFlagsORAS.flag_0184=Kyurem Defeated
-SAV_EventFlagsORAS.flag_0208=(OR) Ho-Oh Defeated
-SAV_EventFlagsORAS.flag_0209=(AS) Lugia Defeated
-SAV_EventFlagsORAS.flag_0252=Regigigas Defeated
-SAV_EventFlagsORAS.flag_0260=Heatran Defeated
-SAV_EventFlagsORAS.flag_0284=Singles Statuette
-SAV_EventFlagsORAS.flag_0285=Doubles Statuette
-SAV_EventFlagsORAS.flag_0286=Triples Statuette
-SAV_EventFlagsORAS.flag_0287=Rotation Statuette
-SAV_EventFlagsORAS.flag_0288=Multi Statuette
-SAV_EventFlagsORAS.flag_0289=Super Singles Unlocked
-SAV_EventFlagsORAS.flag_0290=Super Doubles Unlocked
-SAV_EventFlagsORAS.flag_0291=Super Triples Unlocked
-SAV_EventFlagsORAS.flag_0292=Super Rotation Unlocked
-SAV_EventFlagsORAS.flag_0293=Super Multi Unlocked
-SAV_EventFlagsORAS.flag_0419=(OR) Latias Defeated
-SAV_EventFlagsORAS.flag_0420=(AS) Latios Defeated
-SAV_EventFlagsORAS.flag_0647=(AS) Kyogre Defeated
-SAV_EventFlagsORAS.flag_0648=(OR) Groudon Defeated
-SAV_EventFlagsORAS.flag_0945=Deoxys Defeated
-SAV_EventFlagsORAS.flag_0956=Regirock Defeated
-SAV_EventFlagsORAS.flag_0957=Regice Defeated
-SAV_EventFlagsORAS.flag_0958=Registeel Defeated
-SAV_EventFlagsORAS.flag_2811=Raikou Captured
-SAV_EventFlagsORAS.flag_2812=Entei Captured
-SAV_EventFlagsORAS.flag_2813=Suicune Captured
-SAV_EventFlagsORAS.flag_2814=(AS) Lugia Captured
-SAV_EventFlagsORAS.flag_2815=(OR) Ho-Oh Captured
-SAV_EventFlagsORAS.flag_2816=Uxie Captured
-SAV_EventFlagsORAS.flag_2817=Mesprit Captured
-SAV_EventFlagsORAS.flag_2818=Azelf Captured
-SAV_EventFlagsORAS.flag_2819=(AS) Dialga Captured
-SAV_EventFlagsORAS.flag_2820=(OR) Palkia Captured
-SAV_EventFlagsORAS.flag_2821=Heatran Captured
-SAV_EventFlagsORAS.flag_2822=Regigigas Captured
-SAV_EventFlagsORAS.flag_2823=Giratina Captured
-SAV_EventFlagsORAS.flag_2824=Cresselia Captured
-SAV_EventFlagsORAS.flag_2825=Cobalion Captured
-SAV_EventFlagsORAS.flag_2826=Terrakion Captured
-SAV_EventFlagsORAS.flag_2827=Virizion Captured
-SAV_EventFlagsORAS.flag_2828=(OR) Tornadus Captured
-SAV_EventFlagsORAS.flag_2829=(AS) Thundurus Captured
-SAV_EventFlagsORAS.flag_2830=(OR) Reshiram Captured
-SAV_EventFlagsORAS.flag_2831=(AS) Zekrom Captured
-SAV_EventFlagsORAS.flag_2832=Landorus Captured
-SAV_EventFlagsORAS.flag_2833=Kyurem Captured
-SAV_EventFlagsORAS.flag_2834=(OR) Latias Captured
-SAV_EventFlagsORAS.flag_2835=(AS) Latios Captured
-SAV_EventFlagsORAS.flag_2836=Regirock Captured
-SAV_EventFlagsORAS.flag_2837=Regice Captured
-SAV_EventFlagsORAS.flag_2838=Registeel Captured
-SAV_EventFlagsORAS.flag_2839=(OR) Groudon Captured
-SAV_EventFlagsORAS.flag_2840=(AS) Kyogre Captured
-SAV_EventFlagsORAS.flag_2842=Deoxys Captured
-SAV_EventFlagsORAS.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsORAS.GB_Misc=Misc
-SAV_EventFlagsORAS.GB_Rebattle=Rebattle
-SAV_EventFlagsORAS.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsORAS.L_Ash=Volcanic Ash:
-SAV_EventFlagsORAS.L_Flag=Flag:
-SAV_EventFlagsORAS.L_IsSet=IsSet
-SAV_EventFlagsORAS.L_SkyTower=*Sky Tower
-SAV_EventFlagsORAS.L_UnSet=UnSet
-SAV_EventFlagsXY.B_Cancel=Cancel
-SAV_EventFlagsXY.B_LoadNew=Load New
-SAV_EventFlagsXY.B_LoadOld=Load Old
-SAV_EventFlagsXY.B_Save=Save
-SAV_EventFlagsXY.CHK_CustomFlag=Status:
-SAV_EventFlagsXY.flag_0001=Flag1
-SAV_EventFlagsXY.flag_0002=Flag2
-SAV_EventFlagsXY.flag_0003=Flag3
-SAV_EventFlagsXY.flag_0004=Flag4
-SAV_EventFlagsXY.flag_0005=Flag5
-SAV_EventFlagsXY.flag_0114=Zygarde Captured
-SAV_EventFlagsXY.flag_0115=Mewtwo Captured
-SAV_EventFlagsXY.flag_0285=Singles Statuette
-SAV_EventFlagsXY.flag_0286=Doubles Statuette
-SAV_EventFlagsXY.flag_0287=Triples Statuette
-SAV_EventFlagsXY.flag_0288=Rotation Statuette
-SAV_EventFlagsXY.flag_0289=Multi Statuette
-SAV_EventFlagsXY.flag_0290=Super Singles Unlocked
-SAV_EventFlagsXY.flag_0291=Super Doubles Unlocked
-SAV_EventFlagsXY.flag_0292=Super Triples Unlocked
-SAV_EventFlagsXY.flag_0293=Super Rotation Unlocked
-SAV_EventFlagsXY.flag_0294=Super Multi Unlocked
-SAV_EventFlagsXY.flag_0675=50: Beat Chatelaine
-SAV_EventFlagsXY.flag_0790=Zygarde Defeated
-SAV_EventFlagsXY.flag_0963=Mewtwo Defeated
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=Pokédex Obtained
-SAV_EventFlagsXY.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsXY.GB_Misc=Misc
-SAV_EventFlagsXY.GB_Rebattle=Rebattle
-SAV_EventFlagsXY.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsXY.L_Flag=Flag:
-SAV_EventFlagsXY.L_IsSet=IsSet
-SAV_EventFlagsXY.L_UnSet=UnSet
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -453,7 +363,6 @@ SAV_HallOfFame.L_Shiny=Shiny:
 SAV_HallOfFame.L_Victory=Victory Number:
 SAV_HallOfFame.Label_EncryptionConstant=Encryption Constant:
 SAV_HallOfFame.Label_Form=Form:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=Held Item:
 SAV_HallOfFame.Label_MetDate=Date:
 SAV_HallOfFame.Label_OT=OT:
@@ -490,7 +399,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=Cancel
 SAV_Inventory.B_GiveAll=Give All
 SAV_Inventory.B_Save=Save
@@ -550,17 +458,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -914,7 +814,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=Main
 SAV_SecretBase.f_PKM=Trainer Pokémon
 SAV_SecretBase.GB_Object=Object Layout
-SAV_SecretBase.GB_PKM=PKM
 SAV_SecretBase.L_ATK=ATK
 SAV_SecretBase.L_BaseLocation=Secret Base Location:
 SAV_SecretBase.L_Blackboard=Blackboard:
@@ -933,7 +832,6 @@ SAV_SecretBase.L_IVs=IVs
 SAV_SecretBase.L_Participant=Participant:
 SAV_SecretBase.L_PKFriendship=Friendship:
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=PPUps
 SAV_SecretBase.L_Rotation=Rotation Val:
 SAV_SecretBase.L_SpA=SpA
 SAV_SecretBase.L_SpD=SpD
@@ -943,7 +841,6 @@ SAV_SecretBase.L_TeamSlogan=Team Slogan:
 SAV_SecretBase.L_TrName=Trainer Name:
 SAV_SecretBase.L_X=X Coordinate:
 SAV_SecretBase.L_Y=Y Coordinate:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancel
 SAV_SimplePokedex.B_CaughtAll=Caught All
 SAV_SimplePokedex.B_CaughtNone=Caught None
@@ -1054,7 +951,6 @@ SAV_Trainer.L_SinglesC=Singles:
 SAV_Trainer.L_SkinColor=Skin Color:
 SAV_Trainer.L_Socks=Socks:
 SAV_Trainer.L_Started=Game Started:
-SAV_Trainer.L_Stats=Stats
 SAV_Trainer.L_Style=Style:
 SAV_Trainer.L_SuperB=Super
 SAV_Trainer.L_SuperC=Super
@@ -1178,17 +1074,6 @@ SettingsEditor.SetUpdateDex=Modify Pokédex
 SettingsEditor.SetUpdatePKM=Modify PKM Info
 SettingsEditor.ShinySprites=Shiny Sprites
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=Cancel
-SuperTrain.B_Save=Save
-SuperTrain.L_Bags=Training Bags
-SuperTrain.L_Records=Records
-SuperTrain.L_Species=Species:
-SuperTrain.L_Species2=Species
-SuperTrain.L_Time0=Time:
-SuperTrain.L_Time1=Time1
-SuperTrain.L_Time2=Time2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=UNKNOWN
 SuperTrainingEditor.B_All=Give All
 SuperTrainingEditor.B_Cancel=Cancel
 SuperTrainingEditor.B_None=Remove All
@@ -1235,4 +1120,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/es/lang_es.txt b/PKHeX.Core/Resources/text/es/lang_es.txt
index d0eecdb39..480766aea 100644
--- a/PKHeX.Core/Resources/text/es/lang_es.txt
+++ b/PKHeX.Core/Resources/text/es/lang_es.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Error
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Editor de Memorias / Poké Recreo
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=Editor de la apariencia del C-Gear
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Editor de Eventos (ORAS)
-SAV_EventFlagsXY=Editor de Eventos (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Editor de Hall de la Fama
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -46,7 +44,6 @@ SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
 SAV_Wondercard=Tarjetas misteriosas
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Editor de Medallas
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=Abortar
 ErrorWindow.B_Continue=Continuar
 ErrorWindow.B_CopyToClipboard=Copiar al portapapeles
 ErrorWindow.L_ProvideInfo=Por favor, proporciona esta información cuando reportes este fallo:
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C-Gear
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=Guardar PGL .JPEG
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=C. de Bayas
 Main.B_OpenBoxLayout=Fondos Cajas
 Main.B_OpenEventFlags=Eventos
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=Hall de la fama
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=Inventario
 Main.B_OpenLinkInfo=Datos Enlace
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=Poder O
 Main.B_OpenPokeBeans=Poké Beans
-Main.B_OpenPokeBlocks=Pokécubos
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=Pokédex
-Main.B_OpenPokePuffs=‎Pokélito
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=Base Secreta
 Main.B_OpenSuperTraining=Superentren.
 Main.B_OpenTrainerInfo=Entrenador
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=Tarjetas Misteriosas
 Main.B_OUTPasserby=Transeúntes
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=Guardar Cajas++
 Main.B_VerifyCHK=Checksums
 Main.BTN_History=Memorias
@@ -94,27 +101,40 @@ Main.CHK_Infected=Infectado
 Main.CHK_IsEgg=Huevo
 Main.CHK_Nicknamed=Apodo:
 Main.CHK_NSparkle=Activo
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=Huevo Disponible
 Main.GB_CurrentMoves=Ataques Actuales
 Main.GB_Daycare=Guardería
 Main.GB_EggConditions=Condiciones del huevo
 Main.GB_ExtraBytes=Bytes Extras
-Main.GB_Fused=Fusión
-Main.GB_GTS=GTS
 Main.GB_Markings=Marcas
 Main.GB_nOT=Ultimo dueño (no EO)
 Main.GB_OT=Info del Entrenador
 Main.GB_RelearnMoves=Recordar Movimientos
-Main.GB_SUBE=Viejo
 Main.L_BattleBox=Caja de Combate:
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=Semill.
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=ID de Sincronización:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
 Main.L_NSparkle=Brillo de N
 Main.L_Party=Equipo:
 Main.L_ReadOnlyOther=Sólo lectura.
 Main.L_ReadOnlyPBB=Sólo lectura.
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=Valor Seguro 1:
 Main.L_Secure2=Valor Seguro  2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=Región 3DS:
 Main.Label_Ability=Habilidad:
 Main.Label_ATK=Ataque:
@@ -137,6 +157,7 @@ Main.Label_EVs=EVs
 Main.Label_EXP=EXP:
 Main.Label_Form=Forma:
 Main.Label_Friendship=Felicidad:
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=Objeto Equipado:
 Main.Label_HiddenPowerPrefix=Tipo del Poder Oculto:
 Main.Label_HP=PS:
@@ -170,6 +191,7 @@ Main.Menu_About=Sobre PKHeX
 Main.Menu_BatchEditor=Editor por lotes
 Main.Menu_Data=Data
 Main.Menu_Database=Base de datos de PKM
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=Exportar Cajas
 Main.Menu_Exit=Salir
 Main.Menu_ExportBAK=Guardar BAK
@@ -182,17 +204,22 @@ Main.Menu_LoadBoxes=Cargar Cajas
 Main.Menu_MGDatabase=Base de datos de Regalo Misterioso
 Main.Menu_Open=Abrir...
 Main.Menu_Options=Opciones
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=Informe de la caja
 Main.Menu_Save=Guardar PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=Exportar caja de combate desde el portapapeles
 Main.Menu_ShowdownExportParty=Exportar equipo desde el portapapeles
 Main.Menu_ShowdownExportPKM=Exportar set desde el portapapeles
 Main.Menu_ShowdownImportPKM=Importar set desde el portapapeles
 Main.Menu_Tools=Herramientas
-Main.Menu_Unicode=Unicode
-Main.mnu2View=Ver
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=Borrar
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=Colocar
 Main.mnuView=Ver
 Main.Tab_Attacks=Ataques
@@ -213,7 +240,6 @@ MemoryAmie.GB_Residence=El Pokémon ha residido en:
 MemoryAmie.L_Arguments=Deshabilitado ; Nunca dejado ; EO ; Gen Pas ; Memorias con ; Pokémon ; Área ; Objeto(s) ; Mov. ; Localización ;
 MemoryAmie.L_Country=País
 MemoryAmie.L_CT_Affection=Affection:
-MemoryAmie.L_cT_Affection=Cariño:
 MemoryAmie.L_CT_Feeling=Feeling:
 MemoryAmie.L_CT_Friendship=Amistad:
 MemoryAmie.L_CT_Quality=Intensity:
@@ -261,10 +287,8 @@ SAV_BoxLayout.B_Cancel=Cancelar
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=Guardar
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=Fndo:
 SAV_BoxLayout.L_BoxName=Nombre de la caja:
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=Fondos desbloqueados:
 SAV_BoxLayout.L_Unlocked=Desbloq.:
 SAV_CGearSkin.B_Cancel=Cancelar
 SAV_CGearSkin.B_ExportCGB=Exportar .cgb
@@ -323,122 +347,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=Cancelar
-SAV_EventFlagsORAS.B_LoadNew=Carg. Nuevo
-SAV_EventFlagsORAS.B_LoadOld=Carg. Antig.
-SAV_EventFlagsORAS.B_Save=Guardar
-SAV_EventFlagsORAS.CHK_CustomFlag=Estado:
-SAV_EventFlagsORAS.flag_0172=Cresselia Derrotado
-SAV_EventFlagsORAS.flag_0173=Raikou Derrotado
-SAV_EventFlagsORAS.flag_0174=Entei Derrotado
-SAV_EventFlagsORAS.flag_0175=Suicune Derrotado
-SAV_EventFlagsORAS.flag_0176=Cobalion Derrotado
-SAV_EventFlagsORAS.flag_0177=Terrakion Derrotado
-SAV_EventFlagsORAS.flag_0178=Virizion Derrotado
-SAV_EventFlagsORAS.flag_0179=Uxie Derrotado
-SAV_EventFlagsORAS.flag_0180=Mesprit Derrotado
-SAV_EventFlagsORAS.flag_0181=Azelf Derrotado
-SAV_EventFlagsORAS.flag_0182=(OR) Reshiram Derrotado
-SAV_EventFlagsORAS.flag_0183=(AS) Zekrom Derrotado
-SAV_EventFlagsORAS.flag_0184=Kyurem Derrotado
-SAV_EventFlagsORAS.flag_0208=(OR) Ho-Oh Derrotado
-SAV_EventFlagsORAS.flag_0209=(AS) Lugia Derrotado
-SAV_EventFlagsORAS.flag_0252=Regigigas Derrotado
-SAV_EventFlagsORAS.flag_0260=Heatran Derrotado
-SAV_EventFlagsORAS.flag_0284=Singles Statuette
-SAV_EventFlagsORAS.flag_0285=Doubles Statuette
-SAV_EventFlagsORAS.flag_0286=Triples Statuette
-SAV_EventFlagsORAS.flag_0287=Rotation Statuette
-SAV_EventFlagsORAS.flag_0288=Multi Statuette
-SAV_EventFlagsORAS.flag_0289=Super Singles Unlocked
-SAV_EventFlagsORAS.flag_0290=Super Doubles Unlocked
-SAV_EventFlagsORAS.flag_0291=Super Triples Unlocked
-SAV_EventFlagsORAS.flag_0292=Super Rotation Unlocked
-SAV_EventFlagsORAS.flag_0293=Super Multi Unlocked
-SAV_EventFlagsORAS.flag_0419=(OR) Latias Derrotado
-SAV_EventFlagsORAS.flag_0420=(AS) Latios Derrotado
-SAV_EventFlagsORAS.flag_0647=(AS) Kyogre Derrotado
-SAV_EventFlagsORAS.flag_0648=(OR) Groudon Derrotado
-SAV_EventFlagsORAS.flag_0945=Deoxys Derrotado
-SAV_EventFlagsORAS.flag_0956=Regirock Derrotado
-SAV_EventFlagsORAS.flag_0957=Regice Derrotado
-SAV_EventFlagsORAS.flag_0958=Registeel Derrotado
-SAV_EventFlagsORAS.flag_2811=Raikou Capturado
-SAV_EventFlagsORAS.flag_2812=Entei Capturado
-SAV_EventFlagsORAS.flag_2813=Suicune Capturado
-SAV_EventFlagsORAS.flag_2814=(AS) Lugia Capturado
-SAV_EventFlagsORAS.flag_2815=(OR) Ho-Oh Capturado
-SAV_EventFlagsORAS.flag_2816=Uxie Capturado
-SAV_EventFlagsORAS.flag_2817=Mesprit Capturado
-SAV_EventFlagsORAS.flag_2818=Azelf Capturado
-SAV_EventFlagsORAS.flag_2819=(AS) Dialga Capturado
-SAV_EventFlagsORAS.flag_2820=(OR) Palkia Capturado
-SAV_EventFlagsORAS.flag_2821=Heatran Capturado
-SAV_EventFlagsORAS.flag_2822=Regigigas Capturado
-SAV_EventFlagsORAS.flag_2823=Giratina Capturado
-SAV_EventFlagsORAS.flag_2824=Cresselia Capturado
-SAV_EventFlagsORAS.flag_2825=Cobalion Capturado
-SAV_EventFlagsORAS.flag_2826=Terrakion Capturado
-SAV_EventFlagsORAS.flag_2827=Virizion Capturado
-SAV_EventFlagsORAS.flag_2828=(OR) Tornadus Capturado
-SAV_EventFlagsORAS.flag_2829=(AS) Thundurus Capturado
-SAV_EventFlagsORAS.flag_2830=(OR) Reshiram Capturado
-SAV_EventFlagsORAS.flag_2831=(AS) Zekrom Capturado
-SAV_EventFlagsORAS.flag_2832=Landorus Capturado
-SAV_EventFlagsORAS.flag_2833=Kyurem Capturado
-SAV_EventFlagsORAS.flag_2834=(OR) Latias Capturado
-SAV_EventFlagsORAS.flag_2835=(AS) Latios Capturado
-SAV_EventFlagsORAS.flag_2836=Regirock Capturado
-SAV_EventFlagsORAS.flag_2837=Regice Capturado
-SAV_EventFlagsORAS.flag_2838=Registeel Capturado
-SAV_EventFlagsORAS.flag_2839=(OR) Groudon Capturado
-SAV_EventFlagsORAS.flag_2840=(AS) Kyogre Capturado
-SAV_EventFlagsORAS.flag_2842=Deoxys Capturado
-SAV_EventFlagsORAS.GB_FlagStatus=Comprobar Estado de Flags
-SAV_EventFlagsORAS.GB_Misc=Misc
-SAV_EventFlagsORAS.GB_Rebattle=Rebattle
-SAV_EventFlagsORAS.GB_Researcher=Investigador de FlagDiff
-SAV_EventFlagsORAS.L_Ash=Ceniza volcánica:
-SAV_EventFlagsORAS.L_Flag=Flag:
-SAV_EventFlagsORAS.L_IsSet=IsSet
-SAV_EventFlagsORAS.L_SkyTower=*Torre del Cielo
-SAV_EventFlagsORAS.L_UnSet=UnSet
-SAV_EventFlagsXY.B_Cancel=Cancelar
-SAV_EventFlagsXY.B_LoadNew=Carg. Nuevo
-SAV_EventFlagsXY.B_LoadOld=Carg. Antig.
-SAV_EventFlagsXY.B_Save=Guardar
-SAV_EventFlagsXY.CHK_CustomFlag=Estado:
-SAV_EventFlagsXY.flag_0001=Flag1
-SAV_EventFlagsXY.flag_0002=Flag2
-SAV_EventFlagsXY.flag_0003=Flag3
-SAV_EventFlagsXY.flag_0004=Flag4
-SAV_EventFlagsXY.flag_0005=Flag5
-SAV_EventFlagsXY.flag_0114=Zygarde Capturado
-SAV_EventFlagsXY.flag_0115=Mewtwo Capturado
-SAV_EventFlagsXY.flag_0285=Singles Statuette
-SAV_EventFlagsXY.flag_0286=Doubles Statuette
-SAV_EventFlagsXY.flag_0287=Triples Statuette
-SAV_EventFlagsXY.flag_0288=Rotation Statuette
-SAV_EventFlagsXY.flag_0289=Multi Statuette
-SAV_EventFlagsXY.flag_0290=Super Singles Unlocked
-SAV_EventFlagsXY.flag_0291=Super Doubles Unlocked
-SAV_EventFlagsXY.flag_0292=Super Triples Unlocked
-SAV_EventFlagsXY.flag_0293=Super Rotation Unlocked
-SAV_EventFlagsXY.flag_0294=Super Multi Unlocked
-SAV_EventFlagsXY.flag_0675=50: Beat Chatelaine
-SAV_EventFlagsXY.flag_0790=Zygarde Derrotado
-SAV_EventFlagsXY.flag_0963=Mewtwo Derrotado
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=Pokédex Obtenido
-SAV_EventFlagsXY.GB_FlagStatus=Comprobar Estado de Flags
-SAV_EventFlagsXY.GB_Misc=Misc
-SAV_EventFlagsXY.GB_Rebattle=Rebattle
-SAV_EventFlagsXY.GB_Researcher=Investigador de FlagDiff
-SAV_EventFlagsXY.L_Flag=Flag:
-SAV_EventFlagsXY.L_IsSet=IsSet
-SAV_EventFlagsXY.L_UnSet=UnSet
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -455,7 +363,6 @@ SAV_HallOfFame.L_Shiny=Brillante:
 SAV_HallOfFame.L_Victory=Núm. Victorias:
 SAV_HallOfFame.Label_EncryptionConstant=Cte. de Encriptación:
 SAV_HallOfFame.Label_Form=Forma:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=Objeto:
 SAV_HallOfFame.Label_MetDate=Fecha:
 SAV_HallOfFame.Label_OT=EO:
@@ -492,7 +399,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=Cancelar
 SAV_Inventory.B_GiveAll=Todos Max
 SAV_Inventory.B_Save=Guardar
@@ -552,17 +458,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -916,7 +814,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=Inicio
 SAV_SecretBase.f_PKM=Entrenador Pokémon
 SAV_SecretBase.GB_Object=Objetos
-SAV_SecretBase.GB_PKM=Pokémon
 SAV_SecretBase.L_ATK=Atq.
 SAV_SecretBase.L_BaseLocation=Localización Base:
 SAV_SecretBase.L_Blackboard=Pizarra:
@@ -935,7 +832,6 @@ SAV_SecretBase.L_IVs=IVs
 SAV_SecretBase.L_Participant=Participante:
 SAV_SecretBase.L_PKFriendship=Amistad:
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=PPs
 SAV_SecretBase.L_Rotation=Rotación:
 SAV_SecretBase.L_SpA=AtqE.
 SAV_SecretBase.L_SpD=DefE.
@@ -945,7 +841,6 @@ SAV_SecretBase.L_TeamSlogan=Eslógan Eq.:
 SAV_SecretBase.L_TrName=Nombre Entrenador:
 SAV_SecretBase.L_X=Coord. X:
 SAV_SecretBase.L_Y=Coord. Y:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancelar
 SAV_SimplePokedex.B_CaughtAll=Atrapados Todos
 SAV_SimplePokedex.B_CaughtNone=Atrapado Ninguno
@@ -1056,7 +951,6 @@ SAV_Trainer.L_SinglesC=Indiv.:
 SAV_Trainer.L_SkinColor=Color Piel:
 SAV_Trainer.L_Socks=Calcetines:
 SAV_Trainer.L_Started=Comienzo:
-SAV_Trainer.L_Stats=Estadísticas
 SAV_Trainer.L_Style=Estilo:
 SAV_Trainer.L_SuperB=Super
 SAV_Trainer.L_SuperC=Super
@@ -1180,17 +1074,6 @@ SettingsEditor.SetUpdateDex=Modificar Pokédex
 SettingsEditor.SetUpdatePKM=Modificar info PKM
 SettingsEditor.ShinySprites=Shiny Sprites
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=Cancel
-SuperTrain.B_Save=Save
-SuperTrain.L_Bags=Training Bags
-SuperTrain.L_Records=Records
-SuperTrain.L_Species=Species:
-SuperTrain.L_Species2=Species
-SuperTrain.L_Time0=Time:
-SuperTrain.L_Time1=Time1
-SuperTrain.L_Time2=Time2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=UNKNOWN
 SuperTrainingEditor.B_All=Dar todos
 SuperTrainingEditor.B_Cancel=Cancelar
 SuperTrainingEditor.B_None=Quitar todos
@@ -1238,4 +1121,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/fr/lang_fr.txt b/PKHeX.Core/Resources/text/fr/lang_fr.txt
index 1fe460d53..ecee308d2 100644
--- a/PKHeX.Core/Resources/text/fr/lang_fr.txt
+++ b/PKHeX.Core/Resources/text/fr/lang_fr.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Erreur
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Memory / Amie Editor
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=C-Gear Skin
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Event Flag Editor (ORAS)
-SAV_EventFlagsXY=Event Flag Editor (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Hall of Fame Editor
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -46,7 +44,6 @@ SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Medal Editor
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=Abandonner
 ErrorWindow.B_Continue=Continuer
 ErrorWindow.B_CopyToClipboard=Copier dans le presse-papier
 ErrorWindow.L_ProvideInfo=Veuillez fournir les informations suivantes dans votre rapport d'erreur :
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C-Gear Skin
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=Sauver image PGL
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=Baies
 Main.B_OpenBoxLayout=Fonds Boîte
 Main.B_OpenEventFlags=Évènements
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=Panthéon
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=Objets
 Main.B_OpenLinkInfo=Link Data
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=O-Auras
 Main.B_OpenPokeBeans=Poké Beans
-Main.B_OpenPokeBlocks=Pokéblocks
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=Pokédex
-Main.B_OpenPokePuffs=Pofiteroles
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=Secret Base
 Main.B_OpenSuperTraining=Super Train
 Main.B_OpenTrainerInfo=Infos Dress.
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=CarteMiracle
 Main.B_OUTPasserby=PSS
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=Save Box Data++
 Main.B_VerifyCHK=Checksums
 Main.BTN_History=Souvenirs
@@ -93,26 +100,41 @@ Main.CHK_HackedStats=Hacked Stats
 Main.CHK_Infected=Infecté
 Main.CHK_IsEgg=Œuf
 Main.CHK_Nicknamed=Surnom :
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=Œuf disponible
 Main.GB_CurrentMoves=Capacités actuelles
 Main.GB_Daycare=Pension
 Main.GB_EggConditions=Éclosion
 Main.GB_ExtraBytes=Octets supplémentaires
-Main.GB_Fused=Fusion
-Main.GB_GTS=GTS
 Main.GB_Markings=Marquages
 Main.GB_nOT=Dernier Dresseur connu
 Main.GB_OT=Infos Dresseur
 Main.GB_RelearnMoves=Capacités réapprises
-Main.GB_SUBE=Vieil H.
 Main.L_BattleBox=Boîte de Combat :
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=Seed
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=Game Sync ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=Équipe :
 Main.L_ReadOnlyOther=Cet onglet est en lecture seule.
 Main.L_ReadOnlyPBB=Cet onglet est en lecture seule.
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=Secure Value 1:
 Main.L_Secure2=Secure Value 2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=Région 3DS :
 Main.Label_Ability=Talent :
 Main.Label_ATK=Attaque :
@@ -135,6 +157,7 @@ Main.Label_EVs=EV
 Main.Label_EXP=Expérience :
 Main.Label_Form=Forme
 Main.Label_Friendship=Bonheur :
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=Objet :
 Main.Label_HiddenPowerPrefix=Type Puissance Cachée :
 Main.Label_HP=PV :
@@ -168,6 +191,7 @@ Main.Menu_About=À propos de PKHeX
 Main.Menu_BatchEditor=Éditeur en vrac
 Main.Menu_Data=Données
 Main.Menu_Database=Base de données PKM
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=Dumper Boîtes
 Main.Menu_Exit=Quitter
 Main.Menu_ExportBAK=Enregistrer BAK
@@ -180,17 +204,22 @@ Main.Menu_LoadBoxes=Charger Boîtes
 Main.Menu_MGDatabase=Base de données de cadeaux de mystère
 Main.Menu_Open=Ouvrir...
 Main.Menu_Options=Options
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=Rapport de données Box
 Main.Menu_Save=Enregistrer PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=Exporter la Boîte de Combat
 Main.Menu_ShowdownExportParty=Exporter équipe
 Main.Menu_ShowdownExportPKM=Exporter set Showdown
 Main.Menu_ShowdownImportPKM=Importer set Showdown
 Main.Menu_Tools=Outils
-Main.Menu_Unicode=Unicode
-Main.mnu2View=Voir
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=Effacer
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=Appliquer
 Main.mnuView=Voir
 Main.Tab_Attacks=Capacités
@@ -211,7 +240,6 @@ MemoryAmie.GB_Residence=Ce Pokémon a résidé (en) (à) :
 MemoryAmie.L_Arguments=Onglet désactivé ; Toujours avec ; DO ; Génération précédente - ; Souvenirs avec ; Pokémon  ; Zone  ; Objet(s)  ; Attaque  ; Emplacement
 MemoryAmie.L_Country=Pays
 MemoryAmie.L_CT_Affection=Affection :
-MemoryAmie.L_cT_Affection=Affection:
 MemoryAmie.L_CT_Feeling=Feeling :
 MemoryAmie.L_CT_Friendship=Bonheur :
 MemoryAmie.L_CT_Quality=Intensité :
@@ -263,10 +291,8 @@ SAV_BoxLayout.B_Cancel=Cancel
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=Save
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=BG:
 SAV_BoxLayout.L_BoxName=Box Name:
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=Unlocked BG Flags:
 SAV_BoxLayout.L_Unlocked=Unlocked:
 SAV_CGearSkin.B_Cancel=Cancel
 SAV_CGearSkin.B_ExportCGB=Export .cgb
@@ -325,122 +351,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=Cancel
-SAV_EventFlagsORAS.B_LoadNew=Load New
-SAV_EventFlagsORAS.B_LoadOld=Load Old
-SAV_EventFlagsORAS.B_Save=Save
-SAV_EventFlagsORAS.CHK_CustomFlag=Status:
-SAV_EventFlagsORAS.flag_0172=Cresselia Defeated
-SAV_EventFlagsORAS.flag_0173=Raikou Defeated
-SAV_EventFlagsORAS.flag_0174=Entei Defeated
-SAV_EventFlagsORAS.flag_0175=Suicune Defeated
-SAV_EventFlagsORAS.flag_0176=Cobalion Defeated
-SAV_EventFlagsORAS.flag_0177=Terrakion Defeated
-SAV_EventFlagsORAS.flag_0178=Virizion Defeated
-SAV_EventFlagsORAS.flag_0179=Uxie Defeated
-SAV_EventFlagsORAS.flag_0180=Mesprit Defeated
-SAV_EventFlagsORAS.flag_0181=Azelf Defeated
-SAV_EventFlagsORAS.flag_0182=(OR) Reshiram Defeated
-SAV_EventFlagsORAS.flag_0183=(AS) Zekrom Defeated
-SAV_EventFlagsORAS.flag_0184=Kyurem Defeated
-SAV_EventFlagsORAS.flag_0208=(OR) Ho-Oh Defeated
-SAV_EventFlagsORAS.flag_0209=(AS) Lugia Defeated
-SAV_EventFlagsORAS.flag_0252=Regigigas Defeated
-SAV_EventFlagsORAS.flag_0260=Heatran Defeated
-SAV_EventFlagsORAS.flag_0284=Singles Statuette
-SAV_EventFlagsORAS.flag_0285=Doubles Statuette
-SAV_EventFlagsORAS.flag_0286=Triples Statuette
-SAV_EventFlagsORAS.flag_0287=Rotation Statuette
-SAV_EventFlagsORAS.flag_0288=Multi Statuette
-SAV_EventFlagsORAS.flag_0289=Super Singles Unlocked
-SAV_EventFlagsORAS.flag_0290=Super Doubles Unlocked
-SAV_EventFlagsORAS.flag_0291=Super Triples Unlocked
-SAV_EventFlagsORAS.flag_0292=Super Rotation Unlocked
-SAV_EventFlagsORAS.flag_0293=Super Multi Unlocked
-SAV_EventFlagsORAS.flag_0419=(OR) Latias Defeated
-SAV_EventFlagsORAS.flag_0420=(AS) Latios Defeated
-SAV_EventFlagsORAS.flag_0647=(AS) Kyogre Defeated
-SAV_EventFlagsORAS.flag_0648=(OR) Groudon Defeated
-SAV_EventFlagsORAS.flag_0945=Deoxys Defeated
-SAV_EventFlagsORAS.flag_0956=Regirock Defeated
-SAV_EventFlagsORAS.flag_0957=Regice Defeated
-SAV_EventFlagsORAS.flag_0958=Registeel Defeated
-SAV_EventFlagsORAS.flag_2811=Raikou Captured
-SAV_EventFlagsORAS.flag_2812=Entei Captured
-SAV_EventFlagsORAS.flag_2813=Suicune Captured
-SAV_EventFlagsORAS.flag_2814=(AS) Lugia Captured
-SAV_EventFlagsORAS.flag_2815=(OR) Ho-Oh Captured
-SAV_EventFlagsORAS.flag_2816=Uxie Captured
-SAV_EventFlagsORAS.flag_2817=Mesprit Captured
-SAV_EventFlagsORAS.flag_2818=Azelf Captured
-SAV_EventFlagsORAS.flag_2819=(AS) Dialga Captured
-SAV_EventFlagsORAS.flag_2820=(OR) Palkia Captured
-SAV_EventFlagsORAS.flag_2821=Heatran Captured
-SAV_EventFlagsORAS.flag_2822=Regigigas Captured
-SAV_EventFlagsORAS.flag_2823=Giratina Captured
-SAV_EventFlagsORAS.flag_2824=Cresselia Captured
-SAV_EventFlagsORAS.flag_2825=Cobalion Captured
-SAV_EventFlagsORAS.flag_2826=Terrakion Captured
-SAV_EventFlagsORAS.flag_2827=Virizion Captured
-SAV_EventFlagsORAS.flag_2828=(OR) Tornadus Captured
-SAV_EventFlagsORAS.flag_2829=(AS) Thundurus Captured
-SAV_EventFlagsORAS.flag_2830=(OR) Reshiram Captured
-SAV_EventFlagsORAS.flag_2831=(AS) Zekrom Captured
-SAV_EventFlagsORAS.flag_2832=Landorus Captured
-SAV_EventFlagsORAS.flag_2833=Kyurem Captured
-SAV_EventFlagsORAS.flag_2834=(OR) Latias Captured
-SAV_EventFlagsORAS.flag_2835=(AS) Latios Captured
-SAV_EventFlagsORAS.flag_2836=Regirock Captured
-SAV_EventFlagsORAS.flag_2837=Regice Captured
-SAV_EventFlagsORAS.flag_2838=Registeel Captured
-SAV_EventFlagsORAS.flag_2839=(OR) Groudon Captured
-SAV_EventFlagsORAS.flag_2840=(AS) Kyogre Captured
-SAV_EventFlagsORAS.flag_2842=Deoxys Captured
-SAV_EventFlagsORAS.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsORAS.GB_Misc=Misc
-SAV_EventFlagsORAS.GB_Rebattle=Rebattle
-SAV_EventFlagsORAS.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsORAS.L_Ash=Volcanic Ash:
-SAV_EventFlagsORAS.L_Flag=Flag:
-SAV_EventFlagsORAS.L_IsSet=IsSet
-SAV_EventFlagsORAS.L_SkyTower=*Sky Tower
-SAV_EventFlagsORAS.L_UnSet=UnSet
-SAV_EventFlagsXY.B_Cancel=Cancel
-SAV_EventFlagsXY.B_LoadNew=Load New
-SAV_EventFlagsXY.B_LoadOld=Load Old
-SAV_EventFlagsXY.B_Save=Save
-SAV_EventFlagsXY.CHK_CustomFlag=Status:
-SAV_EventFlagsXY.flag_0001=Flag1
-SAV_EventFlagsXY.flag_0002=Flag2
-SAV_EventFlagsXY.flag_0003=Flag3
-SAV_EventFlagsXY.flag_0004=Flag4
-SAV_EventFlagsXY.flag_0005=Flag5
-SAV_EventFlagsXY.flag_0114=Zygarde Captured
-SAV_EventFlagsXY.flag_0115=Mewtwo Captured
-SAV_EventFlagsXY.flag_0285=Singles Statuette
-SAV_EventFlagsXY.flag_0286=Doubles Statuette
-SAV_EventFlagsXY.flag_0287=Triples Statuette
-SAV_EventFlagsXY.flag_0288=Rotation Statuette
-SAV_EventFlagsXY.flag_0289=Multi Statuette
-SAV_EventFlagsXY.flag_0290=Super Singles Unlocked
-SAV_EventFlagsXY.flag_0291=Super Doubles Unlocked
-SAV_EventFlagsXY.flag_0292=Super Triples Unlocked
-SAV_EventFlagsXY.flag_0293=Super Rotation Unlocked
-SAV_EventFlagsXY.flag_0294=Super Multi Unlocked
-SAV_EventFlagsXY.flag_0675=50: Beat Chatelaine
-SAV_EventFlagsXY.flag_0790=Zygarde Defeated
-SAV_EventFlagsXY.flag_0963=Mewtwo Defeated
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=Pokédex Obtained
-SAV_EventFlagsXY.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsXY.GB_Misc=Misc
-SAV_EventFlagsXY.GB_Rebattle=Rebattle
-SAV_EventFlagsXY.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsXY.L_Flag=Flag:
-SAV_EventFlagsXY.L_IsSet=IsSet
-SAV_EventFlagsXY.L_UnSet=UnSet
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -457,7 +367,6 @@ SAV_HallOfFame.L_Shiny=Shiny:
 SAV_HallOfFame.L_Victory=Victory Number:
 SAV_HallOfFame.Label_EncryptionConstant=Encryption Constant:
 SAV_HallOfFame.Label_Form=Form:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=Held Item:
 SAV_HallOfFame.Label_MetDate=Date:
 SAV_HallOfFame.Label_OT=OT:
@@ -494,7 +403,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=Cancel
 SAV_Inventory.B_GiveAll=Give All
 SAV_Inventory.B_Save=Save
@@ -554,17 +462,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -918,7 +818,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=Main
 SAV_SecretBase.f_PKM=Trainer Pokémon
 SAV_SecretBase.GB_Object=Object Layout
-SAV_SecretBase.GB_PKM=PKM
 SAV_SecretBase.L_ATK=ATK
 SAV_SecretBase.L_BaseLocation=Secret Base Location:
 SAV_SecretBase.L_Blackboard=Blackboard:
@@ -937,7 +836,6 @@ SAV_SecretBase.L_IVs=IVs
 SAV_SecretBase.L_Participant=Participant:
 SAV_SecretBase.L_PKFriendship=Friendship:
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=PPUps
 SAV_SecretBase.L_Rotation=Rotation Val:
 SAV_SecretBase.L_SpA=SpA
 SAV_SecretBase.L_SpD=SpD
@@ -947,7 +845,6 @@ SAV_SecretBase.L_TeamSlogan=Team Slogan:
 SAV_SecretBase.L_TrName=Trainer Name:
 SAV_SecretBase.L_X=X Coordinate:
 SAV_SecretBase.L_Y=Y Coordinate:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancel
 SAV_SimplePokedex.B_CaughtAll=Caught All
 SAV_SimplePokedex.B_CaughtNone=Caught None
@@ -1058,7 +955,6 @@ SAV_Trainer.L_SinglesC=Singles:
 SAV_Trainer.L_SkinColor=Skin Color:
 SAV_Trainer.L_Socks=Socks:
 SAV_Trainer.L_Started=Game Started:
-SAV_Trainer.L_Stats=Stats
 SAV_Trainer.L_Style=Style:
 SAV_Trainer.L_SuperB=Super
 SAV_Trainer.L_SuperC=Super
@@ -1182,17 +1078,6 @@ SettingsEditor.SetUpdateDex=Modifier Infos Pokédex
 SettingsEditor.SetUpdatePKM=Modifier Infos Pokémon
 SettingsEditor.ShinySprites=Shiny Sprites
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=Cancel
-SuperTrain.B_Save=Save
-SuperTrain.L_Bags=Training Bags
-SuperTrain.L_Records=Records
-SuperTrain.L_Species=Species:
-SuperTrain.L_Species2=Species
-SuperTrain.L_Time0=Time:
-SuperTrain.L_Time1=Time1
-SuperTrain.L_Time2=Time2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=UNKNOWN
 SuperTrainingEditor.B_All=Give All
 SuperTrainingEditor.B_Cancel=Cancel
 SuperTrainingEditor.B_None=Remove All
@@ -1239,4 +1124,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/it/lang_it.txt b/PKHeX.Core/Resources/text/it/lang_it.txt
index 6dbe329ee..b7578fe31 100644
--- a/PKHeX.Core/Resources/text/it/lang_it.txt
+++ b/PKHeX.Core/Resources/text/it/lang_it.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Error
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Memory / Amie Editor
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=C-Gear Skin
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Event Flag Editor (ORAS)
-SAV_EventFlagsXY=Event Flag Editor (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Hall of Fame Editor
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -44,9 +42,8 @@ SAV_SuperTrain=Super Training Records
 SAV_Trainer=Trainer Data Editor
 SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
-SAV_Wondercard=Wonder Card I/O
+SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Medal Editor
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=Abort
 ErrorWindow.B_Continue=Continue
 ErrorWindow.B_CopyToClipboard=Copy to Clipboard
 ErrorWindow.L_ProvideInfo=Please provide this information when reporting this error:
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C-Gear Skin
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=Save PGL .JPEG
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=Berry Field
 Main.B_OpenBoxLayout=Box Layout
 Main.B_OpenEventFlags=Event Flags
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=Hall of Fame
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=Items
 Main.B_OpenLinkInfo=Link Data
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=O-Powers
 Main.B_OpenPokeBeans=Poké Beans
-Main.B_OpenPokeBlocks=Pokéblocks
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=Pokédex
-Main.B_OpenPokePuffs=‎Poké Puffs
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=Secret Base
 Main.B_OpenSuperTraining=Super Train
 Main.B_OpenTrainerInfo=Trainer Info
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=WonderCard
 Main.B_OUTPasserby=Passerby
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=Save Box Data++
 Main.B_VerifyCHK=Verify Checksums
 Main.BTN_History=Memories
@@ -93,26 +100,41 @@ Main.CHK_HackedStats=Hacked Stats
 Main.CHK_Infected=Infected
 Main.CHK_IsEgg=Is Egg
 Main.CHK_Nicknamed=Nickname:
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=Egg Available
 Main.GB_CurrentMoves=Current Moves
 Main.GB_Daycare=Daycare
 Main.GB_EggConditions=Egg Met Conditions
 Main.GB_ExtraBytes=Extra Bytes
-Main.GB_Fused=Fused
-Main.GB_GTS=GTS
 Main.GB_Markings=Markings
 Main.GB_nOT=Latest (not OT) Handler
 Main.GB_OT=Trainer Information
 Main.GB_RelearnMoves=Relearn Moves
-Main.GB_SUBE=OldMan
 Main.L_BattleBox=Battle Box:
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=Seed
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=Game Sync ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=Party:
 Main.L_ReadOnlyOther=This tab is read only.
 Main.L_ReadOnlyPBB=This is read only.
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=Secure Value 1:
 Main.L_Secure2=Secure Value 2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=3DS Region:
 Main.Label_Ability=Ability:
 Main.Label_ATK=Atk:
@@ -135,6 +157,7 @@ Main.Label_EVs=EVs
 Main.Label_EXP=EXP:
 Main.Label_Form=Form:
 Main.Label_Friendship=Friendship:
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=Held Item:
 Main.Label_HiddenPowerPrefix=Hidden Power Type:
 Main.Label_HP=HP:
@@ -168,6 +191,7 @@ Main.Menu_About=About PKHeX
 Main.Menu_BatchEditor=Batch Editor
 Main.Menu_Data=Data
 Main.Menu_Database=PKM Database
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=Dump Boxes
 Main.Menu_Exit=Quit
 Main.Menu_ExportBAK=Export BAK
@@ -180,17 +204,22 @@ Main.Menu_LoadBoxes=Load Boxes
 Main.Menu_MGDatabase=Mystery Gift Database
 Main.Menu_Open=Open...
 Main.Menu_Options=Options
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=Box Data Report
 Main.Menu_Save=Save PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=Export Battle Box to Clipboard
 Main.Menu_ShowdownExportParty=Export Party to Clipboard
 Main.Menu_ShowdownExportPKM=Export Set to Clipboard
 Main.Menu_ShowdownImportPKM=Import Set from Clipboard
 Main.Menu_Tools=Tools
-Main.Menu_Unicode=Unicode
-Main.mnu2View=Vedi
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=Elimina
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=Applica
 Main.mnuView=Vedi
 Main.Tab_Attacks=Attacks
@@ -210,7 +239,6 @@ MemoryAmie.GB_M_OT=Memories with Original Trainer
 MemoryAmie.GB_Residence=Pokémon has Resided in:
 MemoryAmie.L_Arguments=Disabled ; Never left ; OT ; Past Gen ; Memories with ; Pokémon ; Area ; Item(s) ; Move ; Location ;
 MemoryAmie.L_Country=Country
-MemoryAmie.L_cT_Affection=Affection:
 MemoryAmie.L_CT_Affection=Affection:
 MemoryAmie.L_CT_Feeling=Feeling:
 MemoryAmie.L_CT_Friendship=Friendship:
@@ -263,10 +291,8 @@ SAV_BoxLayout.B_Cancel=Cancel
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=Save
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=BG:
 SAV_BoxLayout.L_BoxName=Box Name:
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=Unlocked BG Flags:
 SAV_BoxLayout.L_Unlocked=Unlocked:
 SAV_CGearSkin.B_Cancel=Cancel
 SAV_CGearSkin.B_ExportCGB=Export .cgb
@@ -325,122 +351,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=Cancel
-SAV_EventFlagsORAS.B_LoadNew=Load New
-SAV_EventFlagsORAS.B_LoadOld=Load Old
-SAV_EventFlagsORAS.B_Save=Save
-SAV_EventFlagsORAS.CHK_CustomFlag=Status:
-SAV_EventFlagsORAS.flag_0172=Cresselia Defeated
-SAV_EventFlagsORAS.flag_0173=Raikou Defeated
-SAV_EventFlagsORAS.flag_0174=Entei Defeated
-SAV_EventFlagsORAS.flag_0175=Suicune Defeated
-SAV_EventFlagsORAS.flag_0176=Cobalion Defeated
-SAV_EventFlagsORAS.flag_0177=Terrakion Defeated
-SAV_EventFlagsORAS.flag_0178=Virizion Defeated
-SAV_EventFlagsORAS.flag_0179=Uxie Defeated
-SAV_EventFlagsORAS.flag_0180=Mesprit Defeated
-SAV_EventFlagsORAS.flag_0181=Azelf Defeated
-SAV_EventFlagsORAS.flag_0182=(OR) Reshiram Defeated
-SAV_EventFlagsORAS.flag_0183=(AS) Zekrom Defeated
-SAV_EventFlagsORAS.flag_0184=Kyurem Defeated
-SAV_EventFlagsORAS.flag_0208=(OR) Ho-Oh Defeated
-SAV_EventFlagsORAS.flag_0209=(AS) Lugia Defeated
-SAV_EventFlagsORAS.flag_0252=Regigigas Defeated
-SAV_EventFlagsORAS.flag_0260=Heatran Defeated
-SAV_EventFlagsORAS.flag_0284=Singles Statuette
-SAV_EventFlagsORAS.flag_0285=Doubles Statuette
-SAV_EventFlagsORAS.flag_0286=Triples Statuette
-SAV_EventFlagsORAS.flag_0287=Rotation Statuette
-SAV_EventFlagsORAS.flag_0288=Multi Statuette
-SAV_EventFlagsORAS.flag_0289=Super Singles Unlocked
-SAV_EventFlagsORAS.flag_0290=Super Doubles Unlocked
-SAV_EventFlagsORAS.flag_0291=Super Triples Unlocked
-SAV_EventFlagsORAS.flag_0292=Super Rotation Unlocked
-SAV_EventFlagsORAS.flag_0293=Super Multi Unlocked
-SAV_EventFlagsORAS.flag_0419=(OR) Latias Defeated
-SAV_EventFlagsORAS.flag_0420=(AS) Latios Defeated
-SAV_EventFlagsORAS.flag_0647=(AS) Kyogre Defeated
-SAV_EventFlagsORAS.flag_0648=(OR) Groudon Defeated
-SAV_EventFlagsORAS.flag_0945=Deoxys Defeated
-SAV_EventFlagsORAS.flag_0956=Regirock Defeated
-SAV_EventFlagsORAS.flag_0957=Regice Defeated
-SAV_EventFlagsORAS.flag_0958=Registeel Defeated
-SAV_EventFlagsORAS.flag_2811=Raikou Captured
-SAV_EventFlagsORAS.flag_2812=Entei Captured
-SAV_EventFlagsORAS.flag_2813=Suicune Captured
-SAV_EventFlagsORAS.flag_2814=(AS) Lugia Captured
-SAV_EventFlagsORAS.flag_2815=(OR) Ho-Oh Captured
-SAV_EventFlagsORAS.flag_2816=Uxie Captured
-SAV_EventFlagsORAS.flag_2817=Mesprit Captured
-SAV_EventFlagsORAS.flag_2818=Azelf Captured
-SAV_EventFlagsORAS.flag_2819=(AS) Dialga Captured
-SAV_EventFlagsORAS.flag_2820=(OR) Palkia Captured
-SAV_EventFlagsORAS.flag_2821=Heatran Captured
-SAV_EventFlagsORAS.flag_2822=Regigigas Captured
-SAV_EventFlagsORAS.flag_2823=Giratina Captured
-SAV_EventFlagsORAS.flag_2824=Cresselia Captured
-SAV_EventFlagsORAS.flag_2825=Cobalion Captured
-SAV_EventFlagsORAS.flag_2826=Terrakion Captured
-SAV_EventFlagsORAS.flag_2827=Virizion Captured
-SAV_EventFlagsORAS.flag_2828=(OR) Tornadus Captured
-SAV_EventFlagsORAS.flag_2829=(AS) Thundurus Captured
-SAV_EventFlagsORAS.flag_2830=(OR) Reshiram Captured
-SAV_EventFlagsORAS.flag_2831=(AS) Zekrom Captured
-SAV_EventFlagsORAS.flag_2832=Landorus Captured
-SAV_EventFlagsORAS.flag_2833=Kyurem Captured
-SAV_EventFlagsORAS.flag_2834=(OR) Latias Captured
-SAV_EventFlagsORAS.flag_2835=(AS) Latios Captured
-SAV_EventFlagsORAS.flag_2836=Regirock Captured
-SAV_EventFlagsORAS.flag_2837=Regice Captured
-SAV_EventFlagsORAS.flag_2838=Registeel Captured
-SAV_EventFlagsORAS.flag_2839=(OR) Groudon Captured
-SAV_EventFlagsORAS.flag_2840=(AS) Kyogre Captured
-SAV_EventFlagsORAS.flag_2842=Deoxys Captured
-SAV_EventFlagsORAS.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsORAS.GB_Misc=Misc
-SAV_EventFlagsORAS.GB_Rebattle=Rebattle
-SAV_EventFlagsORAS.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsORAS.L_Ash=Volcanic Ash:
-SAV_EventFlagsORAS.L_Flag=Flag:
-SAV_EventFlagsORAS.L_IsSet=IsSet
-SAV_EventFlagsORAS.L_SkyTower=*Sky Tower
-SAV_EventFlagsORAS.L_UnSet=UnSet
-SAV_EventFlagsXY.B_Cancel=Cancel
-SAV_EventFlagsXY.B_LoadNew=Load New
-SAV_EventFlagsXY.B_LoadOld=Load Old
-SAV_EventFlagsXY.B_Save=Save
-SAV_EventFlagsXY.CHK_CustomFlag=Status:
-SAV_EventFlagsXY.flag_0001=Flag1
-SAV_EventFlagsXY.flag_0002=Flag2
-SAV_EventFlagsXY.flag_0003=Flag3
-SAV_EventFlagsXY.flag_0004=Flag4
-SAV_EventFlagsXY.flag_0005=Flag5
-SAV_EventFlagsXY.flag_0114=Zygarde Captured
-SAV_EventFlagsXY.flag_0115=Mewtwo Captured
-SAV_EventFlagsXY.flag_0285=Singles Statuette
-SAV_EventFlagsXY.flag_0286=Doubles Statuette
-SAV_EventFlagsXY.flag_0287=Triples Statuette
-SAV_EventFlagsXY.flag_0288=Rotation Statuette
-SAV_EventFlagsXY.flag_0289=Multi Statuette
-SAV_EventFlagsXY.flag_0290=Super Singles Unlocked
-SAV_EventFlagsXY.flag_0291=Super Doubles Unlocked
-SAV_EventFlagsXY.flag_0292=Super Triples Unlocked
-SAV_EventFlagsXY.flag_0293=Super Rotation Unlocked
-SAV_EventFlagsXY.flag_0294=Super Multi Unlocked
-SAV_EventFlagsXY.flag_0675=50: Beat Chatelaine
-SAV_EventFlagsXY.flag_0790=Zygarde Defeated
-SAV_EventFlagsXY.flag_0963=Mewtwo Defeated
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=Pokédex Obtained
-SAV_EventFlagsXY.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsXY.GB_Misc=Misc
-SAV_EventFlagsXY.GB_Rebattle=Rebattle
-SAV_EventFlagsXY.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsXY.L_Flag=Flag:
-SAV_EventFlagsXY.L_IsSet=IsSet
-SAV_EventFlagsXY.L_UnSet=UnSet
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -457,7 +367,6 @@ SAV_HallOfFame.L_Shiny=Shiny:
 SAV_HallOfFame.L_Victory=Victory Number:
 SAV_HallOfFame.Label_EncryptionConstant=Encryption Constant:
 SAV_HallOfFame.Label_Form=Form:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=Held Item:
 SAV_HallOfFame.Label_MetDate=Date:
 SAV_HallOfFame.Label_OT=OT:
@@ -494,7 +403,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=Cancel
 SAV_Inventory.B_DisplayBerries=Berry
 SAV_Inventory.B_DisplayItems=Items
@@ -560,17 +468,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -924,7 +824,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=Main
 SAV_SecretBase.f_PKM=Trainer Pokémon
 SAV_SecretBase.GB_Object=Object Layout
-SAV_SecretBase.GB_PKM=PKM
 SAV_SecretBase.L_ATK=ATK
 SAV_SecretBase.L_BaseLocation=Secret Base Location:
 SAV_SecretBase.L_Blackboard=Blackboard:
@@ -943,7 +842,6 @@ SAV_SecretBase.L_IVs=IVs
 SAV_SecretBase.L_Participant=Participant:
 SAV_SecretBase.L_PKFriendship=Friendship:
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=PPUps
 SAV_SecretBase.L_Rotation=Rotation Val:
 SAV_SecretBase.L_SpA=SpA
 SAV_SecretBase.L_SpD=SpD
@@ -953,7 +851,6 @@ SAV_SecretBase.L_TeamSlogan=Team Slogan:
 SAV_SecretBase.L_TrName=Trainer Name:
 SAV_SecretBase.L_X=X Coordinate:
 SAV_SecretBase.L_Y=Y Coordinate:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancel
 SAV_SimplePokedex.B_CaughtAll=Caught All
 SAV_SimplePokedex.B_CaughtNone=Caught None
@@ -1064,7 +961,6 @@ SAV_Trainer.L_SinglesC=Singles:
 SAV_Trainer.L_SkinColor=Skin Color:
 SAV_Trainer.L_Socks=Socks:
 SAV_Trainer.L_Started=Game Started:
-SAV_Trainer.L_Stats=Stats
 SAV_Trainer.L_Style=Style:
 SAV_Trainer.L_SuperB=Super
 SAV_Trainer.L_SuperC=Super
@@ -1188,17 +1084,6 @@ SettingsEditor.SetUpdateDex=Modify Pokédex
 SettingsEditor.SetUpdatePKM=Modify PKM Info
 SettingsEditor.ShinySprites=Shiny Sprites
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=Cancel
-SuperTrain.B_Save=Save
-SuperTrain.L_Bags=Training Bags
-SuperTrain.L_Records=Records
-SuperTrain.L_Species=Species:
-SuperTrain.L_Species2=Species
-SuperTrain.L_Time0=Time:
-SuperTrain.L_Time1=Time1
-SuperTrain.L_Time2=Time2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=UNKNOWN
 SuperTrainingEditor.B_All=Give All
 SuperTrainingEditor.B_Cancel=Cancel
 SuperTrainingEditor.B_None=Remove All
@@ -1245,4 +1130,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/ja/lang_ja.txt b/PKHeX.Core/Resources/text/ja/lang_ja.txt
index 1e23dd188..5d74966db 100644
--- a/PKHeX.Core/Resources/text/ja/lang_ja.txt
+++ b/PKHeX.Core/Resources/text/ja/lang_ja.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Error
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Memory / Amie Editor
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=C-Gear Skin
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Event Flag Editor (ORAS)
-SAV_EventFlagsXY=Event Flag Editor (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Hall of Fame Editor
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -46,7 +44,6 @@ SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Medal Editor
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -64,6 +61,7 @@ Main.B_CGearSkin=Cギア スキン
 Main.B_FestivalPlaza=フェスサークル
 Main.B_JPEG=PGL 画像保存
 Main.B_MailBox=メールボックス
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=きのみ畑
 Main.B_OpenBoxLayout=ボックス
 Main.B_OpenEventFlags=イベントフラグ
@@ -75,13 +73,14 @@ Main.B_OpenLinkInfo=ポケモンリンク
 Main.B_OpenMiscEditor=その他
 Main.B_OpenOPowers= Oパワー
 Main.B_OpenPokeBeans=ポケマメ
-Main.B_OpenPokeBlocks=ポロック
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=ポケモン図鑑
-Main.B_OpenPokePuffs=‎ポフレ
+Main.B_OpenPokepuffs=‎Poké Puffs
 Main.B_OpenRTCEditor=時刻
 Main.B_OpenSecretBase=ひみつきち
 Main.B_OpenSuperTraining=スパトレ
 Main.B_OpenTrainerInfo=トレーナー情報
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=ふしぎなカード
 Main.B_OUTPasserby=すれちがい
 Main.B_Roamer=徘徊ポケモン
@@ -101,28 +100,41 @@ Main.CHK_HackedStats=Hacked Stats
 Main.CHK_Infected=感染状態
 Main.CHK_IsEgg=タマゴ
 Main.CHK_Nicknamed=ニックネーム
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=タマゴがある状態
 Main.GB_CurrentMoves=覚えているわざ
 Main.GB_Daycare=育て屋
 Main.GB_EggConditions=タマゴのデータ
 Main.GB_ExtraBytes=余分なバイト
-Main.GB_Fused=Fused
-Main.GB_GTS=GTS
 Main.GB_Markings=マーキング
 Main.GB_nOT=現在のトレーナー
 Main.GB_OT=トレーナー情報
 Main.GB_RelearnMoves=遺伝わざ
-Main.GB_SUBE=OldMan
 Main.L_BattleBox=バトルボックス
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=シード値
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=ゲームシンク ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
 Main.L_MetTimeOfDay=出会った時間
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=手持ちポケモン
 Main.L_ReadOnlyOther=このタブは読み取り専用です
 Main.L_ReadOnlyPBB=読み取り専用
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=Secure Value 1:
 Main.L_Secure2=Secure Value 2:
+Main.L_ShadowID=Shadow ID:
 Main.L_ShinyLeaf=かがやくはっぱ
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=3DS地域:
 Main.Label_Ability=特性
 Main.Label_ATK=攻撃
@@ -145,6 +157,7 @@ Main.Label_EVs=努力値
 Main.Label_EXP=経験値
 Main.Label_Form=フォルム
 Main.Label_Friendship=なつき度
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=持ち物
 Main.Label_HiddenPowerPrefix=めざめるパワーのタイプ:
 Main.Label_HP=HP
@@ -178,6 +191,7 @@ Main.Menu_About=PKHeXについて
 Main.Menu_BatchEditor=バルクエディタ
 Main.Menu_Data=データ
 Main.Menu_Database=PKMデータベース
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=ダンプボックス
 Main.Menu_Exit=閉じる
 Main.Menu_ExportBAK=保存 BAK
@@ -190,17 +204,22 @@ Main.Menu_LoadBoxes=ロードボックス
 Main.Menu_MGDatabase=ふしぎなおくりものデータベース
 Main.Menu_Open=読み込み...
 Main.Menu_Options=設定
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=ボックスデータレポート
 Main.Menu_Save=保存 PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=Export Battle Box to Clipboard
 Main.Menu_ShowdownExportParty=Export Party to Clipboard
 Main.Menu_ShowdownExportPKM=Export Set to Clipboard
 Main.Menu_ShowdownImportPKM=クリップボードから読み込む
 Main.Menu_Tools=ツール
-Main.Menu_Unicode=Unicode
-Main.mnu2View=見る
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=消去
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=セット
 Main.mnuView=見る
 Main.Tab_Attacks=わざ
@@ -221,7 +240,6 @@ MemoryAmie.GB_Residence=ポケモンの出身地
 MemoryAmie.L_Arguments=使用禁止 ; 左はありませんでした ; トレーナー ; 前回のゲーム ; 思い出 ; ポケモン ; エリア ; アイテム ; わざ ; 場所 ;
 MemoryAmie.L_Country=国
 MemoryAmie.L_CT_Affection=愛情
-MemoryAmie.L_cT_Affection=愛情:
 MemoryAmie.L_CT_Feeling=気持ち
 MemoryAmie.L_CT_Friendship=なつき度
 MemoryAmie.L_CT_Quality=気持ちの強さ
@@ -273,10 +291,8 @@ SAV_BoxLayout.B_Cancel=キャンセル
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=保存
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=かべがみ
 SAV_BoxLayout.L_BoxName=ボックス名
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=かべがみﾌﾗｸﾞ解除
 SAV_BoxLayout.L_Unlocked=制限解除
 SAV_CGearSkin.B_Cancel=Cancel
 SAV_CGearSkin.B_ExportCGB=Export .cgb
@@ -335,122 +351,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=キャンセル
-SAV_EventFlagsORAS.B_LoadNew=Load New
-SAV_EventFlagsORAS.B_LoadOld=Load Old
-SAV_EventFlagsORAS.B_Save=保存
-SAV_EventFlagsORAS.CHK_CustomFlag=Status:
-SAV_EventFlagsORAS.flag_0172=Cresselia Defeated
-SAV_EventFlagsORAS.flag_0173=Raikou Defeated
-SAV_EventFlagsORAS.flag_0174=Entei Defeated
-SAV_EventFlagsORAS.flag_0175=Suicune Defeated
-SAV_EventFlagsORAS.flag_0176=Cobalion Defeated
-SAV_EventFlagsORAS.flag_0177=Terrakion Defeated
-SAV_EventFlagsORAS.flag_0178=Virizion Defeated
-SAV_EventFlagsORAS.flag_0179=Uxie Defeated
-SAV_EventFlagsORAS.flag_0180=Mesprit Defeated
-SAV_EventFlagsORAS.flag_0181=Azelf Defeated
-SAV_EventFlagsORAS.flag_0182=(OR) Reshiram Defeated
-SAV_EventFlagsORAS.flag_0183=(AS) Zekrom Defeated
-SAV_EventFlagsORAS.flag_0184=Kyurem Defeated
-SAV_EventFlagsORAS.flag_0208=(OR) Ho-Oh Defeated
-SAV_EventFlagsORAS.flag_0209=(AS) Lugia Defeated
-SAV_EventFlagsORAS.flag_0252=Regigigas Defeated
-SAV_EventFlagsORAS.flag_0260=Heatran Defeated
-SAV_EventFlagsORAS.flag_0284=Singles Statuette
-SAV_EventFlagsORAS.flag_0285=Doubles Statuette
-SAV_EventFlagsORAS.flag_0286=Triples Statuette
-SAV_EventFlagsORAS.flag_0287=Rotation Statuette
-SAV_EventFlagsORAS.flag_0288=Multi Statuette
-SAV_EventFlagsORAS.flag_0289=Super Singles Unlocked
-SAV_EventFlagsORAS.flag_0290=Super Doubles Unlocked
-SAV_EventFlagsORAS.flag_0291=Super Triples Unlocked
-SAV_EventFlagsORAS.flag_0292=Super Rotation Unlocked
-SAV_EventFlagsORAS.flag_0293=Super Multi Unlocked
-SAV_EventFlagsORAS.flag_0419=(OR) Latias Defeated
-SAV_EventFlagsORAS.flag_0420=(AS) Latios Defeated
-SAV_EventFlagsORAS.flag_0647=(AS) Kyogre Defeated
-SAV_EventFlagsORAS.flag_0648=(OR) Groudon Defeated
-SAV_EventFlagsORAS.flag_0945=Deoxys Defeated
-SAV_EventFlagsORAS.flag_0956=Regirock Defeated
-SAV_EventFlagsORAS.flag_0957=Regice Defeated
-SAV_EventFlagsORAS.flag_0958=Registeel Defeated
-SAV_EventFlagsORAS.flag_2811=Raikou Captured
-SAV_EventFlagsORAS.flag_2812=Entei Captured
-SAV_EventFlagsORAS.flag_2813=Suicune Captured
-SAV_EventFlagsORAS.flag_2814=(AS) Lugia Captured
-SAV_EventFlagsORAS.flag_2815=(OR) Ho-Oh Captured
-SAV_EventFlagsORAS.flag_2816=Uxie Captured
-SAV_EventFlagsORAS.flag_2817=Mesprit Captured
-SAV_EventFlagsORAS.flag_2818=Azelf Captured
-SAV_EventFlagsORAS.flag_2819=(AS) Dialga Captured
-SAV_EventFlagsORAS.flag_2820=(OR) Palkia Captured
-SAV_EventFlagsORAS.flag_2821=Heatran Captured
-SAV_EventFlagsORAS.flag_2822=Regigigas Captured
-SAV_EventFlagsORAS.flag_2823=Giratina Captured
-SAV_EventFlagsORAS.flag_2824=Cresselia Captured
-SAV_EventFlagsORAS.flag_2825=Cobalion Captured
-SAV_EventFlagsORAS.flag_2826=Terrakion Captured
-SAV_EventFlagsORAS.flag_2827=Virizion Captured
-SAV_EventFlagsORAS.flag_2828=(OR) Tornadus Captured
-SAV_EventFlagsORAS.flag_2829=(AS) Thundurus Captured
-SAV_EventFlagsORAS.flag_2830=(OR) Reshiram Captured
-SAV_EventFlagsORAS.flag_2831=(AS) Zekrom Captured
-SAV_EventFlagsORAS.flag_2832=Landorus Captured
-SAV_EventFlagsORAS.flag_2833=Kyurem Captured
-SAV_EventFlagsORAS.flag_2834=(OR) Latias Captured
-SAV_EventFlagsORAS.flag_2835=(AS) Latios Captured
-SAV_EventFlagsORAS.flag_2836=Regirock Captured
-SAV_EventFlagsORAS.flag_2837=Regice Captured
-SAV_EventFlagsORAS.flag_2838=Registeel Captured
-SAV_EventFlagsORAS.flag_2839=(OR) Groudon Captured
-SAV_EventFlagsORAS.flag_2840=(AS) Kyogre Captured
-SAV_EventFlagsORAS.flag_2842=Deoxys Captured
-SAV_EventFlagsORAS.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsORAS.GB_Misc=Misc
-SAV_EventFlagsORAS.GB_Rebattle=Rebattle
-SAV_EventFlagsORAS.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsORAS.L_Ash=Volcanic Ash:
-SAV_EventFlagsORAS.L_Flag=Flag:
-SAV_EventFlagsORAS.L_IsSet=IsSet
-SAV_EventFlagsORAS.L_SkyTower=*Sky Tower
-SAV_EventFlagsORAS.L_UnSet=UnSet
-SAV_EventFlagsXY.B_Cancel=Cancel
-SAV_EventFlagsXY.B_LoadNew=Load New
-SAV_EventFlagsXY.B_LoadOld=Load Old
-SAV_EventFlagsXY.B_Save=Save
-SAV_EventFlagsXY.CHK_CustomFlag=Status:
-SAV_EventFlagsXY.flag_0001=Flag1
-SAV_EventFlagsXY.flag_0002=Flag2
-SAV_EventFlagsXY.flag_0003=Flag3
-SAV_EventFlagsXY.flag_0004=Flag4
-SAV_EventFlagsXY.flag_0005=Flag5
-SAV_EventFlagsXY.flag_0114=Zygarde Captured
-SAV_EventFlagsXY.flag_0115=Mewtwo Captured
-SAV_EventFlagsXY.flag_0285=Singles Statuette
-SAV_EventFlagsXY.flag_0286=Doubles Statuette
-SAV_EventFlagsXY.flag_0287=Triples Statuette
-SAV_EventFlagsXY.flag_0288=Rotation Statuette
-SAV_EventFlagsXY.flag_0289=Multi Statuette
-SAV_EventFlagsXY.flag_0290=Super Singles Unlocked
-SAV_EventFlagsXY.flag_0291=Super Doubles Unlocked
-SAV_EventFlagsXY.flag_0292=Super Triples Unlocked
-SAV_EventFlagsXY.flag_0293=Super Rotation Unlocked
-SAV_EventFlagsXY.flag_0294=Super Multi Unlocked
-SAV_EventFlagsXY.flag_0675=50: Beat Chatelaine
-SAV_EventFlagsXY.flag_0790=Zygarde Defeated
-SAV_EventFlagsXY.flag_0963=Mewtwo Defeated
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=Pokédex Obtained
-SAV_EventFlagsXY.GB_FlagStatus=Check Flag Status
-SAV_EventFlagsXY.GB_Misc=Misc
-SAV_EventFlagsXY.GB_Rebattle=Rebattle
-SAV_EventFlagsXY.GB_Researcher=FlagDiff Researcher
-SAV_EventFlagsXY.L_Flag=Flag:
-SAV_EventFlagsXY.L_IsSet=IsSet
-SAV_EventFlagsXY.L_UnSet=UnSet
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -467,7 +367,6 @@ SAV_HallOfFame.L_Shiny=色違い
 SAV_HallOfFame.L_Victory=殿堂入りNo.
 SAV_HallOfFame.Label_EncryptionConstant=暗号化定数
 SAV_HallOfFame.Label_Form=ﾌｫﾙﾑ
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=持ち物
 SAV_HallOfFame.Label_MetDate=日付
 SAV_HallOfFame.Label_OT=おや
@@ -504,7 +403,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=キャンセル
 SAV_Inventory.B_GiveAll=全て取得
 SAV_Inventory.B_Save=保存
@@ -564,17 +462,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -928,7 +818,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=メイン
 SAV_SecretBase.f_PKM=トレーナーポケモン
 SAV_SecretBase.GB_Object=オブジェクトのレイアウト
-SAV_SecretBase.GB_PKM=ポケモン
 SAV_SecretBase.L_ATK=攻撃
 SAV_SecretBase.L_BaseLocation=ひみつきちの場所
 SAV_SecretBase.L_Blackboard=こくばん
@@ -947,7 +836,6 @@ SAV_SecretBase.L_IVs=個体値
 SAV_SecretBase.L_Participant=ともだちリスト:
 SAV_SecretBase.L_PKFriendship=なつき度
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=ポイントアップ
 SAV_SecretBase.L_Rotation=Rotation Val:
 SAV_SecretBase.L_SpA=特攻
 SAV_SecretBase.L_SpD=特防
@@ -957,7 +845,6 @@ SAV_SecretBase.L_TeamSlogan=あいことば
 SAV_SecretBase.L_TrName=Trainer Name:
 SAV_SecretBase.L_X=X座標:
 SAV_SecretBase.L_Y=Y座標:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancel
 SAV_SimplePokedex.B_CaughtAll=Caught All
 SAV_SimplePokedex.B_CaughtNone=Caught None
@@ -1068,7 +955,6 @@ SAV_Trainer.L_SinglesC=Singles:
 SAV_Trainer.L_SkinColor=Skin Color:
 SAV_Trainer.L_Socks=Socks:
 SAV_Trainer.L_Started=Game Started:
-SAV_Trainer.L_Stats=Stats
 SAV_Trainer.L_Style=Style:
 SAV_Trainer.L_SuperB=Super
 SAV_Trainer.L_SuperC=Super
@@ -1192,17 +1078,6 @@ SettingsEditor.SetUpdateDex=ポケモン図鑑に反映
 SettingsEditor.SetUpdatePKM=PKM情報の変更
 SettingsEditor.ShinySprites=色違いアイコン
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=Cancel
-SuperTrain.B_Save=Save
-SuperTrain.L_Bags=Training Bags
-SuperTrain.L_Records=Records
-SuperTrain.L_Species=Species:
-SuperTrain.L_Species2=Species
-SuperTrain.L_Time0=Time:
-SuperTrain.L_Time1=Time1
-SuperTrain.L_Time2=Time2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=UNKNOWN
 SuperTrainingEditor.B_All=全て取得
 SuperTrainingEditor.B_Cancel=キャンセル
 SuperTrainingEditor.B_None=全て消去
@@ -1249,4 +1124,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/ko/lang_ko.txt b/PKHeX.Core/Resources/text/ko/lang_ko.txt
index 3d0064a2d..feb71484f 100644
--- a/PKHeX.Core/Resources/text/ko/lang_ko.txt
+++ b/PKHeX.Core/Resources/text/ko/lang_ko.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Error
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Memory / Amie Editor
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=C-Gear Skin
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Event Flag Editor (ORAS)
-SAV_EventFlagsXY=Event Flag Editor (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Hall of Fame Editor
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -46,7 +44,6 @@ SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Medal Editor
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=중단
 ErrorWindow.B_Continue=계속
 ErrorWindow.B_CopyToClipboard=클립보드에 복사
 ErrorWindow.L_ProvideInfo=오류를 보고할 때 이 정보를 제공해 주세요:
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C기어 스킨
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=PGL .JPEG 저장
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=나무열매 농장
 Main.B_OpenBoxLayout=박스 배열
 Main.B_OpenEventFlags=이벤트 플래그
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=명예의 전당
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=아이템
 Main.B_OpenLinkInfo=링크 데이터
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=O파워
 Main.B_OpenPokeBeans=포켓콩
-Main.B_OpenPokeBlocks=포켓몬스넥
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=포켓몬 도감
-Main.B_OpenPokePuffs=포켓파를레
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=비밀기지
 Main.B_OpenSuperTraining=슈퍼트레이닝
 Main.B_OpenTrainerInfo=트레이너 정보
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=이상한 카드
 Main.B_OUTPasserby=지나친 사람
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=박스 데이터 저장++
 Main.B_VerifyCHK=체크섬 확인
 Main.BTN_History=기억
@@ -93,26 +100,41 @@ Main.CHK_HackedStats=조작된 능력치
 Main.CHK_Infected=감염
 Main.CHK_IsEgg=알 여부
 Main.CHK_Nicknamed=이름:
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=알 획득 가능
 Main.GB_CurrentMoves=가진 기술
 Main.GB_Daycare=키우미집
 Main.GB_EggConditions=알을 만난 조건
 Main.GB_ExtraBytes=추가 바이트
-Main.GB_Fused=알
-Main.GB_GTS=GTS
 Main.GB_Markings=마킹
 Main.GB_nOT=최근 (주인이 아닌) 소유자
 Main.GB_OT=트레이너 정보
 Main.GB_RelearnMoves=다시 배운 기술
-Main.GB_SUBE=노인
 Main.L_BattleBox=배틀박스:
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=시드
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=게임싱크 ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=파티:
 Main.L_ReadOnlyOther=이 탭은 읽기 전용입니다.
 Main.L_ReadOnlyPBB=읽기 전용입니다.
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=보안 값 1:
 Main.L_Secure2=보안 값 2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=3DS 국적:
 Main.Label_Ability=특성:
 Main.Label_ATK=공격:
@@ -135,6 +157,7 @@ Main.Label_EVs=EVs
 Main.Label_EXP=경험치:
 Main.Label_Form=폼:
 Main.Label_Friendship=친밀도:
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=지닌 물건:
 Main.Label_HiddenPowerPrefix=잠재파워 속성:
 Main.Label_HP=HP:
@@ -168,6 +191,7 @@ Main.Menu_About=PKHeX 정보
 Main.Menu_BatchEditor=일괄 수정
 Main.Menu_Data=데이터
 Main.Menu_Database=포켓몬 데이터베이스
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=박스 덤프
 Main.Menu_Exit=끝내기
 Main.Menu_ExportBAK=백업 파일 내보내기
@@ -180,17 +204,22 @@ Main.Menu_LoadBoxes=박스 불러오기
 Main.Menu_MGDatabase=이상한 카드 데이터베이스
 Main.Menu_Open=열기...
 Main.Menu_Options=옵션
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=박스 데이터 보고서
 Main.Menu_Save=PKM 파일 저장...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=클립보드로 배틀 박스 내보내기
 Main.Menu_ShowdownExportParty=클립보드로 파티 내보내기
 Main.Menu_ShowdownExportPKM=클립보드로 세트 내보내기
 Main.Menu_ShowdownImportPKM=클립보드에서 세트 가져오기
 Main.Menu_Tools=도구
-Main.Menu_Unicode=유니코드
-Main.mnu2View=보기
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=삭제
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=놓기
 Main.mnuView=보기
 Main.Tab_Attacks=기술
@@ -211,7 +240,6 @@ MemoryAmie.GB_Residence=Pokémon has Resided in:
 MemoryAmie.L_Arguments=비활성화됨 ; Never left ; 어버이 ; 이전 세대의 ; 어버이가 아닌 자와의 기억: ; 포켓몬 ; 구역 ; 아이템 ; 기술 ; 장소 ;
 MemoryAmie.L_Country=국가
 MemoryAmie.L_CT_Affection=Affection:
-MemoryAmie.L_cT_Affection=관심:
 MemoryAmie.L_CT_Feeling=Feeling:
 MemoryAmie.L_CT_Friendship=친밀도:
 MemoryAmie.L_CT_Quality=Intensity:
@@ -259,10 +287,8 @@ SAV_BoxLayout.B_Cancel=취소
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=저장
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=배경:
 SAV_BoxLayout.L_BoxName=박스 이름:
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=해금된 배경:
 SAV_BoxLayout.L_Unlocked=해금됨:
 SAV_CGearSkin.B_Cancel=Cancel
 SAV_CGearSkin.B_ExportCGB=Export .cgb
@@ -321,122 +347,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=취소
-SAV_EventFlagsORAS.B_LoadNew=새 SAV
-SAV_EventFlagsORAS.B_LoadOld=이전 SAV
-SAV_EventFlagsORAS.B_Save=저장
-SAV_EventFlagsORAS.CHK_CustomFlag=상태:
-SAV_EventFlagsORAS.flag_0172=크레세리아 쓰러뜨림
-SAV_EventFlagsORAS.flag_0173=라이코 쓰러뜨림
-SAV_EventFlagsORAS.flag_0174=앤테이 쓰러뜨림
-SAV_EventFlagsORAS.flag_0175=스이쿤 쓰러뜨림
-SAV_EventFlagsORAS.flag_0176=코바르온 쓰러뜨림
-SAV_EventFlagsORAS.flag_0177=테라키온 쓰러뜨림
-SAV_EventFlagsORAS.flag_0178=비리디온 쓰러뜨림
-SAV_EventFlagsORAS.flag_0179=유크시 쓰러뜨림
-SAV_EventFlagsORAS.flag_0180=엠라이트 쓰러뜨림
-SAV_EventFlagsORAS.flag_0181=아그놈 쓰러뜨림
-SAV_EventFlagsORAS.flag_0182=(OR) 레시라무 쓰러뜨림
-SAV_EventFlagsORAS.flag_0183=(AS) 제크로무 쓰러뜨림
-SAV_EventFlagsORAS.flag_0184=큐레무 쓰러뜨림
-SAV_EventFlagsORAS.flag_0208=(OR) 칠색조 쓰러뜨림
-SAV_EventFlagsORAS.flag_0209=(AS) 루기아 쓰러뜨림
-SAV_EventFlagsORAS.flag_0252=레지기가스 쓰러뜨림
-SAV_EventFlagsORAS.flag_0260=히드런 쓰러뜨림
-SAV_EventFlagsORAS.flag_0284=싱글배틀 조각상
-SAV_EventFlagsORAS.flag_0285=더블배틀 조각상
-SAV_EventFlagsORAS.flag_0286=트리플배틀 조각상
-SAV_EventFlagsORAS.flag_0287=로테이션배틀 조각상
-SAV_EventFlagsORAS.flag_0288=멀티배틀 조각상
-SAV_EventFlagsORAS.flag_0289=슈퍼싱글배틀 해금됨
-SAV_EventFlagsORAS.flag_0290=슈퍼더블배틀 해금됨
-SAV_EventFlagsORAS.flag_0291=슈퍼트리플배틀 해금됨
-SAV_EventFlagsORAS.flag_0292=슈퍼로테이션배틀 해금됨
-SAV_EventFlagsORAS.flag_0293=슈퍼멀티배틀 해금됨
-SAV_EventFlagsORAS.flag_0419=(OR) 라티아스 쓰러뜨림
-SAV_EventFlagsORAS.flag_0420=(AS) 라티오스 쓰러뜨림
-SAV_EventFlagsORAS.flag_0647=(AS) 가이오가 쓰러뜨림
-SAV_EventFlagsORAS.flag_0648=(OR) 그란돈 쓰러뜨림
-SAV_EventFlagsORAS.flag_0945=테오키스 쓰러뜨림
-SAV_EventFlagsORAS.flag_0956=레지락 쓰러뜨림
-SAV_EventFlagsORAS.flag_0957=레지아이스 쓰러뜨림
-SAV_EventFlagsORAS.flag_0958=레지스틸 쓰러뜨림
-SAV_EventFlagsORAS.flag_2811=라이코 잡음
-SAV_EventFlagsORAS.flag_2812=앤테이 잡음
-SAV_EventFlagsORAS.flag_2813=스이쿤 잡음
-SAV_EventFlagsORAS.flag_2814=(AS) 루기아 잡음
-SAV_EventFlagsORAS.flag_2815=(OR) 칠색조 잡음
-SAV_EventFlagsORAS.flag_2816=유크시 잡음
-SAV_EventFlagsORAS.flag_2817=엠라이트 잡음
-SAV_EventFlagsORAS.flag_2818=아그놈 잡음
-SAV_EventFlagsORAS.flag_2819=(AS) 디아루가 잡음
-SAV_EventFlagsORAS.flag_2820=(OR) 펄기아 잡음
-SAV_EventFlagsORAS.flag_2821=히드런 잡음
-SAV_EventFlagsORAS.flag_2822=레지기가스 잡음
-SAV_EventFlagsORAS.flag_2823=기라티나 잡음
-SAV_EventFlagsORAS.flag_2824=크레세리아 잡음
-SAV_EventFlagsORAS.flag_2825=코바르온 잡음
-SAV_EventFlagsORAS.flag_2826=테라키온 잡음
-SAV_EventFlagsORAS.flag_2827=비리디온 잡음
-SAV_EventFlagsORAS.flag_2828=(OR) 토네로스 잡음
-SAV_EventFlagsORAS.flag_2829=(AS) 볼트로스 잡음
-SAV_EventFlagsORAS.flag_2830=(OR) 레시라무 잡음
-SAV_EventFlagsORAS.flag_2831=(AS) 제크로무 잡음
-SAV_EventFlagsORAS.flag_2832=랜드로스 잡음
-SAV_EventFlagsORAS.flag_2833=큐레무 잡음
-SAV_EventFlagsORAS.flag_2834=(OR) 라티아스 잡음
-SAV_EventFlagsORAS.flag_2835=(AS) 라티오스 잡음
-SAV_EventFlagsORAS.flag_2836=레지락 잡음
-SAV_EventFlagsORAS.flag_2837=레지아이스 잡음
-SAV_EventFlagsORAS.flag_2838=레지스틸 잡음
-SAV_EventFlagsORAS.flag_2839=(OR) 그란돈 잡음
-SAV_EventFlagsORAS.flag_2840=(AS) 가이오가 잡음
-SAV_EventFlagsORAS.flag_2842=테오키스 잡음
-SAV_EventFlagsORAS.GB_FlagStatus=플래그 상태 확인
-SAV_EventFlagsORAS.GB_Misc=기타
-SAV_EventFlagsORAS.GB_Rebattle=재배틀
-SAV_EventFlagsORAS.GB_Researcher=플래그 차이점 분석기
-SAV_EventFlagsORAS.L_Ash=화산재:
-SAV_EventFlagsORAS.L_Flag=플래그:
-SAV_EventFlagsORAS.L_IsSet=지정됨
-SAV_EventFlagsORAS.L_SkyTower=*Sky Tower
-SAV_EventFlagsORAS.L_UnSet=해제됨
-SAV_EventFlagsXY.B_Cancel=취소
-SAV_EventFlagsXY.B_LoadNew=새 SAV
-SAV_EventFlagsXY.B_LoadOld=이전 SAV
-SAV_EventFlagsXY.B_Save=저장
-SAV_EventFlagsXY.CHK_CustomFlag=상태:
-SAV_EventFlagsXY.flag_0001=Flag1
-SAV_EventFlagsXY.flag_0002=Flag2
-SAV_EventFlagsXY.flag_0003=Flag3
-SAV_EventFlagsXY.flag_0004=Flag4
-SAV_EventFlagsXY.flag_0005=Flag5
-SAV_EventFlagsXY.flag_0114=지가르데 잡음
-SAV_EventFlagsXY.flag_0115=뮤츠 잡음
-SAV_EventFlagsXY.flag_0285=싱글배틀 조각상
-SAV_EventFlagsXY.flag_0286=더블배틀 조각상
-SAV_EventFlagsXY.flag_0287=트리플배틀 조각상
-SAV_EventFlagsXY.flag_0288=로테이션배틀 조각상
-SAV_EventFlagsXY.flag_0289=멀티배틀 조각상
-SAV_EventFlagsXY.flag_0290=슈퍼싱글배틀 해금됨
-SAV_EventFlagsXY.flag_0291=슈퍼더블배틀 해금됨
-SAV_EventFlagsXY.flag_0292=슈퍼트리플배틀 해금됨
-SAV_EventFlagsXY.flag_0293=슈퍼로테이션배틀 해금됨
-SAV_EventFlagsXY.flag_0294=슈퍼멀티배틀 해금됨
-SAV_EventFlagsXY.flag_0675=50연승: 배틀샤틀레느를 이김
-SAV_EventFlagsXY.flag_0790=지가르데 쓰러뜨림
-SAV_EventFlagsXY.flag_0963=뮤츠 쓰러뜨림
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=포켓몬 도감 얻음
-SAV_EventFlagsXY.GB_FlagStatus=플래그 상태 확인
-SAV_EventFlagsXY.GB_Misc=기타
-SAV_EventFlagsXY.GB_Rebattle=재배틀
-SAV_EventFlagsXY.GB_Researcher=플래그 차이점 분석기
-SAV_EventFlagsXY.L_Flag=플래그:
-SAV_EventFlagsXY.L_IsSet=새로 지정됨
-SAV_EventFlagsXY.L_UnSet=지정 해제됨
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -453,7 +363,6 @@ SAV_HallOfFame.L_Shiny=이로치:
 SAV_HallOfFame.L_Victory=승리 횟수:
 SAV_HallOfFame.Label_EncryptionConstant=암호화 상수:
 SAV_HallOfFame.Label_Form=폼:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=지닌 물건:
 SAV_HallOfFame.Label_MetDate=날짜:
 SAV_HallOfFame.Label_OT=OT:
@@ -490,7 +399,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=취소
 SAV_Inventory.B_GiveAll=모두 주기
 SAV_Inventory.B_Save=저장
@@ -550,17 +458,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -914,7 +814,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=메인
 SAV_SecretBase.f_PKM=트레이너 포켓몬
 SAV_SecretBase.GB_Object=물건 레이아웃
-SAV_SecretBase.GB_PKM=포켓몬
 SAV_SecretBase.L_ATK=공격
 SAV_SecretBase.L_BaseLocation=비밀기지 위치:
 SAV_SecretBase.L_Blackboard=칠판에 적힌 문구:
@@ -933,7 +832,6 @@ SAV_SecretBase.L_IVs=개체값
 SAV_SecretBase.L_Participant=참가자:
 SAV_SecretBase.L_PKFriendship=친밀도:
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=PP 업
 SAV_SecretBase.L_Rotation=회전 값:
 SAV_SecretBase.L_SpA=특공
 SAV_SecretBase.L_SpD=특방
@@ -943,7 +841,6 @@ SAV_SecretBase.L_TeamSlogan=단의 구호:
 SAV_SecretBase.L_TrName=트레이너 이름:
 SAV_SecretBase.L_X=X 좌표:
 SAV_SecretBase.L_Y=Y 좌표:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancel
 SAV_SimplePokedex.B_CaughtAll=Caught All
 SAV_SimplePokedex.B_CaughtNone=Caught None
@@ -1054,7 +951,6 @@ SAV_Trainer.L_SinglesC=싱글:
 SAV_Trainer.L_SkinColor=피부 색:
 SAV_Trainer.L_Socks=양말:
 SAV_Trainer.L_Started=게임 시작:
-SAV_Trainer.L_Stats=스탯
 SAV_Trainer.L_Style=스타일:
 SAV_Trainer.L_SuperB=슈퍼
 SAV_Trainer.L_SuperC=슈퍼
@@ -1178,17 +1074,6 @@ SettingsEditor.SetUpdateDex=포켓몬 도감 수정
 SettingsEditor.SetUpdatePKM=포켓몬 정보 수정
 SettingsEditor.ShinySprites=Shiny Sprites
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=취소
-SuperTrain.B_Save=저장
-SuperTrain.L_Bags=샌드백
-SuperTrain.L_Records=기록
-SuperTrain.L_Species=종류:
-SuperTrain.L_Species2=종류
-SuperTrain.L_Time0=시간:
-SuperTrain.L_Time1=시간1
-SuperTrain.L_Time2=시간2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=알 수 없음
 SuperTrainingEditor.B_All=모두 주기
 SuperTrainingEditor.B_Cancel=취소
 SuperTrainingEditor.B_None=모두 제거
@@ -1235,4 +1120,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/other/lang_pt.txt b/PKHeX.Core/Resources/text/other/lang_pt.txt
index 8a2c6f735..fe57ee9f6 100644
--- a/PKHeX.Core/Resources/text/other/lang_pt.txt
+++ b/PKHeX.Core/Resources/text/other/lang_pt.txt
@@ -1,6 +1,5 @@
 BatchEditor=Batch Editor
 ErrorWindow=Error
-f2_Text=Special Characters
 KChart=KChart
 Main=PKHeX
 MemoryAmie=Memory / Amie Editor
@@ -12,9 +11,8 @@ SAV_BoxList=Storage Viewer
 SAV_CGearSkin=C-Gear Skin
 SAV_Database=Database
 SAV_EventFlags=Event Flag Editor
-SAV_EventFlagsORAS=Event Flag Editor (ORAS)
-SAV_EventFlagsXY=Event Flag Editor (XY)
 SAV_EventReset1=Event Resetter
+SAV_FolderList=Folder List
 SAV_GameSelect=Game Selection
 SAV_HallOfFame=Hall of Fame Editor
 SAV_HallOfFame7=Hall of Fame Viewer
@@ -44,9 +42,8 @@ SAV_SuperTrain=Super Training Records
 SAV_Trainer=Trainer Data Editor
 SAV_Trainer7=Trainer Data Editor
 SAV_Underground=Underground Scores Editor
-SAV_Wondercard=Wonder Card I/O
+SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
-SuperTrain=Super Training Records
 SuperTrainingEditor=Medal Editor
 TrashEditor=Special Characters
 BatchEditor.B_Add=Add
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=Abort
 ErrorWindow.B_Continue=Continue
 ErrorWindow.B_CopyToClipboard=Copy to Clipboard
 ErrorWindow.L_ProvideInfo=Please provide this information when reporting this error:
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C-Gear Skin
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=Gravar PGL .JPEG
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=Campos de Berries
 Main.B_OpenBoxLayout=Aparência das Boxes
 Main.B_OpenEventFlags=Acontecimentos
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=Hall of Fame
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=Itens
 Main.B_OpenLinkInfo=Link Data
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=O-Powers
 Main.B_OpenPokeBeans=Poké Beans
-Main.B_OpenPokeBlocks=Pokéblocks
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=Pokédex
-Main.B_OpenPokePuffs=?Poké Puffs
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=Base Secreta
 Main.B_OpenSuperTraining=Super Treino
 Main.B_OpenTrainerInfo=Informação do Treinador
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=WonderCard
 Main.B_OUTPasserby=Passerby
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=Save Box Data++
 Main.B_VerifyCHK=Checksums
 Main.BTN_History=Memórias
@@ -93,26 +100,41 @@ Main.CHK_HackedStats=Hacked Stats
 Main.CHK_Infected=Infectado
 Main.CHK_IsEgg=É Ovo
 Main.CHK_Nicknamed=Alcunha:
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=Ovo Disponível
 Main.GB_CurrentMoves=Ataques Actuais
 Main.GB_Daycare=Daycare
 Main.GB_EggConditions=Condições de Encontro do Ovo
 Main.GB_ExtraBytes=Bytes Extra
-Main.GB_Fused=Fundido
-Main.GB_GTS=GTS
 Main.GB_Markings=Marcas
 Main.GB_nOT=Último (não OT) Treinador
 Main.GB_OT=Informação do Treinador
 Main.GB_RelearnMoves=Reaprender Ataques
-Main.GB_SUBE=Velhote
 Main.L_BattleBox=Box de Batalha:
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=Semente
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=Game Sync ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=Equipa:
 Main.L_ReadOnlyOther=Este separador é só de leitura.
 Main.L_ReadOnlyPBB=Isto é só de leitura.
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=Secure Value 1:
 Main.L_Secure2=Secure Value 2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=Região 3DS:
 Main.Label_Ability=Habilidade:
 Main.Label_ATK=Atk:
@@ -135,6 +157,7 @@ Main.Label_EVs=EVs
 Main.Label_EXP=EXP:
 Main.Label_Form=Forma:
 Main.Label_Friendship=Amizade:
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=Item a Segurar:
 Main.Label_HiddenPowerPrefix=Tipo do Hidden Power:
 Main.Label_HP=HP:
@@ -168,6 +191,7 @@ Main.Menu_About=Sobre o PKHeX
 Main.Menu_BatchEditor=Editor de lote
 Main.Menu_Data=Dados
 Main.Menu_Database=PKM Database
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=Despejar Boxes
 Main.Menu_Exit=Sair
 Main.Menu_ExportBAK=Guardar BAK
@@ -180,17 +204,22 @@ Main.Menu_LoadBoxes=Carregar Boxes
 Main.Menu_MGDatabase=Mystery Gift Database
 Main.Menu_Open=Abrir...
 Main.Menu_Options=Opções
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=Relatório de Dados das Boxes
 Main.Menu_Save=Guardar PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=Export Battle Box to Clipboard
 Main.Menu_ShowdownExportParty=Export Party to Clipboard
 Main.Menu_ShowdownExportPKM=Export Set to Clipboard
 Main.Menu_ShowdownImportPKM=Import Set from Clipboard
 Main.Menu_Tools=Ferramentas
-Main.Menu_Unicode=Unicode
-Main.mnu2View=Ver
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=Excluir
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=Colocar
 Main.mnuView=Ver
 Main.Tab_Attacks=Ataques
@@ -210,7 +239,6 @@ MemoryAmie.GB_M_OT=Memories with Original Trainer
 MemoryAmie.GB_Residence=Pokémon has Resided in:
 MemoryAmie.L_Arguments=Desactivado ; Nunca deixado ; OT ; Geração Passada ; Memórias com ; Pokémon ; Área ; Item(s) ; Ataques ; Local ;
 MemoryAmie.L_Country=País
-MemoryAmie.L_cT_Affection=Afecto:
 MemoryAmie.L_CT_Affection=Affection:
 MemoryAmie.L_CT_Feeling=Feeling:
 MemoryAmie.L_CT_Friendship=Amizade:
@@ -263,10 +291,8 @@ SAV_BoxLayout.B_Cancel=Cancelar
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=Guardar
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=BG:
 SAV_BoxLayout.L_BoxName=Nome da Box:
 SAV_BoxLayout.L_Flag=Flags:
-SAV_BoxLayout.L_Flags=Eventos BG Desbloqueados:
 SAV_BoxLayout.L_Unlocked=Desbloqueado:
 SAV_CGearSkin.B_Cancel=Cancel
 SAV_CGearSkin.B_ExportCGB=Export .cgb
@@ -325,122 +351,6 @@ SAV_EventFlags.L_IsSet=IsSet:
 SAV_EventFlags.L_Stats=Constant:
 SAV_EventFlags.L_UnSet=UnSet:
 SAV_EventFlags.tabPage3=Research
-SAV_EventFlagsORAS.B_Cancel=Cancelar
-SAV_EventFlagsORAS.B_LoadNew=Abrir Novo
-SAV_EventFlagsORAS.B_LoadOld=Abrir Velho
-SAV_EventFlagsORAS.B_Save=Gravar
-SAV_EventFlagsORAS.CHK_CustomFlag=Estado:
-SAV_EventFlagsORAS.flag_0172=Cresselia Derrotado
-SAV_EventFlagsORAS.flag_0173=Raikou Derrotado
-SAV_EventFlagsORAS.flag_0174=Entei Derrotado
-SAV_EventFlagsORAS.flag_0175=Suicune Derrotado
-SAV_EventFlagsORAS.flag_0176=Cobalion Derrotado
-SAV_EventFlagsORAS.flag_0177=Terrakion Derrotado
-SAV_EventFlagsORAS.flag_0178=Virizion Derrotado
-SAV_EventFlagsORAS.flag_0179=Uxie Derrotado
-SAV_EventFlagsORAS.flag_0180=Mesprit Derrotado
-SAV_EventFlagsORAS.flag_0181=Azelf Derrotado
-SAV_EventFlagsORAS.flag_0182=(OR) Reshiram Derrotado
-SAV_EventFlagsORAS.flag_0183=(AS) Zekrom Derrotado
-SAV_EventFlagsORAS.flag_0184=Kyurem Derrotado
-SAV_EventFlagsORAS.flag_0208=(OR) Ho-Oh Derrotado
-SAV_EventFlagsORAS.flag_0209=(AS) Lugia Derrotado
-SAV_EventFlagsORAS.flag_0252=Regigigas Derrotado
-SAV_EventFlagsORAS.flag_0260=Heatran Derrotado
-SAV_EventFlagsORAS.flag_0284=Estátua Singles
-SAV_EventFlagsORAS.flag_0285=Estátua Doubles
-SAV_EventFlagsORAS.flag_0286=Estátua Triples
-SAV_EventFlagsORAS.flag_0287=Estátua Rotation
-SAV_EventFlagsORAS.flag_0288=Estátua Multi
-SAV_EventFlagsORAS.flag_0289=Super Singles Desbloqueado
-SAV_EventFlagsORAS.flag_0290=Super Doubles Desbloqueado
-SAV_EventFlagsORAS.flag_0291=Super Triples Desbloqueado
-SAV_EventFlagsORAS.flag_0292=Super Rotation Desbloqueado
-SAV_EventFlagsORAS.flag_0293=Super Multi Desbloqueado
-SAV_EventFlagsORAS.flag_0419=(OR) Latias Derrotado
-SAV_EventFlagsORAS.flag_0420=(AS) Latios Derrotado
-SAV_EventFlagsORAS.flag_0647=(AS) Kyogre Derrotado
-SAV_EventFlagsORAS.flag_0648=(OR) Groudon Derrotado
-SAV_EventFlagsORAS.flag_0945=Deoxys Derrotado
-SAV_EventFlagsORAS.flag_0956=Regirock Derrotado
-SAV_EventFlagsORAS.flag_0957=Regice Derrotado
-SAV_EventFlagsORAS.flag_0958=Registeel Derrotado
-SAV_EventFlagsORAS.flag_2811=Raikou Capturado
-SAV_EventFlagsORAS.flag_2812=Entei Capturado
-SAV_EventFlagsORAS.flag_2813=Suicune Capturado
-SAV_EventFlagsORAS.flag_2814=(AS) Lugia Capturado
-SAV_EventFlagsORAS.flag_2815=(OR) Ho-Oh Capturado
-SAV_EventFlagsORAS.flag_2816=Uxie Capturado
-SAV_EventFlagsORAS.flag_2817=Mesprit Capturado
-SAV_EventFlagsORAS.flag_2818=Azelf Capturado
-SAV_EventFlagsORAS.flag_2819=(AS) Dialga Capturado
-SAV_EventFlagsORAS.flag_2820=(OR) Palkia Capturado
-SAV_EventFlagsORAS.flag_2821=Heatran Capturado
-SAV_EventFlagsORAS.flag_2822=Regigigas Capturado
-SAV_EventFlagsORAS.flag_2823=Giratina Capturado
-SAV_EventFlagsORAS.flag_2824=Cresselia Capturado
-SAV_EventFlagsORAS.flag_2825=Cobalion Capturado
-SAV_EventFlagsORAS.flag_2826=Terrakion Capturado
-SAV_EventFlagsORAS.flag_2827=Virizion Capturado
-SAV_EventFlagsORAS.flag_2828=(OR) Tornadus Capturado
-SAV_EventFlagsORAS.flag_2829=(AS) Thundurus Capturado
-SAV_EventFlagsORAS.flag_2830=(OR) Reshiram Capturado
-SAV_EventFlagsORAS.flag_2831=(AS) Zekrom Capturado
-SAV_EventFlagsORAS.flag_2832=Landorus Capturado
-SAV_EventFlagsORAS.flag_2833=Kyurem Capturado
-SAV_EventFlagsORAS.flag_2834=(OR) Latias Capturado
-SAV_EventFlagsORAS.flag_2835=(AS) Latios Capturado
-SAV_EventFlagsORAS.flag_2836=Regirock Capturado
-SAV_EventFlagsORAS.flag_2837=Regice Capturado
-SAV_EventFlagsORAS.flag_2838=Registeel Capturado
-SAV_EventFlagsORAS.flag_2839=(OR) Groudon Capturado
-SAV_EventFlagsORAS.flag_2840=(AS) Kyogre Capturado
-SAV_EventFlagsORAS.flag_2842=Deoxys Capturado
-SAV_EventFlagsORAS.GB_FlagStatus=Verificar Estado do Evento
-SAV_EventFlagsORAS.GB_Misc=Misc
-SAV_EventFlagsORAS.GB_Rebattle=Voltar a Lutar
-SAV_EventFlagsORAS.GB_Researcher=Investigador FlagDiff
-SAV_EventFlagsORAS.L_Ash=Volcanic Ash:
-SAV_EventFlagsORAS.L_Flag=Evento:
-SAV_EventFlagsORAS.L_IsSet=IsSet
-SAV_EventFlagsORAS.L_SkyTower=*Sky Tower
-SAV_EventFlagsORAS.L_UnSet=UnSet
-SAV_EventFlagsXY.B_Cancel=Cancelar
-SAV_EventFlagsXY.B_LoadNew=Abrir Novo
-SAV_EventFlagsXY.B_LoadOld=Abrir Velho
-SAV_EventFlagsXY.B_Save=Gravar
-SAV_EventFlagsXY.CHK_CustomFlag=Estado:
-SAV_EventFlagsXY.flag_0001=Evento1
-SAV_EventFlagsXY.flag_0002=Evento2
-SAV_EventFlagsXY.flag_0003=Evento3
-SAV_EventFlagsXY.flag_0004=Evento4
-SAV_EventFlagsXY.flag_0005=Evento5
-SAV_EventFlagsXY.flag_0114=Zygarde Capturado
-SAV_EventFlagsXY.flag_0115=Mewtwo Capturado
-SAV_EventFlagsXY.flag_0285=Estátua Singles
-SAV_EventFlagsXY.flag_0286=Estátua Doubles
-SAV_EventFlagsXY.flag_0287=Estátua Triples
-SAV_EventFlagsXY.flag_0288=Estátua Rotation
-SAV_EventFlagsXY.flag_0289=Estátua Multi
-SAV_EventFlagsXY.flag_0290=Super Singles Desbloqueado
-SAV_EventFlagsXY.flag_0291=Super Doubles Desbloqueado
-SAV_EventFlagsXY.flag_0292=Super Triples Desbloqueado
-SAV_EventFlagsXY.flag_0293=Super Rotation Desbloqueado
-SAV_EventFlagsXY.flag_0294=Super Multi Desbloqueado
-SAV_EventFlagsXY.flag_0675=50: Chatelaine Derrotada
-SAV_EventFlagsXY.flag_0790=Zygarde Derrotado
-SAV_EventFlagsXY.flag_0963=Mewtwo Derrotado
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=Pokédex Obtido
-SAV_EventFlagsXY.GB_FlagStatus=Verificar Estado do Evento
-SAV_EventFlagsXY.GB_Misc=Outros
-SAV_EventFlagsXY.GB_Rebattle=Voltar a Lutar
-SAV_EventFlagsXY.GB_Researcher=Investigador FlagDiff
-SAV_EventFlagsXY.L_Flag=Evento:
-SAV_EventFlagsXY.L_IsSet=IsSet
-SAV_EventFlagsXY.L_UnSet=UnSet
 SAV_GameSelect.B_Cancel=Cancel
 SAV_GameSelect.B_OK=OK
 SAV_GameSelect.L_Game=Game:
@@ -457,7 +367,6 @@ SAV_HallOfFame.L_Shiny=Shiny:
 SAV_HallOfFame.L_Victory=Número de Victória:
 SAV_HallOfFame.Label_EncryptionConstant=Constante de Encriptação:
 SAV_HallOfFame.Label_Form=Forma:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=Item em Posse:
 SAV_HallOfFame.Label_MetDate=Data:
 SAV_HallOfFame.Label_OT=OT:
@@ -494,7 +403,6 @@ SAV_HoneyTree.L_Shake=Shake
 SAV_HoneyTree.L_Slot=Slot
 SAV_HoneyTree.L_Species=Species
 SAV_HoneyTree.L_Time=Time left (minutes)
-SAV_HoneyTree.L_Tree0=- Route 205, Floaroma Town side
 SAV_Inventory.B_Cancel=Cancelar
 SAV_Inventory.B_DisplayBerries=Bagas
 SAV_Inventory.B_DisplayItems=Itens
@@ -560,17 +468,9 @@ SAV_MailBox.L_PKM3=Bulbasaur:
 SAV_MailBox.L_PKM4=Bulbasaur:
 SAV_MailBox.L_PKM5=Bulbasaur:
 SAV_MailBox.L_PKM6=Bulbasaur:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=Cancel
 SAV_Misc3.B_GetTickets=Get Tickets
 SAV_Misc3.B_Save=Save
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=Activated
 SAV_Misc3.CHK_Catchable=Can get ride
 SAV_Misc3.CHK_Continue=Continue
@@ -926,7 +826,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=Principal
 SAV_SecretBase.f_PKM=Pokémon do Treinador
 SAV_SecretBase.GB_Object=Disposição de Objectos
-SAV_SecretBase.GB_PKM=PKM
 SAV_SecretBase.L_ATK=ATK
 SAV_SecretBase.L_BaseLocation=Local da Base Secreta:
 SAV_SecretBase.L_Blackboard=Quadro:
@@ -945,7 +844,6 @@ SAV_SecretBase.L_IVs=IVs
 SAV_SecretBase.L_Participant=Participante:
 SAV_SecretBase.L_PKFriendship=Amizade:
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=PPUps
 SAV_SecretBase.L_Rotation=Rotação Val:
 SAV_SecretBase.L_SpA=SpA
 SAV_SecretBase.L_SpD=SpD
@@ -955,7 +853,6 @@ SAV_SecretBase.L_TeamSlogan=Lema da Equipa:
 SAV_SecretBase.L_TrName=Nome do Treinador:
 SAV_SecretBase.L_X=X Coordinate:
 SAV_SecretBase.L_Y=Y Coordinate:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=Cancel
 SAV_SimplePokedex.B_CaughtAll=Caught All
 SAV_SimplePokedex.B_CaughtNone=Caught None
@@ -1067,7 +964,6 @@ SAV_Trainer.L_SinglesC=Singles:
 SAV_Trainer.L_SkinColor=Cor da Pele:
 SAV_Trainer.L_Socks=Meias:
 SAV_Trainer.L_Started=Game Started:
-SAV_Trainer.L_Stats=Estatísticas
 SAV_Trainer.L_Style=Estilo:
 SAV_Trainer.L_SuperB=Super
 SAV_Trainer.L_SuperC=Super
@@ -1191,17 +1087,6 @@ SettingsEditor.SetUpdateDex=Modificar Pokédex
 SettingsEditor.SetUpdatePKM=Modificar PKM Info
 SettingsEditor.ShinySprites=Shiny Sprites
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=Cancel
-SuperTrain.B_Save=Save
-SuperTrain.L_Bags=Training Bags
-SuperTrain.L_Records=Records
-SuperTrain.L_Species=Species:
-SuperTrain.L_Species2=Species
-SuperTrain.L_Time0=Time:
-SuperTrain.L_Time1=Time1
-SuperTrain.L_Time2=Time2
-SuperTrain.L_Unk=L_Unk
-SuperTrain.L_UNKNOWN=UNKNOWN
 SuperTrainingEditor.B_All=Give All
 SuperTrainingEditor.B_Cancel=Cancel
 SuperTrainingEditor.B_None=Remove All
@@ -1248,4 +1133,4 @@ TrashEditor.GB_Trash=Trash Byte Layers
 TrashEditor.L_Generation=Generation
 TrashEditor.L_Language=Language
 TrashEditor.L_Species=Species
-TrashEditor.label1=String
+TrashEditor.L_String=String
diff --git a/PKHeX.Core/Resources/text/zh/lang_zh.txt b/PKHeX.Core/Resources/text/zh/lang_zh.txt
index 982b6fbe6..bcbfb0492 100644
--- a/PKHeX.Core/Resources/text/zh/lang_zh.txt
+++ b/PKHeX.Core/Resources/text/zh/lang_zh.txt
@@ -1,6 +1,5 @@
 BatchEditor=批量编辑器
 ErrorWindow=错误
-f2_Text=特殊字符
 KChart=KChart
 Main=PKHeX
 MemoryAmie=回忆/清爽乐
@@ -12,9 +11,8 @@ SAV_BoxList=寄放系统
 SAV_CGearSkin=C-装置皮肤
 SAV_Database=数据库
 SAV_EventFlags=事件旗标编辑
-SAV_EventFlagsORAS=事件旗标编辑
-SAV_EventFlagsXY=事件旗标编辑
 SAV_EventReset1=事件重置
+SAV_FolderList=Folder List
 SAV_GameSelect=游戏选择
 SAV_HallOfFame=名人堂
 SAV_HallOfFame7=名人堂
@@ -46,7 +44,6 @@ SAV_Trainer7=训练家数据编辑
 SAV_Underground=地下世界分数编辑
 SAV_Wondercard=神秘礼物导入导出
 SAV_ZygardeCell=细胞/贴纸编辑
-SuperTrain=超级训练记录
 SuperTrainingEditor=超级训练奖章
 TrashEditor=特殊字符
 BatchEditor.B_Add=增加
@@ -59,24 +56,34 @@ ErrorWindow.B_Abort=终止
 ErrorWindow.B_Continue=继续
 ErrorWindow.B_CopyToClipboard=复制到剪切板
 ErrorWindow.L_ProvideInfo=提交错误报告时请提供以下信息:
+Main.B_CellsStickers=Cells/Stickers
 Main.B_CGearSkin=C装置皮肤
+Main.B_FestivalPlaza=Festival Plaza
 Main.B_JPEG=保存PGL.JPEG
+Main.B_MailBox=Mail Box
+Main.B_OpenApricorn=Apricorns
 Main.B_OpenBerryField=树果农场
 Main.B_OpenBoxLayout=盒子布局
 Main.B_OpenEventFlags=事件旗标
+Main.B_OpenFriendSafari=Friend Safari
 Main.B_OpenHallofFame=名人堂
+Main.B_OpenHoneyTreeEditor=Honey Tree
 Main.B_OpenItemPouch=道具
 Main.B_OpenLinkInfo=宝可梦连接
+Main.B_OpenMiscEditor=Misc Edits
 Main.B_OpenOPowers=O-力量
 Main.B_OpenPokeBeans=宝可豆
-Main.B_OpenPokeBlocks=宝可方块
+Main.B_OpenPokeblocks=Pokéblocks
 Main.B_OpenPokedex=宝可梦图鉴
-Main.B_OpenPokePuffs=波伏蕾
+Main.B_OpenPokepuffs=‎Poké Puffs
+Main.B_OpenRTCEditor=Clock (RTC)
 Main.B_OpenSecretBase=秘密基地
 Main.B_OpenSuperTraining=超级训练
 Main.B_OpenTrainerInfo=训练家信息
+Main.B_OpenUGSEditor=Underground
 Main.B_OpenWondercards=神秘礼物
 Main.B_OUTPasserby=路人
+Main.B_Roamer=Roamer
 Main.B_SaveBoxBin=保存箱子信息++
 Main.B_VerifyCHK=验证校验值
 Main.BTN_History=回忆
@@ -93,26 +100,41 @@ Main.CHK_HackedStats=修改过的状态
 Main.CHK_Infected=感染病毒
 Main.CHK_IsEgg=蛋
 Main.CHK_Nicknamed=昵称:
+Main.CHK_NSparkle=Active
+Main.CHK_Shadow=Shadow
 Main.DayCare_HasEgg=拥有蛋
 Main.GB_CurrentMoves=招式
 Main.GB_Daycare=寄放屋
 Main.GB_EggConditions=蛋的获得相关
 Main.GB_ExtraBytes=额外字节
-Main.GB_Fused=合体
-Main.GB_GTS=GTS
 Main.GB_Markings=标记
 Main.GB_nOT=最近持有人（非初训家）
 Main.GB_OT=初训家信息
 Main.GB_RelearnMoves=回忆招式
-Main.GB_SUBE=SUBE
 Main.L_BattleBox=战斗箱
+Main.L_Box=Box
+Main.L_Daycare=Daycare
 Main.L_DaycareSeed=Seed
+Main.L_DC1=1: 
+Main.L_DC2=2: 
+Main.L_Fused=Fused
 Main.L_GameSync=游戏同步ID:
+Main.L_GTS=GTS
+Main.L_HeartGauge=Heart Gauge:
+Main.L_MetTimeOfDay=Time of Day:
+Main.L_Misc=Misc
+Main.L_NSparkle=N's Sparkle:
 Main.L_Party=同行
 Main.L_ReadOnlyOther=此选项卡不可编辑。
 Main.L_ReadOnlyPBB=只读
+Main.L_Resort=Resort
+Main.L_SaveSlot=Save Slot:
 Main.L_Secure1=安全值 1:
 Main.L_Secure2=安全值 2:
+Main.L_ShadowID=Shadow ID:
+Main.L_ShinyLeaf=Shiny Leaf:
+Main.L_XP1=+XP:
+Main.L_XP2=+XP:
 Main.Label_3DSRegion=3DS区域:
 Main.Label_Ability=特性:
 Main.Label_ATK=攻击:
@@ -135,6 +157,7 @@ Main.Label_EVs=努力值
 Main.Label_EXP=经验值:
 Main.Label_Form=样子:
 Main.Label_Friendship=亲密度:
+Main.Label_HatchCounter=Hatch Counter:
 Main.Label_HeldItem=持有物:
 Main.Label_HiddenPowerPrefix=觉醒力量:
 Main.Label_HP=HP:
@@ -168,6 +191,7 @@ Main.Menu_About=关于PKHeX
 Main.Menu_BatchEditor=批量编辑器
 Main.Menu_Data=数据
 Main.Menu_Database=PKM数据库
+Main.Menu_DumpBox=Dump Box
 Main.Menu_DumpBoxes=导出盒子信息
 Main.Menu_Exit=退出
 Main.Menu_ExportBAK=保存 BAK
@@ -180,17 +204,22 @@ Main.Menu_LoadBoxes=加载盒子信息
 Main.Menu_MGDatabase=神秘礼物数据库
 Main.Menu_Open=读取...
 Main.Menu_Options=设置
+Main.Menu_Redo=Redo Last Change
 Main.Menu_Report=盒子数据报告
 Main.Menu_Save=保存 PKM...
+Main.Menu_Settings=Settings
 Main.Menu_Showdown=Showdown
 Main.Menu_ShowdownExportBattleBox=导出战斗盒子到剪贴板
 Main.Menu_ShowdownExportParty=导出同行队伍到剪贴板
 Main.Menu_ShowdownExportPKM=导出宝可梦到剪贴板
 Main.Menu_ShowdownImportPKM=从剪贴板导入宝可梦
 Main.Menu_Tools=工具
-Main.Menu_Unicode=Unicode
-Main.mnu2View=查看
+Main.Menu_Undo=Undo Last Change
 Main.mnuDelete=删除
+Main.mnuLegality=Legality
+Main.mnuLLegality=Legality
+Main.mnuLQR=QR!
+Main.mnuLSave=Save as...
 Main.mnuSet=设置
 Main.mnuView=查看
 Main.Tab_Attacks=招式
@@ -211,7 +240,6 @@ MemoryAmie.GB_Residence=宝可梦曾经居住在:
 MemoryAmie.L_Arguments=关闭 ; 从未离开 ; 初训家 ; 前代 ; 回忆 ; 宝可梦 ; 地区 ; 道具 ; 移动 ; 位置 ;
 MemoryAmie.L_Country=国家
 MemoryAmie.L_CT_Affection=友好度:
-MemoryAmie.L_cT_Affection=友好度:
 MemoryAmie.L_CT_Feeling=感受:
 MemoryAmie.L_CT_Friendship=亲密度:
 MemoryAmie.L_CT_Quality=程度:
@@ -259,10 +287,8 @@ SAV_BoxLayout.B_Cancel=取消
 SAV_BoxLayout.B_Down=v
 SAV_BoxLayout.B_Save=保存
 SAV_BoxLayout.B_Up=^
-SAV_BoxLayout.L_BG=背景:
 SAV_BoxLayout.L_BoxName=盒子的名字:
 SAV_BoxLayout.L_Flag=旗标:
-SAV_BoxLayout.L_Flags=背景的解锁旗标:
 SAV_BoxLayout.L_Unlocked=已解锁:
 SAV_CGearSkin.B_Cancel=取消
 SAV_CGearSkin.B_ExportCGB=导出.cgb
@@ -321,122 +347,6 @@ SAV_EventFlags.L_IsSet=已设定:
 SAV_EventFlags.L_Stats=常数:
 SAV_EventFlags.L_UnSet=取消设定:
 SAV_EventFlags.tabPage3=研究
-SAV_EventFlagsORAS.B_Cancel=取消
-SAV_EventFlagsORAS.B_LoadNew=读新数据
-SAV_EventFlagsORAS.B_LoadOld=读老数据
-SAV_EventFlagsORAS.B_Save=保存
-SAV_EventFlagsORAS.CHK_CustomFlag=状态:
-SAV_EventFlagsORAS.flag_0172=克雷色利亚 已打败
-SAV_EventFlagsORAS.flag_0173=雷公 已打败
-SAV_EventFlagsORAS.flag_0174=炎帝 已打败
-SAV_EventFlagsORAS.flag_0175=水君 已打败
-SAV_EventFlagsORAS.flag_0176=勾帕路翁 已打败
-SAV_EventFlagsORAS.flag_0177=代拉基翁 已打败
-SAV_EventFlagsORAS.flag_0178=毕力吉翁 已打败
-SAV_EventFlagsORAS.flag_0179=由克希 已打败
-SAV_EventFlagsORAS.flag_0180=艾姆利多 已打败
-SAV_EventFlagsORAS.flag_0181=亚克诺姆 已打败
-SAV_EventFlagsORAS.flag_0182=(OR) 莱希拉姆 已打败
-SAV_EventFlagsORAS.flag_0183=(AS) 捷克罗姆 已打败
-SAV_EventFlagsORAS.flag_0184=酋雷姆 已打败
-SAV_EventFlagsORAS.flag_0208=(OR) 凤王 已打败
-SAV_EventFlagsORAS.flag_0209=(AS) 洛奇亚 已打败
-SAV_EventFlagsORAS.flag_0252=雷吉奇卡斯 已打败
-SAV_EventFlagsORAS.flag_0260=席多蓝恩 已打败
-SAV_EventFlagsORAS.flag_0284=单打雕像
-SAV_EventFlagsORAS.flag_0285=2v2雕像
-SAV_EventFlagsORAS.flag_0286=3v3雕像
-SAV_EventFlagsORAS.flag_0287=轮盘雕像
-SAV_EventFlagsORAS.flag_0288=配合雕像
-SAV_EventFlagsORAS.flag_0289=超级单打 已解锁
-SAV_EventFlagsORAS.flag_0290=超级2v2 已解锁
-SAV_EventFlagsORAS.flag_0291=超级3v3 已解锁
-SAV_EventFlagsORAS.flag_0292=超级轮盘 已解锁
-SAV_EventFlagsORAS.flag_0293=超级配合 已解锁
-SAV_EventFlagsORAS.flag_0419=(OR) 拉帝亚斯 已打败
-SAV_EventFlagsORAS.flag_0420=(AS) 拉帝欧斯 已打败
-SAV_EventFlagsORAS.flag_0647=(AS) 盖欧卡 已打败
-SAV_EventFlagsORAS.flag_0648=(OR) 固拉多 已打败
-SAV_EventFlagsORAS.flag_0945=代欧奇希斯 已打败
-SAV_EventFlagsORAS.flag_0956=雷吉洛克 已打败
-SAV_EventFlagsORAS.flag_0957=雷吉艾斯 已打败
-SAV_EventFlagsORAS.flag_0958=雷吉斯奇鲁 已打败
-SAV_EventFlagsORAS.flag_2811=雷公 已捕获
-SAV_EventFlagsORAS.flag_2812=炎帝 已捕获
-SAV_EventFlagsORAS.flag_2813=水君 已捕获
-SAV_EventFlagsORAS.flag_2814=(AS) 洛奇亚 已捕获
-SAV_EventFlagsORAS.flag_2815=(OR) 凤王 已捕获
-SAV_EventFlagsORAS.flag_2816=由克希 已捕获
-SAV_EventFlagsORAS.flag_2817=艾姆利多 已捕获
-SAV_EventFlagsORAS.flag_2818=亚克诺姆 已捕获
-SAV_EventFlagsORAS.flag_2819=(AS) 帝牙卢卡 已捕获
-SAV_EventFlagsORAS.flag_2820=(OR) 帕路奇亚 已捕获
-SAV_EventFlagsORAS.flag_2821=席多蓝恩 已捕获
-SAV_EventFlagsORAS.flag_2822=雷吉奇卡斯 已捕获
-SAV_EventFlagsORAS.flag_2823=骑拉帝纳 已捕获
-SAV_EventFlagsORAS.flag_2824=克雷色利亚 已捕获
-SAV_EventFlagsORAS.flag_2825=勾帕路翁 已捕获
-SAV_EventFlagsORAS.flag_2826=代拉基翁 已捕获
-SAV_EventFlagsORAS.flag_2827=毕力吉翁 已捕获
-SAV_EventFlagsORAS.flag_2828=(OR) 龙卷云 已捕获
-SAV_EventFlagsORAS.flag_2829=(AS) 雷电云 已捕获
-SAV_EventFlagsORAS.flag_2830=(OR) 莱希拉姆 已捕获
-SAV_EventFlagsORAS.flag_2831=(AS) 捷克罗姆 已捕获
-SAV_EventFlagsORAS.flag_2832=土地云 已捕获
-SAV_EventFlagsORAS.flag_2833=酋雷姆 已捕获
-SAV_EventFlagsORAS.flag_2834=(OR) 拉帝亚斯 已捕获
-SAV_EventFlagsORAS.flag_2835=(AS) 拉帝欧斯 已捕获
-SAV_EventFlagsORAS.flag_2836=雷吉洛克 已捕获
-SAV_EventFlagsORAS.flag_2837=雷吉艾斯 已捕获
-SAV_EventFlagsORAS.flag_2838=雷吉斯奇鲁 已捕获
-SAV_EventFlagsORAS.flag_2839=(OR) 固拉多 已捕获
-SAV_EventFlagsORAS.flag_2840=(AS) 盖欧卡 已捕获
-SAV_EventFlagsORAS.flag_2842=代欧奇希斯 已捕获
-SAV_EventFlagsORAS.GB_FlagStatus=检查旗标状态
-SAV_EventFlagsORAS.GB_Misc=杂项
-SAV_EventFlagsORAS.GB_Rebattle=重新战斗
-SAV_EventFlagsORAS.GB_Researcher=旗标差异研究工具
-SAV_EventFlagsORAS.L_Ash=火山灰:
-SAV_EventFlagsORAS.L_Flag=旗标:
-SAV_EventFlagsORAS.L_IsSet=已设置
-SAV_EventFlagsORAS.L_SkyTower=*天空塔
-SAV_EventFlagsORAS.L_UnSet=未设置
-SAV_EventFlagsXY.B_Cancel=取消
-SAV_EventFlagsXY.B_LoadNew=读新数据
-SAV_EventFlagsXY.B_LoadOld=读老数据
-SAV_EventFlagsXY.B_Save=保存
-SAV_EventFlagsXY.CHK_CustomFlag=状态:
-SAV_EventFlagsXY.flag_0001=旗标1
-SAV_EventFlagsXY.flag_0002=旗标2
-SAV_EventFlagsXY.flag_0003=旗标3
-SAV_EventFlagsXY.flag_0004=旗标4
-SAV_EventFlagsXY.flag_0005=旗标5
-SAV_EventFlagsXY.flag_0114=基格尔德 已捕获
-SAV_EventFlagsXY.flag_0115=梦幻 已捕获
-SAV_EventFlagsXY.flag_0285=单打雕像
-SAV_EventFlagsXY.flag_0286=2v2雕像
-SAV_EventFlagsXY.flag_0287=3v3雕像
-SAV_EventFlagsXY.flag_0288=轮盘雕像
-SAV_EventFlagsXY.flag_0289=配合雕像
-SAV_EventFlagsXY.flag_0290=超级单打 解锁
-SAV_EventFlagsXY.flag_0291=超级2v2 解锁
-SAV_EventFlagsXY.flag_0292=超级3v3 解锁
-SAV_EventFlagsXY.flag_0293=超级轮盘 解锁
-SAV_EventFlagsXY.flag_0294=超级配合 解锁
-SAV_EventFlagsXY.flag_0675=50:打败女城主
-SAV_EventFlagsXY.flag_0790=基格尔德 已打败
-SAV_EventFlagsXY.flag_0963=梦幻 已打败
-SAV_EventFlagsXY.flag_2237=2237
-SAV_EventFlagsXY.flag_2238=2238
-SAV_EventFlagsXY.flag_2239=2239
-SAV_EventFlagsXY.flag_2546=图鉴已获得
-SAV_EventFlagsXY.GB_FlagStatus=检查旗标状态
-SAV_EventFlagsXY.GB_Misc=杂项
-SAV_EventFlagsXY.GB_Rebattle=重新战斗
-SAV_EventFlagsXY.GB_Researcher=旗标差异研究工具
-SAV_EventFlagsXY.L_Flag=旗标:
-SAV_EventFlagsXY.L_IsSet=已设置
-SAV_EventFlagsXY.L_UnSet=未设置
 SAV_GameSelect.B_Cancel=取消
 SAV_GameSelect.B_OK=确认
 SAV_GameSelect.L_Game=游戏:
@@ -453,7 +363,6 @@ SAV_HallOfFame.L_Shiny=闪光:
 SAV_HallOfFame.L_Victory=胜利数字:
 SAV_HallOfFame.Label_EncryptionConstant=加密常数:
 SAV_HallOfFame.Label_Form=形态:
-SAV_HallOfFame.Label_Gender=-
 SAV_HallOfFame.Label_HeldItem=持有道具:
 SAV_HallOfFame.Label_MetDate=日期:
 SAV_HallOfFame.Label_OT=初训家:
@@ -490,7 +399,6 @@ SAV_HoneyTree.L_Shake=摇动
 SAV_HoneyTree.L_Slot=槽
 SAV_HoneyTree.L_Species=种类
 SAV_HoneyTree.L_Time=剩余时间(分钟)
-SAV_HoneyTree.L_Tree0=- 205号道路, 苑之镇侧
 SAV_Inventory.B_Cancel=取消
 SAV_Inventory.B_GiveAll=获得所有
 SAV_Inventory.B_Save=保存
@@ -550,17 +458,9 @@ SAV_MailBox.L_PKM3=妙蛙种子:
 SAV_MailBox.L_PKM4=妙蛙种子:
 SAV_MailBox.L_PKM5=妙蛙种子:
 SAV_MailBox.L_PKM6=妙蛙种子:
-SAV_MailBox.Label_OTGender=G
 SAV_Misc3.B_Cancel=取消
 SAV_Misc3.B_GetTickets=获得船票
 SAV_Misc3.B_Save=保存
-SAV_Misc3.BTN_SymbolA=A
-SAV_Misc3.BTN_SymbolB=B
-SAV_Misc3.BTN_SymbolG=G
-SAV_Misc3.BTN_SymbolK=K
-SAV_Misc3.BTN_SymbolL=L
-SAV_Misc3.BTN_SymbolS=S
-SAV_Misc3.BTN_SymbolT=T
 SAV_Misc3.CHK_ActivatePass=已激活
 SAV_Misc3.CHK_Catchable=可乘坐
 SAV_Misc3.CHK_Continue=继续
@@ -914,7 +814,6 @@ SAV_SecretBase.CHK_Shiny=☆
 SAV_SecretBase.f_MAIN=主要信息
 SAV_SecretBase.f_PKM=训练家的宝可梦
 SAV_SecretBase.GB_Object=物品布局
-SAV_SecretBase.GB_PKM=宝可梦
 SAV_SecretBase.L_ATK=攻击
 SAV_SecretBase.L_BaseLocation=秘密基地地点:
 SAV_SecretBase.L_Blackboard=黑板:
@@ -933,7 +832,6 @@ SAV_SecretBase.L_IVs=个体
 SAV_SecretBase.L_Participant=参与:
 SAV_SecretBase.L_PKFriendship=亲密度:
 SAV_SecretBase.L_PPups=PP Ups
-SAV_SecretBase.L_PPUps=PP提升
 SAV_SecretBase.L_Rotation=旋转值:
 SAV_SecretBase.L_SpA=特攻
 SAV_SecretBase.L_SpD=特防
@@ -943,7 +841,6 @@ SAV_SecretBase.L_TeamSlogan=队伍口号:
 SAV_SecretBase.L_TrName=训练家名字:
 SAV_SecretBase.L_X=X坐标:
 SAV_SecretBase.L_Y=Y坐标:
-SAV_SecretBase.Label_Gender=-
 SAV_SimplePokedex.B_Cancel=取消
 SAV_SimplePokedex.B_CaughtAll=捕获所有
 SAV_SimplePokedex.B_CaughtNone=都没捕获
@@ -1054,7 +951,6 @@ SAV_Trainer.L_SinglesC=单打:
 SAV_Trainer.L_SkinColor=肤色:
 SAV_Trainer.L_Socks=袜子:
 SAV_Trainer.L_Started=游戏已进行:
-SAV_Trainer.L_Stats=统计
 SAV_Trainer.L_Style=风格:
 SAV_Trainer.L_SuperB=超级
 SAV_Trainer.L_SuperC=超级
@@ -1178,17 +1074,6 @@ SettingsEditor.SetUpdateDex=修改图鉴
 SettingsEditor.SetUpdatePKM=修改宝可梦
 SettingsEditor.ShinySprites=异色图标
 SettingsEditor.Unicode=Unicode
-SuperTrain.B_Cancel=取消
-SuperTrain.B_Save=保存
-SuperTrain.L_Bags=训练沙袋
-SuperTrain.L_Records=记录
-SuperTrain.L_Species=种类:
-SuperTrain.L_Species2=种类
-SuperTrain.L_Time0=时间:
-SuperTrain.L_Time1=时间1
-SuperTrain.L_Time2=时间2
-SuperTrain.L_Unk=未知
-SuperTrain.L_UNKNOWN=未知
 SuperTrainingEditor.B_All=获得全部
 SuperTrainingEditor.B_Cancel=取消
 SuperTrainingEditor.B_None=全部清除
@@ -1235,4 +1120,4 @@ TrashEditor.GB_Trash=垃圾字节区
 TrashEditor.L_Generation=世代
 TrashEditor.L_Language=语言
 TrashEditor.L_Species=种类
-TrashEditor.label1=字符串
+TrashEditor.L_String=字符串
diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs
index 2005b76ab..e69920c6b 100644
--- a/PKHeX.WinForms/MainWindow/Main.cs
+++ b/PKHeX.WinForms/MainWindow/Main.cs
@@ -929,10 +929,6 @@ private static void InitializeStrings()
             GameInfo.Strings = GameInfo.GetStrings(l);
 
             // Update Legality Strings
-            // WinFormsTranslator.LoadAllForms();
-            // WinFormsTranslator.UpdateAll("en", new[] {"ja", "fr", "it", "de", "es", "ko", "zh", "pt"});
-            // WinFormsTranslator.DumpAll();
-            // Clipboard.SetText(string.Join(Environment.NewLine, Util.GetLocalization(typeof(LegalityCheckStrings))));
             Task.Run(() => {
                     var lang = Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName.Substring(0, 2);
                     Util.SetLocalization(typeof(LegalityCheckStrings), lang);
diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj
index d5bf28f13..a0d7c02f7 100644
--- a/PKHeX.WinForms/PKHeX.WinForms.csproj
+++ b/PKHeX.WinForms/PKHeX.WinForms.csproj
@@ -571,6 +571,7 @@
     </Compile>
     <Compile Include="Util\ConfigUtil.cs" />
     <Compile Include="Util\CyberGadgetUtil.cs" />
+    <Compile Include="Util\DevUtil.cs" />
     <Compile Include="Util\FontUtil.cs" />
     <Compile Include="Util\ImageUtil.cs" />
     <Compile Include="Util\NetUtil.cs" />
diff --git a/PKHeX.WinForms/Subforms/PKM Editors/Text.Designer.cs b/PKHeX.WinForms/Subforms/PKM Editors/Text.Designer.cs
index 15c07df6e..65d80c476 100644
--- a/PKHeX.WinForms/Subforms/PKM Editors/Text.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/PKM Editors/Text.Designer.cs	
@@ -43,7 +43,7 @@ private void InitializeComponent()
             this.NUD_Generation = new System.Windows.Forms.NumericUpDown();
             this.L_Language = new System.Windows.Forms.Label();
             this.L_Species = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
+            this.L_String = new System.Windows.Forms.Label();
             this.GB_Trash.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.NUD_Generation)).BeginInit();
             this.SuspendLayout();
@@ -203,23 +203,23 @@ private void InitializeComponent()
             this.L_Species.Text = "Species";
             this.L_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // label1
+            // L_String
             // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.L_String.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.label1.Location = new System.Drawing.Point(9, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(77, 23);
-            this.label1.TabIndex = 44;
-            this.label1.Text = "String";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.L_String.Location = new System.Drawing.Point(9, 9);
+            this.L_String.Name = "L_String";
+            this.L_String.Size = new System.Drawing.Size(77, 23);
+            this.L_String.TabIndex = 44;
+            this.L_String.Text = "String";
+            this.L_String.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // f2_Text
+            // TrashEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(503, 219);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.L_String);
             this.Controls.Add(this.GB_Trash);
             this.Controls.Add(this.FLP_Hex);
             this.Controls.Add(this.FLP_Characters);
@@ -255,6 +255,6 @@ private void InitializeComponent()
         private System.Windows.Forms.NumericUpDown NUD_Generation;
         private System.Windows.Forms.Label L_Generation;
         private System.Windows.Forms.Button B_ClearTrash;
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label L_String;
     }
 }
\ No newline at end of file
diff --git a/PKHeX.WinForms/Util/DevUtil.cs b/PKHeX.WinForms/Util/DevUtil.cs
new file mode 100644
index 000000000..360a816ea
--- /dev/null
+++ b/PKHeX.WinForms/Util/DevUtil.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Windows.Forms;
+using PKHeX.Core;
+
+namespace PKHeX.WinForms
+{
+    #if DEBUG
+    public static class DevUtil
+    {
+        private static readonly string[] Languages = {"ja", "fr", "it", "de", "es", "ko", "zh", "pt"};
+        private const string DefaultLanguage = "en";
+        public static void UpdateTranslations()
+        {
+            WinFormsTranslator.LoadAllForms(LoadBanlist); // populate with every possible control
+            WinFormsTranslator.UpdateAll(DefaultLanguage, Languages); // propagate to others
+            WinFormsTranslator.DumpAll(Banlist); // dump current to file
+            WinFormsTranslator.SetRemovalMode(); // remove used keys, don't add any
+            WinFormsTranslator.LoadAllForms(LoadBanlist); // de-populate
+            WinFormsTranslator.RemoveAll(DefaultLanguage, PurgeBanlist); // remove all lines from above generated files that still remain
+
+            Application.Exit();
+        }
+
+        private static readonly string[] LoadBanlist =
+        {
+            nameof(SplashScreen),
+        };
+
+        private static readonly string[] Banlist =
+        {
+            nameof(SplashScreen),
+            "Main.label1=", // idk why this pops up but it does
+            "Gender=", // editor gender labels
+            "BTN_Shinytize", // ☆
+            "Main.B_Box", // << and >> arrows
+            "Main.L_Characteristic=", // Characterstic (dynamic)
+            "Main.L_Potential", // ★☆☆☆ IV judge evaluation
+            "SAV_FolderList.", // don't translate that form's buttons, only title
+            "SAV_HoneyTree.L_Tree0", // dynamic, don't bother
+            "SAV_Misc3.BTN_Symbol", // symbols should stay as their current character
+        };
+
+        private static readonly string[] PurgeBanlist =
+        {
+            nameof(SuperTrainingEditor),
+            nameof(ErrorWindow),
+            nameof(SettingsEditor),
+        };
+
+        public static void DumpLegalityStrings()
+        {
+            Clipboard.SetText(string.Join(Environment.NewLine, Util.GetLocalization(typeof(LegalityCheckStrings))));
+        }
+    }
+    #endif
+}
diff --git a/PKHeX.WinForms/Util/WinFormsTranslator.cs b/PKHeX.WinForms/Util/WinFormsTranslator.cs
index 43f90b459..b82de6c4d 100644
--- a/PKHeX.WinForms/Util/WinFormsTranslator.cs
+++ b/PKHeX.WinForms/Util/WinFormsTranslator.cs
@@ -127,26 +127,30 @@ public static void UpdateAll(string baseLanguage, IEnumerable<string> others)
             }
         }
 
-        public static void DumpAll()
+        public static void DumpAll(params string[] banlist)
         {
             var results = Context.Select(z => new {Lang = z.Key, Lines = z.Value.Write()});
             foreach (var c in results)
-                File.WriteAllLines(GetTranslationFileNameExternal(c.Lang), c.Lines);
+            {
+                var lang = c.Lang;
+                var fn = GetTranslationFileNameExternal(lang);
+                var lines = c.Lines;
+                var result = lines.Where(z => !banlist.Any(z.Contains));
+                File.WriteAllLines(fn, result);
+            }
         }
 
-        public static void LoadAllForms()
+        public static void LoadAllForms(params string[] banlist)
         {
             var q = from t in System.Reflection.Assembly.GetExecutingAssembly().GetTypes()
-                where t.BaseType == typeof(Form)
+                where t.BaseType == typeof(Form) && !banlist.Contains(t.Name)
                 select t;
             foreach (var t in q)
             {
                 var constructors = t.GetConstructors();
                 if (constructors.Length == 0)
-                { System.Console.WriteLine($"skipped {t.Name}"); continue; }
+                { System.Console.WriteLine($"No constructors: {t.Name}"); continue; }
                 var argCount = constructors.First().GetParameters().Length;
-                if (argCount <= 0)
-                { System.Console.WriteLine($"skipped {t.Name}"); continue; }
                 try
                 {
                     var _ = (Form)System.Activator.CreateInstance(t, new object[argCount]);
@@ -154,14 +158,39 @@ public static void LoadAllForms()
                 catch { }
             }
         }
+
+        public static void SetRemovalMode(bool status = true)
+        {
+            foreach (TranslationContext c in Context.Values)
+            {
+                c.RemoveUsedKeys = status;
+                c.AddNew = !status;
+            }
+        }
+
+        public static void RemoveAll(string defaultLanguage, params string[] banlist)
+        {
+            var badKeys = Context[defaultLanguage];
+            var split = badKeys.Write().Select(z => z.Split(TranslationContext.Separator)[0])
+                .Where(l => !banlist.Any(l.StartsWith)).ToArray();
+            foreach (var c in Context)
+            {
+                var lang = c.Key;
+                var fn = GetTranslationFileNameExternal(lang);
+                var lines = File.ReadAllLines(fn);
+                var result = lines.Where(l => !split.Any(s => l.StartsWith(s + TranslationContext.Separator)));
+                File.WriteAllLines(fn, result);
+            }
+        }
     }
 
     public class TranslationContext
     {
-        public bool AddNew { get; set; } = true;
-        public bool RemoveUsedKeys { get; set; } = false;
+        public bool AddNew { private get; set; } = true;
+        public bool RemoveUsedKeys { private get; set; }
+        public const char Separator = '=';
         private readonly Dictionary<string, string> Translation = new Dictionary<string, string>();
-        public TranslationContext(IEnumerable<string> content, char separator = '=')
+        public TranslationContext(IEnumerable<string> content, char separator = Separator)
         {
             var entries = content.Select(z => z.Split(separator)).Where(z => z.Length == 2);
             foreach (var r in entries.Where(z => !Translation.ContainsKey(z[0])))
@@ -181,7 +210,7 @@ public string GetTranslatedText(string val, string fallback)
             return fallback;
         }
 
-        public IEnumerable<string> Write(char separator = '=')
+        public IEnumerable<string> Write(char separator = Separator)
         {
             return Translation.Select(z => $"{z.Key}{separator}{z.Value}").OrderBy(z => z.Contains(".")).ThenBy(z => z);
         }