- fixed some more strings

- updated the Google-translations for the German, Spanish, French
- updated the Romanian translation

AppDatabase.py

@@ -119,7 +119,7 @@ class ToolsDB(QtWidgets.QWidget):
         )
         self.buttons_box.addWidget(import_db_btn)
 
-        self.add_tool_from_db = FCButton(_("Transfer Tool"))
+        self.add_tool_from_db = FCButton(_("Transfer the Tool"))
         self.add_tool_from_db.setToolTip(
             _("Add a new tool in the Tools Table of the\n"
               "active Geometry object after selecting a tool\n"
@@ -1792,7 +1792,7 @@ class ToolsDB2(QtWidgets.QWidget):
         )
         self.buttons_box.addWidget(self.save_db_btn)
 
-        self.add_tool_from_db = FCButton(_("Transfer Tool"))
+        self.add_tool_from_db = FCButton(_("Transfer the Tool"))
         self.add_tool_from_db.setToolTip(
             _("Insert a new tool in the Tools Table of the\n"
               "object/application tool after selecting a tool\n"

AppGUI/MainGUI.py

@@ -483,7 +483,7 @@ class MainGUI(QtWidgets.QMainWindow):
         self.menuview_toggle_workspace = self.menuview.addAction(
             QtGui.QIcon(self.app.resource_location + '/workspace24.png'), _("Toggle Workspace\tShift+W"))
         self.menuview_toggle_hud = self.menuview.addAction(
-            QtGui.QIcon(self.app.resource_location + '/hud_32.png'), _("Toggle HUD\tAlt+M"))
+            QtGui.QIcon(self.app.resource_location + '/hud_32.png'), _("Toggle HUD\tAlt+H"))
 
         # ########################################################################
         # ########################## Objects # ###################################

AppGUI/preferences/PreferencesUIManager.py

@@ -870,7 +870,7 @@ class PreferencesUIManager:
         if theme_new_val != theme or ge != ge_val:
             msgbox = QtWidgets.QMessageBox()
             msgbox.setText(_("Are you sure you want to continue?"))
-            msgbox.setWindowTitle(_("Application restart"))
+            msgbox.setWindowTitle(_("Application will restart"))
             msgbox.setWindowIcon(QtGui.QIcon(self.ui.app.resource_location + '/warning.png'))
             msgbox.setIcon(QtWidgets.QMessageBox.Question)
 

AppGUI/preferences/general/GeneralAPPSetGroupUI.py

@@ -233,7 +233,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
         self.textbox_font_size_label = QtWidgets.QLabel('%s:' % _('Textbox'))
         self.textbox_font_size_label.setToolTip(
             _("This sets the font size for the Textbox AppGUI\n"
-              "elements that are used in FlatCAM.")
+              "elements that are used in the application.")
         )
 
         self.textbox_font_size_spinner = FCSpinner()

AppGUI/preferences/general/GeneralAppSettingsGroupUI.py

@@ -177,7 +177,7 @@ class GeneralAppSettingsGroupUI(OptionsGroupUI2):
                 option="textbox_font_size",
                 label_text="Textbox",
                 label_tooltip="This sets the font size for the Textbox GUI\n"
-                              "elements that are used in FlatCAM.",
+                              "elements that are used in the application.",
                 min_value=8, max_value=40, step=1
             ),
             SeparatorOptionUI(),

AppGUI/preferences/general/GeneralGUIPrefGroupUI.py

@@ -72,7 +72,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         # Layout selection
         self.layout_label = QtWidgets.QLabel('%s:' % _('Layout'))
         self.layout_label.setToolTip(
-            _("Select an layout for the application.\n"
+            _("Select a layout for the application.\n"
               "It is applied immediately.")
         )
         self.layout_combo = FCComboBox()
@@ -94,7 +94,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
         # Style selection
         self.style_label = QtWidgets.QLabel('%s:' % _('Style'))
         self.style_label.setToolTip(
-            _("Select an style for the application.\n"
+            _("Select a style for the application.\n"
               "It will be applied at the next app start.")
         )
         self.style_combo = FCComboBox()

AppGUI/preferences/tools/ToolsISOPrefGroupUI.py

@@ -276,7 +276,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
         self.select_label.setToolTip(
             _("Isolation scope. Choose what to isolate:\n"
               "- 'All' -> Isolate all the polygons in the object\n"
-              "- 'Selection' -> Isolate a selection of polygons.\n"
+              "- 'Area Selection' -> Isolate polygons within a selection area.\n"
+              "- 'Polygon Selection' -> Isolate a selection of polygons.\n"
               "- 'Reference Object' - will process the area specified by another object.")
         )
         self.select_combo = FCComboBox()

AppTools/ToolCorners.py

@@ -54,7 +54,7 @@ class ToolCorners(AppTool):
         # Gerber object #
         self.object_label = QtWidgets.QLabel('<b>%s:</b>' % _("GERBER"))
         self.object_label.setToolTip(
-            _("The Gerber object that to which will be added corner markers.")
+            _("The Gerber object to which will be added corner markers.")
         )
         self.object_combo = FCComboBox()
         self.object_combo.setModel(self.app.collection)

AppTools/ToolIsolation.py

@@ -134,11 +134,11 @@ class ToolIsolation(AppTool, Gerber):
 
         self.tools_table.horizontalHeaderItem(0).setToolTip(
             _("This is the Tool Number.\n"
-              "Non copper clearing will start with the tool with the biggest \n"
+              "Isolation routing will start with the tool with the biggest \n"
               "diameter, continuing until there are no more tools.\n"
               "Only tools that create Isolation geometry will still be present\n"
               "in the resulting geometry. This is because with some tools\n"
-              "this function will not be able to create painting geometry.")
+              "this function will not be able to create routing geometry.")
         )
         self.tools_table.horizontalHeaderItem(1).setToolTip(
             _("Tool Diameter. It's value (in current FlatCAM units)\n"
@@ -495,7 +495,8 @@ class ToolIsolation(AppTool, Gerber):
         self.select_label.setToolTip(
             _("Isolation scope. Choose what to isolate:\n"
               "- 'All' -> Isolate all the polygons in the object\n"
-              "- 'Selection' -> Isolate a selection of polygons.\n"
+              "- 'Area Selection' -> Isolate polygons within a selection area.\n"
+              "- 'Polygon Selection' -> Isolate a selection of polygons.\n"
               "- 'Reference Object' - will process the area specified by another object.")
         )
         self.select_combo = FCComboBox()
@@ -2038,7 +2039,7 @@ class ToolIsolation(AppTool, Gerber):
         # the tools are finished but the isolation is not finished therefore it failed
         if work_geo:
             self.app.inform.emit("[WARNING] %s" % _("Partial failure. The geometry was processed with all tools.\n"
-                                                    "But there are still un-isolated geometry elements. "
+                                                    "But there are still not-isolated geometry elements. "
                                                     "Try to include a tool with smaller diameter."))
             self.app.shell_message(msg=_("The following are coordinates for the copper features "
                                          "that could not be isolated:"))

AppTools/ToolNCC.py

@@ -2264,7 +2264,7 @@ class NonCopperClear(AppTool, Gerber):
                 log.debug("NonCopperClear.clear_polygon_worker() Lines --> %s" % str(ee))
         elif ncc_method == _("Combo"):
             try:
-                self.app.inform.emit(_("Clearing polygon with method: lines."))
+                self.app.inform.emit(_("Clearing the polygon with the method: lines."))
                 cp = self.clear_polygon3(pol, tooldia,
                                          steps_per_circle=self.grb_circle_steps,
                                          overlap=ncc_overlap, contour=ncc_contour,
@@ -2274,7 +2274,7 @@ class NonCopperClear(AppTool, Gerber):
                 if cp and cp.objects:
                     pass
                 else:
-                    self.app.inform.emit(_("Failed. Clearing polygon with method: seed."))
+                    self.app.inform.emit(_("Failed. Clearing the polygon with the method: seed."))
                     cp = self.clear_polygon2(pol, tooldia,
                                              steps_per_circle=self.grb_circle_steps,
                                              overlap=ncc_overlap, contour=ncc_contour,
@@ -2283,7 +2283,7 @@ class NonCopperClear(AppTool, Gerber):
                     if cp and cp.objects:
                         pass
                     else:
-                        self.app.inform.emit(_("Failed. Clearing polygon with method: standard."))
+                        self.app.inform.emit(_("Failed. Clearing the polygon with the method: standard."))
                         cp = self.clear_polygon(pol, tooldia,
                                                 steps_per_circle=self.grb_circle_steps,
                                                 overlap=ncc_overlap, contour=ncc_contour,

AppTools/ToolSolderPaste.py

@@ -65,7 +65,7 @@ class SolderPaste(AppTool):
         self.obj_combo.obj_type = "Gerber"
 
         self.object_label = QtWidgets.QLabel('<b>%s</b>:'% _("GERBER"))
-        self.object_label.setToolTip(_("Gerber Solder paste object.")
+        self.object_label.setToolTip(_("Gerber Solderpaste object.")
         )
         obj_form_layout.addRow(self.object_label)
         obj_form_layout.addRow(self.obj_combo)

App_Main.py

@@ -9235,12 +9235,12 @@ class App(QtCore.QObject):
             title=_("Selected Tab - Choose an Item from Project Tab"),
             subtitle=_("Details"),
 
-            s1=_("The normal flow when working in FlatCAM is the following:"),
-            s2=_("Load/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG file into FlatCAM "
+            s1=_("The normal flow when working with the application is the following:"),
+            s2=_("Load/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG file into the application "
                  "using either the toolbars, key shortcuts or even dragging and dropping the "
                  "files on the AppGUI."),
-            s3=_("You can also load a FlatCAM project by double clicking on the project file, "
-                 "drag and drop of the file into the FLATCAM AppGUI or through the menu (or toolbar) "
+            s3=_("You can also load a project by double clicking on the project file, "
+                 "drag and drop of the file into the AppGUI or through the menu (or toolbar) "
                  "actions offered within the app."),
             s4=_("Once an object is available in the Project Tab, by selecting it and then focusing "
                  "on SELECTED TAB (more simpler is to double click the object name in the Project Tab, "

CHANGELOG.md

@@ -15,7 +15,10 @@ CHANGELOG for FlatCAM beta
 - Etch Compensation Tool - added a new etchant: alkaline baths
 - fixed spacing in the status toolbar icons
 - updated the translation files to the latest changes
- - modified behavior of object comboboxes in Paint, NCC and CutOut Tools: now if an object is selected in Project Tab and is of the supported kind in the Tool, it will be auto-selected
+- modified behavior of object comboboxes in Paint, NCC and CutOut Tools: now if an object is selected in Project Tab and is of the supported kind in the Tool, it will be auto-selected
+- fixed some more strings
+- updated the Google-translations for the German, Spanish, French
+- updated the Romanian translation
 
 1.06.2020