diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 650df356d..cfbec730b 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -536,6 +536,14 @@ simedtdlg.IntensityDesc.Veryhigh = Very high
simedtdlg.IntensityDesc.Extreme = Extreme
! SimulationConfigDialog
+SimulationConfigDialog.btn.plot = Plot
+SimulationConfigDialog.btn.export = Export
+SimulationConfigDialog.btn.OK.ttip = Keep changes and close the dialog
+SimulationConfigDialog.btn.Cancel.ttip = Discard changes and close the dialog
+SimulationConfigDialog.CancelOperation.msg.discardChanges = Are you sure you want to discard your changes to this simulation?
+SimulationConfigDialog.CancelOperation.msg.undoAdd = Are you sure you want to undo adding this simulation?
+SimulationConfigDialog.CancelOperation.title = Cancel operation
+SimulationConfigDialog.CancelOperation.checkbox.dontAskAgain = Don't ask me again
SimulationConfigDialog.tab.plotDis.ttip = Plotting not supported for multi-simulation editing
SimulationConfigDialog.tab.expDis.ttip = Exporting not supported for multi-simulation editing
@@ -561,18 +569,6 @@ SimulationExtension.scripting.text.trusted.clear.ttip = Clear the trusted status
SimulationExtension.scripting.text.trusted.cleared = All scripts are now untrusted on this computer.
SimulationExtension.scripting.text.trusted.cleared.title = Cleared
-SimulationEditDialog.btn.plot = Plot
-SimulationEditDialog.btn.export = Export
-SimulationEditDialog.btn.edit = Edit
-SimulationEditDialog.btn.simulate = Simulate
-SimulationEditDialog.btn.simulateAndPlot = Simulate & Plot
-SimulationEditDialog.btn.OK.ttip = Keep changes and close the dialog
-SimulationEditDialog.btn.Cancel.ttip = Discard changes and close the dialog
-SimulationEditDialog.CancelOperation.msg.discardChanges = Are you sure you want to discard your changes to this simulation?
-SimulationEditDialog.CancelOperation.msg.undoAdd = Are you sure you want to undo adding this simulation?
-SimulationEditDialog.CancelOperation.title = Cancel operation
-SimulationEditDialog.CancelOperation.checkbox.dontAskAgain = Don't ask me again
-
GeodeticComputationStrategy.flat.name = Flat Earth
GeodeticComputationStrategy.flat.desc = Perform computations with a flat Earth approximation. Sufficient for low-altitude flights.
GeodeticComputationStrategy.spherical.name = Spherical approximation
diff --git a/core/resources/l10n/messages_ar.properties b/core/resources/l10n/messages_ar.properties
index 86b215a77..81396868d 100644
--- a/core/resources/l10n/messages_ar.properties
+++ b/core/resources/l10n/messages_ar.properties
@@ -486,11 +486,11 @@ SimulationExtension.scripting.text.trusted.clear.ttip = إمسح حالة موث
SimulationExtension.scripting.text.trusted.cleared = .جميع البرامج النصية الآن غير موثوق بها على هذا الكمبيوتر
SimulationExtension.scripting.text.trusted.cleared.title = تم الإخلاء
-SimulationEditDialog.btn.plot = الرسم البياني
-SimulationEditDialog.btn.export = تصدير
-SimulationEditDialog.btn.edit = تعديل
-SimulationEditDialog.btn.simulate = محاكاة
-SimulationEditDialog.btn.simulateAndPlot = محاكاة وإضهار الرسم البياني
+SimulationConfigDialog.btn.plot = الرسم البياني
+SimulationConfigDialog.btn.export = تصدير
+SimulationConfigDialog.btn.edit = تعديل
+SimulationConfigDialog.btn.simulate = محاكاة
+SimulationConfigDialog.btn.simulateAndPlot = محاكاة وإضهار الرسم البياني
GeodeticComputationStrategy.flat.name = أرض مسطحة
GeodeticComputationStrategy.flat.desc = .قم بإجراء عمليات حسابية بتقريب للأرض المسطحة. كافية للرحلات على إرتفاعات منخفضة
diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties
index 313ebf684..4e46a2adc 100644
--- a/core/resources/l10n/messages_es.properties
+++ b/core/resources/l10n/messages_es.properties
@@ -1012,11 +1012,11 @@ SimuRunDlg.msg.unknownerror2 = El programa puede ser inestable, Guarde todos s
! SimulationRunDialog
SimuRunDlg.title.RunSim = Ejecutar simulaciones
-SimulationEditDialog.btn.edit = Editar
-SimulationEditDialog.btn.export = Exportar
-SimulationEditDialog.btn.plot = Gr\u00e1ficos
-SimulationEditDialog.btn.simulate = Simular
-SimulationEditDialog.btn.simulateAndPlot = Simulaci\u00f3n y Gr\u00e1fico
+SimulationConfigDialog.btn.edit = Editar
+SimulationConfigDialog.btn.export = Exportar
+SimulationConfigDialog.btn.plot = Gr\u00e1ficos
+SimulationConfigDialog.btn.simulate = Simular
+SimulationConfigDialog.btn.simulateAndPlot = Simulaci\u00f3n y Gr\u00e1fico
SimulationModifierTree.OptimizationParameters = Optimizaci\u00f3n de par\u00e1metros
diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties
index e7ddabf40..7f95564f2 100644
--- a/core/resources/l10n/messages_fr.properties
+++ b/core/resources/l10n/messages_fr.properties
@@ -1004,11 +1004,11 @@ SimuRunDlg.msg.unknownerror2 = Le programme peut \u00EAtre instable, vous deve
! SimulationRunDialog
SimuRunDlg.title.RunSim = Simulations en cour...
-SimulationEditDialog.btn.edit = Modifier
-SimulationEditDialog.btn.export = Exporter
-SimulationEditDialog.btn.plot = Tracer
-SimulationEditDialog.btn.simulate = Simuler
-SimulationEditDialog.btn.simulateAndPlot = Simuler et tracer
+SimulationConfigDialog.btn.edit = Modifier
+SimulationConfigDialog.btn.export = Exporter
+SimulationConfigDialog.btn.plot = Tracer
+SimulationConfigDialog.btn.simulate = Simuler
+SimulationConfigDialog.btn.simulateAndPlot = Simuler et tracer
SimulationModifierTree.OptimizationParameters = Param\u00E8tres d'optimisation
diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties
index 79986bd1e..aa89bc969 100644
--- a/core/resources/l10n/messages_nl.properties
+++ b/core/resources/l10n/messages_nl.properties
@@ -464,11 +464,11 @@ SimulationExtension.scripting.text.trusted.clear.ttip = Wis de vertrouwde status
SimulationExtension.scripting.text.trusted.cleared = Alle scripts zijn nu onvertrouwd op deze computer.
SimulationExtension.scripting.text.trusted.cleared.title = Gewist
-SimulationEditDialog.btn.plot = Plot
-SimulationEditDialog.btn.export = Exporteer
-SimulationEditDialog.btn.edit = Bewerk
-SimulationEditDialog.btn.simulate = Simuleer
-SimulationEditDialog.btn.simulateAndPlot = Simuleer & Plot
+SimulationConfigDialog.btn.plot = Plot
+SimulationConfigDialog.btn.export = Exporteer
+SimulationConfigDialog.btn.edit = Bewerk
+SimulationConfigDialog.btn.simulate = Simuleer
+SimulationConfigDialog.btn.simulateAndPlot = Simuleer & Plot
GeodeticComputationStrategy.flat.name = Vlakke Aarde
GeodeticComputationStrategy.flat.desc = Voer berekeningen uit met een benadering van de vlakke aarde. Voldoende voor vluchten op lage hoogte.
diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties
index 0204ef617..ae15eeb25 100644
--- a/core/resources/l10n/messages_ru.properties
+++ b/core/resources/l10n/messages_ru.properties
@@ -473,11 +473,11 @@ SimulationExtension.scripting.text.trusted.clear.ttip = \u0421\u0431\u0440\u043E
SimulationExtension.scripting.text.trusted.cleared = \u0412\u0441\u0435 \u0441\u043A\u0440\u0438\u043F\u0442\u044B \u043D\u0430 \u044D\u0442\u043E\u043C \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u0435 \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435 \u044F\u0432\u043B\u044F\u044E\u0442\u0441\u044F \u0434\u043E\u0432\u0435\u0440\u0435\u043D\u043D\u044B\u043C\u0438.
SimulationExtension.scripting.text.trusted.cleared.title = \u041E\u0447\u0438\u0449\u0435\u043D\u043E
-SimulationEditDialog.btn.plot = \u0413\u0440\u0430\u0444\u0438\u043A\u0438
-SimulationEditDialog.btn.export = \u042D\u043A\u0441\u043F\u043E\u0440\u0442
-SimulationEditDialog.btn.edit = \u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
-SimulationEditDialog.btn.simulate = \u0420\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044C
-SimulationEditDialog.btn.simulateAndPlot = \u0420\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044C \u0438 \u043D\u0430\u0447\u0435\u0440\u0442\u0438\u0442\u044C
+SimulationConfigDialog.btn.plot = \u0413\u0440\u0430\u0444\u0438\u043A\u0438
+SimulationConfigDialog.btn.export = \u042D\u043A\u0441\u043F\u043E\u0440\u0442
+SimulationConfigDialog.btn.edit = \u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+SimulationConfigDialog.btn.simulate = \u0420\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044C
+SimulationConfigDialog.btn.simulateAndPlot = \u0420\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044C \u0438 \u043D\u0430\u0447\u0435\u0440\u0442\u0438\u0442\u044C
GeodeticComputationStrategy.flat.name = \u041F\u043B\u043E\u0441\u043A\u0430\u044F \u0417\u0435\u043C\u043B\u044F
GeodeticComputationStrategy.flat.desc = \u0412\u044B\u043F\u043E\u043B\u043D\u044F\u0442\u044C \u0432\u044B\u0447\u0438\u0441\u043B\u0435\u043D\u0438\u044F \u0441 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435\u043C \u043F\u0440\u0438\u0431\u043B\u0438\u0436\u0435\u043D\u0438\u044F \u043F\u043B\u043E\u0441\u043A\u043E\u0439 \u0417\u0435\u043C\u043B\u0438. \u0422\u043E\u0447\u043D\u043E\u0441\u0442\u044C \u0434\u043E\u0441\u0442\u0430\u0442\u043E\u0447\u043D\u0430 \u0434\u043B\u044F \u043D\u0438\u0437\u043A\u0438\u0445 \u0432\u044B\u0441\u043E\u0442.
diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties
index a99a4ccb3..8352f0757 100644
--- a/core/resources/l10n/messages_uk_UA.properties
+++ b/core/resources/l10n/messages_uk_UA.properties
@@ -396,11 +396,11 @@ simedtdlg.IntensityDesc.High = High
simedtdlg.IntensityDesc.Veryhigh = Very high
simedtdlg.IntensityDesc.Extreme = Extreme
-SimulationEditDialog.btn.plot = Plot
-SimulationEditDialog.btn.export = Export
-SimulationEditDialog.btn.edit = Edit
-SimulationEditDialog.btn.simulate = Simulate
-SimulationEditDialog.btn.simulateAndPlot = Simulate & Plot
+SimulationConfigDialog.btn.plot = Plot
+SimulationConfigDialog.btn.export = Export
+SimulationConfigDialog.btn.edit = Edit
+SimulationConfigDialog.btn.simulate = Simulate
+SimulationConfigDialog.btn.simulateAndPlot = Simulate & Plot
GeodeticComputationStrategy.flat.name = Flat Earth
GeodeticComputationStrategy.flat.desc = Perform computations with a flat Earth approximation. Sufficient for low-altitude flights.
diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties
index 61456230c..0fa2d9800 100644
--- a/core/resources/l10n/messages_zh_CN.properties
+++ b/core/resources/l10n/messages_zh_CN.properties
@@ -1062,11 +1062,11 @@ SimuRunDlg.msg.errorOccurred = \u4EFF\u771F\u65F6\u51FA\u73B0\u9519\u8BEF:
! SimulationRunDialog
SimuRunDlg.title.RunSim = \u8FD0\u884C\u4EFF\u771F...
-SimulationEditDialog.btn.edit = \u7F16\u8F91
-SimulationEditDialog.btn.export = \u5BFC\u51FA
-SimulationEditDialog.btn.plot = \u6570\u636E\u56FE
-SimulationEditDialog.btn.simulate = \u4EFF\u771F
-SimulationEditDialog.btn.simulateAndPlot = \u4EFF\u771F & \u6570\u636E\u56FE
+SimulationConfigDialog.btn.edit = \u7F16\u8F91
+SimulationConfigDialog.btn.export = \u5BFC\u51FA
+SimulationConfigDialog.btn.plot = \u6570\u636E\u56FE
+SimulationConfigDialog.btn.simulate = \u4EFF\u771F
+SimulationConfigDialog.btn.simulateAndPlot = \u4EFF\u771F & \u6570\u636E\u56FE
SimulationExtension.javacode.className = \u5B8C\u6574\u7684Java\u7C7B\u540D:
SimulationExtension.javacode.desc = \u6DFB\u52A0\u81EA\u5B9A\u4E49SimulationListener(\u76D1\u542C\u4E8B\u4EF6)
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
index 66c2b6f95..264f443e5 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
@@ -97,7 +97,7 @@ public class PreferencesDialog extends JDialog {
//// Cancel button
JButton cancelButton = new SelectColorButton(trans.get("dlg.but.cancel"));
- cancelButton.setToolTipText(trans.get("SimulationEditDialog.btn.Cancel.ttip"));
+ cancelButton.setToolTipText(trans.get("SimulationConfigDialog.btn.Cancel.ttip"));
cancelButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -120,7 +120,7 @@ public class PreferencesDialog extends JDialog {
//// Ok button
JButton okButton = new SelectColorButton(trans.get("dlg.but.ok"));
- okButton.setToolTipText(trans.get("SimulationEditDialog.btn.OK.ttip"));
+ okButton.setToolTipText(trans.get("SimulationConfigDialog.btn.OK.ttip"));
okButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -213,7 +213,7 @@ public class PreferencesDialog extends JDialog {
JPanel panel = new JPanel(new MigLayout());
String msg = trans.get("PreferencesDialog.CancelOperation.msg.discardChanges");
JLabel msgLabel = new JLabel(msg);
- JCheckBox dontAskAgain = new JCheckBox(trans.get("SimulationEditDialog.CancelOperation.checkbox.dontAskAgain"));
+ JCheckBox dontAskAgain = new JCheckBox(trans.get("SimulationConfigDialog.CancelOperation.checkbox.dontAskAgain"));
dontAskAgain.setSelected(false);
dontAskAgain.addItemListener(new ItemListener() {
@Override
diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationConfigDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationConfigDialog.java
index a1037cfe1..4f98d88b7 100644
--- a/swing/src/net/sf/openrocket/gui/simulation/SimulationConfigDialog.java
+++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationConfigDialog.java
@@ -146,12 +146,12 @@ public class SimulationConfigDialog extends JDialog {
SimulationConfigDialog.this.revalidate();
break;
case PLOT_IDX:
- okButton.setText(trans.get("SimulationEditDialog.btn.plot"));
+ okButton.setText(trans.get("SimulationConfigDialog.btn.plot"));
cancelButton.setText(trans.get("dlg.but.close"));
SimulationConfigDialog.this.revalidate();
break;
case EXPORT_IDX:
- okButton.setText(trans.get("SimulationEditDialog.btn.export"));
+ okButton.setText(trans.get("SimulationConfigDialog.btn.export"));
cancelButton.setText(trans.get("dlg.but.close"));
SimulationConfigDialog.this.revalidate();
break;
@@ -301,7 +301,7 @@ public class SimulationConfigDialog extends JDialog {
//// Cancel button
this.cancelButton = new SelectColorButton(trans.get("dlg.but.cancel"));
- this.cancelButton.setToolTipText(trans.get("SimulationEditDialog.btn.Cancel.ttip"));
+ this.cancelButton.setToolTipText(trans.get("SimulationConfigDialog.btn.Cancel.ttip"));
this.cancelButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -319,7 +319,7 @@ public class SimulationConfigDialog extends JDialog {
//// Ok button
this.okButton = new SelectColorButton(trans.get("dlg.but.ok"));
- this.okButton.setToolTipText(trans.get("SimulationEditDialog.btn.OK.ttip"));
+ this.okButton.setToolTipText(trans.get("SimulationConfigDialog.btn.OK.ttip"));
this.okButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -392,10 +392,10 @@ public class SimulationConfigDialog extends JDialog {
private JPanel createCancelOperationContent() {
JPanel panel = new JPanel(new MigLayout());
- String msg = isNewSimulation ? trans.get("SimulationEditDialog.CancelOperation.msg.undoAdd") :
- trans.get("SimulationEditDialog.CancelOperation.msg.discardChanges");
+ String msg = isNewSimulation ? trans.get("SimulationConfigDialog.CancelOperation.msg.undoAdd") :
+ trans.get("SimulationConfigDialog.CancelOperation.msg.discardChanges");
JLabel msgLabel = new JLabel(msg);
- JCheckBox dontAskAgain = new JCheckBox(trans.get("SimulationEditDialog.CancelOperation.checkbox.dontAskAgain"));
+ JCheckBox dontAskAgain = new JCheckBox(trans.get("SimulationConfigDialog.CancelOperation.checkbox.dontAskAgain"));
dontAskAgain.setSelected(false);
dontAskAgain.addItemListener(new ItemListener() {
@Override
@@ -429,7 +429,7 @@ public class SimulationConfigDialog extends JDialog {
// Yes/No dialog: Are you sure you want to discard your changes?
JPanel msg = createCancelOperationContent();
int resultYesNo = JOptionPane.showConfirmDialog(SimulationConfigDialog.this, msg,
- trans.get("SimulationEditDialog.CancelOperation.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+ trans.get("SimulationConfigDialog.CancelOperation.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
if (resultYesNo == JOptionPane.YES_OPTION) {
discardChanges();
}