From 8fe69028f13d10a7a91d136240d1cb762a9b94a6 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 2 Mar 2023 00:19:43 +0100 Subject: [PATCH] Changed plugged delay text --- core/resources/l10n/messages.properties | 5 +++-- core/resources/l10n/messages_ar.properties | 2 +- core/resources/l10n/messages_cs.properties | 2 +- core/resources/l10n/messages_de.properties | 2 +- core/resources/l10n/messages_es.properties | 2 +- core/resources/l10n/messages_fr.properties | 2 +- core/resources/l10n/messages_it.properties | 2 +- core/resources/l10n/messages_ja.properties | 2 +- core/resources/l10n/messages_nl.properties | 2 +- core/resources/l10n/messages_pl.properties | 2 +- core/resources/l10n/messages_pt.properties | 2 +- core/resources/l10n/messages_ru.properties | 2 +- core/resources/l10n/messages_uk_UA.properties | 2 +- core/resources/l10n/messages_zh_CN.properties | 2 +- .../ThrustCurveMotorSelectionPanel.java | 15 ++++++++------- 15 files changed, 24 insertions(+), 22 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 38a3dfec7..c70f0339a 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1372,7 +1372,7 @@ TCMotorSelPan.MotorMountDimensions = Motor mount dimensions: TCMotorSelPan.lbl.Search = Search: TCMotorSelPan.lbl.Selectthrustcurve = Select thrust curve: TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay: -TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\") +TCMotorSelPan.lbl.NumberofsecondsorNone = (You can type the desired delay in seconds) TCMotorSelPan.lbl.Designation = Designation: TCMotorSelPan.lbl.CommonName = Common name: TCMotorSelPan.lbl.Totalimpulse = Total impulse: @@ -1389,7 +1389,8 @@ TCMotorSelPan.lbl.Datapoints = Data points: TCMotorSelPan.lbl.Digest = Digest: TCMotorSelPan.title.Thrustcurve = Thrust curve: TCMotorSelPan.title.Thrust = Thrust -TCMotorSelPan.delayBox.None = Plugged (None) +TCMotorSelPan.delayBox.Plugged = Plugged +TCMotorSelPan.delayBox.PluggedNone = None TCMotorSelPan.noDescription = No description available. TCMotorSelPan.btn.checkAll = Select All TCMotorSelPan.btn.checkNone = Clear All diff --git a/core/resources/l10n/messages_ar.properties b/core/resources/l10n/messages_ar.properties index a9a37c691..1cd68b3d3 100644 --- a/core/resources/l10n/messages_ar.properties +++ b/core/resources/l10n/messages_ar.properties @@ -1350,7 +1350,7 @@ TCMotorSelPan.lbl.Datapoints = :نقاط البيانات TCMotorSelPan.lbl.Digest = :الإستيعاب TCMotorSelPan.title.Thrustcurve = :منحنى الدفع TCMotorSelPan.title.Thrust = الدفع -TCMotorSelPan.delayBox.None = لا شئ +TCMotorSelPan.delayBox.Plugged = لا شئ TCMotorSelPan.noDescription = .لا يوجد وصف متاح TCMotorSelPan.btn.checkAll = تحديد الكل TCMotorSelPan.btn.checkNone = مسح الكل diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties index 26f2b1f2f..22d8c2ec2 100644 --- a/core/resources/l10n/messages_cs.properties +++ b/core/resources/l10n/messages_cs.properties @@ -952,7 +952,7 @@ TCMotorSelPan.lbl.Datapoints = Datov TCMotorSelPan.lbl.Digest = Vber: TCMotorSelPan.title.Thrustcurve = Vkonov krivka: TCMotorSelPan.title.Thrust = Tah -TCMotorSelPan.delayBox.None = Nic +TCMotorSelPan.delayBox.Plugged = Nic ! PlotDialog diff --git a/core/resources/l10n/messages_de.properties b/core/resources/l10n/messages_de.properties index fe1ffafd5..28ec6d1f5 100644 --- a/core/resources/l10n/messages_de.properties +++ b/core/resources/l10n/messages_de.properties @@ -1010,7 +1010,7 @@ TCMotorSelPan.lbl.Datapoints = Datenpunkte: TCMotorSelPan.lbl.Digest = bersicht: TCMotorSelPan.title.Thrustcurve = Schubkurve: TCMotorSelPan.title.Thrust = Schub: -TCMotorSelPan.delayBox.None = keine +TCMotorSelPan.delayBox.Plugged = keine ! PlotDialog diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index d1b4e97bd..0c1767bd4 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -1125,7 +1125,7 @@ TCMotorSelPan.checkbox.hideSimilar = Borrar las curvas similares TCMotorSelPan.checkbox.hideUsed = Ocultar los motores que ya est\u00e1n instalados TCMotorSelPan.checkbox.limitdiameter = Limitar el di\u00e1metro de motor al di\u00e1metro del porta motor TCMotorSelPan.checkbox.limitlength = Limitar la longitud del motor a la longitud del porta motor -TCMotorSelPan.delayBox.None = Ninguno +TCMotorSelPan.delayBox.Plugged = Ninguno TCMotorSelPan.lbl.Avgthrust = Empuje medio: TCMotorSelPan.lbl.Burntime = Tiempo de quemado: TCMotorSelPan.lbl.Datapoints = Muestras de la curva: diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index babe924e2..1a9775f4d 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -1119,7 +1119,7 @@ TCMotorSelPan.checkbox.hideSimilar = Cacher les courbes de pouss\u00E9es si TCMotorSelPan.checkbox.hideUsed = Ne pas afficher les moteurs d\u00E9j\u00E0 utilis\u00E9s TCMotorSelPan.checkbox.limitdiameter = Afficher uniquement les moteurs dont le diametre est \u00E9gale au porte moteur TCMotorSelPan.checkbox.limitlength = Limiter la longueur du moteur \u00E0 celle du porte moteur -TCMotorSelPan.delayBox.None = Aucun +TCMotorSelPan.delayBox.Plugged = Aucun TCMotorSelPan.lbl.Avgthrust = Pouss\u00E9e moyenne: TCMotorSelPan.lbl.Burntime = Temps de combustion: TCMotorSelPan.lbl.Datapoints = Points de donn\u00E9es: diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties index 4968e1470..d845e6119 100644 --- a/core/resources/l10n/messages_it.properties +++ b/core/resources/l10n/messages_it.properties @@ -1011,7 +1011,7 @@ TCMotorSelPan.lbl.Datapoints = Punti: TCMotorSelPan.lbl.Digest = Riassunto: TCMotorSelPan.title.Thrustcurve = Curva di spinta: TCMotorSelPan.title.Thrust = Spinta -TCMotorSelPan.delayBox.None = Nessuno +TCMotorSelPan.delayBox.Plugged = Nessuno ! PlotDialog diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index 13931f989..6dcc1c229 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -1041,7 +1041,7 @@ TCMotorSelPan.lbl.Datapoints = \u30C7\u30FC\u30BF\u70B9\uFF1A TCMotorSelPan.lbl.Digest = \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\uFF1A TCMotorSelPan.title.Thrustcurve = \u63A8\u529B\u5C65\u6B74\uFF1A TCMotorSelPan.title.Thrust = \u63A8\u529B -TCMotorSelPan.delayBox.None = Plugged (None) +TCMotorSelPan.delayBox.Plugged = Plugged (None) TCMotorSelPan.noDescription = No description available. diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index a67093f35..be1450f52 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -1275,7 +1275,7 @@ TCMotorSelPan.lbl.Datapoints = Datapunten: TCMotorSelPan.lbl.Digest = Verteer: TCMotorSelPan.title.Thrustcurve = Stuwkrachtcurve: TCMotorSelPan.title.Thrust = Stuwkracht -TCMotorSelPan.delayBox.None = Geen +TCMotorSelPan.delayBox.Plugged = Geen TCMotorSelPan.noDescription = Geen beschrijving beschikbaar. TCMotorSelPan.btn.checkAll = Selecteer Alles TCMotorSelPan.btn.checkNone = Alles wissen diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties index 543cdb9b8..809ce1dc3 100644 --- a/core/resources/l10n/messages_pl.properties +++ b/core/resources/l10n/messages_pl.properties @@ -955,7 +955,7 @@ ComponentInfo.EngineBlock = Blokada silnika unieruchamia silnik wewn\u01 TCMotorSelPan.lbl.Digest = Podsumowanie: TCMotorSelPan.title.Thrustcurve = Krzywa si\u0142y ci\u0105gu: TCMotorSelPan.title.Thrust = Ci\u0105g - TCMotorSelPan.delayBox.None = \u017Badne + TCMotorSelPan.delayBox.Plugged = \u017Badne ! PlotDialog diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index 8cb858eaa..384cd6175 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -1083,7 +1083,7 @@ TCMotorSelPan.SHOW_DESCRIPTIONS.desc1 = Mostrar todos os motores TCMotorSelPan.SHOW_DESCRIPTIONS.desc2 = Mostrar motores com um di\u00e2metro menor do que a montagem do motor TCMotorSelPan.SHOW_DESCRIPTIONS.desc3 = Mostrar motores com um di\u00e2metro igual ao da montagem do motor TCMotorSelPan.checkbox.hideSimilar = Esconder as curvas de impulso muito semelhantes -TCMotorSelPan.delayBox.None = Nenhum +TCMotorSelPan.delayBox.Plugged = Nenhum TCMotorSelPan.lbl.Avgthrust = Empuxo m\u00e9dio: TCMotorSelPan.lbl.Burntime = Tempo de queima: TCMotorSelPan.lbl.Datapoints = Pontos de dados: diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index ff9fb718f..5ba12023c 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -1322,7 +1322,7 @@ TCMotorSelPan.lbl.Datapoints = \u0422\u043E\u0447\u043A\u0438 \u0434\u0430\u043D TCMotorSelPan.lbl.Digest = \u0420\u0435\u0437\u044E\u043C\u0435: TCMotorSelPan.title.Thrustcurve = \u041F\u0440\u043E\u0444\u0438\u043B\u044C \u0442\u044F\u0433\u0438: TCMotorSelPan.title.Thrust = \u0422\u044F\u0433\u0430 -TCMotorSelPan.delayBox.None = \u041D\u0435\u0442 +TCMotorSelPan.delayBox.Plugged = \u041D\u0435\u0442 TCMotorSelPan.noDescription = \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442. TCMotorSelPan.btn.checkAll = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435 TCMotorSelPan.btn.checkNone = \u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0432\u044B\u0431\u043E\u0440 diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index 4ee5519ba..3928e5a6e 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -1114,7 +1114,7 @@ TCMotorSelPan.lbl.Datapoints = Data points: TCMotorSelPan.lbl.Digest = Digest: TCMotorSelPan.title.Thrustcurve = Thrust curve: TCMotorSelPan.title.Thrust = Thrust -TCMotorSelPan.delayBox.None = Plugged (None) +TCMotorSelPan.delayBox.Plugged = Plugged (None) TCMotorSelPan.noDescription = No description available. TCMotorSelPan.btn.checkAll = Select All TCMotorSelPan.btn.checkNone = Clear All diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index 230b4b75f..15438da9a 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -1188,7 +1188,7 @@ TCMotorSelPan.checkbox.hideSimilar = \u9690\u85CF\u76F8\u4F3C\u7684\u63A8\u TCMotorSelPan.checkbox.hideUsed = \u9690\u85CF\u5DF2\u4F7F\u7528\u7684\u53D1\u52A8\u673A TCMotorSelPan.checkbox.limitdiameter = \u76F4\u5F84\u4E0D\u8D85\u8FC7\u5F53\u524D\u53D1\u52A8\u673A\u5EA7\u76F4\u5F84 TCMotorSelPan.checkbox.limitlength = \u957F\u5EA6\u4E0D\u8D85\u8FC7\u5F53\u524D\u53D1\u52A8\u673A\u5EA7\u957F\u5EA6 -TCMotorSelPan.delayBox.None = \u65E0 +TCMotorSelPan.delayBox.Plugged = \u65E0 TCMotorSelPan.lbl.Avgthrust = \u5E73\u5747\u63A8\u529B: TCMotorSelPan.lbl.Burntime = \u71C3\u70E7\u65F6\u95F4: TCMotorSelPan.lbl.Datapoints = \u6570\u636E\u70B9: 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 5e538125a..4e074d816 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 @@ -185,7 +185,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec return; } //// None - if (sel.equalsIgnoreCase(trans.get("TCMotorSelPan.delayBox.None"))) { + if (sel.equalsIgnoreCase(trans.get("TCMotorSelPan.delayBox.Plugged")) || + sel.equalsIgnoreCase(trans.get("TCMotorSelPan.delayBox.PluggedNone"))) { selectedDelay = Motor.PLUGGED_DELAY; } else { try { @@ -667,7 +668,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec private void setDelays(boolean reset) { if (selectedMotor == null) { //// None - delayBox.setModel(new DefaultComboBoxModel(new String[] { trans.get("TCMotorSelPan.delayBox.None") })); + delayBox.setModel(new DefaultComboBoxModel(new String[] { trans.get("TCMotorSelPan.delayBox.Plugged") })); delayBox.setSelectedIndex(0); } else { List delays = selectedMotorSet.getDelays(); @@ -678,11 +679,11 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec for (int i = 0; i < delays.size(); i++) { //// None - delayStrings[i] = ThrustCurveMotor.getDelayString(delays.get(i), trans.get("TCMotorSelPan.delayBox.None")); + delayStrings[i] = ThrustCurveMotor.getDelayString(delays.get(i), trans.get("TCMotorSelPan.delayBox.Plugged")); } // We always want the plugged option in the combobox, even if the motor doesn't have it if (!containsPlugged) { - delayStrings[delayStrings.length - 1] = trans.get("TCMotorSelPan.delayBox.None"); + delayStrings[delayStrings.length - 1] = trans.get("TCMotorSelPan.delayBox.Plugged"); } delayBox.setModel(new DefaultComboBoxModel(delayStrings)); @@ -697,15 +698,15 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec } if (!Double.isNaN(closest)) { selectedDelay = closest; - delayBox.setSelectedItem(ThrustCurveMotor.getDelayString(closest, trans.get("TCMotorSelPan.delayBox.None"))); + delayBox.setSelectedItem(ThrustCurveMotor.getDelayString(closest, trans.get("TCMotorSelPan.delayBox.Plugged"))); } else { //// None - delayBox.setSelectedItem(trans.get("TCMotorSelPan.delayBox.None")); + delayBox.setSelectedItem(trans.get("TCMotorSelPan.delayBox.Plugged")); } } else { selectedDelay = currentDelay; - delayBox.setSelectedItem(ThrustCurveMotor.getDelayString(currentDelay, trans.get("TCMotorSelPan.delayBox.None"))); + delayBox.setSelectedItem(ThrustCurveMotor.getDelayString(currentDelay, trans.get("TCMotorSelPan.delayBox.Plugged"))); } }