From 5af66787848c37e708f0007e44c7b4b4668d8d0f Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 5 May 2024 23:24:32 -0500 Subject: [PATCH] Update 24.05.05 Fix devutil text update swap tox & poison icons, move picturebox to the right add some Legality settings util functions --- Directory.Build.props | 2 +- .../Legality/Settings/LegalitySettings.cs | 15 +++++++ .../Specialized/HOMETransferSettings.cs | 8 +++- .../Specialized/HandlerRestrictions.cs | 15 ++++++- .../Specialized/NicknameRestriction.cs | 36 ++++++++++++++- .../checks/LegalityCheckStrings_ja.txt | 1 - PKHeX.Core/Resources/legality/mgdb/wc9.pkl | Bin 110360 -> 111072 bytes .../legality/wild/encounter_go_home.pkl | Bin 130208 -> 132056 bytes .../legality/wild/encounter_go_lgpe.pkl | Bin 28444 -> 28784 bytes PKHeX.Core/Saves/SAV6AO.cs | 2 - .../Saves/Substructures/Gen6/HallOfFame6.cs | 2 - .../Resources/img/Status/sickpoison.png | Bin 3400 -> 3252 bytes .../Resources/img/Status/sicktoxic.png | Bin 3252 -> 3400 bytes .../Controls/PKM Editor/PKMEditor.Designer.cs | 4 +- .../PKM Editor/StatusConditionView.cs | 20 ++++++++- PKHeX.WinForms/Resources/text/changelog.txt | 16 ++++++- PKHeX.WinForms/Resources/text/lang_de.txt | 40 +++++++++++------ PKHeX.WinForms/Resources/text/lang_en.txt | 34 +++++++++----- PKHeX.WinForms/Resources/text/lang_es.txt | 42 ++++++++++++------ PKHeX.WinForms/Resources/text/lang_fr.txt | 36 ++++++++++----- PKHeX.WinForms/Resources/text/lang_it.txt | 42 ++++++++++++------ PKHeX.WinForms/Resources/text/lang_ja.txt | 34 +++++++++----- PKHeX.WinForms/Resources/text/lang_ko.txt | 34 +++++++++----- PKHeX.WinForms/Resources/text/lang_zh.txt | 38 ++++++++++------ PKHeX.WinForms/Resources/text/lang_zh2.txt | 42 ++++++++++++------ PKHeX.WinForms/Subforms/PKM Editors/Text.cs | 2 +- .../Subforms/Save Editors/Gen6/SAV_Trainer.cs | 2 +- .../Save Editors/Gen7/SAV_FestivalPlaza.cs | 2 +- .../Save Editors/Gen7/SAV_Trainer7.cs | 2 +- .../Save Editors/Gen7/SAV_Trainer7GG.cs | 2 +- .../Save Editors/Gen8/SAV_Trainer8.cs | 2 +- .../Save Editors/Gen8/SAV_Trainer8a.cs | 2 +- .../Save Editors/Gen8/SAV_Trainer8b.cs | 2 +- .../Save Editors/Gen9/SAV_Trainer9.cs | 2 +- PKHeX.WinForms/Util/WinFormsTranslator.cs | 25 ++++++++--- 35 files changed, 366 insertions(+), 140 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index f2524f0fd9e..e0616d5e65e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 24.03.26 + 24.05.05 12 enable en diff --git a/PKHeX.Core/Legality/Settings/LegalitySettings.cs b/PKHeX.Core/Legality/Settings/LegalitySettings.cs index f2713a8cdc4..cad22469dee 100644 --- a/PKHeX.Core/Legality/Settings/LegalitySettings.cs +++ b/PKHeX.Core/Legality/Settings/LegalitySettings.cs @@ -16,4 +16,19 @@ public sealed class LegalitySettings public NicknameSettings Nickname { get; set; } = new(); public TradebackSettings Tradeback { get; set; } = new(); public WordFilterSettings WordFilter { get; set; } = new(); + + /// + /// Adjusts the settings to disable all checks that reference the "current" save file. + /// + /// Allows for quick disabling of others for use in unit tests. + /// If false, disable HOME Transfer checks. Useful for checking migration logic. + /// If true, allows special encounters to be nicknamed. + public void SetCheckWithoutSaveFile(bool checkHOME = true, bool allowRNG = false) + { + Handler.CheckActiveHandler = false; + if (!checkHOME) + HOMETransfer.Disable(); + if (allowRNG) + Nickname.Disable(); + } } diff --git a/PKHeX.Core/Legality/Settings/Specialized/HOMETransferSettings.cs b/PKHeX.Core/Legality/Settings/Specialized/HOMETransferSettings.cs index 1ea5e5604aa..9c6c7e781ae 100644 --- a/PKHeX.Core/Legality/Settings/Specialized/HOMETransferSettings.cs +++ b/PKHeX.Core/Legality/Settings/Specialized/HOMETransferSettings.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; namespace PKHeX.Core; @@ -10,4 +10,10 @@ public sealed class HOMETransferSettings [LocalizedDescription("Severity to flag a Legality Check if Pokémon has a zero value for both Height and Weight.")] public Severity ZeroHeightWeight { get; set; } = Severity.Fishy; + + public void Disable() + { + HOMETransferTrackerNotPresent = Severity.Fishy; + ZeroHeightWeight = Severity.Fishy; + } } diff --git a/PKHeX.Core/Legality/Settings/Specialized/HandlerRestrictions.cs b/PKHeX.Core/Legality/Settings/Specialized/HandlerRestrictions.cs index 989f51e8f81..494fb23a3c6 100644 --- a/PKHeX.Core/Legality/Settings/Specialized/HandlerRestrictions.cs +++ b/PKHeX.Core/Legality/Settings/Specialized/HandlerRestrictions.cs @@ -15,7 +15,7 @@ public sealed class HandlerSettings } [TypeConverter(typeof(ExpandableObjectConverter))] -public sealed record HandlerRestrictions +public sealed class HandlerRestrictions { public bool AllowHandleOTGen6 { get; set; } public bool AllowHandleOTGen7 { get; set; } @@ -25,6 +25,19 @@ public sealed record HandlerRestrictions public bool AllowHandleOTGen8b { get; set; } public bool AllowHandleOTGen9 { get; set; } + public void Disable() => SetAllTo(true); + + public void SetAllTo(bool value) + { + AllowHandleOTGen6 = value; + AllowHandleOTGen7 = value; + AllowHandleOTGen7b = value; + AllowHandleOTGen8 = value; + AllowHandleOTGen8a = value; + AllowHandleOTGen8b = value; + AllowHandleOTGen9 = value; + } + public bool GetCanOTHandle(EntityContext encContext) => encContext switch { EntityContext.Gen6 => AllowHandleOTGen6, diff --git a/PKHeX.Core/Legality/Settings/Specialized/NicknameRestriction.cs b/PKHeX.Core/Legality/Settings/Specialized/NicknameRestriction.cs index f110b4aba5c..73de6c6eaf6 100644 --- a/PKHeX.Core/Legality/Settings/Specialized/NicknameRestriction.cs +++ b/PKHeX.Core/Legality/Settings/Specialized/NicknameRestriction.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; [TypeConverter(typeof(ExpandableObjectConverter))] -public sealed record NicknameSettings +public sealed class NicknameSettings { [LocalizedDescription("Severity to flag a Legality Check if Pokémon has a Nickname matching another Species.")] public Severity NicknamedAnotherSpecies { get; set; } = Severity.Fishy; @@ -41,6 +41,28 @@ public sealed record NicknameSettings [LocalizedDescription("Nickname rules for Generation 9.")] public NicknameRestriction Nickname9 { get; set; } = new(); + public void Disable() + { + var nick = new NicknameRestriction(); + nick.Disable(); + SetAllTo(nick); + } + + public void SetAllTo(NicknameRestriction all) + { + Nickname12.CopyFrom(all); + Nickname3.CopyFrom(all); + Nickname4.CopyFrom(all); + Nickname5.CopyFrom(all); + Nickname6.CopyFrom(all); + Nickname7.CopyFrom(all); + Nickname7b.CopyFrom(all); + Nickname8.CopyFrom(all); + Nickname8a.CopyFrom(all); + Nickname8b.CopyFrom(all); + Nickname9.CopyFrom(all); + } + public Severity NicknamedMysteryGift(EntityContext encContext) => encContext switch { EntityContext.Gen1 => Nickname12.NicknamedMysteryGift, @@ -84,4 +106,16 @@ public sealed record NicknameRestriction [LocalizedDescription("Severity to flag a Legality Check if it is a nicknamed Mystery Gift the player cannot normally nickname.")] public Severity NicknamedMysteryGift { get; set; } = Severity.Invalid; + + public void CopyFrom(NicknameRestriction other) + { + NicknamedTrade = other.NicknamedTrade; + NicknamedMysteryGift = other.NicknamedMysteryGift; + } + + public void Disable() + { + NicknamedTrade = Severity.Fishy; + NicknamedMysteryGift = Severity.Fishy; + } } diff --git a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt index a1054fbb597..0a100d9c872 100644 --- a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt +++ b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt @@ -405,4 +405,3 @@ LTransferPIDECEquals = 性格値は暗号化定数と同じにする必要があ LTransferPIDECXor = 暗号化定数と色違い性格値が一致します。 LTransferTrackerMissing = HOME Trackerが見つかりません。 LTransferTrackerShouldBeZero = HOME Trackerを０にしてください。 - diff --git a/PKHeX.Core/Resources/legality/mgdb/wc9.pkl b/PKHeX.Core/Resources/legality/mgdb/wc9.pkl index 4279814ea06a776a0ff9482a9035eaf6cde6bf24..931b50d24718f020e56179ec914245a6ab39bbb9 100644 GIT binary patch delta 224 zcmbPnkL|%@wuUW?66<9cpx^^D149Fl&BzEO*cccp+a+u^|M}0s$oAmSo1?9}CVylS z;oxAP3rCd$=!WDu0t}jr-x*?=JefinVDxon1|}m0E(Qi8!O6}{YCH_`K)@ivpz`Mk O3($%FEN?b3FaQ7#>QI~j delta 11 ScmaFxm~F;AwuUW?66*mY=LJFl diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index a5a0c977cbe4772804bfccda31fbd84d11e01ab1..bdfe08c989fc2d9a2f373d10ea6e7a151ae79524 100644 GIT binary patch delta 8032 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 delta 6241 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 diff --git a/PKHeX.Core/Saves/SAV6AO.cs b/PKHeX.Core/Saves/SAV6AO.cs index 4a99a3bce0a..a3278d79af5 100644 --- a/PKHeX.Core/Saves/SAV6AO.cs +++ b/PKHeX.Core/Saves/SAV6AO.cs @@ -41,8 +41,6 @@ private void Initialize() JPEG = 0x67C00; } - /// Offset of the Contest data block. - #region Blocks public override IReadOnlyList AllBlocks => Blocks.BlockInfo; public override MyItem6AO Items => Blocks.Items; diff --git a/PKHeX.Core/Saves/Substructures/Gen6/HallOfFame6.cs b/PKHeX.Core/Saves/Substructures/Gen6/HallOfFame6.cs index 69f22f4c3c6..284c4cd5547 100644 --- a/PKHeX.Core/Saves/Substructures/Gen6/HallOfFame6.cs +++ b/PKHeX.Core/Saves/Substructures/Gen6/HallOfFame6.cs @@ -20,14 +20,12 @@ public Span GetEntry(int index) public uint GetInsertIndex(out uint clear) { // Check for empty slots (where player hasn't yet registered enough Fame clears) - clear = 0; for (uint i = 0; i < Entries; i++) { var entry = GetEntry((int)i); var vnd = new HallFame6Index(entry[^4..]); if (!vnd.HasData) return clear = i; - clear = vnd.ClearIndex; } // No empty slots, return the last slot. diff --git a/PKHeX.Drawing.PokeSprite/Resources/img/Status/sickpoison.png b/PKHeX.Drawing.PokeSprite/Resources/img/Status/sickpoison.png index 37506e57a32726e866e913658dcf2bbbac3ebd7c..c93aca15ea364cba5a8669dce1da52e63a3f6fa7 100644 GIT binary patch delta 3197 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 delta 3347 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 diff --git a/PKHeX.Drawing.PokeSprite/Resources/img/Status/sicktoxic.png b/PKHeX.Drawing.PokeSprite/Resources/img/Status/sicktoxic.png index c93aca15ea364cba5a8669dce1da52e63a3f6fa7..37506e57a32726e866e913658dcf2bbbac3ebd7c 100644 GIT binary patch delta 3347 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 delta 3197 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 diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs index 3ecb6eac6d3..989d870e0df 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs @@ -2887,7 +2887,7 @@ private void InitializeComponent() // StatusView // StatusView.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; - StatusView.Location = new System.Drawing.Point(-4, 344); + StatusView.Location = new System.Drawing.Point(24, 342); StatusView.Margin = new System.Windows.Forms.Padding(0); StatusView.Name = "StatusView"; StatusView.Size = new System.Drawing.Size(64, 64); @@ -2977,9 +2977,9 @@ private void InitializeComponent() // PKMEditor // AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + Controls.Add(Hidden_TC); Controls.Add(StatusView); Controls.Add(TC_Editor); - Controls.Add(Hidden_TC); Name = "PKMEditor"; Size = new System.Drawing.Size(400, 400); Hidden_TC.ResumeLayout(false); diff --git a/PKHeX.WinForms/Controls/PKM Editor/StatusConditionView.cs b/PKHeX.WinForms/Controls/PKM Editor/StatusConditionView.cs index 6c0366832df..9a36e80694e 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/StatusConditionView.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/StatusConditionView.cs @@ -34,11 +34,27 @@ public void LoadStoredValues() if (pk is null || Loading) return; Loading = true; - var status = pk.Status_Condition; - SetStatus((StatusCondition)status); + if (!pk.PartyStatsPresent) + ClearStatus(); + else if (pk.Stat_HPCurrent == 0) + SetFaint(); + else + SetStatus((StatusCondition)(pk.Status_Condition & 0xFF)); Loading = false; } + private void SetFaint() + { + PB_Status.Image = Drawing.PokeSprite.Properties.Resources.sickfaint; + Hover.RemoveAll(); + } + + private void ClearStatus() + { + PB_Status.Image = null; + Hover.RemoveAll(); + } + private void SetStatus(StatusCondition status) { PB_Status.Image = status.GetStatusSprite(); diff --git a/PKHeX.WinForms/Resources/text/changelog.txt b/PKHeX.WinForms/Resources/text/changelog.txt index 39f0533705b..75ca63d298d 100644 --- a/PKHeX.WinForms/Resources/text/changelog.txt +++ b/PKHeX.WinForms/Resources/text/changelog.txt @@ -1,7 +1,21 @@ PKHeX - By Kaphotics http://projectpokemon.org/pkhex/ -24/03/26 - New Update: +24/05/05 - New Update: + - Legality: Added Regulation G. + - Added: Entity editor can now modify battle-Status effects (Burn, Paralyze, etc). Click the bottom right corner of the window for the GUI. + - Added: Gen5 trainer records can now be edited via Misc editor. Not documented well, but exposes the values for editing. + - Added: Gen1-3 games now detect language/version based on the save file name. If not detected, can be overridden via settings before loading. + - Added: Gen1 can now show an Entity's gender if enabled via settings, using Gen2 IV gender determination logic. + - Fixed: Gen7 Chinese species names now write correctly. + - Fixed: Gen6 OR/AS DexNav count read/write fixed. + - Fixed: Gen3 trash bytes now reference the Entity for translating the string, rather than the save file. + - Fixed: Gen2 Box Names now read/write ligatures correctly. + - Fixed: Gen1/2 box data now retains empty slot data instead of reformatting into empty box lists (glitching friendly). + - Changed: Legality settings have been extracted to a more easily customized settings object. + - Changed: Translations updated for Chinese & Japanese. Thanks @ppllouf & @902PM ! + +24/03/26 - New Update: (139375) [8676873] - Legality: - - Fixed: Handled some edge cases with latest release RNG Frame checks for Gen4. - - Added: Verification for Gen3 CHANNEL and MYSTRY seed patterns. diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt index 56ca2f75fc1..b2137b12b45 100644 --- a/PKHeX.WinForms/Resources/text/lang_de.txt +++ b/PKHeX.WinForms/Resources/text/lang_de.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=Überprüft Spitznamen und Trainer Namen na LocalizedDescription.CurrentHandlerMismatch=Schweregrad mit dem der aktuelle Besitzer eines Pokémons in der Legalitäts Analyse geprüft wird. LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=Female gender color. LocalizedDescription.FilterUnavailableSpecies=Versteckt nicht erhältliche Pokémon, wenn diese nicht in den Spielstand importiert werden können. LocalizedDescription.FlagIllegal=Illegale Pokémon in den Boxen markieren @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=HaX Modus beim Programmstart erzwingen LocalizedDescription.Gen7TransferStarPID=Kennzeichnet in der Legalitäts Analyse, wenn ein Gen 1/2 Pokémon eine Stern Shiny PID besitzt. LocalizedDescription.Gen8MemoryMissingHT=Schweregrad der Legalitäts Analyse wenn die Gen 8 Erinnerung des Besitzers fehlt. -LocalizedDescription.Gen8TransferTrackerNotPresent=Kennzeichnet in der Legalitäts Analyse, wenn der HOME Tracker fehlt. LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=Wenn der Kraftreserve Typ geändert wird, ändere die DVs auf den höchst möglichen Wert, um die best mögliche Stärke zu erhalten. Sonst werden die originalen DVs nur leicht abgeändert. @@ -125,7 +125,7 @@ LocalizedDescription.HideEvent8Contains=Verstecke Event Variablen Namen, welche LocalizedDescription.HideEventTypeBelow=Verstecke Event Variablen unter diesem Event Typ Wert. Entfernt Event Variablen aus der Benutzeroberfläche, die den Benutzer nicht interessieren. LocalizedDescription.HideSAVDetails=Verstecke Spielstand Details in Programmtitel LocalizedDescription.HideSecretDetails=Verstecke persönliche Details im Editor -LocalizedDescription.HOMETransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing +LocalizedDescription.HOMETransferTrackerNotPresent=Kennzeichnet in der Legalitäts Analyse, wenn der HOME Tracker fehlt. LocalizedDescription.HoverSlotGlowEdges=Zeige Glanz bei Berührung LocalizedDescription.HoverSlotPlayCry=Spiele PKM Ruf bei Berührung LocalizedDescription.HoverSlotShowEncounter=Show Encounter Info in on Hover @@ -139,21 +139,37 @@ LocalizedDescription.MarkBlue=Blue colored marking. LocalizedDescription.MarkDefault=Default colored marking. LocalizedDescription.MarkPink=Pink colored marking. LocalizedDescription.ModifyUnset=Benachrichtigung über nicht gesetzte Änderungen. +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=Kennzeichnet in der Legalitäts Analyse, wenn das Pokémon einen Spitznamen hat, der der Spezies eines anderen Pokémon entspricht. LocalizedDescription.NicknamedMysteryGift=Kennzeichnet in der Legalitäts Analyse, wenn es sich um ein Geschenk mit Spitznamen handelt, welches der Spieler nicht umbenennen kann. LocalizedDescription.NicknamedTrade=Kennzeichnet in der Legalitäts Analyse, wenn es sich um ein ertauschtes Pokémon mit Spitznamen handelt, welches der Spieler nicht umbenennen kann. LocalizedDescription.OtherBackupPaths=Liste aller weiteren Verzeichnisse, in denen nach Spielständen gesucht wird. LocalizedDescription.OtherSaveFileExtensions=Spielstand Dateiendung (ohne Punkt), welche von PKHeX auch erkannt werden sollen. +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Ordner, welcher Dateien mit Block Hash-Namen enthält. Wenn eine spezifische Datei nicht existiert, werden nur Namen geladen, welche im Programmcode enthalten sind. LocalizedDescription.PlaySoundLegalityCheck=Ton beim Pop-Up der Legalitäts Analyse abspielen. LocalizedDescription.PlaySoundSAVLoad=Ton beim Öffnen eines Spielstands abspielen. LocalizedDescription.PluginLoadMethod=Läd Plugins aus dem "plugins" Ordner, falls dieser existiert. Versuche LoadFile um Fehler beim Laden zu reduzieren. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=Überspringt die Suche, wenn vergessen wurde ein Pokémon / Attacken in die Suchkriterien einzugeben. -LocalizedDescription.RNGFrameNotFound=Zeigt in der Legalitäts Analyse an, wenn der RNG Frame Check keine Übereinstimmung findet. -LocalizedDescription.RNGFrameNotFound3=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 3 encounters. -LocalizedDescription.RNGFrameNotFound4=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 4 encounters. +LocalizedDescription.RNGFrameNotFound3=Zeigt in der Legalitäts Analyse an, wenn der RNG Frame Check keine Übereinstimmung findet. +LocalizedDescription.RNGFrameNotFound4=Zeigt in der Legalitäts Analyse an, wenn der RNG Frame Check keine Übereinstimmung findet. LocalizedDescription.SearchBackups=Suche beim Laden der PKM Datenbank auch in den Backup Spielständen. LocalizedDescription.SearchExtraSaves=Durchsuche beim Laden der PKM Datenbank auch Backup Verzeichnisse. LocalizedDescription.SearchExtraSavesDeep=Durchsuche beim Laden der PKM Datenbank auch Unterverzeichmisse der Backup Verzeichnisse. @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=Deckkraft des Hintergrunds d LocalizedDescription.ShowEncounterOpacityStripe=Deckkraft der Begegnungs Typen Streifen Schicht. LocalizedDescription.ShowEncounterThicknessStripe=Anzahl der Pixel des farbigen Streifens der Begegnungs Typen. LocalizedDescription.ShowExperiencePercent=Zeige einen dünnen Streifen, der den Level-Up Fortschritt darstellt. +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=Zeige in der Ball Auswahl legale Bälle zuerst und illegale Bälle darunter an. +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=Deckkraft des Tera Typ Hintergrunds. LocalizedDescription.ShowTeraOpacityStripe=Deckkraft der Tery Typ Streifens. LocalizedDescription.ShowTeraThicknessStripe=Anzahl der Pixel des farbigen Streifens der Tera Typen.. @@ -899,7 +917,6 @@ SAV_Misc5.B_ImportFC=Import Data SAV_Misc5.B_ObtainAllMedals=Obtain All Medals SAV_Misc5.B_RandForest=Alle Areale zufällig SAV_Misc5.B_Save=Speichern -SAV_Misc5.B_UnlockAllMusicalProps=Alle Musical Accessoires SAV_Misc5.B_UnlockAllProps=Unlock All Props SAV_Misc5.CHK_Area9=Areal 9 erreichbar: SAV_Misc5.CHK_FMNew=NEU @@ -945,7 +962,6 @@ SAV_Misc5.L_FMParticipated=Teilnehmer SAV_Misc5.L_FMTopScore=High Score SAV_Misc5.L_FMUnlocked=Freigeschaltet SAV_Misc5.L_Form=Form: -SAV_Misc5.L_Gender=Gender: SAV_Misc5.L_Move=Attacke: SAV_Misc5.L_MultiFriends=Freunde SAV_Misc5.L_MultiFriendsPast=Vergangen @@ -953,6 +969,10 @@ SAV_Misc5.L_MultiFriendsRecord=Rekord SAV_Misc5.L_MultiNPC=NPC SAV_Misc5.L_MultiNpcPast=Vergangen SAV_Misc5.L_MultiNpcRecord=Rekord +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=Boreos SAV_Misc5.L_Roamer642=Voltolos SAV_Misc5.L_RoamStatus=Roam status @@ -1014,15 +1034,9 @@ SAV_MysteryGiftDB.Tab_General=Allgemein SAV_OPower.B_Cancel=Abbr. SAV_OPower.B_ClearAll=Alle leeren SAV_OPower.B_GiveAll=Alle geben -SAV_OPower.B_GiveAllMAX=Alle MAX SAV_OPower.B_Save=OK -SAV_OPower.CHK_Master=??? Flag -SAV_OPower.CHK_MAX=MAX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=Battle SAV_OPower.GB_Field=Field -SAV_OPower.L_Points=Points: -SAV_OPower.L_Type=Typ: SAV_Poffin8b.B_All=Alle SAV_Poffin8b.B_Cancel=Abbr. SAV_Poffin8b.B_None=Keine diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt index 8adaa546126..27097697f9e 100644 --- a/PKHeX.WinForms/Resources/text/lang_en.txt +++ b/PKHeX.WinForms/Resources/text/lang_en.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=Checks player given Nicknames and Trainer N LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value. LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=Female gender color. LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them. LocalizedDescription.FlagIllegal=Flag Illegal Slots in Save File @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=Force HaX mode on Program Launch LocalizedDescription.Gen7TransferStarPID=Severity to flag a Legality Check if Pokémon from Gen1/2 has a Star Shiny PID. LocalizedDescription.Gen8MemoryMissingHT=Severity to flag a Legality Check if a Gen8 Memory is missing for the Handling Trainer. -LocalizedDescription.Gen8TransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=When changing the Hidden Power type, automatically maximize the IVs to ensure the highest Base Power result. Otherwise, keep the IVs as close as possible to the original. @@ -139,19 +139,35 @@ LocalizedDescription.MarkBlue=Blue colored marking. LocalizedDescription.MarkDefault=Default colored marking. LocalizedDescription.MarkPink=Pink colored marking. LocalizedDescription.ModifyUnset=Notify Unset Changes +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=Severity to flag a Legality Check if Pokémon has a Nickname matching another Species. LocalizedDescription.NicknamedMysteryGift=Severity to flag a Legality Check if it is a nicknamed Mystery Gift the player cannot normally nickname. LocalizedDescription.NicknamedTrade=Severity to flag a Legality Check if it is a nicknamed In-Game Trade the player cannot normally nickname. LocalizedDescription.OtherBackupPaths=List of extra locations to look for Save Files. LocalizedDescription.OtherSaveFileExtensions=Save File file-extensions (no period) that the program should also recognize. +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Folder path that contains dump(s) of block hash-names. If a specific dump file does not exist, only names defined within the program's code will be loaded. LocalizedDescription.PlaySoundLegalityCheck=Play Sound when popping up Legality Report LocalizedDescription.PlaySoundSAVLoad=Play Sound when loading a new Save File LocalizedDescription.PluginLoadMethod=Loads plugins from the plugins folder, assuming the folder exists. Try LoadFile to mitigate intermittent load failures. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=Skips searching if the user forgot to enter Species / Move(s) into the search criteria. -LocalizedDescription.RNGFrameNotFound=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match. LocalizedDescription.RNGFrameNotFound3=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 3 encounters. LocalizedDescription.RNGFrameNotFound4=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 4 encounters. LocalizedDescription.SearchBackups=When loading content for the PKM Database, search within backup save files. @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer. LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe. LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID. +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=Opacity for the Tera Type background layer. LocalizedDescription.ShowTeraOpacityStripe=Opacity for the Tera Type stripe layer. LocalizedDescription.ShowTeraThicknessStripe=Amount of pixels thick to show when displaying the Tera Type color stripe. @@ -895,7 +913,6 @@ SAV_Misc5.B_ImportFC=Import Data SAV_Misc5.B_ObtainAllMedals=Obtain All Medals SAV_Misc5.B_RandForest=Randomize All Areas SAV_Misc5.B_Save=Save -SAV_Misc5.B_UnlockAllMusicalProps=Unlock All Musical Props SAV_Misc5.B_UnlockAllProps=Unlock All Props SAV_Misc5.CHK_Area9=Area 9 Unlocked: SAV_Misc5.CHK_FMNew=NEW @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=Participated SAV_Misc5.L_FMTopScore=Top Score SAV_Misc5.L_FMUnlocked=Unlocked SAV_Misc5.L_Form=Form: -SAV_Misc5.L_Gender=Gender: SAV_Misc5.L_Move=Move: SAV_Misc5.L_MultiFriends=Friends SAV_Misc5.L_MultiFriendsPast=Past @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=Record SAV_Misc5.L_MultiNPC=NPC SAV_Misc5.L_MultiNpcPast=Past SAV_Misc5.L_MultiNpcRecord=Record +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=Tornadus SAV_Misc5.L_Roamer642=Thundurus SAV_Misc5.L_RoamStatus=Roam status @@ -1010,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=General SAV_OPower.B_Cancel=Cancel SAV_OPower.B_ClearAll=Clear All SAV_OPower.B_GiveAll=Give All -SAV_OPower.B_GiveAllMAX=MAX All SAV_OPower.B_Save=Save -SAV_OPower.CHK_Master=??? Flag -SAV_OPower.CHK_MAX=MAX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=Battle SAV_OPower.GB_Field=Field -SAV_OPower.L_Points=Points: -SAV_OPower.L_Type=Type: SAV_Poffin8b.B_All=All SAV_Poffin8b.B_Cancel=Cancel SAV_Poffin8b.B_None=None diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt index abc41ab9961..321c3d133bb 100644 --- a/PKHeX.WinForms/Resources/text/lang_es.txt +++ b/PKHeX.WinForms/Resources/text/lang_es.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=Comprobar los motes y los nombres de Entren LocalizedDescription.CurrentHandlerMismatch=En la validación de Legalidad, marcar Severidad si se detecta que el Entrenador Actual del Pokémon no corresponde con el valor esperado. LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=Female gender color. LocalizedDescription.FilterUnavailableSpecies=Ocultar Especie no disponible si la partida cargada no puede importarla. LocalizedDescription.FlagIllegal=Detectar ilegal @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=Forzar el modo HaX al inicio de programa LocalizedDescription.Gen7TransferStarPID=En la validación de Legalidad, marcar Severidad si se detecta que el Pokémon de Gen 1/2 tiene un PID variocolor estrella. LocalizedDescription.Gen8MemoryMissingHT=En la validación de Legalidad, marcar Severidad si se detecta que el Recuerdo Gen8 esta faltando para el Entrenador Actual. -LocalizedDescription.Gen8TransferTrackerNotPresent=En la validación de Legalidad, marcar Severidad para detectar una validación de legalidad si falta el rastreador HOME LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=Cuando se cambia el tipo de Poder Oculto, automáticamente maximixar los IVs para resultar con el mayor Poder Base. De otra forma mantener lo más cerca posible al original. @@ -125,7 +125,7 @@ LocalizedDescription.HideEvent8Contains=Ocultar eventos que contengan alguna de LocalizedDescription.HideEventTypeBelow=Ocultar variables de evento por debajo de este valor de tipo de evento. Elimina de la interfaz los valores de los eventos que no le interesa version al usuario. LocalizedDescription.HideSAVDetails=Ocultar detalles de partidas guardadas en el título del programa LocalizedDescription.HideSecretDetails=Ocultar detalles secretos en los editores -LocalizedDescription.HOMETransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing +LocalizedDescription.HOMETransferTrackerNotPresent=En la validación de Legalidad, marcar Severidad para detectar una validación de legalidad si falta el rastreador HOME LocalizedDescription.HoverSlotGlowEdges=Mostrar brillo PKM al pasar el ratón LocalizedDescription.HoverSlotPlayCry=Reproducir grito PKM al pasar el ratón LocalizedDescription.HoverSlotShowEncounter=Show Encounter Info in on Hover @@ -139,21 +139,37 @@ LocalizedDescription.MarkBlue=Blue colored marking. LocalizedDescription.MarkDefault=Default colored marking. LocalizedDescription.MarkPink=Pink colored marking. LocalizedDescription.ModifyUnset=Notificar cambios no hechos +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=En la validación de legalidad, marcar Severidad si se detecta que un Pokémon tiene un apodo que coincide con otra especie. LocalizedDescription.NicknamedMysteryGift=En la validación de legalidad, marcar Severidad si se detecta que se trata de un regalo misterioso apodado que el jugador normalmente no puede apodar. LocalizedDescription.NicknamedTrade=En la validación de legalidad, marcar Severidad si se detecta que se trata de un intercambio dentro del juego que el jugador normalmente no puede apodar. LocalizedDescription.OtherBackupPaths=Lista de ubicaciones adicionales para buscar archivos guardados. LocalizedDescription.OtherSaveFileExtensions=Archivos de guardado y/o extensiones (sin punto) que el programa también debería reconocer. +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Ruta de la carpeta que contiene los volcados de los nombre de bloques. Si un archivo específico no exite, solo se cargarán los nombres definidos en el código del programa. LocalizedDescription.PlaySoundLegalityCheck=Reproducir sonido en la validación de legalidad LocalizedDescription.PlaySoundSAVLoad=Reproducir sonido al cargar archivo de guardado LocalizedDescription.PluginLoadMethod=Carga plugins desde la carpeta de plugins, asumiendo que esa carpeta existe. Intentar LoadFile para mitigar los fallos de carga intermitentes. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=Salta la búsqueda si el usuario olvidó ingresar la especie/movimiento(s) en el criterio de búsqueda. -LocalizedDescription.RNGFrameNotFound=En la validación de legalidad, marcar Severidad si se detecta que la lógica de verificación de tramas RNG no encuentra una coincidencia. -LocalizedDescription.RNGFrameNotFound3=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 3 encounters. -LocalizedDescription.RNGFrameNotFound4=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 4 encounters. +LocalizedDescription.RNGFrameNotFound3=En la validación de legalidad, marcar Severidad si se detecta que la lógica de verificación de tramas RNG no encuentra una coincidencia. +LocalizedDescription.RNGFrameNotFound4=En la validación de legalidad, marcar Severidad si se detecta que la lógica de verificación de tramas RNG no encuentra una coincidencia. LocalizedDescription.SearchBackups=Cuando se carga contenido para la base de datos PKM, buscar entre los archivos de guardado de respaldo. LocalizedDescription.SearchExtraSaves=Cuando se carga contenido para la base de datos PKM, buscar entre OtherBackupPaths. LocalizedDescription.SearchExtraSavesDeep=Cuando se carga contenido para la base de datos PKM, buscar subcarpetas entre OtherBackupPaths. @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=Nivel de opacidad de la capa LocalizedDescription.ShowEncounterOpacityStripe=Nivel de opacidad de la raya correspondiente al tipo de encuentro. LocalizedDescription.ShowEncounterThicknessStripe=Nivel de grosor (en píxeles) al mostrar la raya coloreada del tipo de encuentro. LocalizedDescription.ShowExperiencePercent=Mostrar una raya fina para indicar el porcentaje de subida de nivel. +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=Al mostrar la lista de Poké Ball a seleccionar, ordenarlas por Poké Ball legales primero, en vez de ordenarlas por ID. +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=Nivel de opacidad de la capa de fondo correspondiente al Teratipo. LocalizedDescription.ShowTeraOpacityStripe=Nivel de opacidad de la raya correspondiente al Teratipo. LocalizedDescription.ShowTeraThicknessStripe=Nivel de grosor (en píxeles) al mostrar la raya coloreada del Teratipo. @@ -895,8 +913,7 @@ SAV_Misc5.B_ImportFC=Import Data SAV_Misc5.B_ObtainAllMedals=Obtain All Medals SAV_Misc5.B_RandForest=Aleatorizar todas las áreas SAV_Misc5.B_Save=Guardar -SAV_Misc5.B_UnlockAllMusicalProps=Desbloq. complementos -SAV_Misc5.B_UnlockAllProps=Unlock All Props +SAV_Misc5.B_UnlockAllProps=Desbloq. complementos SAV_Misc5.CHK_Area9=Área 9 desbloqueada: SAV_Misc5.CHK_FMNew=NUEVO SAV_Misc5.CHK_Invisible=Invisible @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=Participados SAV_Misc5.L_FMTopScore=Puntuación tope SAV_Misc5.L_FMUnlocked=Desbloqueado SAV_Misc5.L_Form=Forma: -SAV_Misc5.L_Gender=Gender: SAV_Misc5.L_Move=Movimiento: SAV_Misc5.L_MultiFriends=Amigos SAV_Misc5.L_MultiFriendsPast=Pasado @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=Récord SAV_Misc5.L_MultiNPC=PNJ SAV_Misc5.L_MultiNpcPast=Pasado SAV_Misc5.L_MultiNpcRecord=Récord +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=Tornadus SAV_Misc5.L_Roamer642=Thundurus SAV_Misc5.L_RoamStatus=Roam status @@ -1010,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=General SAV_OPower.B_Cancel=Cancelar SAV_OPower.B_ClearAll=Limpiar todo SAV_OPower.B_GiveAll=Dar Todo -SAV_OPower.B_GiveAllMAX=Todo MÁX SAV_OPower.B_Save=Guardar -SAV_OPower.CHK_Master=??? Flag -SAV_OPower.CHK_MAX=MÁX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=Battle SAV_OPower.GB_Field=Field -SAV_OPower.L_Points=Points: -SAV_OPower.L_Type=Tipo: SAV_Poffin8b.B_All=Todos SAV_Poffin8b.B_Cancel=Cancelar SAV_Poffin8b.B_None=Ninguno diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt index 414124ed656..929709e0e43 100644 --- a/PKHeX.WinForms/Resources/text/lang_fr.txt +++ b/PKHeX.WinForms/Resources/text/lang_fr.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=Checks player given Nicknames and Trainer N LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value. LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=Female gender color. LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them. LocalizedDescription.FlagIllegal=Marquer les Pokémon illégaux dans la sauvegarde @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=Forcer le mode HaX au lancement du programme LocalizedDescription.Gen7TransferStarPID=Severity to flag a Legality Check if Pokémon from Gen1/2 has a Star Shiny PID. LocalizedDescription.Gen8MemoryMissingHT=Severity to flag a Legality Check if a Gen8 Memory is missing for the Handling Trainer. -LocalizedDescription.Gen8TransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=When changing the Hidden Power type, automatically maximize the IVs to ensure the highest Base Power result. Otherwise, keep the IVs as close as possible to the original. @@ -139,19 +139,35 @@ LocalizedDescription.MarkBlue=Blue colored marking. LocalizedDescription.MarkDefault=Default colored marking. LocalizedDescription.MarkPink=Pink colored marking. LocalizedDescription.ModifyUnset=Notifier en cas de changements non sauvegardés +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=Severity to flag a Legality Check if Pokémon has a Nickname matching another Species. LocalizedDescription.NicknamedMysteryGift=Severity to flag a Legality Check if it is a nicknamed Mystery Gift the player cannot normally nickname. LocalizedDescription.NicknamedTrade=Severity to flag a Legality Check if it is a nicknamed In-Game Trade the player cannot normally nickname. LocalizedDescription.OtherBackupPaths=List of extra locations to look for Save Files. LocalizedDescription.OtherSaveFileExtensions=Save File file-extensions (no period) that the program should also recognize. +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Folder path that contains dump(s) of block hash-names. If a specific dump file does not exist, only names defined within the program's code will be loaded. LocalizedDescription.PlaySoundLegalityCheck=PlaySoundLegalityCheck LocalizedDescription.PlaySoundSAVLoad=PlaySoundSAVLoad LocalizedDescription.PluginLoadMethod=Charge les plugins depuis le dossier plugins, en supposant que ce dossier existe. Essayez "LoadFile" pour atténuer les échecs de chargement intermittents. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=Saute la recherche si l'utilisateur a oublié de saisir Espèce / Capacité(s) dans les critères de recherche. -LocalizedDescription.RNGFrameNotFound=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match. LocalizedDescription.RNGFrameNotFound3=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 3 encounters. LocalizedDescription.RNGFrameNotFound4=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 4 encounters. LocalizedDescription.SearchBackups=When loading content for the PKM Database, search within backup save files. @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer. LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe. LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID. +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=Opacity for the Tera Type background layer. LocalizedDescription.ShowTeraOpacityStripe=Opacity for the Tera Type stripe layer. LocalizedDescription.ShowTeraThicknessStripe=Amount of pixels thick to show when displaying the Tera Type color stripe. @@ -895,8 +913,7 @@ SAV_Misc5.B_ImportFC=Importer données SAV_Misc5.B_ObtainAllMedals=Obtenir toutes les médailles SAV_Misc5.B_RandForest=Randomiser toutes les zones SAV_Misc5.B_Save=Sauvegarder -SAV_Misc5.B_UnlockAllMusicalProps=Débloquez tous les accessoires musicaux -SAV_Misc5.B_UnlockAllProps=Unlock All Props +SAV_Misc5.B_UnlockAllProps=Accessoires musicaux SAV_Misc5.CHK_Area9=Zone 9 déverrouillée : SAV_Misc5.CHK_FMNew=NOUVEAU SAV_Misc5.CHK_Invisible=Invisible @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=Participé SAV_Misc5.L_FMTopScore=Meilleur score SAV_Misc5.L_FMUnlocked=Dévérouillé SAV_Misc5.L_Form=Forme : -SAV_Misc5.L_Gender=Gender: SAV_Misc5.L_Move=Move : SAV_Misc5.L_MultiFriends=Amis SAV_Misc5.L_MultiFriendsPast=Past @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=Record SAV_Misc5.L_MultiNPC=PNJ SAV_Misc5.L_MultiNpcPast=Past SAV_Misc5.L_MultiNpcRecord=Record +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=Tornadus SAV_Misc5.L_Roamer642=Thundurus SAV_Misc5.L_RoamStatus=Roam status @@ -1010,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=Général SAV_OPower.B_Cancel=Annuler SAV_OPower.B_ClearAll=Effacer tout SAV_OPower.B_GiveAll=Donner tout -SAV_OPower.B_GiveAllMAX=Maxer tout SAV_OPower.B_Save=Sauvegarder -SAV_OPower.CHK_Master=??? Flag -SAV_OPower.CHK_MAX=Maximum -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=Battle SAV_OPower.GB_Field=Field -SAV_OPower.L_Points=Points: -SAV_OPower.L_Type=Type : SAV_Poffin8b.B_All=Tout SAV_Poffin8b.B_Cancel=Annuler SAV_Poffin8b.B_None=Aucun diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt index c258ca312c6..408ed50c2c5 100644 --- a/PKHeX.WinForms/Resources/text/lang_it.txt +++ b/PKHeX.WinForms/Resources/text/lang_it.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=Controlla la volgarità di Soprannomi e Nom LocalizedDescription.CurrentHandlerMismatch=Forza una segnalazione di legalità se l'Ultimo Allenatore non corrisponde al valore aspettato. LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=Female gender color. LocalizedDescription.FilterUnavailableSpecies=Nascondi specie non disponibili se il salvatggio caricato non è in grado di importarli. LocalizedDescription.FlagIllegal=Segnala Slot Illegali nel Salvataggio @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=Forza l'avvio del programma in modalità HaX LocalizedDescription.Gen7TransferStarPID=Forza una segnalazione di Legalità se un Pokémon da Gen1/2 ha un PID Star Shiny. LocalizedDescription.Gen8MemoryMissingHT=Forza una segnalazione di Legalità se una Memoria Gen8 è assente per l'Allenatore Attuale. -LocalizedDescription.Gen8TransferTrackerNotPresent=Forza una segnalazione di legalità se il codice di Tracciamento di Pokémon Home è assente. LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=Massimizza automaticamente gli IV quando si cambia il tipo di Introforza per assicurare il massimo punteggio di Potenza Base. Altrimenti, mantieni gli IV il più vicino possibile agli originali. @@ -125,7 +125,7 @@ LocalizedDescription.HideEvent8Contains=Nascondi i nomi delle variabili evento c LocalizedDescription.HideEventTypeBelow=Nascondi variabili evento al di sotto del valore di questa tipologia di eventi. Rimuove i valori evento dall'Interfaccia di non interesse dell'utente. LocalizedDescription.HideSAVDetails=Nascondi i dettagli del File di Salvataggio dal Titolo del Programma. LocalizedDescription.HideSecretDetails=Nascondi i Dettagli Segreti dagli Editor. -LocalizedDescription.HOMETransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing +LocalizedDescription.HOMETransferTrackerNotPresent=Forza una segnalazione di legalità se il codice di Tracciamento di Pokémon Home è assente. LocalizedDescription.HoverSlotGlowEdges=Mostra l'evidenziatura del Pokémon al passaggio del Mouse LocalizedDescription.HoverSlotPlayCry=Ascolta il verso del Pokémon al passaggio del Mouse LocalizedDescription.HoverSlotShowEncounter=Show Encounter Info in on Hover @@ -139,21 +139,37 @@ LocalizedDescription.MarkBlue=Blue colored marking. LocalizedDescription.MarkDefault=Default colored marking. LocalizedDescription.MarkPink=Pink colored marking. LocalizedDescription.ModifyUnset=Notifica modifiche non complete +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=Forza una segnalazione di Legalità se un Pokémon ha un Soprannome che coincide con il nome di un'altra Specie. LocalizedDescription.NicknamedMysteryGift=Forza una segnalazione di Legalità se il Pokémon ha un Soprannome e proviene da un Dono Segreto. LocalizedDescription.NicknamedTrade=Forza una segnalazione di Legalità se il Pokémon proveniente da uno scambio ha un Soprannome che non potrebbe normalmente avere. LocalizedDescription.OtherBackupPaths=Lista di percorsi da controllare per cercare File di Salvataggio. LocalizedDescription.OtherSaveFileExtensions=Estensioni per i File di Salvataggio che il programma dovrebbe riconoscere (senza punto) +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Percorso che contiene i Dump dei blocchi dei nomi hash. Se il Dump di uno specifico elemento non esiste, solamente i nomi specificati nel codice del programma verranno caricati. LocalizedDescription.PlaySoundLegalityCheck=AvviaSuoniPerControlliLegalità LocalizedDescription.PlaySoundSAVLoad=AvviaSuoniAlCaricamentoDelSAV LocalizedDescription.PluginLoadMethod=Carica Plugins dlla cartella plugins, se esiste. Prova LoadFile per mitigare eventuali fallimenti. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=Salta il processo di ricerca se l'utente non ha inserito la Specie o le Mosse nei filtri di ricerca. -LocalizedDescription.RNGFrameNotFound=Forza una segnalazione di Legalità se la logica di controllo RNG non trova una corrispondenza. -LocalizedDescription.RNGFrameNotFound3=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 3 encounters. -LocalizedDescription.RNGFrameNotFound4=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 4 encounters. +LocalizedDescription.RNGFrameNotFound3=Forza una segnalazione di Legalità se la logica di controllo RNG non trova una corrispondenza. +LocalizedDescription.RNGFrameNotFound4=Forza una segnalazione di Legalità se la logica di controllo RNG non trova una corrispondenza. LocalizedDescription.SearchBackups=Cerca nei backup dei salvataggi quando carica il contenuto per il Database Pokémon. LocalizedDescription.SearchExtraSaves=Cerca in OtherBackupPaths quando carica il contenuto per il Database Pokémon. LocalizedDescription.SearchExtraSavesDeep=Cerca nelle sottocartelle di OtherBackupPaths quando carica il contenuto per il Database Pokémon. @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacità per lo sfondo del T LocalizedDescription.ShowEncounterOpacityStripe=Opacità per la barra del Tipo di Incontro. LocalizedDescription.ShowEncounterThicknessStripe=Spessore dei Pixel da mostrare per la barra del Tipo di Incontro. LocalizedDescription.ShowExperiencePercent=Mostra una piccola barra per indicare la percentuale di progresso di Aumento Livello +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst= Quando viene mostrata la lista di Ball, mostra le Ball legali prima di quelle illegali, anziché andare per ordine di ID. +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=Opacità del background Layer per il Teratipo. LocalizedDescription.ShowTeraOpacityStripe=Opacità dello stripe layer per il Teratipo. LocalizedDescription.ShowTeraThicknessStripe=Spessore dei pixel mostrati nella color stripe per il Teratipo. @@ -895,8 +913,7 @@ SAV_Misc5.B_ImportFC=Import Data SAV_Misc5.B_ObtainAllMedals=Obtain All Medals SAV_Misc5.B_RandForest=Casualizza Tutti gli Alberi SAV_Misc5.B_Save=Salva -SAV_Misc5.B_UnlockAllMusicalProps=Sblocca tutti gli accessori per Musical -SAV_Misc5.B_UnlockAllProps=Unlock All Props +SAV_Misc5.B_UnlockAllProps=Accessori per Musical SAV_Misc5.CHK_Area9=Area 9 Sbloccata: SAV_Misc5.CHK_FMNew=Nuovo SAV_Misc5.CHK_Invisible=Invisibile @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=Partecipato SAV_Misc5.L_FMTopScore=Miglior Punteggio SAV_Misc5.L_FMUnlocked=Sbloccato SAV_Misc5.L_Form=Forma: -SAV_Misc5.L_Gender=Gender: SAV_Misc5.L_Move=Mossa: SAV_Misc5.L_MultiFriends=Amici SAV_Misc5.L_MultiFriendsPast=Scorso @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=Record SAV_Misc5.L_MultiNPC=NPC SAV_Misc5.L_MultiNpcPast=Scorso SAV_Misc5.L_MultiNpcRecord=Record +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=Tornadus SAV_Misc5.L_Roamer642=Thundurus SAV_Misc5.L_RoamStatus=Roam status @@ -1010,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=Generale SAV_OPower.B_Cancel=Annulla SAV_OPower.B_ClearAll=Ripulisci SAV_OPower.B_GiveAll=Dai Tutto -SAV_OPower.B_GiveAllMAX=Massimizza Tutto SAV_OPower.B_Save=Salva -SAV_OPower.CHK_Master=??? Segnale -SAV_OPower.CHK_MAX=MAX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=Battle SAV_OPower.GB_Field=Field -SAV_OPower.L_Points=Points: -SAV_OPower.L_Type=Tipo: SAV_Poffin8b.B_All=Tutto SAV_Poffin8b.B_Cancel=Annulla SAV_Poffin8b.B_None=Nessuno diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt index 276b93539af..591481a8ea4 100644 --- a/PKHeX.WinForms/Resources/text/lang_ja.txt +++ b/PKHeX.WinForms/Resources/text/lang_ja.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=プレイヤーがつけたニックネー LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value. LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=メスのアイコンの色 LocalizedDescription.FilterUnavailableSpecies=読み込まれているセーブファイルにインポートできないポケモンがいた場合、非表示にします。 LocalizedDescription.FlagIllegal=不整合を表示 @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=Force HaX mode on Program Launch LocalizedDescription.Gen7TransferStarPID=Severity to flag a Legality Check if Pokémon from Gen1/2 has a Star Shiny PID. LocalizedDescription.Gen8MemoryMissingHT=Severity to flag a Legality Check if a Gen8 Memory is missing for the Handling Trainer. -LocalizedDescription.Gen8TransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=When changing the Hidden Power type, automatically maximize the IVs to ensure the highest Base Power result. Otherwise, keep the IVs as close as possible to the original. @@ -139,19 +139,35 @@ LocalizedDescription.MarkBlue=青色のマーキング。 LocalizedDescription.MarkDefault=デフォルトのマーキング。 LocalizedDescription.MarkPink=ピンクのマーキング。 LocalizedDescription.ModifyUnset=未設定の変更を通知する。 +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=別のポケモンと一致するニックネームを持っているかどうかで正規チェックにフラグを立てる。 LocalizedDescription.NicknamedMysteryGift=プレイヤーが通常つけられないニックネームのふしぎなおくりもの産ポケモンに正規チェックフラグを立てる。 LocalizedDescription.NicknamedTrade=プレイヤーが通常つけられないニックネームのポケモンをゲーム内で交換した場合、正規チェックにフラグを立てる。 LocalizedDescription.OtherBackupPaths=セーブファイルを探すための追加の場所リスト。 LocalizedDescription.OtherSaveFileExtensions=プログラムが認識するセーブファイルの拡張子（ピリオドなし） +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Folder path that contains dump(s) of block hash-names. If a specific dump file does not exist, only names defined within the program's code will be loaded. LocalizedDescription.PlaySoundLegalityCheck=正規チェック時に音を鳴らす。 LocalizedDescription.PlaySoundSAVLoad=ロード時に音を鳴らす。 LocalizedDescription.PluginLoadMethod=Loads plugins from the plugins folder, assuming the folder exists. Try LoadFile to mitigate intermittent load failures. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=ユーザーがポケモンや技の入力をしなかった場合、検索をスキップする。 -LocalizedDescription.RNGFrameNotFound=フレームによる乱数生成の中にない個体が見つかった場合、正規チェックにフラグを立てる。 LocalizedDescription.RNGFrameNotFound3=第３世代の乱数生成にはない個体が見つかった場合、正規チェックにフラグを立てる。 LocalizedDescription.RNGFrameNotFound4=第４世代の乱数生成にはない個体が見つかった場合、正規チェックにフラグを立てる。 LocalizedDescription.SearchBackups=When loading content for the PKM Database, search within backup save files. @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer. LocalizedDescription.ShowEncounterThicknessStripe=エンカウントタイプのカラーストライプを表示する時のピクセルの太さ。 LocalizedDescription.ShowExperiencePercent=次のレベルに必要な経験値のストライプを表示します。 +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=ボールを選択する時のリストはID順ではなく、正規が先で後から不正の順番にする。 +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=テラスタルタイプの背景レイヤーの不透明度。 LocalizedDescription.ShowTeraOpacityStripe=テラスタルタイプのストライプレイヤーの不透明度。 LocalizedDescription.ShowTeraThicknessStripe=テラスタルタイプを表示するときのピクセルの太さ。 @@ -895,7 +913,6 @@ SAV_Misc5.B_ImportFC=データをインポート SAV_Misc5.B_ObtainAllMedals=全てのメダル獲得 SAV_Misc5.B_RandForest=ランダム配置 SAV_Misc5.B_Save=保存 -SAV_Misc5.B_UnlockAllMusicalProps=全てのﾐｭｰｼﾞｶﾙｸﾞｯｽﾞ解放 SAV_Misc5.B_UnlockAllProps=全てのグッズ解放 SAV_Misc5.CHK_Area9=９番目のエリア解放済み: SAV_Misc5.CHK_FMNew=NEW @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=参加 SAV_Misc5.L_FMTopScore=トップスコア SAV_Misc5.L_FMUnlocked=アンロック SAV_Misc5.L_Form=フォルム: -SAV_Misc5.L_Gender=性別: SAV_Misc5.L_Move=技: SAV_Misc5.L_MultiFriends=フレンド SAV_Misc5.L_MultiFriendsPast=前回 @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=記録 SAV_Misc5.L_MultiNPC=NPC SAV_Misc5.L_MultiNpcPast=前回 SAV_Misc5.L_MultiNpcRecord=記録 +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=トルネロス SAV_Misc5.L_Roamer642=ボルトロス SAV_Misc5.L_RoamStatus=徘徊状態 @@ -1010,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=一般 SAV_OPower.B_Cancel=ｷｬﾝｾﾙ SAV_OPower.B_ClearAll=全てクリア SAV_OPower.B_GiveAll=全て取得 -SAV_OPower.B_GiveAllMAX=全て最大 SAV_OPower.B_Save=保存 -SAV_OPower.CHK_Master=??? Flag -SAV_OPower.CHK_MAX=MAX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=戦闘 SAV_OPower.GB_Field=ﾌｨｰﾙﾄﾞ -SAV_OPower.L_Points=ポイント: -SAV_OPower.L_Type=タイプ: SAV_Poffin8b.B_All=全て SAV_Poffin8b.B_Cancel=ｷｬﾝｾﾙ SAV_Poffin8b.B_None=ﾘｾｯﾄ diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt index d4383e8e918..c3a2558f0e8 100644 --- a/PKHeX.WinForms/Resources/text/lang_ko.txt +++ b/PKHeX.WinForms/Resources/text/lang_ko.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=Checks player given Nicknames and Trainer N LocalizedDescription.CurrentHandlerMismatch=Severity to flag a Legality Check if Pokémon's Current Handler does not match the expected value. LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=Female gender color. LocalizedDescription.FilterUnavailableSpecies=Hides unavailable Species if the currently loaded save file cannot import them. LocalizedDescription.FlagIllegal=세이브 파일에서 적법하지 않은 포켓몬 표시 @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=프로그램 시작 시 HaX 모드 강제 사용 LocalizedDescription.Gen7TransferStarPID=Severity to flag a Legality Check if Pokémon from Gen1/2 has a Star Shiny PID. LocalizedDescription.Gen8MemoryMissingHT=Severity to flag a Legality Check if a Gen8 Memory is missing for the Handling Trainer. -LocalizedDescription.Gen8TransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=When changing the Hidden Power type, automatically maximize the IVs to ensure the highest Base Power result. Otherwise, keep the IVs as close as possible to the original. @@ -139,19 +139,35 @@ LocalizedDescription.MarkBlue=Blue colored marking. LocalizedDescription.MarkDefault=Default colored marking. LocalizedDescription.MarkPink=Pink colored marking. LocalizedDescription.ModifyUnset=적용하지 않은 변경 사항 알림 +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=Severity to flag a Legality Check if Pokémon has a Nickname matching another Species. LocalizedDescription.NicknamedMysteryGift=Severity to flag a Legality Check if it is a nicknamed Mystery Gift the player cannot normally nickname. LocalizedDescription.NicknamedTrade=Severity to flag a Legality Check if it is a nicknamed In-Game Trade the player cannot normally nickname. LocalizedDescription.OtherBackupPaths=List of extra locations to look for Save Files. LocalizedDescription.OtherSaveFileExtensions=Save File file-extensions (no period) that the program should also recognize. +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Folder path that contains dump(s) of block hash-names. If a specific dump file does not exist, only names defined within the program's code will be loaded. LocalizedDescription.PlaySoundLegalityCheck=적법성 검사 창을 띄울 때 소리로 알림 LocalizedDescription.PlaySoundSAVLoad=새 세이브 파일을 불러올 때 소리로 알림 LocalizedDescription.PluginLoadMethod=Loads plugins from the plugins folder, assuming the folder exists. Try LoadFile to mitigate intermittent load failures. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=Skips searching if the user forgot to enter Species / Move(s) into the search criteria. -LocalizedDescription.RNGFrameNotFound=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match. LocalizedDescription.RNGFrameNotFound3=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 3 encounters. LocalizedDescription.RNGFrameNotFound4=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 4 encounters. LocalizedDescription.SearchBackups=When loading content for the PKM Database, search within backup save files. @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=Opacity for the Encounter Ty LocalizedDescription.ShowEncounterOpacityStripe=Opacity for the Encounter Type stripe layer. LocalizedDescription.ShowEncounterThicknessStripe=Amount of pixels thick to show when displaying the encounter type color stripe. LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID. +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=Opacity for the Tera Type background layer. LocalizedDescription.ShowTeraOpacityStripe=Opacity for the Tera Type stripe layer. LocalizedDescription.ShowTeraThicknessStripe=Amount of pixels thick to show when displaying the Tera Type color stripe. @@ -895,7 +913,6 @@ SAV_Misc5.B_ImportFC=Import Data SAV_Misc5.B_ObtainAllMedals=Obtain All Medals SAV_Misc5.B_RandForest=Randomize All Areas SAV_Misc5.B_Save=저장 -SAV_Misc5.B_UnlockAllMusicalProps=Unlock All Musical Props SAV_Misc5.B_UnlockAllProps=Unlock All Props SAV_Misc5.CHK_Area9=Area 9 Unlocked: SAV_Misc5.CHK_FMNew=신규 @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=Participated SAV_Misc5.L_FMTopScore=Top Score SAV_Misc5.L_FMUnlocked=Unlocked SAV_Misc5.L_Form=Form: -SAV_Misc5.L_Gender=Gender: SAV_Misc5.L_Move=Move: SAV_Misc5.L_MultiFriends=Friends SAV_Misc5.L_MultiFriendsPast=Past @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=Record SAV_Misc5.L_MultiNPC=NPC SAV_Misc5.L_MultiNpcPast=Past SAV_Misc5.L_MultiNpcRecord=Record +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=토네로스 SAV_Misc5.L_Roamer642=볼트로스 SAV_Misc5.L_RoamStatus=Roam status @@ -1010,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=일반 SAV_OPower.B_Cancel=취소 SAV_OPower.B_ClearAll=모두 비우기 SAV_OPower.B_GiveAll=모두 주기 -SAV_OPower.B_GiveAllMAX=모두 최대 SAV_OPower.B_Save=저장 -SAV_OPower.CHK_Master=??? 플래그 -SAV_OPower.CHK_MAX=MAX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=Battle SAV_OPower.GB_Field=Field -SAV_OPower.L_Points=Points: -SAV_OPower.L_Type=유형: SAV_Poffin8b.B_All=All SAV_Poffin8b.B_Cancel=Cancel SAV_Poffin8b.B_None=None diff --git a/PKHeX.WinForms/Resources/text/lang_zh.txt b/PKHeX.WinForms/Resources/text/lang_zh.txt index 179d873c14a..9d3e996f35f 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=检查昵称和训练家名称是否存在 LocalizedDescription.CurrentHandlerMismatch=如果当前持有人与预期值不匹配，则开启严格合法性检查。 LocalizedDescription.DefaultBoxExportNamer=如果有多个可用的文件名，则选择文件名用于GUI的框导出。 LocalizedDescription.DisableScalingDpi=在程序启动时禁用基于 Dpi 的 GUI 缩放，回退到字体缩放。 +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=女性性别颜色。 LocalizedDescription.FilterUnavailableSpecies=隐藏当前存档无法导入的宝可梦种类。 LocalizedDescription.FlagIllegal=标记非法。 @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=自定义调整图标模块与的边框 LocalizedDescription.ForceHaXOnLaunch=程序启动时强制HaX模式。 LocalizedDescription.Gen7TransferStarPID=Gen1/2的星星异色宝可梦合法性检查等级。 LocalizedDescription.Gen8MemoryMissingHT=如果第八世代当前持有人回忆信息丢失，则开启严格合法性检查。 -LocalizedDescription.Gen8TransferTrackerNotPresent=HOME追踪丢失合法性检查等级。 LocalizedDescription.GlowFinal=PKM鼠标悬停闪烁颜色2。 LocalizedDescription.GlowInitial=PKM鼠标悬停闪烁颜色1。 LocalizedDescription.HiddenPowerOnChangeMaxPower=当修改觉醒力量属性时，程序将自动尽最大可能使用最高的个体值来确保基础能力，否则使用最接近原始数值的个体值。 @@ -139,19 +139,35 @@ LocalizedDescription.MarkBlue=蓝色标记。 LocalizedDescription.MarkDefault=默认彩色标记。 LocalizedDescription.MarkPink=粉红色标记。 LocalizedDescription.ModifyUnset=未保存修改提醒。 +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=宝可梦昵称和其他种类名称相同合法性检查等级。 LocalizedDescription.NicknamedMysteryGift=玩家无法取昵称的神秘礼物合法性检查等级。 LocalizedDescription.NicknamedTrade=游戏内交换宝可梦昵称合法性检查等级。 LocalizedDescription.OtherBackupPaths=查找存档文件的位置列表。 LocalizedDescription.OtherSaveFileExtensions=程序可识别的其他存档文件扩展名(不包含扩展名前的点)。 +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=包含特定长度名称保存的文件夹路径。如果特定的转储文件不存在，则只会加载程序代码中定义的名称。 LocalizedDescription.PlaySoundLegalityCheck=弹窗合法性报告时播放声音。 LocalizedDescription.PlaySoundSAVLoad=读取新档时播放声音。 LocalizedDescription.PluginLoadMethod=从plugins文件夹加载插件，假设该文件夹存在。尝试加载文件以减少间歇性加载失败。 LocalizedDescription.PreviewCursorShift=悬停时在 PKM 周围时显示发光效果。 LocalizedDescription.PreviewShowPaste=在悬停在特殊预览中显示Showdown粘贴。 +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=如果用户忘记在搜索条件中输入种类/招式，则跳过搜索。 -LocalizedDescription.RNGFrameNotFound=RNG帧匹配合法性检查等级。 LocalizedDescription.RNGFrameNotFound3=如果 RNG 帧检查逻辑未找到第3代遭遇的匹配项，则标记合法性检查的严重性。 LocalizedDescription.RNGFrameNotFound4=如果 RNG 帧检查逻辑未找到第4代遭遇的匹配项，则标记合法性检查的严重性。 LocalizedDescription.SearchBackups=当加载 PKM 数据库内容时，包含其他备份储存资料档案。 @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=相遇方式指示背景层 LocalizedDescription.ShowEncounterOpacityStripe=相遇方式指示条的透明度。 LocalizedDescription.ShowEncounterThicknessStripe=相遇方式指示条的画素高度。 LocalizedDescription.ShowExperiencePercent=显示一条细条纹来表示升级进度的百分比。 +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=当显示要选择的球列表时，在非法球之前显示合法球，而不是按球ID排序。 +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=太晶属性指示背景层的透明度。 LocalizedDescription.ShowTeraOpacityStripe=太晶属性指示条的透明度。 LocalizedDescription.ShowTeraThicknessStripe=太晶属性指示条的画素高度。 @@ -895,7 +913,6 @@ SAV_Misc5.B_ImportFC=导入数据 SAV_Misc5.B_ObtainAllMedals=获得所有奖章 SAV_Misc5.B_RandForest=随机所有区域 SAV_Misc5.B_Save=保存 -SAV_Misc5.B_UnlockAllMusicalProps=解锁全部音乐物品 SAV_Misc5.B_UnlockAllProps=解锁所有道具 SAV_Misc5.CHK_Area9=区域 9 解锁: SAV_Misc5.CHK_FMNew=NEW @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=已参加 SAV_Misc5.L_FMTopScore=最高分 SAV_Misc5.L_FMUnlocked=解锁 SAV_Misc5.L_Form=形态: -SAV_Misc5.L_Gender=性别: SAV_Misc5.L_Move=招式: SAV_Misc5.L_MultiFriends=朋友 SAV_Misc5.L_MultiFriendsPast=过去 @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=记录 SAV_Misc5.L_MultiNPC=NPC SAV_Misc5.L_MultiNpcPast=过去 SAV_Misc5.L_MultiNpcRecord=记录 +SAV_Misc5.L_Record16=记录: +SAV_Misc5.L_Record16V=数值: +SAV_Misc5.L_Record32=记录: +SAV_Misc5.L_Record32V=数值: SAV_Misc5.L_Roamer641=龙卷云 SAV_Misc5.L_Roamer642=雷电云 SAV_Misc5.L_RoamStatus=游走状态 @@ -965,10 +985,6 @@ SAV_Misc5.L_SMultiNpcRecord=记录 SAV_Misc5.L_Species=种类: SAV_Misc5.L_SSinglePast=过去 SAV_Misc5.L_SSingleRecord=记录 -SAV_Misc5.L_Record32V=数值: -SAV_Misc5.L_Record32=记录: -SAV_Misc5.L_Record16V=数值: -SAV_Misc5.L_Record16=记录: SAV_Misc5.TAB_BWCityForest=白森林/黑色市 SAV_Misc5.TAB_Entralink=连入 SAV_Misc5.TAB_Forest=森林 @@ -1014,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=一般 SAV_OPower.B_Cancel=取消 SAV_OPower.B_ClearAll=清空 SAV_OPower.B_GiveAll=获得全部 -SAV_OPower.B_GiveAllMAX=全部最大 SAV_OPower.B_Save=保存 -SAV_OPower.CHK_Master=???旗帜 -SAV_OPower.CHK_MAX=MAX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=对战内 SAV_OPower.GB_Field=对战外 -SAV_OPower.L_Points=能量: -SAV_OPower.L_Type=类型: SAV_Poffin8b.B_All=所有 SAV_Poffin8b.B_Cancel=取消 SAV_Poffin8b.B_None=清空 diff --git a/PKHeX.WinForms/Resources/text/lang_zh2.txt b/PKHeX.WinForms/Resources/text/lang_zh2.txt index e315663ac5f..37620728b2b 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh2.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh2.txt @@ -110,6 +110,7 @@ LocalizedDescription.CheckWordFilter=檢查昵稱和訓練家名稱是否存在 LocalizedDescription.CurrentHandlerMismatch=如果寶可夢現時持有人與預期值不匹配，則使用高等級合法性檢查。 LocalizedDescription.DefaultBoxExportNamer=Selected File namer to use for box exports for the GUI, if multiple are available. LocalizedDescription.DisableScalingDpi=Disables the GUI scaling based on Dpi on program startup, falling back to font scaling. +LocalizedDescription.DisableWordFilterPastGen=Disables the Word Filter check for formats prior to 3DS-era. LocalizedDescription.Female=Female gender color. LocalizedDescription.FilterUnavailableSpecies=隱藏無法匯入當前儲存資料之寶可夢種類 LocalizedDescription.FlagIllegal=標記不合法 @@ -117,7 +118,6 @@ LocalizedDescription.FocusBorderDeflate=Focus border indentation for custom draw LocalizedDescription.ForceHaXOnLaunch=程式啟動時強制HaX模式 LocalizedDescription.Gen7TransferStarPID=第一、二世代之星星異色寶可夢合法性檢查等級。 LocalizedDescription.Gen8MemoryMissingHT=對缺失第八世代現時持有人回憶之寶可夢提高合法性檢測等級。 -LocalizedDescription.Gen8TransferTrackerNotPresent=HOME追蹤碼丟失合法性檢查等級。 LocalizedDescription.GlowFinal=Hovering over a PKM color 2. LocalizedDescription.GlowInitial=Hovering over a PKM color 1. LocalizedDescription.HiddenPowerOnChangeMaxPower=當修改覺醒力量屬性時，自動最大化個體值以確保基礎能力。否則使個體值盡量與原個體值接近。 @@ -125,7 +125,7 @@ LocalizedDescription.HideEvent8Contains=隱藏包含逗號分隔子串之活動 LocalizedDescription.HideEventTypeBelow=隱藏該活動類型值下之各類事件，並從GUI中移除用戶不關心的活動名稱值。 LocalizedDescription.HideSAVDetails=隱藏程式標題中的儲存資料檔詳細資訊 LocalizedDescription.HideSecretDetails=在編輯器中隱藏秘密細節 -LocalizedDescription.HOMETransferTrackerNotPresent=Severity to flag a Legality Check if the HOME Tracker is Missing +LocalizedDescription.HOMETransferTrackerNotPresent=HOME追蹤碼丟失合法性檢查等級。 LocalizedDescription.HoverSlotGlowEdges=在懸停時顯示PKM Glow LocalizedDescription.HoverSlotPlayCry=在懸停時播放PKM Slot Cry LocalizedDescription.HoverSlotShowEncounter=Show Encounter Info in on Hover @@ -139,21 +139,37 @@ LocalizedDescription.MarkBlue=Blue colored marking. LocalizedDescription.MarkDefault=Default colored marking. LocalizedDescription.MarkPink=Pink colored marking. LocalizedDescription.ModifyUnset=未儲存修改提醒 +LocalizedDescription.Nickname12=Nickname rules for Generation 1 and 2. +LocalizedDescription.Nickname3=Nickname rules for Generation 3. +LocalizedDescription.Nickname4=Nickname rules for Generation 4. +LocalizedDescription.Nickname5=Nickname rules for Generation 5. +LocalizedDescription.Nickname6=Nickname rules for Generation 6. +LocalizedDescription.Nickname7=Nickname rules for Generation 7. +LocalizedDescription.Nickname7b=Nickname rules for Generation 7b. +LocalizedDescription.Nickname8=Nickname rules for Generation 8. +LocalizedDescription.Nickname8a=Nickname rules for Generation 8a. +LocalizedDescription.Nickname8b=Nickname rules for Generation 8b. +LocalizedDescription.Nickname9=Nickname rules for Generation 9. LocalizedDescription.NicknamedAnotherSpecies=寶可夢昵稱和其他種類名稱相同合法性檢查等級。 LocalizedDescription.NicknamedMysteryGift=玩家無法取昵稱的神秘禮物合法性檢查等級。 LocalizedDescription.NicknamedTrade=遊戲內交換寶可夢昵稱合法性檢查等級。 LocalizedDescription.OtherBackupPaths=查找儲存資料檔的位置列表。 LocalizedDescription.OtherSaveFileExtensions=程式可識別的其他儲存資料檔副檔名(不包含副檔名前的點) +LocalizedDescription.OverrideGen1=Gen1: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen2=Gen2: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3FRLG=Gen3 FR/LG: If unable to detect a language or version for a save file, use these instead. +LocalizedDescription.OverrideGen3RS=Gen3 R/S: If unable to detect a language or version for a save file, use these instead. LocalizedDescription.PathBlockKeyList=Folder path that contains dump(s) of block hash-names. If a specific dump file does not exist, only names defined within the program's code will be loaded. LocalizedDescription.PlaySoundLegalityCheck=彈窗合法性報告時播放聲音 LocalizedDescription.PlaySoundSAVLoad=讀取新檔時播放聲音 LocalizedDescription.PluginLoadMethod=Loads plugins from the plugins folder, assuming the folder exists. Try LoadFile to mitigate intermittent load failures. LocalizedDescription.PreviewCursorShift=Show a Glow effect around the PKM on Hover LocalizedDescription.PreviewShowPaste=Show Showdown Paste in special Preview on Hover +LocalizedDescription.RecentlyLoadedMaxCount=Amount of recently loaded save files to remember. +LocalizedDescription.RetainMetDateTransfer45=Retain the Met Date when transferring from Generation 4 to Generation 5. LocalizedDescription.ReturnNoneIfEmptySearch=Skips searching if the user forgot to enter Species / Move(s) into the search criteria. -LocalizedDescription.RNGFrameNotFound=RNG幀匹配度合法性檢查等級。 -LocalizedDescription.RNGFrameNotFound3=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 3 encounters. -LocalizedDescription.RNGFrameNotFound4=Severity to flag a Legality Check if the RNG Frame Checking logic does not find a match for Generation 4 encounters. +LocalizedDescription.RNGFrameNotFound3=RNG幀匹配度合法性檢查等級。 +LocalizedDescription.RNGFrameNotFound4=RNG幀匹配度合法性檢查等級。 LocalizedDescription.SearchBackups=當加載 PKM 數據庫内容時，包含其他備份儲存資料檔案 LocalizedDescription.SearchExtraSaves=當加載 PKM 數據庫内容時，包含其他備份路徑内檔案 LocalizedDescription.SearchExtraSavesDeep=當加載 PKM 數據庫内容時，包含其他備份路徑内子資料夾 @@ -172,7 +188,9 @@ LocalizedDescription.ShowEncounterOpacityBackground=遇見方式指示背景層 LocalizedDescription.ShowEncounterOpacityStripe=遇見方式指示條之透明度。 LocalizedDescription.ShowEncounterThicknessStripe=遇見方式指示條之畫素高度。 LocalizedDescription.ShowExperiencePercent=Show a thin stripe to indicate the percent of level-up progress +LocalizedDescription.ShowGenderGen1=When showing a Generation 1 format entity, show the gender it would have if transferred to other generations. LocalizedDescription.ShowLegalBallsFirst=When showing the list of balls to select, show the legal balls before the illegal balls rather than sorting by Ball ID. +LocalizedDescription.ShowStatusCondition=When showing an entity, show any stored Status Condition (Sleep/Burn/etc) it may have. LocalizedDescription.ShowTeraOpacityBackground=太晶屬性指示背景層之透明度。 LocalizedDescription.ShowTeraOpacityStripe=太晶屬性指示條之透明度。 LocalizedDescription.ShowTeraThicknessStripe=太晶屬性指示條之畫素高度。 @@ -895,8 +913,7 @@ SAV_Misc5.B_ImportFC=Import Data SAV_Misc5.B_ObtainAllMedals=Obtain All Medals SAV_Misc5.B_RandForest=隨機所有區域 SAV_Misc5.B_Save=儲存 -SAV_Misc5.B_UnlockAllMusicalProps=解鎖全部音樂物品 -SAV_Misc5.B_UnlockAllProps=Unlock All Props +SAV_Misc5.B_UnlockAllProps=解鎖全部音樂物品 SAV_Misc5.CHK_Area9=區域 9 解鎖: SAV_Misc5.CHK_FMNew=NEW SAV_Misc5.CHK_Invisible=隱性 @@ -941,7 +958,6 @@ SAV_Misc5.L_FMParticipated=已參加 SAV_Misc5.L_FMTopScore=最高分 SAV_Misc5.L_FMUnlocked=解鎖 SAV_Misc5.L_Form=形態: -SAV_Misc5.L_Gender=Gender: SAV_Misc5.L_Move=招式: SAV_Misc5.L_MultiFriends=朋友 SAV_Misc5.L_MultiFriendsPast=過去 @@ -949,6 +965,10 @@ SAV_Misc5.L_MultiFriendsRecord=記錄 SAV_Misc5.L_MultiNPC=NPC SAV_Misc5.L_MultiNpcPast=過去 SAV_Misc5.L_MultiNpcRecord=記錄 +SAV_Misc5.L_Record16=Record: +SAV_Misc5.L_Record16V=Value: +SAV_Misc5.L_Record32=Record: +SAV_Misc5.L_Record32V=Value: SAV_Misc5.L_Roamer641=龍卷雲 SAV_Misc5.L_Roamer642=雷電雲 SAV_Misc5.L_RoamStatus=Roam status @@ -1010,15 +1030,9 @@ SAV_MysteryGiftDB.Tab_General=一般 SAV_OPower.B_Cancel=取消 SAV_OPower.B_ClearAll=清空 SAV_OPower.B_GiveAll=獲得全部 -SAV_OPower.B_GiveAllMAX=全部最大 SAV_OPower.B_Save=儲存 -SAV_OPower.CHK_Master=???旗幟 -SAV_OPower.CHK_MAX=MAX -SAV_OPower.CHK_S=S SAV_OPower.GB_Battle=Battle SAV_OPower.GB_Field=Field -SAV_OPower.L_Points=Points: -SAV_OPower.L_Type=類型: SAV_Poffin8b.B_All=所有 SAV_Poffin8b.B_Cancel=取消 SAV_Poffin8b.B_None=清空 diff --git a/PKHeX.WinForms/Subforms/PKM Editors/Text.cs b/PKHeX.WinForms/Subforms/PKM Editors/Text.cs index cfed6275afc..0d71c3d1a18 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/Text.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/Text.cs @@ -11,7 +11,7 @@ public partial class TrashEditor : Form { private readonly IStringConverter Converter; - public TrashEditor(TextBoxBase TB_NN, SaveFile sav) : this(TB_NN, [], sav, sav.Generation) { } + public TrashEditor(TextBoxBase TB_NN, IStringConverter sav, byte generation) : this(TB_NN, [], sav, generation) { } public TrashEditor(TextBoxBase TB_NN, Span raw, IStringConverter converter, byte generation) { diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs index 066739b277c..b4fd0c3c3ac 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs @@ -278,7 +278,7 @@ private void ClickOT(object sender, MouseEventArgs e) if (ModifierKeys != Keys.Control) return; - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs index 8200a8e4826..e381da5123c 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs @@ -397,7 +397,7 @@ private void TB_OTName_MouseDown(object sender, MouseEventArgs e) if (ModifierKeys != Keys.Control) return; - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs index 5b7e97c9ec3..dfe490bcd9c 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs @@ -483,7 +483,7 @@ private void ClickOT(object sender, MouseEventArgs e) if (ModifierKeys != Keys.Control) return; - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs index f8d1d9518c0..02194e5f9cf 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7GG.cs @@ -152,7 +152,7 @@ private void ClickString(object sender, MouseEventArgs e) TextBox tb = sender as TextBox ?? TB_OTName; // Special Character Form - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs index ffe5440877b..425a5677cae 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs @@ -188,7 +188,7 @@ private void ClickOT(object sender, MouseEventArgs e) if (ModifierKeys != Keys.Control) return; - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs index fc946d1ee13..56c2de940c2 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8a.cs @@ -126,7 +126,7 @@ private void ClickOT(object sender, MouseEventArgs e) if (ModifierKeys != Keys.Control) return; - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8b.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8b.cs index dfc89b0f141..bf1514a9991 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8b.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8b.cs @@ -157,7 +157,7 @@ private void ClickOT(object sender, MouseEventArgs e) if (ModifierKeys != Keys.Control) return; - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs index 0ce6e39c4d2..26ec30a9cbb 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Trainer9.cs @@ -180,7 +180,7 @@ private void ClickOT(object sender, MouseEventArgs e) if (ModifierKeys != Keys.Control) return; - var d = new TrashEditor(tb, SAV); + var d = new TrashEditor(tb, SAV, SAV.Generation); d.ShowDialog(); tb.Text = d.FinalString; } diff --git a/PKHeX.WinForms/Util/WinFormsTranslator.cs b/PKHeX.WinForms/Util/WinFormsTranslator.cs index 59e6bff533d..6e400aefc73 100644 --- a/PKHeX.WinForms/Util/WinFormsTranslator.cs +++ b/PKHeX.WinForms/Util/WinFormsTranslator.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using System.Windows.Forms; using PKHeX.Core; @@ -204,7 +205,7 @@ private static bool IsBannedContains(ReadOnlySpan line, ReadOnlySpan banlist) { var badKeys = Context[defaultLanguage]; - var split = GetSkips(banlist, badKeys); + var skipExports = GetSkips(banlist, badKeys); 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))); + var result = lines.Where(l => !skipExports.Any(l.StartsWith)); File.WriteAllLines(fn, result); } } @@ -275,8 +276,8 @@ private static string[] GetSkips(ReadOnlySpan banlist, TranslationContex if (index < 0) continue; var key = line.AsSpan(0, index); - if (IsBannedStartsWith(key, banlist)) - split.Add(key.ToString()); + if (!IsBannedStartsWith(key, banlist)) + split.Add(line[..(index+1)]); } if (split.Count == 0) @@ -287,10 +288,17 @@ private static string[] GetSkips(ReadOnlySpan banlist, TranslationContex public static void LoadSettings(string defaultLanguage, bool add = true) { var context = (Dictionary)Context[defaultLanguage].Lookup; - var props = typeof(T).GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance); + Type t = typeof(T); + LoadSettings(add, t, context); + } + + private static void LoadSettings(bool add, IReflect type, Dictionary context) + { + var props = type.GetProperties(BindingFlags.Public | BindingFlags.Instance); foreach (var prop in props) { - var p = prop.PropertyType.GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance); + var t = prop.PropertyType; + var p = t.GetProperties(BindingFlags.Public | BindingFlags.Instance); foreach (var x in p) { var individual = (LocalizedDescriptionAttribute[])x.GetCustomAttributes(typeof(LocalizedDescriptionAttribute), false); @@ -309,6 +317,9 @@ public static void LoadSettings(string defaultLanguage, bool add = true) } } } + // If t is an object type, recurse. + if (t.IsClass && t != typeof(string)) + LoadSettings(add, t, context); } } #endif