diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 69831ccae..c5929d0bb 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -289,8 +289,6 @@ pref.dlg.opengl.but.enableAA = Enable Anti-aliasing
pref.dlg.opengl.lbl.useFBO = Use Off-screen Rendering
pref.dlg.lbl.DefaultMach = Default Mach Number for C.P. Estimate:
-pref.dlg.ttip.DefaultMach1 = This setting will take effect the next time you start OpenRocket.
-pref.dlg.ttip.DefaultMach2 = To change the CP Mach number during this session use Tools->Component Analysis.
pref.dlg.lbl.launchWarning = NOTE: the settings below apply only to newly created simulations.
To change the settings for an existing simulation, select that simulation and edit it.
pref.dlg.lbl.launchWarning.ttip = You would not be the first one to be confused by this :)
diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties
index a207ab420..08dccf2ca 100644
--- a/core/resources/l10n/messages_nl.properties
+++ b/core/resources/l10n/messages_nl.properties
@@ -271,8 +271,6 @@ pref.dlg.opengl.but.enableAA = Activeer Anti-aliasing
pref.dlg.opengl.lbl.useFBO = Gebruik Off-screen Rendering
pref.dlg.lbl.DefaultMach = Standaard Machgetal voor C.P. schatting:
-pref.dlg.ttip.DefaultMach1 = Deze instelling gaat van kracht de volgende keer dat u OpenRocket start.
-pref.dlg.ttip.DefaultMach2 = Om het C.P. Machgetal te veranderen tijdens deze sessie gebruik je Tools->Onderdeelanalyse.
pref.dlg.lbl.Positiontoinsert = Positie om nieuwe romponderdelen toe te voegen:
pref.dlg.lbl.Confirmdeletion = Bevestig de verwijdering van simulaties.
diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties
index d00e78672..b9eee7e88 100644
--- a/core/resources/l10n/messages_ru.properties
+++ b/core/resources/l10n/messages_ru.properties
@@ -286,8 +286,6 @@ pref.dlg.opengl.but.enableAA = \u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C
pref.dlg.opengl.lbl.useFBO = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0444\u043E\u043D\u043E\u0432\u0443\u044E \u043E\u0442\u0440\u0438\u0441\u043E\u0432\u043A\u0443
pref.dlg.lbl.DefaultMach = \u0427\u0438\u0441\u043B\u043E \u041C\u0430\u0445\u0430 \u043F\u043E \u0443\u043C\u0430\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u0434\u043B\u044F \u0432\u044B\u0447\u0438\u0441\u043B\u0435\u043D\u0438\u044F \u0426\u0414:
-pref.dlg.ttip.DefaultMach1 = \u042D\u0442\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0431\u0443\u0434\u0435\u0442 \u043F\u0440\u0438\u043C\u0435\u043D\u0435\u043D \u0432 \u043F\u0440\u0438 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u043C \u0437\u0430\u043F\u0443\u0441\u043A\u0435 OpenRocket.
-pref.dlg.ttip.DefaultMach2 = \u0414\u043B\u044F \u0441\u043C\u0435\u043D\u044B \u0447\u0438\u0441\u043B\u0430 \u041C\u0430\u0445\u0430 \u0434\u043B\u044F \u0426\u0414 \u0432 \u0442\u0435\u043A\u0443\u0449\u0435\u0439 \u0441\u0435\u0441\u0441\u0438\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B->\u0410\u043D\u0430\u043B\u0438\u0437 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432.
pref.dlg.lbl.launchWarning = \u0412\u0410\u0416\u041D\u041E: \u0434\u0430\u043D\u043D\u044B\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0431\u0443\u0434\u0443\u0442 \u043F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u044B \u0442\u043E\u043B\u044C\u043A\u043E \u043A \u0432\u043D\u043E\u0432\u044C \u0441\u043E\u0437\u0434\u0430\u043D\u043D\u044B\u043C \u0440\u0430\u0441\u0447\u0435\u0442\u0430\u043C.
\u0427\u0442\u043E\u0431\u044B \u043F\u043E\u043C\u0435\u043D\u044F\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044E\u0449\u0435\u0433\u043E \u0440\u0430\u0441\u0447\u0435\u0442, \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0438 \u043E\u0442\u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0439\u0442\u0435 \u0435\u0433\u043E.
pref.dlg.lbl.launchWarning.ttip = \u0412\u044B \u043D\u0435 \u043F\u0435\u0440\u0432\u044B\u0439, \u043A\u043E\u0433\u043E \u044D\u0442\u043E \u0441\u043C\u0443\u0449\u0430\u0435\u0442 :)
diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties
index e9a1f5735..03f619d04 100644
--- a/core/resources/l10n/messages_zh_CN.properties
+++ b/core/resources/l10n/messages_zh_CN.properties
@@ -1774,7 +1774,6 @@ pref.dlg.tab.Simulation = \u4EFF\u771F
pref.dlg.tab.Units = \u5355\u4F4D\u5236
pref.dlg.title.Preferences = \u9996\u9009\u9879
pref.dlg.ttip.Checkupdatesnow = \u73B0\u5728\u68C0\u67E5\u8F6F\u4EF6\u66F4\u65B0
-pref.dlg.ttip.DefaultMach1 = \u672C\u8BBE\u5B9A\u5C06\u5728\u4E0B\u6B21\u542F\u52A8OpenRocket\u65F6\u751F\u6548.
printdlg.but.preview = \u9884\u89C8
printdlg.but.saveaspdf = \u4FDD\u5B58\u4E3A PDF
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/DesignPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/DesignPreferencesPanel.java
index 3a98bd616..1df5d5a51 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/DesignPreferencesPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/DesignPreferencesPanel.java
@@ -66,16 +66,12 @@ public class DesignPreferencesPanel extends PreferencesPanel {
// // Default Mach number
JLabel dfn = new JLabel(trans.get("pref.dlg.lbl.DefaultMach"));
this.add(dfn, "gapright para");
- dfn.setToolTipText(trans.get("pref.dlg.ttip.DefaultMach1")
- + trans.get("pref.dlg.ttip.DefaultMach2"));
DoubleModel m = new DoubleModel(preferences, "DefaultMach", 1.0,
UnitGroup.UNITS_COEFFICIENT, 0.1, 0.9);
JSpinner spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
- spin.setToolTipText(trans.get("pref.dlg.ttip.DefaultMach1")
- + trans.get("pref.dlg.ttip.DefaultMach2"));
this.add(spin, "wrap");
final JCheckBox autoOpenDesignFile = new JCheckBox(