[Debugger] Added UI option for AllowImplicitTypeLoading and improved general UI

2 files changed, 150 insertions, 104 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs
index 431616def3..54c3a0591a 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs
@@ -6,22 +6,24 @@ namespace MonoDevelop.Debugger
 	{
 		private global::Gtk.Notebook notebook1;
 		private global::Gtk.VBox vbox3;
-		private global::Gtk.CheckButton projectCodeOnly;
-		private global::Gtk.CheckButton stepOverPropertiesAndOperators;
+		private global::Gtk.CheckButton checkProjectCodeOnly;
+		private global::Gtk.CheckButton checkStepOverPropertiesAndOperators;
 		private global::Gtk.CheckButton checkAllowEval;
-		private global::Gtk.CheckButton checkToString;
+		private global::Gtk.Alignment alignmentAllowToString;
+		private global::Gtk.CheckButton checkAllowToString;
+		private global::Gtk.CheckButton checkAllowTypeLoad;
 		private global::Gtk.CheckButton checkShowBaseGroup;
 		private global::Gtk.CheckButton checkGroupPrivate;
 		private global::Gtk.CheckButton checkGroupStatic;
 		private global::Gtk.Table tableEval;
 		private global::Gtk.Label label3;
-		private global::Gtk.Label label60;
+		private global::Gtk.Label labelEvalTimeout;
 		private global::Gtk.SpinButton spinTimeout;
 		private global::Gtk.Label label4;
 		private global::Gtk.VBox vbox2;
-		private global::Gtk.Label label2;
+		private global::Gtk.Label labelPriorityList;
 		private global::MonoDevelop.Ide.Gui.Components.PriorityList prioritylist;
-		private global::Gtk.Label label1;
+		private global::Gtk.Label labelPreferredDebuggers;
 		
 		protected virtual void Build ()
 		{
@@ -40,28 +42,28 @@ namespace MonoDevelop.Debugger
 			this.vbox3.Spacing = 6;
 			this.vbox3.BorderWidth = ((uint)(9));
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.projectCodeOnly = new global::Gtk.CheckButton ();
-			this.projectCodeOnly.CanFocus = true;
-			this.projectCodeOnly.Name = "projectCodeOnly";
-			this.projectCodeOnly.Label = global::Mono.Unix.Catalog.GetString ("Debug project code only; do not step into framework code.");
-			this.projectCodeOnly.Active = true;
-			this.projectCodeOnly.DrawIndicator = true;
-			this.projectCodeOnly.UseUnderline = true;
-			this.vbox3.Add (this.projectCodeOnly);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.projectCodeOnly]));
+			this.checkProjectCodeOnly = new global::Gtk.CheckButton ();
+			this.checkProjectCodeOnly.CanFocus = true;
+			this.checkProjectCodeOnly.Name = "checkProjectCodeOnly";
+			this.checkProjectCodeOnly.Label = global::Mono.Unix.Catalog.GetString ("Debug project code only; do not step into framework code.");
+			this.checkProjectCodeOnly.Active = true;
+			this.checkProjectCodeOnly.DrawIndicator = true;
+			this.checkProjectCodeOnly.UseUnderline = true;
+			this.vbox3.Add (this.checkProjectCodeOnly);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkProjectCodeOnly]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.stepOverPropertiesAndOperators = new global::Gtk.CheckButton ();
-			this.stepOverPropertiesAndOperators.CanFocus = true;
-			this.stepOverPropertiesAndOperators.Name = "stepOverPropertiesAndOperators";
-			this.stepOverPropertiesAndOperators.Label = global::Mono.Unix.Catalog.GetString ("Step over properties and operators");
-			this.stepOverPropertiesAndOperators.Active = true;
-			this.stepOverPropertiesAndOperators.DrawIndicator = true;
-			this.stepOverPropertiesAndOperators.UseUnderline = true;
-			this.vbox3.Add (this.stepOverPropertiesAndOperators);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.stepOverPropertiesAndOperators]));
+			this.checkStepOverPropertiesAndOperators = new global::Gtk.CheckButton ();
+			this.checkStepOverPropertiesAndOperators.CanFocus = true;
+			this.checkStepOverPropertiesAndOperators.Name = "checkStepOverPropertiesAndOperators";
+			this.checkStepOverPropertiesAndOperators.Label = global::Mono.Unix.Catalog.GetString ("Step over properties and operators");
+			this.checkStepOverPropertiesAndOperators.Active = true;
+			this.checkStepOverPropertiesAndOperators.DrawIndicator = true;
+			this.checkStepOverPropertiesAndOperators.UseUnderline = true;
+			this.vbox3.Add (this.checkStepOverPropertiesAndOperators);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkStepOverPropertiesAndOperators]));
 			w2.Position = 1;
 			w2.Expand = false;
 			w2.Fill = false;
@@ -79,29 +81,48 @@ namespace MonoDevelop.Debugger
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.checkToString = new global::Gtk.CheckButton ();
-			this.checkToString.CanFocus = true;
-			this.checkToString.Name = "checkToString";
-			this.checkToString.Label = global::Mono.Unix.Catalog.GetString ("Use ToString() to get the string value of objects");
-			this.checkToString.DrawIndicator = true;
-			this.checkToString.UseUnderline = true;
-			this.vbox3.Add (this.checkToString);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkToString]));
-			w4.Position = 3;
-			w4.Expand = false;
-			w4.Fill = false;
+			this.alignmentAllowToString = new global::Gtk.Alignment (0F, 0.5F, 1F, 1F);
+			this.alignmentAllowToString.Name = "alignmentAllowToString";
+			this.alignmentAllowToString.LeftPadding = ((uint)(18));
+			// Container child alignmentAllowToString.Gtk.Container+ContainerChild
+			this.checkAllowToString = new global::Gtk.CheckButton ();
+			this.checkAllowToString.CanFocus = true;
+			this.checkAllowToString.Name = "checkAllowToString";
+			this.checkAllowToString.Label = global::Mono.Unix.Catalog.GetString ("Call string-conversion function on objects in variables windows");
+			this.checkAllowToString.Active = true;
+			this.checkAllowToString.DrawIndicator = true;
+			this.checkAllowToString.UseUnderline = true;
+			this.alignmentAllowToString.Add (this.checkAllowToString);
+			this.vbox3.Add (this.alignmentAllowToString);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.alignmentAllowToString]));
+			w5.Position = 3;
+			w5.Expand = false;
+			w5.Fill = false;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.checkAllowTypeLoad = new global::Gtk.CheckButton ();
+			this.checkAllowTypeLoad.CanFocus = true;
+			this.checkAllowTypeLoad.Name = "checkAllowTypeLoad";
+			this.checkAllowTypeLoad.Label = global::Mono.Unix.Catalog.GetString ("Allow implicitly invoking static constructors on types");
+			this.checkAllowTypeLoad.Active = true;
+			this.checkAllowTypeLoad.DrawIndicator = true;
+			this.checkAllowTypeLoad.UseUnderline = true;
+			this.vbox3.Add (this.checkAllowTypeLoad);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkAllowTypeLoad]));
+			w6.Position = 4;
+			w6.Expand = false;
+			w6.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.checkShowBaseGroup = new global::Gtk.CheckButton ();
 			this.checkShowBaseGroup.CanFocus = true;
 			this.checkShowBaseGroup.Name = "checkShowBaseGroup";
-			this.checkShowBaseGroup.Label = global::Mono.Unix.Catalog.GetString ("Shown inherited class members in a base class group");
+			this.checkShowBaseGroup.Label = global::Mono.Unix.Catalog.GetString ("Show inherited class members in a base class group");
 			this.checkShowBaseGroup.DrawIndicator = true;
 			this.checkShowBaseGroup.UseUnderline = true;
 			this.vbox3.Add (this.checkShowBaseGroup);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkShowBaseGroup]));
-			w5.Position = 4;
-			w5.Expand = false;
-			w5.Fill = false;
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkShowBaseGroup]));
+			w7.Position = 5;
+			w7.Expand = false;
+			w7.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.checkGroupPrivate = new global::Gtk.CheckButton ();
 			this.checkGroupPrivate.CanFocus = true;
@@ -110,10 +131,10 @@ namespace MonoDevelop.Debugger
 			this.checkGroupPrivate.DrawIndicator = true;
 			this.checkGroupPrivate.UseUnderline = true;
 			this.vbox3.Add (this.checkGroupPrivate);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkGroupPrivate]));
-			w6.Position = 5;
-			w6.Expand = false;
-			w6.Fill = false;
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkGroupPrivate]));
+			w8.Position = 6;
+			w8.Expand = false;
+			w8.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.checkGroupStatic = new global::Gtk.CheckButton ();
 			this.checkGroupStatic.CanFocus = true;
@@ -122,10 +143,10 @@ namespace MonoDevelop.Debugger
 			this.checkGroupStatic.DrawIndicator = true;
 			this.checkGroupStatic.UseUnderline = true;
 			this.vbox3.Add (this.checkGroupStatic);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkGroupStatic]));
-			w7.Position = 6;
-			w7.Expand = false;
-			w7.Fill = false;
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkGroupStatic]));
+			w9.Position = 7;
+			w9.Expand = false;
+			w9.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.tableEval = new global::Gtk.Table (((uint)(1)), ((uint)(3)), false);
 			this.tableEval.Name = "tableEval";
@@ -136,20 +157,20 @@ namespace MonoDevelop.Debugger
 			this.label3.Name = "label3";
 			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("ms");
 			this.tableEval.Add (this.label3);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.tableEval [this.label3]));
-			w8.LeftAttach = ((uint)(2));
-			w8.RightAttach = ((uint)(3));
-			w8.XOptions = ((global::Gtk.AttachOptions)(4));
-			w8.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.tableEval [this.label3]));
+			w10.LeftAttach = ((uint)(2));
+			w10.RightAttach = ((uint)(3));
+			w10.XOptions = ((global::Gtk.AttachOptions)(4));
+			w10.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child tableEval.Gtk.Table+TableChild
-			this.label60 = new global::Gtk.Label ();
-			this.label60.Name = "label60";
-			this.label60.Xalign = 0F;
-			this.label60.LabelProp = global::Mono.Unix.Catalog.GetString ("Evaluation Timeout:");
-			this.tableEval.Add (this.label60);
-			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.tableEval [this.label60]));
-			w9.XOptions = ((global::Gtk.AttachOptions)(4));
-			w9.YOptions = ((global::Gtk.AttachOptions)(4));
+			this.labelEvalTimeout = new global::Gtk.Label ();
+			this.labelEvalTimeout.Name = "labelEvalTimeout";
+			this.labelEvalTimeout.Xalign = 0F;
+			this.labelEvalTimeout.LabelProp = global::Mono.Unix.Catalog.GetString ("Evaluation Timeout:");
+			this.tableEval.Add (this.labelEvalTimeout);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.tableEval [this.labelEvalTimeout]));
+			w11.XOptions = ((global::Gtk.AttachOptions)(4));
+			w11.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child tableEval.Gtk.Table+TableChild
 			this.spinTimeout = new global::Gtk.SpinButton (0, 1000000, 100);
 			this.spinTimeout.CanFocus = true;
@@ -158,16 +179,16 @@ namespace MonoDevelop.Debugger
 			this.spinTimeout.ClimbRate = 100;
 			this.spinTimeout.Numeric = true;
 			this.tableEval.Add (this.spinTimeout);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.tableEval [this.spinTimeout]));
-			w10.LeftAttach = ((uint)(1));
-			w10.RightAttach = ((uint)(2));
-			w10.XOptions = ((global::Gtk.AttachOptions)(4));
-			w10.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.tableEval [this.spinTimeout]));
+			w12.LeftAttach = ((uint)(1));
+			w12.RightAttach = ((uint)(2));
+			w12.XOptions = ((global::Gtk.AttachOptions)(4));
+			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.vbox3.Add (this.tableEval);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.tableEval]));
-			w11.Position = 7;
-			w11.Expand = false;
-			w11.Fill = false;
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.tableEval]));
+			w13.Position = 8;
+			w13.Expand = false;
+			w13.Fill = false;
 			this.notebook1.Add (this.vbox3);
 			// Notebook tab
 			this.label4 = new global::Gtk.Label ();
@@ -181,32 +202,32 @@ namespace MonoDevelop.Debugger
 			this.vbox2.Spacing = 6;
 			this.vbox2.BorderWidth = ((uint)(6));
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.WidthRequest = 417;
-			this.label2.Name = "label2";
-			this.label2.Xalign = 0F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("This priority list will be used by MonoDevelop when selecting the engine to be used for debugging an application.");
-			this.label2.Wrap = true;
-			this.vbox2.Add (this.label2);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label2]));
-			w13.Position = 0;
-			w13.Expand = false;
-			w13.Fill = false;
+			this.labelPriorityList = new global::Gtk.Label ();
+			this.labelPriorityList.WidthRequest = 417;
+			this.labelPriorityList.Name = "labelPriorityList";
+			this.labelPriorityList.Xalign = 0F;
+			this.labelPriorityList.LabelProp = global::Mono.Unix.Catalog.GetString ("This priority list will be used when selecting the engine to be used for debugging an application.");
+			this.labelPriorityList.Wrap = true;
+			this.vbox2.Add (this.labelPriorityList);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.labelPriorityList]));
+			w15.Position = 0;
+			w15.Expand = false;
+			w15.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.prioritylist = new global::MonoDevelop.Ide.Gui.Components.PriorityList ();
 			this.prioritylist.Name = "prioritylist";
 			this.vbox2.Add (this.prioritylist);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.prioritylist]));
-			w14.Position = 1;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.prioritylist]));
+			w16.Position = 1;
 			this.notebook1.Add (this.vbox2);
-			global::Gtk.Notebook.NotebookChild w15 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox2]));
-			w15.Position = 1;
+			global::Gtk.Notebook.NotebookChild w17 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox2]));
+			w17.Position = 1;
 			// Notebook tab
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Preferred Debuggers");
-			this.notebook1.SetTabLabel (this.vbox2, this.label1);
-			this.label1.ShowAll ();
+			this.labelPreferredDebuggers = new global::Gtk.Label ();
+			this.labelPreferredDebuggers.Name = "labelPreferredDebuggers";
+			this.labelPreferredDebuggers.LabelProp = global::Mono.Unix.Catalog.GetString ("Preferred Debuggers");
+			this.notebook1.SetTabLabel (this.vbox2, this.labelPreferredDebuggers);
+			this.labelPreferredDebuggers.ShowAll ();
 			this.Add (this.notebook1);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
index d88e40a6e8..2399ed409b 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
@@ -1289,7 +1289,7 @@
             <property name="Spacing">6</property>
             <property name="BorderWidth">9</property>
             <child>
-              <widget class="Gtk.CheckButton" id="projectCodeOnly">
+              <widget class="Gtk.CheckButton" id="checkProjectCodeOnly">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="Label" translatable="yes">Debug project code only; do not step into framework code.</property>
@@ -1306,7 +1306,7 @@
               </packing>
             </child>
             <child>
-              <widget class="Gtk.CheckButton" id="stepOverPropertiesAndOperators">
+              <widget class="Gtk.CheckButton" id="checkStepOverPropertiesAndOperators">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="Label" translatable="yes">Step over properties and operators</property>
@@ -1341,16 +1341,41 @@
               </packing>
             </child>
             <child>
-              <widget class="Gtk.CheckButton" id="checkToString">
+              <widget class="Gtk.Alignment" id="alignmentAllowToString">
+                <property name="MemberName" />
+                <property name="Xalign">0</property>
+                <property name="LeftPadding">18</property>
+                <child>
+                  <widget class="Gtk.CheckButton" id="checkAllowToString">
+                    <property name="MemberName" />
+                    <property name="CanFocus">True</property>
+                    <property name="Label" translatable="yes">Call string-conversion function on objects in variables windows</property>
+                    <property name="Active">True</property>
+                    <property name="DrawIndicator">True</property>
+                    <property name="HasLabel">True</property>
+                    <property name="UseUnderline">True</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">3</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.CheckButton" id="checkAllowTypeLoad">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="Label" translatable="yes">Use ToString() to get the string value of objects</property>
+                <property name="Label" translatable="yes">Allow implicitly invoking static constructors on types</property>
+                <property name="Active">True</property>
                 <property name="DrawIndicator">True</property>
                 <property name="HasLabel">True</property>
                 <property name="UseUnderline">True</property>
               </widget>
               <packing>
-                <property name="Position">3</property>
+                <property name="Position">4</property>
                 <property name="AutoSize">True</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
@@ -1360,13 +1385,13 @@
               <widget class="Gtk.CheckButton" id="checkShowBaseGroup">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="Label" translatable="yes">Shown inherited class members in a base class group</property>
+                <property name="Label" translatable="yes">Show inherited class members in a base class group</property>
                 <property name="DrawIndicator">True</property>
                 <property name="HasLabel">True</property>
                 <property name="UseUnderline">True</property>
               </widget>
               <packing>
-                <property name="Position">4</property>
+                <property name="Position">5</property>
                 <property name="AutoSize">True</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
@@ -1382,7 +1407,7 @@
                 <property name="UseUnderline">True</property>
               </widget>
               <packing>
-                <property name="Position">5</property>
+                <property name="Position">6</property>
                 <property name="AutoSize">True</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
@@ -1398,7 +1423,7 @@
                 <property name="UseUnderline">True</property>
               </widget>
               <packing>
-                <property name="Position">6</property>
+                <property name="Position">7</property>
                 <property name="AutoSize">True</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
@@ -1430,7 +1455,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.Label" id="label60">
+                  <widget class="Gtk.Label" id="labelEvalTimeout">
                     <property name="MemberName" />
                     <property name="Xalign">0</property>
                     <property name="LabelProp" translatable="yes">Evaluation Timeout:</property>
@@ -1473,7 +1498,7 @@
                 </child>
               </widget>
               <packing>
-                <property name="Position">7</property>
+                <property name="Position">8</property>
                 <property name="AutoSize">True</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
@@ -1496,11 +1521,11 @@
             <property name="Spacing">6</property>
             <property name="BorderWidth">6</property>
             <child>
-              <widget class="Gtk.Label" id="label2">
+              <widget class="Gtk.Label" id="labelPriorityList">
                 <property name="MemberName" />
                 <property name="WidthRequest">417</property>
                 <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">This priority list will be used by MonoDevelop when selecting the engine to be used for debugging an application.</property>
+                <property name="LabelProp" translatable="yes">This priority list will be used when selecting the engine to be used for debugging an application.</property>
                 <property name="Wrap">True</property>
               </widget>
               <packing>
@@ -1525,7 +1550,7 @@
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Label" id="label1">
+          <widget class="Gtk.Label" id="labelPreferredDebuggers">
             <property name="MemberName" />
             <property name="LabelProp" translatable="yes">Preferred Debuggers</property>
           </widget>