Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.GTK

changeset 97:6d2c8ad0d8f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re #308: Make GTK# UI translatable * More standardisation of widget names with WinForms
author IBBoard <dev@ibboard.co.uk>
date Sun, 02 Jan 2011 15:50:29 +0000
parents b4416ca69153
children fac0636ae13b
files FrmAddEquipment.cs FrmEditEquipment.cs FrmReplaceEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs gtk-gui/gui.stetic translations/en.translation translations/fr.translation
diffstat 10 files changed, 125 insertions(+), 123 deletions(-) [+]
line wrap: on
line diff
--- a/FrmAddEquipment.cs	Sun Jan 02 15:12:31 2011 +0000
+++ b/FrmAddEquipment.cs	Sun Jan 02 15:50:29 2011 +0000
@@ -143,7 +143,7 @@
 
 		public void SetOkayEnabledState(bool enabled)
 		{
-			buttonOk.Sensitive = enabled;
+			bttnOkay.Sensitive = enabled;
 		}
 
 		protected virtual void SpinButtonValueChanged(object sender, System.EventArgs e)
--- a/FrmEditEquipment.cs	Sun Jan 02 15:12:31 2011 +0000
+++ b/FrmEditEquipment.cs	Sun Jan 02 15:50:29 2011 +0000
@@ -133,7 +133,7 @@
 
 		public void SetOkayEnabledState(bool enabled)
 		{
-			buttonOk.Sensitive = enabled;
+			bttnOkay.Sensitive = enabled;
 		}
 
 		protected virtual void SpinButtonValueChanged(object sender, System.EventArgs e)
--- a/FrmReplaceEquipment.cs	Sun Jan 02 15:12:31 2011 +0000
+++ b/FrmReplaceEquipment.cs	Sun Jan 02 15:50:29 2011 +0000
@@ -158,7 +158,7 @@
 
 		public void SetOkayEnabledState(bool enabled)
 		{
-			buttonOk.Sensitive = enabled;
+			bttnOkay.Sensitive = enabled;
 		}
 
 		protected virtual void SpinButtonValueChanged(object sender, System.EventArgs e)
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs	Sun Jan 02 15:12:31 2011 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs	Sun Jan 02 15:50:29 2011 +0000
@@ -16,10 +16,10 @@
 		private global::Gtk.RadioButton rbEquipAll;
 		private global::Gtk.RadioButton rbEquipNumeric;
 		private global::Gtk.RadioButton rbEquipPercent;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblEquipAmount;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblEquipment;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableButton buttonCancel;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableButton buttonOk;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblAmount;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblItem;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay;
 
 		protected virtual void Build()
 		{
@@ -166,21 +166,21 @@
 			w12.RightAttach = ((uint)(2));
 			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblEquipAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
-			this.lblEquipAmount.Name = "lblEquipAmount";
-			this.lblEquipAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
-			this.table1.Add(this.lblEquipAmount);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblEquipAmount]));
+			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblAmount.Name = "lblAmount";
+			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
+			this.table1.Add(this.lblAmount);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount]));
 			w13.TopAttach = ((uint)(1));
 			w13.BottomAttach = ((uint)(2));
 			w13.XOptions = ((global::Gtk.AttachOptions)(4));
 			w13.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblEquipment = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
-			this.lblEquipment.Name = "lblEquipment";
-			this.lblEquipment.LabelProp = global::Mono.Unix.Catalog.GetString("equipment");
-			this.table1.Add(this.lblEquipment);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblEquipment]));
+			this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblItem.Name = "lblItem";
+			this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString("equipment");
+			this.table1.Add(this.lblItem);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblItem]));
 			w14.XOptions = ((global::Gtk.AttachOptions)(4));
 			w14.YOptions = ((global::Gtk.AttachOptions)(4));
 			w1.Add(this.table1);
@@ -195,27 +195,27 @@
 			w16.BorderWidth = ((uint)(5));
 			w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget(this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonCancel]));
+			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnCancel.CanDefault = true;
+			this.bttnCancel.CanFocus = true;
+			this.bttnCancel.Name = "bttnCancel";
+			this.bttnCancel.UseStock = true;
+			this.bttnCancel.UseUnderline = true;
+			this.bttnCancel.Label = "gtk-cancel";
+			this.AddActionWidget(this.bttnCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnCancel]));
 			w17.Expand = false;
 			w17.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget(this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonOk]));
+			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnOkay.CanDefault = true;
+			this.bttnOkay.CanFocus = true;
+			this.bttnOkay.Name = "bttnOkay";
+			this.bttnOkay.UseStock = true;
+			this.bttnOkay.UseUnderline = true;
+			this.bttnOkay.Label = "gtk-ok";
+			this.AddActionWidget(this.bttnOkay, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnOkay]));
 			w18.Position = 1;
 			w18.Expand = false;
 			w18.Fill = false;
@@ -229,8 +229,8 @@
 			this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
 			this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
 			this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
-			this.buttonCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
-			this.buttonOk.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
+			this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
+			this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
 		}
 	}
 }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs	Sun Jan 02 15:12:31 2011 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs	Sun Jan 02 15:50:29 2011 +0000
@@ -14,9 +14,9 @@
 		private global::Gtk.RadioButton rbEquipAll;
 		private global::Gtk.RadioButton rbEquipNumeric;
 		private global::Gtk.RadioButton rbEquipPercent;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblEquipAmount;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableButton buttonCancel;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableButton buttonOk;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblAmount;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay;
 
 		protected virtual void Build()
 		{
@@ -146,12 +146,12 @@
 			w10.RightAttach = ((uint)(2));
 			w10.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblEquipAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
-			this.lblEquipAmount.Name = "lblEquipAmount";
-			this.lblEquipAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
-			this.lblEquipAmount.Justify = ((global::Gtk.Justification)(1));
-			this.table1.Add(this.lblEquipAmount);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.lblEquipAmount]));
+			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblAmount.Name = "lblAmount";
+			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
+			this.lblAmount.Justify = ((global::Gtk.Justification)(1));
+			this.table1.Add(this.lblAmount);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount]));
 			w11.YOptions = ((global::Gtk.AttachOptions)(4));
 			w1.Add(this.table1);
 			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
@@ -165,27 +165,27 @@
 			w13.BorderWidth = ((uint)(5));
 			w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget(this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.buttonCancel]));
+			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnCancel.CanDefault = true;
+			this.bttnCancel.CanFocus = true;
+			this.bttnCancel.Name = "bttnCancel";
+			this.bttnCancel.UseStock = true;
+			this.bttnCancel.UseUnderline = true;
+			this.bttnCancel.Label = "gtk-cancel";
+			this.AddActionWidget(this.bttnCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCancel]));
 			w14.Expand = false;
 			w14.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget(this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.buttonOk]));
+			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnOkay.CanDefault = true;
+			this.bttnOkay.CanFocus = true;
+			this.bttnOkay.Name = "bttnOkay";
+			this.bttnOkay.UseStock = true;
+			this.bttnOkay.UseUnderline = true;
+			this.bttnOkay.Label = "gtk-ok";
+			this.AddActionWidget(this.bttnOkay, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnOkay]));
 			w15.Position = 1;
 			w15.Expand = false;
 			w15.Fill = false;
@@ -201,8 +201,8 @@
 			this.rbEquipAll.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
 			this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
 			this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
-			this.buttonCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
-			this.buttonOk.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
+			this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
+			this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
 		}
 	}
 }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs	Sun Jan 02 15:12:31 2011 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs	Sun Jan 02 15:50:29 2011 +0000
@@ -6,7 +6,7 @@
 	{
 		private global::Gtk.VBox vbox2;
 		private global::Gtk.HBox hbox1;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblUnitType;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblUnitList;
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
 		private global::Gtk.TreeView lstUnitTypes;
 		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblNewUnitWarning;
@@ -37,11 +37,11 @@
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.lblUnitType = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
-			this.lblUnitType.Name = "lblUnitType";
-			this.lblUnitType.LabelProp = global::Mono.Unix.Catalog.GetString("unit type");
-			this.hbox1.Add(this.lblUnitType);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.lblUnitType]));
+			this.lblUnitList = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblUnitList.Name = "lblUnitList";
+			this.lblUnitList.LabelProp = global::Mono.Unix.Catalog.GetString("unit type");
+			this.hbox1.Add(this.lblUnitList);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.lblUnitList]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs	Sun Jan 02 15:12:31 2011 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs	Sun Jan 02 15:50:29 2011 +0000
@@ -16,10 +16,10 @@
 		private global::Gtk.RadioButton rbEquipAll;
 		private global::Gtk.RadioButton rbEquipNumeric;
 		private global::Gtk.RadioButton rbEquipPercent;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblEquipAmount;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblEquipment;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableButton buttonCancel;
-		private global::IBBoard.GtkSharp.Translatable.TranslatableButton buttonOk;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblAmount;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblItem;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
+		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay;
 
 		protected virtual void Build()
 		{
@@ -166,21 +166,21 @@
 			w12.RightAttach = ((uint)(2));
 			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblEquipAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
-			this.lblEquipAmount.Name = "lblEquipAmount";
-			this.lblEquipAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
-			this.table1.Add(this.lblEquipAmount);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblEquipAmount]));
+			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblAmount.Name = "lblAmount";
+			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
+			this.table1.Add(this.lblAmount);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount]));
 			w13.TopAttach = ((uint)(1));
 			w13.BottomAttach = ((uint)(2));
 			w13.XOptions = ((global::Gtk.AttachOptions)(4));
 			w13.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblEquipment = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
-			this.lblEquipment.Name = "lblEquipment";
-			this.lblEquipment.LabelProp = global::Mono.Unix.Catalog.GetString("equipment");
-			this.table1.Add(this.lblEquipment);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblEquipment]));
+			this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblItem.Name = "lblItem";
+			this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString("equipment");
+			this.table1.Add(this.lblItem);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblItem]));
 			w14.XOptions = ((global::Gtk.AttachOptions)(4));
 			w14.YOptions = ((global::Gtk.AttachOptions)(4));
 			w1.Add(this.table1);
@@ -195,27 +195,27 @@
 			w16.BorderWidth = ((uint)(5));
 			w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget(this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonCancel]));
+			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnCancel.CanDefault = true;
+			this.bttnCancel.CanFocus = true;
+			this.bttnCancel.Name = "bttnCancel";
+			this.bttnCancel.UseStock = true;
+			this.bttnCancel.UseUnderline = true;
+			this.bttnCancel.Label = "gtk-cancel";
+			this.AddActionWidget(this.bttnCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnCancel]));
 			w17.Expand = false;
 			w17.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget(this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonOk]));
+			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnOkay.CanDefault = true;
+			this.bttnOkay.CanFocus = true;
+			this.bttnOkay.Name = "bttnOkay";
+			this.bttnOkay.UseStock = true;
+			this.bttnOkay.UseUnderline = true;
+			this.bttnOkay.Label = "gtk-ok";
+			this.AddActionWidget(this.bttnOkay, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnOkay]));
 			w18.Position = 1;
 			w18.Expand = false;
 			w18.Fill = false;
@@ -229,8 +229,8 @@
 			this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
 			this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
 			this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
-			this.buttonCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
-			this.buttonOk.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
+			this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
+			this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
 		}
 	}
 }
--- a/gtk-gui/gui.stetic	Sun Jan 02 15:12:31 2011 +0000
+++ b/gtk-gui/gui.stetic	Sun Jan 02 15:50:29 2011 +0000
@@ -584,7 +584,7 @@
                 <property name="MemberName" />
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblUnitType">
+                  <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblUnitList">
                     <property name="MemberName" />
                     <property name="LabelProp" translatable="yes">unit type</property>
                   </widget>
@@ -1283,7 +1283,7 @@
               </packing>
             </child>
             <child>
-              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblEquipAmount">
+              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblAmount">
                 <property name="MemberName" />
                 <property name="LabelProp" translatable="yes">amount:</property>
               </widget>
@@ -1302,7 +1302,7 @@
               </packing>
             </child>
             <child>
-              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblEquipment">
+              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblItem">
                 <property name="MemberName" />
                 <property name="LabelProp" translatable="yes">equipment</property>
               </widget>
@@ -1336,7 +1336,7 @@
         <property name="Size">2</property>
         <property name="LayoutStyle">End</property>
         <child>
-          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="buttonCancel">
+          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="bttnCancel">
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
@@ -1353,7 +1353,7 @@
           </packing>
         </child>
         <child>
-          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="buttonOk">
+          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="bttnOkay">
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
@@ -1602,7 +1602,7 @@
               </packing>
             </child>
             <child>
-              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblEquipAmount">
+              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblAmount">
                 <property name="MemberName" />
                 <property name="LabelProp" translatable="yes">amount:</property>
                 <property name="Justify">Right</property>
@@ -1636,7 +1636,7 @@
         <property name="Size">2</property>
         <property name="LayoutStyle">End</property>
         <child>
-          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="buttonCancel">
+          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="bttnCancel">
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
@@ -1653,7 +1653,7 @@
           </packing>
         </child>
         <child>
-          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="buttonOk">
+          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="bttnOkay">
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
@@ -1835,6 +1835,7 @@
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="Label" translatable="yes" />
+                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>
@@ -1929,7 +1930,7 @@
               </packing>
             </child>
             <child>
-              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblEquipAmount">
+              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblAmount">
                 <property name="MemberName" />
                 <property name="LabelProp" translatable="yes">amount:</property>
               </widget>
@@ -1948,7 +1949,7 @@
               </packing>
             </child>
             <child>
-              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblEquipment">
+              <widget class="IBBoard.GtkSharp.Translatable.TranslatableLabel" id="lblItem">
                 <property name="MemberName" />
                 <property name="LabelProp" translatable="yes">equipment</property>
               </widget>
@@ -1982,7 +1983,7 @@
         <property name="Size">2</property>
         <property name="LayoutStyle">End</property>
         <child>
-          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="buttonCancel">
+          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="bttnCancel">
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
@@ -1999,7 +2000,7 @@
           </packing>
         </child>
         <child>
-          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="buttonOk">
+          <widget class="IBBoard.GtkSharp.Translatable.TranslatableButton" id="bttnOkay">
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
--- a/translations/en.translation	Sun Jan 02 15:12:31 2011 +0000
+++ b/translations/en.translation	Sun Jan 02 15:50:29 2011 +0000
@@ -26,8 +26,6 @@
 <translation id="menuRemoveUnit">Remove Unit</translation>
 <translation id="armyFileFilter">WarFoundry Army Files (*.army)</translation>
 <translation id="bttnCancel">Cancel</translation>
-<translation id="buttonCancel">Cancel</translation>
-<translation id="buttonOk">OK</translation>
 <translation id="bttnOkay">OK</translation>
 <translation id="bttnSelectSystem">Select system</translation>
 <translation id="saveArmyDialog">Save army</translation>
@@ -57,12 +55,12 @@
 <translation id="equipNumberTooSmallTitle">Equipment amount too small</translation>
 <translation id="IBBoard.WarFoundry.GUI.GTK.FrmNewUnit">Add New {0} Choice</translation>
 <translation id="frmNewUnitNewUnitColumn">Unit Type</translation>
-<translation id="lblUnitType">Unit Type:</translation>
+<translation id="lblUnitList">Unit Type:</translation>
 <translation id="IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment">Add Equipment</translation>
 <translation id="frmAddEquipmentColumnTitle">Equipment</translation>
 <translation id="lblEquipAll">Equip All</translation>
 <translation id="lblPercent">%</translation>
-<translation id="lblEquipAmount">Amount:</translation>
+<translation id="lblAmount">Amount:</translation>
 <translation id="lblEquipment">Equipment:</translation>
 <translation id="IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment">Edit Equipment</translation>
 <translation id="frmEditEquipmentColumnTitle">Equipment</translation>
--- a/translations/fr.translation	Sun Jan 02 15:12:31 2011 +0000
+++ b/translations/fr.translation	Sun Jan 02 15:50:29 2011 +0000
@@ -44,7 +44,7 @@
 	<translation id="IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment">Nouvelle équipement pour unité</translation>
 	<translation id="lblAmount">Quantité :</translation>
 	<translation id="lblItem">Équipement :</translation>
-	<translation id="rbEquipAll">Tout équiper</translation>
+	<translation id="lblEquipAll">Tout équiper</translation>
 	<translation id="equipPercentageTooLarge">Le pourcentage actuel ({0}%) est trop important par rapport au maximum d'équipement accordé ({1}%). La valeur maximum sera utilisée à la place.</translation>
 	<translation id="equipPercentageTooLargeTitle">Le pourcentage d'équipement est trop important</translation>
 	<translation id="equipPercentageTooSmall">Le pourcentage actuel ({0}%) est trop faible par rapport au minimum d'équipement demandé ({1}%). La valeur minimum sera utilisée à la place.</translation>
@@ -124,4 +124,7 @@
 <translation id="bttnClose">Fermer</translation>
 <translation id="armyCategoryColumnTitle">Catégories de l'armée</translation>
 <translation id="IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment">Remplacer l'équipement pour unité</translation>
+<translation id="bttnCreate">Créer</translation>
+<translation id="frmAddEquipmentColumnTitle">Équipement</translation>
+<translation id="lblPercent">%</translation>
 </translations>