From fbd533092d94d19251460b4046714cc7ec3ddfa8 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 12 Mar 2020 15:05:34 -0700 Subject: [PATCH] Fix misspelling of the word "Received" Closes #2757 Co-Authored-By: pi1024e --- .../Legality/Encounters/Verifiers/MysteryGiftVerifier.cs | 4 ++-- PKHeX.Core/MysteryGifts/MysteryUtil.cs | 4 ++-- PKHeX.Core/Resources/text/de/MessageStrings_de.txt | 2 +- PKHeX.Core/Resources/text/en/MessageStrings_en.txt | 2 +- PKHeX.Core/Resources/text/es/MessageStrings_es.txt | 2 +- PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt | 2 +- PKHeX.Core/Resources/text/it/MessageStrings_it.txt | 2 +- PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt | 2 +- PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt | 2 +- PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt | 2 +- PKHeX.Core/Saves/Substructures/Records.cs | 4 ++-- PKHeX.Core/Util/MessageStrings.cs | 2 +- PKHeX.WinForms/Resources/text/changelog_2018.txt | 4 ++-- .../Subforms/Save Editors/SAV_Wondercard.Designer.cs | 2 +- PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs | 6 +++--- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/MysteryGiftVerifier.cs b/PKHeX.Core/Legality/Encounters/Verifiers/MysteryGiftVerifier.cs index 88dfbd93f..3b22adf5e 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/MysteryGiftVerifier.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/MysteryGiftVerifier.cs @@ -39,7 +39,7 @@ public static CheckResult VerifyGift(PKM pk, MysteryGift g) return new CheckResult(CheckIdentifier.GameOrigin); var ver = (int)val >> 16; - if (ver != 0 && !CanVersionRecieveGift(g.Format, ver, pk.Version)) + if (ver != 0 && !CanVersionReceiveGift(g.Format, ver, pk.Version)) return new CheckResult(Severity.Invalid, LEncGiftVersionNotDistributed, CheckIdentifier.GameOrigin); var lang = val & MysteryGiftRestriction.LangRestrict; @@ -72,7 +72,7 @@ public static bool IsValidChangedOTName(PKM pk, MysteryGift g) return CurrentOTMatchesReplaced(g.Format, pk.OT_Name); } - private static bool CanVersionRecieveGift(int format, int version4bit, int version) + private static bool CanVersionReceiveGift(int format, int version4bit, int version) { return format switch { diff --git a/PKHeX.Core/MysteryGifts/MysteryUtil.cs b/PKHeX.Core/MysteryGifts/MysteryUtil.cs index 57a7a91ee..1b575f4a4 100644 --- a/PKHeX.Core/MysteryGifts/MysteryUtil.cs +++ b/PKHeX.Core/MysteryGifts/MysteryUtil.cs @@ -125,7 +125,7 @@ public static bool IsCardCompatible(this MysteryGift g, SaveFile SAV, out string return false; } - if (!SAV.CanRecieveGift(g)) + if (!SAV.CanReceiveGift(g)) { message = MsgMysteryGiftTypeDetails; return false; @@ -150,7 +150,7 @@ public static bool IsCardCompatible(this MysteryGift g, SaveFile SAV, out string /// Save file receiving the gift data. /// Gift data to potentially insert to the save file. /// True if compatible, false if incompatible. - public static bool CanRecieveGift(this SaveFile SAV, MysteryGift gift) + public static bool CanReceiveGift(this SaveFile SAV, MysteryGift gift) { if (gift.Species > SAV.MaxSpeciesID) return false; diff --git a/PKHeX.Core/Resources/text/de/MessageStrings_de.txt b/PKHeX.Core/Resources/text/de/MessageStrings_de.txt index 90da5b484..22e02c9d4 100644 --- a/PKHeX.Core/Resources/text/de/MessageStrings_de.txt +++ b/PKHeX.Core/Resources/text/de/MessageStrings_de.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead. MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}. MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file. -MsgMysteryGiftQRRecieved = QR Gift Type: +MsgMysteryGiftQRReceived = QR Gift Type: MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR. MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead. MsgItemPouchUnknown = Unknown item detected. diff --git a/PKHeX.Core/Resources/text/en/MessageStrings_en.txt b/PKHeX.Core/Resources/text/en/MessageStrings_en.txt index d06e5eb7f..9ecc81823 100644 --- a/PKHeX.Core/Resources/text/en/MessageStrings_en.txt +++ b/PKHeX.Core/Resources/text/en/MessageStrings_en.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead. MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}. MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file. -MsgMysteryGiftQRRecieved = QR Gift Type: +MsgMysteryGiftQRReceived = QR Gift Type: MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR. MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead. MsgItemPouchUnknown = Unknown item detected. diff --git a/PKHeX.Core/Resources/text/es/MessageStrings_es.txt b/PKHeX.Core/Resources/text/es/MessageStrings_es.txt index ad6444ab0..db4ee50f4 100644 --- a/PKHeX.Core/Resources/text/es/MessageStrings_es.txt +++ b/PKHeX.Core/Resources/text/es/MessageStrings_es.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = ¿Este Regalo Misterioso realmente pertenece a MsgMysteryGiftSlotAlternate = Regalo {0} se estableció en el espacio {1} en su lugar. MsgMysteryGiftSlotFailSwap = No se puede cambiar {0} con {1}. MsgMysteryGiftQRTypeLength = La longitud de los datos decodificados no es válida para el archivo guardado cargado. -MsgMysteryGiftQRRecieved = Tipo de Regalo QR: +MsgMysteryGiftQRReceived = Tipo de Regalo QR: MsgMysteryGiftQREonTicket = Regalo Misterioso del Ticket Eon no se importará correctamente cuando se reciba a través de QR. MsgMysteryGiftQREonTicketAdvice = Inyecte el Regalo Misterioso del Ticket Eon en el archivo de guardado en su lugar. MsgItemPouchUnknown = Se detectó un Objeto desconocido. diff --git a/PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt b/PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt index c751dc093..460ffa0df 100644 --- a/PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt +++ b/PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Ce Cadeau Mystère appartient-il vraiment à c MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead. MsgMysteryGiftSlotFailSwap = Impossible d'échanger {0} pour {1}. MsgMysteryGiftQRTypeLength = Taille de données décodées invalide pour cette sauvegarde. -MsgMysteryGiftQRRecieved = Type de Cadeau QR: +MsgMysteryGiftQRReceived = Type de Cadeau QR: MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR. MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead. MsgItemPouchUnknown = Objet inconnu détecté. diff --git a/PKHeX.Core/Resources/text/it/MessageStrings_it.txt b/PKHeX.Core/Resources/text/it/MessageStrings_it.txt index 90da5b484..22e02c9d4 100644 --- a/PKHeX.Core/Resources/text/it/MessageStrings_it.txt +++ b/PKHeX.Core/Resources/text/it/MessageStrings_it.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead. MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}. MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file. -MsgMysteryGiftQRRecieved = QR Gift Type: +MsgMysteryGiftQRReceived = QR Gift Type: MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR. MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead. MsgItemPouchUnknown = Unknown item detected. diff --git a/PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt b/PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt index 90da5b484..22e02c9d4 100644 --- a/PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt +++ b/PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead. MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}. MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file. -MsgMysteryGiftQRRecieved = QR Gift Type: +MsgMysteryGiftQRReceived = QR Gift Type: MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR. MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead. MsgItemPouchUnknown = Unknown item detected. diff --git a/PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt b/PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt index e4047ad95..d7114b692 100644 --- a/PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt +++ b/PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = 정말 이 게임에 맞는 이상한소포가 MsgMysteryGiftSlotAlternate = {0} 소포를 {1} 슬롯으로 바꾸어 지정했습니다. MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}. MsgMysteryGiftQRTypeLength = 해독한 데이터 길이가 이 세이브 파일과 호환되지 않습니다. -MsgMysteryGiftQRRecieved = QR 선물 유형: +MsgMysteryGiftQRReceived = QR 선물 유형: MsgMysteryGiftQREonTicket = 무한티켓이 담긴 이상한소포는 QR로 받았을 때 정상적으로 불러올 수 없습니다. MsgMysteryGiftQREonTicketAdvice = 무한티켓이 담긴 이상한소포를 세이브 파일에 직접 추가하세요. MsgItemPouchUnknown = 알 수 없는 아이템을 발견했습니다. diff --git a/PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt b/PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt index 08fe73a6d..2cc366196 100644 --- a/PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt +++ b/PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt @@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = 当前神秘礼物真的属于该游戏吗? MsgMysteryGiftSlotAlternate = {0} 礼物已另被设置到格子 {1} 。 MsgMysteryGiftSlotFailSwap = 无法将 {0} 与 {1} 交换。 MsgMysteryGiftQRTypeLength = 解码后的数据大小对于当前存档不兼容。 -MsgMysteryGiftQRRecieved = QR 礼物类型: +MsgMysteryGiftQRReceived = QR 礼物类型: MsgMysteryGiftQREonTicket = 无限船票的神秘礼物无法从QR导入。 MsgMysteryGiftQREonTicketAdvice = 注入无限船票的神秘礼物至存档文件? MsgItemPouchUnknown = 检测到未知道具。 diff --git a/PKHeX.Core/Saves/Substructures/Records.cs b/PKHeX.Core/Saves/Substructures/Records.cs index 2f34d6ae4..8896e4dcc 100644 --- a/PKHeX.Core/Saves/Substructures/Records.cs +++ b/PKHeX.Core/Saves/Substructures/Records.cs @@ -346,7 +346,7 @@ public static int GetOffset(int baseOfs, int recordID) {179, "Shiny Pokemon Encountered"}, {180, "Trick House Clears"}, - {181, "Eon Ticket 1 (Spotpass)"}, + {181, "Eon Ticket 1 (SpotPass)"}, {182, "Eon Ticket 2 (Mystery Gift)"}, }; @@ -469,7 +469,7 @@ public static int GetOffset(int baseOfs, int recordID) {137, "Battle Royal Dome Battles"}, {138, "Items Picked Up after Battle"}, {139, "Ate in Malasadas Shop"}, - {140, "Hyper Trainings Recieved"}, + {140, "Hyper Trainings Received"}, {141, "Dishes eaten in Battle Buffet"}, {142, "Pokémon Refresh Accessed"}, {143, "Pokémon Storage System Log-outs"}, diff --git a/PKHeX.Core/Util/MessageStrings.cs b/PKHeX.Core/Util/MessageStrings.cs index 7e64c7e0b..b839ed064 100644 --- a/PKHeX.Core/Util/MessageStrings.cs +++ b/PKHeX.Core/Util/MessageStrings.cs @@ -296,7 +296,7 @@ public static class MessageStrings public static string MsgMysteryGiftSlotFailSwap { get; set; } = "Can't swap a {0} with a {1}."; public static string MsgMysteryGiftQRTypeLength { get; set; } = "Decoded data length not valid for loaded save file."; - public static string MsgMysteryGiftQRRecieved { get; set; } = "QR Gift Type:"; + public static string MsgMysteryGiftQRReceived { get; set; } = "QR Gift Type:"; public static string MsgMysteryGiftQREonTicket { get; set; } = "Eon Ticket Mystery Gift will not import correctly when received via QR."; public static string MsgMysteryGiftQREonTicketAdvice { get; set; } = "Inject the Eon Ticket Mystery Gift to the save file instead."; diff --git a/PKHeX.WinForms/Resources/text/changelog_2018.txt b/PKHeX.WinForms/Resources/text/changelog_2018.txt index 540a0b6e7..9a1269cdd 100644 --- a/PKHeX.WinForms/Resources/text/changelog_2018.txt +++ b/PKHeX.WinForms/Resources/text/changelog_2018.txt @@ -1015,7 +1015,7 @@ - Fixed: Glass (Colored) Flutes should now be in the proper pouch. Thanks SoujiSeta! - Fixed: Super Training copying too much and erroring out. Thanks SoujiSeta! - Fixed: Mono compatibility fix for inventory data editing. Thanks SoujiSeta! - - Fixed: Deleting Wonder Card recieved flags will actually save. Thanks ifyfg! + - Fixed: Deleting Wonder Card Received flags will actually save. Thanks ifyfg! - Fixed: X/Y xorpad auto-loading/decryption now works instead of hanging. 15/01/01 - New Update: (5300) @@ -1135,7 +1135,7 @@ - Added: Hex view (as decimal) of the current appearance for advanced editing. - Added: Opening of files via command line arguments (dragging onto .exe). - Added: Auto-loading of "main" file on startup if it exists. - - Fixed: Nice Recieved is actually @ 0x0EC. Added "People Met Online" @ 0x0F4. + - Fixed: Nice Received is actually @ 0x0EC. Added "People Met Online" @ 0x0F4. - Fixed: Load Boxes from Folder will no longer give bad eggs in empty slots. - Fixed: Can no longer set illegal Dex entries (either manually or via Give All) - Misc: Cleaned up some code, reduced file size. diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.Designer.cs index 02e3c7079..d33b99327 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.Designer.cs @@ -123,7 +123,7 @@ private void InitializeComponent() this.flagDel.Name = "flagDel"; this.flagDel.Size = new System.Drawing.Size(107, 22); this.flagDel.Text = "Delete"; - this.flagDel.Click += new System.EventHandler(this.ClearRecievedFlag); + this.flagDel.Click += new System.EventHandler(this.ClearReceivedFlag); // // L_Received // diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs index 8c809fefd..3e5b4849b 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs @@ -246,7 +246,7 @@ private void B_Save_Click(object sender, EventArgs e) } // Delete Received Flag - private void ClearRecievedFlag(object sender, EventArgs e) + private void ClearReceivedFlag(object sender, EventArgs e) { if (LB_Received.SelectedIndex < 0) return; @@ -360,8 +360,8 @@ private void ImportQRToView(string url) if (mga.Gifts.All(card => card.Data.Length != data.Length)) WinFormsUtil.Alert(MsgMysteryGiftQRTypeLength, string.Format(MsgQRDecodeSize, $"0x{data.Length:X}")); else if (types.All(type => type != giftType)) - WinFormsUtil.Alert(MsgMysteryGiftTypeIncompatible, $"{MsgMysteryGiftQRRecieved} {gift.Type}{Environment.NewLine}{MsgMysteryGiftTypeUnexpected} {string.Join(", ", types)}"); - else if (!SAV.CanRecieveGift(gift)) + WinFormsUtil.Alert(MsgMysteryGiftTypeIncompatible, $"{MsgMysteryGiftQRReceived} {gift.Type}{Environment.NewLine}{MsgMysteryGiftTypeUnexpected} {string.Join(", ", types)}"); + else if (!SAV.CanReceiveGift(gift)) WinFormsUtil.Alert(MsgMysteryGiftTypeDetails); else ViewGiftData(gift);