diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index e05c59987..70531726d 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -865,6 +865,12 @@ FinSetConfig.ttip.Tabheight = The spanwise height of the fin tab. FinSetConfig.lbl.Tabposition = Tab position: FinSetConfig.ttip.Tabposition = The position of the fin tab. FinSetConfig.lbl.relativeto = relative to +FinSetConfig.title.RootFillets = Root Fillets +FinSetConfig.lbl.Finfilletmaterial = Fillet material: +FinSetConfig.lbl.Filletradius = Fillet radius: +FinsetConfig.ttip.Finfillets1 = Adds the predicted mass of fin fillets to the root of the fins.
+FinsetConfig.ttip.Finfillets2 = Assumes the fillet is concave and tangent to the body tube and fin.
+FinsetConfig.ttip.Finfillets3 = Zero radius will give no fillet. !FinMarkingGuide FinMarkingGuide.lbl.Front = Front @@ -1331,13 +1337,6 @@ TrapezoidFinSetCfg.lbl.plus = plus TrapezoidFinSetCfg.tab.General = General TrapezoidFinSetCfg.tab.Generalproperties = General properties -! Fin Fillets -FinSetCfg.lbl.Finfilletmaterial = Fillet material: -FinSetCfg.lbl.Filletradius = Fillet radius: -FinsetCfg.ttip.Finfillets1 = Adds the predicted mass of fin fillets to the root of the fins.
-FinsetCfg.ttip.Finfillets2 = Assumes the fillet is concave and tangent to the body tube and fin.
-FinsetCfg.ttip.Finfillets3 = Zero radius will give no fillet. - ! Save RKT Warning Dialog SaveRktWarningDialog.txt1=Exporting to RockSim file format does not support all features of OpenRocket. SaveRktWarningDialog.donotshow=Do not show this dialog again diff --git a/core/resources/l10n/messages_ar.properties b/core/resources/l10n/messages_ar.properties index ad2d8fac7..2cc68a831 100644 --- a/core/resources/l10n/messages_ar.properties +++ b/core/resources/l10n/messages_ar.properties @@ -1290,11 +1290,11 @@ TrapezoidFinSetCfg.tab.General = عام TrapezoidFinSetCfg.tab.Generalproperties = خصائص عامة ! Fin Fillets -FinSetCfg.lbl.Finfilletmaterial = :مادة الشريحة -FinSetCfg.lbl.Filletradius = :نصف قطر الشريحة -FinsetCfg.ttip.Finfillets1 = .يضيف الكتلة المتوقعة لشرائح الزعانف إلى جذر الزعانف
-FinsetCfg.ttip.Finfillets2 = .يفترض أن الشرائح مقعرة وماسة لأنبوب الجسم والزعنفة
-FinsetCfg.ttip.Finfillets3 = .لن يعطي نصف القطر الصفري أي شرائح +FinSetConfig.lbl.Finfilletmaterial = :مادة الشريحة +FinSetConfig.lbl.Filletradius = :نصف قطر الشريحة +FinsetConfig.ttip.Finfillets1 = .يضيف الكتلة المتوقعة لشرائح الزعانف إلى جذر الزعانف
+FinsetConfig.ttip.Finfillets2 = .يفترض أن الشرائح مقعرة وماسة لأنبوب الجسم والزعنفة
+FinsetConfig.ttip.Finfillets3 = .لن يعطي نصف القطر الصفري أي شرائح ! Save RKT Warning Dialog SaveRktWarningDialog.txt1= .لا يدعم التصدير إلى تنسيق ملف روكسيم جميع ميزات أوبنروكت diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index 4af03a02b..d25062186 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -1152,11 +1152,11 @@ TrapezoidFinSetCfg.tab.General = Algemeen TrapezoidFinSetCfg.tab.Generalproperties = Algemene eigenschappen ! Fin Fillets -FinSetCfg.lbl.Finfilletmaterial = Fillet materiaal: -FinSetCfg.lbl.Filletradius = Fillet straal: -FinsetCfg.ttip.Finfillets1 = Voegt de voorspelde massa van de vin fillets toe aan de basis van de vinnen.
-FinsetCfg.ttip.Finfillets2 = Veronderstelt dat de fillet concaaf is en raakt aan de buis en de vin.
-FinsetCfg.ttip.Finfillets3 = Nul radius geeft geen fillet. +FinSetConfig.lbl.Finfilletmaterial = Fillet materiaal: +FinSetConfig.lbl.Filletradius = Fillet straal: +FinsetConfig.ttip.Finfillets1 = Voegt de voorspelde massa van de vin fillets toe aan de basis van de vinnen.
+FinsetConfig.ttip.Finfillets2 = Veronderstelt dat de fillet concaaf is en raakt aan de buis en de vin.
+FinsetConfig.ttip.Finfillets3 = Nul radius geeft geen fillet. ! Save RKT Warning Dialog SaveRktWarningDialog.txt1 = Exporteren naar RockSim bestandsformaat ondersteunt niet alle functies van OpenRocket. diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index 6d768a919..254b1eff0 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -1266,11 +1266,11 @@ TrapezoidFinSetCfg.tab.General = \u041E\u0441\u043D\u043E\u0432\u043D\u043E\u043 TrapezoidFinSetCfg.tab.Generalproperties = \u041E\u0441\u043D\u043E\u0432\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B ! Fin Fillets -FinSetCfg.lbl.Finfilletmaterial = \u041C\u0430\u0442\u0435\u0440\u0438\u0430\u043B \u0433\u0430\u043B\u0442\u0435\u043B\u0438: -FinSetCfg.lbl.Filletradius = \u0420\u0430\u0434\u0438\u0443\u0441 \u0433\u0430\u043B\u0442\u0435\u043B\u0438: -FinsetCfg.ttip.Finfillets1 = \u0414\u043E\u0431\u0430\u0432\u043B\u044F\u0435\u0442 \u043F\u0440\u0435\u0434\u0441\u043A\u0430\u0437\u0430\u043D\u043D\u0443\u044E \u043C\u0430\u0441\u0441\u0443 \u0433\u0430\u043B\u0442\u0435\u043B\u0435\u0439 \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u043E\u0432 \u043A \u043E\u0441\u043D\u043E\u0432\u0430\u043D\u0438\u044E \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u043E\u0432.
-FinsetCfg.ttip.Finfillets2 = \u041F\u0440\u0435\u0434\u043F\u043E\u043B\u0430\u0433\u0430\u0435\u0442\u0441\u044F, \u0447\u0442\u043E \u0433\u0430\u043B\u0442\u0435\u043B\u044C \u043A\u0430\u0441\u0430\u0435\u0442\u0441\u044F \u0442\u0440\u0443\u0431\u044B \u043A\u043E\u0440\u043F\u0443\u0441\u0430 \u0438 \u0440\u0435\u0431\u0440\u0430.
-FinsetCfg.ttip.Finfillets3 = \u041D\u0443\u043B\u0435\u0432\u043E\u0439 \u0440\u0430\u0434\u0438\u0443\u0441 \u043E\u0437\u043D\u0430\u0447\u0430\u0435\u0442, \u0447\u0442\u043E \u0433\u0430\u043B\u0442\u0435\u043B\u0435\u0439 \u043D\u0435\u0442. +FinSetConfig.lbl.Finfilletmaterial = \u041C\u0430\u0442\u0435\u0440\u0438\u0430\u043B \u0433\u0430\u043B\u0442\u0435\u043B\u0438: +FinSetConfig.lbl.Filletradius = \u0420\u0430\u0434\u0438\u0443\u0441 \u0433\u0430\u043B\u0442\u0435\u043B\u0438: +FinsetConfig.ttip.Finfillets1 = \u0414\u043E\u0431\u0430\u0432\u043B\u044F\u0435\u0442 \u043F\u0440\u0435\u0434\u0441\u043A\u0430\u0437\u0430\u043D\u043D\u0443\u044E \u043C\u0430\u0441\u0441\u0443 \u0433\u0430\u043B\u0442\u0435\u043B\u0435\u0439 \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u043E\u0432 \u043A \u043E\u0441\u043D\u043E\u0432\u0430\u043D\u0438\u044E \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u043E\u0432.
+FinsetConfig.ttip.Finfillets2 = \u041F\u0440\u0435\u0434\u043F\u043E\u043B\u0430\u0433\u0430\u0435\u0442\u0441\u044F, \u0447\u0442\u043E \u0433\u0430\u043B\u0442\u0435\u043B\u044C \u043A\u0430\u0441\u0430\u0435\u0442\u0441\u044F \u0442\u0440\u0443\u0431\u044B \u043A\u043E\u0440\u043F\u0443\u0441\u0430 \u0438 \u0440\u0435\u0431\u0440\u0430.
+FinsetConfig.ttip.Finfillets3 = \u041D\u0443\u043B\u0435\u0432\u043E\u0439 \u0440\u0430\u0434\u0438\u0443\u0441 \u043E\u0437\u043D\u0430\u0447\u0430\u0435\u0442, \u0447\u0442\u043E \u0433\u0430\u043B\u0442\u0435\u043B\u0435\u0439 \u043D\u0435\u0442. ! Save RKT Warning Dialog SaveRktWarningDialog.txt1 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0432 \u0444\u043E\u0440\u043C\u0430\u0442 \u0444\u0430\u0439\u043B\u0430 RockSim \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0432\u0441\u0435 \u0444\u0443\u043D\u043A\u0446\u0438\u0438 OpenRocket. diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index 095ff0766..27202fd55 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -272,8 +272,8 @@ FinSet.TabRelativePosition.CENTER = \u7FFC\u6839\u5F26\u4E2D\u70B9 FinSet.TabRelativePosition.END = \u7FFC\u6839\u5F26\u540E\u7F18 FinSet.TabRelativePosition.FRONT = \u7FFC\u6839\u5F26\u524D\u7F18 -FinSetCfg.lbl.Filletradius = \u63A5\u7F1D\u534A\u5F84: -FinSetCfg.lbl.Finfilletmaterial = \u63A5\u7F1D\u6750\u6599: +FinSetConfig.lbl.Filletradius = \u63A5\u7F1D\u534A\u5F84: +FinSetConfig.lbl.Finfilletmaterial = \u63A5\u7F1D\u6750\u6599: FinSetConfig.Convertfinset = \u8F6C\u6362\u7FFC FinSetConfig.but.AutoCalc = \u81EA\u52A8\u8BA1\u7B97 @@ -293,9 +293,9 @@ FinSetConfig.ttip.Tabheight = \u7FFC\u5C55\u65B9\u5411\u7684\u9AD8\u FinSetConfig.ttip.Tablength = \u7FFC\u677F\u7684\u957F\u5EA6. FinSetConfig.ttip.Tabposition = \u7FFC\u677F\u7684\u4F4D\u7F6E. -FinsetCfg.ttip.Finfillets1 = \u5C06\u9884\u4F30\u8D28\u91CF\u6DFB\u52A0\u5230\u7FFC\u6839\u90E8.
-FinsetCfg.ttip.Finfillets2 = \u5047\u5B9A\u63A5\u7F1D\u5185\u51F9\u4E14\u548C\u7BAD\u4F53\u3001\u7FFC\u677F\u76F8\u5207.
-FinsetCfg.ttip.Finfillets3 = \u65E0\u63A5\u7F1D\u60C5\u51B5\u4E0B\u5C06\u8BBE\u5B9A\u63A5\u7F1D\u534A\u5F84\u4E3A0. +FinsetConfig.ttip.Finfillets1 = \u5C06\u9884\u4F30\u8D28\u91CF\u6DFB\u52A0\u5230\u7FFC\u6839\u90E8.
+FinsetConfig.ttip.Finfillets2 = \u5047\u5B9A\u63A5\u7F1D\u5185\u51F9\u4E14\u548C\u7BAD\u4F53\u3001\u7FFC\u677F\u76F8\u5207.
+FinsetConfig.ttip.Finfillets3 = \u65E0\u63A5\u7F1D\u60C5\u51B5\u4E0B\u5C06\u8BBE\u5B9A\u63A5\u7F1D\u534A\u5F84\u4E3A0. FlightDataType.TYPE_ACCELERATION_TOTAL = \u603B\u52A0\u901F\u5EA6 FlightDataType.TYPE_ACCELERATION_XY = \u6A2A\u5411\u52A0\u901F\u5EA6 diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java index e32301cea..3a061017b 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java @@ -5,7 +5,6 @@ import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import javax.swing.BorderFactory; @@ -20,7 +19,6 @@ import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.SpinnerEditor; -import net.sf.openrocket.gui.adaptors.CustomFocusTraversalPolicy; import net.sf.openrocket.gui.adaptors.DoubleModel; import net.sf.openrocket.gui.adaptors.EnumModel; import net.sf.openrocket.gui.adaptors.MaterialModel; @@ -549,13 +547,13 @@ public abstract class FinSetConfig extends RocketComponentConfig { protected JPanel filletMaterialPanel(){ JPanel filletPanel=new JPanel(new MigLayout("", "[][65lp::][30lp::]")); - String tip = trans.get("FinsetCfg.ttip.Finfillets1") + - trans.get("FinsetCfg.ttip.Finfillets2") + - trans.get("FinsetCfg.ttip.Finfillets3"); - filletPanel.setBorder(BorderFactory.createTitledBorder("Root Fillets")); + String tip = trans.get("FinsetConfig.ttip.Finfillets1") + + trans.get("FinsetConfig.ttip.Finfillets2") + + trans.get("FinsetConfig.ttip.Finfillets3"); + filletPanel.setBorder(BorderFactory.createTitledBorder(trans.get("FinSetConfig.title.RootFillets"))); // Fillet Radius: - filletPanel.add(new JLabel(trans.get("FinSetCfg.lbl.Filletradius"))); + filletPanel.add(new JLabel(trans.get("FinSetConfig.lbl.Filletradius"))); DoubleModel m = new DoubleModel(component, "FilletRadius", UnitGroup.UNITS_LENGTH, 0); @@ -572,7 +570,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { bs.setToolTipText(tip); // Fillet Material: - JLabel label = new JLabel(trans.get("FinSetCfg.lbl.Finfilletmaterial")); + JLabel label = new JLabel(trans.get("FinSetConfig.lbl.Finfilletmaterial")); label.setToolTipText(tip); //// The component material affects the weight of the component. label.setToolTipText(trans.get("RocketCompCfg.lbl.ttip.componentmaterialaffects"));