From dd277b37027ad4d5694835f3eb70c99afa9df81b Mon Sep 17 00:00:00 2001
From: Daniel_M_Williams <equipoise@gmail.com>
Date: Sat, 9 May 2020 10:48:03 -0400
Subject: [PATCH] [fix][i10n] Adjusts Labels for multiple add-component-buttons

---
 core/resources/l10n/messages.properties         | 17 ++++++++---------
 .../gui/main/ComponentAddButtons.java           | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 15b1f97d8..3226bb598 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -656,7 +656,8 @@ 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.AxialStage = Stage
+compaddbuttons.Bodycompandfinsets = Body Components and Fin Sets
 compaddbuttons.Nosecone = Nose cone
 compaddbuttons.Bodytube = Body tube
 compaddbuttons.Transition = Transition
@@ -666,22 +667,20 @@ compaddbuttons.Freeform = Freeform
 compaddbuttons.Tubefin = Tube fins
 compaddbuttons.Launchlug = Launch Lug
 compaddbuttons.RailButton = Rail Button
-compaddbuttons.Innercomponent = Inner component
+compaddbuttons.InnerComponent = Inner Components
 compaddbuttons.Innertube = Inner tube
 compaddbuttons.Coupler = Coupler
 compaddbuttons.Centeringring = Centering\nring
 compaddbuttons.Bulkhead = Bulkhead
 compaddbuttons.Engineblock = Engine\nblock
-compaddbuttons.assembly = Assembly Components
-compaddbuttons.newBooster.lbl = New\nBoosters
-compaddbuttons.newBooster.ttip = Add a new set booster stage to the rocket design.
-compaddbuttons.newPods.lbl = New Pods
-compaddbuttons.newPods.ttip = Add a new set of pods to the rocket design.
-compaddbuttons.Massobjects = Mass objects
+compaddbuttons.ComponentAssembly = Assembly Components
+compaddbuttons.ParallelStage = Boosters
+compaddbuttons.Pods = Pods
 compaddbuttons.Parachute = Parachute
 compaddbuttons.Streamer = Streamer
 compaddbuttons.Shockcord = Shock cord
-compaddbuttons.Masscomponent = Mass\ncomponent
+compaddbuttons.MassComponent = Mass Component
+compaddbuttons.MassComponents = Mass Components
 compaddbuttons.Donotaskmeagain = Do not ask me again
 compaddbuttons.Selectcomppos = Select component position
 compaddbuttons.lbl.Youcanchange = You can change the default operation in the preferences.
diff --git a/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java b/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
index 043ee9cd8..50e60350e 100644
--- a/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
+++ b/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
@@ -118,20 +118,19 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
 		int col = 0;
 
 		////////////////////////////////////////////
-		add(new JLabel(trans.get("compaddbuttons.assembly")), "span, gaptop unrel, wrap");
+		add(new JLabel(trans.get("compaddbuttons.ComponentAssembly")), "span, gaptop 0, wrap");
 
 		//// Component Assembly Components:
 		addButtonGroup(row,
-				new ComponentButton(AxialStage.class, trans.get("RocketActions.NewStageAct.Newstage")),
-				new ComponentButton(ParallelStage.class, trans.get("compaddbuttons.newBooster.lbl")),
-				new ComponentButton(PodSet.class, trans.get("compaddbuttons.newPods.lbl")));
-
+				new ComponentButton(AxialStage.class, trans.get("compaddbuttons.AxialStage")),
+				new ComponentButton(ParallelStage.class, trans.get("compaddbuttons.ParallelStage")),
+				new ComponentButton(PodSet.class, trans.get("compaddbuttons.Pods")));
 		row++;
 
 		////////////////////////////////////////////
 		
 		//// Body components and fin sets
-		add(new JLabel(trans.get("compaddbuttons.Bodycompandfinsets")), "span, gaptop 0, wrap");
+		add(new JLabel(trans.get("compaddbuttons.Bodycompandfinsets")), "span, gaptop unrel, wrap");
 		addButtonGroup(row, 
 				//// Nose cone
 				new BodyComponentButton(NoseCone.class, trans.get("compaddbuttons.Nosecone")),
@@ -156,7 +155,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
 		/////////////////////////////////////////////
 		
 		//// Inner component
-		add(new JLabel(trans.get("compaddbuttons.Innercomponent")), "span, gaptop unrel, wrap");
+		add(new JLabel(trans.get("compaddbuttons.InnerComponent")), "span, gaptop unrel, wrap");
 		addButtonGroup(row, 
 				//// Inner tube
 				new ComponentButton(InnerTube.class, trans.get("compaddbuttons.Innertube")),
@@ -172,7 +171,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
 		row++;
 
 		////////////////////////////////////////////
-		add(new JLabel(trans.get("compaddbuttons.Massobjects")), "span, gaptop unrel, wrap");
+		add(new JLabel(trans.get("compaddbuttons.MassComponents")), "span, gaptop unrel, wrap");
 
 		//// Mass objects
 		// NOTE: These are on the same line as the assemblies above
@@ -186,7 +185,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
 				//				new ComponentButton("Motor clip"),
 				//				new ComponentButton("Payload"),
 				//// Mass component
-				new ComponentButton(MassComponent.class, trans.get("compaddbuttons.Masscomponent")));
+				new ComponentButton(MassComponent.class, trans.get("compaddbuttons.MassComponent")));
 		
 
 		// Get maximum button size