796 changed files with 35798 additions and 78000 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,99 @@
 *.DS_Store
 *~
 # /
 /bin
 /build
 /data
 /dists
 /misc
 /stuff
 /thesis
 /rawdump
 /tmp
 /loganalysis
 # /android/
 /android/bin
 # /android-libraries/achartengine/
 /android-libraries/achartengine/gen
 /android-libraries/achartengine/bin
 /android-libraries/achartengine/lint.xml
 # /core/
 /core/loganalysis
 /core/build
 /core/tmp
 /core/misc
 # /core/doc/techdoc/
 /core/doc/techdoc/*.aux
 /core/doc/techdoc/*.dvi
 /core/doc/techdoc/*.out
 /core/doc/techdoc/*.toc
 # /core/resources-src/pix/
 /core/resources-src/pix/sormus.xcf.gz
 /core/resources-src/pix/splashscreen-sormus.png
 /core/resources-src/pix/splashscreen-sormus.xcf.gz
 /swing/build
 /swing/tmp
 # IntelliJ
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 # https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
 # User-specific stuff:
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/shelf
 .idea/dictionaries
 .idea/vcs.xml
 .idea/jsLibraryMappings.xml
 .idea/codeStyles/
 .idea/runConfigurations.xml
 # Sensitive or high-churn files:
 .idea/dataSources.ids
 .idea/dataSources.xml
 .idea/dataSources.local.xml
 .idea/sqlDataSources.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml
 # Gradle:
 .idea/gradle.xml
 .idea/libraries
 # Mongo Explorer plugin:
 .idea/mongoSettings.xml
 ## File-based project format:
 *.iws
 ## Plugin-specific files:
 # IntelliJ
 /out/
 # mpeltonen/sbt-idea plugin
 .idea_modules/
 # JIRA plugin
 atlassian-ide-plugin.xml
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 openrocket.log
 *.snap
 prime/*
 swing/resources/datafiles/presets/system.ser
 swing/resources/datafiles/presets
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
 [submodule "swing/resources-src/datafiles/components"]
 	path = swing/resources-src/datafiles/components-dbcook
 	url = https://github.com/dbcook/openrocket-database.git
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -0,0 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
    <annotationProcessing>
      <profile name="Maven default annotation processors profile" enabled="true">
        <sourceOutputDir name="target/generated-sources/annotations" />
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
        <outputRelativeToContentRoot value="true" />
      </profile>
    </annotationProcessing>
    <bytecodeTargetLevel>
      <module name="OpenRokcet" target="1.7" />
      <module name="SSM_Stuct" target="1.7" />
      <module name="swing" target="11" />
    </bytecodeTargetLevel>
  </component>
 </project>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@ -0,0 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="RemoteRepositoriesConfiguration">
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Central Repository" />
      <option name="url" value="https://repo.maven.apache.org/maven2" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Maven Central repository" />
      <option name="url" value="https://repo1.maven.org/maven2" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="jboss.community" />
      <option name="name" value="JBoss Community repository" />
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
    </remote-repository>
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="MavenProjectsManager">
    <option name="originalFiles">
      <list>
        <option value="$PROJECT_DIR$/swing/pom.xml" />
        <option value="$PROJECT_DIR$/pom.xml" />
      </list>
    </option>
    <option name="ignoredFiles">
      <set>
        <option value="$PROJECT_DIR$/pom.xml" />
        <option value="$PROJECT_DIR$/swing/pom.xml" />
      </set>
    </option>
  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/OpenRocket Core.iml" filepath="$PROJECT_DIR$/OpenRocket Core.iml" />
      <module fileurl="file://$PROJECT_DIR$/OpenRocket Swing.iml" filepath="$PROJECT_DIR$/OpenRocket Swing.iml" />
      <module fileurl="file://$PROJECT_DIR$/OpenRocket Test Libraries.iml" filepath="$PROJECT_DIR$/OpenRocket Test Libraries.iml" />
    </modules>
  </component>
 </project>
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,20 @@
 language: java
 dist: bionic
 sudo: false
 addons:
  apt:
    packages:
      - ant
      - ant-optional
 jdk:
  - openjdk11
  - openjdk13
  - oraclejdk11
  - oraclejdk13
 script:
  - "ant -buildfile build.xml clean check jar unittest"
 notifications:
    webhooks: https://www.travisbuddy.com/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -63,6 +63,7 @@ Right, you've dug into the codebase, found that one nasty line that caused all y
 1. Explain briefly which issue that you are trying to solve, e.g. 'This PR solves #123 in which buttons were displayed as red instead of blue' 
 2. Next explain what the underlying issue was, e.g. 'The problem was that by default Java swing displays buttons as red.' 
 3. Next is how you fixed the issue, e.g. 'Fixed it by overriding the default button color to blue' 
 4. Finally, for other people to test your code, it is good to include a jar file of your fixed OpenRocket. This can be done using ant ([more info here](https://github.com/openrocket/openrocket/wiki/Instructions-to-Build-from-Terminal)). You can upload this jar-file to e.g. Dropbox or Google Drive and include it in your PR, e.g. 'Here is a jar file for testing: ' or if you're really GitHub-savvy, you can add a hyperlink to the 'jar file'-text. If necessary, you can also include information on how to recreate the original issue so that testers can check whether your code solved the issue. If needed, you can also included information about the expected behavior so that others know what your solution should do.
 You can take a look at example PR [#979](https://github.com/openrocket/openrocket/pull/979).
--- a/6
+++ b/6
@ -1,8 +1,4 @@
-2023-11-16 Sibo Van Gool
+2022-02-06 Sibo Van Gool
  * Released version 23.09. See Release Notes for changes.
 2023-02-06 Sibo Van Gool
  * Released version 22.02. See Release Notes of 22.02.beta.01, 22.02.beta.02, 22.02.beta.03, 22.02.beta.04,
    22.02.beta.05, and 22.02.RC.01 for changes.
--- a/Core.iml
+++ b/Core.iml
@ -0,0 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module classpath="eclipse" classpath-dir="$MODULE_DIR$/core" type="JAVA_MODULE" version="4" />
--- a/Swing.iml
+++ b/Swing.iml
@ -0,0 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module classpath="eclipse" classpath-dir="$MODULE_DIR$/swing" type="JAVA_MODULE" version="4" />
--- a/Libraries.iml
+++ b/Libraries.iml
@ -0,0 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module classpath="eclipse" classpath-dir="$MODULE_DIR$/lib-test" type="JAVA_MODULE" version="4" />
--- a/README.md
+++ b/README.md
@ -1,80 +1,64 @@
-# OpenRocket 🚀
+OpenRocket
-
+==========
 OpenRocket is a free, fully featured model rocket simulator that allows you to design and simulate your rockets before actually building and flying them.
 ![Build Status](https://github.com/openrocket/openrocket/actions/workflows/build.yml/badge.svg)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 ![GitHub release](https://img.shields.io/github/release/openrocket/openrocket.svg)
 [![Github Releases (by release)](https://img.shields.io/github/downloads/openrocket/openrocket/latest/total.svg)](https://GitHub.com/openrocket/openrocket/releases/)
 [![openrocket](https://snapcraft.io/openrocket/badge.svg)](https://snapcraft.io/openrocket)
 ![Chocolatey release](https://img.shields.io/chocolatey/v/openrocket)
 [![Join our Discord server!](https://img.shields.io/discord/1073297014814691328?logo=discord)](https://discord.gg/qD2G5v2FAw)
 --------
-## 🛠️ Design, Visualize, and Analyze
+OpenRocket is a free, fully featured model rocket simulator that allows you to design and simulate your rockets before actually building and flying them.
 1. **Design** your rockets using a rich selection of built-in components:
   ![Three-stage rocket - 2D](.github/OpenRocket_home_2D.png)
 2. **Visualize** your masterpiece in 3D:
   ![Three-stage rocket - 3D](.github/OpenRocket_home_3D.png)
 3. **Plot & Analyze** your simulation results for precision and improvements:
   ![Three-stage rocket - Simulation plot](.github/OpenRocket_sim.png)
 ## 🌟 Features
 - **Six-degree-of-freedom flight simulation**
 - **Automatic design optimization**
 - **Realtime simulated altitude, velocity, and acceleration display**
 - **Staging and clustering support**
 - **Export to other simulation programs (RockSim, RASAero II)**
 - **Export component(s) to OBJ file for 3D printing**
 - **Cross-platform (Java-based)**
-... plus many more
+![Three-stage rocket - 2D](.github/OpenRocket_home_2D.png)
 ![Three-stage rocket - 3D](.github/OpenRocket_home_3D.png)
 ![Three-stage rocket - Simulation plot](.github/OpenRocket_sim.png)
-📖 Read more on [our website](https://openrocket.info/) or the [OpenRocket Wiki](http://wiki.openrocket.info).
+The main features include:
-## 💾 Installers
+* Six-degree-of-freedom flight simulation
 * Automatic design optimization
 * Realtime simulated altitude, velocity and acceleration display
 * Staging and clustering support
 * Cross-platform (Java-based)
-You can find the OpenRocket installers [here](https://openrocket.info/downloads.html).
+Read more about it on the [OpenRocket Wiki](http://wiki.openrocket.info).
-## 📝 Release Notes
+Installers
 ----------
 OpenRocket maintains an installer for installing the software and Java runtime. You can find the installers on [our
 website](https://openrocket.info/downloads.html).
 Release Notes
 -------------
 Release notes are available on each [release's page](https://github.com/openrocket/openrocket/releases) or on [our website](https://openrocket.info/release_notes.html).
-## 🚀 Getting started
+License
-
+-------
 The easiest way to get started is to open one of our in-program example designs:
 ![Get started with the example designs](.github/getting-started.png)
-Dive into the essentials: adjust component dimensions, plot a simulation, swap out motors, ... Explore the impact of your changes and, most importantly, enjoy the process! 😊
+OpenRocket is an Open Source project licensed under the [GNU GPL](https://www.gnu.org/licenses/gpl-3.0.en.html). This means that the software is free to use for whatever purposes, and the source code is also available for studying and extending.
-## 💪 Contribute
+Contributing
 ------------
 OpenRocket needs help to become even better. Implementing features, writing documentation and creating example designs are just a few ways of helping. If you are interested in helping make OpenRocket the best rocket simulator out there, please [click here for information on how to get involved](http://openrocket.sourceforge.net/getinvolved.html) and [read the practicalities of contributing here](CONTRIBUTING.md).
-Help us soar higher! Whether it's implementing features, writing documentation, or creating design examples, every contribution matters. Interested? Check out [how to get involved](http://openrocket.sourceforge.net/getinvolved.html) and the [practicalities of contributing](CONTRIBUTING.md).
+**Contributors**
 - Sampo Niskanen, main developer
 - Doug Pedrick, support for RockSim designs, printing
 - Kevin Ruland, Android version
 - Bill Kuker, 3D visualization
 - Richard Graham, geodetic computations
 - Jason Blood, freeform fin set import
 - Boris du Reau, internationalization
 - Daniel Williams, pod support, maintainer
 - Joe Pfeiffer (maintainer)
 - Billy Olsen (maintainer)
 - Sibo Van Gool (maintainer)
 - Neil Weinstock (tester, icons, forum support)
 - H. Craig Miller (tester)
 ### ✨ Contributors
 - [Sampo Niskanen](https://github.com/plaa) - Original developer
 - [Doug Pedrick](https://github.com/rodinia814) - RockSim designs, printing
 - [Kevin Ruland](https://github.com/kruland2607) - Android version
 - [Bill Kuker](https://github.com/bkuker) - 3D visualization
 - [Richard Graham](https://github.com/rdgraham) - Geodetic computations
 - Jason Blood - Freeform fin set import
 - [Boris du Reau](https://github.com/bdureau) - Internationalization
 - [Daniel Williams](https://github.com/teyrana) - Pod support, maintainer
 - [Joe Pfeiffer](https://github.com/JoePfeiffer) - Maintainer
 - [Billy Olsen](https://github.com/wolsen) - Maintainer
 - [Sibo Van Gool](https://github.com/SiboVG) - RASAero file format, 3D OBJ export, dark theme, maintainer
 - [Neil Weinstock](https://github.com/neilweinstock) - Tester, icons, forum support
 - [H. Craig Miller](https://github.com/hcraigmiller) - Tester
-You can view the full list of contributors [here](https://github.com/openrocket/openrocket/graphs/contributors).
+**Translators**
 ### 🌍Translators
 - Tripoli France
 - Tripoli Spain
 - Stefan Lobas / ERIG
@ -84,12 +68,3 @@ You can view the full list of contributors [here](https://github.com/openrocket/
 - Polish Rocketry Society / Łukasz & Alex Kazanski
 - Sibo Van Gool
 - Mohamed Amin Elkebsi
 ## 📜 License
 OpenRocket is proudly open-source under the [GNU GPL](https://www.gnu.org/licenses/gpl-3.0.en.html) license. Feel free to use, study, and extend.
 ---
 ⭐ Please give us a star if you find OpenRocket useful, and spread the word! ⭐
 [![Star History Chart](https://api.star-history.com/svg?repos=openrocket/openrocket&type=Date)](https://star-history.com/#openrocket/openrocket&Date)
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@ -13,98 +13,11 @@ Release Notes
 </div>
 <div id="23.09">
 OpenRocket 23.09 (2023-11-16)
 ------------------------
 You can find a visual overview of what's new for this release on [our website](https://openrocket.info//downloads.html?vers=23.09#whats-new).
 ### Major Updates
 #### New Features:
 * **3D Printing Support: Export any component or combination to OBJ file** (fixes #604)
 * **RASAero compatibility: Import/Export CDX1 files** (fixes #875 and #1147)
 * **Dark mode (normal and high-contrast) and custom UI font size support** (fixes #1089)
 * **Export sim table to CSV** (fixes #2077)
 #### Bug Fixes:
 * **Fix Tube fin drag** (fixes #2065)
 * **Fix Base drag when using Cd override** (fixes base drag hack sim error, fixes #2118)
 * **Fix Atmospheric pressure when using ISA conditions** (fixes #2103)
 * **Properly sanitize XML in ORK file** (eliminates corrupt ORK files, fixes #2051)
 ### Other New Features
 * Bumped app to Java 17
 * Export and import preferences to XML file
 * Display secondary stability unit. This means you can display stability in both calibers *and* percentage of length (fixes #2079)
 * Added "cases" and "manufacturers" substitution in motor config names (fixes #2055 and #2204)
 * Selection of "common name" or "manufacturer's designation" in motor selection table is now reflected everywhere else in the program (fixes #2072)
 * Added "plugged" option in charge delay combobox (fixes #2090)
 * Added motor type to "show details" in motor selection (fixes #2069)
 * Added instances settings in launch lug config (fixes #2035)
 * Account for fin cant in fin root points, and support canted fins in fin marking guide (fixes #2231 and #2242)
 * Set cluster tube separation in absolute or relative units (fixes #1970)
 * Support transparent rendering and export of Photo Studio images (fixes #2076)
 * Added "Select -> Components of same color" and "Select -> None" options (fixes #2129)
 * Remember column width, order and visibility in component preset table (fixes #2357)
 ### Bug Fixes
 * Fixed mass issues with fin sets (fixes #2217)
 * Fixed CG issues for launch lugs and rail buttons (fixes #2040)
 * Improved rail button drag calculations
 * Added parts detail for pods and boosters (fixes #2084)
 * Fixed parachute position when using auto radius (fixes #2036)
 * Fixed pod set and booster marker position under certain circumstances (fixes #2047)
 * Fix CG marker location in top view (fixes #2050)
 * Handle zero-area fins (warn and don't crash with NaN error) (fixes #2032)
 * Don't dispose config dialog when no components are selected in 3D view (fixes #2108)
 * Display ISA values in temp and pressure fields (fixes #2104)
 * Improved simulation of fins on transitions and nose cones (fixes #2113)
 * Cleaned up multi-sim editing (fixes #2138 and #1826)
 * Update ruler units immediately when preferences are changed (fixes #2151)
 * Compute CG and CP based on currently active stages (fixes #2171)
 * Improved mass/CG calculations for fillets (fixes 2209)
 * Set auto radius correctly for mass objects (fixes #2267)
 * Apply radial positioning to multi-engine clusters (fixes #2283)
 * Fixed 3D rendering of fin tabs (fixes #2286)
 * Update recent file list when opening via file association (fixes #2222)
 * Corrected the columns displayed in the component preset table's popup menu, ensuring only relevant columns appear
 * Ensured optimum delay is saved in flight summary and .ork files (fixes #2353)
 * Corrected longitudinal moment of inertia calculations by excluding shoulders (fixes #2278)
 * Fixed exception when setting wind speed to zero (fixes #2386)
 * Fixed unexpected mass and CG override interaction (fixes #2394)
 ### Miscellaneous
 * Updated example rockets (including brand-new two stage example)
 * Show calculated values in override tab (fixes #1629)
 * Decrease minimum FoV to 10 degrees in Photo Studio
 * Increase resolution of launch temperature and pressure to 2 decimal places (fixes #2003)
 * Display Cd override with 3 decimal places
 * Added wiki button to help menu (fixes #2046)
 * Eliminate option to save "some" sim data (fixes #2024)
 * Added OK/Cancel buttons when editing simulations (fixes #2158)
 * Added OK/Cancel buttons when editing preferences (fixes #2266)
 * Added multi-sim edit indicators (fixes #2159)
 * Show warning when motor file has illegal format (fixes #2150)
 * Reset window position if off-screen (fixes #2141)
 * Keep current field value when "auto" option is unchecked (fixes #2096)
 * Open dialog to save design info when first saving file
 * Added '3D Printable Nose Cone and Fins' to example rockets
 * Use more sensible colors for thrust curve selection in motor selection dialog (fixes #2385)
 ...along with numerous other minor fixes and enhancements.
 </div>
 <div id="22.02">
 OpenRocket 22.02 (2023-02-08)
 ------------------------
 You can find a visual overview of what's new for this release on [our website](https://openrocket.info//downloads.html?vers=22.02#whats-new).
 The 22.02 release includes hundreds of new features, bug fixes, and UI improvements, more than we could ever fit into one set of release notes.  These notes summarize the highlights of the entire release; for more detail consult the notes from the five previous public beta releases.
 Please note that version 22.02 is required for Macs running macOS 13.0 or later.
--- a/SUPPORT.md
+++ b/SUPPORT.md
@ -5,12 +5,8 @@ OpenRocket has two main Wiki-pages for documentation:
 * [OpenRocket wiki](http://wiki.openrocket.info/Main_Page)
 * [OpenRocket website](https://openrocket.info/index.html)
 Also check out our tutorials to get you going on OpenRocket:
 * [OpenRocket tutorials](https://openrocket.info/tutorials/)
 Our main communication channel are:
-* [Discord](https://discord.gg/qD2G5v2FAw) = **primary communication channel**
+* [Slack](https://www.rocketryforum.com/forums/rocketry-electronics-software.36/) = **primary communication channel**
 * [OpenRocket forum](https://www.rocketryforum.com/forums/rocketry-electronics-software.36/)
 * [OpenRocket-devel mailing list](https://sourceforge.net/projects/openrocket/lists/openrocket-devel) for discussion related to OpenRocket development, documentation and upcoming features
-* [OpenRocket-announce mailing list](https://sourceforge.net/projects/openrocket/lists/openrocket-announce) for announcements of new OpenRocket versions and developments
+* [OpenRocket-announce mailing list](https://sourceforge.net/projects/openrocket/lists/openrocket-announce) for announcements of new OpenRocket versions and developments
 * [OpenRocket-website](https://lists.sourceforge.net/lists/listinfo/openrocket-website) for discussions around our website ([openrocket.info](openrocket.info))
--- a/build.xml
+++ b/build.xml
@ -29,7 +29,7 @@
    <!-- JAR -->
-	<target name="jar" depends="clean,jar-core,jar-swing">
+	<target name="jar" depends="jar-core,jar-swing">
 	</target>
 	<target name="jar-core" depends="build-core">
--- a/core/.classpath
+++ b/core/.classpath
@ -27,6 +27,7 @@
 	<classpathentry kind="lib" path="lib/logback-classic-1.2.11.jar"/>
 	<classpathentry kind="lib" path="lib/logback-core-1.2.11.jar"/>
 	<classpathentry kind="lib" path="lib/opencsv-5.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.12.0.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-2.2.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-2.2.jar"/>
 	<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.12.0.jar"/>
--- a/core/.project
+++ b/core/.project
@ -14,15 +14,4 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
 			<id>1703042982681</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
 				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
 </projectDescription>
--- a/core/OpenRocket
+++ b/core/OpenRocket
@ -10,7 +10,6 @@
    <libelement value="jar://$MODULE_DIR$/lib/aopalliance.jar!/" />
    <libelement value="jar://$MODULE_DIR$/lib/slf4j-api-1.7.5.jar!/" />
    <libelement value="jar://$MODULE_DIR$/lib/annotation-detector-3.0.2.jar!/" />
    <libelement value="jar://$MODULE_DIR$/lib/obj-0.4.0.jar!/" />
    <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-core-2.2.jar!/" />
    <libelement value="jar://$MODULE_DIR$/../lib-test/hamcrest-2.2.jar!/" />
    <libelement value="jar://$MODULE_DIR$/../lib-test/jmock-2.12.0.jar!/" />
@ -225,15 +224,6 @@
        <SOURCES />
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library>
        <CLASSES>
          <root url="jar://$MODULE_DIR$/lib/obj-0.4.0.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library>
        <CLASSES>
@ -252,15 +242,6 @@
            <SOURCES />
          </library>
        </orderEntry>
    <orderEntry type="module-library">
          <library>
            <CLASSES>
              <root url="jar://$MODULE_DIR$/lib/commons-text-1.10.0!/" />
            </CLASSES>
            <JAVADOC />
            <SOURCES />
          </library>
        </orderEntry>
    <orderEntry type="module-library">
      <library>
        <CLASSES>
--- a/core/build.xml
+++ b/core/build.xml
@ -59,7 +59,7 @@
 		<echo level="info">Java/JVM detail version: ${java.version}</echo>
 		<mkdir dir="${classes.dir}"/>
 		<echo level="info">Compiling main classes</echo>
-		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="17" target="17"/>
+		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="1.8" target="1.8"/>
 	</target>
 	<!-- Executable Eclipse-Jar-In-Jar style JAR -->
--- a/core/doc/techdoc/figures/wind-old/pinkfreq.m
+++ b/core/doc/techdoc/figures/wind-old/pinkfreq.m
--- a/core/doc/techdoc/figures/wind-old/pinktime.m
+++ b/core/doc/techdoc/figures/wind-old/pinktime.m
--- a/core/doc/techdoc/figures/wind/pinkfreq-old.eps
+++ b/core/doc/techdoc/figures/wind/pinkfreq-old.eps
--- a/core/doc/techdoc/figures/wind/pinkfreq.m
+++ b/core/doc/techdoc/figures/wind/pinkfreq.m
--- a/core/doc/techdoc/figures/wind/pinkfreq2.eps
+++ b/core/doc/techdoc/figures/wind/pinkfreq2.eps
--- a/core/doc/techdoc/figures/wind/pinktime-old.eps
+++ b/core/doc/techdoc/figures/wind/pinktime-old.eps
--- a/core/doc/techdoc/figures/wind/pinktime.m
+++ b/core/doc/techdoc/figures/wind/pinktime.m
--- a/core/doc/techdoc/figures/wind/pinktime2.eps
+++ b/core/doc/techdoc/figures/wind/pinktime2.eps
--- a/core/doc/techdoc/figures/wind/pinktimesub.eps
+++ b/core/doc/techdoc/figures/wind/pinktimesub.eps
--- a/core/doc/techdoc/figures/wind/pinktimesub.fig
+++ b/core/doc/techdoc/figures/wind/pinktimesub.fig
--- a/core/doc/techdoc/figures/wind/pinktimesub.m
+++ b/core/doc/techdoc/figures/wind/pinktimesub.m
--- a/core/doc/techdoc/figures/wind/pinktimesub2.eps
+++ b/core/doc/techdoc/figures/wind/pinktimesub2.eps
--- a/core/doc/techdoc/figures/wind/pinktimesub2.fig
+++ b/core/doc/techdoc/figures/wind/pinktimesub2.fig
--- a/core/lib/commons-lang3-3.12.0.jar
+++ b/core/lib/commons-lang3-3.12.0.jar
--- a/core/lib/obj-0.4.0.jar
+++ b/core/lib/obj-0.4.0.jar
--- a/core/resources-src/datafiles/thrustcurves/manual/Klima_A6.eng
+++ b/core/resources-src/datafiles/thrustcurves/manual/Klima_A6.eng
@ -1,13 +1,13 @@
-; Raketenmodellbau Klima GmbH
+; Raketenmodellbau Klima GmbH
-; Official manufacturer thrust data - A6
+; Official manufacturer thrust data - A6
-; Created by Leo Nutz for OpenRocket,
+; Created by Leo Nutz for OpenRocket,
-; released into the Public Domain (3/2014)
+; released into the Public Domain (3/2014)
-A6 18 70 4 0.0035 0.0145 Klima
+A6 18 70 4 0.0035 0.0145 Klima
-   0.088 0.502
+   0.088 0.502
-   0.186 4.601
+   0.186 4.601
-   0.232 7.089
+   0.232 7.089
-   0.314 10.477
+   0.314 10.477
-   0.418 6.713
+   0.418 6.713
-   0.467 3.011
+   0.467 3.011
-   0.501 0.418
+   0.501 0.418
-   0.71 0.0
+   0.71 0.0
--- a/core/resources-src/datafiles/thrustcurves/manual/Klima_B4.eng
+++ b/core/resources-src/datafiles/thrustcurves/manual/Klima_B4.eng
@ -1,27 +1,27 @@
-; Raketenmodellbau Klima GmbH
+; Raketenmodellbau Klima GmbH
-; Official manufacturer thrust data - B4
+; Official manufacturer thrust data - B4
-; Created by Leo Nutz for OpenRocket,
+; Created by Leo Nutz for OpenRocket,
-; released into the Public Domain (3/2014)
+; released into the Public Domain (3/2014)
-B4 18 70 0-4 0.0054 0.0163 Klima
+B4 18 70 0-4 0.0054 0.0163 Klima
-   0.049 0.83
+   0.049 0.83
-   0.096 1.745
+   0.096 1.745
-   0.157 2.946
+   0.157 2.946
-   0.209 3.89
+   0.209 3.89
-   0.273 4.977
+   0.273 4.977
-   0.335 6.093
+   0.335 6.093
-   0.380 7.122
+   0.380 7.122
-   0.411 8.001
+   0.411 8.001
-   0.436 7.065
+   0.436 7.065
-   0.465 6.236
+   0.465 6.236
-   0.516 5.063
+   0.516 5.063
-   0.564 4.462
+   0.564 4.462
-   0.607 4.205
+   0.607 4.205
-   0.669 4.09
+   0.669 4.09
-   0.90 4.09
+   0.90 4.09
-   0.966 3.976
+   0.966 3.976
-   1.025 3.719
+   1.025 3.719
-   1.084 3.261
+   1.084 3.261
-   1.145 2.546
+   1.145 2.546
-   1.212 1.745
+   1.212 1.745
-   1.295 0.772
+   1.295 0.772
-   1.364 0.0
+   1.364 0.0
--- a/core/resources-src/datafiles/thrustcurves/manual/Klima_C2.eng
+++ b/core/resources-src/datafiles/thrustcurves/manual/Klima_C2.eng
@ -1,24 +1,24 @@
-; Raketenmodellbau Klima GmbH
+; Raketenmodellbau Klima GmbH
-; Official manufacturer thrust data - C2
+; Official manufacturer thrust data - C2
-; Created by Leo Nutz for OpenRocket,
+; Created by Leo Nutz for OpenRocket,
-; released into the Public Domain (3/2014)
+; released into the Public Domain (3/2014)
-C2 18 70 0-P 0.0113 0.0224 Klima
+C2 18 70 0-P 0.0113 0.0224 Klima
-   0.04 0.229
+   0.04 0.229
-   0.12 0.658
+   0.12 0.658
-   0.211 1.144
+   0.211 1.144
-   0.291 1.831
+   0.291 1.831
-   0.385 2.86
+   0.385 2.86
-   0.447 3.833
+   0.447 3.833
-   0.505 5.001
+   0.505 5.001
-   0.567 3.89
+   0.567 3.89
-   0.615 3.146
+   0.615 3.146
-   0.665 2.66
+   0.665 2.66
-   0.735 2.203
+   0.735 2.203
-   0.815 2.088
+   0.815 2.088
-   0.93 1.98
+   0.93 1.98
-   4.589 1.96
+   4.589 1.96
-   4.729 1.888
+   4.729 1.888
-   4.815 1.602
+   4.815 1.602
-   4.873 1.259
+   4.873 1.259
-   4.969 0.658
+   4.969 0.658
-   5.083 0.0
+   5.083 0.0
--- a/core/resources-src/datafiles/thrustcurves/manual/Klima_C6.eng
+++ b/core/resources-src/datafiles/thrustcurves/manual/Klima_C6.eng
@ -1,21 +1,21 @@
-; Raketenmodellbau Klima GmbH
+; Raketenmodellbau Klima GmbH
-; Official manufacturer thrust data - C6
+; Official manufacturer thrust data - C6
-; Created by Leo Nutz for OpenRocket,
+; Created by Leo Nutz for OpenRocket,
-; released into the Public Domain (3/2014)
+; released into the Public Domain (3/2014)
-C6 18 70 0-3-5-7-P 0.0096 0.0205 Klima
+C6 18 70 0-3-5-7-P 0.0096 0.0205 Klima
-   0.046 0.953
+   0.046 0.953
-   0.168 5.259
+   0.168 5.259
-   0.235 10.023
+   0.235 10.023
-   0.291 15.00
+   0.291 15.00
-   0.418 9.87
+   0.418 9.87
-   0.505 7.546
+   0.505 7.546
-   0.582 6.631
+   0.582 6.631
-   0.679 6.136
+   0.679 6.136
-   0.786 5.716
+   0.786 5.716
-   1.26 5.678
+   1.26 5.678
-   1.357 5.488
+   1.357 5.488
-   1.423 4.992
+   1.423 4.992
-   1.469 4.116
+   1.469 4.116
-   1.618 1.22
+   1.618 1.22
-   1.701 0.0
+   1.701 0.0
-
+
--- a/core/resources-src/datafiles/thrustcurves/manual/Klima_D3.eng
+++ b/core/resources-src/datafiles/thrustcurves/manual/Klima_D3.eng
@ -1,28 +1,28 @@
-; Raketenmodellbau Klima GmbH
+; Raketenmodellbau Klima GmbH
-; Official manufacturer thrust data - D3
+; Official manufacturer thrust data - D3
-; Created by Leo Nutz for OpenRocket,
+; Created by Leo Nutz for OpenRocket,
-; released into the Public Domain (3/2014)
+; released into the Public Domain (3/2014)
-D3 18 70 0-P 0.017 0.0279 Klima
+D3 18 70 0-P 0.017 0.0279 Klima
-   0.073 0.229
+   0.073 0.229
-   0.178 0.686
+   0.178 0.686
-   0.251 1.287
+   0.251 1.287
-   0.313 2.203
+   0.313 2.203
-   0.375 3.633
+   0.375 3.633
-   0.425 5.006
+   0.425 5.006
-   0.473 6.465
+   0.473 6.465
-   0.556 8.181
+   0.556 8.181
-   0.603 9.01
+   0.603 9.01
-   0.655 6.922
+   0.655 6.922
-   0.698 5.463
+   0.698 5.463
-   0.782 4.291
+   0.782 4.291
-   0.873 3.576
+   0.873 3.576
-   1.024 3.146
+   1.024 3.146
-   1.176 2.946
+   1.176 2.946
-   5.282 2.918
+   5.282 2.918
-   5.491 2.832
+   5.491 2.832
-   5.59 2.517
+   5.59 2.517
-   5.782 1.859
+   5.782 1.859
-   5.924 1.287
+   5.924 1.287
-   6.061 0.715
+   6.061 0.715
-   6.17 0.286
+   6.17 0.286
-   6.26 0.0
+   6.26 0.0
--- a/core/resources-src/datafiles/thrustcurves/manual/Klima_D9.eng
+++ b/core/resources-src/datafiles/thrustcurves/manual/Klima_D9.eng
@ -1,20 +1,20 @@
-; Raketenmodellbau Klima GmbH
+; Raketenmodellbau Klima GmbH
-; Official manufacturer thrust data - D9
+; Official manufacturer thrust data - D9
-; Created by Leo Nutz for OpenRocket,
+; Created by Leo Nutz for OpenRocket,
-; released into the Public Domain (3/2014)
+; released into the Public Domain (3/2014)
-D9 18 70 0-3-5-7-P 0.0161 0.0271 Klima
+D9 18 70 0-3-5-7-P 0.0161 0.0271 Klima
-   0.04 2.111
+   0.04 2.111
-   0.116 9.685
+   0.116 9.685
-   0.213 25.0
+   0.213 25.0
-   0.286 15.738
+   0.286 15.738
-   0.329 12.472
+   0.329 12.472
-   0.369 10.67
+   0.369 10.67
-   0.42 9.713
+   0.42 9.713
-   0.495 9.178
+   0.495 9.178
-   0.597 8.896
+   0.597 8.896
-   1.711 8.925
+   1.711 8.925
-   1.826 8.699
+   1.826 8.699
-   1.917 8.052
+   1.917 8.052
-   1.975 6.954
+   1.975 6.954
-   2.206 1.07
+   2.206 1.07
-   2.242 0.0
+   2.242 0.0
--- a/core/resources-src/pix/splashscreen.txt
+++ b/core/resources-src/pix/splashscreen.txt
@ -4,7 +4,6 @@ OpenRocket text:
 Create logo using Gimp's "Blended" logo script.
 Apply suitable gradient to text layer
 (softened "Horizon 1" -> "Horizon 1 soft").
 Font: Kanit (Italic): https://fonts.google.com/specimen/Kanit?query=kanit
 Background starfield:
--- a/core/resources/build.properties
+++ b/core/resources/build.properties
@ -1,6 +1,6 @@
 # The OpenRocket build version
-build.version=23.09
+build.version=22.02
 # The copyright year for the build. Displayed in the about dialog.
 # Will show as Copyright 2013-${build.copyright}
--- a/core/resources/datafiles/thrustcurves/RASAero/RASAero_Motors.eng
+++ b/core/resources/datafiles/thrustcurves/RASAero/RASAero_Motors.eng
--- a/core/resources/datafiles/thrustcurves/RASAero/README.txt
+++ b/core/resources/datafiles/thrustcurves/RASAero/README.txt
@ -1,2 +0,0 @@
 This directory contains thrust curves used in RASAero.
 Last updated: 2018-07-31
--- a/core/resources/datafiles/thrustcurves/thrustcurves.ser
+++ b/core/resources/datafiles/thrustcurves/thrustcurves.ser
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@ -16,29 +16,29 @@
 debug.currentFile = messages.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain = Do not ask me again
 RocketActions.lbl.Youcanchangedefop = You can change the default operation in the preferences.
 RocketActions.showConfirmDialog.lbl1 = Delete the selected simulations?
 RocketActions.showConfirmDialog.lbl2 = <html><i>This operation cannot be undone.</i>
 RocketActions.showConfirmDialog.title = Delete simulations
 RocketActions.DelCompAct.Delete = Delete
-RocketActions.DelCompAct.ttip.Delete = Delete the selected components.
+RocketActions.DelCompAct.ttip.Delete = Delete the selected component.
 RocketActions.DelSimuAct.Delete = Delete
-RocketActions.DelSimuAct.ttip.Delete = Delete the selected simulations.
+RocketActions.DelSimuAct.ttip.Delete = Delete the selected simulation.
 RocketActions.DelAct.Delete = Delete
-RocketActions.DelAct.ttip.Delete = Delete the selected components or simulations.
+RocketActions.DelAct.ttip.Delete = Delete the selected component or simulation.
 RocketActions.CutAction.Cut = Cut
-RocketActions.CutAction.ttip.Cut = Cut these components or simulations to the clipboard and delete from this design
+RocketActions.CutAction.ttip.Cut = Cut this component or simulation to the clipboard and delete from this design
 RocketActions.CopyAct.Copy = Copy
-RocketActions.CopyAct.ttip.Copy = Copy these components (and subcomponents) to the clipboard.
+RocketActions.CopyAct.ttip.Copy = Copy this component (and subcomponents) to the clipboard.
 RocketActions.PasteAct.Paste = Paste
-RocketActions.PasteAct.ttip.Paste = Paste the components or simulations on the clipboard to the design.
+RocketActions.PasteAct.ttip.Paste = Paste the component or simulation on the clipboard to the design.
 RocketActions.PasteAct.invalidPosition.msg = Invalid paste position for object '%s', ignoring pasting.
 RocketActions.PasteAct.invalidPosition.title = Could not paste
 RocketActions.DuplicateAct.Duplicate = Duplicate
 RocketActions.DuplicateAct.ttip.Duplicate = Duplicate this component (and subcomponents).
 RocketActions.EditAct.Edit = Edit
 RocketActions.EditAct.ttip.Edit = Edit the selected component.
 RocketActions.Select = Select
 RocketActions.Select.SelectSameColorAct = Components of same color
 RocketActions.Select.SelectSameColorAct.ttip = Select all components of the same color as this component.
 RocketActions.Select.DeselectAllAct = Deselect all
 RocketActions.Select.DeselectAllAct.ttip = Deselect all currently selected components.
 RocketActions.ScaleAct.Scale = Scale
 RocketActions.ScaleAct.ttip.Scale = Scale parts of the rocket design
 RocketActions.NewStageAct.Newstage = New stage
@ -47,8 +47,6 @@ RocketActions.MoveUpAct.Moveup = Move up
 RocketActions.MoveUpAct.ttip.Moveup = Move this component upwards.
 RocketActions.MoveDownAct.Movedown = Move down
 RocketActions.MoveDownAct.ttip.Movedown = Move this component downwards.
 RocketActions.ExportOBJAct.ExportOBJ = Export as OBJ (.obj)
 RocketActions.ExportOBJAct.ttip.ExportOBJ = Export the selected components as a Wavefront OBJ 3D file.
 ! RocketPanel
 RocketPanel.FigTypeAct.SideView = Side view
@ -86,16 +84,8 @@ BasicFrame.dlg.title = Design not saved
 BasicFrame.StageName.Sustainer = Sustainer
 BasicFrame.WarningDialog.txt1 = The following problems were encountered while opening
 BasicFrame.WarningDialog.txt2 = Some design features may not have been loaded correctly.
 BasicFrame.WarningDialog.saving.txt1 = The following problems were encountered while saving
 BasicFrame.WarningDialog.saving.txt2 = Some design features may not have exported correctly.
 BasicFrame.WarningDialog.title = Warnings while opening file
 BasicFrame.WarningDialog.saving.title = Warnings while saving file
 BasicFrame.ErrorWarningDialog.txt1 = <html>Please <b>correct the errors</b>.</html>
 BasicFrame.ErrorWarningDialog.saving.title = Errors/Warnings while saving file
 BasicFrame.lbl.SaveRocketInfo = Save Design Info
 ! SaveDesignInfoPanel
 SaveDesignInfoPanel.lbl.FillInInfo = (Optional) Fill in the design information for this file
 ! General error messages used in multiple contexts
 error.fileExists.title = File exists
@ -120,15 +110,12 @@ dlg.but.close = Close
 ! General file type names
 FileHelper.CSV_FILTER = Comma Separated Files (*.csv)
 FileHelper.PDF_FILTER = PDF files (*.pdf)
-FileHelper.ALL_DESIGNS_FILTER = All rocket designs (*.ork; *.rkt, *.CDX1)
+FileHelper.ALL_DESIGNS_FILTER = All rocket designs (*.ork; *.rkt)
 FileHelper.OPENROCKET_DESIGN_FILTER = OpenRocket designs (*.ork)
 FileHelper.ROCKSIM_DESIGN_FILTER = RockSim designs (*.rkt)
 FileHelper.RASAERO_DESIGN_FILTER = RASAero designs (*.CDX1)
 FileHelper.WAVEFRONT_OBJ_FILTER = Wavefront OBJ 3D file (*.obj)
 FileHelper.OPEN_ROCKET_COMPONENT_FILTER = OpenRocket presets (*.orc)
 FileHelper.PNG_FILTER = PNG image (*.png)
 FileHelper.IMAGES = Image files
 FileHelper.XML_FILTER = XML files (*.xml)
 ! About Dialog
@ -241,11 +228,6 @@ edtmotorconfdlg.tbl.Separationheader = Separation
 RenameConfigDialog.title = Rename Configuration
 RenameConfigDialog.lbl.name = Name for flight configuration:
 RenameConfigDialog.but.reset = Reset to default
 RenameConfigDialog.lbl.infoMotors = The text '<b>{motors}</b>' will be replaced with the <b>motor designation(s).</b><br><pre>\te.g. '{motors} \u2192 'M1350-0'</pre>
 RenameConfigDialog.lbl.infoManufacturers = The text '<b>{manufacturers}</b>' will be replaced with the <b>motor manufacturer(s).</b><br><pre>\te.g. '{manufacturers}' \u2192 'AeroTech'</pre>
 RenameConfigDialog.lbl.infoCases = The text '<b>{cases}</b>' will be replaced with the <b>motor case(s).</b><br><pre>\te.g. '{cases}' \u2192 'SU 18.0x70.0'</pre>
 RenameConfigDialog.lbl.infoCombination = A <b>combination</b> of the above can be used (you may choose the separator).<br><pre>\te.g. '{manufacturers motors}' \u2192 'AeroTech M1350-0'</pre>
 ! Example design dialog
 exdesigndlg.but.open = Open
@ -297,15 +279,9 @@ pref.dlg.tab.Design = Design
 pref.dlg.tab.Simulation = Simulation
 pref.dlg.tab.Launch = Launch
 pref.dlg.tab.Miscellaneousoptions = Miscellaneous options
 pref.dlg.lbl.RASAeroWarning = Show warning when saving in RASAero format
 pref.dlg.lbl.RockSimWarning = Show warning when saving in RockSim format
-pref.dlg.checkbox.ShowDiscardPreferencesConfirmation = Show confirmation dialog when discarding preferences
+pref.dlg.but.clearCachedPreferences = Reset all preferences
-pref.dlg.but.resetAllPreferences = Reset all preferences
+pref.dlg.but.clearCachedPreferences.ttip = Reset all the preferences, including cached preferences (UI settings, recent files, etc.)
 pref.dlg.but.resetAllPreferences.ttip = Reset all the preferences, including cached preferences (UI settings, recent files, etc.)
 pref.dlg.but.exportPreferences = Export preferences
 pref.dlg.but.exportPreferences.ttip = Export all your OpenRocket preferences to an external file
 pref.dlg.but.importPreferences = Import preferences
 pref.dlg.but.importPreferences.ttip = Import new OpenRocket preferences from an external file
 pref.dlg.clearCachedPreferences.title = Reset preferences?
 pref.dlg.clearCachedPreferences.message = Are you sure you want to reset all your preferences?
@ -332,8 +308,6 @@ pref.dlg.checkbox.AlwaysOpenLeftmost = Always open leftmost tab when opening a c
 pref.dlg.checkbox.AlwaysOpenLeftmost.ttip = <html>If checked, a component edit dialog will always pop up with the first tab selected.<br>If unchecked, the previous selected tab will be used.</html>
 pref.dlg.checkbox.ShowDiscardConfirmation = Show confirmation dialog for discarding component changes
 pref.dlg.checkbox.ShowDiscardConfirmation.ttip = If checked, you will be asked if you want really want to discard component configuration configuration changes.
 pref.dlg.checkbox.ShowDiscardSimulationConfirmation = Show confirmation dialog for discarding simulation changes
 pref.dlg.checkbox.ShowDiscardSimulationConfirmation.ttip = If checked, you will be asked if you want really want to discard simulation configuration configuration changes.
 pref.dlg.lbl.User-definedthrust = User-defined thrust curves:
 pref.dlg.lbl.Windspeed = Wind speed
 pref.dlg.Allthrustcurvefiles = All thrust curve files (*.eng; *.rse; *.zip; directories)
@ -369,13 +343,7 @@ pref.dlg.lbl.Temperature = Temperature:
 pref.dlg.lbl.Momentofinertia = Moment of inertia:
 pref.dlg.lbl.Pressure = Pressure:
 pref.dlg.lbl.Stability = Stability:
 pref.dlg.lbl.SecondaryStability = Secondary Stability:
 pref.dlg.lbl.SecondaryStability.ttip = Select the stability unit that will be displayed alongside the main stability unit in the design view.
 pref.dlg.checkbox.DisplaySecondaryStability = Display secondary stability unit
 pref.dlg.checkbox.DisplaySecondaryStability.ttip = If checked, a secondary stability unit will be displayed in the rocket design view.
 pref.dlg.lbl.FlightTime = Flight time:
 pref.dlg.lbl.Latitude = Latitude:
 pref.dlg.lbl.Longitude = Longitude:
 pref.dlg.lbl.effect1 = The effects will take place the next time you open a window.
 pref.dlg.lbl.Checkingupdates = Checking for updates\u2026
 pref.dlg.PrefChoiseSelector1 = Always ask
@ -386,33 +354,13 @@ pref.dlg.PrefBooleanSelector2 = Confirm
 pref.dlg.Add = Add
 pref.dlg.DescriptionArea.Adddirectories = Add directories, RASP motor files (*.eng), RockSim engine files (*.rse) or ZIP archives separated by a semicolon (;) to load external thrust curves.  Changes will take effect the next time you start OpenRocket.
-PreferencesDialog.CancelOperation.title = Discard Preference Changes
+PreferencesDialog.lbl.language = Interface language:
-PreferencesDialog.CancelOperation.msg.discardChanges = <html>Are you sure you want to <b>discard the preference changes</b>?</html>
+PreferencesDialog.languages.default = System default
 PreferencesDialog.lbl.languageEffect = The language will change the next time you start OpenRocket.
 generalprefs.lbl.language = Interface language
 generalprefs.languages.default = System default
 generalprefs.lbl.languageEffect = The language will change the next time you start OpenRocket.
 generalprefs.lbl.UITheme = UI Theme
 generalprefs.lbl.FontSize = UI Font Size
 generalprefs.lbl.themeRestartOR = You must restart OpenRocket for the UI changes to take effect.
 generalprefs.ImportWarning.title = Reload OpenRocket
 generalprefs.ImportWarning.msg = You may need to restart OpenRocket for some of the changes to take effect.
 PreferencesExporter.chooser.title = Export the Preferences File
 PreferencesImporter.chooser.title = Import a Preferences File
 PreferencesOptionPanel.title = Export settings
 PreferencesOptionPanel.checkbox.userDirectories = Export user directories
 PreferencesOptionPanel.checkbox.userDirectories.ttip = If unchecked, user directories (possibly sensitive information) will not be exported.
 PreferencesOptionPanel.checkbox.windowInfo = Export window information (position, size\u2026)
 PreferencesOptionPanel.checkbox.windowInfo.ttip = If unchecked, window information (position, size\u2026) will not be exported.
 ! UI Themes
 UITheme.Auto = Auto (detect)
 UITheme.Light = Light (default)
 UITheme.Dark = Dark
 UITheme.DarkContrast = Dark, high-contrast
 ! Welcome dialog
 welcome.dlg.title = Welcome to OpenRocket
@ -449,8 +397,6 @@ simedtdlg.but.savedefault = Save as default
 simedtdlg.but.add = Add
 simedtdlg.but.delete = Delete
 simedtdlg.title.Editsim = Edit simulation
 simedtdlg.title.MultiSimEdit = Multi-simulation edit
 simedtdlg.title.MultiSimEdit.ttip = <html>You are editing the following simulations:<br>
 simedtdlg.lbl.Simname = Simulation name:
 simedtdlg.tab.Launchcond = Launch conditions
 simedtdlg.tab.Simopt = Simulation options
@ -560,12 +506,6 @@ SimulationEditDialog.btn.export = Export
 SimulationEditDialog.btn.edit = Edit
 SimulationEditDialog.btn.simulate = Simulate
 SimulationEditDialog.btn.simulateAndPlot = Simulate & Plot
 SimulationEditDialog.btn.OK.ttip = Keep changes and close the dialog
 SimulationEditDialog.btn.Cancel.ttip = Discard changes and close the dialog
 SimulationEditDialog.CancelOperation.msg.discardChanges = <html>Are you sure you want to <b>discard</b> your <b>changes</b> to this simulation?</html>
 SimulationEditDialog.CancelOperation.msg.undoAdd = <html>Are you sure you want to <b>undo adding</b> this simulation?</html>
 SimulationEditDialog.CancelOperation.title = Cancel operation
 SimulationEditDialog.CancelOperation.checkbox.dontAskAgain = Don't ask me again
 GeodeticComputationStrategy.flat.name = Flat Earth
 GeodeticComputationStrategy.flat.desc = Perform computations with a flat Earth approximation.  Sufficient for low-altitude flights.
@ -588,31 +528,15 @@ simpanel.but.ttip.editsim = Edit the selected simulation
 simpanel.but.ttip.runsimu = Re-run the selected simulations
 simpanel.but.ttip.deletesim = Delete the selected simulations
 simpanel.pop.edit = Edit
 simpanel.pop.edit.ttip= Edit the selected simulation(s)
 simpanel.pop.cut= Cut
 simpanel.pop.cut.ttip= Copy the selected simulation(s) to the clipboard and delete from this design
 simpanel.pop.copy= Copy
 simpanel.pop.copy.ttip= Copy the selected simulation(s) to the clipboard
 simpanel.pop.paste= Paste
 simpanel.pop.paste.ttip= Paste the simulation(s) on the clipboard to the design.
 simpanel.pop.plot = Plot / Export
 simpanel.pop.plot.ttip= Plot or Export the selected simulation(s)
 simpanel.pop.run = Run
 simpanel.pop.run.ttip= Run the selected simulation(s)
 simpanel.pop.delete = Delete
 simpanel.pop.delete.ttip= Delete the selected simulation(s)
 simpanel.pop.duplicate = Duplicate
 simpanel.pop.duplicate.ttip= Duplicate the selected simulation(s)
 simpanel.pop.exportSimTableToCSV = Export simulation table as CSV file
 simpanel.pop.exportSelectedSimsToCSV = Export simulation(s) as CSV file
 simpanel.pop.exportToCSV.save.dialog.title = Save as CSV file
 simpanel.dlg.no.simulation.table.rows = Simulation table has no entries\u2026 Please run a simulation first.
 simpanel.checkbox.donotask = Do not ask me again
 simpanel.lbl.defpref = You can change the default operation in the preferences.
 simpanel.dlg.lbl.DeleteSim1 = Delete the selected simulations?
 simpanel.dlg.lbl.DeleteSim2 = <html><i>This operation cannot be undone.</i>
 simpanel.dlg.lbl.DeleteSim3 = Delete simulations
 simpanel.col.Status = Status
 simpanel.col.Name = Name
 simpanel.col.Motors = Motors
 simpanel.col.Configuration = Configuration
@ -627,14 +551,12 @@ simpanel.col.Timetoapogee = Time to apogee
 simpanel.col.Flighttime = Flight time
 simpanel.col.Groundhitvelocity = Ground hit velocity
 simpanel.ttip.uptodate = <i>Up to date</i>
 simpanel.ttip.loaded = <i>Loaded from file</i>
 simpanel.ttip.outdated = <i><font color=\"red\">Out of date</font></i><br>Click <i><b>Run simulations</b></i> to simulate.
 simpanel.ttip.external = <i>Imported data</i>
 simpanel.ttip.notSimulated = <i>Not simulated yet</i><br>Click <i><b>Run simulations</b></i> to simulate.
 simpanel.ttip.noData = No simulation data available.
 simpanel.ttip.noWarnings = <font color=\"gray\">No warnings.</font>
 simpanel.ttip.warnings = <font color=\"red\">Warnings:</font>
 simpanel.msg.invalidCopySelection = Invalid copy selection
 ! SimulationRunDialog
 SimuRunDlg.title.RunSim = Running simulations\u2026
@ -644,12 +566,10 @@ SimuRunDlg.lbl.Altitude = Altitude:
 SimuRunDlg.lbl.Velocity = Velocity:
 SimuRunDlg.msg.Unabletosim = Unable to simulate:
 SimuRunDlg.msg.errorOccurred = An error occurred during the simulation:
 SimuRunDlg.msg.branchErrorOccurred = An error occurred during simulation branch
 BasicEventSimulationEngine.error.noMotorsDefined = No motors defined in the simulation.
-BasicEventSimulationEngine.error.activeLengthZero = Active airframe has length 0
+BasicEventSimulationEngine.error.cantCalculateStability = Can't calculate rocket stability.
-BasicEventSimulationEngine.error.cantCalculateStability = Can't calculate stability
+BasicEventSimulationEngine.error.earlyMotorBurnout = Motor burnout without liftoff.
 BasicEventSimulationEngine.error.earlyMotorBurnout = <html>Motor burnout without liftoff.<br>Use more (powerful) motors, or decrease the rocket mass.</html>
 BasicEventSimulationEngine.error.noConfiguredIgnition = No motors configured to ignite at liftoff
 BasicEventSimulationEngine.error.noIgnition = No motors ignited.
 BasicEventSimulationEngine.error.NaNResult = Simulation resulted in not-a-number (NaN) value, please report a bug.
@ -659,8 +579,6 @@ RK4SimulationStepper.error.valuesTooLarge = Simulation values exceeded limits.
 SimulationModifierTree.OptimizationParameters = Optimization Parameters
 SimulationStepper.error.totalMassZero = Total mass of active states is 0
 ! SimulationExportPanel
 SimExpPan.border.Vartoexport = Variables to export
 SimExpPan.border.Stage = Stage to export
@ -813,9 +731,6 @@ simplotpanel.MarkerStyle.btn.VerticalMarker = Vertical line
 simplotpanel.MarkerStyle.btn.Icon = Icon
 simplotpanel.MarkerStyle.OnlyInTime = Only available for time domain, other domains only support icon markers
 ! FlightDataComboBox
 FlightDataComboBox.placeholder = Enter the data type
 ! Component add buttons
 compaddbuttons.AxialStage = Stage
 compaddbuttons.Bodycompandfinsets = Body Components and Fin Sets
@ -888,7 +803,7 @@ componentanalysisdlg.lbl.reflenght = Reference length:
 componentanalysisdlg.lbl.refarea = Reference area:
 !componentanalysisdlg.But.close =Close
 componentanalysisdlg.TabStability.Col.Component = Component
-componentanalysisdlg.TOTAL = Total (Rocket)
+componentanalysisdlg.TOTAL = Total
 componentanalysisdlg.noWarnings = <html><i><font color=\"gray\">No warnings.</font></i>
 ! Custom Material dialog
@ -1054,8 +969,10 @@ RocketCompCfg.lbl.Length = Length:
 RocketCompCfg.lbl.Thickness = Thickness:
 RocketCompCfg.checkbox.Endcapped = End capped
 RocketCompCfg.checkbox.Endcapped.ttip = Caps (closes) the end of the shoulder.
-RocketCompCfg.border.Aftshoulder = Aft shoulder
+RocketCompCfg.title.Aftshoulder = Aft shoulder
 RocketCompCfg.border.Foreshoulder = Fore shoulder
 RocketCompCfg.lbl.InstanceCount = Instance Count:
 RocketCompCfg.lbl.InstanceSeparation = Instance Separation:
 RocketCompCfg.tab.Outside = Outside
 RocketCompCfg.tab.Inside = Inside
 RocketCompCfg.tab.RightSide = Right Side
@ -1068,11 +985,6 @@ RocketCompCfg.CancelOperation.title = Cancel operation
 RocketCompCfg.CancelOperation.checkbox.dontAskAgain = Don't ask me again
 RocketCompCfg.btn.ComponentInfo.ttip = Show/hide informative text about this component.
 ! InstancesPanel
 InstancesPanel.title.Instances = Instances
 InstancesPanel.lbl.InstanceCount = Instance Count:
 InstancesPanel.lbl.InstanceSeparation = Instance Separation:
 ! MaterialPanel
 MaterialPanel.lbl.ComponentMaterial = Component material:
 MaterialPanel.lbl.ComponentFinish = Component finish:
@ -1215,7 +1127,6 @@ InnerTubeCfg.tab.ttip.Radialpos = Radial position
 InnerTubeCfg.lbl.Selectclustercfg = Select cluster configuration:
 InnerTubeCfg.lbl.TubeSep = Tube separation:
 InnerTubeCfg.lbl.ttip.TubeSep = The separation of the tubes, 1.0 = touching each other
 InnerTubeCfg.lbl.ttip.TubeSepAbs = The separation of the tubes, 0 = touching each other
 InnerTubeCfg.lbl.Rotation = Rotation:
 InnerTubeCfg.lbl.ttip.Rotation = Rotation angle of the cluster configuration
 InnerTubeCfg.lbl.Rotangle = Rotation angle of the cluster configuration
@ -1224,10 +1135,6 @@ InnerTubeCfg.lbl.longA1 = <html>Split the cluster into separate components.<br>
 InnerTubeCfg.lbl.longA2 = This also duplicates all components attached to this inner tube.
 InnerTubeCfg.but.Resetsettings = Reset settings
 InnerTubeCfg.but.ttip.Resetsettings = Reset the separation and rotation to the default values
 InnerTubeCfg.radioBut.Relative = Relative
 InnerTubeCfg.radioBut.Relative.ttip = The separation is measured relative to the outer diameter of the inner tube
 InnerTubeCfg.radioBut.Absolute = Absolute
 InnerTubeCfg.radioBut.Absolute.ttip = The separation is measured in length units
 ! LaunchLugConfig
 LaunchLugCfg.lbl.Length = Length:
@ -1413,77 +1320,23 @@ TransitionCfg.tab.Generalproperties = General properties
 TransitionCfg.tab.Shoulder = Shoulder
 TransitionCfg.tab.Shoulderproperties = Shoulder properties
-! Save RASAero Warning Dialog
+! Save RKT Warning Dialog
 SaveRASAeroWarningDialog.txt1 = Exporting to RASAero file format does not support all features of OpenRocket.
 SaveRASAeroWarningDialog.donotshow = Do not show this dialog again
 ! Save RockSim Warning Dialog
 SaveRktWarningDialog.txt1=Exporting to RockSim file format does not support all features of OpenRocket.
 SaveRktWarningDialog.donotshow=Do not show this dialog again
-saveAs.openrocket.title = Save as OpenRocket ork file
+saveAs.openrocket.title=Save as OpenRocket ork file
-saveAs.rocksim.title = Export as RockSim rkt file
+saveAs.rocksim.title=Export as RockSim rkt file
 saveAs.rasaero.title = Export as RASAero CDX1 file
 saveAs.wavefront.title = Export as Wavefront OBJ file
 ! RASAero exporting
 RASAeroExport.warning1 = Nose cone may not be flipped.
 RASAeroExport.warning2 = First component of booster must be body tube.
 RASAeroExport.warning3 = Already added a rail button, ignoring launch lug '%s'.
 RASAeroExport.warning4 = Already added a launch shoe, ignoring launch lug '%s'.
 RASAeroExport.warning5 = Instance count of '%s' not set to 2, defaulting to 2 and adjusting launch lug length accordingly.
 RASAeroExport.warning6 = Already added a launch lug, ignoring rail button '%s'.
 RASAeroExport.warning7 = Already added a launch shoe, ignoring rail button '%s'.
 RASAeroExport.warning8 = Instance count of '%s' equals %d, defaulting to 2.
 RASAeroExport.warning9 = Unsupported component '%s', ignoring.
 RASAeroExport.warning10 = Rocket should have no more then 3 stages (excl. boosters) in total.\nIgnoring other stage(s).
 RASAeroExport.warning11 = Empty simulation '%s', ignoring.
 RASAeroExport.warning12 = No motors found in simulation '%s', ignoring.
 RASAeroExport.warning13 = <html>Stage %s has no motor.<br>&nbsp --> When adding a motor in RASAero, don't forget to update the stage mass and CG.</html>
 RASAeroExport.error1 = Unsupported component: %s.
 RASAeroExport.error2 = Length of '%s' must be greater than 0.
 RASAeroExport.error3 = Diameter of '%s' must be greater than 0.
 RASAeroExport.error4 = Launch lug diameter can not be 0.
 RASAeroExport.error5 = Launch lug length can not be 0.
 RASAeroExport.error6 = Rail button diameter can not be 0.
 RASAeroExport.error7 = Rail button height can not be 0.
 RASAeroExport.error8 = Launch shoe area can not be 0.
 RASAeroExport.error9 = Invalid stage number '%d' for booster stage '%s'.
 RASAeroExport.error10 = Stage '%s' may not be empty.
 RASAeroExport.error11 = First component of stage '%s' must be a body tube or transition.
 RASAeroExport.error12 = When the first component of stage '%s' is a transition, the second one must be a body tube.
 RASAeroExport.error13 = No previous component for '%s' in stage '%s'.
 RASAeroExport.error14 = Transition '%s' in stage '%s' must have the same fore radius as the aft radius of its previous component '%s'.
 RASAeroExport.error15 = Radius of '%s' in stage '%s' must be the same as the aft radius of '%s'.
 RASAeroExport.error16 = Body tube '%s' in stage '%s' must have a TrapezoidFinSet.
 RASAeroExport.error17 = Length of '%s' must be greater than 0.
 RASAeroExport.error18 = Diameter of '%s' must be greater than 0.
 RASAeroExport.error19 = Inside diameter of '%s' must be greater than 0.
 RASAeroExport.error20 = Fin set '%s' must have a fin count between 3 and 8.
 RASAeroExport.error21 = RASAero only supports apogee and altitude deployment events for parachute '%s', not '%s'
 RASAeroExport.error22 = First component of the sustainer must be a nose cone.
 RASAeroExport.error23 = Second component of the sustainer must be a body tube (or boattail).
 RASAeroExport.error24 = A nose cone can only be the first component of the rocket.
 RASAeroExport.error25 = Invalid stage number '%d' for simulation '%s'
 RASAeroExport.error26 = RASAero only supports conical transitions.
 RASAeroExport.error27 = Transition '%s' has no previous component.
 RASAeroExport.error28 = Transition '%s' should have the same fore radius as the aft radius (%f) of its previous component, not %f.
 RASAeroExport.error29 = Boattail length may not be zero.
 RASAeroExport.error30 = Boattail rear diameter may not be zero.
 RASAeroExport.error31 = Stage '%s' can only contain a body tube (incl. shoulder transition).
 RASAeroExport.error32 = Boattails can only be added to the last stage.
 RASAeroExport.error33 = Invalid component '%s' in sustainer stage.
 ! SaveAsFileChooser
 SaveAsFileChooser.illegalFilename.title = Illegal filename
 SaveAsFileChooser.illegalFilename.message = The filename '%s' may not contain the character ' %c '. Please remove it.
 ! StorageOptionChooser
 StorageOptChooser.lbl.Simdatatostore = Simulated data to store:
 StorageOptChooser.rdbut.Allsimdata = All simulated data
 StorageOptChooser.lbl.longA1 = <html>Store all simulated data.<br>
 StorageOptChooser.lbl.longA2 = This can result in very large files!
-StorageOptChooser.rdbut.Onlysummarydata = Only summary data
+StorageOptChooser.rdbut.Every = Every
 StorageOptChooser.lbl.longB1 = <html>Store plottable values approximately this far apart.<br>
 StorageOptChooser.lbl.longB2 = Larger values result in smaller files.
 StorageOptChooser.lbl.seconds = seconds
 StorageOptChooser.rdbut.Onlyprimfig = Only primary figures
 StorageOptChooser.lbl.longC1 = <html>Store only the values shown in the summary table.<br>
 StorageOptChooser.lbl.longC2 = This results in the smallest files.
 StorageOptChooser.lbl.longD1 = An estimate on how large the resulting file would be with the present options.
@ -1493,53 +1346,6 @@ StorageOptChooser.lbl.info3 = Smallest file size
 StorageOptChooser.ttip.Saveopt = Save options
 StorageOptChooser.lbl.Saveopt = Save options
 ! OBJOptionChooser
 OBJOptionChooser.lbl.component = <html>Component: %s</html>
 OBJOptionChooser.lbl.multipleComponents = <i>Multiple components</i>
 OBJOptionChooser.lbl.optimizeFor = Optimize for:
 OBJOptionChooser.btn.opt3DPrint = 3D printing
 OBJOptionChooser.btn.opt3DPrint.ttip = Optimize the OBJ export settings for 3D printing.
 OBJOptionChooser.btn.optRend = Rendering
 OBJOptionChooser.btn.optRend.ttip = Optimize the OBJ export settings for use in 3D rendering software.
 OBJOptionChooser.easterEgg.title = Don't worry
 OBJOptionChooser.easterEgg.msg = Don't worry, you already have the 3D printing settings enabled :).
 OBJOptionChooser.easterEgg.msg2 = Seriously, you don't have to keep pressing me. :|
 OBJOptionChooser.easterEgg.msg3 = I'm getting tired\u2026 Please stop :(
 OBJOptionChooser.easterEgg.msg4 = Well, congrats on wasting 40 clicks and your time :D Bye!
 OBJOptionChooser.checkbox.exportChildren = Export children
 OBJOptionChooser.checkbox.exportChildren.ttip = If true, export children of the selected components as well.
 OBJOptionChooser.checkbox.exportChildren.assemblies.ttip = Component assemblies always export their children.
 OBJOptionChooser.checkbox.exportChildren.noChildren.ttip = Selected components don't have children.
 OBJOptionChooser.checkbox.exportMotors = Export motors
 OBJOptionChooser.checkbox.exportMotors.ttip = If true, export the motors of the rocket.
 OBJOptionChooser.checkbox.exportAppearance = Export appearance
 OBJOptionChooser.checkbox.exportAppearance.ttip = If true, export the component appearances to an MTL file.
 OBJOptionChooser.checkbox.exportAsSeparateFiles = Export as separate files
 OBJOptionChooser.checkbox.exportAsSeparateFiles.ttip = If true, export each component as a separate OBJ file.
 OBJOptionChooser.checkbox.exportAppearance.ttip.triangulate = You can not export the appearance with the triangulate feature enabled.
 OBJOptionChooser.checkbox.removeOffset = Remove origin offset
 OBJOptionChooser.checkbox.removeOffset.ttip = <html>If true, remove the offset of the component from the origin.<br>If false, the component is exported at its original location in the rocket.</html>
 OBJOptionChooser.btn.showAdvanced = Show Advanced options
 OBJOptionChooser.checkbox.triangulate = Triangulate mesh
 OBJOptionChooser.checkbox.triangulate.ttip = If true, triangulate the mesh before exporting (convert all quads or high-order polygons to a triangle).
 OBJOptionChooser.checkbox.sRGB = Export colors in sRGB
 OBJOptionChooser.checkbox.sRGB.ttip = <html>If true, export colors in sRGB instead of a linear color scheme.<br>Is useful for instance when exporting for use in Blender.</html>
 OBJOptionChooser.lbl.Scaling = Scaling:
 OBJOptionChooser.lbl.Scaling.ttip = <html>Scale the exported geometry by the given factor.<br>The default dimensions are in SI units (meters), but e.g. 3D printing slicer software often uses mm.<br>In that scenario, you can set the scale to '1000'.</html>
 OBJOptionChooser.lbl.LevelOfDetail = Level of detail:
 OBJOptionChooser.lbl.LevelOfDetail.ttip = Select the desired level of detail of the geometry export.
 OBJOptionChooser.lbl.CoordinateTransform = Coordinate transform:
 OBJOptionChooser.lbl.CoordinateTransform.ttip = Define how to OpenRocket axes are mapped to the OBJ axes.
 OBJOptionChooser.lbl.CoordinateTransform.Axial = Axial (up) axis:
 OBJOptionChooser.lbl.CoordinateTransform.Axial.ttip = Select the OBJ axis that should correspond to the axial (up) axis of the OpenRocket model.
 OBJOptionChooser.lbl.CoordinateTransform.Forward = Forward axis:
 OBJOptionChooser.lbl.CoordinateTransform.Forward.ttip = Select the OBJ axis that should correspond to the forward axis of the OpenRocket model.
 ! LevelOfDetail
 LevelOfDetail.LOW_QUALITY = Low quality
 LevelOfDetail.NORMAL_QUALITY = Normal quality
 LevelOfDetail.HIGH_QUALITY = High quality
 ! ThrustCurveMotorSelectionPanel
 TCMotorSelPan.lbl.Selrocketmotor = Select rocket motor:
 TCMotorSelPan.checkbox.hideSimilar = Hide very similar thrust curves
@ -1549,7 +1355,6 @@ TCMotorSelPan.lbl.motorNameColumn.ttip = Select which motor property to display
 TCMotorSelPan.btn.commonName = Use common name
 TCMotorSelPan.btn.designation = Use manufacturer's designation
 TCMotorSelPan.lbl.nrOfMotors = Number of motors:
 TCMotorSelPan.lbl.nrOfMotors.None = None
 TCMotorSelPan.lbl.ttip.nrOfMotors = Number of motors currently visible in the motor selection table
 TCMotorSelPan.checkbox.limitlength = Limit motor length to mount length
 TCMotorSelPan.checkbox.limitdiameter = Limit motor diameter to mount diameter
@ -1563,16 +1368,15 @@ TCMotorSelPan.MotorMountDimensions = Motor mount dimensions:
 TCMotorSelPan.lbl.Search = Search:
 TCMotorSelPan.lbl.Selectthrustcurve = Select thrust curve:
 TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay:
-TCMotorSelPan.lbl.Numberofseconds = (or type in desired delay in seconds)
+TCMotorSelPan.equalsIgnoreCase.None = None
 TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\")
 TCMotorSelPan.lbl.Designation = Designation:
 TCMotorSelPan.lbl.CommonName = Common name:
 TCMotorSelPan.lbl.Totalimpulse = Total impulse:
 TCMotorSelPan.lbl.Avgthrust = Avg. thrust:
 TCMotorSelPan.lbl.Maxthrust = Max. thrust:
 TCMotorSelPan.lbl.Burntime = Burn time:
 TCMotorSelPan.lbl.Launchmass = Launch mass:
 TCMotorSelPan.lbl.Emptymass = Empty mass:
 TCMotorSelPan.lbl.Motortype = Motor type:
 TCMotorSelPan.lbl.Caseinfo = Case info:
 TCMotorSelPan.lbl.Propinfo = Propellant:
 TCMotorSelPan.lbl.CompatibleCases = Compatible Cases:
@ -1580,8 +1384,7 @@ TCMotorSelPan.lbl.Datapoints = Data points:
 TCMotorSelPan.lbl.Digest = Digest:
 TCMotorSelPan.title.Thrustcurve = Thrust curve:
 TCMotorSelPan.title.Thrust = Thrust
-TCMotorSelPan.delayBox.Plugged = Plugged
+TCMotorSelPan.delayBox.None = Plugged (None)
 TCMotorSelPan.delayBox.PluggedNone = None
 TCMotorSelPan.noDescription = No description available.
 TCMotorSelPan.btn.checkAll = Select All
 TCMotorSelPan.btn.checkNone = Clear All
@ -1592,7 +1395,6 @@ TCMotorSelPan.btn.close = Close
 ! PlotDialog
 PlotDialog.CheckBox.Showdatapoints = Show data points
 PlotDialog.lbl.Chart = left click drag to zoom area. mouse wheel to zoom. ctrl-mouse wheel to zoom x axis only. ctrl-left click drag to pan.  right click drag to zoom dynamically.
 PlotDialog.lbl.timeSeriesWarning = The data is plotted in time order even though the X axis type is not time. 
 PlotDialog.btn.exportImage = Export Image
 ComponentTree.ttip.massoverride = mass overriden
@ -1614,24 +1416,16 @@ main.menu.file.openRecent = Open recent
 main.menu.file.openRecent.desc = Open a recent rocket design
 main.menu.file.openExample = Open example
 main.menu.file.openExample.desc = Open an example rocket design
 main.menu.file.import = Import
 main.menu.file.import.desc = Import a rocket design file from another program
 main.menu.file.import.RockSim = RockSim (.rkt)
 main.menu.file.import.RockSim.desc = Import design from RockSim file into OpenRocket
 main.menu.file.import.RASAero = RASAero II (.CDX1)
 main.menu.file.import.RASAero.desc = Import design from RASAero II file into OpenRocket
 main.menu.file.save = Save
 main.menu.file.save.desc = Save the current rocket design
 main.menu.file.saveAs = Save as\u2026
 main.menu.file.saveAs.desc = Save the current rocket design to a new file
-main.menu.file.exportAs = Export as
+!  main.menu.file.import = Import\u2026
-main.menu.file.exportAs.desc = Export design as selected file format
+!  main.menu.file.import.desc = Import design from RockSim rkt file
-main.menu.file.exportAs.RockSim = RockSim (.rkt)
+main.menu.file.export_as = Export as
-main.menu.file.exportAs.RockSim.desc = Export design to RockSim file
+main.menu.file.export_as.desc = Export design as selected file format
-main.menu.file.exportAs.RASAero = RASAero II (.CDX1)
+main.menu.file.encode_3d = Encode 3D
-main.menu.file.exportAs.RASAero.desc = Export design to RASAero II file
+main.menu.file.encode_3d.desc = Encode design to selected 3D file format
 main.menu.file.exportAs.WavefrontOBJ= Wavefront OBJ (.obj)
 main.menu.file.exportAs.WavefrontOBJ.desc = Export the selected components to a Wavefront OBJ 3D file
 main.menu.file.print = Print design info\u2026
 main.menu.file.print.desc = Print design specifications, including the parts list and fin templates, print or save as PDF
 main.menu.file.close = Close design
@ -1640,7 +1434,6 @@ main.menu.file.quit = Quit
 main.menu.file.quit.desc = Quit the program
 main.menu.file.exportDecal = Save decal image\u2026
 main.menu.file.exportDecal.desc = Save a decal from the current rocket design to a file for editing.
 main.menu.file.table.exportToCSV = Export simulations table as CSV file
 main.menu.edit = Edit
 main.menu.edit.desc = Rocket editing
@ -1668,8 +1461,6 @@ main.menu.help = Help
 main.menu.help.desc = Information about OpenRocket
 main.menu.help.tours = Guided tours
 main.menu.help.tours.desc = Take guided tours on OpenRocket
 main.menu.help.wiki = Wiki (Online Help)
 main.menu.help.wiki.desc = Open the OpenRocket Wiki site, containing documentation, in your default webbrowser
 main.menu.help.license = License
 main.menu.help.license.desc = OpenRocket license information
 main.menu.help.bugReport = Bug report
@ -1724,9 +1515,6 @@ material.styrofoam_blue_foam_xps = Styrofoam \"Blue foam\" (XPS)
 material.titanium = Titanium
 material.quantum_tubing = Quantum tubing
 material.blue_tube = Blue tube
 material.pla = PLA - 100% infill
 material.petg = PETG - 100% infill
 material.abs = ABS - 100% infill
 !SURFACE_MATERIAL
 material.ripstop_nylon = Ripstop nylon
 material.mylar = Mylar
@ -1788,7 +1576,7 @@ Shape.Haackseries.desc2 = The Haack series <i>nose cones</i> are designed to min
 ! RocketComponent
-RocketComponent.Position.Method.Axial.ABSOLUTE = Tip of the rocket
+RocketComponent.Position.Method.Axial.ABSOLUTE = Tip of the nose cone
 RocketComponent.Position.Method.Axial.AFTER =  After the sibling component
 RocketComponent.Position.Method.Axial.BOTTOM = Bottom of the parent component
 RocketComponent.Position.Method.Axial.MIDDLE =  Middle of the parent component
@ -2036,7 +1824,6 @@ FlightDataType.TYPE_STABILITY = Stability margin calibers
 FlightDataType.TYPE_MACH_NUMBER = Mach number
 FlightDataType.TYPE_REYNOLDS_NUMBER = Reynolds number
 FlightDataType.TYPE_THRUST_FORCE = Thrust
 FlightDataType.TYPE_THRUST_WEIGHT_RATIO = Thrust-to-weight ratio
 FlightDataType.TYPE_DRAG_FORCE = Drag force
 FlightDataType.TYPE_DRAG_COEFF = Drag coefficient
 FlightDataType.TYPE_AXIAL_DRAG_COEFF = Axial drag coefficient
@ -2067,20 +1854,6 @@ FlightDataType.TYPE_LONGITUDE = Longitude
 FlightDataType.TYPE_CORIOLIS_ACCELERATION = Coriolis acceleration
 FlightDataType.TYPE_GRAVITY = Gravitational acceleration
 ! FlightDataTypeGroup
 FlightDataTypeGroup.GROUP_TIME = Time
 FlightDataTypeGroup.GROUP_POSITION_AND_MOTION = Position and Motion
 FlightDataTypeGroup.GROUP_ORIENTATION = Orientation
 FlightDataTypeGroup.GROUP_MASS_AND_INERTIA = Mass and Inertia
 FlightDataTypeGroup.GROUP_STABILITY = Stability
 FlightDataTypeGroup.GROUP_THRUST_AND_DRAG = Thrust and Drag
 FlightDataTypeGroup.GROUP_COEFFICIENTS = Coefficients
 FlightDataTypeGroup.GROUP_ATMOSPHERIC_CONDITIONS = Atmospheric Conditions
 FlightDataTypeGroup.GROUP_CHARACTERISTIC_NUMBERS = Characteristic Numbers
 FlightDataTypeGroup.GROUP_REFERENCE_VALUES = Reference Values
 FlightDataTypeGroup.GROUP_SIMULATION_INFORMATION = Simulation Information
 FlightDataTypeGroup.GROUP_CUSTOM = Custom
 ! PlotConfiguration
 PlotConfiguration.Verticalmotion = Vertical motion vs. time
 PlotConfiguration.Totalmotion = Total motion vs. time
@ -2101,9 +1874,8 @@ Warning.AIRFRAME_GAP = Gap in rocket airframe
 Warning.AIRFRAME_OVERLAP = Overlap in airframe components
 Warning.PODSET_FORWARD = In-line podset forward of parent airframe component
 Warning.PODSET_OVERLAP = In-line podset overlaps parent airframe component
-Warning.THICK_FIN = Thick fins may not simulate accurately
+Warning.THICK_FIN = Thick fins may not simulate accurately.
-Warning.JAGGED_EDGED_FIN = Jagged-edged fin predictions may be inaccurate
+Warning.JAGGED_EDGED_FIN = Jagged-edged fin predictions may be inaccurate.
 Warning.ZERO_AREA_FIN = Fins with zero area will not affect aerodynamics
 Warning.LISTENERS_AFFECTED = Listeners modified the flight simulation
 Warning.RECOVERY_DEPLOYMENT_WHILE_BURNING = Recovery device opened while motor still burning.
 Warning.FILE_INVALID_PARAMETER = Invalid parameter encountered, ignoring.
@ -2119,8 +1891,6 @@ Warning.TUBE_SEPARATION = Space between tube fins may not simulate accurately.
 Warning.TUBE_OVERLAP = Overlapping tube fins may not simulate accurately.
 Warning.EMPTY_BRANCH = Simulation branch contains no data
 Warning.SEPARATION_ORDER = Stages separated in an unreasonable order
 Warning.EARLY_SEPARATION = Stages separated before clearing launch rod/rail
 Warning.OBJ_ZERO_THICKNESS = Zero-thickness component can cause issues for 3D printing
 ! Scale dialog
 ScaleDialog.lbl.scaleRocket = Entire rocket
@ -2415,7 +2185,7 @@ ComponentPresetChooserDialog.menu.units = Units
 ComponentPresetChooserDialog.checkbox.showLegacyCheckBox = Show Legacy Database
 ComponentPresetChooserDialog.lbl.favorites = Check to add preset to the preset drop-down menu in the component edit dialog<br>Directly apply a preset by double-clicking it or by selecting it and closing this window.
 ComponentPresetChooserDialog.checkbox.alwaysOpenPreset = Always open this dialog when creating a new %s
-table.column.Favorite = \u2026 Favorite
+table.column.Favorite = Favorite
 table.column.Legacy = Legacy
 table.column.Manufacturer = Manufacturer
 table.column.PartNo = Part Number
@ -2480,17 +2250,16 @@ IgnitionSelectionDialog.opt.default = Change all configurations using the defaul
 IgnitionSelectionDialog.opt.override = Override for the {0} flight configuration only
 DeploymentSelectionDialog.opt.title = Which flight configurations are affected:
-DeploymentSelectionDialog.opt.default = Change all configurations using the default deployment event
+DeploymentSelectionDialog.opt.default = Change all configuration using the default deployment event
 DeploymentSelectionDialog.opt.override = Override for the {0} flight configuration only
 SeparationSelectionDialog.opt.title = Which flight configurations are affected:
-SeparationSelectionDialog.opt.default = Change all configurations using the default separation event
+SeparationSelectionDialog.opt.default = Change all configuration using the default separation event
 SeparationSelectionDialog.opt.override = Override for the {0} flight configuration only
 MotorConfigurationPanel.description = <b>Select the motors and motor ignition events of the selected flight configuration.</b><br> <em>Motor mounts:</em> Select which components function as motor mounts.<br> <em>Motor configurations:</em> Select the motor and ignition event for each motor mount.
 MotorDescriptionSubstitutor.description = Motors in the configuration
 MotorManufacturerSubstitutor.description = Motor manufacturers in the configuration
 !Photo Panel
@ -2530,7 +2299,6 @@ PhotoSettingsConfig.lbl.lightAz = Light Azimuth
 PhotoSettingsConfig.lbl.lightAlt = Light Altitude
 PhotoSettingsConfig.lbl.sky = Sky
 PhotoSettingsConfig.lbl.skyColor = Sky Color
 PhotoSettingsConfig.lbl.skyColorOpacity = Sky Color Opacity
 PhotoSettingsConfig.lbl.skyImage = Sky Image
 PhotoSettingsConfig.lbl.skyCredit = Image Credit
--- a/core/resources/l10n/messages_ar.properties
+++ b/core/resources/l10n/messages_ar.properties
@ -16,6 +16,11 @@
 debug.currentFile = messages_ar.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain = لا تسألني مجددا
 RocketActions.lbl.Youcanchangedefop = يمكنك تغيير العملية الافتراضية في التفضيلات.
 RocketActions.showConfirmDialog.lbl1 = إحذف المحاكاة المختارة؟
 RocketActions.showConfirmDialog.lbl2 = <html><i>لا يمكنك التراجع عن هذه العملية.</i>
 RocketActions.showConfirmDialog.title = إحذف كل المحاكاة
 RocketActions.DelCompAct.Delete = إحذف
 RocketActions.DelCompAct.ttip.Delete = إحذف القطعة المختارة
 RocketActions.DelSimuAct.Delete = إحذف
@ -101,7 +106,7 @@ dlg.but.close = إغلاق
 ! General file type names
 FileHelper.CSV_FILTER = (*.csv) ملفات مفصولة بفواصل
 FileHelper.PDF_FILTER = (*.pdf) ملف بي دي إف
-FileHelper.ALL_DESIGNS_FILTER = (*.ork; *.rkt, *.CDX1) كل تصاميم الصواريخ
+FileHelper.ALL_DESIGNS_FILTER = (*.ork; *.rkt) كل تصاميم الصواريخ
 FileHelper.OPENROCKET_DESIGN_FILTER = (*.ork) تصاميم أوبنروكت
 FileHelper.ROCKSIM_DESIGN_FILTER = (*.rkt) تصاميم روكسيم
 FileHelper.OPEN_ROCKET_COMPONENT_FILTER = (*.orc) إعدادات أوبنروكت المسبقة
@ -271,8 +276,8 @@ pref.dlg.tab.Simulation = محاكاة
 pref.dlg.tab.Launch = إطلاق
 pref.dlg.tab.Miscellaneousoptions = الخيارات المتنوعة
 pref.dlg.lbl.RockSimWarning = إظهار تحذير عند الحفظ بتنسيق روكسيم
-pref.dlg.but.resetAllPreferences = إعادة تعيين كل التفضيلات
+pref.dlg.but.clearCachedPreferences = إعادة تعيين كل التفضيلات
-pref.dlg.but.resetAllPreferences.ttip = (إعدادات واجهة المستخدم والملفات الحديثة وما إلى ذلك)إعادة تعيين جميع التفضيلات ، بما في ذلك التفضيلات المخزنة مؤقتًا
+pref.dlg.but.clearCachedPreferences.ttip = (إعدادات واجهة المستخدم والملفات الحديثة وما إلى ذلك)إعادة تعيين جميع التفضيلات ، بما في ذلك التفضيلات المخزنة مؤقتًا
 pref.dlg.clearCachedPreferences.title = هل تريد إعادة تعيين التفضيلات؟
 pref.dlg.clearCachedPreferences.message = هل أنت متأكد أنك تريد إعادة تعيين كل تفضيلاتك؟
@ -343,6 +348,9 @@ pref.dlg.PrefBooleanSelector2 = تأكيد
 pref.dlg.Add = أضف
 pref.dlg.DescriptionArea.Adddirectories =.ملفات محرك روكسيم أو أرشيفات زيب مفصولة بفاصلة منقوطة لتحميل منحنيات الدفع الخارجية. ستدخل التغييرات حيز التنفيذ في المرة التالية التي تفتح فيها أوبنروكت (* .rse)أو RASP ملفات محرك (* .eng), أضف الدلائل
 PreferencesDialog.lbl.language = :لغة الواجهة
 PreferencesDialog.languages.default = النظام الافتراضي
 PreferencesDialog.lbl.languageEffect = .ستتغير اللغة في المرة التالية التي تعيد تشغيل أوبنروكت
 generalprefs.lbl.language = :لغة الواجهة
 generalprefs.languages.default = النظام الافتراضي
 generalprefs.lbl.languageEffect = .ستتغير اللغة في المرة التالية التي تعيد تشغيل أوبنروكت
@ -951,18 +959,16 @@ RocketCompCfg.lbl.Length = :الطول
 RocketCompCfg.lbl.Thickness = :السماكة
 RocketCompCfg.checkbox.Endcapped = نهاية مغلقة
 RocketCompCfg.checkbox.Endcapped.ttip = .يغلق نهاية الكتف
-RocketCompCfg.border.Aftshoulder = مؤخرة الكتف
+RocketCompCfg.title.Aftshoulder = مؤخرة الكتف
 RocketCompCfg.border.Foreshoulder = مقدمة الكتف
 !RocketCompCfg.lbl.Length = :الطول
 RocketCompCfg.lbl.InstanceCount = عدد المثيل
 RocketCompCfg.lbl.InstanceSeparation = فصل المثيل
 RocketCompCfg.tab.Outside = من الخارج
 RocketCompCfg.tab.Inside = من الداخل
 RocketCompCfg.tab.RightSide = الجانب اليميني
 RocketCompCfg.tab.LeftSide = الجانب اليساري
 ! InstancesPanel
 InstancesPanel.lbl.InstanceCount = عدد المثيل
 InstancesPanel.lbl.InstanceSeparation = فصل المثيل
 ! ComponentInfo
 ComponentInfo.EngineBlock = .كتلة المحرك تمنعه من التحرك للأمام في أنبوب الحامل للمحرك<br><br>.من أجل إضافة محرك ، قم بإنشاء أنبوب جسم أو أنبوب داخلي وقم بتمييزه على أنه حامل محرك في علامة تبويب المحرك
@ -1295,7 +1301,11 @@ StorageOptChooser.lbl.Simdatatostore = :بيانات مُحاكاة للتخزي
 StorageOptChooser.rdbut.Allsimdata = جميع البيانات المحاكاة
 StorageOptChooser.lbl.longA1 = <html>.تخزين جميع البيانات المحاكاة<br>
 StorageOptChooser.lbl.longA2 = !يمكن أن ينتج عن ذلك ملفات كبيرة جدًا
-StorageOptChooser.rdbut.Onlysummarydata = المحاكاة الأولية فقط
+StorageOptChooser.rdbut.Every = كل
 StorageOptChooser.lbl.longB1 = <html>.قم بتخزين القيم القابلة للرسم على مخطط بياني على مسافة متباعدة تقريبًا<br>
 StorageOptChooser.lbl.longB2 = .القيم الأكبر ينتج عنها ملفات أصغر
 StorageOptChooser.lbl.seconds = ثواني
 StorageOptChooser.rdbut.Onlyprimfig = المحاكاة الأولية فقط
 StorageOptChooser.lbl.longC1 = <html>.قم بتخزين القيم المعروضة في جدول الملخص فقط<br>
 StorageOptChooser.lbl.longC2 = .ينتج عن هذا أصغر الملفات
 StorageOptChooser.lbl.longD1 = .تقدير لمدى حجم الملف الناتج مع الخيارات الحالية
@ -1327,7 +1337,8 @@ TCMotorSelPan.MotorMountDimensions = :أبعاد حامل المحرك
 TCMotorSelPan.lbl.Search = :بحث
 TCMotorSelPan.lbl.Selectthrustcurve = :حدد منحنى الدفع
 TCMotorSelPan.lbl.Ejectionchargedelay = :تأخير شحنة الإطلاق
-TCMotorSelPan.lbl.Numberofseconds = (\"لا شئ\" عدد الثواني أو)
+TCMotorSelPan.equalsIgnoreCase.None = لا شئ
 TCMotorSelPan.lbl.NumberofsecondsorNone = (\"لا شئ\" عدد الثواني أو)
 TCMotorSelPan.lbl.Designation = :تسمية الشركة المصنعة
 TCMotorSelPan.lbl.Totalimpulse = :الدفع الكلي
 TCMotorSelPan.lbl.Avgthrust = :متوسط الدفع
@ -1342,7 +1353,7 @@ TCMotorSelPan.lbl.Datapoints = :نقاط البيانات
 TCMotorSelPan.lbl.Digest = :الإستيعاب
 TCMotorSelPan.title.Thrustcurve = :منحنى الدفع
 TCMotorSelPan.title.Thrust = الدفع
-TCMotorSelPan.delayBox.Plugged = لا شئ
+TCMotorSelPan.delayBox.None = لا شئ
 TCMotorSelPan.noDescription = .لا يوجد وصف متاح
 TCMotorSelPan.btn.checkAll = تحديد الكل
 TCMotorSelPan.btn.checkNone = مسح الكل
@ -1380,10 +1391,10 @@ main.menu.file.saveAs = \u2026 إحفظ ك
 main.menu.file.saveAs.desc = إحفظ تصميم الصاروخ الحالي في ملف جديد
 !  main.menu.file.import = \u2026 إستيراد
 !  main.menu.file.import.desc = rkt إستيراد التصميم من ملف روكسيم
-main.menu.file.exportAs = صدر ك
+main.menu.file.export_as = صدر ك
-main.menu.file.exportAs.desc = تصدير التصميم كتنسيق ملف محدد
+main.menu.file.export_as.desc = تصدير التصميم كتنسيق ملف محدد
-main.menu.file.encode3D = تشفير ثلاثي الأبعاد
+main.menu.file.encode_3d = تشفير ثلاثي الأبعاد
-main.menu.file.encode3D.desc = تشفير التصميم إلى تنسيق ملف ثلاثي الأبعاد محدد
+main.menu.file.encode_3d.desc = تشفير التصميم إلى تنسيق ملف ثلاثي الأبعاد محدد
 main.menu.file.print = \u2026 طباعة معلومات التصميم
 main.menu.file.print.desc = مواصفات تصميم الطباعة ، بما في ذلك قائمة الأجزاء وقوالب الزعان, إطبع أو إحفظ كملف بي دي إف
 main.menu.file.close = أغلق التصميم
--- a/core/resources/l10n/messages_cs.properties
+++ b/core/resources/l10n/messages_cs.properties
@ -16,6 +16,11 @@
 debug.currentFile = messages_cs.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain = Prí\u0161te se me neptejte
 RocketActions.lbl.Youcanchangedefop = Mu\u017Eete zmenit výchozí operaci v nastavení.
 RocketActions.showConfirmDialog.lbl1 = Chcete smazat oznacenou simulaci?
 RocketActions.showConfirmDialog.lbl2 = <html><i>Tuto operaci nelze vzít zpet.</i>
 RocketActions.showConfirmDialog.title = Sma\u017E simulace
 RocketActions.DelCompAct.Delete = Sma\u017E
 RocketActions.DelCompAct.ttip.Delete = Sma\u017E oznacenou komponentu.
 RocketActions.DelSimuAct.Delete = Sma\u017E
@ -54,7 +59,7 @@ RocketPanel.lbl.infoMessage = <html>Stiskni k oznacen
 ! BasicFrame
-FileHelper.ALL_DESIGNS_FILTER = V\u0161echny návrhy raket (*.ork; *.rkt, *.CDX1)
+FileHelper.ALL_DESIGNS_FILTER = V\u0161echny návrhy raket (*.ork; *.rkt)
 FileHelper.OPENROCKET_DESIGN_FILTER = Návrhy OpenRocket (*.ork)
 FileHelper.ROCKSIM_DESIGN_FILTER = Návrhy RockSim (*.rkt)
 FileHelper.CSV_FILTER = Soubory s cárkovým oddelovacem (*.csv)
@ -264,9 +269,9 @@ pref.dlg.PrefBooleanSelector2 = Potvrd
 pref.dlg.Add = Pridej
 pref.dlg.DescriptionArea.Adddirectories = Pridej adresáre, soubory RASP motor  (*.eng), RockSim engine soubory (*.rse) nebo ZIP archiv oddelený oddelovacem (;) k nahrání externích výkonových prubehu. Zmeny se projeví po restaru programu OpenRocket.
-generalprefs.lbl.language = Jazyk rohranní:
+PreferencesDialog.lbl.language = Jazyk rohranní:
-generalprefs.languages.default = Výchozí
+PreferencesDialog.languages.default = Výchozí
-generalprefs.lbl.languageEffect = Jazyk se zmení pri dal\u0161ím spu\u0161tení programu OpenRocket.
+PreferencesDialog.lbl.languageEffect = Jazyk se zmení pri dal\u0161ím spu\u0161tení programu OpenRocket.
 ! Software update checker
 update.dlg.error.title = Nemohu získat informace o aktualizacích
@ -651,7 +656,7 @@ RocketCompCfg.lbl.Length = D
 RocketCompCfg.lbl.Thickness = Tlou\u0161tka:
 RocketCompCfg.checkbox.Endcapped = Záslepka
 RocketCompCfg.ttip.Endcapped = Zdali je konec ramene zaslepen.
-RocketCompCfg.border.Aftshoulder = Dr\u017Eák zádi
+RocketCompCfg.title.Aftshoulder = Dr\u017Eák zádi
 RocketCompCfg.border.Foreshoulder = Dr\u017Eák prídi 
 !RocketCompCfg.lbl.Length = Délka:
@ -916,6 +921,10 @@ StorageOptChooser.lbl.Simdatatostore = Simulacn
 StorageOptChooser.rdbut.Allsimdata = V\u0161echny data ze simulace
 StorageOptChooser.lbl.longA1 = <html>Ulo\u017Eí v\u0161echny simulacní data.<br>
 StorageOptChooser.lbl.longA2 = Výsledek mu\u017Ee vyústit ve velmi velké soubory!
 StorageOptChooser.rdbut.Every = Ka\u017Edý
 StorageOptChooser.lbl.longB1 = <html>Store plottable values approximately this far apart.<br>
 StorageOptChooser.lbl.longB2 = Vet\u0161í hodnoty vyústí v men\u0161í soubory.
 StorageOptChooser.lbl.seconds = sekundy
 StorageOptChooser.rdbut.Onlyprimfig = Pouze hlavní grafy
 StorageOptChooser.lbl.longC1 = <html>Ulo\u017E pouze hodnoty ukázané v prehledu.<br>
 StorageOptChooser.lbl.longC2 = This results in the smallest files.
@ -935,7 +944,8 @@ TCMotorSelPan.lbl.Motormountdia = Prumer uchycen
 TCMotorSelPan.lbl.Search = Hledej:
 TCMotorSelPan.lbl.Selectthrustcurve = Vyber výkonovou krivku:
 TCMotorSelPan.lbl.Ejectionchargedelay = Oddelovací zpo\u017Edení:
-TCMotorSelPan.lbl.Numberofseconds = (Pocet sekund nebo \"Nic\")
+TCMotorSelPan.equalsIgnoreCase.None = Nic
 TCMotorSelPan.lbl.NumberofsecondsorNone = (Pocet sekund nebo \"Nic\")
 TCMotorSelPan.lbl.Designation = Pojmenování:
 TCMotorSelPan.lbl.Totalimpulse = Celkový impulse:
 TCMotorSelPan.lbl.Avgthrust = Prumerný tah:
@ -947,7 +957,7 @@ TCMotorSelPan.lbl.Datapoints = Datov
 TCMotorSelPan.lbl.Digest = Výber:
 TCMotorSelPan.title.Thrustcurve = Výkonová krivka:
 TCMotorSelPan.title.Thrust = Tah
-TCMotorSelPan.delayBox.Plugged = Nic
+TCMotorSelPan.delayBox.None = Nic
 ! PlotDialog
--- a/core/resources/l10n/messages_de.properties
+++ b/core/resources/l10n/messages_de.properties
--- a/core/resources/l10n/messages_es.properties
+++ b/core/resources/l10n/messages_es.properties
--- a/core/resources/l10n/messages_fr.properties
+++ b/core/resources/l10n/messages_fr.properties
--- a/core/resources/l10n/messages_it.properties
+++ b/core/resources/l10n/messages_it.properties
--- a/core/resources/l10n/messages_ja.properties
+++ b/core/resources/l10n/messages_ja.properties
@ -12,6 +12,11 @@
 debug.currentFile = messages_ja.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain  = \u6B21\u56DE\u304B\u3089\u8868\u793A\u3057\u306A\u3044
 RocketActions.lbl.Youcanchangedefop  = \u8A2D\u5B9A\u306E\u4E2D\u3067\u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u5909\u66F4\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059
 RocketActions.showConfirmDialog.lbl1  = \u9078\u629E\u3057\u305F\u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u3092\u6D88\u53BB\u3057\u307E\u3059\u304B\uFF1F
 RocketActions.showConfirmDialog.lbl2  = <html><i>\u6D88\u53BB\u3057\u305F\u3089\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093</i>
 RocketActions.showConfirmDialog.title  = \u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u306E\u524A\u9664
 RocketActions.DelCompAct.Delete  = \u524A\u9664
 RocketActions.DelCompAct.ttip.Delete  = \u9078\u629E\u3057\u305F\u90E8\u54C1\u306E\u524A\u9664
 RocketActions.DelSimuAct.Delete  = \u524A\u9664
@ -84,7 +89,7 @@ dlg.but.close  = \u9589\u3058\u308B
 ! General file type names
 FileHelper.PDF_FILTER  = PDF files (*.pdf)
-FileHelper.ALL_DESIGNS_FILTER  = All rocket designs (*.ork; *.rkt, *.CDX1)
+FileHelper.ALL_DESIGNS_FILTER  = All rocket designs (*.ork; *.rkt)
 FileHelper.OPENROCKET_DESIGN_FILTER  = OpenRocket designs (*.ork)
 FileHelper.ROCKSIM_DESIGN_FILTER  = RockSim designs (*.rkt)
 FileHelper.OPEN_ROCKET_COMPONENT_FILTER  = OpenRocket presets (*.orc)
@ -265,9 +270,9 @@ pref.dlg.PrefBooleanSelector2  = \u78BA\u8A8D
 pref.dlg.Add  = \u8FFD\u52A0
 pref.dlg.DescriptionArea.Adddirectories  = \u30D5\u30A9\u30EB\u30C0, RASP motor files (*.eng), RockSim engine files (*.rse) \u3082\u3057\u304F\u306F ZIP archives \u3092\u30BB\u30DF\u30B3\u30ED\u30F3(;)\u306B\u3088\u3063\u3066\u5206\u3051\u3089\u308C\u305F\u5F62\u3067\u8FFD\u52A0\u306E\u63A8\u529B\u5C65\u6B74\u3068\u3057\u3066\u8FFD\u52A0\u3067\u304D\u307E\u3059\u3002\u3053\u306E\u5909\u66F4\u306FOpenRocket\u306E\u518D\u8D77\u52D5\u6642\u306B\u6709\u52B9\u306B\u306A\u308A\u307E\u3059
-generalprefs.lbl.language  = \u8A00\u8A9E\uFF1A
+PreferencesDialog.lbl.language  = \u8A00\u8A9E\uFF1A
-generalprefs.languages.default  = \u30B7\u30B9\u30C6\u30E0\u8A00\u8A9E
+PreferencesDialog.languages.default  = \u30B7\u30B9\u30C6\u30E0\u8A00\u8A9E
-generalprefs.lbl.languageEffect  = \u8A00\u8A9E\u306F\u518D\u8D77\u52D5\u6642\u306B\u5909\u66F4\u3055\u308C\u307E\u3059
+PreferencesDialog.lbl.languageEffect  = \u8A00\u8A9E\u306F\u518D\u8D77\u52D5\u6642\u306B\u5909\u66F4\u3055\u308C\u307E\u3059
 ! Software update checker
 update.dlg.error.title  = \u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u60C5\u5831\u306E\u8AAD\u307F\u51FA\u3057\u304C\u3067\u304D\u307E\u305B\u3093
@ -739,7 +744,7 @@ RocketCompCfg.lbl.Length  = \u9577\u3055\uFF1A
 RocketCompCfg.lbl.Thickness  = \u539A\u3055\uFF1A
 RocketCompCfg.checkbox.Endcapped  = \u7AEF\u306B\u30D5\u30BF\u3092\u3059\u308B
 RocketCompCfg.ttip.Endcapped  = \u30D5\u30BF\u304C\u3042\u308B\u304B\u3069\u3046\u304B
-RocketCompCfg.border.Aftshoulder  = \u5F8C\u65B9\u30B7\u30E7\u30EB\u30C0\u30FC
+RocketCompCfg.title.Aftshoulder  = \u5F8C\u65B9\u30B7\u30E7\u30EB\u30C0\u30FC
 RocketCompCfg.border.Foreshoulder  = \u524D\u65B9\u30B7\u30E7\u30EB\u30C0\u30FC
 !RocketCompCfg.lbl.Length 
@ -1005,7 +1010,11 @@ StorageOptChooser.lbl.Simdatatostore  = \u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30
 StorageOptChooser.rdbut.Allsimdata  = \u5168\u3066\u306E\u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u30C7\u30FC\u30BF
 StorageOptChooser.lbl.longA1  = <html>\u5168\u3066\u306E\u30B7\u30DF\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58<br>
 StorageOptChooser.lbl.longA2  = \u3068\u3066\u3082\u5927\u304D\u306A\u30D5\u30A1\u30A4\u30EB\u306B\u306A\u308A\u307E\u3059
-StorageOptChooser.rdbut.Onlysummarydata  = \u4E3B\u8981\u306A\u5024\u306E\u307F
+StorageOptChooser.rdbut.Every  = 
 StorageOptChooser.lbl.longB1  = <html>\u8FD1\u4F3C\u3057\u3066\u4FDD\u5B58<br>
 StorageOptChooser.lbl.longB2  = \u5927\u304D\u306A\u5024\u306B\u3059\u308B\u3068\u30D5\u30A1\u30A4\u30EB\u306F\u5C0F\u3055\u304F\u306A\u308B
 StorageOptChooser.lbl.seconds  = \u79D2\u6BCE
 StorageOptChooser.rdbut.Onlyprimfig  = \u4E3B\u8981\u306A\u5024\u306E\u307F
 StorageOptChooser.lbl.longC1  = <html>\u8868\u306B\u66F8\u304B\u308C\u3066\u3044\u308B\u5024\u306E\u307F\u4FDD\u5B58<br>
 StorageOptChooser.lbl.longC2  = \u30D5\u30A1\u30A4\u30EB\u306F\u4E00\u756A\u5C0F\u3055\u304F\u306A\u308B
 StorageOptChooser.checkbox.Compfile  = \u30D5\u30A1\u30A4\u30EB\u306E\u5727\u7E2E
@ -1024,7 +1033,8 @@ TCMotorSelPan.lbl.Motormountdia  = \u30E2\u30FC\u30BF\u30FC\u30DE\u30A6\u30F3\u3
 TCMotorSelPan.lbl.Search  = \u691C\u7D22\uFF1A
 TCMotorSelPan.lbl.Selectthrustcurve  = \u63A8\u529B\u5C65\u6B74\uFF1A
 TCMotorSelPan.lbl.Ejectionchargedelay  = Ejection charge delay:
-TCMotorSelPan.lbl.Numberofseconds  = (Number of seconds or \"None\")
+TCMotorSelPan.equalsIgnoreCase.None  = None
 TCMotorSelPan.lbl.NumberofsecondsorNone  = (Number of seconds or \"None\")
 TCMotorSelPan.lbl.Designation = \u8A18\u53F7
 TCMotorSelPan.lbl.Totalimpulse  = \u30C8\u30FC\u30BF\u30EB\u30A4\u30F3\u30D1\u30EB\u30B9\uFF1A
 TCMotorSelPan.lbl.Avgthrust  = \u5E73\u5747\u63A8\u529B\uFF1A
@ -1036,7 +1046,7 @@ TCMotorSelPan.lbl.Datapoints  = \u30C7\u30FC\u30BF\u70B9\uFF1A
 TCMotorSelPan.lbl.Digest  = \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\uFF1A
 TCMotorSelPan.title.Thrustcurve  = \u63A8\u529B\u5C65\u6B74\uFF1A
 TCMotorSelPan.title.Thrust  = \u63A8\u529B
-TCMotorSelPan.delayBox.Plugged  = Plugged (None)
+TCMotorSelPan.delayBox.None  = Plugged (None)
 TCMotorSelPan.noDescription  = No description available.
--- a/core/resources/l10n/messages_nl.properties
+++ b/core/resources/l10n/messages_nl.properties
@ -18,6 +18,11 @@
 debug.currentFile = messages_nl.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain = Niet opnieuw vragen
 RocketActions.lbl.Youcanchangedefop = U kan de standaardbewerking veranderen in de voorkeuren.
 RocketActions.showConfirmDialog.lbl1 = Geselecteerde simulatie verwijderen?
 RocketActions.showConfirmDialog.lbl2 = <html><i>Deze bewerking kan niet ongedaan worden.</i>
 RocketActions.showConfirmDialog.title = Verwijder simulaties
 RocketActions.DelCompAct.Delete = Verwijder
 RocketActions.DelCompAct.ttip.Delete = Verwijder het geselecteerde onderdeel.
 RocketActions.DelSimuAct.Delete = Verwijder
@ -105,7 +110,7 @@ dlg.but.close = Sluit
 ! General file type names
 FileHelper.PDF_FILTER = PDF-bestanden (*.pdf)
-FileHelper.ALL_DESIGNS_FILTER = Alle raketontwerpen (*.ork; *.rkt, *.CDX1)
+FileHelper.ALL_DESIGNS_FILTER = Alle raketontwerpen (*.ork; *.rkt)
 FileHelper.OPENROCKET_DESIGN_FILTER = OpenRocket-ontwerpen (*.ork)
 FileHelper.ROCKSIM_DESIGN_FILTER = RockSim-ontwerpen (*.rkt)
 FileHelper.OPEN_ROCKET_COMPONENT_FILTER = OpenRocket-presets (*.orc)
@ -271,10 +276,9 @@ pref.dlg.tab.Design = Ontwerp
 pref.dlg.tab.Simulation = Simulatie
 pref.dlg.tab.Launch = Lanceer
 pref.dlg.tab.Miscellaneousoptions = Diverse opties
 pref.dlg.lbl.RASAeroWarning = Toon waarschuwingen bij opslaan in RASAero-formaat
 pref.dlg.lbl.RockSimWarning = Toon waarschuwingen bij opslaan in RockSim-formaat
-pref.dlg.but.resetAllPreferences = Alle voorkeuren opnieuw instellen
+pref.dlg.but.clearCachedPreferences = Alle voorkeuren opnieuw instellen
-pref.dlg.but.resetAllPreferences.ttip = Alle voorkeuren opnieuw instellen, inclusief voorkeuren in de cache (UI-instellingen, recente bestanden, enz.)
+pref.dlg.but.clearCachedPreferences.ttip = Alle voorkeuren opnieuw instellen, inclusief voorkeuren in de cache (UI-instellingen, recente bestanden, enz.)
 pref.dlg.clearCachedPreferences.title = Voorkeuren opnieuw instellen?
 pref.dlg.clearCachedPreferences.message = Bent u zeker dat u al uw voorkeuren opnieuw wilt instellen?
@ -345,6 +349,10 @@ pref.dlg.PrefBooleanSelector2 = Bevestig
 pref.dlg.Add = Voeg toe
 pref.dlg.DescriptionArea.Adddirectories = Voeg folders, RASP motorbestanden (*.eng), RockSim motorbestanden (*.rse) of ZIP-archieven gescheiden door een puntkomma (;) om externe stuwkrachtcurves te laden. Wijzigingen zullen van kracht gaan de volgende keer dat u OpenRocket start.
 PreferencesDialog.lbl.language = Interface taal:
 PreferencesDialog.languages.default = Systeemstandaard
 PreferencesDialog.lbl.languageEffect = De taal zal veranderen de volgende keer dat u OpenRocket start.
 generalprefs.lbl.language = Interface taal
 generalprefs.languages.default = Systeemstandaard
 generalprefs.lbl.languageEffect = De taal zal veranderen de volgende keer dat u OpenRocket start.
@ -898,9 +906,11 @@ RocketCompCfg.lbl.Length = Lengte:
 RocketCompCfg.lbl.Thickness = Dikte:
 RocketCompCfg.checkbox.Endcapped = Einde afgetopt
 RocketCompCfg.ttip.Endcapped = Of het einde van de schouder is afgedekt.
-RocketCompCfg.border.Aftshoulder = Achterschouder
+RocketCompCfg.title.Aftshoulder = Achterschouder
 RocketCompCfg.border.Foreshoulder = Voorschouder
 !RocketCompCfg.lbl.Length = Lengte:
 RocketCompCfg.lbl.InstanceCount = Aantal instanties
 RocketCompCfg.lbl.InstanceSeparation = Instantie afstand
 RocketCompCfg.tab.Outside = Buitenkant
 RocketCompCfg.tab.Inside = Binnenkant
 RocketCompCfg.tab.RightSide = Rechterkant
@ -913,10 +923,6 @@ RocketCompCfg.CancelOperation.title = Annuleren
 RocketCompCfg.CancelOperation.checkbox.dontAskAgain = Vraag me niet opnieuw
 RocketCompCfg.btn.ComponentInfo.ttip = Toon/verberg informatieve text over deze component.
 ! InstancesPanel
 InstancesPanel.lbl.InstanceCount = Aantal instanties
 InstancesPanel.lbl.InstanceSeparation = Instantie afstand
 ! ComponentInfo
 ComponentInfo.EngineBlock = Een <b>motorblok</b> voorkomt dat de motor voorwaarts beweegt in de buis van de motorsteun.<br><br>Om een motor toe te voegen, maak een <b>rompbuis</b> of <b>binnenbuis</b> en markeer het als een motorbevestiging in het <em>Motortabblad</em>.
@ -1211,10 +1217,6 @@ FinsetConfig.ttip.Finfillets1 = <HTML>Voegt de voorspelde massa van de vin fille
 FinsetConfig.ttip.Finfillets2 = Veronderstelt dat de fillet concaaf is en raakt aan de buis en de vin.<br>
 FinsetConfig.ttip.Finfillets3 = Nul radius geeft geen fillet.
 ! Save RASAero Warning Dialog
 SaveRASAeroWarningDialog.txt1 = Exporteren naar RASAero bestandsformaat ondersteunt niet alle functies van OpenRocket.
 SaveRASAeroWarningDialog.donotshow = Laat dit dialoogvenster niet meer zien
 ! Save RKT Warning Dialog
 SaveRktWarningDialog.txt1 = Exporteren naar RockSim bestandsformaat ondersteunt niet alle functies van OpenRocket.
 SaveRktWarningDialog.donotshow = Laat dit dialoogvenster niet meer zien
@ -1227,7 +1229,11 @@ StorageOptChooser.lbl.Simdatatostore = Gesimuleerde gegevens om op te slaan:
 StorageOptChooser.rdbut.Allsimdata = Alle gesimuleerde gegevens
 StorageOptChooser.lbl.longA1 = <html>Sla alle gesimuleerde gegevens op.<br>
 StorageOptChooser.lbl.longA2 = Dit kan resulteren in zeer grote bestanden!
-StorageOptChooser.rdbut.Onlysummarydata = Alleen primaire figuren
+StorageOptChooser.rdbut.Every = Elke
 StorageOptChooser.lbl.longB1 = <html>Sla plottable waarden ongeveer zo ver uit elkaar op.<br>
 StorageOptChooser.lbl.longB2 = Grotere waarden resulteren in kleinere bestanden.
 StorageOptChooser.lbl.seconds = seconden
 StorageOptChooser.rdbut.Onlyprimfig = Alleen primaire figuren
 StorageOptChooser.lbl.longC1 = <html>Sla alleen de waarden op die in de overzichtstabel staan.<br>
 StorageOptChooser.lbl.longC2 = Dit resulteert in de kleinste bestanden.
 StorageOptChooser.lbl.longD1 = Een schatting van hoe groot het resulterende bestand zou zijn met de huidige opties.
@ -1256,7 +1262,8 @@ TCMotorSelPan.MotorMountDimensions = Motorbevestiging afmetingen:
 TCMotorSelPan.lbl.Search = Zoek:
 TCMotorSelPan.lbl.Selectthrustcurve = Selecteer stuwkrachtcurve:
 TCMotorSelPan.lbl.Ejectionchargedelay = Vertraging schietlading:
-TCMotorSelPan.lbl.Numberofseconds = (Aantal seconden of \"Geen\")
+TCMotorSelPan.equalsIgnoreCase.None = Geen
 TCMotorSelPan.lbl.NumberofsecondsorNone = (Aantal seconden of \"Geen\")
 TCMotorSelPan.lbl.Designation = Benaming
 TCMotorSelPan.lbl.Totalimpulse = Totale impuls:
 TCMotorSelPan.lbl.Avgthrust = Gemiddelde stuwkracht:
@ -1271,7 +1278,7 @@ TCMotorSelPan.lbl.Datapoints = Datapunten:
 TCMotorSelPan.lbl.Digest = Verteer:
 TCMotorSelPan.title.Thrustcurve = Stuwkrachtcurve:
 TCMotorSelPan.title.Thrust = Stuwkracht
-TCMotorSelPan.delayBox.Plugged = Geen
+TCMotorSelPan.delayBox.None = Geen
 TCMotorSelPan.noDescription = Geen beschrijving beschikbaar.
 TCMotorSelPan.btn.checkAll = Selecteer Alles
 TCMotorSelPan.btn.checkNone = Alles wissen
@ -1456,7 +1463,7 @@ Shape.Haackseries.desc2 = De Haack-serie <i>neuskegels</i> zijn ontworpen om de
 ! RocketComponent
 RocketComponent.Position.Method.Axial.Label = Straal positioneermethode
-RocketComponent.Position.Method.Axial.ABSOLUTE = Tip van raket
+RocketComponent.Position.Method.Axial.ABSOLUTE = Tip van neuskegel
 RocketComponent.Position.Method.Axial.AFTER =  Na de sibling component
 RocketComponent.Position.Method.Axial.BOTTOM = Onderkant van de oudercomponent
 RocketComponent.Position.Method.Axial.MIDDLE =  Midden van de oudercomponent
--- a/core/resources/l10n/messages_pl.properties
+++ b/core/resources/l10n/messages_pl.properties
@ -16,6 +16,11 @@
 debug.currentFile  =  messages_pl.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain  =  Nie pytaj ponownie
 RocketActions.lbl.Youcanchangedefop  =  Domy\u015Bln\u0105 operacj\u0119 mo\u017Cna zmieni\u0107 w ustawieniach.
 RocketActions.showConfirmDialog.lbl1  =  Usun\u0105\u0107 zaznaczone symulacje?
 RocketActions.showConfirmDialog.lbl2  =  <html><i>Tej operacji nie mo\u017Cna cofn\u0105\u0107.</i>
 RocketActions.showConfirmDialog.title  =  Usu\u0144 symulacje
 RocketActions.DelCompAct.Delete  =  Usu\u0144
 RocketActions.DelCompAct.ttip.Delete  =  Usu\u0144 wybran\u0105 cz\u0119\u015B\u0107
 RocketActions.DelSimuAct.Delete  =  Usu\u0144
@ -89,7 +94,7 @@
 ! General file type names
 FileHelper.PDF_FILTER  =  Pliki PDF (*.pdf)
- FileHelper.ALL_DESIGNS_FILTER  =  Wszystkie projekty rakiet (*.ork; *.rkt, *.CDX1)
+ FileHelper.ALL_DESIGNS_FILTER  =  Wszystkie projekty rakiet (*.ork; *.rkt)
 FileHelper.OPENROCKET_DESIGN_FILTER  =  Projekty OpenRocket (*.ork; *.rkt)
 FileHelper.ROCKSIM_DESIGN_FILTER  =  Projekty RockSim (*.rkt)
 FileHelper.OPEN_ROCKET_COMPONENT_FILTER  =  Ustawienia OpenRocket (*.orc)
@ -265,10 +270,10 @@
 pref.dlg.PrefBooleanSelector2  =  Potwierd\u017A
 pref.dlg.Add  =  Dodaj
 pref.dlg.DescriptionArea.Adddirectories  =  Dodaj katalogi, pliki silnikowe RASP (*.eng), Pliki silnikowe RockSim (*.rse) albo archiwa ZIP rozdzielone \u015Brednikiem (;) by za\u0142adowa\u0107 zewn\u0119trzne krzywe si\u0142y ci\u0105gu.  Zmiany zostan\u0105 wprowadzone przy kolejnym uruchomieniu OpenRocket.
-
+ 
-generalprefs.lbl.language  =  J\u0119zyk programu:
+ PreferencesDialog.lbl.language  =  J\u0119zyk programu:
-generalprefs.languages.default  =  Domy\u015Blny j\u0119zyk systemu
+ PreferencesDialog.languages.default  =  Domy\u015Blny j\u0119zyk systemu
-generalprefs.lbl.languageEffect  =  Nowy j\u0119zyk zostanie ustawiony przy kolejnym uruchomieniu OpenRocket.
+ PreferencesDialog.lbl.languageEffect  =  Nowy j\u0119zyk zostanie ustawiony przy kolejnym uruchomieniu OpenRocket.
 ! Software update checker
 update.dlg.error.title  =  Nie mo\u017Cna uzyska\u0107 informacji o aktualizacji 
@ -653,7 +658,7 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s.
 RocketCompCfg.lbl.Thickness  =  Grubo\u015B\u0107:
 RocketCompCfg.checkbox.Endcapped  =  Zasklepiony koniec
 RocketCompCfg.ttip.Endcapped  =  Czy koniec wpustu jest zasklepiony.
- RocketCompCfg.border.Aftshoulder  =  Wpust tylny
+ RocketCompCfg.title.Aftshoulder  =  Wpust tylny
 RocketCompCfg.border.Foreshoulder  =  Wpust przedni
 !RocketCompCfg.lbl.Length
@ -919,7 +924,11 @@ ComponentInfo.EngineBlock  = <b>Blokada silnika</b> unieruchamia silnik wewn\u01
 StorageOptChooser.rdbut.Allsimdata  =  Wszystkie dane symulacji:
 StorageOptChooser.lbl.longA1  =  <html>Zapisz wszystkie dane z symulacji.<br>
 StorageOptChooser.lbl.longA2  =  To mo\u017Ce bardzo zwi\u0119kszy\u0107 rozmiar plików!
- StorageOptChooser.rdbut.Onlysummarydata  =  Tylko dane podstawowe
+ StorageOptChooser.rdbut.Every  =  Co
 StorageOptChooser.lbl.longB1  =  <html>Zapisz warto\u015Bci daj\u0105ce si\u0119 przedstawi\u0107 na wykresie w powy\u017Cszych odst\u0119pach.<br>
 StorageOptChooser.lbl.longB2  =  Wi\u0119ksze warto\u015Bci przek\u0142adaj\u0105 si\u0119 na mniejsze pliki.
 StorageOptChooser.lbl.seconds  =  sek.
 StorageOptChooser.rdbut.Onlyprimfig  =  Tylko dane podstawowe
 StorageOptChooser.lbl.longC1  =  <html>Zapisz tylko warto\u015Bci ukazane w tabeli podsumowuj\u0105cej symulacj\u0119.<br>
 StorageOptChooser.lbl.longC2  =  Przy tym ustawieniu pliki s\u0105 najmniejsze.
 StorageOptChooser.checkbox.Compfile  =  Kompresuj plik
@ -938,7 +947,8 @@ ComponentInfo.EngineBlock  = <b>Blokada silnika</b> unieruchamia silnik wewn\u01
 TCMotorSelPan.lbl.Search  =  Szukaj:
 TCMotorSelPan.lbl.Selectthrustcurve  =  Wybierz krzyw\u0105 si\u0142y ci\u0105gu:
 TCMotorSelPan.lbl.Ejectionchargedelay  =  Opó\u017Anienie odpalenia \u0142adunku odrzucaj\u0105cego:
- TCMotorSelPan.lbl.Numberofseconds  =  (liczba sekund lub \"Brak\")
+ TCMotorSelPan.equalsIgnoreCase.None  =  \u017Badne
 TCMotorSelPan.lbl.NumberofsecondsorNone  =  (liczba sekund lub \"Brak\")
 TCMotorSelPan.lbl.Designation =  Oznaczenie:
 TCMotorSelPan.lbl.Totalimpulse  =  Ca\u0142kowity impuls:
 TCMotorSelPan.lbl.Avgthrust  =  \u015Arednia si\u0142a ci\u0105gu:
@ -950,7 +960,7 @@ ComponentInfo.EngineBlock  = <b>Blokada silnika</b> unieruchamia silnik wewn\u01
 TCMotorSelPan.lbl.Digest  =  Podsumowanie:
 TCMotorSelPan.title.Thrustcurve  =  Krzywa si\u0142y ci\u0105gu:
 TCMotorSelPan.title.Thrust  =  Ci\u0105g
- TCMotorSelPan.delayBox.Plugged  =  \u017Badne
+ TCMotorSelPan.delayBox.None  =  \u017Badne
 ! PlotDialog
--- a/core/resources/l10n/messages_pt.properties
+++ b/core/resources/l10n/messages_pt.properties
--- a/core/resources/l10n/messages_ru.properties
+++ b/core/resources/l10n/messages_ru.properties
@ -16,6 +16,11 @@
 debug.currentFile = messages_ru.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain = \u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0441\u043F\u0440\u0430\u0448\u0438\u0432\u0430\u0442\u044C
 RocketActions.lbl.Youcanchangedefop = \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u0432 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0445.
 RocketActions.showConfirmDialog.lbl1 = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u0440\u0430\u0441\u0447\u0435\u0442\u044B?
 RocketActions.showConfirmDialog.lbl2 = <html><i>\u042D\u0442\u0443 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044E \u043D\u0435\u043B\u044C\u0437\u044F \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C.</i>
 RocketActions.showConfirmDialog.title = \u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u0440\u0430\u0441\u0447\u0435\u0442\u043E\u0432
 RocketActions.DelCompAct.Delete = \u0423\u0434\u0430\u043B\u0438\u0442\u044C
 RocketActions.DelCompAct.ttip.Delete = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442.
 RocketActions.DelSimuAct.Delete = \u0423\u0434\u0430\u043B\u0438\u0442\u044C
@ -101,7 +106,7 @@ dlg.but.close = \u0417\u0430\u043A\u0440\u044B\u0442\u044C
 ! General file type names
 FileHelper.CSV_FILTER = \u0422\u0435\u043A\u0441\u0442, \u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0437\u0430\u043F\u044F\u0442\u044B\u043C\u0438 (*.csv)
 FileHelper.PDF_FILTER = \u0424\u0430\u0439\u043B\u044B PDF (*.pdf)
-FileHelper.ALL_DESIGNS_FILTER = \u0412\u0441\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u044B \u0440\u0430\u043A\u0435\u0442 (*.ork; *.rkt, *.CDX1)
+FileHelper.ALL_DESIGNS_FILTER = \u0412\u0441\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u044B \u0440\u0430\u043A\u0435\u0442 (*.ork; *.rkt)
 FileHelper.OPENROCKET_DESIGN_FILTER = \u0424\u0430\u0439\u043B\u044B OpenRocket (*.ork)
 FileHelper.ROCKSIM_DESIGN_FILTER = \u0424\u0430\u0439\u043B\u044B RockSim (*.rkt)
 FileHelper.OPEN_ROCKET_COMPONENT_FILTER = \u0417\u0430\u0433\u043E\u0442\u043E\u0432\u043A\u0438 OpenRocket (*.orc)
@ -271,7 +276,6 @@ pref.dlg.tab.Design = \u0414\u0438\u0437\u0430\u0439\u043D
 pref.dlg.tab.Simulation = \u0420\u0430\u0441\u0447\u0435\u0442
 pref.dlg.tab.Launch = \u0417\u0430\u043F\u0443\u0441\u043A
 pref.dlg.tab.Miscellaneousoptions = \u041F\u0440\u043E\u0447\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
 pref.dlg.lbl.RASAeroWarning = \u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043F\u0440\u0435\u0434\u0443\u043F\u0440\u0435\u0436\u0434\u0435\u043D\u0438\u0435 \u043F\u0440\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0438 \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u0435 RASAero
 pref.dlg.lbl.RockSimWarning = \u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043F\u0440\u0435\u0434\u0443\u043F\u0440\u0435\u0436\u0434\u0435\u043D\u0438\u0435 \u043F\u0440\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0438 \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u0435 RockSim
 pref.dlg.tab.Graphics = \u0413\u0440\u0430\u0444\u0438\u043A\u0430
@ -341,6 +345,10 @@ pref.dlg.PrefBooleanSelector2 = \u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434
 pref.dlg.Add = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
 pref.dlg.DescriptionArea.Adddirectories = \u0414\u043B\u044F \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0434\u0430\u043D\u043D\u044B\u0445 \u0441\u0432\u043E\u0438\u0445 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0435\u0439 \u0434\u043E\u0431\u0430\u0432\u044C\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0438, \u0444\u0430\u0439\u043B\u044B \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0435\u0439 RASP (*.eng), \u0444\u0430\u0439\u043B\u044B \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u0435\u0439 RockSim (*.rse) \u0438\u043B\u0438 ZIP-\u0430\u0440\u0445\u0438\u0432\u044B, \u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 \u0442\u043E\u0447\u043A\u043E\u0439 \u0441 \u0437\u0430\u043F\u044F\u0442\u043E\u0439 (;). \u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0432\u0441\u0442\u0443\u043F\u044F\u0442 \u0432 \u0441\u0438\u043B\u0443 \u043F\u0440\u0438 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u043C \u0437\u0430\u043F\u0443\u0441\u043A\u0435 OpenRocket.
 PreferencesDialog.lbl.language = \u042F\u0437\u044B\u043A \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430:
 PreferencesDialog.languages.default = \u0421\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0439
 PreferencesDialog.lbl.languageEffect = \u042F\u0437\u044B\u043A \u0441\u043C\u0435\u043D\u0438\u0442\u0441\u044F \u043F\u0440\u0438 \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A\u0435 OpenRocket.
 generalprefs.lbl.language = \u042F\u0437\u044B\u043A \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430
 generalprefs.languages.default = \u0421\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0439
 generalprefs.lbl.languageEffect = \u042F\u0437\u044B\u043A \u0441\u043C\u0435\u043D\u0438\u0442\u0441\u044F \u043F\u0440\u0438 \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A\u0435 OpenRocket.
@ -929,18 +937,16 @@ RocketCompCfg.lbl.Length = \u0414\u043B\u0438\u043D\u0430:
 RocketCompCfg.lbl.Thickness = \u0422\u043E\u043B\u0449\u0438\u043D\u0430:
 RocketCompCfg.checkbox.Endcapped = \u0422\u043E\u0440\u0435\u0446 \u0437\u0430\u0433\u043B\u0443\u0448\u0435\u043D
 RocketCompCfg.checkbox.Endcapped.ttip = \u0417\u0430\u0433\u043B\u0443\u0448\u0430\u0435\u0442 \u0442\u043E\u0440\u0435\u0446 \u043A\u0440\u044B\u0448\u043A\u043E\u0439.
-RocketCompCfg.border.Aftshoulder = \u0417\u0430\u0434\u043D\u0438\u0439 \u0432\u044B\u0441\u0442\u0443\u043F
+RocketCompCfg.title.Aftshoulder = \u0417\u0430\u0434\u043D\u0438\u0439 \u0432\u044B\u0441\u0442\u0443\u043F
 RocketCompCfg.border.Foreshoulder = \u041F\u0435\u0440\u0435\u0434\u043D\u0438\u0439 \u0432\u044B\u0441\u0442\u0443\u043F
 !RocketCompCfg.lbl.Length = \u0414\u043B\u0438\u043D\u0430:
 RocketCompCfg.lbl.InstanceCount = \u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u043E\u0432
 RocketCompCfg.lbl.InstanceSeparation = \u0420\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u043E\u0432
 RocketCompCfg.tab.Outside = \u0421\u043D\u0430\u0440\u0443\u0436\u0438
 RocketCompCfg.tab.Inside = \u0412\u043D\u0443\u0442\u0440\u0438
 RocketCompCfg.tab.RightSide = \u0421\u043F\u0440\u0430\u0432\u0430
 RocketCompCfg.tab.LeftSide = \u0421\u043B\u0435\u0432\u0430
 ! InstancesPanel
 InstancesPanel.lbl.InstanceCount = \u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u043E\u0432
 InstancesPanel.lbl.InstanceSeparation = \u0420\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u043E\u0432
 ! ComponentInfo
 ComponentInfo.EngineBlock = <b>\u0423\u043F\u043E\u0440 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044F</b> \u043F\u0440\u0435\u043F\u044F\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0434\u0432\u0438\u0436\u0435\u043D\u0438\u044E \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044F \u0432\u043F\u0435\u0440\u0435\u0434 \u0432 \u0442\u0440\u0443\u0431\u0435.<br><br>\u0414\u043B\u044F \u0442\u043E\u0433\u043E \u0447\u0442\u043E\u0431\u044B \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C, \u0441\u043E\u0437\u0434\u0430\u0439\u0442\u0435 <b>\u041A\u043E\u0440\u043F\u0443\u0441\u043D\u0443\u044E \u0442\u0440\u0443\u0431\u0443</b> \u0438\u043B\u0438 <b>\u0412\u043D\u0443\u0442\u0440\u0435\u043D\u043D\u044E\u044E \u0442\u0440\u0443\u0431\u0443</b> \u0438 \u043E\u0442\u043C\u0435\u0442\u044C\u0442\u0435 \u044D\u0442\u043E\u0442 \u044D\u043B\u0435\u043C\u0435\u043D\u0442 \u043A\u0430\u043A \u043A\u0440\u0435\u043F\u0435\u0436 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044F \u043D\u0430 \u0432\u043A\u043B\u0430\u0434\u043A\u0435 <em>\u0414\u0432\u0438\u0433\u0430\u0442\u0435\u043B\u044C</em> .
@ -1259,10 +1265,6 @@ FinsetConfig.ttip.Finfillets1 = <HTML>\u0414\u043E\u0431\u0430\u0432\u043B\u044F
 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.<br>
 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 RASAero Warning Dialog
 SaveRASAeroWarningDialog.txt1 = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0432 \u0444\u043E\u0440\u043C\u0430\u0442 \u0444\u0430\u0439\u043B\u0430 RASAero \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.
 SaveRASAeroWarningDialog.donotshow = \u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u044D\u0442\u043E\u0442 \u0434\u0438\u0430\u043B\u043E\u0433
 ! 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.
 SaveRktWarningDialog.donotshow = \u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u044D\u0442\u043E\u0442 \u0434\u0438\u0430\u043B\u043E\u0433
@ -1275,7 +1277,11 @@ StorageOptChooser.lbl.Simdatatostore = \u0421\u043E\u0445\u0440\u0430\u043D\u043
 StorageOptChooser.rdbut.Allsimdata = \u0412\u0441\u0435 \u0434\u0430\u043D\u043D\u044B\u0435 \u0440\u0430\u0441\u0447\u0435\u0442\u0430
 StorageOptChooser.lbl.longA1 = <html>\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0432\u0441\u0435 \u0434\u0430\u043D\u043D\u044B\u0435 \u0440\u0430\u0441\u0447\u0435\u0442\u043E\u0432.<br>
 StorageOptChooser.lbl.longA2 = \u0420\u0430\u0437\u043C\u0435\u0440 \u0444\u0430\u0439\u043B\u0430 \u043C\u043E\u0436\u0435\u0442 \u043E\u043A\u0430\u0437\u0430\u0442\u044C\u0441\u044F \u043E\u0447\u0435\u043D\u044C \u0431\u043E\u043B\u044C\u0448\u0438\u043C!
-StorageOptChooser.rdbut.Onlysummarydata = \u0422\u043E\u043B\u044C\u043A\u043E \u0441\u0445\u0435\u043C\u0443
+StorageOptChooser.rdbut.Every = \u041A\u0430\u0436\u0434\u044B\u0435
 StorageOptChooser.lbl.longB1 = <html>\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u043D\u043D\u044B\u0439 \u0434\u0430\u043D\u043D\u044B\u0435 \u043F\u0440\u0438\u0431\u043B\u0438\u0437\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0441 \u0442\u0430\u043A\u043E\u0439 \u0447\u0430\u0441\u0442\u043E\u0442\u043E\u0439.<br>
 StorageOptChooser.lbl.longB2 = \u0411\u043E\u043B\u044C\u0448\u0438\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u0434\u0430\u044E\u0442 \u043C\u0435\u043D\u044C\u0448\u0438\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u0444\u0430\u0439\u043B\u0430.
 StorageOptChooser.lbl.seconds = \u0441\u0435\u043A\u0443\u043D\u0434
 StorageOptChooser.rdbut.Onlyprimfig = \u0422\u043E\u043B\u044C\u043A\u043E \u0441\u0445\u0435\u043C\u0443
 StorageOptChooser.lbl.longC1 = <html>\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F, \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0435 \u0441\u0432\u043E\u0434\u043D\u043E\u0439 \u0442\u0430\u0431\u043B\u0438\u0446\u0435<br>
 StorageOptChooser.lbl.longC2 = \u042D\u0442\u043E \u0434\u0430\u0435\u0442 \u043D\u0430\u0438\u043C\u0435\u043D\u044C\u0448\u0438\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u0444\u0430\u0439\u043B\u0430.
 StorageOptChooser.lbl.longD1 = \u041F\u0440\u0438\u0431\u043B\u0438\u0437\u0438\u0442\u0435\u043B\u044C\u043D\u0430\u044F \u043E\u0446\u0435\u043D\u043A\u0430 \u0440\u0430\u0437\u043C\u0435\u0440\u0430 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0438\u0440\u0443\u044E\u0449\u0435\u0433\u043E \u0444\u0430\u0439\u043B\u0430 \u0441 \u0434\u0430\u043D\u043D\u044B\u043C\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u043C\u0438.
@ -1303,7 +1309,8 @@ TCMotorSelPan.MotorMountDimensions = \u0420\u0430\u0437\u043C\u0435\u0440\u044B
 TCMotorSelPan.lbl.Search = \u041F\u043E\u0438\u0441\u043A:
 TCMotorSelPan.lbl.Selectthrustcurve = \u0412\u044B\u0431\u043E\u0440 \u043F\u0440\u043E\u0444\u0438\u043B\u044F \u0442\u044F\u0433\u0438:
 TCMotorSelPan.lbl.Ejectionchargedelay = \u0417\u0430\u0434\u0435\u0440\u0436\u043A\u0430 \u0432\u044B\u0431\u0440\u043E\u0441\u0430 \u0437\u0430\u0440\u044F\u0434\u0430:
-TCMotorSelPan.lbl.Numberofseconds = (\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0435\u043A\u0443\u043D\u0434 \u0438\u043B\u0438 "\u041D\u0435\u0442")
+TCMotorSelPan.equalsIgnoreCase.None = \u041D\u0435\u0442
 TCMotorSelPan.lbl.NumberofsecondsorNone = (\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0435\u043A\u0443\u043D\u0434 \u0438\u043B\u0438 "\u041D\u0435\u0442")
 TCMotorSelPan.lbl.Designation = \u041E\u0431\u043E\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435:
 TCMotorSelPan.lbl.Totalimpulse = \u041E\u0431\u0449\u0438\u0439 \u0438\u043C\u043F\u0443\u043B\u044C\u0441:
 TCMotorSelPan.lbl.Avgthrust = \u0421\u0440\u0435\u0434\u043D\u044F\u044F \u0442\u044F\u0433\u0430:
@ -1318,7 +1325,7 @@ TCMotorSelPan.lbl.Datapoints = \u0422\u043E\u0447\u043A\u0438 \u0434\u0430\u043D
 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.Plugged = \u041D\u0435\u0442
+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.
 TCMotorSelPan.btn.checkAll = \u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435
 TCMotorSelPan.btn.checkNone = \u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u0432\u044B\u0431\u043E\u0440
@ -1353,10 +1360,10 @@ main.menu.file.saveAs = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \
 main.menu.file.saveAs.desc = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0443\u044E \u0441\u0445\u0435\u043C\u0443 \u0440\u0430\u043A\u0435\u0442\u044B \u0432 \u043D\u043E\u0432\u044B\u0439 \u0444\u0430\u0439\u043B
 !  main.menu.file.import = Import\u2026
 !  main.menu.file.import.desc = Import design from RockSim rkt file
-main.menu.file.exportAs = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
+main.menu.file.export_as = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
-main.menu.file.exportAs.desc = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0445\u0435\u043C\u0443 \u0432 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u043C \u0444\u043E\u0440\u043C\u0430\u0442\u0435
+main.menu.file.export_as.desc = \u042D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0445\u0435\u043C\u0443 \u0432 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u043C \u0444\u043E\u0440\u043C\u0430\u0442\u0435
-main.menu.file.encode3D = \u041F\u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C 3D
+main.menu.file.encode_3d = \u041F\u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C 3D
-main.menu.file.encode3D.desc = \u041F\u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0441\u0445\u0435\u043C\u0443 \u0432 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u043C \u0444\u043E\u0440\u043C\u0430\u0442\u0435 3D
+main.menu.file.encode_3d.desc = \u041F\u043E\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0441\u0445\u0435\u043C\u0443 \u0432 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u043C \u0444\u043E\u0440\u043C\u0430\u0442\u0435 3D
 main.menu.file.print = \u041F\u0435\u0447\u0430\u0442\u044C / \u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0432 PDF...
 main.menu.file.print.desc = \u041D\u0430\u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C \u0438\u043B\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0432 PDF \u0441\u043F\u0438\u0441\u043E\u043A \u0434\u0435\u0442\u0430\u043B\u0435\u0439 \u0438 \u0448\u0430\u0431\u043B\u043E\u043D\u043E\u0432 \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u043E\u0432
 main.menu.file.close = \u0417\u0430\u043A\u0440\u044B\u0442\u044C
--- a/core/resources/l10n/messages_tr.properties
+++ b/core/resources/l10n/messages_tr.properties
@ -1,165 +1,171 @@
-#
+#
-# English base translation file
+# English base translation file
-#
+#
-# Should you need to add new logical keys here is the proposed method
+# Should you need to add new logical keys here is the proposed method
-#
+#
-# className.ComponentType.componentName
+# className.ComponentType.componentName
-#
+#
-#
+#
-# Text tokens within braces should not be translated, e.g.
+# Text tokens within braces should not be translated, e.g.
-#    "The file '{filename}' exists."
+#    "The file '{filename}' exists."
-# They are pieces that are inserted dynamically.
+# They are pieces that are inserted dynamically.
-#
+#
-
+
-
+
-! Set to the name of the current translation file (used for debugging
+! Set to the name of the current translation file (used for debugging
-purposes)
+purposes)
-debug.currentFile = messages.properties
+debug.currentFile = messages.properties
-
+
-! RocketActions
+! RocketActions
-RocketActions.DelCompAct.Delete = Sil
+RocketActions.checkbox.Donotaskmeagain = Yeniden Tekrarlama
-RocketActions.DelCompAct.ttip.Delete = Se\u00e7ili par\u00e7ay\u0131 sil.
+RocketActions.lbl.Youcanchangedefop = Hatal\u0131 \u00c7al\u0131\u015fmay\u0131 De\u011fi\u015ftirebilirsin
-RocketActions.DelSimuAct.Delete = Sil
+in the preferences.
-RocketActions.DelSimuAct.ttip.Delete = Se\u00e7ili sim\u00fclasyonu sil.
+RocketActions.showConfirmDialog.lbl1 = Se\u00e7ili sim\u00fclasyonlar\u0131 silmek ister misiniz?
-RocketActions.DelAct.Delete = Sil
+RocketActions.showConfirmDialog.lbl2 = <html><i>Bu \u00e7al\u0131\u015fma tamamlanmad\u0131.</i>
-RocketActions.DelAct.ttip.Delete = Se\u00e7ilen par\u00e7ay\u0131 ya da sim\u00fclasyonu sil
+RocketActions.showConfirmDialog.title = Sim\u00fclasyonlar\u0131 Sil
-RocketActions.CutAction.Cut = Kes
+RocketActions.DelCompAct.Delete = Sil
-RocketActions.CutAction.ttip.Cut = Kes bu par\u00e7ay\u0131 yada sim\u00fclasyonun
+RocketActions.DelCompAct.ttip.Delete = Se\u00e7ili par\u00e7ay\u0131 sil.
-haf\u0131zadan ve kald\u0131r bu tasar\u0131mdan 
+RocketActions.DelSimuAct.Delete = Sil
-RocketActions.CopyAct.Copy = Kopyala
+RocketActions.DelSimuAct.ttip.Delete = Se\u00e7ili sim\u00fclasyonu sil.
-RocketActions.CopyAct.ttip.Copy = Bu par\u00e7ay\u0131 kopyala (ve altpar\u00e7alar\u0131) 
+RocketActions.DelAct.Delete = Sil
-haf\u0131zaya
+RocketActions.DelAct.ttip.Delete = Se\u00e7ilen par\u00e7ay\u0131 ya da sim\u00fclasyonu sil
-RocketActions.PasteAct.Paste = Yap\u0131\u015ft\u0131r
+RocketActions.CutAction.Cut = Kes
-RocketActions.PasteAct.ttip.Paste = Yap\u0131\u015ft\u0131r par\u00e7ay\u0131 ya da simulasyonu haf\u0131za \u00fczerinden
+RocketActions.CutAction.ttip.Cut = Kes bu par\u00e7ay\u0131 yada sim\u00fclasyonun
-tasar\u0131ma do\u011fru.
+haf\u0131zadan ve kald\u0131r bu tasar\u0131mdan 
-RocketActions.EditAct.Edit = D\u00fczenle
+RocketActions.CopyAct.Copy = Kopyala
-RocketActions.EditAct.ttip.Edit = Se\u00e7ilmi\u015f par\u00e7ay\u0131 d\u00fczenle .
+RocketActions.CopyAct.ttip.Copy = Bu par\u00e7ay\u0131 kopyala (ve altpar\u00e7alar\u0131) 
-RocketActions.NewStageAct.Newstage = Yeni A\u015fama
+haf\u0131zaya
-RocketActions.NewStageAct.ttip.Newstage = Yeni bir roket tasar\u0131m\u0131 ekle
+RocketActions.PasteAct.Paste = Yap\u0131\u015ft\u0131r
-RocketActions.ActBoosterstage = Yard\u0131mc\u0131/Y\u00fckseltici A\u015fama
+RocketActions.PasteAct.ttip.Paste = Yap\u0131\u015ft\u0131r par\u00e7ay\u0131 ya da simulasyonu haf\u0131za \u00fczerinden
-RocketActions.MoveUpAct.Moveup = Yukar\u0131 \u00c7\u0131kar
+tasar\u0131ma do\u011fru.
-RocketActions.MoveUpAct.ttip.Moveup = Yukar\u0131ya do\u011fru bu par\u00e7ay\u0131 haraket ettir.
+RocketActions.EditAct.Edit = D\u00fczenle
-RocketActions.MoveDownAct.Movedown = A\u015fa\u011f\u0131ya \u0130ndir
+RocketActions.EditAct.ttip.Edit = Se\u00e7ilmi\u015f par\u00e7ay\u0131 d\u00fczenle .
-RocketActions.MoveDownAct.ttip.Movedown = A\u015fa\u011f\u0131ya do\u011fru bu par\u00e7ay\u0131 haraket
+RocketActions.NewStageAct.Newstage = Yeni A\u015fama
-ettir.
+RocketActions.NewStageAct.ttip.Newstage = Yeni bir roket tasar\u0131m\u0131 ekle
-
+RocketActions.ActBoosterstage = Yard\u0131mc\u0131/Y\u00fckseltici A\u015fama
-! RocketPanel
+RocketActions.MoveUpAct.Moveup = Yukar\u0131 \u00c7\u0131kar
-RocketPanel.FigTypeAct.SideView = Yandan G\u00f6r\u00fcn\u00fc\u015f
+RocketActions.MoveUpAct.ttip.Moveup = Yukar\u0131ya do\u011fru bu par\u00e7ay\u0131 haraket ettir.
-RocketPanel.FigTypeAct.BackView = Arkadan G\u00f6r\u00fcn\u00fc\u015f
+RocketActions.MoveDownAct.Movedown = A\u015fa\u011f\u0131ya \u0130ndir
-RocketPanel.FigTypeAct.Figure3D = 3D Resimlendirme
+RocketActions.MoveDownAct.ttip.Movedown = A\u015fa\u011f\u0131ya do\u011fru bu par\u00e7ay\u0131 haraket
-RocketPanel.FigTypeAct.Finished = 3D Bitmi\u015f
+ettir.
-RocketPanel.FigTypeAct.Unfinished = 3D Bitmemi\u015f
+
-
+! RocketPanel
-
+RocketPanel.FigTypeAct.SideView = Yandan G\u00f6r\u00fcn\u00fc\u015f
-RocketPanel.lbl.Flightcfg = U\u00e7u\u015f Bi\u00e7imi/Konumu:
+RocketPanel.FigTypeAct.BackView = Arkadan G\u00f6r\u00fcn\u00fc\u015f
-RocketPanel.lbl.infoMessage = <html>Click to select &nbsp;&nbsp; Shift+Click
+RocketPanel.FigTypeAct.Figure3D = 3D Resimlendirme
-to select other &nbsp;&nbsp; Double-click to edit &nbsp;&nbsp; Click+drag to
+RocketPanel.FigTypeAct.Finished = 3D Bitmi\u015f
-move
+RocketPanel.FigTypeAct.Unfinished = 3D Bitmemi\u015f
-RocketPanel.lbl.ViewType          = G\u00f6r\u00fcn\u00fc\u015f \u015eekli:
+
-
+
-! BasicFrame
+RocketPanel.lbl.Flightcfg = U\u00e7u\u015f Bi\u00e7imi/Konumu:
-BasicFrame.tab.Rocketdesign = Roket Tasar\u0131m\u0131
+RocketPanel.lbl.infoMessage = <html>Click to select &nbsp;&nbsp; Shift+Click
-BasicFrame.tab.Flightconfig = Motorlar & Bi\u00e7imleri
+to select other &nbsp;&nbsp; Double-click to edit &nbsp;&nbsp; Click+drag to
-BasicFrame.tab.Flightsim = U\u00e7u\u015f Sim\u00fclasyonlar\u0131
+move
-BasicFrame.title.Addnewcomp = Yeni par\u00e7a ekle
+RocketPanel.lbl.ViewType          = G\u00f6r\u00fcn\u00fc\u015f \u015eekli:
-BasicFrame.dlg.lbl1 = Tasar\u0131m '
+
-BasicFrame.dlg.lbl2 = ' Kaydedilmemi\u015f.
+! BasicFrame
-BasicFrame.dlg.lbl3 = Kaydetmek ister misiniz?
+BasicFrame.tab.Rocketdesign = Roket Tasar\u0131m\u0131
-BasicFrame.dlg.title = Tasar\u0131m Kaydedilmedi
+BasicFrame.tab.Flightconfig = Motorlar & Bi\u00e7imleri
-BasicFrame.StageName.Sustainer = Devam Et
+BasicFrame.tab.Flightsim = U\u00e7u\u015f Sim\u00fclasyonlar\u0131
-BasicFrame.WarningDialog.txt1 = Problemler a\u00e7\u0131l\u0131rken d\u00fczenleniyor
+BasicFrame.title.Addnewcomp = Yeni par\u00e7a ekle
-BasicFrame.WarningDialog.txt2 = Baz\u0131 tasar\u0131m par\u00e7alar\u0131 d\u00fczg\u00fcnce 
+BasicFrame.dlg.lbl1 = Tasar\u0131m '
-y\u00fcklenemedi.
+BasicFrame.dlg.lbl2 = ' Kaydedilmemi\u015f.
-BasicFrame.WarningDialog.title = Dosya a\u00e7\u0131l\u0131rken Tehlike
+BasicFrame.dlg.lbl3 = Kaydetmek ister misiniz?
-
+BasicFrame.dlg.title = Tasar\u0131m Kaydedilmedi
-
+BasicFrame.StageName.Sustainer = Devam Et
-! General error messages used in multiple contexts
+BasicFrame.WarningDialog.txt1 = Problemler a\u00e7\u0131l\u0131rken d\u00fczenleniyor
-error.fileExists.title = File exists
+BasicFrame.WarningDialog.txt2 = Baz\u0131 tasar\u0131m par\u00e7alar\u0131 d\u00fczg\u00fcnce 
-error.fileExists.desc = File '{filename}' exists. \u00dczerine yazmak ister misiniz?
+y\u00fcklenemedi.
-
+BasicFrame.WarningDialog.title = Dosya a\u00e7\u0131l\u0131rken Tehlike
-error.writing.title = Hata Dosya Yaz\u0131l\u0131rken
+
-error.writing.desc = Bir hata dosya yaz\u0131l\u0131rken ortaya \u00e7\u0131kt\u0131:
+
-Configuration.lbl.override = Bu durum baz\u0131 u\u00e7u\u015f bi\u00e7imlerinde ge\u00e7ersizdir.
+! General error messages used in multiple contexts
-
+error.fileExists.title = File exists
-
+error.fileExists.desc = File '{filename}' exists. \u00dczerine yazmak ister misiniz?
-! Labels used in buttons of dialog windows
+
-# TODO: Rename these to "btn.xxx"
+error.writing.title = Hata Dosya Yaz\u0131l\u0131rken
-button.ok = Tamam
+error.writing.desc = Bir hata dosya yaz\u0131l\u0131rken ortaya \u00e7\u0131kt\u0131:
-button.cancel = \u00c7\u0131k\u0131\u015f
+Configuration.lbl.override = Bu durum baz\u0131 u\u00e7u\u015f bi\u00e7imlerinde ge\u00e7ersizdir.
-button.close = Kapat
+
-
+
-! Common labels used in buttons of dialog windows
+! Labels used in buttons of dialog windows
-dlg.but.ok = Tamam
+# TODO: Rename these to "btn.xxx"
-dlg.but.cancel = \u00c7\u0131k\u0131\u015f
+button.ok = Tamam
-dlg.but.close = Kapat
+button.cancel = \u00c7\u0131k\u0131\u015f
-! General file type names
+button.close = Kapat
-FileHelper.PDF_FILTER = PDF files (*.pdf)
+
-FileHelper.ALL_DESIGNS_FILTER = All rocket designs (*.ork; *.rkt, *.CDX1)
+! Common labels used in buttons of dialog windows
-FileHelper.OPENROCKET_DESIGN_FILTER = OpenRocket designs (*.ork)
+dlg.but.ok = Tamam
-FileHelper.ROCKSIM_DESIGN_FILTER = RockSim designs (*.rkt)
+dlg.but.cancel = \u00c7\u0131k\u0131\u015f
-FileHelper.OPEN_ROCKET_COMPONENT_FILTER = OpenRocket presets (*.orc)
+dlg.but.close = Kapat
-FileHelper.IMAGES = Resim Dosyalar\u0131
+! General file type names
-
+FileHelper.PDF_FILTER = PDF files (*.pdf)
-
+FileHelper.ALL_DESIGNS_FILTER = All rocket designs (*.ork; *.rkt)
-! Diyolog Hakk\u0131nda
+FileHelper.OPENROCKET_DESIGN_FILTER = OpenRocket designs (*.ork)
-AboutDialog.lbl.version = Version
+FileHelper.ROCKSIM_DESIGN_FILTER = RockSim designs (*.rkt)
-! The texts below provide additional credits for the translation maintainer
+FileHelper.OPEN_ROCKET_COMPONENT_FILTER = OpenRocket presets (*.orc)
-! - In AboutDialog.lbl.translation replace "English" with the current
+FileHelper.IMAGES = Resim Dosyalar\u0131
-language.
+
-! - AboutDialog.lbl.translator is the translator / group name (may be empty)
+
-! - AboutDialog.lbl.translatorWebsite is a URL to the translator / group
+! Diyolog Hakk\u0131nda
-(may be empty)
+AboutDialog.lbl.version = Version
-! - AboutDialog.lbl.translatorIcon is the file name of an icon under
+! The texts below provide additional credits for the translation maintainer
-pix/translators/ (may be empty)
+! - In AboutDialog.lbl.translation replace "English" with the current
-AboutDialog.lbl.translation = English translation by:Turkish
+language.
-AboutDialog.lbl.translator =Batuhan Dereli	
+! - AboutDialog.lbl.translator is the translator / group name (may be empty)
-AboutDialog.lbl.translatorWebsite =www.batuhandereli.com
+! - AboutDialog.lbl.translatorWebsite is a URL to the translator / group
-AboutDialog.lbl.translatorIcon =
+(may be empty)
-
+! - AboutDialog.lbl.translatorIcon is the file name of an icon under
-
+pix/translators/ (may be empty)
-! Yaz\u0131c\u0131 
+AboutDialog.lbl.translation = English translation by:Turkish
-PrintDialog.title = Yazd\u0131r yada \u00c7\u0131kart
+AboutDialog.lbl.translator =Batuhan Dereli	
-PrintDialog.but.previewAndPrint = \u00c7\u0131kt\u0131 \u00d6ncesi Bak & Yaz
+AboutDialog.lbl.translatorWebsite =www.batuhandereli.com
-PrintDialog.checkbox.showByStage = Par\u00e7a G\u00f6ster
+AboutDialog.lbl.translatorIcon =
-PrintDialog.lbl.selectElements = \u0130\u00e7eren gruplar\u0131 se\u00e7:
+
-printdlg.but.saveaspdf = Kaydet PDF Olarak
+
-printdlg.but.preview = \u00d6nceki
+! Yaz\u0131c\u0131 
-printdlg.but.settings = Ayarlar
+PrintDialog.title = Yazd\u0131r yada \u00c7\u0131kart
-PrintDialog.error.preview.title = \u00d6nceki g\u00f6r\u00fcnt\u00fc ula\u015f\u0131lmaz
+PrintDialog.but.previewAndPrint = \u00c7\u0131kt\u0131 \u00d6ncesi Bak & Yaz
-PrintDialog.error.preview.desc1 = Pdf g\u00f6r\u00fcnt\u00fc ula\u015f\u0131lmaz.
+PrintDialog.checkbox.showByStage = Par\u00e7a G\u00f6ster
-PrintDialog.error.preview.desc2 = L\u00fctfen kullan "Pdf Olarak Kaydet" i\u00e7eren
+PrintDialog.lbl.selectElements = \u0130\u00e7eren gruplar\u0131 se\u00e7:
-ayarlardan.
+printdlg.but.saveaspdf = Kaydet PDF Olarak
-
+printdlg.but.preview = \u00d6nceki
-
+printdlg.but.settings = Ayarlar
-!PrintSettingsDialog
+PrintDialog.error.preview.title = \u00d6nceki g\u00f6r\u00fcnt\u00fc ula\u015f\u0131lmaz
-PrintSettingsDialog.title = Yaz\u0131c\u0131 Ayarlar\u0131
+PrintDialog.error.preview.desc1 = Pdf g\u00f6r\u00fcnt\u00fc ula\u015f\u0131lmaz.
-PrintSettingsDialog.lbl.Templatefillcolor = Kal\u0131p Renkli Doldur:
+PrintDialog.error.preview.desc2 = L\u00fctfen kullan "Pdf Olarak Kaydet" i\u00e7eren
-PrintSettingsDialog.lbl.Templatebordercolor = Kal\u0131b\u0131 S\u0131n\u0131rl\u0131 Doldur:
+ayarlardan.
-PrintSettingsDialog.lbl.Papersize = Ka\u011f\u0131t Boyutu:
+
-PrintSettingsDialog.lbl.Paperorientation = Ka\u011f\u0131t Hizalama:
+
-PrintSettingsDialog.but.Reset = Yeniden Ba\u015flat	
+!PrintSettingsDialog
-PrintSettingsDialog.but.Close = Kapat
+PrintSettingsDialog.title = Yaz\u0131c\u0131 Ayarlar\u0131
-
+PrintSettingsDialog.lbl.Templatefillcolor = Kal\u0131p Renkli Doldur:
-
+PrintSettingsDialog.lbl.Templatebordercolor = Kal\u0131b\u0131 S\u0131n\u0131rl\u0131 Doldur:
-! Bug Report dialog
+PrintSettingsDialog.lbl.Papersize = Ka\u011f\u0131t Boyutu:
-bugreport.dlg.title = Hata Raporu
+PrintSettingsDialog.lbl.Paperorientation = Ka\u011f\u0131t Hizalama:
-bugreport.dlg.but.Sendbugreport = Hata Raporu G\u00f6nder
+PrintSettingsDialog.but.Reset = Yeniden Ba\u015flat	
-bugreport.dlg.but.Sendbugreport.Ttip = Atomatik olarak hata raporu g\u00f6nder OPEN ROCKET 
+PrintSettingsDialog.but.Close = Kapat
-geli\u015ftiricilerine.
+
-bugreport.dlg.successmsg1 = Hata raporu sorunsuz yolland\u0131.
+
-bugreport.dlg.successmsg2 = Te\u015fekk\u00fcrler sizin sayenizde OPENROCKET daha iyi geli\u015ficek!
+! Bug Report dialog
-bugreport.dlg.successmsg3 = Hata Raporu G\u00f6nderildi
+bugreport.dlg.title = Hata Raporu
-bugreport.dlg.connectedInternet = <html>E\u011fer internet ba\u011flant\u0131n varsa,
+bugreport.dlg.but.Sendbugreport = Hata Raporu G\u00f6nder
-basit\u00e7e t\u0131klay\u0131p<em>Hata Raporu G\u00f6nder</em>.
+bugreport.dlg.but.Sendbugreport.Ttip = Atomatik olarak hata raporu g\u00f6nder OPEN ROCKET 
-bugreport.dlg.otherwise = Ba\u015fka \u015fekilde,adrese yollay\u0131n:
+geli\u015ftiricilerine.
-bugreport.lbl.Theinformation = Genel hata raporlar\u0131hakk\u0131nda bilgi i\u00e7eriyor.Emin de\u011filsen ve 
+bugreport.dlg.successmsg1 = Hata raporu sorunsuz yolland\u0131.
-hislerinden \u00f6t\u00fcr\u00fc koyuyorsan hata raporunu koyma .  
+bugreport.dlg.successmsg2 = Te\u015fekk\u00fcrler sizin sayenizde OPENROCKET daha iyi geli\u015ficek!
-bugreport.dlg.failedmsg1 = OpenRocket hata raporunu g\u00f6ndermek i\u00e7in uygun de\u011fil:
+bugreport.dlg.successmsg3 = Hata Raporu G\u00f6nderildi
-bugreport.dlg.failedmsg2 = L\u00fctfen manual bir yolla g\u00f6nder
+bugreport.dlg.connectedInternet = <html>E\u011fer internet ba\u011flant\u0131n varsa,
-bugreport.dlg.failedmsg3 = Hata raporu g\u00f6nderiliyor
+basit\u00e7e t\u0131klay\u0131p<em>Hata Raporu G\u00f6nder</em>.
-bugreport.reportDialog.txt = <html><b> OpenRocket i\u00e7erisindeki hatalar\u0131
+bugreport.dlg.otherwise = Ba\u015fka \u015fekilde,adrese yollay\u0131n:
-form doldurarak yollayabilirsiniz.</b><br>Hatta hatalar\u0131 dosyalay\u0131p internet sitesi
+bugreport.lbl.Theinformation = Genel hata raporlar\u0131hakk\u0131nda bilgi i\u00e7eriyor.Emin de\u011filsen ve 
-\u00fczerinde proje sayfas\u0131na koyabilirsin.
+hislerinden \u00f6t\u00fcr\u00fc koyuyorsan hata raporunu koyma .  
-bugreport.reportDialog.txt2 = <html><b>L\u00fctfen belirtiniz tam olarak nas\u0131l bir beklentiniz vard\u0131</b>
+bugreport.dlg.failedmsg1 = OpenRocket hata raporunu g\u00f6ndermek i\u00e7in uygun de\u011fil:
-bugreport.dlg.provideDescription = L\u00fctfen Hatay\u0131 ilk ne zaman rastlad\u0131n\u0131z tam olarak a\u00e7\u0131klay\u0131n\u0131z
+bugreport.dlg.failedmsg2 = L\u00fctfen manual bir yolla g\u00f6nder
 bugreport.dlg.failedmsg3 = Hata raporu g\u00f6nderiliyor
 bugreport.reportDialog.txt = <html><b> OpenRocket i\u00e7erisindeki hatalar\u0131
 form doldurarak yollayabilirsiniz.</b><br>Hatta hatalar\u0131 dosyalay\u0131p internet sitesi
 \u00fczerinde proje sayfas\u0131na koyabilirsin.
 bugreport.reportDialog.txt2 = <html><b>L\u00fctfen belirtiniz tam olarak nas\u0131l bir beklentiniz vard\u0131</b>
 bugreport.dlg.provideDescription = L\u00fctfen Hatay\u0131 ilk ne zaman rastlad\u0131n\u0131z tam olarak a\u00e7\u0131klay\u0131n\u0131z
 bugreport.dlg.provideDescription.title = Hata tan\u0131m\u0131 kayboluyor
--- a/core/resources/l10n/messages_uk_UA.properties
+++ b/core/resources/l10n/messages_uk_UA.properties
@ -18,6 +18,11 @@
 debug.currentFile = messages.properties
 ! RocketActions
 RocketActions.checkbox.Donotaskmeagain = \u0411\u0456\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u0438\u0442\u0430\u0442\u0438
 RocketActions.lbl.Youcanchangedefop = \u0412\u0438 \u043C\u043E\u0436\u0435\u0442\u0435 \u0437\u043C\u0456\u043D\u0438\u0442\u0438 \u0442\u0438\u043F\u043E\u0432\u0443 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044E \u0432 \u043E\u043F\u0446\u0438\u044F\u0445.
 RocketActions.showConfirmDialog.lbl1 = \u0412\u0434\u0430\u043B\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0443 \u0441\u0438\u043C\u0443\u043B\u044F\u0446\u0456\u044E?
 RocketActions.showConfirmDialog.lbl2 = <html><i>\u0426\u044F \u043E\u043F\u0435\u0440\u0430\u0446\u0456\u044F \u043D\u0435 \u043C\u043E\u0436\u0435 \u0431\u0443\u0442\u0438 \u0432\u0456\u0434\u043C\u0456\u043D\u0435\u043D\u0430.</i>
 RocketActions.showConfirmDialog.title = \u0412\u0434\u0430\u043B\u0438\u0442\u0438 \u0441\u0438\u043C\u0443\u043B\u044F\u0446\u0456\u044E
 RocketActions.DelCompAct.Delete = \u0412\u0434\u0430\u043B\u0438\u0442\u0438
 RocketActions.DelCompAct.ttip.Delete = \u0412\u0434\u0430\u043B\u0438\u0442\u0438 \u0432\u0438\u0431\u0440\u0430\u043D\u0443 \u0447\u0430\u0441\u0442\u0438\u043D\u0443.
 RocketActions.DelSimuAct.Delete = \u0412\u0434\u0430\u043B\u0438\u0442\u0438
@ -91,7 +96,7 @@ dlg.but.close = Close
 ! General file type names
 FileHelper.PDF_FILTER = PDF files (*.pdf)
-FileHelper.ALL_DESIGNS_FILTER = All rocket designs (*.ork; *.rkt, *.CDX1)
+FileHelper.ALL_DESIGNS_FILTER = All rocket designs (*.ork; *.rkt)
 FileHelper.OPENROCKET_DESIGN_FILTER = OpenRocket designs (*.ork)
 FileHelper.ROCKSIM_DESIGN_FILTER = RockSim designs (*.rkt)
 FileHelper.OPEN_ROCKET_COMPONENT_FILTER = OpenRocket presets (*.orc)
@ -304,9 +309,9 @@ pref.dlg.PrefBooleanSelector2 = Confirm
 pref.dlg.Add = Add
 pref.dlg.DescriptionArea.Adddirectories = Add directories, RASP motor files (*.eng), RockSim engine files (*.rse) or ZIP archives separated by a semicolon (;) to load external thrust curves.  Changes will take effect the next time you start OpenRocket.
-generalprefs.lbl.language = Interface language:
+PreferencesDialog.lbl.language = Interface language:
-generalprefs.languages.default = System default
+PreferencesDialog.languages.default = System default
-generalprefs.lbl.languageEffect = The language will change the next time you start OpenRocket.
+PreferencesDialog.lbl.languageEffect = The language will change the next time you start OpenRocket.
 ! Software update checker
 update.dlg.error.title = Unable to retrieve update information
@ -811,7 +816,7 @@ RocketCompCfg.lbl.Length = Length:
 RocketCompCfg.lbl.Thickness = Thickness:
 RocketCompCfg.checkbox.Endcapped = End capped
 RocketCompCfg.ttip.Endcapped = Whether the end of the shoulder is capped.
-RocketCompCfg.border.Aftshoulder = Aft shoulder
+RocketCompCfg.title.Aftshoulder = Aft shoulder
 RocketCompCfg.border.Foreshoulder = Fore shoulder
 !RocketCompCfg.lbl.Length = Length:
@ -1075,7 +1080,11 @@ StorageOptChooser.lbl.Simdatatostore = Simulated data to store:
 StorageOptChooser.rdbut.Allsimdata = All simulated data
 StorageOptChooser.lbl.longA1 = <html>Store all simulated data.<br>
 StorageOptChooser.lbl.longA2 = This can result in very large files!
-StorageOptChooser.rdbut.Onlysummarydata = Only summary data
+StorageOptChooser.rdbut.Every = Every
 StorageOptChooser.lbl.longB1 = <html>Store plottable values approximately this far apart.<br>
 StorageOptChooser.lbl.longB2 = Larger values result in smaller files.
 StorageOptChooser.lbl.seconds = seconds
 StorageOptChooser.rdbut.Onlyprimfig = Only primary figures
 StorageOptChooser.lbl.longC1 = <html>Store only the values shown in the summary table.<br>
 StorageOptChooser.lbl.longC2 = This results in the smallest files.
 StorageOptChooser.lbl.longD1 = An estimate on how large the resulting file would be with the present options.
@ -1097,7 +1106,8 @@ TCMotorSelPan.MotorMountDimensions = Motor mount dimensions:
 TCMotorSelPan.lbl.Search = Search:
 TCMotorSelPan.lbl.Selectthrustcurve = Select thrust curve:
 TCMotorSelPan.lbl.Ejectionchargedelay = Ejection charge delay:
-TCMotorSelPan.lbl.Numberofseconds = (Number of seconds or \"None\")
+TCMotorSelPan.equalsIgnoreCase.None = None
 TCMotorSelPan.lbl.NumberofsecondsorNone = (Number of seconds or \"None\")
 TCMotorSelPan.lbl.Designation = Designation:
 TCMotorSelPan.lbl.Totalimpulse = Total impulse:
 TCMotorSelPan.lbl.Avgthrust = Avg. thrust:
@ -1109,7 +1119,7 @@ TCMotorSelPan.lbl.Datapoints = Data points:
 TCMotorSelPan.lbl.Digest = Digest:
 TCMotorSelPan.title.Thrustcurve = Thrust curve:
 TCMotorSelPan.title.Thrust = Thrust
-TCMotorSelPan.delayBox.Plugged = Plugged (None)
+TCMotorSelPan.delayBox.None = Plugged (None)
 TCMotorSelPan.noDescription = No description available.
 TCMotorSelPan.btn.checkAll = Select All
 TCMotorSelPan.btn.checkNone = Clear All
@ -1285,6 +1295,11 @@ Shape.Haackseries.desc2 = The Haack series <i>nose cones</i> are designed to min
 ! RocketComponent
 RocketComponent.Position.TOP = Top of the parent component
 RocketComponent.Position.MIDDLE = Middle of the parent component
 RocketComponent.Position.BOTTOM = Bottom of the parent component
 RocketComponent.Position.AFTER = After the parent component
 RocketComponent.Position.ABSOLUTE = Tip of the nose cone
 ! LaunchLug
 LaunchLug.Launchlug = Launch Lug
--- a/core/resources/l10n/messages_zh_CN.properties
+++ b/core/resources/l10n/messages_zh_CN.properties
--- a/core/resources/l10n/rename.sh
+++ b/core/resources/l10n/rename.sh
--- a/core/resources/pix/componenticons/altimeter_dark-small.png
+++ b/core/resources/pix/componenticons/altimeter_dark-small.png
--- a/core/resources/pix/componenticons/battery_dark-small.png
+++ b/core/resources/pix/componenticons/battery_dark-small.png
--- a/core/resources/pix/componenticons/deployment-charge_dark-small.png
+++ b/core/resources/pix/componenticons/deployment-charge_dark-small.png
--- a/core/resources/pix/componenticons/ellipticalfin_dark-large.png
+++ b/core/resources/pix/componenticons/ellipticalfin_dark-large.png
--- a/core/resources/pix/componenticons/ellipticalfin_dark-small.png
+++ b/core/resources/pix/componenticons/ellipticalfin_dark-small.png
--- a/core/resources/pix/componenticons/flight-comp_dark-small.png
+++ b/core/resources/pix/componenticons/flight-comp_dark-small.png
--- a/core/resources/pix/componenticons/freeformfin_dark-large.png
+++ b/core/resources/pix/componenticons/freeformfin_dark-large.png
--- a/core/resources/pix/componenticons/freeformfin_dark-small.png
+++ b/core/resources/pix/componenticons/freeformfin_dark-small.png
--- a/core/resources/pix/componenticons/launchlug_dark-large.png
+++ b/core/resources/pix/componenticons/launchlug_dark-large.png
--- a/core/resources/pix/componenticons/launchlug_dark-small.png
+++ b/core/resources/pix/componenticons/launchlug_dark-small.png
--- a/core/resources/pix/componenticons/mass_dark-large.png
+++ b/core/resources/pix/componenticons/mass_dark-large.png
--- a/core/resources/pix/componenticons/mass_dark-small.png
+++ b/core/resources/pix/componenticons/mass_dark-small.png
--- a/core/resources/pix/componenticons/parachute_dark-large.png
+++ b/core/resources/pix/componenticons/parachute_dark-large.png
--- a/core/resources/pix/componenticons/parachute_dark-small.png
+++ b/core/resources/pix/componenticons/parachute_dark-small.png
--- a/core/resources/pix/componenticons/pods-small.png
+++ b/core/resources/pix/componenticons/pods-small.png
--- a/core/resources/pix/componenticons/pods_dark-large.png
+++ b/core/resources/pix/componenticons/pods_dark-large.png
--- a/core/resources/pix/componenticons/pods_dark-small.png
+++ b/core/resources/pix/componenticons/pods_dark-small.png
--- a/core/resources/pix/componenticons/recovery-hardware_dark-small.png
+++ b/core/resources/pix/componenticons/recovery-hardware_dark-small.png
--- a/core/resources/pix/componenticons/shockcord_dark-large.png
+++ b/core/resources/pix/componenticons/shockcord_dark-large.png
--- a/core/resources/pix/componenticons/shockcord_dark-small.png
+++ b/core/resources/pix/componenticons/shockcord_dark-small.png
--- a/core/resources/pix/componenticons/streamer_dark-large.png
+++ b/core/resources/pix/componenticons/streamer_dark-large.png
--- a/core/resources/pix/componenticons/streamer_dark-small.png
+++ b/core/resources/pix/componenticons/streamer_dark-small.png
--- a/core/resources/pix/componenticons/tracker_dark-small.png
+++ b/core/resources/pix/componenticons/tracker_dark-small.png
--- a/core/resources/pix/componenticons/tubefin-large.png
+++ b/core/resources/pix/componenticons/tubefin-large.png
--- a/core/resources/pix/componenticons/tubefin-small.png
+++ b/core/resources/pix/componenticons/tubefin-small.png
--- a/core/resources/pix/eventicons/event-exception.png
+++ b/core/resources/pix/eventicons/event-exception.png
--- a/core/resources/pix/icons/cd-override-subcomponent.png
+++ b/core/resources/pix/icons/cd-override-subcomponent.png
--- a/core/resources/pix/icons/cd-override-subcomponent_dark.png
+++ b/core/resources/pix/icons/cd-override-subcomponent_dark.png
--- a/core/resources/pix/icons/cd-override-subcomponent_light.png
+++ b/core/resources/pix/icons/cd-override-subcomponent_light.png
--- a/core/resources/pix/icons/cd-override_light.png
+++ b/core/resources/pix/icons/cd-override_light.png
--- a/core/resources/pix/icons/cg-override-subcomponent.png
+++ b/core/resources/pix/icons/cg-override-subcomponent.png
--- a/core/resources/pix/icons/cg-override-subcomponent_dark.png
+++ b/core/resources/pix/icons/cg-override-subcomponent_dark.png
--- a/core/resources/pix/icons/cg-override-subcomponent_light.png
+++ b/core/resources/pix/icons/cg-override-subcomponent_light.png
--- a/core/resources/pix/icons/cg-override_light.png
+++ b/core/resources/pix/icons/cg-override_light.png
--- a/core/resources/pix/icons/mass-override-subcomponent.png
+++ b/core/resources/pix/icons/mass-override-subcomponent.png
--- a/core/resources/pix/icons/mass-override-subcomponent_dark.png
+++ b/core/resources/pix/icons/mass-override-subcomponent_dark.png
--- a/core/resources/pix/icons/mass-override-subcomponent_light.png
+++ b/core/resources/pix/icons/mass-override-subcomponent_light.png
--- a/core/resources/pix/icons/mass-override_light.png
+++ b/core/resources/pix/icons/mass-override_light.png
--- a/Show More
+++ b/Show More
		`@ -0,0 +1,2 @@`
							`<?xml version="1.0" encoding="UTF-8"?>`
							`<module classpath="eclipse" classpath-dir="$MODULE_DIR$/core" type="JAVA_MODULE" version="4" />`
		`@ -1,2 +0,0 @@`
			`This directory contains thrust curves used in RASAero.`
			`Last updated: 2018-07-31`