diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 9cc4cf088..f561dd63f 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -76,6 +76,7 @@ error.fileExists.desc = File '{filename}' exists. Do you want to overwrite it? error.writing.title = Error writing file error.writing.desc = An error occurred while writing to the file: +Configuration.lbl.override = Parameter can be overridden in each flight configuration. ! Labels used in buttons of dialog windows diff --git a/core/src/net/sf/openrocket/gui/configdialog/CommonStrings.java b/core/src/net/sf/openrocket/gui/configdialog/CommonStrings.java new file mode 100644 index 000000000..be0011c12 --- /dev/null +++ b/core/src/net/sf/openrocket/gui/configdialog/CommonStrings.java @@ -0,0 +1,8 @@ +package net.sf.openrocket.gui.configdialog; + +import net.sf.openrocket.startup.Application; + +public class CommonStrings { + public final static String dagger = "\u2020"; + public final static String override_description = dagger + Application.getTranslator().get("Configuration.lbl.override"); +} diff --git a/core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java index 2974e768f..429f4bf1c 100644 --- a/core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java +++ b/core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java @@ -134,7 +134,7 @@ public class MotorConfig extends JPanel { // Select ignition event //// Ignition at: - panel.add(new JLabel(trans.get("MotorCfg.lbl.Ignitionat")), ""); + panel.add(new JLabel(trans.get("MotorCfg.lbl.Ignitionat") + CommonStrings.dagger), ""); IgnitionConfiguration ignitionConfig = mount.getIgnitionConfiguration().getDefault(); combo = new JComboBox(new EnumModel(ignitionConfig, "IgnitionEvent")); @@ -152,6 +152,7 @@ public class MotorConfig extends JPanel { //// seconds panel.add(new JLabel(trans.get("MotorCfg.lbl.seconds")), "wrap unrel"); + panel.add(new StyledLabel(CommonStrings.override_description, -1), "spanx, wrap para"); // Check stage count @@ -165,13 +166,13 @@ public class MotorConfig extends JPanel { panel.add(new StyledLabel(trans.get("MotorCfg.lbl.longA1") + " " + trans.get("MotorCfg.lbl.longA2"), -1), - "spanx, right, wrap para"); + "spanx, wrap para"); } else { //// The current design has //// stages. panel.add(new StyledLabel(trans.get("MotorCfg.lbl.longB1") + " " + stages + " " + trans.get("MotorCfg.lbl.longB2"), -1), - "skip 1, spanx, wrap para"); + "spanx, wrap para"); } diff --git a/core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java index 2c89fd9b3..0f50a27e0 100644 --- a/core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java +++ b/core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java @@ -190,7 +190,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig { //// Deployment //// Deploys at: - panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Deploysat")), ""); + panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Deploysat") + CommonStrings.dagger), ""); DeploymentConfiguration deploymentConfig = parachute.getDeploymentConfiguration().getDefault(); combo = new JComboBox(new EnumModel(deploymentConfig, "DeployEvent")); @@ -209,7 +209,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig { panel.add(new JLabel(trans.get("ParachuteCfg.lbl.seconds")), "wrap paragraph"); // Altitude: - label = new JLabel(trans.get("ParachuteCfg.lbl.Altitude")); + label = new JLabel(trans.get("ParachuteCfg.lbl.Altitude") + CommonStrings.dagger); altitudeComponents.add(label); panel.add(label); @@ -226,6 +226,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig { altitudeComponents.add(slider); panel.add(slider, "w 100lp, wrap"); + panel.add(new StyledLabel(CommonStrings.override_description, -1), "spanx, wrap para"); primary.add(panel, "grow"); diff --git a/core/src/net/sf/openrocket/gui/configdialog/StageConfig.java b/core/src/net/sf/openrocket/gui/configdialog/StageConfig.java index 08e6a57b9..b1e868ec0 100644 --- a/core/src/net/sf/openrocket/gui/configdialog/StageConfig.java +++ b/core/src/net/sf/openrocket/gui/configdialog/StageConfig.java @@ -38,7 +38,7 @@ public class StageConfig extends RocketComponentConfig { JPanel panel = new JPanel(new MigLayout("fill")); // Select separation event - panel.add(new StyledLabel(trans.get("separation.lbl.title"), Style.BOLD), "spanx, wrap rel"); + panel.add(new StyledLabel(trans.get("separation.lbl.title") + CommonStrings.dagger, Style.BOLD), "spanx, wrap rel"); StageSeparationConfiguration config = stage.getStageSeparationConfiguration().getDefault(); JComboBox combo = new JComboBox(new EnumModel(config, "SeparationEvent")); @@ -55,6 +55,8 @@ public class StageConfig extends RocketComponentConfig { //// seconds panel.add(new JLabel(trans.get("separation.lbl.seconds")), "wrap unrel"); + panel.add(new StyledLabel(CommonStrings.override_description, -1), "spanx, wrap para"); + return panel; } diff --git a/core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java index cafb52dca..80a713c2b 100644 --- a/core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java +++ b/core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java @@ -192,7 +192,7 @@ public class StreamerConfig extends RecoveryDeviceConfig { //// Deployment //// Deploys at: - panel.add(new JLabel(trans.get("StreamerCfg.lbl.Deploysat")), ""); + panel.add(new JLabel(trans.get("StreamerCfg.lbl.Deploysat") + CommonStrings.dagger), ""); DeploymentConfiguration deploymentConfig = streamer.getDeploymentConfiguration().getDefault(); combo = new JComboBox(new EnumModel(deploymentConfig, "DeployEvent")); @@ -211,7 +211,7 @@ public class StreamerConfig extends RecoveryDeviceConfig { panel.add(new JLabel(trans.get("StreamerCfg.lbl.seconds")), "wrap paragraph"); // Altitude: - label = new JLabel(trans.get("StreamerCfg.lbl.Altitude")); + label = new JLabel(trans.get("StreamerCfg.lbl.Altitude") + CommonStrings.dagger); altitudeComponents.add(label); panel.add(label); @@ -228,6 +228,7 @@ public class StreamerConfig extends RecoveryDeviceConfig { altitudeComponents.add(slider); panel.add(slider, "w 100lp, wrap"); + panel.add(new StyledLabel(CommonStrings.override_description, -1), "skip 1, spanx, wrap para"); primary.add(panel, "grow");