diff --git a/EduNetworkBuilder/EduNetworkBuilder.csproj b/EduNetworkBuilder/EduNetworkBuilder.csproj
index 3d2573f..a1bf2b5 100644
--- a/EduNetworkBuilder/EduNetworkBuilder.csproj
+++ b/EduNetworkBuilder/EduNetworkBuilder.csproj
@@ -28,7 +28,7 @@
     <PublisherName>Tim Young</PublisherName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>41</ApplicationRevision>
+    <ApplicationRevision>42</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 044766f..0c56a5c 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -605,7 +605,9 @@ namespace EduNetworkBuilder
             {
                 foreach(string str in pi.PuzzleTags)
                 {
-                    if(Regex.IsMatch(str,NB.Translate("NB_Level")))
+                    //string What = NB.Translate("NB_Level");
+                    string What = "^Level";
+                    if (Regex.IsMatch(str,What))
                     {
                         if (!LevelTags.Contains(str, StringComparer.OrdinalIgnoreCase))
                             LevelTags.Add(str);
@@ -719,7 +721,8 @@ namespace EduNetworkBuilder
                             if (!DoneList.Contains(tStr))
                             {
                                 pbNetworkView.ContextMenuStrip.Items.Add(string.Format(NB.Translate("_PingStr"), tStr));
-                                pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Ping_Name_Click;
+                                pbNetworkView.ContextMenuStrip.Items[index].Click += pbNetworkView_Ping_Name_Click;
+                                pbNetworkView.ContextMenuStrip.Items[index++].Tag = tStr;
                                 DoneList.Add(tStr);
                             }
                         }
@@ -731,7 +734,8 @@ namespace EduNetworkBuilder
                             if (!DoneList.Contains(tStr))
                             {
                                 pbNetworkView.ContextMenuStrip.Items.Add(string.Format(NB.Translate("_Traceroute") + " " + tStr));
-                                pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Traceroute_Name_Click;
+                                pbNetworkView.ContextMenuStrip.Items[index].Click += pbNetworkView_Traceroute_Name_Click;
+                                pbNetworkView.ContextMenuStrip.Items[index++].Tag = tStr;
                                 DoneList.Add(tStr);
                             }
                         }
@@ -741,7 +745,8 @@ namespace EduNetworkBuilder
                             if (!DoneList.Contains(tStr))
                             {
                                 pbNetworkView.ContextMenuStrip.Items.Add(string.Format(NB.Translate("H_ARP_TitleStr"), tStr));
-                                pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Arp_Name_Click;
+                                pbNetworkView.ContextMenuStrip.Items[index].Click += pbNetworkView_Arp_Name_Click;
+                                pbNetworkView.ContextMenuStrip.Items[index++].Tag = tStr;
                                 DoneList.Add(tStr);
                             }
                         }
@@ -1018,7 +1023,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("_Ping") + " ", "");
+            string dest = (string)Pressed.Tag;
             IPAddress destination;
             destination = myNetwork.DNSLookup(ItemClickedOn, dest);
             if(destination == null || destination.GetIPString == NB.ZeroIPString)
@@ -1033,7 +1038,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("_Traceroute") + " ", "");
+            string dest = (string)Pressed.Tag;
             IPAddress destination;
             destination = myNetwork.DNSLookup(ItemClickedOn, dest);
             if (destination == null || destination.GetIPString == NB.ZeroIPString)
@@ -1048,7 +1053,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("H_ARP_Title")+" ", "");
+            string dest = (string)Pressed.Tag;
             IPAddress destination;
             destination = myNetwork.DNSLookup(ItemClickedOn, dest);
             if (destination == null || destination.GetIPString == NB.ZeroIPString)
diff --git a/EduNetworkBuilder/Resources/Level0_BrokenLink.enbx b/EduNetworkBuilder/Resources/Level0_BrokenLink.enbx
index dfc1c85..cea7546 100644
--- a/EduNetworkBuilder/Resources/Level0_BrokenLink.enbx
+++ b/EduNetworkBuilder/Resources/Level0_BrokenLink.enbx
@@ -3,7 +3,10 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message>This shows what happens if there is a broken network wire in your network.  Ping laptop1 and see where the packet dies.  Open one of the devices connected to that link and you will see that, even though the device has a link connected to it, it does not have a "connection light" saying it is connected.  (The connection-light is the * at the end of the eth name).  You can also edit the network card to see if it thinks it is connected.  Remove the broken network wire by right-clicking one of the devices at either end and removing the link.  Then add the link again.  A successful ping tells you if you got it working.</en_message>
+    <fr_message>
+Cela montre ce qui se passe s'il existe un fil de réseau brisé dans votre réseau. Ping laptop1 et voir où le paquet est en train de mourir. Ouvrez l'un des périphériques connectés à ce lien et vous verrez que même si le périphérique possède un lien qui lui est connecté, il ne dispose pas d'une "lumière de connexion" indiquant qu'il est connecté. (La lumière de connexion est le * à la fin du nom de l'éth). Vous pouvez également éditer la carte réseau pour voir si elle pense qu'elle est connectée. Retirez le fil de réseau cassé en cliquant avec le bouton droit de la souris sur l'un des périphériques à chaque extrémité et en supprimant le lien. Ensuite, ajoutez le lien à nouveau. Un ping réussi vous dit si vous l'avez travaillé.</fr_message>
     <en_title>Broken Link</en_title>
+    <fr_title>Lien brisé</fr_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
diff --git a/EduNetworkBuilder/Resources/Level0_HiddenSwitch.enbx b/EduNetworkBuilder/Resources/Level0_HiddenSwitch.enbx
index 346db1f..8fd385d 100644
--- a/EduNetworkBuilder/Resources/Level0_HiddenSwitch.enbx
+++ b/EduNetworkBuilder/Resources/Level0_HiddenSwitch.enbx
@@ -5,11 +5,15 @@
     <en_message>You bought a switch but forgot where you plugget it into.  Now where did you put that?
 What do you do when you know where something is, but not exactly?  You go to the device you know it is plugged into and follow the wire.
 To solve this, drag the switch around, and then find the other end of the wire and "drag" on the empty spot to "find" it.  Then, change the IP address of the missing switch.</en_message>
+    <fr_message>Vous avez acheté un commutateur, mais vous avez oublié où vous l'achetez. Maintenant, où avez-vous mis cela?
+Que faites-vous lorsque vous savez où se trouve quelque chose, mais pas exactement? Vous allez à l'appareil, vous savez qu'il est branché et suivez le fil.
+Pour résoudre ce problème, faites glisser le commutateur autour, puis retrouvez l'autre extrémité du fil et faites-le glisser sur l'endroit vide pour le "trouver". Ensuite, modifiez l'adresse IP du commutateur manquant.</fr_message>
     <en_title>Where did I put that?</en_title>
+    <fr_title>Où ai-je mis cela?</fr_title>
     <height>1024</height>
     <width>1024</width>
     <itemsize>100</itemsize>
-    <showlabels>True</showlabels>
+    <showlabels>full</showlabels>
     <level>0</level>
     <sortorder>5</sortorder>
     <uniqueidentifier>141</uniqueidentifier>
@@ -42,6 +46,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -66,6 +72,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -105,6 +113,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>lo</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -129,6 +139,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>eth</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -168,6 +180,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -192,6 +206,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>management_interface</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -216,6 +232,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>112</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -240,6 +258,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -264,6 +284,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -288,6 +310,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>115</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -312,6 +336,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -336,6 +362,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -360,6 +388,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>118</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -400,6 +430,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>lo</nictype>
         <uniqueidentifier>131</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -424,6 +456,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>management_interface</nictype>
         <uniqueidentifier>132</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -448,6 +482,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -472,6 +508,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -496,6 +534,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -520,6 +560,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -544,6 +586,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -568,6 +612,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -592,6 +638,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>port</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -631,6 +679,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -655,6 +705,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -694,6 +746,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>lo</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -718,6 +772,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>eth</nictype>
         <uniqueidentifier>121</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -742,6 +798,8 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <nictype>eth</nictype>
         <uniqueidentifier>122</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -768,7 +826,7 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <hostname>net_switch0</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>pc0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>126</uniqueidentifier>
     </link>
@@ -785,7 +843,7 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <hostname>net_switch0</hostname>
         <nicname>port2</nicname>
       </DstNic>
-      <hostname />
+      <hostname>laptop0_link_net_switch0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>127</uniqueidentifier>
     </link>
@@ -802,7 +860,7 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <hostname>router0</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_router0</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>128</uniqueidentifier>
     </link>
@@ -819,7 +877,7 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <hostname>laptop1</hostname>
         <nicname>eth0</nicname>
       </DstNic>
-      <hostname />
+      <hostname>router0_link_laptop1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>129</uniqueidentifier>
     </link>
@@ -836,7 +894,7 @@ To solve this, drag the switch around, and then find the other end of the wire a
         <hostname>net_switch1</hostname>
         <nicname>port1</nicname>
       </DstNic>
-      <hostname />
+      <hostname>net_switch0_link_net_switch1</hostname>
       <linktype>normal</linktype>
       <uniqueidentifier>140</uniqueidentifier>
       <isinvisible>True</isinvisible>
diff --git a/EduNetworkBuilder/Resources/languages/edustrings.fr.resx b/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
index 6e4456c..31f7d31 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
@@ -1106,7 +1106,7 @@
     <comment>NB_ChngLngSure = Are you Sure?</comment>
   </data>
   <data name="NB_Level" xml:space="preserve">
-    <value>Niveau ^</value>
+    <value>^Niveau</value>
     <comment>NB_Level = ^Level</comment>
   </data>
   <data name="_LoadErr" xml:space="preserve">