nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaning up translation strings

Browse source
This commit is contained in:
Lars Brubaker 2021-12-20 12:19:32 -08:00
parent bc6e160493
commit e0a594abb2
10 changed files with 349 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/LoadFilamentWizard.cs
View file

@ -350,7 +350,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
yield return new WaitForTempPage(
this,
"Waiting For Printer To Heat".Localize(),
"Waiting for the hotend to heat to ".Localize() + targetHotendTemp + "°C.\n"
"Waiting for the hotend to heat to".Localize() + " " + targetHotendTemp + "°C.\n"
+ "This will ensure that filament is able to flow through the nozzle.".Localize() + "\n"
+ "\n"
+ "Warning! The tip of the nozzle will be HOT!".Localize() + "\n"

8
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/PrintLevelingWizard.cs
View file

@ -221,10 +221,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
if (targetBedTemp > 0 && targetHotendTemp > 0)
{
// heating both the bed and the hotend
heatingInstructions = "Waiting for the bed to heat to ".Localize() + targetBedTemp + "°C\n"
heatingInstructions = "Waiting for the bed to heat to".Localize() + " " + targetBedTemp + "°C\n"
+ "and the hotend to heat to ".Localize() + targetHotendTemp + "°C.\n"
+ "\n"
+ "This will improve the accuracy of print leveling ".Localize()
+ "This will improve the accuracy of print leveling".Localize() + " "
+ "and ensure that no filament is stuck to your nozzle.".Localize() + "\n"
+ "\n"
+ "Warning! The tip of the nozzle will be HOT!".Localize() + "\n"
@ -233,13 +233,13 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
else if (targetBedTemp > 0)
{
// only heating the bed
heatingInstructions = "Waiting for the bed to heat to ".Localize() + targetBedTemp + "°C.\n"
heatingInstructions = "Waiting for the bed to heat to".Localize() + " " + targetBedTemp + "°C.\n"
+ "This will improve the accuracy of print leveling.".Localize();
}
else // targetHotendTemp > 0
{
// only heating the hotend
heatingInstructions += "Waiting for the hotend to heat to ".Localize() + targetHotendTemp + "°C.\n"
heatingInstructions += "Waiting for the hotend to heat to".Localize() + " " + targetHotendTemp + "°C.\n"
+ "This will ensure that no filament is stuck to your nozzle.".Localize() + "\n"
+ "\n"
+ "Warning! The tip of the nozzle will be HOT!".Localize() + "\n"

2
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/UnloadFilamentWizard.cs
View file

@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
yield return new WaitForTempPage(
this,
"Waiting For Printer To Heat".Localize(),
(extruderCount > 1 ? "Waiting for hotend {0} to heat to ".Localize().FormatWith(extruderIndex + 1) : "Waiting for the hotend to heat to ".Localize()) + targetHotendTemp + "°C.\n"
(extruderCount > 1 ? "Waiting for hotend {0} to heat to".Localize().FormatWith(extruderIndex + 1) : "Waiting for the hotend to heat to".Localize()) + " " + targetHotendTemp + "°C.\n"
+ "This will ensure that filament is able to flow through the nozzle.".Localize() + "\n"
+ "\n"
+ "Warning! The tip of the nozzle will be HOT!".Localize() + "\n"

2
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/ZCalibrationWizard.cs
View file

@ -175,7 +175,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
yield return new WaitForTempPage(
this,
"Heating the printer".Localize(),
((extruderCount == 1) ? "Waiting for the hotend to heat to ".Localize() + temps[0] + "°C.\n" : "Waiting for the hotends to heat up.".Localize())
((extruderCount == 1) ? "Waiting for the hotend to heat to".Localize() + " " + temps[0] + "°C.\n" : "Waiting for the hotends to heat up.".Localize())
+ "This will ensure that no filament is stuck to your nozzle.".Localize() + "\n"
+ "\n"
+ "Warning! The tip of the nozzle will be HOT!".Localize() + "\n"

2
MatterControlLib/History/PrintHistoryEditor.cs
View file

@ -361,7 +361,7 @@ namespace MatterHackers.MatterControl.PrintHistory
AddSelection(menu, "Flooded Hot End".Localize());
AddSelection(menu, "Power Outage".Localize());
});
popupMenu.CreateSubMenu("Computer / MatterControl ".Localize(),
popupMenu.CreateSubMenu("Computer / MatterControl".Localize() + " ",
theme,
(menu) =>
{

4
MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs
View file

@ -386,11 +386,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var overlayMinusTargetRect = new CombinePaths(dimRegion, targetRect);
graphics.Render(overlayMinusTargetRect, new Color(Color.Black, alpha));
string toolTitle = string.Format("{0} {1}", "Tool ".Localize(), toolIndex + 1);
string toolTitle = string.Format("{0} {1}", "Tool".Localize(), toolIndex + 1);
if (toolIndex == 2)
{
toolTitle = "Tools ".Localize() + "1 & 2";
toolTitle = "Tools".Localize() + " 1 & 2";
}
var stringPrinter = new TypeFacePrinter(toolTitle, theme.DefaultFontSize, bold: true);