From 335379bd2edab927f9537e40ea5be3cc017df5b6 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 8 Apr 2018 17:54:09 -0700 Subject: [PATCH] Remove unneeded string #1893 --- PKHeX.Core/Resources/text/de/MessageStrings_de.txt | 1 - PKHeX.Core/Resources/text/en/MessageStrings_en.txt | 1 - PKHeX.Core/Resources/text/es/MessageStrings_es.txt | 1 - PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt | 1 - PKHeX.Core/Resources/text/it/MessageStrings_it.txt | 1 - PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt | 1 - PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt | 1 - PKHeX.Core/Resources/text/other/MessageStrings_pt.txt | 1 - PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt | 1 - PKHeX.Core/Util/MessageStrings.cs | 1 - PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs | 2 +- 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/PKHeX.Core/Resources/text/de/MessageStrings_de.txt b/PKHeX.Core/Resources/text/de/MessageStrings_de.txt index 4a566a0dc..41f1a5f11 100644 --- a/PKHeX.Core/Resources/text/de/MessageStrings_de.txt +++ b/PKHeX.Core/Resources/text/de/MessageStrings_de.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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 f9594a47a..b92563cfa 100644 --- a/PKHeX.Core/Resources/text/en/MessageStrings_en.txt +++ b/PKHeX.Core/Resources/text/en/MessageStrings_en.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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 7f4f81d86..17a6b1ecf 100644 --- a/PKHeX.Core/Resources/text/es/MessageStrings_es.txt +++ b/PKHeX.Core/Resources/text/es/MessageStrings_es.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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/fr/MessageStrings_fr.txt b/PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt index 4a566a0dc..41f1a5f11 100644 --- a/PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt +++ b/PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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/it/MessageStrings_it.txt b/PKHeX.Core/Resources/text/it/MessageStrings_it.txt index 4a566a0dc..41f1a5f11 100644 --- a/PKHeX.Core/Resources/text/it/MessageStrings_it.txt +++ b/PKHeX.Core/Resources/text/it/MessageStrings_it.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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 4a566a0dc..41f1a5f11 100644 --- a/PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt +++ b/PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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 4a566a0dc..41f1a5f11 100644 --- a/PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt +++ b/PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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/other/MessageStrings_pt.txt b/PKHeX.Core/Resources/text/other/MessageStrings_pt.txt index 4a566a0dc..41f1a5f11 100644 --- a/PKHeX.Core/Resources/text/other/MessageStrings_pt.txt +++ b/PKHeX.Core/Resources/text/other/MessageStrings_pt.txt @@ -215,7 +215,6 @@ 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: -MsgMysteryGiftQRDataSize = QR Data Size: 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/zh/MessageStrings_zh.txt b/PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt index be5347887..c33fe59a7 100644 --- a/PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt +++ b/PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt @@ -215,7 +215,6 @@ MsgMysteryGiftSlotAlternate = {0} 礼物已另被设置到格子 {1} 。 MsgMysteryGiftSlotFailSwap = 无法将 {0} 与 {1} 交换。 MsgMysteryGiftQRTypeLength = 解码后的数据大小对于当前存档不兼容。 MsgMysteryGiftQRRecieved = QR 礼物类型: -MsgMysteryGiftQRDataSize = QR 数据大小: MsgMysteryGiftQREonTicket = 无限船票的神秘礼物无法从QR导入。 MsgMysteryGiftQREonTicketAdvice = 注入无限船票的神秘礼物至存档文件? MsgItemPouchUnknown = 检测到未知道具。 diff --git a/PKHeX.Core/Util/MessageStrings.cs b/PKHeX.Core/Util/MessageStrings.cs index 944b8e7a3..8d350859c 100644 --- a/PKHeX.Core/Util/MessageStrings.cs +++ b/PKHeX.Core/Util/MessageStrings.cs @@ -291,7 +291,6 @@ public static class MessageStrings 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 MsgMysteryGiftQRDataSize { get; set; } = "QR Data Size:"; 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/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs index 28f8837f3..7f806644f 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs @@ -337,7 +337,7 @@ private void ImportQRToView(string url) string giftType = gift.Type; if (mga.Gifts.All(card => card.Data.Length != data.Length)) - WinFormsUtil.Alert(MsgMysteryGiftQRTypeLength, $"{MsgMysteryGiftQRDataSize} 0x{data.Length:X}"); + WinFormsUtil.Alert(MsgMysteryGiftQRTypeLength, $"{MsgQRDecodeSize} 0x{data.Length:X}"); else if (types.All(type => type != giftType)) WinFormsUtil.Alert(MsgMysteryGiftTypeIncompatible, $"{MsgMysteryGiftQRRecieved} {gift.Type}{Environment.NewLine}{MsgMysteryGiftTypeUnexpected} {string.Join(", ", types)}");