From f299b8082d667cada3fa1fea40046229a2d89067 Mon Sep 17 00:00:00 2001 From: Dan Royer Date: Thu, 24 Aug 2023 16:14:40 -0700 Subject: [PATCH] 7.40.3 even more missing translation solved --- pom.xml | 2 +- .../plottercontrols/CartesianButtons.java | 2 +- src/main/resources/languages/english.xml | 62 +++++++++++++++---- .../makelangelo/TranslationsMissingTest.java | 4 +- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 27b8ff3d1..def988c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.marginallyclever Makelangelo - 7.40.2 + 7.40.3 Makelangelo Makelangelo Software is a Java program that prepares art for CNC plotters. It is especially designed for the Makelangelo Robot. It pairs really well with Marlin-polargraph, the code in the brain of the robot that receives instructions and moves the motors. diff --git a/src/main/java/com/marginallyclever/makelangelo/plotter/plottercontrols/CartesianButtons.java b/src/main/java/com/marginallyclever/makelangelo/plotter/plottercontrols/CartesianButtons.java index 6b82b66df..b203b699d 100644 --- a/src/main/java/com/marginallyclever/makelangelo/plotter/plottercontrols/CartesianButtons.java +++ b/src/main/java/com/marginallyclever/makelangelo/plotter/plottercontrols/CartesianButtons.java @@ -111,7 +111,7 @@ private void assignDefaultLabels() { --v; } - labels[ZONE_CENTER] = Translator.get( "CartesianButtons.buttonCenter" ); + labels[ZONE_CENTER] = Translator.get("CartesianButtons.buttonCenter"); } @Override diff --git a/src/main/resources/languages/english.xml b/src/main/resources/languages/english.xml index 107e6c957..f6461a9b2 100644 --- a/src/main/resources/languages/english.xml +++ b/src/main/resources/languages/english.xml @@ -86,10 +86,7 @@ MenuLanguageTitleLanguage StartAtStart at RobotMakelangelo - RobotMenu.RenderStyleRender style - RobotMenu.OpenControlsOpen Controls - RobotMenu.SaveGCodeSave Gcode to file/SD - RobotMenu.GetTimeEstimateEstimate time + UpdateNoticeA new version of this software is available.
Please visit https://www.marginallyclever.com/product/makelangelo-software/ to get the new hotness.]]> UpToDateThis software is up to date. UpdateCheckFailedSorry, I failed. Please visit http://www.marginallyclever.com/ to check yourself. @@ -111,6 +108,7 @@ SierpinskiTriangleNameSierpinski triangle fractal Converter_VoronoiStippling.NameVoronoi stipples VoronoiZigZagNameVoronoi zigzag + Converter_Voronoi.NameVoronoi diagram Converter_VoronoiStippling.CellCountNumber of cells Converter_VoronoiStippling.DotMaxMax dot size @@ -256,26 +254,23 @@ LogPanel.LogFilesLog files LogPanel.TitleLog LogPanel.CopyClipboardCopy - PlotterSettings.zMotorTypeZ axis type - PlotterSettings.zMotorType.servoServo - PlotterSettings.zMotorType.stepperStepper QuestionTitleQuestion InfoTitleInformation ErrorTitleError MenuItemPayPalDonationPayPal donation - PlotterSettingsPanel.TitlePlotter settings - PlotterSettingsPanel.TabEssentialEssential - PlotterSettingsPanel.TabPenPen - PlotterSettingsPanel.TabSimulationSimulation + TurtleGenerators.LearnMore.Link.TextLearn more LoadScratch3.foreverNotAllowedForever loops are forever forbidden. SaveGCode.splitGCodeTitleMany colors detected + Converter_CMYK_Circles.nameCMYK circles Converter_CMYK_Circles.maxCircleSizemax circle size + Converter_EdgeDetection.nameEdge detection Converter_EdgeDetection.passesPasses Converter_EdgeDetection.stepSizeStep size Converter_EdgeDetection.sampleSizeSampleSize + Generator_FlowField.nameFlow field Generator_FlowField.scaleXX scale Generator_FlowField.scaleYY scale @@ -287,21 +282,56 @@ Generator_FlowField.fromEdgeContinuous Generator_FlowField.rightAngleAdd orthogonal lines Generator_FlowField.noiseTypeNoise type + VoronoiZigZag.optimizePathOptimize path Generator_GridFit.NameGrid fit Generator_GridFit.marginMinimum margin each side (mm) Generator_GridFit.cellsWideCells horizontal Generator_GridFit.cellsHighCells vertical PlotterSettingsUserGcodePanel.TitleCustom GCode + + PlotterSettings.zMotorTypeZ axis type + PlotterSettings.zMotorType.servoServo + PlotterSettings.zMotorType.stepperStepper PlotterSettings.userGeneralStartGcodeStart GCode PlotterSettings.userGeneralEndGcodeEnd GCode + PlotterSettings.minimumPlannerSpeedMin Planner Speed (mm/s) + PlotterSettings.blockBufferSizeBlock Buffer Size + PlotterSettings.segmentsPerSecondSegments Per Second + PlotterSettings.minSegmentLengthMin Segment Length (mm) + PlotterSettings.minSegTimeMin Seg Time (ns) + PlotterSettings.handleSmallSegmentsHandle Small Segments + PlotterSettings.minAccelerationMin Acceleration (mm/s²) + + PlotterSettingsPanel.TitlePlotter settings + PlotterSettingsPanel.TabEssentialEssential + PlotterSettingsPanel.TabPenPen + PlotterSettingsPanel.TabSimulationSimulation + PlotterSettingsPanel.MachineWidthMachine width (mm) + PlotterSettingsPanel.MachineHeightMachine height (mm) + PlotterSettingsPanel.ServoLengthNeededServo wire length (m) + PlotterSettingsPanel.StepperLengthNeededStepper wire length (m,each) + PlotterSettingsPanel.BeltLengthNeededTiming belt length (m,each) + PlotterSettingsPanel.penToolDiameterDiameter (mm) + PlotterSettingsPanel.penToolMaxFeedRateTravel speed (mm/min) + PlotterSettingsPanel.penToolUpUp angle (degrees) + PlotterSettingsPanel.penToolDownDown angle (degrees) + PlotterSettingsPanel.penToolLiftSpeedPen lift time (ms) + PlotterSettingsPanel.penToolLowerSpeedPen lower time (ms) + PlotterSettingsPanel.SpeedDraw speed (mm/min) + PlotterSettingsPanel.AdjustAccelerationAcceleration (mm/s²) + PlotterSettingsPanel.pen up colorUp color + PlotterSettingsPanel.pen down colorDefault down color + PlotterSettingsManagerPanel.RemoveProfile- PlotterSettingsManagerPanel.AddProfile+ PlotterSettingsManagerPanel.NewProfileNameNew unique name: PlotterSettingsManagerPanel.NewProfileNameAlreadyExistsName already in use. Try again! PlotterSettingsManagerPanel.NewProfileNameCannotBeBlankName cannot be blank. Try again! - FirmwareUploaderPanel.statusFirmware upload status + FirmwareUploader.helphelp]]> + + FirmwareUploaderPanel.statusFirmware upload status FirmwareUploaderPanel.startM5M5 FirmwareUploaderPanel.startHugeHuge FirmwareUploaderPanel.avrdudeNotDownloadedAVRDude not downloaded. @@ -334,6 +364,12 @@ PlotterControls.homeXYFirstHome the printer first. PlotterControls.StepStep + RobotMenu.RobotStyleRobot style + RobotMenu.RenderStyleRender style + RobotMenu.OpenControlsOpen Controls + RobotMenu.SaveGCodeSave Gcode to file/SD + RobotMenu.GetTimeEstimateEstimate time + JogInterface.FindHomeHome JogInterface.PenUpPen up JogInterface.PenDownPen down @@ -343,4 +379,6 @@ ConversationHistory.ClearClear ConversationHistory.SaveSave ConversationHistory.CopyCopy + + CartesianButtons.buttonCenter diff --git a/src/test/java/com/marginallyclever/makelangelo/TranslationsMissingTest.java b/src/test/java/com/marginallyclever/makelangelo/TranslationsMissingTest.java index 2402b53c4..311340de2 100644 --- a/src/test/java/com/marginallyclever/makelangelo/TranslationsMissingTest.java +++ b/src/test/java/com/marginallyclever/makelangelo/TranslationsMissingTest.java @@ -26,8 +26,8 @@ public class TranslationsMissingTest { private static final Logger logger = LoggerFactory.getLogger(TranslationsMissingTest.class); - private Pattern patternComment = Pattern.compile("^\\s*//.*"); - private Pattern patternTranslator = Pattern.compile("Translator\\s*\\.\\s*get\\s*\\(\"(?[^)]*)\"\\)"); + private final Pattern patternComment = Pattern.compile("^\\s*//.*"); + private final Pattern patternTranslator = Pattern.compile("Translator\\s*\\.\\s*get\\s*\\(\\s*\"(?[^)]*)\"\\s*\\)"); public static class TranslationFileSearcher { public final String key;