diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 801eb18c3..b1719fd2f 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -916,15 +916,14 @@ RocketCompCfg.lbl.longA1 = The component finish affects the aerodynamic dr RocketCompCfg.lbl.longA2 = The value indicated is the average roughness height of the surface. RocketCompCfg.but.Setforall = Set for all RocketCompCfg.but.ttip.Setforall = Set this finish for all components of the rocket. -RocketCompCfg.lbl.Overridemassorcenter = Override the mass or center of gravity of the RocketCompCfg.checkbox.Overridemass = Override mass: RocketCompCfg.checkbox.Overridemass.ttip = Overrides the mass of the component calculated by the component's volume and density. RocketCompCfg.checkbox.Overridecenterofgrav = Override center of gravity: RocketCompCfg.checkbox.Overridecenterofgrav.ttip = Overrides the component's center of gravity location. -RocketCompCfg.checkbox.SetDragCoeff = Set coefficient of drag: +RocketCompCfg.checkbox.SetDragCoeff = Override coefficient of drag: RocketCompCfg.checkbox.SetDragCoeff.ttip = Overrides the component's coefficient of drag. -RocketCompCfg.checkbox.OverridemassandCG = Override mass and CG of all subcomponents -RocketCompCfg.checkbox.OverridemassandCG.ttip = Overrides the aggregate mass and center of gravity (CG) of this component
and its subcomponents with the mass and CG of this component. +RocketCompCfg.checkbox.OverrideSubcomponents = Override mass, CG, and CD of all subcomponents +RocketCompCfg.checkbox.OverrideSubcomponents.ttip = Overrides the aggregate mass, center of gravity (CG), and coefficient of drag (CD) of this component
and its subcomponents with the mass, CG, and CD of this component. RocketCompCfg.lbl.longB1 = The overridden mass and center of gravity does not include motors.
RocketCompCfg.lbl.longB2 = The center of gravity is measured from the front end of the RocketCompCfg.lbl.Commentsonthe = Comments on the diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties index 3d2ebb086..cbde32398 100644 --- a/core/resources/l10n/messages_cs.properties +++ b/core/resources/l10n/messages_cs.properties @@ -640,10 +640,9 @@ RocketCompCfg.lbl.longA1 = Povrchov RocketCompCfg.lbl.longA2 = Hodnota odpovídá prumerné hrubosti povrchu. RocketCompCfg.but.Setforall = Nastav pro v\u0161echny RocketCompCfg.but.ttip.Setforall = Nastav povrchovou úpravu pro v\u0161echny komponenty rakety. -RocketCompCfg.lbl.Overridemassorcenter = Zmen hmotnost nebo te\u017Ei\u0161te RocketCompCfg.checkbox.Overridemass = Zmen hmotnost: RocketCompCfg.checkbox.Overridecenterofgrav = Zmen te\u017Ei\u0161te: -RocketCompCfg.checkbox.OverridemassandCG = Zmen hmotnost a te\u017Ei\u0161te v\u0161ech komponent +RocketCompCfg.checkbox.OverrideSubcomponents = Zmen hmotnost a te\u017Ei\u0161te v\u0161ech komponent RocketCompCfg.lbl.longB1 = Zmena hmotnosti nezahrnuje motory.
RocketCompCfg.lbl.longB2 = Te\u017Ei\u0161te je mereno od predku RocketCompCfg.lbl.Commentsonthe = Komentár na diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties index 2b756618a..80f565efa 100644 --- a/core/resources/l10n/messages_es.properties +++ b/core/resources/l10n/messages_es.properties @@ -831,7 +831,7 @@ RocketCompCfg.but.ttip.Setforall = Aplicar este acabado a todos RocketCompCfg.checkbox.Endcapped = Extremo tapado RocketCompCfg.checkbox.Overridecenterofgrav = Especificar el CG: RocketCompCfg.checkbox.Overridemass = Especificar la masa: -RocketCompCfg.checkbox.OverridemassandCG = Incluir la masa y el CG de todos los subcomponentes +RocketCompCfg.checkbox.OverrideSubcomponents = Incluir la masa y el CG de todos los subcomponentes RocketCompCfg.checkbox.Usedefaultcolor = Usar color por defecto RocketCompCfg.combo.ttip.componentmaterialaffects = El peso del componente depender\u00e1 del material seleccionado. RocketCompCfg.lbl.Choosecolor = Elija color @@ -847,7 +847,6 @@ RocketCompCfg.lbl.Diameter = Di\u00e1metro: RocketCompCfg.lbl.Figurestyle = Estilo de dibujo: RocketCompCfg.lbl.Length = Longitud: RocketCompCfg.lbl.Mass = Masa: -RocketCompCfg.lbl.Overridemassorcenter = Especificar la masa y el CG del componente RocketCompCfg.lbl.Thickness = Espesor: RocketCompCfg.lbl.longA1 = El Coeficiente de rozamiento depender\u00e1 del acabado del componente.
RocketCompCfg.lbl.longA2 = El valor indicado es el promedio de la rugosidad en altura de la superficie. diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties index 551c474a9..57709d450 100644 --- a/core/resources/l10n/messages_fr.properties +++ b/core/resources/l10n/messages_fr.properties @@ -823,7 +823,7 @@ RocketCompCfg.checkbox.Endcapped = Arri\u00E8re clos RocketCompCfg.checkbox.Overridecenterofgrav = Forcer le centre de gravit\u00E9: RocketCompCfg.checkbox.Overridecoeffofdrag = Modifier le coefficient de trainee: RocketCompCfg.checkbox.Overridemass = Forcer la masse: -RocketCompCfg.checkbox.OverridemassandCG = Forcer la masse et le centre de gravit\u00E9 de tous les sous composants +RocketCompCfg.checkbox.OverrideSubcomponents = Forcer la masse et le centre de gravit\u00E9 de tous les sous composants RocketCompCfg.checkbox.Usedefaultcolor = Utiliser la couleur par d\u00E9faut RocketCompCfg.combo.ttip.componentmaterialaffects = Les mat\u00E9riaux utilis\u00E9s pour la pi\u00E8ce affectent le poids de la pi\u00E8ce. RocketCompCfg.lbl.Choosecolor = Choisir la couleur @@ -839,7 +839,6 @@ RocketCompCfg.lbl.Diameter = Diam\u00E8tre: RocketCompCfg.lbl.Figurestyle = Mod\u00E8le de forme: RocketCompCfg.lbl.Length = Longueur: RocketCompCfg.lbl.Mass = Masse: -RocketCompCfg.lbl.Overridemassorcenter = Forcer la masse ou le centre de gravit\u00E9 du RocketCompCfg.lbl.Thickness = Epaisseur: RocketCompCfg.lbl.longA1 = La finition de la pi\u00E8ce affecte l'a\u00E9rodynamisme de la pi\u00E8ce.
RocketCompCfg.lbl.longA2 = La valeur indiqu\u00E9e est la hauteur moyenne de la rugosit\u00E9 de la surface. diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties index d27278f71..30e240111 100644 --- a/core/resources/l10n/messages_it.properties +++ b/core/resources/l10n/messages_it.properties @@ -698,10 +698,9 @@ RocketCompCfg.lbl.longA1 = La finitura del componente influisce sull'aerod RocketCompCfg.lbl.longA2 = Il valore indicato e' la media dell'altezza delle asperita' della superficie. RocketCompCfg.but.Setforall = Imposta per tutti RocketCompCfg.but.ttip.Setforall = Imposta questa finitura per tutti i componenti del razzo. -RocketCompCfg.lbl.Overridemassorcenter = Modifica la massa o il centro di gravita' del RocketCompCfg.checkbox.Overridemass = Modifica la massa: RocketCompCfg.checkbox.Overridecenterofgrav = Sposta il centro di gravita': -RocketCompCfg.checkbox.OverridemassandCG = Modifica la massa ed il CG di tutti i subcomponenti +RocketCompCfg.checkbox.OverrideSubcomponents = Modifica la massa ed il CG di tutti i subcomponenti RocketCompCfg.lbl.longB1 = La massa modificata non include i motori.
RocketCompCfg.lbl.longB2 = Il Centro di Gravita' e' misurato dall'inizio di RocketCompCfg.lbl.Commentsonthe = Commenti sul diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties index 639f7e797..d2b35d286 100644 --- a/core/resources/l10n/messages_ja.properties +++ b/core/resources/l10n/messages_ja.properties @@ -728,10 +728,9 @@ RocketCompCfg.lbl.longA1 = \u4ED5\u4E0A\u3052\u65B9\u306F\u6297\u529B\u4F RocketCompCfg.lbl.longA2 = \u3053\u306E\u5024\u306F\u8868\u9762\u7C97\u3055\u306E\u5E73\u5747\u5024\u3092\u793A\u3059 RocketCompCfg.but.Setforall = \u5168\u3066\u306B\u9069\u7528 RocketCompCfg.but.ttip.Setforall = \u3053\u306E\u4ED5\u4E0A\u3052\u65B9\u3092\u5168\u3066\u306E\u90E8\u54C1\u306B\u9069\u7528\u3059\u308B -RocketCompCfg.lbl.Overridemassorcenter = \u8CEA\u91CF\u3084\u91CD\u5FC3\u306E\u518D\u5B9A\u7FA9\u3000 RocketCompCfg.checkbox.Overridemass = \u8CEA\u91CF\u306E\u518D\u5B9A\u7FA9\uFF1A RocketCompCfg.checkbox.Overridecenterofgrav = \u91CD\u5FC3\u306E\u518D\u5B9A\u7FA9\uFF1A -RocketCompCfg.checkbox.OverridemassandCG = \u5168\u3066\u306E\u30B5\u30D6\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u8CEA\u91CF\u3068CG\u3092\u518D\u5B9A\u7FA9\uFF1A +RocketCompCfg.checkbox.OverrideSubcomponents = \u5168\u3066\u306E\u30B5\u30D6\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u8CEA\u91CF\u3068CG\u3092\u518D\u5B9A\u7FA9\uFF1A RocketCompCfg.lbl.longB1 = \u518D\u5B9A\u7FA9\u3055\u308C\u305F\u8CEA\u91CF\u306B\u306F\u30E2\u30FC\u30BF\u30FC\u306F\u542B\u307E\u308C\u306A\u3044
RocketCompCfg.lbl.longB2 = \u91CD\u5FC3\u306F\u90E8\u54C1\u306E\u524D\u65B9\u7AEF\u304B\u3089\u3001\u90E8\u54C1\uFF1A RocketCompCfg.lbl.Commentsonthe = \u30B3\u30E1\u30F3\u30C8\uFF1A diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties index 743cbfd9d..7c73fb9b1 100644 --- a/core/resources/l10n/messages_nl.properties +++ b/core/resources/l10n/messages_nl.properties @@ -848,11 +848,10 @@ RocketCompCfg.lbl.longA1 = De afwerking van het onderdeel beïnvloedt de l RocketCompCfg.lbl.longA2 = De aangegeven waarde is de gemiddelde ruwheidshoogte van het oppervlak. RocketCompCfg.but.Setforall = Instellen voor alle RocketCompCfg.but.ttip.Setforall = Stel deze afwerking in voor alle onderdelen van de raket. -RocketCompCfg.lbl.Overridemassorcenter = Overschrijf de massa of het zwaartepunt van de RocketCompCfg.checkbox.Overridemass = Overschrijf massa: RocketCompCfg.checkbox.Overridecenterofgrav = Overschrijf zwaartepunt: RocketCompCfg.checkbox.SetDragCoeff = Stel wrijvingscoëfficiënt in: -RocketCompCfg.checkbox.OverridemassandCG = Massa en zwaartepunt van alle subonderdelen overschrijven +RocketCompCfg.checkbox.OverrideSubcomponents = Massa en zwaartepunt van alle subonderdelen overschrijven RocketCompCfg.lbl.longB1 = De overschreven massa omvat geen motoren.
RocketCompCfg.lbl.longB2 = Het zwaartepunt wordt gemeten vanaf de voorkant van de RocketCompCfg.lbl.Commentsonthe = Opmerkingen over de diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties index 14c8d5388..e8311050b 100644 --- a/core/resources/l10n/messages_pl.properties +++ b/core/resources/l10n/messages_pl.properties @@ -642,10 +642,9 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s. RocketCompCfg.lbl.longA2 = Wskazana warto\u015B\u0107 okre\u015Bla przeci\u0119tn\u0105 chropowato\u015B\u0107 powierzchni. RocketCompCfg.but.Setforall = Ustaw dla wszystkich RocketCompCfg.but.ttip.Setforall = Nadaj to wyko\u0144czenie wszystkim cz\u0119\u015Bci\u0105 sk\u0142adow\u0105 rakiety. - RocketCompCfg.lbl.Overridemassorcenter = Wymu\u015B ci\u0119\u017Car b\u0105d\u017A \u015Brodek ci\u0119\u017Cko\u015Bci dla - RocketCompCfg.checkbox.Overridemass = Wymu\u015B ci\u0119\u017Car: + RocketCompCfg.checkbox.Overridemass = Wymu\u015B ci\u0119\u017Car: RocketCompCfg.checkbox.Overridecenterofgrav = Wymu\u015B \u015Brodek ci\u0119\u017Cko\u015Bci: - RocketCompCfg.checkbox.OverridemassandCG = Wymu\u015B ci\u0119\u017Car oraz \u015Brodek ci\u0119\u017Cko\u015Bci wszystkich dodatkowych cz\u0119\u015Bci sk\u0142adowych + RocketCompCfg.checkbox.OverrideSubcomponents = Wymu\u015B ci\u0119\u017Car oraz \u015Brodek ci\u0119\u017Cko\u015Bci wszystkich dodatkowych cz\u0119\u015Bci sk\u0142adowych RocketCompCfg.lbl.longB1 = Wymuszony ci\u0119\u017Car nie uwzgl\u0119dnia silników.
RocketCompCfg.lbl.longB2 = \u015Arodek ci\u0119\u017Cko\u015Bci jest mierzony od przodu RocketCompCfg.lbl.Commentsonthe = Uwagi - diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties index 3e91ae460..85b28b7e2 100644 --- a/core/resources/l10n/messages_pt.properties +++ b/core/resources/l10n/messages_pt.properties @@ -809,7 +809,7 @@ RocketCompCfg.checkbox.Endcapped = Fim tampado RocketCompCfg.checkbox.Overridecenterofgrav = Modificar o centro de gravidade: RocketCompCfg.checkbox.Overridecoeffofdrag = Modificar o coeficiente de arrasto: RocketCompCfg.checkbox.Overridemass = Modificar massa: -RocketCompCfg.checkbox.OverridemassandCG = Modificar a massa e o CG de todos os subcomponentes +RocketCompCfg.checkbox.OverrideSubcomponents = Modificar a massa e o CG de todos os subcomponentes RocketCompCfg.checkbox.Usedefaultcolor = Use a cor padr\u00e3o RocketCompCfg.combo.ttip.componentmaterialaffects = O material do componente afeta o peso do componente. RocketCompCfg.lbl.Choosecolor = Escolha a cor @@ -825,7 +825,6 @@ RocketCompCfg.lbl.Diameter = Di\u00e2metro: RocketCompCfg.lbl.Figurestyle = Estilo da figura: RocketCompCfg.lbl.Length = Comprimento: RocketCompCfg.lbl.Mass = Massa: -RocketCompCfg.lbl.Overridemassorcenter = Modificar a massa ou o centro de gravidade do RocketCompCfg.lbl.Thickness = Espessura: RocketCompCfg.lbl.longA1 = O acabamento do componente afeta o arrasto aerodin\u00e2mico do componente.
RocketCompCfg.lbl.longA2 = O valor indicado \u00e9 a altura m\u00e9dia da rugosidade da superf\u00edcie. diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index fe73ee0c3..d2e3e3dcd 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -913,11 +913,10 @@ RocketCompCfg.lbl.longA1 = \u041E\u0442\u0434\u0435\u043B\u043A\u0430 \u04 RocketCompCfg.lbl.longA2 = \u0423\u043A\u0430\u0437\u0430\u043D\u043E \u0441\u0440\u0435\u0434\u043D\u0435\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u0448\u0435\u0440\u043E\u0445\u043E\u0432\u0430\u0442\u043E\u0441\u0442\u0438. RocketCompCfg.but.Setforall = \u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0434\u043B\u044F \u0432\u0441\u0435\u0445 RocketCompCfg.but.ttip.Setforall = \u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u044D\u0442\u0443 \u0448\u0435\u0440\u043E\u0445\u043E\u0432\u0430\u0442\u043E\u0441\u0442\u044C \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432 \u0440\u0430\u043A\u0435\u0442\u044B. -RocketCompCfg.lbl.Overridemassorcenter = \u041F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C \u043C\u0430\u0441\u0441\u0443 \u0438\u043B\u0438 \u0446\u0435\u043D\u0442\u0440 \u0442\u044F\u0436\u0435\u0441\u0442\u0438 - RocketCompCfg.checkbox.Overridemass = \u041F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C \u043C\u0430\u0441\u0441\u0443: RocketCompCfg.checkbox.Overridecenterofgrav = \u041F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C \u0446\u0435\u043D\u0442\u0440 \u0442\u044F\u0436\u0435\u0441\u0442\u0438: RocketCompCfg.checkbox.SetDragCoeff = \u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u043A\u043E\u044D\u0444\u0444\u0438\u0446\u0438\u0435\u043D\u0442 \u0441\u043E\u043F\u0440\u043E\u0442\u0438\u0432\u043B\u0435\u043D\u0438\u044F: -RocketCompCfg.checkbox.OverridemassandCG = \u041F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C \u043C\u0430\u0441\u0441\u0443 \u0438 \u0426\u0422 \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043F\u043E\u0434\u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432: +RocketCompCfg.checkbox.OverrideSubcomponents = \u041F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C \u043C\u0430\u0441\u0441\u0443 \u0438 \u0426\u0422 \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043F\u043E\u0434\u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u043E\u0432: RocketCompCfg.lbl.longB1 = \u041F\u0435\u0440\u0435\u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043D\u0430\u044F \u043C\u0430\u0441\u0441\u0430 \u043D\u0435 \u0432\u043A\u043B\u044E\u0447\u0430\u0435\u0442 \u0432 \u0441\u0435\u0431\u044F \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0438.
RocketCompCfg.lbl.longB2 = \u0426\u0435\u043D\u0442\u0440 \u0442\u044F\u0436\u0435\u0441\u0442\u0438 \u0438\u0437\u043C\u0435\u0440\u044F\u0435\u0442\u0441\u044F \u043E\u0442 \u043D\u0430\u0447\u0430\u043B\u0430 RocketCompCfg.lbl.Commentsonthe = \u041F\u0440\u0438\u043C\u0435\u0447\u0430\u043D\u0438\u044F - diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties index 4cb554daa..09c8a5319 100644 --- a/core/resources/l10n/messages_uk_UA.properties +++ b/core/resources/l10n/messages_uk_UA.properties @@ -799,11 +799,10 @@ RocketCompCfg.lbl.longA1 = The component finish affects the aerodynamic dr RocketCompCfg.lbl.longA2 = The value indicated is the average roughness height of the surface. RocketCompCfg.but.Setforall = Set for all RocketCompCfg.but.ttip.Setforall = Set this finish for all components of the rocket. -RocketCompCfg.lbl.Overridemassorcenter = Override the mass or center of gravity of the RocketCompCfg.checkbox.Overridemass = Override mass: RocketCompCfg.checkbox.Overridecenterofgrav = Override center of gravity: RocketCompCfg.checkbox.Overridecoeffofdrag = Override coefficient of drag: -RocketCompCfg.checkbox.OverridemassandCG = Override mass and CG of all subcomponents +RocketCompCfg.checkbox.OverrideSubcomponents = Override mass and CG of all subcomponents RocketCompCfg.lbl.longB1 = The overridden mass does not include motors.
RocketCompCfg.lbl.longB2 = The center of gravity is measured from the front end of the RocketCompCfg.lbl.Commentsonthe = Comments on the diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties index 1b326fa08..9049a78c9 100644 --- a/core/resources/l10n/messages_zh_CN.properties +++ b/core/resources/l10n/messages_zh_CN.properties @@ -897,7 +897,7 @@ RocketCompCfg.but.ttip.Setforall = \u5BF9\u6240\u6709\u7684\u7E RocketCompCfg.checkbox.Endcapped = \u6709\u7AEF\u76D6 RocketCompCfg.checkbox.Overridecenterofgrav = \u8986\u5199\u91CD\u5FC3: RocketCompCfg.checkbox.Overridemass = \u8986\u5199\u8D28\u91CF: -RocketCompCfg.checkbox.OverridemassandCG = \u8986\u5199\u6240\u6709\u7EC4\u4EF6\u7684\u91CD\u91CF\u548C\u91CD\u5FC3 +RocketCompCfg.checkbox.OverrideSubcomponents = \u8986\u5199\u6240\u6709\u7EC4\u4EF6\u7684\u91CD\u91CF\u548C\u91CD\u5FC3 RocketCompCfg.checkbox.Usedefaultcolor = \u9ED8\u8BA4\u989C\u8272 RocketCompCfg.combo.ttip.componentmaterialaffects = \u7EC4\u4EF6\u6750\u6599\u5C06\u4F1A\u5F71\u54CD\u5230\u7EC4\u4EF6\u91CD\u91CF. RocketCompCfg.lbl.Choosecolor = \u989C\u8272\u9009\u62E9 @@ -913,7 +913,6 @@ RocketCompCfg.lbl.Diameter = \u76F4\u5F84: RocketCompCfg.lbl.Figurestyle = \u6837\u5F0F: RocketCompCfg.lbl.Length = \u957F\u5EA6: RocketCompCfg.lbl.Mass = \u8D28\u91CF: -RocketCompCfg.lbl.Overridemassorcenter = \u8986\u5199\u91CD\u91CF\u6216\u91CD\u5FC3 RocketCompCfg.lbl.Thickness = \u539A\u5EA6: RocketCompCfg.lbl.longA1 = \u8868\u9762\u5904\u7406\u5C06\u4F1A\u5F71\u54CD\u5230\u7EC4\u4EF6\u7684\u7A7A\u6C14\u52A8\u529B.
RocketCompCfg.lbl.longA2 = \u8BE5\u6570\u503C\u4E3A\u5E73\u5747\u8868\u9762\u7C97\u7CD9\u5EA6. diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index b9034ac91..aaa4dedcd 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -411,8 +411,6 @@ public class RocketComponentConfig extends JPanel { JPanel panel = new JPanel(new MigLayout("align 50% 20%, fillx, gap rel unrel", "[][65lp::][30lp::][]", "")); //// Override the mass or center of gravity of the - panel.add(new StyledLabel(trans.get("RocketCompCfg.lbl.Overridemassorcenter") + " " + - component.getComponentName() + ":", Style.BOLD), "spanx, wrap 20lp"); JCheckBox check; BooleanModel bm; @@ -501,14 +499,6 @@ public class RocketComponentConfig extends JPanel { //END OVERRIDES CG --------------------------------------------------- - // Override subcomponents checkbox - bm = new BooleanModel(component, "OverrideSubcomponents"); - check = new JCheckBox(bm); - //// Override mass and CG of all subcomponents - check.setText(trans.get("RocketCompCfg.checkbox.OverridemassandCG")); - check.setToolTipText(trans.get("RocketCompCfg.checkbox.OverridemassandCG.ttip")); - panel.add(check, "spanx, wrap 35lp"); - //BEGIN OVERRIDES CD --------------------------------------------------- @@ -530,10 +520,18 @@ public class RocketComponentConfig extends JPanel { bs = new BasicSlider(m.getSliderModel(0, 1.0)); bm.addEnableComponent(bs); - panel.add(bs, "growx 5, w 100lp, wrap"); + panel.add(bs, "skip, growx 5, w 100lp, wrap"); - //END OVERRIDES CP -------------------------------------------------- + //END OVERRIDES CD -------------------------------------------------- + + // Override subcomponents checkbox + bm = new BooleanModel(component, "OverrideSubcomponents"); + check = new JCheckBox(bm); + //// Override mass and CG of all subcomponents + check.setText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents")); + check.setToolTipText(trans.get("RocketCompCfg.checkbox.OverrideSubcomponents.ttip")); + panel.add(check, "spanx, wrap 35lp"); //// The overridden mass does not include motors. panel.add(new StyledLabel(trans.get("RocketCompCfg.lbl.longB1") +