From 6695e979abfa2eaf071c9100ccf538e5646574f0 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 18 Nov 2015 16:34:00 -0600 Subject: [PATCH] Catchup to ND Edits --- EduNetworkBuilder/DeviceConfig.cs | 6 +- EduNetworkBuilder/IPAddress.cs | 2 +- EduNetworkBuilder/NetworkBuilder.cs | 8 +-- EduNetworkBuilder/NetworkCardEditor.cs | 10 +-- EduNetworkBuilder/NetworkComponent.cs | 2 +- EduNetworkBuilder/NetworkDevice.cs | 12 ++-- .../Resources/languages/edustrings.resx | 72 ++++++++++++++++++- 7 files changed, 90 insertions(+), 22 deletions(-) diff --git a/EduNetworkBuilder/DeviceConfig.cs b/EduNetworkBuilder/DeviceConfig.cs index ef51623..566f720 100644 --- a/EduNetworkBuilder/DeviceConfig.cs +++ b/EduNetworkBuilder/DeviceConfig.cs @@ -28,7 +28,7 @@ namespace EduNetworkBuilder OriginalItem = Original_Item; ClonedItem = NetworkComponent.Clone(OriginalItem); UpdateForm(); - lblHelp.Text = "Select the network card or interface for that network card that you wish to edit. Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another."; + lblHelp.Text = NB.Translate("DC_DeviceConfigEdit"); } private void LoadFromOrig() @@ -102,7 +102,7 @@ namespace EduNetworkBuilder } btnGateway.Visible = true; - btnGateway.Text = string.Format("Gateway: {0}", ndCLonedItem.GetGateway().GetIP.ToIpString()); + btnGateway.Text = string.Format(NB.Translate("DC_UdFrmGtewayStr"), ndCLonedItem.GetGateway().GetIP.ToIpString()); tbHostname.Text = ndCLonedItem.hostname; //Network cards are changed with the [edit] button and do not need to be updated here //IPAddresses are changed with the [edit] button and do not need to be updated here @@ -209,7 +209,7 @@ namespace EduNetworkBuilder otext = tbHostname.Text; tbHostname.Text = OriginalItem.hostname; - MessageBox.Show(string.Format("The name '{0}' is being used as part of this puzzle and this machine cannot be named that.", otext)); + MessageBox.Show(string.Format(NB.Translate("DC_HostValidateStr"), otext)); } } } diff --git a/EduNetworkBuilder/IPAddress.cs b/EduNetworkBuilder/IPAddress.cs index 6824260..1e7f2f7 100644 --- a/EduNetworkBuilder/IPAddress.cs +++ b/EduNetworkBuilder/IPAddress.cs @@ -223,7 +223,7 @@ namespace EduNetworkBuilder } public string IPFormat(string gw) { - string tstring = string.Format("IP:{0} Mask:{1} GW:{2}", + string tstring = string.Format(NB.Translate("IPA_IPFormatStr"), PadIt(_ip.ToIpString()), PadIt(_mask.ToIpString()), PadIt(gw)); return tstring; } diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index c36384a..bbeddfc 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("NB_LoadPuzInfo", str)); + MessageBox.Show(String.Format(NB.Translate("NB_LoadPuzInfo"), str)); continue; } myString = new StreamReader(new MemoryStream(item), true).ReadToEnd(); @@ -544,12 +544,12 @@ namespace EduNetworkBuilder { foreach (string tStr in myNetwork.GetIncompleteTestDestinations(ReleasedOn.hostname, true)) { - pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Ping {0}",tStr)); + pbNetworkView.ContextMenuStrip.Items.Add(string.Format(NB.Translate("NB_NetViewPingStr"),tStr)); pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Ping_Name_Click; } foreach (string tStr in myNetwork.GetIncompleteTestDestinations(ReleasedOn.hostname, false)) { - pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Arp {0}", tStr)); + pbNetworkView.ContextMenuStrip.Items.Add(string.Format("NB_NetViewArpStr", tStr)); pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Arp_Name_Click; } } @@ -586,7 +586,7 @@ namespace EduNetworkBuilder } foreach (string host in ReleasedOn.ListOfConnectedHosts()) { - pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Remove Link To {0}", host)); + pbNetworkView.ContextMenuStrip.Items.Add(string.Format("NB_NetViewRmLnkStr", host)); pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_RemoveLink_Click; } } diff --git a/EduNetworkBuilder/NetworkCardEditor.cs b/EduNetworkBuilder/NetworkCardEditor.cs index bc7b5ca..d75c44b 100644 --- a/EduNetworkBuilder/NetworkCardEditor.cs +++ b/EduNetworkBuilder/NetworkCardEditor.cs @@ -47,7 +47,7 @@ namespace EduNetworkBuilder lblVPNEnd = new Label(); lblVPNEnd.Location = new Point(10, btnVPNEnd.Location.Y); - lblVPNEnd.Text = "VPN Endpoint:"; + lblVPNEnd.Text = NB.Translate("NCE_NCEVPNEnd"); Controls.Add(btnVPNEnd); Controls.Add(lblVPNEnd); this.Height = lblVPNEnd.Location.Y + lblVPNEnd.Height + 80; @@ -59,7 +59,7 @@ namespace EduNetworkBuilder lblVPNEncrypt = new Label(); lblVPNEncrypt.Location = new Point(10, tbVPNEncrypt.Location.Y); - lblVPNEncrypt.Text = "Encryption Key:"; + lblVPNEncrypt.Text = NB.Translate("NCE_NCEEncrypt"); Controls.Add(tbVPNEncrypt); Controls.Add(lblVPNEncrypt); this.Height = tbVPNEncrypt.Location.Y + tbVPNEncrypt.Height + 80; @@ -88,7 +88,7 @@ namespace EduNetworkBuilder lblVPNEncrypt = new Label(); lblVPNEncrypt.Location = new Point(10, tbVPNEncrypt.Location.Y); - lblVPNEncrypt.Text = "Wireless Key:"; + lblVPNEncrypt.Text = NB.Translate("NCE_NCEWireless"); Controls.Add(tbVPNEncrypt); Controls.Add(lblVPNEncrypt); this.Height = tbVPNEncrypt.Location.Y + tbVPNEncrypt.Height + 80; @@ -163,9 +163,9 @@ namespace EduNetworkBuilder else lblLinkStatus.Visible = true; if (MyNicToEdit.isConnected(true)) - lblLinkStatus.Text = "Connected"; + lblLinkStatus.Text = NB.Translate("NCE_UdfrmCon"); else - lblLinkStatus.Text = "Disconnected"; + lblLinkStatus.Text = NB.Translate("NCE_UdfrmDiscon"); } private void btnDone_Click(object sender, EventArgs e) diff --git a/EduNetworkBuilder/NetworkComponent.cs b/EduNetworkBuilder/NetworkComponent.cs index 02b43a7..a7db48b 100644 --- a/EduNetworkBuilder/NetworkComponent.cs +++ b/EduNetworkBuilder/NetworkComponent.cs @@ -85,7 +85,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 2503d3e..1cd1f34 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -292,7 +292,7 @@ namespace EduNetworkBuilder public void EditGateway() { - DefaultGW.Edit(this,"Default Gateway"); + DefaultGW.Edit(this,NB.Translate("ND_EdtGteway")); } public IPAddress GetGateway() @@ -704,7 +704,7 @@ namespace EduNetworkBuilder } else { - MessageBox.Show(string.Format("The network card, {0} is locked as part of the puzzle.", NICs[index].NicName()), "Locked NIC"); + MessageBox.Show(string.Format(NB.Translate("ND_DelNicNicLockStr"), NICs[index].NicName()), NB.Translate("ND_DelNicNicLock")); } } public bool AutoJoinWireless() @@ -1127,7 +1127,7 @@ namespace EduNetworkBuilder { nic.SetIPForDHCP(); //clear the source IP } - Packet DHCPPacket = new Packet(this, "", NB.BroadcastMACString, "DHCP Request", PacketType.dhcp_request); + Packet DHCPPacket = new Packet(this, "", NB.BroadcastMACString, NB.Translate("NB_NetViewDHCP"), PacketType.dhcp_request); DHCPPacket.destIP = new IPAddress(NB.BroadcastIPString); Network myNet = NB.GetNetwork(); myNet.addPacket(DHCPPacket); @@ -1137,7 +1137,7 @@ namespace EduNetworkBuilder public void PingFromHere(IPAddress Destination) { //We need to create a packet - Packet PingPacket = new Packet(this,Destination,"Ping",PacketType.ping_request); + Packet PingPacket = new Packet(this,Destination, NB.Translate("H_Ping_Title"), PacketType.ping_request); Network myNet = NB.GetNetwork(); myNet.addPacket(PingPacket); } @@ -1145,7 +1145,7 @@ namespace EduNetworkBuilder public void AskArpFromHere(IPAddress Destination, PacketMessage Tracker=null) { //We need to create a packet - Packet ArpPacket = new Packet(this, Destination, "Arp Request", PacketType.arp_request); + Packet ArpPacket = new Packet(this, Destination, NB.Translate("NB_NetViewArp2"), PacketType.arp_request); if (Tracker != null) ArpPacket.ReplaceMessage(Tracker); Network myNet = NB.GetNetwork(); @@ -1163,7 +1163,7 @@ namespace EduNetworkBuilder PacketType TunType = PacketType.tun_packet; if (Encryption != "") TunType = PacketType.vpn_packet; - Packet TunnelPacket = new Packet(this, Destination, "Tunnel", TunType); + Packet TunnelPacket = new Packet(this, Destination, NB.Translate("ND_TunlPckTunl"), TunType); TunnelPacket.payloadPacket = Payload; TunnelPacket.EncryptionString = Encryption; if(Payload != null) diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index 0bd3eff..a5bf184 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -566,11 +566,11 @@ Text used in the program on buttons and the like - + Help: Text from the help document that we jump to - + Help Text used in the program on buttons and the like @@ -1301,10 +1301,62 @@ The packet timed out and was dropped. N_ProssShouldContinTimeout = The packet timed out and was dropped. + + Select the network card or interface for that network card that you wish to edit. Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another. + DC_DeviceConfigEdit = Select the network card or interface for that network card that you wish to edit. Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another. + + + The name '{0}' is being used as part of this puzzle and this machine cannot be named that. + DC_HostValidate = The name '{0}' is being used as part of this puzzle and this machine cannot be named that. + + + Gateway: {0} + DC_UdFrmGteway = Gateway: {0} + + + IP:{0} Mask:{1} GW:{2} + IPA_IPFormatStr = IP:{0} Mask:{1} GW:{2} + Skipping Invalid Puzzle: '{0}' NB_LoadPuzInfo = Skipping Invalid Puzzle: '{0}' + + Arp {0} + NB_NetViewArpStr = Arp {0} + + + Ping {0} + NB_NetViewPingStr = Ping {0} + + + Remove Link To {0} + NB_NetViewRmLnk = Remove Link To {0} + + + Encryption Key: + NCE_NCEEncrypt = Encryption Key: + + + VPN Endpoint: + NCE_NCEVPNEnd = VPN Endpoint: + + + Wireless Key: + NCE_NCEWireless = Wireless Key: + + + Connected + NCE_UdfrmCon = Connected + + + Disconnected + NCE_UdfrmDiscon = Disconnected + + + Endpoint + NCE_VPNEnd = Endpoint + The type must be serializable. NC_CloneSerialzable = The type must be serializable. @@ -1321,6 +1373,22 @@ source NC_source = source + + Locked NIC + ND_DelNicNicLock = Locked NIC + + + The network card, {0} is locked as part of the puzzle. + ND_DelNicNicLockStr = The network card, {0} is locked as part of the puzzle. + + + Default Gateway + ND_EdtGteway = Default Gateway + + + Tunnel + ND_TunlPckTunl = Tunnel + Total seconds = {0} Stopping. N_ProssShouldContinSec = Total seconds = {0} Stopping.