diff --git a/AboutPage/CheckForUpdatesPage.cs b/AboutPage/CheckForUpdatesPage.cs index 76bdb4a23..73a1d8e1a 100644 --- a/AboutPage/CheckForUpdatesPage.cs +++ b/AboutPage/CheckForUpdatesPage.cs @@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.AboutPage additionalInfoContainer.HAnchor = HAnchor.Stretch; additionalInfoContainer.Padding = new BorderDouble(left: 6, top: 6); - string aboutUpdateChannel = "Changing your update channel will change the version of MatterControl that you receive when updating:".Localize(); + string aboutUpdateChannel = "Changing your update channel will change the version of MatterControl that you receive when updating".Localize() + ":"; var updateChannelLabel = new WrappedTextWidget(aboutUpdateChannel); updateChannelLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor; updateChannelLabel.HAnchor = HAnchor.Stretch; diff --git a/CustomWidgets/ExportPrintItemPage.cs b/CustomWidgets/ExportPrintItemPage.cs index 0f274e929..1d9eb13cf 100644 --- a/CustomWidgets/ExportPrintItemPage.cs +++ b/CustomWidgets/ExportPrintItemPage.cs @@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl public ExportPrintItemPage(IEnumerable libraryItems) { this.WindowTitle = "Export File".Localize(); - this.HeaderText = "Export selection to:".Localize(); + this.HeaderText = "Export selection to".Localize() + ":"; this.libraryItems = libraryItems; this.Name = "Export Item Window"; diff --git a/EeProm/EePromMarlinWindow.cs b/EeProm/EePromMarlinWindow.cs index 1ec094ae5..6c24a9ea4 100644 --- a/EeProm/EePromMarlinWindow.cs +++ b/EeProm/EePromMarlinWindow.cs @@ -136,42 +136,42 @@ namespace MatterHackers.MatterControl.EeProm conterContent.Padding = new BorderDouble(top: 3); conterContent.Margin = new BorderDouble(top: topBarHeight); - conterContent.AddChild(Create4FieldSet("Steps per mm:".Localize(), + conterContent.AddChild(Create4FieldSet("Steps per mm".Localize() + ":", "X:", ref stepsPerMmX, "Y:", ref stepsPerMmY, "Z:", ref stepsPerMmZ, "E:", ref stepsPerMmE)); - conterContent.AddChild(Create4FieldSet("Maximum feedrates [mm/s]:".Localize(), + conterContent.AddChild(Create4FieldSet("Maximum feedrates [mm/s]".Localize() + ":", "X:", ref maxFeedrateMmPerSX, "Y:", ref maxFeedrateMmPerSY, "Z:", ref maxFeedrateMmPerSZ, "E:", ref maxFeedrateMmPerSE)); - conterContent.AddChild(Create4FieldSet("Maximum Acceleration [mm/s²]:".Localize(), + conterContent.AddChild(Create4FieldSet("Maximum Acceleration [mm/s²]".Localize() + ":", "X:", ref maxAccelerationMmPerSSqrdX, "Y:", ref maxAccelerationMmPerSSqrdY, "Z:", ref maxAccelerationMmPerSSqrdZ, "E:", ref maxAccelerationMmPerSSqrdE)); - conterContent.AddChild(CreateField("Acceleration:".Localize(), ref acceleration)); - conterContent.AddChild(CreateField("Retract Acceleration:".Localize(), ref retractAcceleration)); + conterContent.AddChild(CreateField("Acceleration".Localize() + ":", ref acceleration)); + conterContent.AddChild(CreateField("Retract Acceleration".Localize() + ":", ref retractAcceleration)); - conterContent.AddChild(Create3FieldSet("PID settings:".Localize(), + conterContent.AddChild(Create3FieldSet("PID settings".Localize() + ":", "P:", ref pidP, "I:", ref pidI, "D:", ref pidD)); - conterContent.AddChild(Create3FieldSet("Homing Offset:".Localize(), + conterContent.AddChild(Create3FieldSet("Homing Offset".Localize() + ":", "X:", ref homingOffsetX, "Y:", ref homingOffsetY, "Z:", ref homingOffsetZ)); - conterContent.AddChild(CreateField("Min feedrate [mm/s]:".Localize(), ref minFeedrate)); - conterContent.AddChild(CreateField("Min travel feedrate [mm/s]:".Localize(), ref minTravelFeedrate)); - conterContent.AddChild(CreateField("Minimum segment time [ms]:".Localize(), ref minSegmentTime)); - conterContent.AddChild(CreateField("Maximum X-Y jerk [mm/s]:".Localize(), ref maxXYJerk)); - conterContent.AddChild(CreateField("Maximum Z jerk [mm/s]:".Localize(), ref maxZJerk)); + conterContent.AddChild(CreateField("Min feedrate [mm/s]".Localize() + ":", ref minFeedrate)); + conterContent.AddChild(CreateField("Min travel feedrate [mm/s]".Localize() + ":", ref minTravelFeedrate)); + conterContent.AddChild(CreateField("Minimum segment time [ms]".Localize() + ":", ref minSegmentTime)); + conterContent.AddChild(CreateField("Maximum X-Y jerk [mm/s]".Localize() + ":", ref maxXYJerk)); + conterContent.AddChild(CreateField("Maximum Z jerk [mm/s]".Localize() + ":", ref maxZJerk)); GuiWidget topBottomSpacer = new GuiWidget(1, 1); topBottomSpacer.VAnchor = VAnchor.Stretch; diff --git a/History/PrintHistoryListItem.cs b/History/PrintHistoryListItem.cs index 1fa27de04..0b0ac8d45 100644 --- a/History/PrintHistoryListItem.cs +++ b/History/PrintHistoryListItem.cs @@ -335,7 +335,7 @@ namespace MatterHackers.MatterControl.PrintHistory string end = maxLengthName.Substring(maxLengthName.Length - amountRemaining, amountRemaining); maxLengthName = start + end; } - string notFoundMessage = "Oops! Could not find this file:".Localize(); + string notFoundMessage = "Oops! Could not find this file".Localize() + ":"; string message = "{0}:\n'{1}'".FormatWith(notFoundMessage, maxLengthName); string titleLabel = "Item not Found".Localize(); StyledMessageBox.ShowMessageBox(onConfirmRemove, message, titleLabel, StyledMessageBox.MessageType.OK); diff --git a/PrinterControls/PrinterConnections/ShowAuthPanel.cs b/PrinterControls/PrinterConnections/ShowAuthPanel.cs index 8dbdedee2..e4de92c0e 100644 --- a/PrinterControls/PrinterConnections/ShowAuthPanel.cs +++ b/PrinterControls/PrinterConnections/ShowAuthPanel.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { this.WindowTitle = "Setup Wizard".Localize(); - WrappedTextWidget userSignInPromptLabel = new WrappedTextWidget("Sign in to access your cloud printer profiles.\n\nOnce signed in you will be able to access:".Localize()) + WrappedTextWidget userSignInPromptLabel = new WrappedTextWidget("Sign in to access your cloud printer profiles.\n\nOnce signed in you will be able to access".Localize() + ":") { TextColor = ActiveTheme.Instance.PrimaryTextColor, }; diff --git a/SetupWizard/AndroidConnectDevicePage.cs b/SetupWizard/AndroidConnectDevicePage.cs index 8d17fe974..6040b47ee 100644 --- a/SetupWizard/AndroidConnectDevicePage.cs +++ b/SetupWizard/AndroidConnectDevicePage.cs @@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl }; contentRow.AddChild(printerNameLabel); - contentRow.AddChild(new TextWidget("Instructions:".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor)); + contentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor)); contentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor)); contentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor)); contentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor)); diff --git a/SetupWizard/CopyGuestProfilesToUser.cs b/SetupWizard/CopyGuestProfilesToUser.cs index 2e19aca18..ecf0cf0b1 100644 --- a/SetupWizard/CopyGuestProfilesToUser.cs +++ b/SetupWizard/CopyGuestProfilesToUser.cs @@ -72,7 +72,7 @@ namespace MatterHackers.MatterControl var guest = ProfileManager.Load("guest"); if (guest?.Profiles.Count > 0) { - container.AddChild(new TextWidget("Printers to Copy:".Localize()) + container.AddChild(new TextWidget("Printers to Copy".Localize() + ":") { TextColor = ActiveTheme.Instance.PrimaryTextColor, Margin = new BorderDouble(0, 3, 0, 15), diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs b/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs index 5e1d89e67..be8b43062 100644 --- a/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs +++ b/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs @@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration }; // Add label - topRow.AddChild(new TextWidget("Preset Name:".Localize(), pointSize: 14) + topRow.AddChild(new TextWidget("Preset Name".Localize() + ":", pointSize: 14) { TextColor = ActiveTheme.Instance.PrimaryTextColor, VAnchor = VAnchor.Center, diff --git a/TextCreator/Text/TextEditor.cs b/TextCreator/Text/TextEditor.cs index 4ea2013f7..f8214e47e 100644 --- a/TextCreator/Text/TextEditor.cs +++ b/TextCreator/Text/TextEditor.cs @@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator textToAddWidget.ActualTextEditWidget.EnterPressed += (s, e) => RebuildText(textToAddWidget.Text); container.AddChild(textToAddWidget); - var spacingScrollBar = theme.CreateSolidSlider(container, "Spacing:".Localize(), .5, 1); + var spacingScrollBar = theme.CreateSolidSlider(container, "Spacing".Localize() + ":", .5, 1); spacingScrollBar.Value = injectedItem.Spacing; spacingScrollBar.ValueChanged += (sender, e) => {