diff --git a/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs b/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs index 3d90db928..e6e3bfbeb 100644 --- a/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs +++ b/MatterControlLib/DesignTools/Operations/Image/ImageToPathObject3D_2.cs @@ -341,7 +341,7 @@ namespace MatterHackers.MatterControl.DesignTools CopyNewImageData(); await Rebuild(); - this.ReloadEditorPannel(); + this.ReloadEditorPanel(); } else if ((invalidateArgs.InvalidateType.HasFlag(InvalidateType.Properties) && invalidateArgs.Source == this)) { diff --git a/MatterControlLib/DesignTools/Operations/Object3DExtensions.cs b/MatterControlLib/DesignTools/Operations/Object3DExtensions.cs index 8e7044d31..890314c61 100644 --- a/MatterControlLib/DesignTools/Operations/Object3DExtensions.cs +++ b/MatterControlLib/DesignTools/Operations/Object3DExtensions.cs @@ -161,7 +161,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations return null; } - public static void ReloadEditorPannel(this IObject3D object3D) + public static void ReloadEditorPanel(this IObject3D object3D) { // de-select and select this object var scene = object3D.ContainingScene(); diff --git a/MatterControlLib/DesignTools/Operations/PartSettingsObject3D.cs b/MatterControlLib/DesignTools/Operations/PartSettingsObject3D.cs index be8f1a98e..b70d9eda4 100644 --- a/MatterControlLib/DesignTools/Operations/PartSettingsObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/PartSettingsObject3D.cs @@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations if (containingPrinter.Bed.Scene.SelectedItem == this) { - // refresh the properties pannel by unselecting and selecting + // refresh the properties panel by unselecting and selecting containingPrinter.Bed.Scene.SelectedItem = null; containingPrinter.Bed.Scene.SelectedItem = this; } diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs index 03db513a9..9f0d4cace 100644 --- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs +++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs @@ -197,7 +197,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow editorSectionWidget.Text = editorTitle; // show any variables that are on the scene - // and return before showing a properties pannel for the selected part (no selection) + // and return before showing a properties panel for the selected part (no selection) return; } diff --git a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs index c834cc2f1..7c613b157 100644 --- a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs +++ b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs @@ -72,11 +72,11 @@ namespace MatterHackers.MatterControl settingsAreaScrollBox.AddChild(settingsColumn); } - AddGeneralPannel(settingsColumn); + AddGeneralPanel(settingsColumn); - AddUsserOptionsPannel(settingsColumn); + AddUsserOptionsPanel(settingsColumn); - AddAdvancedPannel(settingsColumn); + AddAdvancedPanel(settingsColumn); // Enforce consistent SectionWidget spacing and last child borders foreach (var section in settingsColumn.Children()) @@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl } } - private void AddGeneralPannel(GuiWidget settingsColumn) + private void AddGeneralPanel(GuiWidget settingsColumn) { var generalPanel = new FlowLayoutWidget(FlowDirection.TopToBottom) { @@ -304,7 +304,7 @@ namespace MatterHackers.MatterControl theme.ApplyBoxStyle(themeSection); } - private void AddAdvancedPannel(GuiWidget settingsColumn) + private void AddAdvancedPanel(GuiWidget settingsColumn) { var advancedPanel = new FlowLayoutWidget(FlowDirection.TopToBottom); @@ -439,7 +439,7 @@ namespace MatterHackers.MatterControl advancedPanel.Children().First().Border = new BorderDouble(0, 1); } - private void AddUsserOptionsPannel(GuiWidget settingsColumn) + private void AddUsserOptionsPanel(GuiWidget settingsColumn) { var optionsPanel = new FlowLayoutWidget(FlowDirection.TopToBottom); diff --git a/MatterControlLib/SettingsManagement/UpdateSettingsPage.cs b/MatterControlLib/SettingsManagement/UpdateSettingsPage.cs index 19e8bd32c..dce868817 100644 --- a/MatterControlLib/SettingsManagement/UpdateSettingsPage.cs +++ b/MatterControlLib/SettingsManagement/UpdateSettingsPage.cs @@ -79,7 +79,7 @@ namespace MatterHackers.MatterControl if (ProfileManager.GetOemSettingsNeedingUpdate(printer).Any()) { - AddUpgradeInfoPannel(settingsColumn); + AddUpgradeInfoPanel(settingsColumn); } else { @@ -108,7 +108,7 @@ namespace MatterHackers.MatterControl } } - private async void AddUpgradeInfoPannel(GuiWidget generalPanel) + private async void AddUpgradeInfoPanel(GuiWidget generalPanel) { var make = printer.Settings.GetValue(SettingsKey.make); var model = printer.Settings.GetValue(SettingsKey.model); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 1d9b24d73..9668eada8 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -1447,6 +1447,9 @@ Translated:Done English:Down Arrow Translated:Down Arrow +English:Download current parts data +Translated:Download current parts data + English:Download Now Translated:Download Now @@ -4210,6 +4213,9 @@ Translated:Reloading English:Remind Me Later Translated:Remind Me Later +English:Remote Server +Translated:Remote Server + English:remove Translated:remove @@ -5224,6 +5230,21 @@ Translated:Sync Complete English:Sync Dashboard Translated:Sync Dashboard +English:Sync data +Translated:Sync data + +English:Sync Data +Translated:Sync Data + +English:Sync farm data +Translated:Sync farm data + +English:Sync From Remote Server +Translated:Sync From Remote Server + +English:Sync in progress +Translated:Sync in progress + English:Sync Printers Translated:Sync Printers diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ce7df9c32..7a3b1595d 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ce7df9c320de6092b8e53b7e81d77ed2efb60e75 +Subproject commit 7a3b1595df43d39fd1a0e66249a3d2cb9608052b