From d566f5b28a77c3caf1f10512ba6883e1cd3b668d Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 18 Nov 2015 14:11:16 -0600 Subject: [PATCH] More Changes --- EduNetworkBuilder/Network.cs | 2 +- EduNetworkBuilder/NetworkBuilder.cs | 2 +- EduNetworkBuilder/NetworkCard.cs | 6 ++--- EduNetworkBuilder/NetworkDevice.cs | 2 +- .../Resources/languages/edustrings.resx | 24 +++++++++++++++++++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs index 7949e9a..69a2285 100644 --- a/EduNetworkBuilder/Network.cs +++ b/EduNetworkBuilder/Network.cs @@ -833,7 +833,7 @@ namespace EduNetworkBuilder NB.SetProgress(Duration.TotalSeconds, NumberOfSecondsForTimeout); if (Duration.TotalSeconds > NumberOfSecondsForTimeout) { - Console.WriteLine(string.Format("Total seconds = {0} Stopping.", Duration.TotalSeconds.ToString())); + Console.WriteLine(string.Format(NB.Translate("N_ProssShouldContinSec"), Duration.TotalSeconds.ToString())); foreach (Packet pkt in myPackets) { pkt.Tracking.AddMessage(DebugLevel.packet, NB.Translate("N_ProssShouldContinNet"), NB.Translate("N_ProssShouldContinTime")); diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index 911ff36..c36384a 100644 --- a/EduNetworkBuilder/NetworkBuilder.cs +++ b/EduNetworkBuilder/NetworkBuilder.cs @@ -437,7 +437,7 @@ namespace EduNetworkBuilder byte[] item = (byte[])myManager.GetObject(str); if(item == null) { - MessageBox.Show(String.Format("Skipping Invalid Puzzle: '{0}'",str)); + MessageBox.Show(String.Format("NB_LoadPuzInfo", str)); continue; } myString = new StreamReader(new MemoryStream(item), true).ReadToEnd(); diff --git a/EduNetworkBuilder/NetworkCard.cs b/EduNetworkBuilder/NetworkCard.cs index a4ca196..42be461 100644 --- a/EduNetworkBuilder/NetworkCard.cs +++ b/EduNetworkBuilder/NetworkCard.cs @@ -652,8 +652,8 @@ namespace EduNetworkBuilder } else if(!HasIP(tPacket.destIP.GetIP)) { - tPacket.AddMessage(DebugLevel.routing, "The packet was rejected by the firewall."); - tPacket.AddMessage(DebugLevel.debug, " The packet was not expected by the firewall, so it was rejected."); + tPacket.AddMessage(DebugLevel.routing, NB.Translate("NC_ProssInPackReject")); + tPacket.AddMessage(DebugLevel.debug, NB.Translate("NC_ProssInPackExpect")); mynet = NB.GetNetwork(); nd = mynet.GetDeviceFromID(myID); string hostname = NB.Translate("NC_NoHost"); @@ -702,7 +702,7 @@ namespace EduNetworkBuilder { if (!typeof(T).IsSerializable) { - throw new ArgumentException("The type must be serializable.", "source"); + throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("NC_source")); } // Don't serialize a null object, simply return the default for that object diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index fffa711..22e574d 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -1768,7 +1768,7 @@ namespace EduNetworkBuilder } else if(!tPacket.isFresh && !ForwardsPackets()) { - tPacket.AddMessage(DebugLevel.info, "ND_ProcessArrival_PackReturnErr1"); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_PackReturnErr1")); string sIP = "?.?.?.?"; if (tPacket.sourceIP != null) sIP = tPacket.sourceIP.GetIP.ToIpString(); diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index 8ed79cb..0bd3eff 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -1301,4 +1301,28 @@ The packet timed out and was dropped. N_ProssShouldContinTimeout = The packet timed out and was dropped. + + Skipping Invalid Puzzle: '{0}' + NB_LoadPuzInfo = Skipping Invalid Puzzle: '{0}' + + + The type must be serializable. + NC_CloneSerialzable = The type must be serializable. + + + The packet was not expected by the firewall, so it was rejected. + NC_ProssInPackExpect = The packet was not expected by the firewall, so it was rejected. + + + The packet was rejected by the firewall. + NC_ProssInPackReject = The packet was rejected by the firewall. + + + source + NC_source = source + + + Total seconds = {0} Stopping. + N_ProssShouldContinSec = Total seconds = {0} Stopping. + \ No newline at end of file