From db0f47600db98b2e8083a2523e6443b92bfaf2c9 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sat, 15 Sep 2012 22:54:27 +0000 Subject: [PATCH] More localization updates by Ruslan Uss. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@1024 180e2498-e6e9-4542-8430-84ac67f01cd8 --- core/resources/l10n/messages.properties | 12 ++++++++++++ core/resources/l10n/messages_ru.properties | 13 +++++++++++++ .../gui/dialogs/ComponentAnalysisDialog.java | 16 ++++++++-------- .../thrustcurve/ThrustCurveMotorColumns.java | 16 ++++++++-------- .../ThrustCurveMotorSelectionPanel.java | 2 +- 5 files changed, 42 insertions(+), 17 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 6df6b713..1c68f3fd 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -630,6 +630,8 @@ componentanalysisdlg.lbl.reflenght = Reference length: componentanalysisdlg.lbl.refarea = Reference area: !componentanalysisdlg.But.close =Close componentanalysisdlg.TabStability.Col.Component = Component +componentanalysisdlg.TOTAL = Total +componentanalysisdlg.noWarnings = No warnings. ! Custom Material dialog custmatdlg.title.Custommaterial = Custom material @@ -1047,6 +1049,7 @@ TCMotorSelPan.lbl.Digest = Digest: TCMotorSelPan.title.Thrustcurve = Thrust curve: TCMotorSelPan.title.Thrust = Thrust TCMotorSelPan.delayBox.None = None +TCMotorSelPan.noDescription = No description available. ! PlotDialog @@ -1330,6 +1333,15 @@ TCurveMotorCol.TYPE = Type TCurveMotorCol.DIAMETER = Diameter TCurveMotorCol.LENGTH = Length +TCurveMotor.ttip.diameter = Diameter: +TCurveMotor.ttip.length = Length: +TCurveMotor.ttip.maxThrust = Maximum thrust: +TCurveMotor.ttip.avgThrust = Average thrust: +TCurveMotor.ttip.burnTime = Burn time: +TCurveMotor.ttip.totalImpulse = Total impulse: +TCurveMotor.ttip.launchMass = Launch mass: +TCurveMotor.ttip.emptyMass = Empty mass: + ! RocketInfo RocketInfo.lengthLine.Length = Length RocketInfo.lengthLine.maxdiameter = , max. diameter diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties index 21382492..6731930e 100644 --- a/core/resources/l10n/messages_ru.properties +++ b/core/resources/l10n/messages_ru.properties @@ -629,6 +629,9 @@ componentanalysisdlg.TabStability.Col.Component = \u041a\u043e\u043c\u043f\u043e componentanalysisdlg.TabStability.Col.CG = \u0426\u0422 componentanalysisdlg.TabStability.Col.Mass = \u041c\u0430\u0441\u0441\u0430 componentanalysisdlg.TabStability.Col.CP = \u0426\u0414 +componentanalysisdlg.TOTAL = \u0412\u0441\u0435\u0433\u043e +componentanalysisdlg.noWarnings = \u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0439 \u043d\u0435\u0442. + ! Custom Material dialog custmatdlg.title.Custommaterial = \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b @@ -1046,6 +1049,7 @@ 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.noDescription = \u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442. ! PlotDialog @@ -1329,6 +1333,15 @@ TCurveMotorCol.TYPE = \u0422\u0438\u043f TCurveMotorCol.DIAMETER = \u0414\u0438\u0430\u043c\u0435\u0442\u0440 TCurveMotorCol.LENGTH = \u0414\u043b\u0438\u043d\u0430 +TCurveMotor.ttip.diameter = \u0414\u0438\u0430\u043c\u0435\u0442\u0440: +TCurveMotor.ttip.length = \u0414\u043b\u0438\u043d\u0430: +TCurveMotor.ttip.maxThrust = \u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0430\u044f \u0442\u044f\u0433\u0430: +TCurveMotor.ttip.avgThrust = \u0421\u0440\u0435\u0434\u043d\u044f\u044f \u0442\u044f\u0433\u0430: +TCurveMotor.ttip.burnTime = \u0412\u0440\u0435\u043c\u044f \u0433\u043e\u0440\u0435\u043d\u0438\u044f: +TCurveMotor.ttip.totalImpulse = \u041e\u0431\u0449\u0438\u0439 \u0438\u043c\u043f\u0443\u043b\u044c\u0441: +TCurveMotor.ttip.launchMass = \u0421\u0442\u0430\u0440\u0442\u043e\u0432\u0430\u044f \u043c\u0430\u0441\u0441\u0430: +TCurveMotor.ttip.emptyMass = \u041c\u0430\u0441\u0441\u0430 \u0431\u0435\u0437 \u0442\u043e\u043f\u043b\u0438\u0432\u0430: + ! RocketInfo RocketInfo.lengthLine.Length = \u0414\u043b\u0438\u043d\u0430 RocketInfo.lengthLine.maxdiameter = , \u043c\u0430\u043a\u0441. \u0434\u0438\u0430\u043c\u0435\u0442\u0440 diff --git a/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java index c0f66394..9f5064ed 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java @@ -119,7 +119,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener { roll = new DoubleModel(rocketPanel, "CPRoll", UnitGroup.UNITS_ROLL); //// Wind direction: - panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.winddir")), "width 100lp!"); + panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.winddir")), "width 120lp!"); panel.add(new UnitSelector(theta, true), "width 50lp!"); BasicSlider slider = new BasicSlider(theta.getSliderModel(0, 2 * Math.PI)); panel.add(slider, "growx, split 2"); @@ -149,17 +149,17 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener { panel.add(scrollPane, "gap paragraph, spany 4, width 300lp!, growy 1, height :100lp:, wrap"); ////Angle of attack: - panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack")), "width 100lp!"); + panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack")), "width 120lp!"); panel.add(new UnitSelector(aoa, true), "width 50lp!"); panel.add(new BasicSlider(aoa.getSliderModel(0, Math.PI)), "growx, wrap"); //// Mach number: - panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.machnumber")), "width 100lp!"); + panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.machnumber")), "width 120lp!"); panel.add(new UnitSelector(mach, true), "width 50lp!"); panel.add(new BasicSlider(mach.getSliderModel(0, 3)), "growx, wrap"); //// Roll rate: - panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.rollrate")), "width 100lp!"); + panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.rollrate")), "width 120lp!"); panel.add(new UnitSelector(roll, true), "width 50lp!"); panel.add(new BasicSlider(roll.getSliderModel(-20 * 2 * Math.PI, 20 * 2 * Math.PI)), "growx, wrap paragraph"); @@ -193,7 +193,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener { public Object getValueAt(int row) { RocketComponent c = cpData.get(row).getComponent(); if (c instanceof Rocket) { - return "Total"; + return trans.get("componentanalysisdlg.TOTAL"); } return c.toString(); } @@ -268,7 +268,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener { public Object getValueAt(int row) { RocketComponent c = dragData.get(row).getComponent(); if (c instanceof Rocket) { - return "Total"; + return trans.get("componentanalysisdlg.TOTAL"); } return c.toString(); } @@ -342,7 +342,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener { public Object getValueAt(int row) { RocketComponent c = rollData.get(row).getComponent(); if (c instanceof Rocket) { - return "Total"; + return trans.get("componentanalysisdlg.TOTAL"); } return c.toString(); } @@ -541,7 +541,7 @@ public class ComponentAnalysisDialog extends JDialog implements ChangeListener { // Set warnings if (set.isEmpty()) { warningList.setListData(new String[] { - "No warnings." + trans.get("componentanalysisdlg.noWarnings") }); } else { warningList.setListData(new Vector(set)); diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java index d4cefca2..7520a01b 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java @@ -116,28 +116,28 @@ enum ThrustCurveMotorColumns { tip += "" + desc.replace("\n", "
") + "
"; } - tip += ("Diameter: " + + tip += (trans.get("TCurveMotor.ttip.diameter") + " " + UnitGroup.UNITS_MOTOR_DIMENSIONS.getDefaultUnit().toStringUnit(m.getDiameter()) + "
"); - tip += ("Length: " + + tip += (trans.get("TCurveMotor.ttip.length") + " " + UnitGroup.UNITS_MOTOR_DIMENSIONS.getDefaultUnit().toStringUnit(m.getLength()) + "
"); - tip += ("Maximum thrust: " + + tip += (trans.get("TCurveMotor.ttip.maxThrust") + " " + UnitGroup.UNITS_FORCE.getDefaultUnit().toStringUnit(m.getMaxThrustEstimate()) + "
"); - tip += ("Average thrust: " + + tip += (trans.get("TCurveMotor.ttip.avgThrust") + " " + UnitGroup.UNITS_FORCE.getDefaultUnit().toStringUnit(m.getAverageThrustEstimate()) + "
"); - tip += ("Burn time: " + + tip += (trans.get("TCurveMotor.ttip.burnTime") + " " + UnitGroup.UNITS_SHORT_TIME.getDefaultUnit() .toStringUnit(m.getBurnTimeEstimate()) + "
"); - tip += ("Total impulse: " + + tip += (trans.get("TCurveMotor.ttip.totalImpulse") + " " + UnitGroup.UNITS_IMPULSE.getDefaultUnit() .toStringUnit(m.getTotalImpulseEstimate()) + "
"); - tip += ("Launch mass: " + + tip += (trans.get("TCurveMotor.ttip.launchMass") + " " + UnitGroup.UNITS_MASS.getDefaultUnit().toStringUnit(m.getLaunchCG().weight) + "
"); - tip += ("Empty mass: " + + tip += (trans.get("TCurveMotor.ttip.emptyMass") + " " + UnitGroup.UNITS_MASS.getDefaultUnit() .toStringUnit(m.getEmptyCG().weight)); return tip; diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index a78fec48..7deaaa8f 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -763,7 +763,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec s = s.trim(); if (s.length() == 0) { //// No description available. - comment.setText("No description available."); + comment.setText(trans.get("TCMotorSelPan.noDescription")); comment.setFont(noCommentFont); comment.setForeground(NO_COMMENT_COLOR); } else { -- 2.30.2