diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 7d169196e..267f1e13d 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1087,6 +1087,8 @@ StorageOptChooser.lbl.Saveopt = Save options
 ! ThrustCurveMotorSelectionPanel
 TCMotorSelPan.lbl.Selrocketmotor = Select rocket motor:
 TCMotorSelPan.checkbox.hideSimilar = Hide very similar thrust curves
+TCMotorSelPan.checkbox.hideUsed = Hide motors already used in the mount
+TCMotorSelPan.btn.filter = Filter Motors
 TCMotorSelPan.SHOW_DESCRIPTIONS.desc1 = Show all motors
 TCMotorSelPan.SHOW_DESCRIPTIONS.desc2 = Show motors with diameter less than that of the motor mount
 TCMotorSelPan.SHOW_DESCRIPTIONS.desc3 = Show motors with diameter equal to that of the motor mount
@@ -1108,6 +1110,10 @@ TCMotorSelPan.title.Thrustcurve = Thrust curve:
 TCMotorSelPan.title.Thrust = Thrust
 TCMotorSelPan.delayBox.None = None
 TCMotorSelPan.noDescription = No description available.
+TCMotorSelPan.btn.checkAll = Select All
+TCMotorSelPan.btn.checkNone = Clear All
+TCMotorSelPan.btn.close = Close
+
 
 
 ! PlotDialog
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPopupMenu.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPopupMenu.java
index e49733413..b124c6036 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPopupMenu.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPopupMenu.java
@@ -57,7 +57,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 		
 		// Manufacturer selection
 		JPanel sub = new JPanel(new MigLayout("fill"));
-		TitledBorder border = BorderFactory.createTitledBorder("Manufacturer");
+		TitledBorder border = BorderFactory.createTitledBorder(trans.get("TCurveMotorCol.MANUFACTURER"));
 		GUIUtil.changeFontStyle(border, Font.BOLD);
 		sub.setBorder(border);
 
@@ -99,7 +99,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 
 		sub.add(new JScrollPane(manufacturerCheckList.getList()), "grow,wrap");
 
-		JButton clearMotors = new JButton("clear");
+		JButton clearMotors = new JButton(trans.get("TCMotorSelPan.btn.checkNone"));
 		clearMotors.addActionListener( new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -110,7 +110,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 
 		sub.add(clearMotors,"split 2");
 
-		JButton selectMotors = new JButton("all");
+		JButton selectMotors = new JButton(trans.get("TCMotorSelPan.btn.checkAll"));
 		selectMotors.addActionListener( new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -125,7 +125,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 
 		// Impulse selection
 		sub = new JPanel(new MigLayout("fill"));
-		border = BorderFactory.createTitledBorder("Impulse");
+		border = BorderFactory.createTitledBorder(trans.get("TCurveMotorCol.TOTAL_IMPULSE"));
 		GUIUtil.changeFontStyle(border, Font.BOLD);
 		sub.setBorder(border);
 
@@ -149,7 +149,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 
 		sub.add(new JScrollPane(impulseCheckList.getList()), "grow,wrap");
 
-		JButton clearImpulse = new JButton("clear");
+		JButton clearImpulse = new JButton(trans.get("TCMotorSelPan.btn.checkNone"));
 		clearImpulse.addActionListener( new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -159,7 +159,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 		});
 		sub.add(clearImpulse,"split 2");
 
-		JButton selectImpulse = new JButton("all");
+		JButton selectImpulse = new JButton(trans.get("TCMotorSelPan.btn.checkAll"));
 		selectImpulse.addActionListener( new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -174,7 +174,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 		// Diameter selection
 
 		sub = new JPanel(new MigLayout("fill"));
-		border = BorderFactory.createTitledBorder("Diameter");
+		border = BorderFactory.createTitledBorder(trans.get("TCurveMotorCol.DIAMETER"));
 		GUIUtil.changeFontStyle(border, Font.BOLD);
 		sub.setBorder(border);
 
@@ -222,7 +222,7 @@ public abstract class MotorFilterPopupMenu extends JPopupMenu {
 
 
 		// Close button
-		JButton closeButton = new JButton("close");
+		JButton closeButton = new JButton(trans.get("TCMotorSelPan.btn.close"));
 		closeButton.addActionListener(new ActionListener() {
 
 			@Override
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
index 3c09a7a15..bd24a5ca5 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
@@ -203,7 +203,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 		// Search field
 		//// Search:
 		label = new StyledLabel(trans.get("TCMotorSelPan.lbl.Search"));
-		panel.add(label, "");
+		panel.add(label, "split");
 		
 		searchField = new JTextField();
 		searchField.getDocument().addDocumentListener(new DocumentListener() {
@@ -250,7 +250,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 				
 			};
 			
-			JButton manuFilter = new JButton("Motor Filter");
+			JButton manuFilter = new JButton(trans.get("TCMotorSelPan.btn.filter"));
 			manuFilter.addMouseListener(new MouseListener() {
 				
 				@Override
@@ -339,7 +339,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 		panel.add(scrollpane, "grow, width :500:, height :300:, spanx, wrap para");
 		
 		{
-			final JCheckBox hideUsedBox = new JCheckBox("Hide motors already used in the mount");
+			final JCheckBox hideUsedBox = new JCheckBox(trans.get("TCMotorSelPan.checkbox.hideUsed"));
 			GUIUtil.changeFontSize(hideUsedBox, -1);
 			hideUsedBox.addActionListener(new ActionListener() {
 				@Override