--- a/Util/UnitEquipmentChoice.cs	Sat Nov 21 15:33:00 2009 +0000
+++ b/Util/UnitEquipmentChoice.cs	Sat Nov 21 16:41:28 2009 +0000
@@ -3,9 +3,9 @@
 // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
 
 using System;
+using IBBoard.Lang;
 using IBBoard.WarFoundry.API.Objects;
-
-
+using IBBoard.WarFoundry.API.Util;
 
 namespace IBBoard.WarFoundry.GUI.WinForms.Util
 {
@@ -26,19 +26,44 @@
 
         public override string ToString()
         {
-            return String.Format("{0} (For {1} at {2}pts each)", item.Name, GetAmountString(), item.Cost);
+			String translation = "";
+
+			if (item.Cost == 0)
+			{
+				translation = Translation.GetTranslation("equipmentAmountWithZeroCost", "{0} ({1} - free)", item.Name, GetAmountString());
+			}
+			else
+			{
+				translation = Translation.GetTranslation("equipmentAmountWithCost", "{0} ({1} at {2}pts each)", item.Name, GetAmountString(), item.Cost);
+			}
+
+			return translation;
         }
 
 		private string GetAmountString()
 		{
-			if (unit.GetEquipmentAmountIsRatio(item))
+			double amount = UnitEquipmentUtil.GetEquipmentAmount(unit, item);
+			string amountString = "";
+
+			if (UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, item))
 			{
-				return UnitEquipmentRatioSelection.GetEquipmentAmountString(unit.GetEquipmentAmount(item));
+				int number = UnitEquipmentUtil.GetEquipmentAmountTaken(unit, item);
+
+				if (amount == 100)
+				{
+					amountString = Translation.GetTranslation("equipmentAmountAll", "all ({1})", amount, number);
+				}
+				else
+				{
+					amountString = Translation.GetTranslation("equipmentAmountPercentage", "{0}% ({1})", amount, number);
+				}
 			}
 			else
 			{
-				return UnitEquipmentNumericSelection.GetEquipmentAmountString(unit.GetEquipmentAmount(item));
+				amountString = amount.ToString();
 			}
+
+			return amountString;
 		}
 
         public UnitEquipmentItem Item