hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied patch for l10n supplied by Russian Uss.

Browse Source
This commit is contained in:
Kevin Ruland 2012-08-20 02:02:38 +00:00
parent 3aedbaa19f
commit da430d3611
10 changed files with 1490 additions and 1305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/resources/l10n/messages.properties
View File

@ -169,6 +169,9 @@ debuglogdlg.lbl.Logmessage = Log message:
debuglogdlg.lbl.Stacktrace = Stack trace:
! MotorChooserDialog
MotorChooserDialog.title = Select a rocket motor
! Edit Motor configuration dialog
edtmotorconfdlg.but.removemotor = Remove motor
edtmotorconfdlg.but.Selectmotor = Select motor
@ -1111,7 +1114,13 @@ main.menu.debug.createtestrocket = Create test rocket
! Translate here all material database
!
Material.CUSTOM = Custom
! Material database
Databases.materials.types.Bulk = Bulk
Databases.materials.types.Line = Line
Databases.materials.types.Surface = Surface
! BULK_MATERIAL
Databases.materials.Acrylic = Acrylic
Databases.materials.Aluminum = Aluminum
@ -1186,8 +1195,8 @@ Shape.Ellipsoid = Ellipsoid
Shape.Ellipsoid.desc1 = An ellipsoidal nose cone has a profile of a half-ellipse with major axes of lengths 2&times;<i>Length</i> and <i>Diameter</i>.
Shape.Ellipsoid.desc2 = An ellipsoidal transition has a profile of a half-ellipse with major axes of lengths 2&times;<i>Length</i> and <i>Diameter</i>. If the transition is not clipped, then the profile is extended at the center by the corresponding radius.
Shape.Powerseries = Power series
Shape.Powerseries.desc1 = A power series nose cone has a profile of <i>Radius</i>&nbsp;&times;&nbsp;(<i>x</i>&nbsp;/&nbsp;<i>Length</i>)<sup><i>k</i></sup> where <i>k</i> is the shape parameter. For <i>k</i>=0.5 this is a <b>\u00BD-power</b> or <b>parabolic</b> nose cone, for <i>k</i>=0.75 a <b>\u00BE-power</b>, and for <i>k</i>=1 a <b>conical</b> nose cone.
Shape.Powerseries.desc2 = A power series transition has a profile of <i>Radius</i>&nbsp;&times;&nbsp;(<i>x</i>&nbsp;/&nbsp;<i>Length</i>)<sup><i>k</i></sup> where <i>k</i> is the shape parameter. For <i>k</i>=0.5 the transition is <b>\u00BD-power</b> or <b>parabolic</b>, for <i>k</i>=0.75 a <b>\u00BE-power</b>, and for <i>k</i>=1 <b>conical</b>.
Shape.Powerseries.desc1 = A power series nose cone has a profile of <i>Radius</i>&nbsp;&times;&nbsp;(<i>x</i>&nbsp;/&nbsp;<i>Length</i>)<sup><i>k</i></sup> where <i>k</i> is the shape parameter. For <i>k</i>=0.5 this is a <b>\u00bd-power</b> or <b>parabolic</b> nose cone, for <i>k</i>=0.75 a <b>\u00be-power</b>, and for <i>k</i>=1 a <b>conical</b> nose cone.
Shape.Powerseries.desc2 = A power series transition has a profile of <i>Radius</i>&nbsp;&times;&nbsp;(<i>x</i>&nbsp;/&nbsp;<i>Length</i>)<sup><i>k</i></sup> where <i>k</i> is the shape parameter. For <i>k</i>=0.5 the transition is <b>\u00bd-power</b> or <b>parabolic</b>, for <i>k</i>=0.75 a <b>\u00be-power</b>, and for <i>k</i>=1 <b>conical</b>.
Shape.Parabolicseries = Parabolic series
Shape.Parabolicseries.desc1 = A parabolic series nose cone has a profile of a parabola. The shape parameter defines the segment of the parabola to utilize. The shape parameter 1.0 produces a <b>full parabola</b> which is tangent to the body tube, 0.75 produces a <b>3/4 parabola</b>, 0.5 procudes a <b>1/2 parabola</b> and 0 produces a <b>conical</b> nose cone.
Shape.Parabolicseries.desc2 = A parabolic series transition has a profile of a parabola. The shape parameter defines the segment of the parabola to utilize. The shape parameter 1.0 produces a <b>full parabola</b> which is tangent to the body tube at the aft end, 0.75 produces a <b>3/4 parabola</b>, 0.5 procudes a <b>1/2 parabola</b> and 0 produces a <b>conical</b> transition.
@ -1237,6 +1246,14 @@ Parachute.Parachute = Parachute
ShockCord.ShockCord = Shock cord
! Bulkhead
Bulkhead.Bulkhead = Bulkhead
! CenteringRing
CenteringRing.CenteringRing = Centering ring
! EngineBlock
EngineBlock.EngineBlock = Engine block
! Streamer
Streamer.Streamer = Streamer
! Sleeve
Sleeve.Sleeve = Sleeve
!Rocket
Rocket.motorCount.Nomotor = [No motors]

2731
core/resources/l10n/messages_ru.properties
View File

File diff suppressed because it is too large Load Diff

7
core/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
View File

@ -22,7 +22,7 @@ import net.sf.openrocket.util.Reflection;
public class MaterialModel extends AbstractListModel implements
ComboBoxModel, ComponentChangeListener, DatabaseListener<Material> {
private static final String CUSTOM = "Custom";
private final String custom;
private final Component parentComponent;
@ -47,6 +47,7 @@ public class MaterialModel extends AbstractListModel implements
this.parentComponent = parent;
this.component = component;
this.type = type;
this.custom = trans.get ("Material.CUSTOM");
switch (type) {
case LINE:
@ -90,7 +91,7 @@ public class MaterialModel extends AbstractListModel implements
return;
}
if (item == CUSTOM) {
if (item == custom) {
// Open custom material dialog in the future, after combo box has closed
SwingUtilities.invokeLater(new Runnable() {
@ -129,7 +130,7 @@ public class MaterialModel extends AbstractListModel implements
@Override
public Object getElementAt(int index) {
if (index == database.size()) {
return CUSTOM;
return custom;
} else if (index >= database.size()+1) {
return null;
}

2
core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java
View File

@ -29,7 +29,7 @@ public class MotorChooserDialog extends JDialog implements CloseableDialog {
public MotorChooserDialog(Motor current, double delay, double diameter, Window owner) {
super(owner, "Select a rocket motor", Dialog.ModalityType.APPLICATION_MODAL);
super(owner, trans.get ("MotorChooserDialog.title"), Dialog.ModalityType.APPLICATION_MODAL);
// Check that the motor database has been loaded properly
MotorDatabaseLoadingDialog.check(null);

10
core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java
View File

@ -63,7 +63,7 @@ public class PlotConfiguration implements Cloneable {
configs.add(config);
//// Stability vs. time
config = new PlotConfiguration("Stability vs. time");
config = new PlotConfiguration(trans.get("PlotConfiguration.Stability"));
config.addPlotDataType(FlightDataType.TYPE_STABILITY, 0);
config.addPlotDataType(FlightDataType.TYPE_CP_LOCATION, 1);
config.addPlotDataType(FlightDataType.TYPE_CG_LOCATION, 1);
@ -76,7 +76,7 @@ public class PlotConfiguration implements Cloneable {
configs.add(config);
//// Drag coefficients vs. Mach number
config = new PlotConfiguration("Drag coefficients vs. Mach number",
config = new PlotConfiguration(trans.get("PlotConfiguration.Dragcoef"),
FlightDataType.TYPE_MACH_NUMBER);
config.addPlotDataType(FlightDataType.TYPE_DRAG_COEFF, 0);
config.addPlotDataType(FlightDataType.TYPE_FRICTION_DRAG_COEFF, 0);
@ -85,7 +85,7 @@ public class PlotConfiguration implements Cloneable {
configs.add(config);
//// Roll characteristics
config = new PlotConfiguration("Roll characteristics");
config = new PlotConfiguration(trans.get("PlotConfiguration.Rollcharacteristics"));
config.addPlotDataType(FlightDataType.TYPE_ROLL_RATE, 0);
config.addPlotDataType(FlightDataType.TYPE_ROLL_MOMENT_COEFF, 1);
config.addPlotDataType(FlightDataType.TYPE_ROLL_FORCING_COEFF, 1);
@ -100,7 +100,7 @@ public class PlotConfiguration implements Cloneable {
configs.add(config);
//// Angle of attack and orientation vs. time
config = new PlotConfiguration("Angle of attack and orientation vs. time");
config = new PlotConfiguration(trans.get("PlotConfiguration.Angleofattack"));
config.addPlotDataType(FlightDataType.TYPE_AOA, 0);
config.addPlotDataType(FlightDataType.TYPE_ORIENTATION_PHI);
config.addPlotDataType(FlightDataType.TYPE_ORIENTATION_THETA);
@ -113,7 +113,7 @@ public class PlotConfiguration implements Cloneable {
configs.add(config);
//// Simulation time step and computation time
config = new PlotConfiguration("Simulation time step and computation time");
config = new PlotConfiguration(trans.get("PlotConfiguration.Simulationtime"));
config.addPlotDataType(FlightDataType.TYPE_TIME_STEP);
config.addPlotDataType(FlightDataType.TYPE_COMPUTATION_TIME);
config.setEvent(FlightEvent.Type.IGNITION, true);

2
core/src/net/sf/openrocket/material/Material.java
View File

@ -30,7 +30,7 @@ public abstract class Material implements Comparable<Material> {
private final UnitGroup units;
private Type(String name, UnitGroup units) {
this.name = name;
this.name = trans.get ("Databases.materials.types." + name);
this.units = units;
}

6
core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
View File

@ -1,7 +1,9 @@
package net.sf.openrocket.rocketcomponent;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.ComponentPreset.Type;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Coordinate;
@ -12,6 +14,8 @@ public class CenteringRing extends RadiusRingComponent {
setInnerRadiusAutomatic(true);
setLength(0.002);
}
private static final Translator trans = Application.getTranslator();
@Override
@ -56,7 +60,7 @@ public class CenteringRing extends RadiusRingComponent {
@Override
public String getComponentName() {
return "Centering ring";
return trans.get ("CenteringRing.CenteringRing");
}
@Override

6
core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java
View File

@ -1,11 +1,15 @@
package net.sf.openrocket.rocketcomponent;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.ComponentPreset.Type;
import net.sf.openrocket.startup.Application;
public class EngineBlock extends ThicknessRingComponent {
private static final Translator trans = Application.getTranslator();
public EngineBlock() {
super();
setOuterRadiusAutomatic(true);
@ -20,7 +24,7 @@ public class EngineBlock extends ThicknessRingComponent {
@Override
public String getComponentName() {
return "Engine block";
return trans.get ("EngineBlock.EngineBlock");
}
@Override

5
core/src/net/sf/openrocket/rocketcomponent/Sleeve.java
View File

@ -1,5 +1,7 @@
package net.sf.openrocket.rocketcomponent;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.MathUtil;
@ -12,6 +14,7 @@ import net.sf.openrocket.util.MathUtil;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class Sleeve extends RingComponent {
private static final Translator trans = Application.getTranslator();
protected double innerRadius = 0;
protected double thickness = 0;
@ -91,7 +94,7 @@ public class Sleeve extends RingComponent {
@Override
public String getComponentName() {
return "Sleeve";
return trans.get ("Sleeve.Sleeve");
}
@Override

5
core/src/net/sf/openrocket/rocketcomponent/Streamer.java
View File

@ -1,7 +1,9 @@
package net.sf.openrocket.rocketcomponent;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.ComponentPreset.Type;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.MathUtil;
public class Streamer extends RecoveryDevice {
@ -10,6 +12,7 @@ public class Streamer extends RecoveryDevice {
public static final double MAX_COMPUTED_CD = 0.4;
private static final Translator trans = Application.getTranslator();
private double stripLength;
private double stripWidth;
@ -120,7 +123,7 @@ public class Streamer extends RecoveryDevice {
@Override
public String getComponentName() {
return "Streamer";
return trans.get ("Streamer.Streamer");
}
@Override