diff --git a/EduNetworkBuilder/DeviceConfig.cs b/EduNetworkBuilder/DeviceConfig.cs
index 566f720..db340f5 100644
--- a/EduNetworkBuilder/DeviceConfig.cs
+++ b/EduNetworkBuilder/DeviceConfig.cs
@@ -45,18 +45,18 @@ namespace EduNetworkBuilder
         {
             Text = NB.Translate("DC_lblHostname");
             Text = NB.Translate("DC_lblHelp");
-            Text = NB.Translate("DC_btnCancel");
-            Text = NB.Translate("DC_btnOK");
-            Text = NB.Translate("DC_btnNicPlus");
-            Text = NB.Translate("DC_btnNicMinus");
-            Text = NB.Translate("DC_btnNicEdit");
-            Text = NB.Translate("DC_btnIfEdit");
-            Text = NB.Translate("DC_btnIfMinus");
-            Text = NB.Translate("DC_btnIfAdd");
+            Text = NB.Translate("_Cancel");
+            Text = NB.Translate("_OK");
+            Text = NB.Translate("DC_btnAdd");
+            Text = NB.Translate("DC_btnMinus");
+            Text = NB.Translate("_Edit");
+            Text = NB.Translate("_Edit");
+            Text = NB.Translate("DC_btnMinus");
+            Text = NB.Translate("DC_btnAdd");
             Text = NB.Translate("DC_btnGateway");
             Text = NB.Translate("DC_btnRoutes");
             Text = NB.Translate("DC_cbDHCP");
-            Text = NB.Translate("DC_btnDHCP");
+            Text = NB.Translate("_DHCP");
             Text = NB.Translate("DC_Form");
         }
 
@@ -270,7 +270,7 @@ namespace EduNetworkBuilder
 
                     Button btnAccept = new Button();
                     btnAccept.Location = new Point(cbQuestions.Location.X, cbQuestions.Location.Y + cbQuestions.Height + 10);
-                    btnAccept.Text = NB.Translate("DC_UpdateForm+");
+                    btnAccept.Text = NB.Translate("_Add");
                     btnAccept.Click += (s, g) => { Button b = (Button)s; Form f = (Form)b.Parent; f.Close(); };
 
                     QuestionForm.Controls.Add(lblText);
diff --git a/EduNetworkBuilder/IPAddressEntry.cs b/EduNetworkBuilder/IPAddressEntry.cs
index 0f16ab2..4ee9ae1 100644
--- a/EduNetworkBuilder/IPAddressEntry.cs
+++ b/EduNetworkBuilder/IPAddressEntry.cs
@@ -123,8 +123,8 @@ namespace EduNetworkBuilder
             Text = NB.Translate("IPAE_lblIP");
             Text = NB.Translate("IPAE_lblNetmask");
             Text = NB.Translate("IPAE_lblGateway");
-            Text = NB.Translate("IPAE_btnCancel");
-            Text = NB.Translate("IPAE_btnOK");
+            Text = NB.Translate("_Cancel");
+            Text = NB.Translate("_OK");
             Text = NB.Translate("IPAE_Form");
         }
  
diff --git a/EduNetworkBuilder/LinkEditor.cs b/EduNetworkBuilder/LinkEditor.cs
index 3b0bf76..b101f2a 100644
--- a/EduNetworkBuilder/LinkEditor.cs
+++ b/EduNetworkBuilder/LinkEditor.cs
@@ -59,7 +59,7 @@ namespace EduNetworkBuilder
         private void LanguagifyComponents()
         {
             Text = NB.Translate("LE_btnLink");
-            Text = NB.Translate("LE_btnCancel");
+            Text = NB.Translate("_Cancel");
             Text = NB.Translate("LE_Form");
         }
 
diff --git a/EduNetworkBuilder/ListBoxWindow.cs b/EduNetworkBuilder/ListBoxWindow.cs
index d090757..f594ac8 100644
--- a/EduNetworkBuilder/ListBoxWindow.cs
+++ b/EduNetworkBuilder/ListBoxWindow.cs
@@ -39,8 +39,8 @@ namespace EduNetworkBuilder
             lblInstructions.Text = NB.Translate("LBW_LBWFilter");
             panelCheckboxes.SuspendLayout();
             string SelectedTag = GetSelectedTag();
-            if (SelectedTag == NB.Translate("LBW_LBWALL"))
-                Text = Text + NB.Translate("LBW_LBWAllS");
+            if (SelectedTag == NB.Translate("_All"))
+                Text = Text + NB.Translate("_AllS");
             foreach (string str in NB.GetPuzzleTags())
             {
                 newCB = AddCheckBox(count, str);
@@ -55,8 +55,8 @@ namespace EduNetworkBuilder
                 count++;
             }
             panelCheckboxes.ResumeLayout();
-            btnOK.Text = NB.Translate("LBW_LBWLoad");
-            btnAdd.Text = NB.Translate("LBW_LBWCancel");
+            btnOK.Text = NB.Translate("_Load");
+            btnAdd.Text = NB.Translate("_Cancel");
             btnAdd.Visible = true;
             cbLoadPuzzlesAtStart.Checked = Properties.Settings.Default.AutoStartPuzzles;            
             UpdateForm();
@@ -115,7 +115,7 @@ namespace EduNetworkBuilder
 
         private void LanguagifyComponents()
         {
-            Text = NB.Translate("LBW_btnOK");
+            Text = NB.Translate("_OK");
             Text = NB.Translate("LBW_lblInstructions");
             Text = NB.Translate("LBW_btnAdd");
             Text = NB.Translate("LBW_cbLoadPuzzlesAtStart");
@@ -159,7 +159,7 @@ namespace EduNetworkBuilder
                     return "Level_" + PI.Level;
                 }
             }
-            return NB.Translate("LBW_LBWALL");
+            return NB.Translate("_All");
         }
 
         private void UpdateForm()
@@ -401,9 +401,9 @@ namespace EduNetworkBuilder
                     lbWindowData.ContextMenuStrip = new ContextMenuStrip();
                 }
                 lbWindowData.ContextMenuStrip.Items.Clear();
-                lbWindowData.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWEdit"));
+                lbWindowData.ContextMenuStrip.Items.Add(NB.Translate("_Edit"));
                 lbWindowData.ContextMenuStrip.Items[index++].Click += lbWindowData_Edit_Click;
-                lbWindowData.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWDelete"));
+                lbWindowData.ContextMenuStrip.Items.Add(NB.Translate("_Delete"));
                 lbWindowData.ContextMenuStrip.Items[index++].Click += lbWindowData_Delete_Click;
             }
         }
diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs
index 818cc4a..9918c95 100644
--- a/EduNetworkBuilder/NB.cs
+++ b/EduNetworkBuilder/NB.cs
@@ -400,7 +400,7 @@ namespace EduNetworkBuilder
 
             Button btnAccept = new Button();
             btnAccept.Location = new Point(cbQuestions.Location.X, cbQuestions.Location.Y + cbQuestions.Height + 10);
-            btnAccept.Text = NB.Translate("NB_ChangeLangOK");
+            btnAccept.Text = NB.Translate("_OK");
             btnAccept.Click += (s, g) => { Button b = (Button)s; Form f = (Form)b.Parent; f.Close(); };
 
             LanguageForm.Controls.Add(lblText);
diff --git a/EduNetworkBuilder/NetTestEditor.cs b/EduNetworkBuilder/NetTestEditor.cs
index b966881..98021ca 100644
--- a/EduNetworkBuilder/NetTestEditor.cs
+++ b/EduNetworkBuilder/NetTestEditor.cs
@@ -42,8 +42,8 @@ namespace EduNetworkBuilder
             Text = NB.Translate("NTE_lblSource");
             Text = NB.Translate("NTE_lblTest");
             Text = NB.Translate("NTE_lblDest");
-            Text = NB.Translate("NTE_btnOK");
-            Text = NB.Translate("NTE_btnCancel");
+            Text = NB.Translate("_Done");
+            Text = NB.Translate("_Cancel");
             Text = NB.Translate("NTE_Form");
         }
 
@@ -118,11 +118,11 @@ namespace EduNetworkBuilder
                 {
                     cbSource.Items.Add(ContextHelp);
                 }
-                cbDest.Items.Add(NB.Translate("NTE_Read"));
+                cbDest.Items.Add(NB.Translate("_Read"));
             }
             else if (ToEdit.TheTest == NetTestType.LockAll || ToEdit.TheTest == NetTestType.LockGateway)
             {
-                cbDest.Items.Add(NB.Translate("NTE_All"));
+                cbDest.Items.Add(NB.Translate("_All"));
             }
             else if (ToEdit.TheTest == NetTestType.LockDHCP)
             {
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 5160b1a..65cbe7f 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -674,7 +674,7 @@ namespace EduNetworkBuilder
                     Properties.Settings.Default.Save();
                 }
             }
-            DialogResult answer = MessageBox.Show(NB.Translate("N_MarkAsSolvedDone"),NB.Translate("N_MarkAsSolvedSolved"),MessageBoxButtons.YesNo);
+            DialogResult answer = MessageBox.Show(NB.Translate("N_MarkAsSolvedDone"),NB.Translate("_Solved"),MessageBoxButtons.YesNo);
             if(answer == DialogResult.Yes)
             {
                 ListBoxWindow LBW = new ListBoxWindow();
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index ea1bef7..d503379 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -78,41 +78,41 @@ namespace EduNetworkBuilder
         {
             msMainMenuStrip.Text = NB.Translate("NB_msMainMenuStrip");
             fileToolStripMenuItem.Text = NB.Translate("NB_fileToolStripMenuItem");
-            newToolStripMenuItem.Text = NB.Translate("NB_newToolStripMenuItem");
-            loadToolStripMenuItem.Text = NB.Translate("NB_loadToolStripMenuItem");
+            newToolStripMenuItem.Text = NB.Translate("LBW_btnAdd");
+            loadToolStripMenuItem.Text = NB.Translate("_Load");
             reloadToolStripMenuItem.Text = NB.Translate("NB_reloadToolStripMenuItem");
             saveToolStripMenuItem.Text = NB.Translate("NB_saveToolStripMenuItem");
             exitToolStripMenuItem.Text = NB.Translate("NB_exitToolStripMenuItem");
-            editToolStripMenuItem.Text = NB.Translate("NB_editToolStripMenuItem");
+            editToolStripMenuItem.Text = NB.Translate("_Edit");
             cutToolStripMenuItem.Text = NB.Translate("NB_cutToolStripMenuItem");
             copyToolStripMenuItem.Text = NB.Translate("NB_copyToolStripMenuItem");
             pasteToolStripMenuItem.Text = NB.Translate("NB_pasteToolStripMenuItem");
             undoToolStripMenuItem.Text = NB.Translate("NB_undoToolStripMenuItem");
             optionsToolStripMenuItem.Text = NB.Translate("NB_optionsToolStripMenuItem");
-            allToolStripMenuItem.Text = NB.Translate("NB_allToolStripMenuItem");
-            dHCPRequestToolStripMenuItem.Text = NB.Translate("NB_dHCPRequestToolStripMenuItem");
-            clearArpTableToolStripMenuItem.Text = NB.Translate("NB_clearArpTableToolStripMenuItem");
+            allToolStripMenuItem.Text = NB.Translate("_All");
+            dHCPRequestToolStripMenuItem.Text = NB.Translate("NB_NetViewDHCP");
+            clearArpTableToolStripMenuItem.Text = NB.Translate("NB_NetViewClr");
             clearIPsToolStripMenuItem.Text = NB.Translate("NB_clearIPsToolStripMenuItem");
-            pingToolStripMenuItem.Text = NB.Translate("NB_pingToolStripMenuItem");
-            helpToolStripMenuItem.Text = NB.Translate("NB_helpToolStripMenuItem");
-            helpToolStripMenuItem1.Text = NB.Translate("NB_helpToolStripMenuItem1");
+            pingToolStripMenuItem.Text = NB.Translate("_Ping");
+            helpToolStripMenuItem.Text = NB.Translate("_Help");
+            helpToolStripMenuItem1.Text = NB.Translate("_Help");
             aboutToolStripMenuItem.Text = NB.Translate("NB_aboutToolStripMenuItem");
             releaseNotesToolStripMenuItem.Text = NB.Translate("NB_releaseNotesToolStripMenuItem");
             checkForUpdatesToolStripMenuItem.Text = NB.Translate("NB_checkForUpdatesToolStripMenuItem");
             samplesToolStripMenuItem.Text = NB.Translate("NB_samplesToolStripMenuItem");
             puzzlesToolStripMenuItem.Text = NB.Translate("NB_puzzlesToolStripMenuItem");
-            solvedToolStripMenuItem.Text = NB.Translate("NB_solvedToolStripMenuItem");
-            dHCPToolStripMenuItem.Text = NB.Translate("NB_dHCPToolStripMenuItem");
-            oneNetworkToolStripMenuItem.Text = NB.Translate("NB_oneNetworkToolStripMenuItem");
-            twoNetworksToolStripMenuItem.Text = NB.Translate("NB_twoNetworksToolStripMenuItem");
-            threeNetworksToolStripMenuItem.Text = NB.Translate("NB_threeNetworksToolStripMenuItem");
-            firewallsToolStripMenuItem.Text = NB.Translate("NB_firewallsToolStripMenuItem");
+            solvedToolStripMenuItem.Text = NB.Translate("_Solved");
+            dHCPToolStripMenuItem.Text = NB.Translate("_DHCP");
+            oneNetworkToolStripMenuItem.Text = NB.Translate("NB_OneNetwork");
+            twoNetworksToolStripMenuItem.Text = NB.Translate("NB_TwoNetworks");
+            threeNetworksToolStripMenuItem.Text = NB.Translate("NB_ThreeNetworks");
+            firewallsToolStripMenuItem.Text = NB.Translate("NB_Firewalls");
             toSolveToolStripMenuItem.Text = NB.Translate("NB_toSolveToolStripMenuItem");
-            solvedDHCPToolStripMenuItem.Text = NB.Translate("NB_solvedDHCPToolStripMenuItem");
-            solvedOneNetworkToolStripMenuItem.Text = NB.Translate("NB_solvedOneNetworkToolStripMenuItem");
-            solvedTwoNetworksToolStripMenuItem.Text = NB.Translate("NB_solvedTwoNetworksToolStripMenuItem");
-            SolvedThreeNetworksToolStripMenuItem.Text = NB.Translate("NB_SolvedThreeNetworksToolStripMenuItem");
-            firewallsToolStripMenuItem1.Text = NB.Translate("NB_firewallsToolStripMenuItem1");
+            solvedDHCPToolStripMenuItem.Text = NB.Translate("_DHCP");
+            solvedOneNetworkToolStripMenuItem.Text = NB.Translate("NB_OneNetwork");
+            solvedTwoNetworksToolStripMenuItem.Text = NB.Translate("NB_TwoNetworks");
+            SolvedThreeNetworksToolStripMenuItem.Text = NB.Translate("NB_ThreeNetworks");
+            firewallsToolStripMenuItem1.Text = NB.Translate("NB_Firewalls");
             lblStatus.Text = NB.Translate("NB_lblStatus");
             btnHelp.Text = NB.Translate("NB_btnHelp");
             changeLanguageToolStripMenuItem.Text = NB.Translate("NB_changeLanguageToolStripMenuItem");
@@ -233,7 +233,7 @@ namespace EduNetworkBuilder
             HelpTopics HT = NB.TryParseEnum<HelpTopics>(me.Name, HelpTopics.None);
             if(HT != HelpTopics.None)
             {
-                myNetwork.NoteActionDone(NetTestType.ReadContextHelp, me.Name, NB.Translate("NTE_Read"));
+                myNetwork.NoteActionDone(NetTestType.ReadContextHelp, me.Name, NB.Translate("_Read"));
                 NB.ReadContextHelp(HT);
             }
             UpdateHelpTopicButtons();
@@ -544,20 +544,20 @@ namespace EduNetworkBuilder
             {
                 foreach (string tStr in myNetwork.GetIncompleteTestDestinations(ReleasedOn.hostname, true))
                 {
-                    pbNetworkView.ContextMenuStrip.Items.Add(string.Format(NB.Translate("NB_NetViewPingStr"),tStr));
+                    pbNetworkView.ContextMenuStrip.Items.Add(string.Format(NB.Translate("_PingStr"),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(NB.Translate("NB_NetViewArpStr"), tStr));
+                    pbNetworkView.ContextMenuStrip.Items.Add(string.Format(NB.Translate("H_ARP_TitleStr"), tStr));
                     pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Arp_Name_Click;
                 }
             }
             if (ReleasedOn != null && ReleasedOn.IsNotNetDevice())
             {
-                pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_NetViewPing1"));
+                pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("_Ping1"));
                 pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Ping_Click;
-                pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_NetViewArp"));
+                pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("H_ARP_Title"));
                 pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Arp_Click;
                 pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_NetViewClr"));
                 pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_ArpClear_Click;
@@ -566,13 +566,13 @@ namespace EduNetworkBuilder
             {
                 if (!myNetwork.ItemIsCritical(ReleasedOn.hostname))
                 {
-                    pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWDelete"));
+                    pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("_Delete"));
                     pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Delete_Click;
                 }
             }
             if (ReleasedOn != null && ReleasedOn.IsNotNetDevice())
             {
-                pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWEdit"));
+                pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("_Edit"));
                 pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Edit_Click;
             }
             
@@ -682,7 +682,7 @@ namespace EduNetworkBuilder
             if (ItemClickedOn == null) return; //we do not have something chosen to ping from
             ToolStripMenuItem Pressed = (ToolStripMenuItem)sender;
             string itemname = Pressed.Text;
-            string dest = Regex.Replace(itemname, NB.Translate("NB_NetViewPing "), "");
+            string dest = Regex.Replace(itemname, NB.Translate("_Ping "), "");
             IPAddress destination;
             destination = myNetwork.DNSLookup(ItemClickedOn, dest);
             if(destination == null || destination.GetIPString == NB.ZeroIPString)
@@ -696,7 +696,7 @@ namespace EduNetworkBuilder
             if (ItemClickedOn == null) return; //we do not have something chosen to ping from
             ToolStripMenuItem Pressed = (ToolStripMenuItem)sender;
             string itemname = Pressed.Text;
-            string dest = Regex.Replace(itemname, NB.Translate("NB_NetViewArp "), "");
+            string dest = Regex.Replace(itemname, NB.Translate("H_ARP_Title "), "");
             IPAddress destination;
             destination = myNetwork.DNSLookup(ItemClickedOn, dest);
             if (destination == null || destination.GetIPString == NB.ZeroIPString)
@@ -711,7 +711,7 @@ namespace EduNetworkBuilder
             bool todo = true;
             if (ItemClickedOn == null) return; //we do not have something chosen to arp request from
             IPAddress destination = new IPAddress(NB.ZeroIPString, "255.255.255.255", IPAddressType.ip_only);
-            todo = destination.Edit(ItemClickedOn, NB.Translate("NB_NetViewArp2"));
+            todo = destination.Edit(ItemClickedOn, NB.Translate("H_ARP_Title2"));
             if (todo)
             {
                 ItemClickedOn.AskArpFromHere(destination);
@@ -901,7 +901,7 @@ namespace EduNetworkBuilder
             if (result == System.Windows.Forms.DialogResult.Cancel) return;
             if(!Regex.IsMatch(mydialog.FileName,@"^.*.enbx$"))
             {
-                MessageBox.Show(NB.Translate("NB_LoadToolStripMenuItemErr"));
+                MessageBox.Show(NB.Translate("_LoadErr"));
                 return;
             }
             LastPath = mydialog.FileName;
@@ -950,7 +950,7 @@ namespace EduNetworkBuilder
                 if (result == System.Windows.Forms.DialogResult.Cancel)
                 {
                     NB.PlaySound(NBSoundType.saved_failed);
-                    lblStatus.Text = NB.Translate("_Save_Canceled");
+                    lblStatus.Text = NB.Translate("_Canceled");
                     return;
                 }
                 LastPath = mydialog.FileName;
diff --git a/EduNetworkBuilder/NetworkCard.cs b/EduNetworkBuilder/NetworkCard.cs
index c2ef6a3..90a24f0 100644
--- a/EduNetworkBuilder/NetworkCard.cs
+++ b/EduNetworkBuilder/NetworkCard.cs
@@ -702,7 +702,7 @@ namespace EduNetworkBuilder
         {
             if (!typeof(T).IsSerializable)
             {
-                throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("NC_source"));
+                throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("_source"));
             }
 
             // Don't serialize a null object, simply return the default for that object
diff --git a/EduNetworkBuilder/NetworkCardEditor.cs b/EduNetworkBuilder/NetworkCardEditor.cs
index 829061d..e9fcf72 100644
--- a/EduNetworkBuilder/NetworkCardEditor.cs
+++ b/EduNetworkBuilder/NetworkCardEditor.cs
@@ -133,7 +133,7 @@ namespace EduNetworkBuilder
             Text = NB.Translate("NCE_label1");
             Text = NB.Translate("NCE_label2");
             Text = NB.Translate("NCE_label3");
-            Text = NB.Translate("NCE_btnDone");
+            Text = NB.Translate("_Done");
             Text = NB.Translate("NCE_lblLinkStatus");
             Text = NB.Translate("NCE_Form");
         }
@@ -191,7 +191,7 @@ namespace EduNetworkBuilder
             {
                 MyNicToEdit.TunnelEndpoint = new IPAddress(NB.ZeroIPString, "255.255.255.0", IPAddressType.ip_only);
             }
-            MyNicToEdit.TunnelEndpoint.Edit(nd, NB.Translate("NCE_VPNEnd"));
+            MyNicToEdit.TunnelEndpoint.Edit(nd, NB.Translate("_Endpt"));
             UpdateForm();
         }
     }
diff --git a/EduNetworkBuilder/NetworkComponent.cs b/EduNetworkBuilder/NetworkComponent.cs
index a7db48b..0caf337 100644
--- a/EduNetworkBuilder/NetworkComponent.cs
+++ b/EduNetworkBuilder/NetworkComponent.cs
@@ -85,7 +85,7 @@ namespace EduNetworkBuilder
         {
             if (!typeof(T).IsSerializable)
             {
-                throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("NC_source"));
+                throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("_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 281a33d..29eeed9 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -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, NB.Translate("NB_NetViewArp2"), PacketType.arp_request);
+            Packet ArpPacket = new Packet(this, Destination, NB.Translate("H_ARP_Title2"), PacketType.arp_request);
             if (Tracker != null)
                 ArpPacket.ReplaceMessage(Tracker);
             Network myNet = NB.GetNetwork();
@@ -1486,8 +1486,8 @@ namespace EduNetworkBuilder
                     {
                         if(nPacket.destMAC != nc.MAC)
                         {
-                            nPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_IPError1");
-                            nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProcessArrival_IPError2"));
+                            nPacket.Tracking.Status = NB.Translate("ND_ProssArr_Error1");
+                            nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProssArr_Error"));
                             nPacket.MyStatus = PacketStatus.finished_failed;
                             myNet.addPacket(nPacket);  //so it gets pulled out apropriately
                             tPacket.payloadPacket = null;
@@ -1518,8 +1518,8 @@ namespace EduNetworkBuilder
                     else
                     {
                         //There is no nic that matches the incoming IP
-                        nPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_VPNNicErr1");
-                        nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProcessArrival_VPNNicErr2"));
+                        nPacket.Tracking.Status = NB.Translate("ND_ProssArr_Error1");
+                        nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProssArr_Error"));
                         nPacket.MyStatus = PacketStatus.finished_failed;
                         myNet.addPacket(nPacket);  //so it gets pulled out apropriately
                         return;
@@ -1579,8 +1579,8 @@ namespace EduNetworkBuilder
                 }
                 else
                 {
-                    tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProssArrNotSameNet"));
-                    tPacket.Tracking.Status = hostname + ":\t" + string.Format(NB.Translate("ND_ProssArrNotSameNet")) + tPacket.sourceIP.GetIP.ToIpString() + " -> " + hostname;
+                    tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProssArr_PingErr"));
+                    tPacket.Tracking.Status = hostname + ":\t" + string.Format(NB.Translate("ND_ProssArr_PingErr")) + tPacket.sourceIP.GetIP.ToIpString() + " -> " + hostname;
                     tPacket.MyStatus = PacketStatus.finished_ok;
                 }
                 return;
diff --git a/EduNetworkBuilder/OptionsWindow.cs b/EduNetworkBuilder/OptionsWindow.cs
index bf8c5f9..b125349 100644
--- a/EduNetworkBuilder/OptionsWindow.cs
+++ b/EduNetworkBuilder/OptionsWindow.cs
@@ -51,7 +51,7 @@ namespace EduNetworkBuilder
 
         private void LanguagifyComponents()
         {
-            Text = NB.Translate("OW_btnDone");
+            Text = NB.Translate("_Done");
             Text = NB.Translate("OW_lblNetTitle");
             Text = NB.Translate("OW_cbDisplayTitles");
             Text = NB.Translate("OW_lblNetSize");
@@ -180,11 +180,11 @@ namespace EduNetworkBuilder
                     lbTests.ContextMenuStrip = new ContextMenuStrip();
                 }
                 lbTests.ContextMenuStrip.Items.Clear();
-                lbTests.ContextMenuStrip.Items.Add(NB.Translate("DC_UpdateForm+"));
+                lbTests.ContextMenuStrip.Items.Add(NB.Translate("_Add"));
                 lbTests.ContextMenuStrip.Items[index++].Click += lbTests_Add_Click;
-                lbTests.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWEdit"));
+                lbTests.ContextMenuStrip.Items.Add(NB.Translate("_Edit"));
                 lbTests.ContextMenuStrip.Items[index++].Click += lbTests_Edit_Click;
-                lbTests.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWDelete"));
+                lbTests.ContextMenuStrip.Items.Add(NB.Translate("_Delete"));
                 lbTests.ContextMenuStrip.Items[index++].Click += lbTests_Delete_Click;
             }
         }
@@ -201,11 +201,11 @@ namespace EduNetworkBuilder
                     lbTests.ContextMenuStrip = new ContextMenuStrip();
                 }
                 lbTests.ContextMenuStrip.Items.Clear();
-                lbTests.ContextMenuStrip.Items.Add(NB.Translate("DC_UpdateForm+"));
+                lbTests.ContextMenuStrip.Items.Add(NB.Translate("_Add"));
                 lbTests.ContextMenuStrip.Items[index++].Click += lbTests_Add_Click;
-                lbTests.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWEdit"));
+                lbTests.ContextMenuStrip.Items.Add(NB.Translate("_Edit"));
                 lbTests.ContextMenuStrip.Items[index++].Click += lbTests_Edit_Click;
-                lbTests.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWDelete"));
+                lbTests.ContextMenuStrip.Items.Add(NB.Translate("_Delete"));
                 lbTests.ContextMenuStrip.Items[index++].Click += lbTests_Delete_Click;
             }
         }
@@ -253,15 +253,15 @@ namespace EduNetworkBuilder
                     lbTags.ContextMenuStrip = new ContextMenuStrip();
                 }
                 lbTags.ContextMenuStrip.Items.Clear();
-                lbTags.ContextMenuStrip.Items.Add(NB.Translate("DC_UpdateForm+"));
+                lbTags.ContextMenuStrip.Items.Add(NB.Translate("_Add"));
                 lbTags.ContextMenuStrip.Items[index++].Click += lbTags_Add_Click;
                 if (lbTags.SelectedIndex != -1)
                 {
-                    lbTags.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWEdit"));
+                    lbTags.ContextMenuStrip.Items.Add(NB.Translate("_Edit"));
                     lbTags.ContextMenuStrip.Items[index++].Click += lbTags_Edit_Click;
-                    lbTags.ContextMenuStrip.Items.Add(NB.Translate("NTE_Read"));
+                    lbTags.ContextMenuStrip.Items.Add(NB.Translate("_Read"));
                     lbTags.ContextMenuStrip.Items[index++].Click += lbTags_Read_Click;
-                    lbTags.ContextMenuStrip.Items.Add(NB.Translate("LBW_LBWDelete"));
+                    lbTags.ContextMenuStrip.Items.Add(NB.Translate("_Delete"));
                     lbTags.ContextMenuStrip.Items[index++].Click += lbTags_Delete_Click;
                 }
             }
@@ -299,7 +299,7 @@ namespace EduNetworkBuilder
             Button Done = new Button();
             Done.Click += btnClose_Click;
             Choice.DoubleClick += btnClose_Click;
-            Done.Text = NB.Translate("OW_btnDone");
+            Done.Text = NB.Translate("_Done");
             Done.Location = new Point(1, Choice.Location.Y + Choice.Height + 5);
             QuestionForm.Controls.Clear();
             QuestionForm.Controls.Add(Choice);
diff --git a/EduNetworkBuilder/PacketMessage.cs b/EduNetworkBuilder/PacketMessage.cs
index c1ff9ab..cf7ce3f 100644
--- a/EduNetworkBuilder/PacketMessage.cs
+++ b/EduNetworkBuilder/PacketMessage.cs
@@ -44,7 +44,7 @@ namespace EduNetworkBuilder
         {
             if (!typeof(T).IsSerializable)
             {
-                throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("NC_source"));
+                throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("_source"));
             }
 
             // Don't serialize a null object, simply return the default for that object
diff --git a/EduNetworkBuilder/RTFWindow.cs b/EduNetworkBuilder/RTFWindow.cs
index 794db67..c20e3e1 100644
--- a/EduNetworkBuilder/RTFWindow.cs
+++ b/EduNetworkBuilder/RTFWindow.cs
@@ -113,7 +113,7 @@ namespace EduNetworkBuilder
         private void LanguagifyComponents()
         {
             rtbContent.Text = NB.Translate("RTFW_rtbContent");
-            btnOK.Text = NB.Translate("RTFW_btnOK");
+            btnOK.Text = NB.Translate("_OK");
             Text = NB.Translate("RTFW_Form");
             lblFind.Text = NB.Translate("RTFW_lblFind");
         }
diff --git a/EduNetworkBuilder/Resources/languages/edustrings.fr.resx b/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
index a4d83f5..c4df3bd 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
@@ -123,10 +123,10 @@
   <data name="NB_fileToolStripMenuItem" xml:space="preserve">
     <value>Fichier</value>
   </data>
-  <data name="NB_newToolStripMenuItem" xml:space="preserve">
+  <data name="LBW_btnAdd" xml:space="preserve">
     <value>Nouveau</value>
   </data>
-  <data name="NB_loadToolStripMenuItem" xml:space="preserve">
+  <data name="_Load" xml:space="preserve">
     <value>Charge</value>
   </data>
   <data name="NB_reloadToolStripMenuItem" xml:space="preserve">
@@ -138,7 +138,7 @@
   <data name="NB_exitToolStripMenuItem" xml:space="preserve">
     <value>Sortie</value>
   </data>
-  <data name="NB_editToolStripMenuItem" xml:space="preserve">
+  <data name="_Edit" xml:space="preserve">
     <value>Éditer</value>
   </data>
   <data name="NB_cutToolStripMenuItem" xml:space="preserve">
@@ -156,25 +156,25 @@
   <data name="NB_optionsToolStripMenuItem" xml:space="preserve">
     <value>Options</value>
   </data>
-  <data name="NB_allToolStripMenuItem" xml:space="preserve">
+  <data name="_All" xml:space="preserve">
     <value>Tous</value>
   </data>
-  <data name="NB_dHCPRequestToolStripMenuItem" xml:space="preserve">
+  <data name="NB_NetViewDHCP" xml:space="preserve">
     <value>Requête DHCP</value>
   </data>
-  <data name="NB_clearArpTableToolStripMenuItem" xml:space="preserve">
+  <data name="NB_NetViewClr" xml:space="preserve">
     <value>Effacer Arp tableau</value>
   </data>
   <data name="NB_clearIPsToolStripMenuItem" xml:space="preserve">
     <value>IPs claires</value>
   </data>
-  <data name="NB_pingToolStripMenuItem" xml:space="preserve">
+  <data name="_Ping" xml:space="preserve">
     <value>Ping</value>
   </data>
-  <data name="NB_helpToolStripMenuItem" xml:space="preserve">
+  <data name="_Help" xml:space="preserve">
     <value>Aidez-Moi</value>
   </data>
-  <data name="NB_helpToolStripMenuItem1" xml:space="preserve">
+  <data name="_Help" xml:space="preserve">
     <value>Aidez-Moi</value>
   </data>
   <data name="NB_aboutToolStripMenuItem" xml:space="preserve">
@@ -192,40 +192,40 @@
   <data name="NB_puzzlesToolStripMenuItem" xml:space="preserve">
     <value>Puzzle</value>
   </data>
-  <data name="NB_solvedToolStripMenuItem" xml:space="preserve">
+  <data name="_Solved" xml:space="preserve">
     <value>Résolu</value>
   </data>
-  <data name="NB_dHCPToolStripMenuItem" xml:space="preserve">
+  <data name="_DHCP" xml:space="preserve">
     <value>DHCP</value>
   </data>
-  <data name="NB_oneNetworkToolStripMenuItem" xml:space="preserve">
+  <data name="NB_OneNetwork" xml:space="preserve">
     <value>One Network</value>
   </data>
-  <data name="NB_twoNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_TwoNetworks" xml:space="preserve">
     <value>Deux réseaux</value>
   </data>
-  <data name="NB_threeNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_ThreeNetworks" xml:space="preserve">
     <value>Trois Réseaux</value>
   </data>
-  <data name="NB_firewallsToolStripMenuItem" xml:space="preserve">
+  <data name="NB_Firewalls" xml:space="preserve">
     <value>Firewalls</value>
   </data>
   <data name="NB_toSolveToolStripMenuItem" xml:space="preserve">
     <value>Résoudre</value>
   </data>
-  <data name="NB_solvedDHCPToolStripMenuItem" xml:space="preserve">
+  <data name="_DHCP" xml:space="preserve">
     <value>DHCP</value>
   </data>
-  <data name="NB_solvedOneNetworkToolStripMenuItem" xml:space="preserve">
+  <data name="NB_OneNetwork" xml:space="preserve">
     <value>One Network</value>
   </data>
-  <data name="NB_solvedTwoNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_TwoNetworks" xml:space="preserve">
     <value>Deux réseaux</value>
   </data>
-  <data name="NB_SolvedThreeNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_ThreeNetworks" xml:space="preserve">
     <value>Trois Réseaux</value>
   </data>
-  <data name="NB_firewallsToolStripMenuItem1" xml:space="preserve">
+  <data name="NB_Firewalls" xml:space="preserve">
     <value>Firewalls</value>
   </data>
   <data name="NB_lblStatus" xml:space="preserve">
@@ -243,10 +243,10 @@
   <data name="DC_lblHelp" xml:space="preserve">
     <value>HelpGoesHere</value>
   </data>
-  <data name="DC_btnCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="DC_btnOK" xml:space="preserve">
+  <data name="_OK" xml:space="preserve">
     <value>Ok</value>
   </data>
   <data name="DC_btnNicPlus" xml:space="preserve">
@@ -255,10 +255,10 @@
   <data name="DC_btnNicMinus" xml:space="preserve">
     <value>-</value>
   </data>
-  <data name="DC_btnNicEdit" xml:space="preserve">
+  <data name="_Edit" xml:space="preserve">
     <value>éditer</value>
   </data>
-  <data name="DC_btnIfEdit" xml:space="preserve">
+  <data name="_Edit" xml:space="preserve">
     <value>éditer</value>
   </data>
   <data name="DC_btnIfMinus" xml:space="preserve">
@@ -276,7 +276,7 @@
   <data name="DC_cbDHCP" xml:space="preserve">
     <value>Serveur DHCP</value>
   </data>
-  <data name="DC_btnDHCP" xml:space="preserve">
+  <data name="_DHCP" xml:space="preserve">
     <value>DHCP</value>
   </data>
   <data name="DC_Form" xml:space="preserve">
@@ -291,10 +291,10 @@
   <data name="IPAE_lblGateway" xml:space="preserve">
     <value>Passerelle</value>
   </data>
-  <data name="IPAE_btnCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>Annuler</value>
   </data>
-  <data name="IPAE_btnOK" xml:space="preserve">
+  <data name="_OK" xml:space="preserve">
     <value>OK</value>
   </data>
   <data name="IPAE_Form" xml:space="preserve">
@@ -303,13 +303,13 @@
   <data name="LE_btnLink" xml:space="preserve">
     <value>Lien</value>
   </data>
-  <data name="LE_btnCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>Annuler</value>
   </data>
   <data name="LE_Form" xml:space="preserve">
     <value>LinkEditor</value>
   </data>
-  <data name="LBW_btnOK" xml:space="preserve">
+  <data name="_OK" xml:space="preserve">
     <value>OK</value>
   </data>
   <data name="LBW_lblInstructions" xml:space="preserve">
@@ -336,10 +336,10 @@
   <data name="NTE_lblDest" xml:space="preserve">
     <value>Dest hôte</value>
   </data>
-  <data name="NTE_btnOK" xml:space="preserve">
+  <data name="_Done" xml:space="preserve">
     <value>Terminé</value>
   </data>
-  <data name="NTE_btnCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>Annuler</value>
   </data>
   <data name="NTE_Form" xml:space="preserve">
@@ -360,7 +360,7 @@
   <data name="NCE_label3" xml:space="preserve">
     <value>Adresse Mac</value>
   </data>
-  <data name="NCE_btnDone" xml:space="preserve">
+  <data name="_Done" xml:space="preserve">
     <value>Terminé</value>
   </data>
   <data name="NCE_lblLinkStatus" xml:space="preserve">
@@ -369,7 +369,7 @@
   <data name="NCE_Form" xml:space="preserve">
     <value>NetworkCardEditor</value>
   </data>
-  <data name="OW_btnDone" xml:space="preserve">
+  <data name="_Done" xml:space="preserve">
     <value>Terminé</value>
   </data>
   <data name="OW_lblNetTitle" xml:space="preserve">
@@ -405,7 +405,7 @@
   <data name="OW_Form" xml:space="preserve">
     <value>OptionsWindow</value>
   </data>
-  <data name="RTFW_btnOK" xml:space="preserve">
+  <data name="_OK" xml:space="preserve">
     <value>OK</value>
   </data>
   <data name="RTFW_Form" xml:space="preserve">
diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx
index d0e0a28..1895267 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.resx
@@ -125,13 +125,13 @@
     <value>File</value>
     <comment>NetworkBuilder fileToolStripMenuItem = File</comment>
   </data>
-  <data name="NB_newToolStripMenuItem" xml:space="preserve">
+  <data name="LBW_btnAdd" xml:space="preserve">
     <value>New</value>
-    <comment>NetworkBuilder newToolStripMenuItem = New</comment>
+    <comment>ListBoxWindow btnAdd = New</comment>
   </data>
-  <data name="NB_loadToolStripMenuItem" xml:space="preserve">
+  <data name="_Load" xml:space="preserve">
     <value>Load</value>
-    <comment>NetworkBuilder loadToolStripMenuItem = Load</comment>
+    <comment>_Load = Load</comment>
   </data>
   <data name="NB_reloadToolStripMenuItem" xml:space="preserve">
     <value>Reload</value>
@@ -145,9 +145,9 @@
     <value>Exit</value>
     <comment>NetworkBuilder exitToolStripMenuItem = Exit</comment>
   </data>
-  <data name="NB_editToolStripMenuItem" xml:space="preserve">
+  <data name="_Edit" xml:space="preserve">
     <value>Edit</value>
-    <comment>NetworkBuilder editToolStripMenuItem = Edit</comment>
+    <comment>_Edit = Edit</comment>
   </data>
   <data name="NB_cutToolStripMenuItem" xml:space="preserve">
     <value>Cut</value>
@@ -169,31 +169,27 @@
     <value>Options</value>
     <comment>NetworkBuilder optionsToolStripMenuItem = Options</comment>
   </data>
-  <data name="NB_allToolStripMenuItem" xml:space="preserve">
+  <data name="_All" xml:space="preserve">
     <value>All</value>
-    <comment>NetworkBuilder allToolStripMenuItem = All</comment>
+    <comment>_All = All</comment>
   </data>
-  <data name="NB_dHCPRequestToolStripMenuItem" xml:space="preserve">
+  <data name="NB_NetViewDHCP" xml:space="preserve">
     <value>DHCP Request</value>
-    <comment>NetworkBuilder dHCPRequestToolStripMenuItem = DHCP Request</comment>
+    <comment>NB_NetViewDHCP = DHCP request</comment>
   </data>
-  <data name="NB_clearArpTableToolStripMenuItem" xml:space="preserve">
+  <data name="NB_NetViewClr" xml:space="preserve">
     <value>Clear Arp Table</value>
-    <comment>NetworkBuilder clearArpTableToolStripMenuItem = Clear Arp Table</comment>
+    <comment>NB_NetViewClr = Clear Arp Table</comment>
   </data>
   <data name="NB_clearIPsToolStripMenuItem" xml:space="preserve">
     <value>Clear IPs</value>
     <comment>NetworkBuilder clearIPsToolStripMenuItem = Clear IPs</comment>
   </data>
-  <data name="NB_pingToolStripMenuItem" xml:space="preserve">
+  <data name="_Ping" xml:space="preserve">
     <value>Ping</value>
-    <comment>NetworkBuilder pingToolStripMenuItem = Ping</comment>
+    <comment>_Ping = Ping</comment>
   </data>
-  <data name="NB_helpToolStripMenuItem" xml:space="preserve">
-    <value>Help</value>
-    <comment>NetworkBuilder helpToolStripMenuItem = Help</comment>
-  </data>
-  <data name="NB_helpToolStripMenuItem1" xml:space="preserve">
+  <data name="_Help" xml:space="preserve">
     <value>Help</value>
     <comment>NetworkBuilder helpToolStripMenuItem1 = Help</comment>
   </data>
@@ -217,54 +213,42 @@
     <value>Puzzles</value>
     <comment>NetworkBuilder puzzlesToolStripMenuItem = Puzzles</comment>
   </data>
-  <data name="NB_solvedToolStripMenuItem" xml:space="preserve">
+  <data name="_Solved" xml:space="preserve">
     <value>Solved</value>
     <comment>NetworkBuilder solvedToolStripMenuItem = Solved</comment>
   </data>
-  <data name="NB_dHCPToolStripMenuItem" xml:space="preserve">
+  <data name="_DHCP" xml:space="preserve">
     <value>DHCP</value>
-    <comment>NetworkBuilder dHCPToolStripMenuItem = DHCP</comment>
+    <comment>DeviceConfig btnDHCP = DHCP</comment>
   </data>
-  <data name="NB_oneNetworkToolStripMenuItem" xml:space="preserve">
+  <data name="NB_OneNetwork" xml:space="preserve">
     <value>One Network</value>
-    <comment>NetworkBuilder oneNetworkToolStripMenuItem = One Network</comment>
+    <comment>NetworkBuilder solvedOneNetworkToolStripMenuItem = One Network</comment>
   </data>
-  <data name="NB_twoNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_TwoNetworks" xml:space="preserve">
     <value>Two Networks</value>
     <comment>NetworkBuilder twoNetworksToolStripMenuItem = Two Networks</comment>
   </data>
-  <data name="NB_threeNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_ThreeNetworks" xml:space="preserve">
     <value>Three Networks</value>
     <comment>NetworkBuilder threeNetworksToolStripMenuItem = Three Networks</comment>
   </data>
-  <data name="NB_firewallsToolStripMenuItem" xml:space="preserve">
+  <data name="NB_Firewalls" xml:space="preserve">
     <value>Firewalls</value>
-    <comment>NetworkBuilder firewallsToolStripMenuItem = Firewalls</comment>
+    <comment>NetworkBuilder firewallsToolStripMenuItem1 = Firewalls</comment>
   </data>
   <data name="NB_toSolveToolStripMenuItem" xml:space="preserve">
     <value>To Solve</value>
     <comment>NetworkBuilder toSolveToolStripMenuItem = To Solve</comment>
   </data>
-  <data name="NB_solvedDHCPToolStripMenuItem" xml:space="preserve">
-    <value>DHCP</value>
-    <comment>NetworkBuilder solvedDHCPToolStripMenuItem = DHCP</comment>
-  </data>
-  <data name="NB_solvedOneNetworkToolStripMenuItem" xml:space="preserve">
-    <value>One Network</value>
-    <comment>NetworkBuilder solvedOneNetworkToolStripMenuItem = One Network</comment>
-  </data>
-  <data name="NB_solvedTwoNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_TwoNetworks" xml:space="preserve">
     <value>Two Networks</value>
     <comment>NetworkBuilder solvedTwoNetworksToolStripMenuItem = Two Networks</comment>
   </data>
-  <data name="NB_SolvedThreeNetworksToolStripMenuItem" xml:space="preserve">
+  <data name="NB_ThreeNetworks" xml:space="preserve">
     <value>Three Networks</value>
     <comment>NetworkBuilder SolvedThreeNetworksToolStripMenuItem = Three Networks</comment>
   </data>
-  <data name="NB_firewallsToolStripMenuItem1" xml:space="preserve">
-    <value>Firewalls</value>
-    <comment>NetworkBuilder firewallsToolStripMenuItem1 = Firewalls</comment>
-  </data>
   <data name="NB_lblStatus" xml:space="preserve">
     <value>lblStatus</value>
     <comment>NetworkBuilder lblStatus = lblStatus</comment>
@@ -285,35 +269,19 @@
     <value>HelpGoesHere</value>
     <comment>DeviceConfig lblHelp = HelpGoesHere</comment>
   </data>
-  <data name="DC_btnCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>Cancel</value>
-    <comment>DeviceConfig btnCancel = Cancel</comment>
+    <comment>_Cancel = Cancel</comment>
   </data>
-  <data name="DC_btnOK" xml:space="preserve">
-    <value>Ok</value>
-    <comment>DeviceConfig btnOK = Ok</comment>
+  <data name="_OK" xml:space="preserve">
+    <value>OK</value>
+    <comment>_OK = OK</comment>
   </data>
-  <data name="DC_btnNicPlus" xml:space="preserve">
-    <value>+</value>
-    <comment>DeviceConfig btnNicPlus = +</comment>
-  </data>
-  <data name="DC_btnNicMinus" xml:space="preserve">
+  <data name="DC_btnMinus" xml:space="preserve">
     <value>-</value>
-    <comment>DeviceConfig btnNicMinus = -</comment>
+    <comment>DeviceConfig btnMinus = -</comment>
   </data>
-  <data name="DC_btnNicEdit" xml:space="preserve">
-    <value>edit</value>
-    <comment>DeviceConfig btnNicEdit = edit</comment>
-  </data>
-  <data name="DC_btnIfEdit" xml:space="preserve">
-    <value>edit</value>
-    <comment>DeviceConfig btnIfEdit = edit</comment>
-  </data>
-  <data name="DC_btnIfMinus" xml:space="preserve">
-    <value>-</value>
-    <comment>DeviceConfig btnIfMinus = -</comment>
-  </data>
-  <data name="DC_btnIfAdd" xml:space="preserve">
+  <data name="DC_btnAdd" xml:space="preserve">
     <value>+</value>
     <comment>DeviceConfig btnIfAdd = +</comment>
   </data>
@@ -329,10 +297,6 @@
     <value>DHCP Server</value>
     <comment>DeviceConfig cbDHCP = DHCP Server</comment>
   </data>
-  <data name="DC_btnDHCP" xml:space="preserve">
-    <value>DHCP</value>
-    <comment>DeviceConfig btnDHCP = DHCP</comment>
-  </data>
   <data name="DC_Form" xml:space="preserve">
     <value>DeviceConfig</value>
     <comment>DeviceConfig Form = DeviceConfig</comment>
@@ -349,14 +313,6 @@
     <value>Gateway</value>
     <comment>IPAddressEntry lblGateway = Gateway</comment>
   </data>
-  <data name="IPAE_btnCancel" xml:space="preserve">
-    <value>Cancel</value>
-    <comment>IPAddressEntry btnCancel = Cancel</comment>
-  </data>
-  <data name="IPAE_btnOK" xml:space="preserve">
-    <value>OK</value>
-    <comment>IPAddressEntry btnOK = OK</comment>
-  </data>
   <data name="IPAE_Form" xml:space="preserve">
     <value>IP-Address Entry</value>
     <comment>IPAddressEntry Form = IP-Address Entry</comment>
@@ -365,26 +321,14 @@
     <value>Link</value>
     <comment>LinkEditor btnLink = Link</comment>
   </data>
-  <data name="LE_btnCancel" xml:space="preserve">
-    <value>Cancel</value>
-    <comment>LinkEditor btnCancel = Cancel</comment>
-  </data>
   <data name="LE_Form" xml:space="preserve">
     <value>LinkEditor</value>
     <comment>LinkEditor Form = LinkEditor</comment>
   </data>
-  <data name="LBW_btnOK" xml:space="preserve">
-    <value>OK</value>
-    <comment>ListBoxWindow btnOK = OK</comment>
-  </data>
   <data name="LBW_lblInstructions" xml:space="preserve">
     <value>label1</value>
     <comment>ListBoxWindow lblInstructions = label1</comment>
   </data>
-  <data name="LBW_btnAdd" xml:space="preserve">
-    <value>New</value>
-    <comment>ListBoxWindow btnAdd = New</comment>
-  </data>
   <data name="LBW_cbLoadPuzzlesAtStart" xml:space="preserve">
     <value>Show this at start</value>
     <comment>ListBoxWindow cbLoadPuzzlesAtStart = Show this at start</comment>
@@ -409,13 +353,9 @@
     <value>Dest Host</value>
     <comment>NetTestEditor lblDest = Dest Host</comment>
   </data>
-  <data name="NTE_btnOK" xml:space="preserve">
+  <data name="_Done" xml:space="preserve">
     <value>Done</value>
-    <comment>NetTestEditor btnOK = Done</comment>
-  </data>
-  <data name="NTE_btnCancel" xml:space="preserve">
-    <value>Cancel</value>
-    <comment>NetTestEditor btnCancel = Cancel</comment>
+    <comment>OptionsWindow btnDone = Done</comment>
   </data>
   <data name="NTE_Form" xml:space="preserve">
     <value>Edit a Test</value>
@@ -441,10 +381,6 @@
     <value>MAC Address</value>
     <comment>NetworkCardEditor label3 = MAC Address</comment>
   </data>
-  <data name="NCE_btnDone" xml:space="preserve">
-    <value>Done</value>
-    <comment>NetworkCardEditor btnDone = Done</comment>
-  </data>
   <data name="NCE_lblLinkStatus" xml:space="preserve">
     <value>LinkStatus</value>
     <comment>NetworkCardEditor lblLinkStatus = LinkStatus</comment>
@@ -453,10 +389,6 @@
     <value>NetworkCardEditor</value>
     <comment>NetworkCardEditor Form = NetworkCardEditor</comment>
   </data>
-  <data name="OW_btnDone" xml:space="preserve">
-    <value>Done</value>
-    <comment>OptionsWindow btnDone = Done</comment>
-  </data>
   <data name="OW_lblNetTitle" xml:space="preserve">
     <value>Net Title</value>
     <comment>OptionsWindow lblNetTitle = Net Title</comment>
@@ -505,10 +437,6 @@
     <value />
     <comment>RTFWindow rtbContent = [intentionally blank.  content is loaded from file]</comment>
   </data>
-  <data name="RTFW_btnOK" xml:space="preserve">
-    <value>OK</value>
-    <comment>RTFWindow btnOK = OK</comment>
-  </data>
   <data name="RTFW_Form" xml:space="preserve">
     <value>RTFWindow</value>
     <comment>RTFWindow Form = RTFWindow</comment>
@@ -523,7 +451,7 @@
   </data>
   <data name="H_ARP_Title" xml:space="preserve">
     <value>ARP</value>
-    <comment>Text used in the program on buttons and the like</comment>
+    <comment>H_ARP_Title = Arp</comment>
   </data>
   <data name="H_ComparingAddresses_Key" xml:space="preserve">
     <value>Comparing IP addresses:</value>
@@ -731,8 +659,8 @@
     <value>The wireless signal was too weak.  Packet dropped.</value>
     <comment>NetworkLink WirelessDropped = The wireless signal was too weak.  Packet dropped.</comment>
   </data>
-  <data name="_Save_Canceled" xml:space="preserve">
-    <value>Saved</value>
+  <data name="_Canceled" xml:space="preserve">
+    <value>Canceled</value>
     <comment>String used when we have successfully saved the network.</comment>
   </data>
   <data name="H_GeneralWireless_Key" xml:space="preserve">
@@ -777,7 +705,7 @@
   <data name="H_WirelessSSID_Title" xml:space="preserve">
     <value>Wireless SSID</value>
   </data>
-  <data name="DC_UpdateForm+" xml:space="preserve">
+  <data name="_Add" xml:space="preserve">
     <value>Add</value>
     <comment>DeviceConfig UpdateForm+ = Add</comment>
   </data>
@@ -829,19 +757,19 @@
     <value>Encryption key mismatch.  Packet dropped.</value>
     <comment>Network Device ProcessArrival EncryptErr2 = Encryption key mismatch.  Packet dropped.</comment>
   </data>
-  <data name="ND_ProcessArrival_IPError1" xml:space="preserve">
+  <data name="ND_ProssArr_Error1" xml:space="preserve">
     <value>No VPN nic to recieve packet.  Check VPN IP</value>
-    <comment>Network Device ProcessArrival IPError1 = No VPN nic to recieve packet.  Check VPN IP</comment>
+    <comment>Network Device ProcessArrival VPNNicErr1 = No VPN nic to recieve packet.  Check VPN IP</comment>
   </data>
-  <data name="ND_ProcessArrival_IPError2" xml:space="preserve">
+  <data name="ND_ProssArr_Error" xml:space="preserve">
     <value>No corresponding IP on vpn.  Packet dropped.</value>
-    <comment>Network Device ProcessArrival IPError2 = No corresponding IP on vpn.  Packet dropped.</comment>
+    <comment>Network Device ProcessArrival VPNNicErr2 = No corresponding IP on vpn.  Packet dropped.</comment>
   </data>
   <data name="ND_ProcessArrival_PackReturnErr1" xml:space="preserve">
     <value>ERROR!  A packet returned to a machine that we were not expecting it from.</value>
     <comment>Network Device ProcessArrival PackReturnErr1 = ERROR!  A packet returned to a machine that we were not expecting it from.</comment>
   </data>
-  <data name="ND_ProcessArrival_PingErr1" xml:space="preserve">
+  <data name="ND_ProssArr_PingErr" xml:space="preserve">
     <value>The broadcast ping reached a destination that was not on the same network</value>
     <comment>Network Device ProcessArrival PingErr1 = The broadcast ping reached a destination that was not on the same network</comment>
   </data>
@@ -853,14 +781,6 @@
     <value>Success!  The ping returned from its destination.</value>
     <comment>Network Device ProcessArrival PingReturn1 = Success!  The ping returned from its destination.</comment>
   </data>
-  <data name="ND_ProcessArrival_VPNNicErr1" xml:space="preserve">
-    <value>No VPN nic to recieve packet.  Check VPN IP</value>
-    <comment>Network Device ProcessArrival VPNNicErr1 = No VPN nic to recieve packet.  Check VPN IP</comment>
-  </data>
-  <data name="ND_ProcessArrival_VPNNicErr2" xml:space="preserve">
-    <value>No corresponding IP on vpn.  Packet dropped.</value>
-    <comment>Network Device ProcessArrival VPNNicErr2 = No corresponding IP on vpn.  Packet dropped.</comment>
-  </data>
   <data name="ND_TunnelPacketFromHere_Error" xml:space="preserve">
     <value>Packet sent out tunnel but no endpoint set.  Dropping</value>
     <comment>Network Device TunnelPacketFromHere Error = Packet sent out tunnel but no endpoint set.  Dropping</comment>
@@ -909,18 +829,10 @@
     <value>Are sure you want to forget what puzzles you have done?</value>
     <comment>LBW_btnResetYouSure? = Are sure you want to forget what puzzles you have done?</comment>
   </data>
-  <data name="LBW_LBWALL" xml:space="preserve">
-    <value>ALL</value>
-    <comment>LBT_LBWALL = ALL</comment>
-  </data>
-  <data name="LBW_LBWAllS" xml:space="preserve">
+  <data name="_AllS" xml:space="preserve">
     <value>(All Solved)</value>
     <comment>LBT_LBWAllS = (All Solved)</comment>
   </data>
-  <data name="LBW_LBWCancel" xml:space="preserve">
-    <value>Cancel</value>
-    <comment>LBW_LBWCancel = Cancel</comment>
-  </data>
   <data name="LBW_LBWDblClckIf" xml:space="preserve">
     <value>Double-Click the interface to add/edit the range of DHCP to serve.</value>
     <comment>LBW_LBWDblClckIf = Double-Click the interface to add/edit the range of DHCP to serve.</comment>
@@ -929,22 +841,14 @@
     <value>Double-click a route to change it.</value>
     <comment>LBW_LBWDblClckRout = Double-click a route to change it.</comment>
   </data>
-  <data name="LBW_LBWDelete" xml:space="preserve">
+  <data name="_Delete" xml:space="preserve">
     <value>Delete</value>
-    <comment>LBW_LBWDelete = Delete</comment>
+    <comment>_Delete = Delete</comment>
   </data>
   <data name="LBW_LBWDetail" xml:space="preserve">
     <value>For greater detail, click on the check-boxes</value>
     <comment>LBW_LBWDetail = For greater detail, click on the check-boxes</comment>
   </data>
-  <data name="LBW_LBWEdit" xml:space="preserve">
-    <value>Edit</value>
-    <comment>LBW_LBWEdit = Edit</comment>
-  </data>
-  <data name="LBW_LBWLoad" xml:space="preserve">
-    <value>Load</value>
-    <comment>LBW_LBWLoad = Load</comment>
-  </data>
   <data name="LBW_UpdateFormNICRout" xml:space="preserve">
     <value>--Routes from NICs (Read-Only)--</value>
     <comment>LBW_UpdateFormNICRout = --Routes from NICs (Read-Only)--</comment>
@@ -961,10 +865,6 @@
     <value>Choose a Language:</value>
     <comment>NB_ChangeLang2 = Choose a Language:</comment>
   </data>
-  <data name="NB_ChangeLangOK" xml:space="preserve">
-    <value>OK</value>
-    <comment>NB_ChangeLangOK = OK</comment>
-  </data>
   <data name="NB_NBEn" xml:space="preserve">
     <value>English</value>
     <comment>NB_NBEn = English</comment>
@@ -1221,37 +1121,21 @@
     <value>^Level</value>
     <comment>NB_Level = ^Level</comment>
   </data>
-  <data name="NB_LoadToolStripMenuItemErr" xml:space="preserve">
+  <data name="_LoadErr" xml:space="preserve">
     <value>EduNetworkBuilder can only open .enbx files.  If this is a valid edunetwork file, please rename it.</value>
-    <comment>NB_LoadToolStripMenuItemErr = EduNetworkBuilder can only open .enbx files.  If this is a valid edunetwork file, please rename it.</comment>
+    <comment>_LoadErr = EduNetworkBuilder can only open .enbx files.  If this is a valid edunetwork file, please rename it.</comment>
   </data>
-  <data name="NB_NetViewArp" xml:space="preserve">
-    <value>Arp</value>
-    <comment>NB_NetViewArp = Arp</comment>
+  <data name="H_ARP_Title1" xml:space="preserve">
+    <value>ARP request [host]</value>
+    <comment>H_ARP_Title = _Ping</comment>
   </data>
-  <data name="NB_NetViewArp1" xml:space="preserve">
-    <value>Arp request [host]</value>
-    <comment>NB_NetViewArp = NB_NetViewPing</comment>
+  <data name="H_ARP_Title2" xml:space="preserve">
+    <value>ARP request</value>
+    <comment>H_ARP_Title2 = Arp request</comment>
   </data>
-  <data name="NB_NetViewArp2" xml:space="preserve">
-    <value>Arp request</value>
-    <comment>NB_NetViewArp2 = Arp request</comment>
-  </data>
-  <data name="NB_NetViewClr" xml:space="preserve">
-    <value>Clear Arp Table</value>
-    <comment>NB_NetViewClr = Clear Arp Table</comment>
-  </data>
-  <data name="NB_NetViewDHCP" xml:space="preserve">
-    <value>DHCP request</value>
-    <comment>NB_NetViewDHCP = DHCP request</comment>
-  </data>
-  <data name="NB_NetViewPing" xml:space="preserve">
-    <value>Ping</value>
-    <comment>NB_NetViewPing = Ping</comment>
-  </data>
-  <data name="NB_NetViewPing1" xml:space="preserve">
+  <data name="_Ping1" xml:space="preserve">
     <value>Ping [host]</value>
-    <comment>NB_NetViewPing = Ping [host]</comment>
+    <comment>_Ping = Ping [host]</comment>
   </data>
   <data name="NB_NetViewPng" xml:space="preserve">
     <value>Ping IP</value>
@@ -1261,21 +1145,17 @@
     <value>EduNetworkBuilder</value>
     <comment>NB_UpdteFrmName = EduNetworkBuilder</comment>
   </data>
-  <data name="NTE_All" xml:space="preserve">
-    <value>All</value>
-    <comment>NTE_All = All</comment>
-  </data>
-  <data name="NTE_Read" xml:space="preserve">
+  <data name="_Read" xml:space="preserve">
     <value>Read</value>
-    <comment>NTE_Read = Read</comment>
+    <comment>_Read = Read</comment>
   </data>
   <data name="N_MarkAsSolvedDone" xml:space="preserve">
     <value>Solved!  Would you like to open the puzzle box to go to the next puzzle? 'No' will let you continue to play with this one.</value>
     <comment>N_MarkAsSolvedDone = Solved!  Would you like to open the puzzle box to go to the next puzzle? 'No' will let you continue to play with this one.</comment>
   </data>
-  <data name="N_MarkAsSolvedSolved" xml:space="preserve">
+  <data name="_Solved" xml:space="preserve">
     <value>Solved</value>
-    <comment>N_MarkAsSolvedSolved = Solved</comment>
+    <comment>_Solved = Solved</comment>
   </data>
   <data name="N_ProssPackDone" xml:space="preserve">
     <value>----All Done----</value>
@@ -1321,13 +1201,13 @@
     <value>Skipping Invalid Puzzle: '{0}'</value>
     <comment>NB_LoadPuzInfo = Skipping Invalid Puzzle: '{0}'</comment>
   </data>
-  <data name="NB_NetViewArpStr" xml:space="preserve">
-    <value>Arp {0}</value>
-    <comment>NB_NetViewArpStr = Arp {0}</comment>
+  <data name="H_ARP_TitleStr" xml:space="preserve">
+    <value>ARP {0}</value>
+    <comment>H_ARP_TitleStr = Arp {0}</comment>
   </data>
-  <data name="NB_NetViewPingStr" xml:space="preserve">
+  <data name="_PingStr" xml:space="preserve">
     <value>Ping {0}</value>
-    <comment>NB_NetViewPingStr = Ping {0}</comment>
+    <comment>_PingStr = Ping {0}</comment>
   </data>
   <data name="NB_NetViewRmLnkStr" xml:space="preserve">
     <value>Remove Link To {0}</value>
@@ -1353,9 +1233,9 @@
     <value>Disconnected</value>
     <comment>NCE_UdfrmDiscon = Disconnected</comment>
   </data>
-  <data name="NCE_VPNEnd" xml:space="preserve">
+  <data name="_Endpt" xml:space="preserve">
     <value>Endpoint</value>
-    <comment>NCE_VPNEnd = Endpoint</comment>
+    <comment>_Endpt = Endpoint</comment>
   </data>
   <data name="NC_CloneSerialzable" xml:space="preserve">
     <value>The type must be serializable.</value>
@@ -1369,9 +1249,9 @@
     <value>The packet was rejected by the firewall.</value>
     <comment>NC_ProssInPackReject = The packet was rejected by the firewall.</comment>
   </data>
-  <data name="NC_source" xml:space="preserve">
+  <data name="_source" xml:space="preserve">
     <value>source</value>
-    <comment>NC_source = source</comment>
+    <comment>_source = source</comment>
   </data>
   <data name="ND_DelNicNicLock" xml:space="preserve">
     <value>Locked NIC</value>
@@ -1478,7 +1358,7 @@
     <comment>ND_PrepPackRoutErr =   ERROR: No route or local interface for packet.</comment>
   </data>
   <data name="ND_ProssArrArp" xml:space="preserve">
-    <value>Arp Request found</value>
+    <value>ARP Request found</value>
     <comment>ND_ProssArrArp = Arp Request found</comment>
   </data>
   <data name="ND_ProssArrArpFailStr" xml:space="preserve">
@@ -1486,7 +1366,7 @@
     <comment>ND_ProssArrArpFailStr = ARP failed: Arrived at a machine that was not expecting it and was rejected. {0} -&gt; {1}</comment>
   </data>
   <data name="ND_ProssArrArpSuccessStr" xml:space="preserve">
-    <value>Arp request success: Who Has {0} tell {1} = {2}</value>
+    <value>ARP request success: Who Has {0} tell {1} = {2}</value>
     <comment>ND_ProssArrArpSuccess = Arp request success: Who Has {0} tell {1} = {2}</comment>
   </data>
   <data name="ND_ProssArrDHCPAnsStr" xml:space="preserve">
@@ -1501,9 +1381,9 @@
     <value>DHCP Request found Server: {0}</value>
     <comment>ND_ProssArrDHCPStr = DHCP Request found Server: {0}</comment>
   </data>
-  <data name="ND_ProssArrNotSameNet" xml:space="preserve">
+  <data name="ND_ProssArr_PingErr" xml:space="preserve">
     <value>The broadcast ping reached a destination that was not on the same network</value>
-    <comment>ND_ProssArrNotSameNet = The broadcast ping reached a destination that was not on the same network</comment>
+    <comment>ND_ProssArr_PingErr = The broadcast ping reached a destination that was not on the same network</comment>
   </data>
   <data name="ND_ProssArrPartialStr" xml:space="preserve">
     <value>Ping partial success: {0}% packet loss. {1} -&gt; {2}</value>