diff --git a/src/main/java/com/marginallyclever/robotoverlord/swing/actions/AboutAction.java b/src/main/java/com/marginallyclever/robotoverlord/swing/actions/AboutAction.java
index 23f302fe5..fb45181d0 100644
--- a/src/main/java/com/marginallyclever/robotoverlord/swing/actions/AboutAction.java
+++ b/src/main/java/com/marginallyclever/robotoverlord/swing/actions/AboutAction.java
@@ -28,19 +28,10 @@ public AboutAction(Component parent) {
*/
@Override
public void actionPerformed(ActionEvent e) {
+ Window ancestor = parent==null? null : SwingUtilities.getWindowAncestor(parent);
JOptionPane.showMessageDialog(
- SwingUtilities.getWindowAncestor(parent),
- "
"
- +""+RobotOverlord.APP_TITLE+" "+RobotOverlord.VERSION+"
"
- +""
- +"Created by
"
- +"Dan Royer (dan@marginallyclever.com).
"
- +"Testers
"
- +"Omar al rafei (Arc robotics)
"
- +"More info
"
- +"To get the latest version please visit
"+RobotOverlord.APP_URL+"
"
- +"This program is open source and free. If this was helpful
to you, please buy me a thank you beer through Paypal.
"
- +"");
+ ancestor,
+ Translator.get("AboutAction.message",RobotOverlord.VERSION));
}
/**
@@ -48,6 +39,7 @@ public void actionPerformed(ActionEvent e) {
* @param args ignored
*/
public static void main(String[] args) {
+ Translator.start();
new AboutAction(null).actionPerformed(null);
}
}
diff --git a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ColorParameterEdit.java b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ColorParameterEdit.java
index 29d81f050..d411b938f 100644
--- a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ColorParameterEdit.java
+++ b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ColorParameterEdit.java
@@ -33,7 +33,7 @@ public ColorParameterEdit(ColorParameter entity, double [] newValue) {
@Override
public String getPresentationName() {
- return Translator.get("change ")+entity.getName();
+ return Translator.get("Change",entity.getName());
}
@Override
diff --git a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComboBoxEdit.java b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComboBoxEdit.java
index c1701b7af..0e8efa011 100644
--- a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComboBoxEdit.java
+++ b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComboBoxEdit.java
@@ -32,7 +32,7 @@ public ComboBoxEdit(IntParameter e, String label, int newValue) {
@Override
public String getPresentationName() {
- return Translator.get("change ")+label;
+ return Translator.get("Change",label);
}
@Override
diff --git a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComponentAddEdit.java b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComponentAddEdit.java
index 1db20e313..e7dce0126 100644
--- a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComponentAddEdit.java
+++ b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/ComponentAddEdit.java
@@ -18,9 +18,6 @@
*
*/
public class ComponentAddEdit extends AbstractUndoableEdit {
- @Serial
- private static final long serialVersionUID = 1L;
-
private final Entity entity;
private final Component component;
private final List existingDependencies = new ArrayList<>();
@@ -40,7 +37,7 @@ public ComponentAddEdit(ComponentManagerPanel componentManagerPanel, Entity enti
@Override
public String getPresentationName() {
- return Translator.get("Add ")+entity.getName();
+ return Translator.get("Add",entity.getName());
}
@Override
diff --git a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/EntityAddEdit.java b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/EntityAddEdit.java
index 2800e8570..a313d6e4a 100644
--- a/src/main/java/com/marginallyclever/robotoverlord/swing/edits/EntityAddEdit.java
+++ b/src/main/java/com/marginallyclever/robotoverlord/swing/edits/EntityAddEdit.java
@@ -32,7 +32,7 @@ public EntityAddEdit(EntityManager entityManager, Entity parent, Entity child) {
@Override
public String getPresentationName() {
- return Translator.get("Add ")+ child.getName();
+ return Translator.get("Add",child.getName());
}
@Override
diff --git a/src/main/java/com/marginallyclever/robotoverlord/swing/translator/TranslatorLanguage.java b/src/main/java/com/marginallyclever/robotoverlord/swing/translator/TranslatorLanguage.java
index 2e1dff6ee..5a54dd6a7 100644
--- a/src/main/java/com/marginallyclever/robotoverlord/swing/translator/TranslatorLanguage.java
+++ b/src/main/java/com/marginallyclever/robotoverlord/swing/translator/TranslatorLanguage.java
@@ -14,6 +14,7 @@
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
/**
* A collection of strings for a single translation of the application.
@@ -149,4 +150,9 @@ public String getName() {
public String getAuthor() {
return author;
}
+
+ public Set getKeys() {
+ // return a copy of strings
+ return strings.keySet();
+ }
}
diff --git a/src/main/resources/languages/english.xml b/src/main/resources/languages/english.xml
index 6e77c539b..fe6b2edeb 100644
--- a/src/main/resources/languages/english.xml
+++ b/src/main/resources/languages/english.xml
@@ -6,273 +6,43 @@
Dan Royer (dan@marginallyclever.com)
- DXFScaleOnLoadScale image to fit paper
- DXFInfillOnLoadFill in closed areas
-
- ChangeChange
- AddAdd
- RemoveRemove
- MoveMove
- ChooseChoose
+ ChangeChange %1
+ AddAdd %1
+ SelectSelect
CancelCancel
SaveSave
- LoadLoad
- CouldNotFindCould not find
-
- MachineWidthMachine width
- MachineHeightMachine height
-
- PaperWidthPaper width
- PaperHeightPaper height
- isLandscapeIs landscape?
- GoPaperBorderBorder
-
- InvertLeftInvert left
- InvertRightInvert right
- ToolTypeTool type
-
- PaperSizePaper Size
- AdjustPulleySizePulley diameter
- AdjustAccelerationAcceleration
-
- LeftLeft
- RightRight
- Millimetersmm
-
- ConnectingToConnecting to
- PortNotConfiguredPort could not be configured:
- PortOpenedPort opened.
- TitlePrefixMakelangelo
- TitlePostfix connected
-
- LineSegments line segments.
- Centimeterscm
-
- EstimatedTimeEstimated draw time:
-
- LoadErrorFile could not be loaded:
- SaveErrorFile could not be saved:
-
- ConversionOptionsConversion options
- FlipForGlassFlip for glass
-
- StartStart
-
- PaperMarginMargin (%)
- ConvertingConverting
- FinishedCompleted
- CancelledCancelled
- FailedFailed:
- ConversionStyleConversion style
-
- OpeningFileOpening
- UnknownFileTypeUnknown file type
- SetPaperSizePlease set a paper size before importing an image.
-
- FileTypeGCodeGCODE (ngc)
- FileTypeImageImage (jpg/bmp/png/gif)
- FileTypeDXFDXF R12 for map data (dxf)
- FileTypeSVGScaleable Vector Graphics 1.1 (svg)
-
- MenuDriveControlsManual Driving
- MenuCreativeControlCreative control
- MenuAnimateAnimation control
-
MenuSoundsTitleSounds
MenuSoundsConnectConnect
MenuSoundsDisconnectDisconnect
MenuSoundsFinishConvertFinish converting
MenuSoundsFinishDrawFinish drawing
- MenuGraphicsTitleGraphics
- MenuGraphicsPenUpShow pen up moves
- MenuGraphicsAntialiasAntialias lines
- MenuGraphicsSpeedVSQualitySpeed over quality
- MenuGraphicsDrawWhileRunningShow entire image while drawing
-
- MenuResetMachinePreferencesReset Preferences
- MenuLanguageTitleLanguage
-
- InvalidToolRequested invalid tool #
- ChangeToolPrefixPlease prepare
- ChangeToolPostfix and click any button to continue.
-
- StartAtStart at
- StartAtLineStart at line #
-
- PausePause
- UnpauseUnpause
-
- SetHomeSet home
- GoHomeGo home
- FindHomeFind home
-
- TopTop
- BottomBottom
- PenUpPen up
- PenDownPen down
-
- SetSet
- SpeedSpeed:
- Ratesteps/min
-
- JogMotorsMotors
- JogInIN
- JogOutOUT
- InvertInvert
-
- UpdateNoticeA new version of this software is available.
Please visit https://www.marginallyclever.com/products/robot-overlord/ to get the new hotness.