diff --git a/core/build.xml b/core/build.xml index c10acd2d6..6ff2e33d6 100644 --- a/core/build.xml +++ b/core/build.xml @@ -60,7 +60,7 @@ - + diff --git a/core/doc/techdoc/chapter-conclusion.tex b/core/doc/techdoc/chapter-conclusion.tex index a2e6a06f6..9098dd28f 100644 --- a/core/doc/techdoc/chapter-conclusion.tex +++ b/core/doc/techdoc/chapter-conclusion.tex @@ -10,7 +10,7 @@ pyrotechnics. At its best, it works as an inspiration for youngsters to study engineering and sciences. This thesis work provides one of the computer-age tools for everybody -intrested in model rocket design. Providing everybody free access to +interested in model rocket design. Providing everybody free access to a full-fledged rocket simulator allows many more hobbyists to experiment with different kinds of rocket designs and become more involved in the sport. The most enthusiastic rocketeers may dive @@ -44,7 +44,7 @@ insight into the effects of roll during flight. The external listener classes that can be attached to the simulator allow huge potential for custom extensions. For example testing the active roll reduction controller that will be included in the -successor project of Haisunäätä would have been exceedingly difficult +successor project of Haisun��t� would have been exceedingly difficult without such support. By interfacing the actual controller with a simulated flight environment it was possible to discover various bugs in the controller software that would otherwise have gone undetected. diff --git a/core/resources/datafiles/tours/creating_design/creating_design.tour b/core/resources/datafiles/tours/creating_design/creating_design.tour index 30529cb46..3e2df9248 100644 --- a/core/resources/datafiles/tours/creating_design/creating_design.tour +++ b/core/resources/datafiles/tours/creating_design/creating_design.tour @@ -113,7 +113,7 @@ mass. The packed length, diameter and position affect the packed size and location of the parachute. -

The Deploys at propery can be used to affect when the +

The Deploys at property can be used to affect when the parachute deploys. The First ejection charge of this stage option will deploy the parachute when the ejection charge is fired, as is typical in small model rockets. diff --git a/core/src/net/sf/openrocket/appearance/AppearanceBuilder.java b/core/src/net/sf/openrocket/appearance/AppearanceBuilder.java index 5dfb7ab3b..f5d07bead 100644 --- a/core/src/net/sf/openrocket/appearance/AppearanceBuilder.java +++ b/core/src/net/sf/openrocket/appearance/AppearanceBuilder.java @@ -523,7 +523,7 @@ public class AppearanceBuilder extends AbstractChangeSource { } /** - * only applies change if there is no more changes comming + * only applies change if there is no more changes coming */ @Override protected void fireChangeEvent() { diff --git a/core/src/net/sf/openrocket/database/Databases.java b/core/src/net/sf/openrocket/database/Databases.java index 6903f6cc9..a2e9fb744 100644 --- a/core/src/net/sf/openrocket/database/Databases.java +++ b/core/src/net/sf/openrocket/database/Databases.java @@ -155,7 +155,7 @@ public class Databases { * @param type The type of material * @param baseName the name of material * @param density density - * @return a new onejct withe the material data + * @return a new object with the material data */ private static Material newMaterial(Type type, String baseName, double density) { String name = trans.get("material", baseName); diff --git a/core/src/net/sf/openrocket/file/GeneralRocketLoader.java b/core/src/net/sf/openrocket/file/GeneralRocketLoader.java index 43b6c5f72..ccea6f823 100644 --- a/core/src/net/sf/openrocket/file/GeneralRocketLoader.java +++ b/core/src/net/sf/openrocket/file/GeneralRocketLoader.java @@ -104,7 +104,7 @@ public class GeneralRocketLoader { } /** - * This method determines the type file contained in the stream then calls the appropriate loading mecahnism. + * This method determines the type file contained in the stream then calls the appropriate loading mechanism. * * If the stream is a gzip file, the argument is wrapped in a GzipInputStream and the rocket loaded. * diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/AxialStageSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/AxialStageSaver.java index a81cc9ac8..1879114aa 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/AxialStageSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/AxialStageSaver.java @@ -20,7 +20,7 @@ public class AxialStageSaver extends ComponentAssemblySaver { if (c.isAfter()) { // yes, this test is redundant. I'm merely paranoid, and attempting to future-proof it if (c.getClass().equals(AxialStage.class)) { - // kept as simply 'stage' for backward compatability + // kept as simply 'stage' for backward compatibility list.add(""); instance.addParams(c, list); list.add(""); diff --git a/core/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java b/core/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java index a988ac8ed..9817a5a08 100644 --- a/core/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java +++ b/core/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java @@ -16,7 +16,7 @@ public class AtmosphericConditions implements Cloneable, Monitorable { /** The standard air pressure (1.01325 bar). */ public static final double STANDARD_PRESSURE = 101325.0; - /** The standard air temperature (20 degrees Celcius). */ + /** The standard air temperature (20 degrees Celsius). */ public static final double STANDARD_TEMPERATURE = 293.15; @@ -83,7 +83,7 @@ public class AtmosphericConditions implements Cloneable, Monitorable { * Return the current speed of sound for dry air. *

* The speed of sound is calculated using the expansion around the temperature 0 C - * c = 331.3 + 0.606*T where T is in Celcius. The result is accurate + * c = 331.3 + 0.606*T where T is in Celsius. The result is accurate * to about 0.5 m/s for temperatures between -30 and 30 C, and within 2 m/s * for temperatures between -55 and 30 C. * @@ -98,7 +98,7 @@ public class AtmosphericConditions implements Cloneable, Monitorable { * Return the current kinematic viscosity of the air. *

* The effect of temperature on the viscosity of a gas can be computed using - * Sutherland's formula. In the region of -40 ... 40 degrees Celcius the effect + * Sutherland's formula. In the region of -40 ... 40 degrees Celsius the effect * is highly linear, and thus a linear approximation is used in its stead. * This is divided by the result of {@link #getDensity()} to achieve the * kinematic viscosity. diff --git a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java index 7fec283d5..4b5e57fdc 100644 --- a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java +++ b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java @@ -222,7 +222,7 @@ public abstract class BaseComponentDTO { } else if ("LINE".equals(type)) { return Material.Type.LINE; } - throw new IllegalArgumentException("Inavlid material type " + type + " specified for Component"); + throw new IllegalArgumentException("Invalid material type " + type + " specified for Component"); } } diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java index cdf63e201..eda70d54b 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java +++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java @@ -28,7 +28,7 @@ public final class FlightConfigurationId implements Comparable

* NOTE: the fin-point axes differ from rocket axes: - * +x within the fin points foreward; +x for the rocket points aft + * +x within the fin points forward; +x for the rocket points aft *

* Moving of the first point in the X-axis is allowed, but this actually moves * all of the other points the corresponding distance back, relative to the first. diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java index ecb4ae5cb..177181168 100644 --- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java +++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java @@ -213,7 +213,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { // } // Check for Tumbling - // Conditions for transision are: + // Conditions for transition are: // apogee reached (if sustainer stage) // and is not already tumbling // and not stable (cg > cp) diff --git a/core/src/net/sf/openrocket/simulation/FlightDataType.java b/core/src/net/sf/openrocket/simulation/FlightDataType.java index ed561400f..bea253490 100644 --- a/core/src/net/sf/openrocket/simulation/FlightDataType.java +++ b/core/src/net/sf/openrocket/simulation/FlightDataType.java @@ -251,7 +251,7 @@ public class FlightDataType implements Comparable { * This returns an existing data type if the symbol matches that of an existing type. * * If the symbol matches but the unit and description information differ, then the old stored datatype - * is erased and the updated version based on the given parametes is returned. + * is erased and the updated version based on the given parameters is returned. * The only exception is if the description or unitgroup are undefined (null or empty string). In this case * we just get these parameters from the existing type when making the new one. * diff --git a/core/src/net/sf/openrocket/util/TestRockets.java b/core/src/net/sf/openrocket/util/TestRockets.java index 13e7c5e45..52fa2c96a 100644 --- a/core/src/net/sf/openrocket/util/TestRockets.java +++ b/core/src/net/sf/openrocket/util/TestRockets.java @@ -1594,7 +1594,7 @@ public class TestRockets { stage2.setName("Stage2"); rocket.addChild(stage2); - // make 2st stage body tube + // make 2nd stage body tube BodyTube bodyTube2 = new BodyTube(12, 1, 0.05); stage2.addChild(bodyTube2); diff --git a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java index a26de0d72..90d8044c0 100644 --- a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java +++ b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java @@ -289,7 +289,7 @@ public class BarrowmanCalculatorTest { AerodynamicCalculator calc = new BarrowmanCalculator(); FlightConfiguration configuration = rocket.getSelectedConfiguration(); - assertTrue("Estes Alpha III should be continous: ", calc.isContinuous(configuration, rocket)); + assertTrue("Estes Alpha III should be continuous: ", calc.isContinuous(configuration, rocket)); } @Test diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins1.rkt b/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins1.rkt index e91d25d50..abe522d7d 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins1.rkt +++ b/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins1.rkt @@ -27,7 +27,7 @@ 0 1 0 - This is a neat design that shows off the ability of RockSim to compute the stability of Assymetrical fin arrangements. + This is a neat design that shows off the ability of RockSim to compute the stability of Asymmetrical fin arrangements. Tim Van Milligan. Visit my web site at: www.ApogeeRockets.com 4 29 diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins2.rkt b/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins2.rkt index ea1c6673c..79324b797 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins2.rkt +++ b/core/test/net/sf/openrocket/file/rocksim/importt/TubeFins2.rkt @@ -27,7 +27,7 @@ 0 1 0 - This is a neat design that shows off the ability of RockSim to compute the stability of Assymetrical fin arrangements. + This is a neat design that shows off the ability of RockSim to compute the stability of Asymmetrical fin arrangements. Tim Van Milligan. Visit my web site at: www.ApogeeRockets.com 4 29 diff --git a/core/test/net/sf/openrocket/masscalc/MassCalculatorTest.java b/core/test/net/sf/openrocket/masscalc/MassCalculatorTest.java index 07ee2fdbb..9ee1587ce 100644 --- a/core/test/net/sf/openrocket/masscalc/MassCalculatorTest.java +++ b/core/test/net/sf/openrocket/masscalc/MassCalculatorTest.java @@ -1030,7 +1030,7 @@ public class MassCalculatorTest extends BaseTestCase { mmt.setOverrideMass(0.213); // cm= 0.21300000g @[1.28900000,0.07700000,0.00000000] - // Fin mass is not overriden + // Fin mass is not overridden // cm= 0.15995232g @[1.23793939,0.07700000,0.00000000] RigidBody boosterData = MassCalculator.calculateStructure(config); diff --git a/core/web/html/actions/updates.php b/core/web/html/actions/updates.php index 0960f6c4e..bb9187cfc 100644 --- a/core/web/html/actions/updates.php +++ b/core/web/html/actions/updates.php @@ -74,7 +74,7 @@ header("Content-type: text/plain"); * Currently all old versions are handled manually. * Update checking was introduced in OpenRocket 0.9.4 * - * We ignore "pre" versions, they are handled exacly like + * We ignore "pre" versions, they are handled exactly like * their non-pre counterparts. */ $version = $_GET["version"]; diff --git a/core/web/htp/contact.htp b/core/web/htp/contact.htp index cea23f889..0b81541bb 100644 --- a/core/web/htp/contact.htp +++ b/core/web/htp/contact.htp @@ -10,7 +10,7 @@

Mailing lists

OpenRocket currently has two mailing lists for - intrested users:

+ interested users:

diff --git a/core/web/htp/news.htp b/core/web/htp/news.htp index 4a612519d..2205e2524 100644 --- a/core/web/htp/news.htp +++ b/core/web/htp/news.htp @@ -45,14 +45,14 @@

15.11.2013: Version 13.11.1 is released! This release contains bug fixes including fixing Tube Coupler configuration, various exceptions in - the flight configuration tab, updated 3d libraris (which didn't really make + the flight configuration tab, updated 3d libraries (which didn't really make it into previous versions).

8.11.2013: Version 13.11 is released! This release simplifies flight configurations by replacing the dialog with the configuration tab. Motor filtering in the motor chooser dialog has been enhanced. - Chineese translations have been added and Russian translations updated. + Chinese translations have been added and Russian translations updated. Updated the 3D libraries, and squashed some bugs introduced by Java 1.7.0_45-b18.

6.10.2013: Version 13.09.1 is @@ -104,7 +104,7 @@

  • Support for fractional inches (1/64) for unit length
  • Added preference for windspeed units separately
  • Added "most recently used files" in File Menu
    • -
  • Improved printed accurracy in fin marking guide
    • +
  • Improved printed accuracy in fin marking guide
  • Calibration rulers added to printed templates
  • Translations in Czech and Polish, numerous updates