Merge branch 'upstream' into debian

[debian/openrocket] / l10n / messages.properties

diff --git a/l10n/messages.properties b/l10n/messages.properties
index 692248a1eaf1b4de8f14124c08307cb14253f753..34e12adb9e69623013afcc3a387fcd7d21cff4c1 100644 (file)
--- a/l10n/messages.properties
+++ b/l10n/messages.properties
@@ -1015,6 +1015,7 @@ Databases.materials.Spruce = Spruce
 Databases.materials.StyrofoamgenericEPS = Styrofoam (generic EPS)
 Databases.materials.StyrofoamBluefoamXPS = Styrofoam \"Blue foam\" (XPS)
 Databases.materials.Quantumtubing = Quantum tubing
+Databases.materials.BlueTube = Blue tube
 !SURFACE_MATERIAL
 Databases.materials.Ripstopnylon = Ripstop nylon
 Databases.materials.Mylar = Mylar
@@ -1344,7 +1345,7 @@ optimization.modifier.trapezoidfinset.height.desc = Optimize the height (semi-sp
 optimization.modifier.ellipticalfinset.length = Root chord
 optimization.modifier.ellipticalfinset.length.desc = Optimize the root chord length of the fin set.
 optimization.modifier.ellipticalfinset.height = Height
-optimization.modifier.ellipticalfinset.height = Optimize the height (semi-span) of the fin set.
+optimization.modifier.ellipticalfinset.height.desc = Optimize the height (semi-span) of the fin set.
 
 optimization.modifier.finset.cant = Cant angle
 optimization.modifier.finset.cant.desc = Optimize the cant angle of the fin set.
@@ -1471,6 +1472,7 @@ OptimizationPlotDialog.plot2d.title = Optimization path
 OptimizationPlotDialog.plot2d.path = Optimization path
 OptimizationPlotDialog.plot2d.evals = Evaluations
 OptimizationPlotDialog.plot.ttip.stability = Stability:
+OptimizationPlotDialog.plot.label.optimum = Optimum
 
 ! Optimization parameters
 MaximumAltitudeParameter.name = Apogee altitude