Merged marius_stanciu/flatcam_beta/Beta_8.994 into Beta_unstable

CHANGELOG.md

@@ -15,6 +15,11 @@ CHANGELOG for FlatCAM beta
 - fixed issue with the app window restored in a shifted position after doing Fullscreen
 - fixed issue with coords, delta_coords and status toolbars being disabled when entering fullscreen mode and remaining disabled after restore to normal mode
 - changed some of the strings (added a few in the How To section)
+- more strings updated
+- modified the shortcut strings and the way the shortcuts were listed in the Shortcut keys list such that it will allow a future Shortcuts Manager
+- updated all the language strings according to the modifications done above
+- fixed a small issue with using the shortcut key for toggling the display of Properties tab
+
 
 25.10.2020
 

appGUI/preferences/tools/ToolsPaintPrefGroupUI.py

@@ -30,7 +30,7 @@ class ToolsPaintPrefGroupUI(OptionsGroupUI):
         # ------------------------------
         # ## Paint area
         # ------------------------------
-        self.paint_label = QtWidgets.QLabel(_('<b>Parameters:</b>'))
+        self.paint_label = QtWidgets.QLabel('<b>%s:</b>' % _('Parameters'))
         self.paint_label.setToolTip(
             _("Creates tool paths to cover the\n"
               "whole area of a polygon.")

appTools/ToolSolderPaste.py

@@ -300,7 +300,7 @@ class SolderPaste(AppTool):
                 if int(tooluid_key) == tooluid:
                     self.set_form(deepcopy(tooluid_value['data']))
         except Exception as e:
-            log.debug("FlatCAMObj ---> update_ui() " + str(e))
+            log.debug("ToolSolderPaste ---> update_ui() " + str(e))
 
         self.ui_connect()
 

app_Main.py

@@ -487,7 +487,7 @@ class App(QtCore.QObject):
             self.splash.move(current_screen_center - self.splash.rect().center())
 
             self.splash.show()
-            self.splash.showMessage(_("FlatCAM is initializing ..."),
+            self.splash.showMessage(_("The application is initializing ..."),
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
                                     color=QtGui.QColor("gray"))
         else:
@@ -720,7 +720,7 @@ class App(QtCore.QObject):
         self.axes = None
 
         if show_splash:
-            self.splash.showMessage(_("FlatCAM is initializing ...\n"
+            self.splash.showMessage(_("The application is initializing ...\n"
                                       "Canvas initialization started."),
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
                                     color=QtGui.QColor("gray"))
@@ -740,7 +740,7 @@ class App(QtCore.QObject):
         self.log.debug("Finished Canvas initialization in %s seconds." % str(self.used_time))
 
         if show_splash:
-            self.splash.showMessage('%s: %ssec' % (_("FlatCAM is initializing ...\n"
+            self.splash.showMessage('%s: %ssec' % (_("The application is initializing ...\n"
                                                      "Canvas initialization started.\n"
                                                      "Canvas initialization finished in"), '%.2f' % self.used_time),
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
@@ -2710,7 +2710,7 @@ class App(QtCore.QObject):
 
                 # Icon and title
                 self.setWindowIcon(parent.app_icon)
-                self.setWindowTitle(_("About FlatCAM"))
+                self.setWindowTitle(_("About"))
                 self.resize(600, 200)
                 # self.setStyleSheet("background-image: url(share/flatcam_icon256.png); background-attachment: fixed")
                 # self.setStyleSheet(
@@ -3288,7 +3288,7 @@ class App(QtCore.QObject):
                          "1. FlatCAM.org website is down\n"
                          "2. Someone forked FlatCAM project and wants to point\n"
                          "to his own website\n\n"
-                         "If you can't get any informations about FlatCAM beta\n"
+                         "If you can't get any informations about the application\n"
                          "use the YouTube channel link from the Help menu."))
 
         msgbox.setWindowTitle(_("Alternative website"))
@@ -6148,7 +6148,7 @@ class App(QtCore.QObject):
 
         if name == 'project':
             self.ui.notebook.setCurrentWidget(self.ui.project_tab)
-        elif name == 'selected':
+        elif name == 'properties':
             self.ui.notebook.setCurrentWidget(self.ui.properties_tab)
         elif name == 'tool':
             self.ui.notebook.setCurrentWidget(self.ui.tool_tab)