timy/EduNetworkBuilder
timy
/
EduNetworkBuilder
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://tyounglightsys.visualstudio.com/DefaultCollection/_git/EduNetworkBuilder

This commit is contained in:
Tim Young 2015-11-16 15:23:17 -05:00
parent a2f11b32a5 22fd27737f
commit c0dbef7c0d
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
EduNetworkBuilder/IPAddressEntry.cs
View File

@ -153,9 +153,9 @@ namespace EduNetworkBuilder
public bool Edit(NetworkDevice ToEdit, IPAddress DHCPif) public bool Edit(NetworkDevice ToEdit, IPAddress DHCPif)
{ {
DHCPInterface = DHCPif; DHCPInterface = DHCPif;
lblIP.Text = "Interface"; lblIP.Text = NB.Translate("IPAE_EditIf");
lblNetmask.Text = "Start"; lblNetmask.Text = "IPAE_EditStart";
lblGateway.Text = "End"; lblGateway.Text = "IPAE_EditEnd";
tbIPAddress.Enabled = false; tbIPAddress.Enabled = false;
tbGateway.Enabled = true; tbGateway.Enabled = true;
tbNetmask.Enabled = true; tbNetmask.Enabled = true;
@ -195,12 +195,12 @@ namespace EduNetworkBuilder
if (!DHCPInterface.IsLocal(new IPAddress(tbGateway.Text))) if (!DHCPInterface.IsLocal(new IPAddress(tbGateway.Text)))
{ {
e.Cancel = true; e.Cancel = true;
MessageBox.Show("The end IP in the range must be within the scope of the interface."); MessageBox.Show(NB.Translate("IPAE_tbGateValEndIPRange"));
} }
if (taddress < startaddress) if (taddress < startaddress)
{ {
e.Cancel = true; e.Cancel = true;
MessageBox.Show("The end IP must be equal to or larger than the start IP."); MessageBox.Show("IPAE_tbGateValIPEqualLarger");
} }
} }
} }
@ -215,7 +215,7 @@ namespace EduNetworkBuilder
if (!DHCPInterface.IsLocal(new IPAddress(tbNetmask.Text))) if (!DHCPInterface.IsLocal(new IPAddress(tbNetmask.Text)))
{ {
e.Cancel = true; e.Cancel = true;
MessageBox.Show("The start IP in the range must be within the scope of the interface."); MessageBox.Show("IPAE_tbNtmskValEndIPRange");
} }
} }
} }

2
EduNetworkBuilder/ListBoxWindow.cs
View File

@ -36,7 +36,7 @@ namespace EduNetworkBuilder
CheckBox newCB; CheckBox newCB;
btnAdd.Visible = false; btnAdd.Visible = false;
int count = 0; int count = 0;
lblInstructions.Text = "Filter the puzzles by checking one the boxes."; lblInstructions.Text = NB.Translate("LBW_LBWFilter");
panelCheckboxes.SuspendLayout(); panelCheckboxes.SuspendLayout();
string SelectedTag = GetSelectedTag(); string SelectedTag = GetSelectedTag();
if (SelectedTag == "ALL") if (SelectedTag == "ALL")

28
EduNetworkBuilder/Resources/languages/edustrings.resx
View File

@ -869,4 +869,32 @@
<value>Packet going into tunnel.</value> <value>Packet going into tunnel.</value>
<comment>Network Device TunnelPacketFromHere Message = Packet going into tunnel.</comment> <comment>Network Device TunnelPacketFromHere Message = Packet going into tunnel.</comment>
</data> </data>
<data name="IPAE_EditEnd" xml:space="preserve">
<value>End</value>
<comment>IPAE_EditIf = End</comment>
</data>
<data name="IPAE_EditIf" xml:space="preserve">
<value>Interface</value>
<comment>IPAE_EditIf = Interface</comment>
</data>
<data name="IPAE_EditStart" xml:space="preserve">
<value>Start</value>
<comment>IPAE_EditStart = Start</comment>
</data>
<data name="IPAE_tbGateValEndIPRange" xml:space="preserve">
<value>The end IP in the range must be within the scope of the interface.</value>
<comment>IPAE_tbGateValEndIPRange = The end IP in the range must be within the scope of the interface.</comment>
</data>
<data name="IPAE_tbGateValIPEqualLarger" xml:space="preserve">
<value>The end IP must be equal to or larger than the start IP.</value>
<comment>IPAE_tbGateValIPEqualLarger = The end IP must be equal to or larger than the start IP.</comment>
</data>
<data name="IPAE_tbNtmskValEndIPRange" xml:space="preserve">
<value>The start IP in the range must be within the scope of the interface.</value>
<comment>IPAE_tbNtmskValEndIPRange = The start IP in the range must be within the scope of the interface.</comment>
</data>
<data name="LBW_LBWFilter" xml:space="preserve">
<value>Filter the puzzles by checking one the boxes.</value>
<comment>LBW_LBWFilter = Filter the puzzles by checking one the boxes.</comment>
</data>
</root> </root>