Some small text updates.

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 2a8915e6648131402c6bfb855368f25b7bd21c51..bd08dc983a0a2f3d5c4dddb8e2e53c08fd6f5ebe 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -114,7 +114,7 @@ class mainWindow(configBase.configWindowBase):
                
                helpMenu = wx.Menu()
                i = helpMenu.Append(-1, 'Online documentation...')
-               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://daid.github.com/Cura'), i)
+               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('http://daid.github.com/Cura'), i)
                i = helpMenu.Append(-1, 'Report a problem...')
                self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://github.com/daid/Cura/issues'), i)
                menubar.Append(helpMenu, 'Help')
@@ -135,7 +135,7 @@ class mainWindow(configBase.configWindowBase):
                
                (left, right) = self.CreateConfigTab(nb, 'Print config')
                
-               configBase.TitleRow(left, "Accuracy")
+               configBase.TitleRow(left, "Quality")
                c = configBase.SettingRow(left, "Layer height (mm)", 'layer_height', '0.2', 'Layer height in millimeters.\n0.2 is a good value for quick prints.\n0.1 gives high quality prints.')
                validators.validFloat(c, 0.0001)
                validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 80.0 / 100.0), "Thicker layers then %.2fmm (80%% nozzle size) usually give bad results and are not recommended.")
@@ -196,7 +196,7 @@ class mainWindow(configBase.configWindowBase):
                configBase.settingNotify(c, self.preview3d.updateCenterY)
 
                configBase.TitleRow(left, "Retraction")
-               c = configBase.SettingRow(left, "Minimal travel (mm)", 'retraction_min_travel', '5.0', 'Minimal amount of travel needed for a retraction to happen at all. To make sure you do not get a lot of retractions in a small area')
+               c = configBase.SettingRow(left, "Minimum travel (mm)", 'retraction_min_travel', '5.0', 'Minimum amount of travel needed for a retraction to happen at all. To make sure you do not get a lot of retractions in a small area')
                validators.validFloat(c, 0.0)
                c = configBase.SettingRow(left, "Speed (mm/s)", 'retraction_speed', '40.0', 'Speed at which the filament is retracted, a higher retraction speed works better. But a very high retraction speed can lead to filament grinding.')
                validators.validFloat(c, 0.1)
@@ -219,11 +219,11 @@ class mainWindow(configBase.configWindowBase):
                validators.validFloat(c, 0.0)
                c = configBase.SettingRow(right, "Enable cooling fan", 'fan_enabled', True, 'Enable the cooling fan during the print. The extra cooling from the cooling fan is essensial during faster prints.')
 
-               configBase.TitleRow(right, "Accuracy")
+               configBase.TitleRow(right, "Quality")
                c = configBase.SettingRow(right, "Initial layer thickness (mm)", 'bottom_thickness', '0.0', 'Layer thickness of the bottom layer. A thicker bottom layer makes sticking to the bed easier. Set to 0.0 to have the bottom layer thickness the same as the other layers.')
                validators.validFloat(c, 0.0)
                validators.warningAbove(c, lambda : (float(profile.getProfileSetting('nozzle_size')) * 3.0 / 4.0), "A bottom layer of more then %.2fmm (3/4 nozzle size) usually give bad results and is not recommended.")
-               c = configBase.SettingRow(right, "Enable 'skin'", 'enable_skin', False, 'Skin prints the outer lines of the prints twice, each time with half the thickness. This gives the illusion of a higher print quality.')
+               c = configBase.SettingRow(right, "Duplicate outlines", 'enable_skin', False, 'Skin prints the outer lines of the prints twice, each time with half the thickness. This gives the illusion of a higher print quality.')
 
                #Plugin page
                self.pluginPanel = pluginPanel.pluginPanel(nb)
@@ -237,7 +237,7 @@ class mainWindow(configBase.configWindowBase):
                nb.AddPage(self.alterationPanel, "Start/End-GCode")
 
                # load and slice buttons.
-               loadButton = wx.Button(self, -1, '&Load Model')
+               loadButton = wx.Button(self, -1, '&Load model')
                sliceButton = wx.Button(self, -1, 'P&repare print')
                printButton = wx.Button(self, -1, '&Print')
                self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(1), loadButton)

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index fcd1fbbe4c6fa3f27cd815bd4b2d0230fbea1a4d..da41b3e7f4e031f9cb114177db43c6b0135d848f 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -22,11 +22,11 @@ class preferencesDialog(configBase.configWindowBase):
                configBase.TitleRow(left, 'Machine settings')\r
                c = configBase.SettingRow(left, 'Steps per E', 'steps_per_e', '0', 'Amount of steps per mm filament extrusion', type = 'preference')\r
                validators.validFloat(c, 0.1)\r
-               c = configBase.SettingRow(left, 'Machine width (mm)', 'machine_width', '205', 'Size of the machine in mm', type = 'preference')\r
+               c = configBase.SettingRow(left, 'Maximum width (mm)', 'machine_width', '205', 'Size of the machine in mm', type = 'preference')\r
                validators.validFloat(c, 10.0)\r
-               c = configBase.SettingRow(left, 'Machine depth (mm)', 'machine_depth', '205', 'Size of the machine in mm', type = 'preference')\r
+               c = configBase.SettingRow(left, 'Maximum depth (mm)', 'machine_depth', '205', 'Size of the machine in mm', type = 'preference')\r
                validators.validFloat(c, 10.0)\r
-               c = configBase.SettingRow(left, 'Machine height (mm)', 'machine_height', '200', 'Size of the machine in mm', type = 'preference')\r
+               c = configBase.SettingRow(left, 'Maximum height (mm)', 'machine_height', '200', 'Size of the machine in mm', type = 'preference')\r
                validators.validFloat(c, 10.0)\r
                c = configBase.SettingRow(left, 'Extruder count', 'extruder_amount', ['1', '2', '3', '4'], 'Amount of extruders in your machine.', type = 'preference')\r
                c = configBase.SettingRow(left, 'Heated bed', 'has_heated_bed', False, 'If you have an heated bed, this enabled heated bed settings', type = 'preference')\r
@@ -44,11 +44,11 @@ class preferencesDialog(configBase.configWindowBase):
                        c = configBase.SettingRow(left, 'Model colour (%d)' % (i+1), 'model_colour%d' % (i+1), wx.Colour(0,0,0), '', type = 'preference')\r
 \r
                configBase.TitleRow(right, 'Filament settings')\r
-               c = configBase.SettingRow(right, 'Filament density (kg/m3)', 'filament_density', '1300', 'Weight of the filament per m3. Around 1300 for PLA. And around 1040 for ABS. This value is used to estimate the weight if the filament used for the print.', type = 'preference')\r
+               c = configBase.SettingRow(right, 'Density (kg/m3)', 'filament_density', '1300', 'Weight of the filament per m3. Around 1300 for PLA. And around 1040 for ABS. This value is used to estimate the weight if the filament used for the print.', type = 'preference')\r
                validators.validFloat(c, 500.0, 3000.0)\r
-               c = configBase.SettingRow(right, 'Filament cost (price/kg)', 'filament_cost_kg', '0', 'Cost of your filament per kg, to estimate the cost of the final print.', type = 'preference')\r
+               c = configBase.SettingRow(right, 'Cost (price/kg)', 'filament_cost_kg', '0', 'Cost of your filament per kg, to estimate the cost of the final print.', type = 'preference')\r
                validators.validFloat(c, 0.0)\r
-               c = configBase.SettingRow(right, 'Filament cost (price/m)', 'filament_cost_meter', '0', 'Cost of your filament per meter, to estimate the cost of the final print.', type = 'preference')\r
+               c = configBase.SettingRow(right, 'Cost (price/m)', 'filament_cost_meter', '0', 'Cost of your filament per meter, to estimate the cost of the final print.', type = 'preference')\r
                validators.validFloat(c, 0.0)\r
                \r
                configBase.TitleRow(right, 'Communication settings')\r

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 67af1c37ead74b686d7f183c5c03fd4147671226..3d1538e1c6cf5f26b67cdb4c2b8de19194d8ef8a 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -120,7 +120,7 @@ class printWindow(wx.Frame):
 \r
                self.powerWarningText = wx.StaticText(parent=self.panel,\r
                        id=-1,\r
-                       label="Connect your computer to AC power\nIf it shuts down during printing, the product will be lost.",\r
+                       label="Your computer is running on battery power.\nConnect your computer to AC power or your print might not finish.",\r
                        style=wx.ALIGN_CENTER)\r
                self.powerWarningText.SetBackgroundColour('red')\r
                self.powerWarningText.SetForegroundColour('white')\r

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 29dfa4180e4a02cdf366eb0bd9a51494e7dcbc7f..1c0e5867295b0626eb61ffab5451261b7934a1d5 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -110,7 +110,7 @@ class simpleModeWindow(configBase.configWindowBase):
                sizer.Add(boxsizer, (2,0), flag=wx.EXPAND)
 
                # load and slice buttons.
-               loadButton = wx.Button(self, -1, '&Load Model')
+               loadButton = wx.Button(self, -1, '&Load model')
                sliceButton = wx.Button(self, -1, 'P&repare print')
                printButton = wx.Button(self, -1, '&Print')
                self.Bind(wx.EVT_BUTTON, self.OnLoadModel, loadButton)