diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 67d9018fb..be925fe41 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -675,27 +675,27 @@ SimulationPlotPanel.error.noPlotSelected.title = Nothing to plot
 ! Component add buttons
 compaddbuttons.AxialStage = Stage
 compaddbuttons.Bodycompandfinsets = Body Components and Fin Sets
-compaddbuttons.Nosecone = Nose cone
-compaddbuttons.Bodytube = Body tube
+compaddbuttons.Nosecone = Nose Cone
+compaddbuttons.Bodytube = Body Tube
 compaddbuttons.Transition = Transition
 compaddbuttons.Trapezoidal = Trapezoidal
 compaddbuttons.Elliptical = Elliptical
 compaddbuttons.Freeform = Freeform
-compaddbuttons.Tubefin = Tube fins
+compaddbuttons.Tubefin = Tube Fins
 compaddbuttons.Launchlug = Launch Lug
 compaddbuttons.RailButton = Rail Button
 compaddbuttons.InnerComponent = Inner Components
-compaddbuttons.Innertube = Inner tube
+compaddbuttons.Innertube = Inner Tube
 compaddbuttons.Coupler = Coupler
-compaddbuttons.Centeringring = Centering\nring
+compaddbuttons.Centeringring = Centering\nRing
 compaddbuttons.Bulkhead = Bulkhead
-compaddbuttons.Engineblock = Engine\nblock
+compaddbuttons.Engineblock = Engine\nBlock
 compaddbuttons.ComponentAssembly = Assembly Components
 compaddbuttons.ParallelStage = Boosters
 compaddbuttons.Pods = Pods
 compaddbuttons.Parachute = Parachute
 compaddbuttons.Streamer = Streamer
-compaddbuttons.Shockcord = Shock cord
+compaddbuttons.Shockcord = Shock Cord
 compaddbuttons.MassComponent = Mass\nComponent
 compaddbuttons.MassComponents = Mass Components
 compaddbuttons.Donotaskmeagain = Do not ask me again
@@ -775,7 +775,7 @@ ringcompcfg.note.desc = Note: An inner tube will not affect the aerodynamics of
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength = Body tube length:
+BodyTubecfg.lbl.Bodytubelength = Length:
 BodyTubecfg.lbl.Outerdiameter = Outer diameter:
 BodyTubecfg.lbl.Innerdiameter = Inner diameter:
 BodyTubecfg.lbl.Wallthickness = Wall thickness:
@@ -1059,7 +1059,7 @@ MotorCfg.lbl.motorLabel = None
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape = Nose cone shape:
 NoseConeCfg.lbl.Shapeparam = Shape parameter:
-NoseConeCfg.lbl.Noseconelength = Nose cone length:
+NoseConeCfg.lbl.Noseconelength = Length:
 NoseConeCfg.lbl.Basediam = Base diameter:
 NoseConeCfg.checkbox.Automatic = Automatic
 NoseConeCfg.checkbox.ttip.Automatic = Use the diameter of the next component
@@ -1163,7 +1163,7 @@ ThicknessRingCompCfg.tab.Generalprop = General properties
 TransitionCfg.lbl.Transitionshape = Transition shape:
 TransitionCfg.checkbox.Clipped = Clipped
 TransitionCfg.lbl.Shapeparam = Shape parameter:
-TransitionCfg.lbl.Transitionlength = Transition length:
+TransitionCfg.lbl.Transitionlength = Length:
 TransitionCfg.lbl.Forediam = Fore diameter:
 TransitionCfg.checkbox.Automatic = Automatic
 TransitionCfg.checkbox.ttip.Automatic = Use the diameter of the previous/next component
@@ -1478,7 +1478,7 @@ LaunchLug.Launchlug = Launch Lug
 ! LaunchButton
 RailButton.RailButton = Rail Button
 ! NoseCone
-NoseCone.NoseCone = Nose cone
+NoseCone.NoseCone = Nose Cone
 ! Transition
 Transition.Transition = Transition
 !Stage
@@ -1496,36 +1496,36 @@ BoosterSet.BoosterSet = Booster Set
 PodSet.PodSet = Pod Set
 
 ! BodyTube
-BodyTube.BodyTube = Body tube
+BodyTube.BodyTube = Body Tube
 ! TubeCoupler
-TubeCoupler.TubeCoupler = Tube coupler
+TubeCoupler.TubeCoupler = Tube Coupler
 !InnerTube
 InnerTube.InnerTube = Inner Tube
 ! TrapezoidFinSet
-TrapezoidFinSet.TrapezoidFinSet = Trapezoidal fin set
+TrapezoidFinSet.TrapezoidFinSet = Trapezoidal Fin Set
 ! FreeformFinSet
-FreeformFinSet.FreeformFinSet = Freeform fin set
+FreeformFinSet.FreeformFinSet = Freeform Fin Set
 ! TubeFinSEt
-TubeFinSet.TubeFinSet = Tube fin set
+TubeFinSet.TubeFinSet = Tube Fin Set
 !MassComponent
 MassComponent.MassComponent = Mass Component
 MassComponent.Altimeter = Altimeter
-MassComponent.FlightComputer = Flight computer
-MassComponent.DeploymentCharge = Deployment charge
+MassComponent.FlightComputer = Flight Computer
+MassComponent.DeploymentCharge = Deployment Charge
 MassComponent.Tracker = Tracker
 MassComponent.Payload = Payload
-MassComponent.RecoveryHardware = Recovery hardware
+MassComponent.RecoveryHardware = Recovery Hardware
 MassComponent.Battery = Battery
 ! Parachute
 Parachute.Parachute = Parachute
 ! ShockCord
-ShockCord.ShockCord = Shock cord
+ShockCord.ShockCord = Shock Cord
 ! Bulkhead
 Bulkhead.Bulkhead = Bulkhead
 ! CenteringRing
-CenteringRing.CenteringRing = Centering ring
+CenteringRing.CenteringRing = Centering Ring
 ! EngineBlock
-EngineBlock.EngineBlock = Engine block
+EngineBlock.EngineBlock = Engine Block
 ! Streamer
 Streamer.Streamer = Streamer
 ! Sleeve
@@ -1558,32 +1558,32 @@ MotorConfiguration.empty = None
 ComponentIcons.Stage = Axial Stage
 ComponentIcons.Boosters = Booster Stage
 ComponentIcons.Pods = Pod Stage
-ComponentIcons.Nosecone = Nose cone
-ComponentIcons.Bodytube = Body tube
+ComponentIcons.Nosecone = Nose Cone
+ComponentIcons.Bodytube = Body Tube
 ComponentIcons.Transition = Transition
-ComponentIcons.Trapezoidalfinset = Trapezoidal fin set
-ComponentIcons.Ellipticalfinset = Elliptical fin set
-ComponentIcons.Freeformfinset = Freeform fin set
-ComponentIcons.Tubefinset = Tube fin set
+ComponentIcons.Trapezoidalfinset = Trapezoidal Fin Set
+ComponentIcons.Ellipticalfinset = Elliptical Fin Set
+ComponentIcons.Freeformfinset = Freeform Fin Set
+ComponentIcons.Tubefinset = Tube Fin Set
 ComponentIcons.Launchlug = Launch Lugs
 ComponentIcons.RailButton = Rail Buttons
-ComponentIcons.Innertube = Inner tube
-ComponentIcons.Tubecoupler = Tube coupler
-ComponentIcons.Centeringring = Centering ring
-ComponentIcons.Bulkhead = Bulk head
-ComponentIcons.Engineblock = Engine block
+ComponentIcons.Innertube = Inner Tube
+ComponentIcons.Tubecoupler = Tube Coupler
+ComponentIcons.Centeringring = Centering Ring
+ComponentIcons.Bulkhead = Bulkhead
+ComponentIcons.Engineblock = Engine Block
 ComponentIcons.Parachute = Parachute
 ComponentIcons.Streamer = Streamer
-ComponentIcons.Shockcord = Shock cord
-ComponentIcons.Masscomponent = Mass component
+ComponentIcons.Shockcord = Shock Cord
+ComponentIcons.Masscomponent = Mass Component
 ComponentIcons.disabled = (disabled)
 ComponentIcons.Altimeter = Altimeter
-ComponentIcons.Flightcomputer = Flight computer
+ComponentIcons.Flightcomputer = Flight Computer
 ComponentIcons.Battery = Battery
 ComponentIcons.Tracker = Tracker
-ComponentIcons.Recoveryhardware = Recovery hardware
+ComponentIcons.Recoveryhardware = Recovery Hardware
 ComponentIcons.Payload = Payload
-ComponentIcons.Deploymentcharge = Deployment charge
+ComponentIcons.Deploymentcharge = Deployment Charge
 
 ! StageAction
 StageAction.Stage = Stage
@@ -1790,7 +1790,7 @@ OpenRocketDocument.Redo = Redo
 OpenRocketDocument.Undo = Undo
 
 !EllipticalFinSet
-EllipticalFinSet.Ellipticalfinset = Elliptical fin set
+EllipticalFinSet.Ellipticalfinset = Elliptical Fin Set
 
 ! Optimization
 
diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties
index 8a551d856..3c5eab213 100644
--- a/core/resources/l10n/messages_cs.properties
+++ b/core/resources/l10n/messages_cs.properties
@@ -571,7 +571,7 @@ ringcompcfg.note.desc = Pozn
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength = Délka tela rakety:
+BodyTubecfg.lbl.Bodytubelength = Délka:
 BodyTubecfg.lbl.Outerdiameter = Vnej\u0161í prumer:
 BodyTubecfg.lbl.Innerdiameter = Vnitrní prumer:
 BodyTubecfg.lbl.Wallthickness = Tlou\u0161tka steny:
@@ -785,7 +785,7 @@ MotorCfg.lbl.motorLabel = Nic
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape = Tvar nosního ku\u017Eele:
 NoseConeCfg.lbl.Shapeparam = Tvarový parametr:
-NoseConeCfg.lbl.Noseconelength = Délka nosního ku\u017Eelu:
+NoseConeCfg.lbl.Noseconelength = Délka:
 NoseConeCfg.lbl.Basediam = Základový prumer:
 NoseConeCfg.checkbox.Automatic = Automaticky
 NoseConeCfg.lbl.Wallthickness =  Tlou\u0161tka steny:
@@ -883,7 +883,7 @@ ThicknessRingCompCfg.tab.Generalprop = Obecn
 TransitionCfg.lbl.Transitionshape = Tvar prechodu trupu:
 TransitionCfg.checkbox.Clipped = Zkrácený
 TransitionCfg.lbl.Shapeparam = Parametr tvaru:
-TransitionCfg.lbl.Transitionlength = Délka prechodu trupu:
+TransitionCfg.lbl.Transitionlength = Délka:
 TransitionCfg.lbl.Forediam = Prídový prumer prechodu trupu:
 TransitionCfg.checkbox.Automatic = Automatický
 TransitionCfg.lbl.Aftdiam = Zádový prumer:
diff --git a/core/resources/l10n/messages_de.properties b/core/resources/l10n/messages_de.properties
index 079e14214..8b417f436 100644
--- a/core/resources/l10n/messages_de.properties
+++ b/core/resources/l10n/messages_de.properties
@@ -628,7 +628,7 @@ ringcompcfg.note.desc = Hinweis: Innenrohre beeinflussen die Aerodynamik der Rak
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength = Länge des Körperrohres:
+BodyTubecfg.lbl.Bodytubelength = Länge:
 BodyTubecfg.lbl.Outerdiameter = Außendurchmesser:
 BodyTubecfg.lbl.Innerdiameter = Innendurchmesser:
 BodyTubecfg.lbl.Wallthickness = Wandstärke:
@@ -842,7 +842,7 @@ MotorCfg.lbl.motorLabel = Keiner
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape = Spitzenform:
 NoseConeCfg.lbl.Shapeparam = Formparameter:
-NoseConeCfg.lbl.Noseconelength = Spitzenlänge:
+NoseConeCfg.lbl.Noseconelength = Länge:
 NoseConeCfg.lbl.Basediam = Basisdurchmesser:
 NoseConeCfg.checkbox.Automatic = Automatisch
 NoseConeCfg.lbl.Wallthickness = Wandstärke:
@@ -940,7 +940,7 @@ ThicknessRingCompCfg.tab.Generalprop = Allgemeine Eigenschaften
 TransitionCfg.lbl.Transitionshape = Form des Übergangs
 TransitionCfg.checkbox.Clipped = geklemmt
 TransitionCfg.lbl.Shapeparam = Formparameter:
-TransitionCfg.lbl.Transitionlength = Länge des Übergangs:
+TransitionCfg.lbl.Transitionlength = Länge:
 TransitionCfg.lbl.Forediam = Vorderer Durchmesser
 TransitionCfg.checkbox.Automatic = Automatisch
 TransitionCfg.lbl.Aftdiam = Hinterer Durchmesser
diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties
index 0d61ffa10..ae4f9fe3b 100644
--- a/core/resources/l10n/messages_es.properties
+++ b/core/resources/l10n/messages_es.properties
@@ -84,7 +84,7 @@ BodyTube.BodyTube                 = Cuerpo
 BodyTubecfg.checkbox.Automatic    = Autom\u00e1tico
 BodyTubecfg.checkbox.Filled       = S\u00f3lido
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength    = Longitud del tubo:
+BodyTubecfg.lbl.Bodytubelength    = Longitud:
 BodyTubecfg.lbl.Innerdiameter     = Di\u00e1metro interior:
 BodyTubecfg.lbl.Outerdiameter     = Di\u00e1metro exterior:
 BodyTubecfg.lbl.Wallthickness     = Espesor de la pared:
@@ -1191,7 +1191,7 @@ TransitionCfg.checkbox.Filled        = S\u00f3lido
 TransitionCfg.lbl.Aftdiam            = Di\u00e1metro trasero:
 TransitionCfg.lbl.Forediam           = Di\u00e1metro delantero:
 TransitionCfg.lbl.Shapeparam         = Valor de forma:
-TransitionCfg.lbl.Transitionlength   = Longitud de la transici\u00f3n:
+TransitionCfg.lbl.Transitionlength   = Longitud:
 ! TransitionConfig
 TransitionCfg.lbl.Transitionshape    = Forma de la transici\u00f3n:
 TransitionCfg.lbl.Wallthickness      = Espesor de la pared:
diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties
index f625beb03..1c823e355 100644
--- a/core/resources/l10n/messages_fr.properties
+++ b/core/resources/l10n/messages_fr.properties
@@ -72,7 +72,7 @@ BodyTube.BodyTube                 = Tube du corps
 BodyTubecfg.checkbox.Automatic    = Automatique
 BodyTubecfg.checkbox.Filled       = Asp\u00E9rit\u00E9s bouch\u00E9es
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength    = Longueur du tube:
+BodyTubecfg.lbl.Bodytubelength    = Longueur:
 BodyTubecfg.lbl.Innerdiameter     = Diam\u00E8tre interne:
 BodyTubecfg.lbl.Outerdiameter     = Diam\u00E8tre externe:
 BodyTubecfg.lbl.Wallthickness     = Epaisseur des parois:
@@ -608,7 +608,7 @@ NoseCone.NoseCone              = Ogive
 NoseConeCfg.checkbox.Automatic = Automatique
 NoseConeCfg.checkbox.Filled    = Asp\u00E9rit\u00E9s bouch\u00E9es
 NoseConeCfg.lbl.Basediam       = Diam\u00E8tre de la base:
-NoseConeCfg.lbl.Noseconelength = Longueur du c\u00F4ne de la fus\u00E9e:
+NoseConeCfg.lbl.Noseconelength = Longueur:
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape  = Forme du c\u00F4ne de la fus\u00E9e:
 NoseConeCfg.lbl.Shapeparam     = Param\u00E8tre de la forme:
@@ -1185,7 +1185,7 @@ TransitionCfg.checkbox.Filled        = Asp\u00E9rit\u00E9s bouch\u00E9es
 TransitionCfg.lbl.Aftdiam            = Diam\u00E8tre arri\u00E8re:
 TransitionCfg.lbl.Forediam           = Diam\u00E8tre avant:
 TransitionCfg.lbl.Shapeparam         = Param\u00E8tre de la forme:
-TransitionCfg.lbl.Transitionlength   = Longueur de la transition:
+TransitionCfg.lbl.Transitionlength   = Longueur:
 ! TransitionConfig
 TransitionCfg.lbl.Transitionshape    = Forme de la transition:
 TransitionCfg.lbl.Wallthickness      = Epaisseur de la paroi:
diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties
index 0b1c325d3..49bddf05d 100644
--- a/core/resources/l10n/messages_it.properties
+++ b/core/resources/l10n/messages_it.properties
@@ -629,7 +629,7 @@ ringcompcfg.note.desc = Nota: Un tubo interno non modifica l'aerodinamica del ra
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength = Lunghezza del corpo:
+BodyTubecfg.lbl.Bodytubelength = Lunghezza:
 BodyTubecfg.lbl.Outerdiameter = Diametro esterno:
 BodyTubecfg.lbl.Innerdiameter = Diametro interno:
 BodyTubecfg.lbl.Wallthickness = Spessore della parete:
@@ -844,7 +844,7 @@ MotorCfg.lbl.motorLabel = Nessuno
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape = Forma del naso:
 NoseConeCfg.lbl.Shapeparam = Parametro di forma:
-NoseConeCfg.lbl.Noseconelength = Lunghezza del naso:
+NoseConeCfg.lbl.Noseconelength = Lunghezza:
 NoseConeCfg.lbl.Basediam = Diametro della base:
 NoseConeCfg.checkbox.Automatic = Automatico
 NoseConeCfg.lbl.Wallthickness = Spessore della parete:
@@ -942,7 +942,7 @@ ThicknessRingCompCfg.tab.Generalprop = Proprieta' generali
 TransitionCfg.lbl.Transitionshape = Forma della transizione:
 TransitionCfg.checkbox.Clipped = Scandito
 TransitionCfg.lbl.Shapeparam = Parametri di forma:
-TransitionCfg.lbl.Transitionlength = Lunghezza della transizione:
+TransitionCfg.lbl.Transitionlength = Lunghezza:
 TransitionCfg.lbl.Forediam = Diametro anteriore:
 TransitionCfg.checkbox.Automatic = Automatico
 TransitionCfg.lbl.Aftdiam = Diametro posteriore:
diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties
index 185f2791b..2810500a9 100644
--- a/core/resources/l10n/messages_ja.properties
+++ b/core/resources/l10n/messages_ja.properties
@@ -659,7 +659,7 @@ ringcompcfg.note.desc  = \u30E1\u30E2\uFF1A\u30A4\u30F3\u30CA\u30FC\u30C1\u30E5\
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength  = \u30DC\u30C7\u30A3\u30C1\u30E5\u30FC\u30D6\u9577\u3055\uFF1A
+BodyTubecfg.lbl.Bodytubelength  = \u9577\u3055\uFF1A
 BodyTubecfg.lbl.Outerdiameter  = \u5916\u5F84\uFF1A
 BodyTubecfg.lbl.Innerdiameter  = \u5185\u5F84\uFF1A
 BodyTubecfg.lbl.Wallthickness  = \u8089\u539A\uFF1A
@@ -874,7 +874,7 @@ MotorCfg.lbl.motorLabel  = None
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape  = \u30CE\u30FC\u30BA\u30B3\u30FC\u30F3\u5F62\u72B6\uFF1A
 NoseConeCfg.lbl.Shapeparam  = \u5F62\u72B6\u4FC2\u6570\uFF1A
-NoseConeCfg.lbl.Noseconelength  = \u30CE\u30FC\u30BA\u30B3\u30FC\u30F3\u9577\u3055\uFF1A
+NoseConeCfg.lbl.Noseconelength  = \u9577\u3055\uFF1A
 NoseConeCfg.lbl.Basediam  = \u30D9\u30FC\u30B9\u76F4\u5F84\uFF1A
 NoseConeCfg.checkbox.Automatic  = \u81EA\u52D5
 NoseConeCfg.lbl.Wallthickness  = \u539A\u3055\uFF1A
@@ -972,7 +972,7 @@ ThicknessRingCompCfg.tab.Generalprop  = \u4E00\u822C
 TransitionCfg.lbl.Transitionshape  = \u30C8\u30E9\u30F3\u30B8\u30B7\u30E7\u30F3\u5F62\u72B6\uFF1A
 TransitionCfg.checkbox.Clipped  = Clipped
 TransitionCfg.lbl.Shapeparam  = \u5F62\u72B6\u4FC2\u6570\uFF1A
-TransitionCfg.lbl.Transitionlength  = \u30C8\u30E9\u30F3\u30B8\u30B7\u30E7\u30F3\u9577\u3055\uFF1A
+TransitionCfg.lbl.Transitionlength  = \u9577\u3055\uFF1A
 TransitionCfg.lbl.Forediam  = \u524D\u65B9\u76F4\u5F84\uFF1A
 TransitionCfg.checkbox.Automatic  = \u81EA\u52D5
 TransitionCfg.lbl.Aftdiam  = \u5F8C\u65B9\u76F4\u5F84\uFF1A
diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties
index f017b73d1..1977c2887 100644
--- a/core/resources/l10n/messages_nl.properties
+++ b/core/resources/l10n/messages_nl.properties
@@ -756,7 +756,7 @@ ringcompcfg.note.desc = Opmerking: Een binnenbuis heeft geen invloed op de aëro
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength = Rompbuislengte:
+BodyTubecfg.lbl.Bodytubelength = Lengte:
 BodyTubecfg.lbl.Outerdiameter = Buitendiameter:
 BodyTubecfg.lbl.Innerdiameter = Binnendiameter:
 BodyTubecfg.lbl.Wallthickness = Wanddikte:
@@ -1021,7 +1021,7 @@ MotorCfg.lbl.motorLabel = Geen
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape = Vorm neuskegel:
 NoseConeCfg.lbl.Shapeparam = Vorm parameter:
-NoseConeCfg.lbl.Noseconelength = Lengte neuskegel:
+NoseConeCfg.lbl.Noseconelength = Lengte:
 NoseConeCfg.lbl.Basediam = Basis diameter:
 NoseConeCfg.checkbox.Automatic = Automatisch
 NoseConeCfg.lbl.Wallthickness = Wanddikte:
@@ -1122,7 +1122,7 @@ ThicknessRingCompCfg.tab.Generalprop = Algemene eigenschappen
 TransitionCfg.lbl.Transitionshape = Transitievorm:
 TransitionCfg.checkbox.Clipped = Geclipt
 TransitionCfg.lbl.Shapeparam = Vormparameters:
-TransitionCfg.lbl.Transitionlength = Transitielengte:
+TransitionCfg.lbl.Transitionlength = Lengte:
 TransitionCfg.lbl.Forediam = Voordiameter
 TransitionCfg.checkbox.Automatic = Automatisch
 TransitionCfg.lbl.Aftdiam = Achterdiameter:
@@ -1474,7 +1474,7 @@ Parachute.Parachute = Parachute
 ! ShockCord
 ShockCord.ShockCord = Hanglijn
 ! Bulkhead
-Bulkhead.Bulkhead = Bulkhead
+Bulkhead.Bulkhead = Schot
 ! CenteringRing
 CenteringRing.CenteringRing = Centreerring
 ! EngineBlock
@@ -1523,7 +1523,7 @@ ComponentIcons.RailButton = Geleidingsknop
 ComponentIcons.Innertube = Binnenbuis
 ComponentIcons.Tubecoupler = Buiskoppeling
 ComponentIcons.Centeringring = Centereerring
-ComponentIcons.Bulkhead = Bulk head
+ComponentIcons.Bulkhead = Schot
 ComponentIcons.Engineblock = Motorblok
 ComponentIcons.Parachute = Parachute
 ComponentIcons.Streamer = Streamer
diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties
index 0611af9a7..cb69f9fb1 100644
--- a/core/resources/l10n/messages_pl.properties
+++ b/core/resources/l10n/messages_pl.properties
@@ -573,7 +573,7 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s.
  
  
  ! Body Tube Config
- BodyTubecfg.lbl.Bodytubelength  =  D\u0142ugo\u015B\u0107 korpusu:
+ BodyTubecfg.lbl.Bodytubelength  =  D\u0142ugo\u015B\u0107:
  BodyTubecfg.lbl.Outerdiameter  =  \u015Arednica zewn\u0119trzna:
  BodyTubecfg.lbl.Innerdiameter  =  \u015Arednica wewn\u0119trzna:
  BodyTubecfg.lbl.Wallthickness  =  Grubo\u015B\u0107 \u015Bciany:
@@ -787,7 +787,7 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s.
  ! NoseConeConfig
  NoseConeCfg.lbl.Noseconeshape  =  Kszta\u0142t g\u0142owicy:
  NoseConeCfg.lbl.Shapeparam  =  Parametr kszta\u0142tu
- NoseConeCfg.lbl.Noseconelength  =  D\u0142ugo\u015B\u0107 g\u0142owicy:
+ NoseConeCfg.lbl.Noseconelength  =  D\u0142ugo\u015B\u0107:
  NoseConeCfg.lbl.Basediam  =  \u015Arednica podstawy:
  NoseConeCfg.checkbox.Automatic  =  Auto
  NoseConeCfg.lbl.Wallthickness  =  Grubo\u015B\u0107 \u015Bciany:
@@ -885,7 +885,7 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s.
  TransitionCfg.lbl.Transitionshape  =  Kszta\u0142t talii przej\u015Bciowej
  TransitionCfg.checkbox.Clipped  =  Przyci\u0119ta
  TransitionCfg.lbl.Shapeparam  =  Parametr kszta\u0142tu
- TransitionCfg.lbl.Transitionlength  =  D\u0142ugo\u015B\u0107 przej\u015Bciówki:
+ TransitionCfg.lbl.Transitionlength  =  D\u0142ugo\u015B\u0107:
  TransitionCfg.lbl.Forediam  =  \u015Arednica przednia:
  TransitionCfg.checkbox.Automatic  =  Auto
  TransitionCfg.lbl.Aftdiam  =  \u015Arednica tylna:
diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties
index 1982ed4ad..5320d3511 100644
--- a/core/resources/l10n/messages_pt.properties
+++ b/core/resources/l10n/messages_pt.properties
@@ -65,7 +65,7 @@ BodyTube.BodyTube                 = Tubo do corpo
 BodyTubecfg.checkbox.Automatic    = Autom\u00e1tico
 BodyTubecfg.checkbox.Filled       = Atribu\u00eddo 
 # Body Tube Config
-BodyTubecfg.lbl.Bodytubelength    = Comprimento do tubo do corpo:
+BodyTubecfg.lbl.Bodytubelength    = Comprimento:
 BodyTubecfg.lbl.Innerdiameter     = Di\u00e2metro interno:
 BodyTubecfg.lbl.Outerdiameter     = Di\u00e2metro externo
 BodyTubecfg.lbl.Wallthickness     = Espessura de parede:
@@ -593,7 +593,7 @@ NoseCone.NoseCone              = Ogiva
 NoseConeCfg.checkbox.Automatic = Autom\u00e1tico
 NoseConeCfg.checkbox.Filled    = Atribu\u00eddo 
 NoseConeCfg.lbl.Basediam       = Di\u00e2metro da base:
-NoseConeCfg.lbl.Noseconelength = Comprimento da ogiva:
+NoseConeCfg.lbl.Noseconelength = Comprimento:
 # NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape  = Forma da ogiva:
 NoseConeCfg.lbl.Shapeparam     = Par\u00e2metro de forma:
@@ -1149,7 +1149,7 @@ TransitionCfg.checkbox.Filled        = Atribu\u00eddo
 TransitionCfg.lbl.Aftdiam            = Di\u00e2metro da popa:
 TransitionCfg.lbl.Forediam           = Di\u00e2metro dianteiro:
 TransitionCfg.lbl.Shapeparam         = Par\u00e2metro de forma:
-TransitionCfg.lbl.Transitionlength   = Comprimento de transi\u00e7\u00e3o:
+TransitionCfg.lbl.Transitionlength   = Comprimento:
 # TransitionConfig
 TransitionCfg.lbl.Transitionshape    = Forma de transi\u00e7\u00e3o:
 TransitionCfg.lbl.Wallthickness      = Espessura de parede:
diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties
index 3628b1067..87ec528fc 100644
--- a/core/resources/l10n/messages_ru.properties
+++ b/core/resources/l10n/messages_ru.properties
@@ -702,7 +702,7 @@ ringcompcfg.note.desc = \u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength = \u0414\u043b\u0438\u043d\u0430 \u0442\u0440\u0443\u0431\u044b:
+BodyTubecfg.lbl.Bodytubelength = \u0414\u043b\u0438\u043d\u0430:
 BodyTubecfg.lbl.Outerdiameter = \u0412\u043d\u0435\u0448\u043d\u0438\u0439 \u0434\u0438\u0430\u043c\u0435\u0442\u0440:
 BodyTubecfg.lbl.Innerdiameter = \u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0439 \u0434\u0438\u0430\u043c\u0435\u0442\u0440:
 BodyTubecfg.lbl.Wallthickness = \u0422\u043e\u043b\u0449\u0438\u043d\u0430 \u0441\u0442\u0435\u043d\u043a\u0438:
@@ -942,7 +942,7 @@ MotorCfg.lbl.motorLabel = \u041d\u0435\u0442
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape = \u0424\u043e\u0440\u043c\u0430 \u043e\u0431\u0442\u0435\u043a\u0430\u0442\u0435\u043b\u044f:
 NoseConeCfg.lbl.Shapeparam = \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u0444\u043e\u0440\u043c\u044b:
-NoseConeCfg.lbl.Noseconelength = \u0414\u043b\u0438\u043d\u0430 \u043e\u0431\u0442\u0435\u043a\u0430\u0442\u0435\u043b\u044f:
+NoseConeCfg.lbl.Noseconelength = \u0414\u043b\u0438\u043d\u0430:
 NoseConeCfg.lbl.Basediam = \u0414\u0438\u0430\u043c\u0435\u0442\u0440 \u043e\u0441\u043d\u043e\u0432\u0430\u043d\u0438\u044f:
 NoseConeCfg.checkbox.Automatic = \u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438
 NoseConeCfg.lbl.Wallthickness = \u0422\u043e\u043b\u0449\u0438\u043d\u0430 \u0441\u0442\u0435\u043d\u043a\u0438:
@@ -1040,7 +1040,7 @@ ThicknessRingCompCfg.tab.Generalprop = \u041e\u0441\u043d\u043e\u0432\u043d\u044
 TransitionCfg.lbl.Transitionshape = \u0424\u043e\u0440\u043c\u0430 \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0430:
 TransitionCfg.checkbox.Clipped = \u041e\u0431\u0440\u0435\u0437\u0430\u043d
 TransitionCfg.lbl.Shapeparam = \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u0444\u043e\u0440\u043c\u044b:
-TransitionCfg.lbl.Transitionlength = \u0414\u043b\u0438\u043d\u0430 \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0430:
+TransitionCfg.lbl.Transitionlength = \u0414\u043b\u0438\u043d\u0430:
 TransitionCfg.lbl.Forediam = \u0414\u0438\u0430\u043c\u0435\u0442\u0440 \u0432\u044b\u0445\u043e\u0434\u0430:
 TransitionCfg.checkbox.Automatic = \u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438
 TransitionCfg.lbl.Aftdiam = \u0414\u0438\u0430\u043c\u0435\u0442\u0440 \u0432\u0445\u043e\u0434\u0430:
diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties
index eb0de6f43..b31e062da 100644
--- a/core/resources/l10n/messages_uk_UA.properties
+++ b/core/resources/l10n/messages_uk_UA.properties
@@ -613,25 +613,25 @@ SimulationPlotPanel.error.noPlotSelected = Please add one or more variables to p
 SimulationPlotPanel.error.noPlotSelected.title = Nothing to plot
 
 ! Component add buttons
-compaddbuttons.Bodycompandfinsets = Body components and fin sets
-compaddbuttons.Nosecone = Nose cone
-compaddbuttons.Bodytube = Body tube
+compaddbuttons.Bodycompandfinsets = Body Components and Fin Sets
+compaddbuttons.Nosecone = Nose Cone
+compaddbuttons.Bodytube = Body Tube
 compaddbuttons.Transition = Transition
 compaddbuttons.Trapezoidal = Trapezoidal
 compaddbuttons.Elliptical = Elliptical
 compaddbuttons.Freeform = Freeform
-compaddbuttons.Launchlug = Launch lug
-compaddbuttons.Innercomponent = Inner component
-compaddbuttons.Innertube = Inner tube
+compaddbuttons.Launchlug = Launch Lug
+compaddbuttons.Innercomponent = Inner Component
+compaddbuttons.Innertube = Inner Tube
 compaddbuttons.Coupler = Coupler
-compaddbuttons.Centeringring = Centering\nring
+compaddbuttons.Centeringring = Centering\nRing
 compaddbuttons.Bulkhead = Bulkhead
-compaddbuttons.Engineblock = Engine\nblock
-compaddbuttons.Massobjects = Mass objects
+compaddbuttons.Engineblock = Engine\nBlock
+compaddbuttons.Massobjects = Mass Objects
 compaddbuttons.Parachute = Parachute
 compaddbuttons.Streamer = Streamer
-compaddbuttons.Shockcord = Shock cord
-compaddbuttons.Masscomponent = Mass\ncomponent
+compaddbuttons.Shockcord = Shock Cord
+compaddbuttons.Masscomponent = Mass\nComponent
 compaddbuttons.Donotaskmeagain = Do not ask me again
 compaddbuttons.Selectcomppos = Select component position
 compaddbuttons.lbl.Youcanchange = You can change the default operation in the preferences.
@@ -706,7 +706,7 @@ ringcompcfg.note.desc = Note: An inner tube will not affect the aerodynamics of
 
 
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength = Body tube length:
+BodyTubecfg.lbl.Bodytubelength = Length:
 BodyTubecfg.lbl.Outerdiameter = Outer diameter:
 BodyTubecfg.lbl.Innerdiameter = Inner diameter:
 BodyTubecfg.lbl.Wallthickness = Wall thickness:
@@ -947,7 +947,7 @@ MotorCfg.lbl.motorLabel = None
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape = Nose cone shape:
 NoseConeCfg.lbl.Shapeparam = Shape parameter:
-NoseConeCfg.lbl.Noseconelength = Nose cone length:
+NoseConeCfg.lbl.Noseconelength = Length:
 NoseConeCfg.lbl.Basediam = Base diameter:
 NoseConeCfg.checkbox.Automatic = Automatic
 NoseConeCfg.lbl.Wallthickness = Wall thickness:
@@ -1045,7 +1045,7 @@ ThicknessRingCompCfg.tab.Generalprop = General properties
 TransitionCfg.lbl.Transitionshape = Transition shape:
 TransitionCfg.checkbox.Clipped = Clipped
 TransitionCfg.lbl.Shapeparam = Shape parameter:
-TransitionCfg.lbl.Transitionlength = Transition length:
+TransitionCfg.lbl.Transitionlength = Length:
 TransitionCfg.lbl.Forediam = Fore diameter:
 TransitionCfg.checkbox.Automatic = Automatic
 TransitionCfg.lbl.Aftdiam = Aft diameter:
@@ -1306,9 +1306,9 @@ RocketComponent.Position.AFTER = After the parent component
 RocketComponent.Position.ABSOLUTE = Tip of the nose cone
 
 ! LaunchLug
-LaunchLug.Launchlug = Launch lug
+LaunchLug.Launchlug = Launch Lug
 ! NoseCone
-NoseCone.NoseCone = Nose cone
+NoseCone.NoseCone = Nose Cone
 ! Transition
 Transition.Transition = Transition
 !Stage
@@ -1322,27 +1322,27 @@ Stage.SeparationEvent.LAUNCH = Launch
 Stage.SeparationEvent.NEVER = Never
 
 ! BodyTube
-BodyTube.BodyTube = Body tube
+BodyTube.BodyTube = Body Tube
 ! TubeCoupler
-TubeCoupler.TubeCoupler = Tube coupler
+TubeCoupler.TubeCoupler = Tube Coupler
 !InnerTube
 InnerTube.InnerTube = Inner Tube
 ! TrapezoidFinSet
-TrapezoidFinSet.TrapezoidFinSet = Trapezoidal fin set
+TrapezoidFinSet.TrapezoidFinSet = Trapezoidal Fin Set
 ! FreeformFinSet
-FreeformFinSet.FreeformFinSet = Freeform fin set
+FreeformFinSet.FreeformFinSet = Freeform Fin Set
 !MassComponent
-MassComponent.MassComponent = Mass component
+MassComponent.MassComponent = Mass Component
 ! Parachute
 Parachute.Parachute = Parachute
 ! ShockCord
-ShockCord.ShockCord = Shock cord
+ShockCord.ShockCord = Shock Cord
 ! Bulkhead
 Bulkhead.Bulkhead = Bulkhead
 ! CenteringRing
-CenteringRing.CenteringRing = Centering ring
+CenteringRing.CenteringRing = Centering Ring
 ! EngineBlock
-EngineBlock.EngineBlock = Engine block
+EngineBlock.EngineBlock = Engine Block
 ! Streamer
 Streamer.Streamer = Streamer
 ! Sleeve
@@ -1368,22 +1368,22 @@ MotorMount.IgnitionEvent.short.NEVER = Never
 
 
 !ComponentIcons
-ComponentIcons.Nosecone = Nose cone
-ComponentIcons.Bodytube = Body tube
+ComponentIcons.Nosecone = Nose Cone
+ComponentIcons.Bodytube = Body Tube
 ComponentIcons.Transition = Transition
-ComponentIcons.Trapezoidalfinset = Trapezoidal fin set
-ComponentIcons.Ellipticalfinset = Elliptical fin set
-ComponentIcons.Freeformfinset = Freeform fin set
-ComponentIcons.Launchlug = Launch lug
-ComponentIcons.Innertube = Inner tube
-ComponentIcons.Tubecoupler = Tube coupler
-ComponentIcons.Centeringring = Centering ring
-ComponentIcons.Bulkhead = Bulk head
-ComponentIcons.Engineblock = Engine block
+ComponentIcons.Trapezoidalfinset = Trapezoidal Fin Set
+ComponentIcons.Ellipticalfinset = Elliptical Fin Set
+ComponentIcons.Freeformfinset = Freeform Fin Set
+ComponentIcons.Launchlug = Launch Lug
+ComponentIcons.Innertube = Inner Tube
+ComponentIcons.Tubecoupler = Tube Coupler
+ComponentIcons.Centeringring = Centering Ring
+ComponentIcons.Bulkhead = Bulkhead
+ComponentIcons.Engineblock = Engine Block
 ComponentIcons.Parachute = Parachute
 ComponentIcons.Streamer = Streamer
-ComponentIcons.Shockcord = Shock cord
-ComponentIcons.Masscomponent = Mass component
+ComponentIcons.Shockcord = Shock Cord
+ComponentIcons.Masscomponent = Mass Component
 ComponentIcons.disabled = (disabled)
 
 ! StageAction
diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties
index 0c8732e03..d3d211751 100644
--- a/core/resources/l10n/messages_zh_CN.properties
+++ b/core/resources/l10n/messages_zh_CN.properties
@@ -80,7 +80,7 @@ BodyTube.BodyTube                 = \u7BAD\u4F53
 BodyTubecfg.checkbox.Automatic    = \u81EA\u52A8
 BodyTubecfg.checkbox.Filled       = \u5B9E\u5FC3
 ! Body Tube Config
-BodyTubecfg.lbl.Bodytubelength    = \u7BAD\u4F53\u957F\u5EA6:
+BodyTubecfg.lbl.Bodytubelength    = \u957F\u5EA6:
 BodyTubecfg.lbl.Innerdiameter     = \u5185\u76F4\u5F84:
 BodyTubecfg.lbl.Outerdiameter     = \u5916\u76F4\u5F84:
 BodyTubecfg.lbl.Wallthickness     = \u58C1\u539A:
@@ -635,7 +635,7 @@ NoseCone.NoseCone              = \u5934\u9525
 NoseConeCfg.checkbox.Automatic = \u81EA\u52A8
 NoseConeCfg.checkbox.Filled    = \u5B9E\u5FC3
 NoseConeCfg.lbl.Basediam       = \u5E95\u5EA7\u76F4\u5F84:
-NoseConeCfg.lbl.Noseconelength = \u5934\u9525\u957F\u5EA6:
+NoseConeCfg.lbl.Noseconelength = \u957F\u5EA6:
 ! NoseConeConfig
 NoseConeCfg.lbl.Noseconeshape  = \u5934\u9525\u5916\u5F62:
 NoseConeCfg.lbl.Shapeparam     = \u5916\u5F62\u53C2\u6570:
@@ -1255,7 +1255,7 @@ TransitionCfg.checkbox.Filled        = \u5B9E\u5FC3
 TransitionCfg.lbl.Aftdiam            = \u540E\u76F4\u5F84:
 TransitionCfg.lbl.Forediam           = \u524D\u76F4\u5F84
 TransitionCfg.lbl.Shapeparam         = \u5F62\u72B6\u53C2\u6570:
-TransitionCfg.lbl.Transitionlength   = \u7EA7\u95F4\u6BB5\u76F4\u5F84:
+TransitionCfg.lbl.Transitionlength   = \u957F\u5EA6:
 ! TransitionConfig
 TransitionCfg.lbl.Transitionshape    = \u7EA7\u95F4\u6BB5\u5F62\u72B6:
 TransitionCfg.lbl.Wallthickness      = \u58C1\u539A:
diff --git a/core/src/net/sf/openrocket/preset/xml/BulkHeadDTO.java b/core/src/net/sf/openrocket/preset/xml/BulkHeadDTO.java
index 7e81622c8..ea39e8c89 100644
--- a/core/src/net/sf/openrocket/preset/xml/BulkHeadDTO.java
+++ b/core/src/net/sf/openrocket/preset/xml/BulkHeadDTO.java
@@ -32,7 +32,7 @@ public class BulkHeadDTO extends BaseComponentDTO {
      *
      * @param thePreset  the preset
      *
-     * @throws net.sf.openrocket.util.BugException thrown if the expected bulk head keys are not in the preset
+     * @throws net.sf.openrocket.util.BugException thrown if the expected bulkhead keys are not in the preset
      */
     public BulkHeadDTO(final ComponentPreset thePreset) {
         super(thePreset);
diff --git a/swing/src/net/sf/openrocket/gui/main/ComponentIcons.java b/swing/src/net/sf/openrocket/gui/main/ComponentIcons.java
index 26bf65701..d5e9b3a28 100644
--- a/swing/src/net/sf/openrocket/gui/main/ComponentIcons.java
+++ b/swing/src/net/sf/openrocket/gui/main/ComponentIcons.java
@@ -70,7 +70,7 @@ public class ComponentIcons {
 		load("tubecoupler", trans.get("ComponentIcons.Tubecoupler"), TubeCoupler.class);
 		//// Centering ring
 		load("centeringring", trans.get("ComponentIcons.Centeringring"), CenteringRing.class);
-		//// Bulk head
+		//// Bulkhead
 		load("bulkhead", trans.get("ComponentIcons.Bulkhead"), Bulkhead.class);
 		// // Engine block
 		load("engineblock", trans.get("ComponentIcons.Engineblock"),