Przeglądaj źródła

- 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

Marius Stanciu 5 lat temu
rodzic
commit
9a6cef05ae

+ 3 - 0
CHANGELOG.md

@@ -15,6 +15,9 @@ CHANGELOG for FlatCAM beta
 - fixed issue with the app window restored in a shifted position after doing Fullscreen
 - 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
 - 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)
 - 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
 
 
 25.10.2020
 25.10.2020
 
 

Plik diff jest za duży
+ 287 - 178
appGUI/MainGUI.py


+ 1 - 1
appGUI/preferences/tools/ToolsPaintPrefGroupUI.py

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

+ 1 - 1
appTools/ToolSolderPaste.py

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

+ 5 - 5
app_Main.py

@@ -487,7 +487,7 @@ class App(QtCore.QObject):
             self.splash.move(current_screen_center - self.splash.rect().center())
             self.splash.move(current_screen_center - self.splash.rect().center())
 
 
             self.splash.show()
             self.splash.show()
-            self.splash.showMessage(_("FlatCAM is initializing ..."),
+            self.splash.showMessage(_("The application is initializing ..."),
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
                                     color=QtGui.QColor("gray"))
                                     color=QtGui.QColor("gray"))
         else:
         else:
@@ -720,7 +720,7 @@ class App(QtCore.QObject):
         self.axes = None
         self.axes = None
 
 
         if show_splash:
         if show_splash:
-            self.splash.showMessage(_("FlatCAM is initializing ...\n"
+            self.splash.showMessage(_("The application is initializing ...\n"
                                       "Canvas initialization started."),
                                       "Canvas initialization started."),
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
                                     color=QtGui.QColor("gray"))
                                     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))
         self.log.debug("Finished Canvas initialization in %s seconds." % str(self.used_time))
 
 
         if show_splash:
         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 started.\n"
                                                      "Canvas initialization finished in"), '%.2f' % self.used_time),
                                                      "Canvas initialization finished in"), '%.2f' % self.used_time),
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
                                     alignment=Qt.AlignBottom | Qt.AlignLeft,
@@ -2710,7 +2710,7 @@ class App(QtCore.QObject):
 
 
                 # Icon and title
                 # Icon and title
                 self.setWindowIcon(parent.app_icon)
                 self.setWindowIcon(parent.app_icon)
-                self.setWindowTitle(_("About FlatCAM"))
+                self.setWindowTitle(_("About"))
                 self.resize(600, 200)
                 self.resize(600, 200)
                 # self.setStyleSheet("background-image: url(share/flatcam_icon256.png); background-attachment: fixed")
                 # self.setStyleSheet("background-image: url(share/flatcam_icon256.png); background-attachment: fixed")
                 # self.setStyleSheet(
                 # self.setStyleSheet(
@@ -3288,7 +3288,7 @@ class App(QtCore.QObject):
                          "1. FlatCAM.org website is down\n"
                          "1. FlatCAM.org website is down\n"
                          "2. Someone forked FlatCAM project and wants to point\n"
                          "2. Someone forked FlatCAM project and wants to point\n"
                          "to his own website\n\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."))
                          "use the YouTube channel link from the Help menu."))
 
 
         msgbox.setWindowTitle(_("Alternative website"))
         msgbox.setWindowTitle(_("Alternative website"))

BIN
locale/de/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 291 - 263
locale/de/LC_MESSAGES/strings.po


BIN
locale/en/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 846 - 619
locale/en/LC_MESSAGES/strings.po


BIN
locale/es/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 816 - 613
locale/es/LC_MESSAGES/strings.po


BIN
locale/fr/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 786 - 534
locale/fr/LC_MESSAGES/strings.po


BIN
locale/it/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 812 - 612
locale/it/LC_MESSAGES/strings.po


BIN
locale/pt_BR/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 805 - 606
locale/pt_BR/LC_MESSAGES/strings.po


BIN
locale/ro/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 812 - 612
locale/ro/LC_MESSAGES/strings.po


BIN
locale/ru/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 821 - 746
locale/ru/LC_MESSAGES/strings.po


BIN
locale/tr/LC_MESSAGES/strings.mo


Plik diff jest za duży
+ 815 - 614
locale/tr/LC_MESSAGES/strings.po


Plik diff jest za duży
+ 662 - 504
locale_template/strings.pot


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików