- added two more strings to translation strings (due of German language)

- completed the Russian translation using the Google and Yandex translation engines

FlatCAMTranslation.py

@@ -16,10 +16,10 @@ from PyQt5.QtCore import QSettings
 from flatcamGUI.GUIElements import log
 import gettext
 
-import builtins
-
-if '_' not in builtins.__dict__:
-    _ = gettext.gettext
+# import builtins
+#
+# if '_' not in builtins.__dict__:
+#     _ = gettext.gettext
 
 # ISO639-1 codes from here: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 languages_dict = {

README.md

@@ -16,6 +16,8 @@ CAD program, and create G-Code for Isolation routing.
 - Spanish Google translation at 77%
 - changed the Disable plots menu entry in the context menu, into a Toggle Visibility menu entry
 - Spanish Google translation 100% but two strings (big ones)
+- added two more strings to translation strings (due of German language)
+- completed the Russian translation using the Google and Yandex translation engines
 
 28.07.2019
 

flatcamGUI/FlatCAMGUI.py

@@ -3851,8 +3851,8 @@ class GeneralAppPrefGroupUI(OptionsGroupUI):
         # Multiple Selection Modifier Key
         self.mselectlabel = QtWidgets.QLabel(_('<b>Multiple Sel:</b>'))
         self.mselectlabel.setToolTip(_("Select the key used for multiple selection."))
-        self.mselect_radio = RadioSet([{'label': 'CTRL', 'value': 'Control'},
-                                       {'label': 'SHIFT', 'value': 'Shift'}])
+        self.mselect_radio = RadioSet([{'label': _('CTRL'), 'value': 'Control'},
+                                       {'label': _('SHIFT'), 'value': 'Shift'}])
 
         # Project at StartUp CB
         self.project_startup_label = QtWidgets.QLabel(_('Project at StartUp:'))

locale/de/LC_MESSAGES/strings.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 19:00+0300\n"
-"PO-Revision-Date: 2019-07-30 19:01+0300\n"
+"POT-Creation-Date: 2019-07-30 20:39+0300\n"
+"PO-Revision-Date: 2019-07-30 20:42+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -3876,7 +3876,7 @@ msgstr "&Datei"
 
 #: flatcamGUI/FlatCAMGUI.py:56
 msgid "&New Project ...\tCTRL+N"
-msgstr "&Neues Projekt ...\tCTRL+N"
+msgstr "&Neues Projekt ...\\STRG+N"
 
 #: flatcamGUI/FlatCAMGUI.py:58
 msgid "Will create a new, blank project"
@@ -3917,11 +3917,11 @@ msgstr "Öffnen"
 
 #: flatcamGUI/FlatCAMGUI.py:84
 msgid "Open &Gerber ...\tCTRL+G"
-msgstr "Offen &Gerber ...\tCTRL+G"
+msgstr "Offen &Gerber ...\\STRG+G"
 
 #: flatcamGUI/FlatCAMGUI.py:91
 msgid "Open &Excellon ...\tCTRL+E"
-msgstr "Offen &Excellon ...\tCTRL+E"
+msgstr "Offen &Excellon ...\\STRG+E"
 
 #: flatcamGUI/FlatCAMGUI.py:95
 msgid "Open G-&Code ..."
@@ -4053,7 +4053,7 @@ msgstr "Projekt speichern ..."
 
 #: flatcamGUI/FlatCAMGUI.py:211
 msgid "Save Project &As ...\tCTRL+S"
-msgstr "Projekt speichern als ...\tCTRL+S"
+msgstr "Projekt speichern als ...\\STRG+S"
 
 #: flatcamGUI/FlatCAMGUI.py:216
 msgid "Save Project C&opy ..."
@@ -6721,6 +6721,14 @@ msgstr "<b>Mehrfachauswahl:</b>"
 msgid "Select the key used for multiple selection."
 msgstr "Wählen Sie den Schlüssel für die Mehrfachauswahl aus."
 
+#: flatcamGUI/FlatCAMGUI.py:3854
+msgid "CTRL"
+msgstr "STRG"
+
+#: flatcamGUI/FlatCAMGUI.py:3855
+msgid "SHIFT"
+msgstr "SHIFT"
+
 #: flatcamGUI/FlatCAMGUI.py:3858
 msgid "Project at StartUp:"
 msgstr "Projekt beim Start:"
@@ -12588,12 +12596,6 @@ msgstr "CNCJob-Objekte können nicht versetzt werden."
 #~ msgid "Copy Drill(s)"
 #~ msgstr "Bohrer kopieren"
 
-#~ msgid "CTRL"
-#~ msgstr "CTRL"
-
-#~ msgid "SHIFT"
-#~ msgstr "SHIFT"
-
 #~ msgid "Both"
 #~ msgstr "Both"
 

locale/en/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 19:01+0300\n"
-"PO-Revision-Date: 2019-07-30 19:01+0300\n"
+"POT-Creation-Date: 2019-07-30 20:41+0300\n"
+"PO-Revision-Date: 2019-07-30 20:41+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en\n"
@@ -5934,7 +5934,6 @@ msgstr ""
 "                    "
 
 #: flatcamGUI/FlatCAMGUI.py:1588
-#| msgid "Toggle Units"
 msgid "Toggle Visibility"
 msgstr "Toggle Visibility"
 
@@ -6568,6 +6567,14 @@ msgstr "<b>Multiple Sel:</b>"
 msgid "Select the key used for multiple selection."
 msgstr "Select the key used for multiple selection."
 
+#: flatcamGUI/FlatCAMGUI.py:3854
+msgid "CTRL"
+msgstr "CTRL"
+
+#: flatcamGUI/FlatCAMGUI.py:3855
+msgid "SHIFT"
+msgstr "SHIFT"
+
 #: flatcamGUI/FlatCAMGUI.py:3858
 msgid "Project at StartUp:"
 msgstr "Project at StartUp:"
@@ -12324,12 +12331,6 @@ msgstr "CNCJob objects can't be offseted."
 #~ msgid "Copy Drill(s)"
 #~ msgstr "Copy Drill(s)"
 
-#~ msgid "CTRL"
-#~ msgstr "CTRL"
-
-#~ msgid "SHIFT"
-#~ msgstr "SHIFT"
-
 #~ msgid "Both"
 #~ msgstr "Both"
 

locale/es/LC_MESSAGES/strings.po

@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 19:15+0300\n"
-"PO-Revision-Date: 2019-07-30 20:02+0300\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2019-07-30 20:40+0300\n"
+"PO-Revision-Date: 2019-07-30 20:40+0300\n"
+"Last-Translator: Marius Stanciu - Google Translate\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgid ""
 "(Type help to get started)\n"
 "\n"
 msgstr ""
-"(Escriba ayuda para empezar)\n"
+"(Para empezar escriba: help)\n"
 "\n"
 
 #: FlatCAMApp.py:2026 ObjectCollection.py:80 flatcamTools/ToolImage.py:213
@@ -4450,7 +4450,7 @@ msgstr "Editar"
 #: flatcamGUI/FlatCAMGUI.py:527 flatcamGUI/FlatCAMGUI.py:1634
 #: flatcamTools/ToolProperties.py:25
 msgid "Properties"
-msgstr "EditProperties"
+msgstr "Propiedades"
 
 #: flatcamGUI/FlatCAMGUI.py:556
 msgid "File Toolbar"
@@ -6093,6 +6093,14 @@ msgstr "<b>Sel múltiple:</b>"
 msgid "Select the key used for multiple selection."
 msgstr "Seleccione la clave utilizada para la selección múltiple."
 
+#: flatcamGUI/FlatCAMGUI.py:3854
+msgid "CTRL"
+msgstr "CTRL"
+
+#: flatcamGUI/FlatCAMGUI.py:3855
+msgid "SHIFT"
+msgstr "SHIFT"
+
 #: flatcamGUI/FlatCAMGUI.py:3858
 msgid "Project at StartUp:"
 msgstr "Proyecto en el inicio:"

locale/pt_BR/LC_MESSAGES/strings.po

@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 19:01+0300\n"
-"PO-Revision-Date: 2019-07-30 19:02+0300\n"
+"POT-Creation-Date: 2019-07-30 20:43+0300\n"
+"PO-Revision-Date: 2019-07-30 20:43+0300\n"
 "Last-Translator: Carlos Stein <carlos.stein@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -6667,6 +6667,14 @@ msgstr "<b>Seleção Múltipla:</b>"
 msgid "Select the key used for multiple selection."
 msgstr "Selecione a tecla usada para seleção múltipla."
 
+#: flatcamGUI/FlatCAMGUI.py:3854
+msgid "CTRL"
+msgstr "CTRL"
+
+#: flatcamGUI/FlatCAMGUI.py:3855
+msgid "SHIFT"
+msgstr "SHIFT"
+
 #: flatcamGUI/FlatCAMGUI.py:3858
 msgid "Project at StartUp:"
 msgstr "Projeto no Inicialização:"
@@ -12422,12 +12430,6 @@ msgstr "Objetos Trabalho CNC não podem ser deslocados."
 #~ msgid "Copy Drill(s)"
 #~ msgstr "Copiar Broca(s)"
 
-#~ msgid "CTRL"
-#~ msgstr "CTRL"
-
-#~ msgid "SHIFT"
-#~ msgstr "SHIFT"
-
 #~ msgid "Both"
 #~ msgstr "Ambos"
 

locale/ro/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 19:02+0300\n"
-"PO-Revision-Date: 2019-07-30 19:02+0300\n"
+"POT-Creation-Date: 2019-07-30 20:43+0300\n"
+"PO-Revision-Date: 2019-07-30 20:43+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ro\n"
@@ -6713,6 +6713,14 @@ msgstr "<b>Sel. multipla:</b>"
 msgid "Select the key used for multiple selection."
 msgstr "Selectează tasta folosita pentru selectia multipla."
 
+#: flatcamGUI/FlatCAMGUI.py:3854
+msgid "CTRL"
+msgstr "CTRL"
+
+#: flatcamGUI/FlatCAMGUI.py:3855
+msgid "SHIFT"
+msgstr "SHIFT"
+
 #: flatcamGUI/FlatCAMGUI.py:3858
 msgid "Project at StartUp:"
 msgstr "Proiect la pornire:"
@@ -12602,12 +12610,6 @@ msgstr "Obiectele tip CNCJob nu pot fi deplasate."
 #~ msgid "Copy Drill(s)"
 #~ msgstr "Copiaza Găurire"
 
-#~ msgid "CTRL"
-#~ msgstr "CTRL"
-
-#~ msgid "SHIFT"
-#~ msgstr "SHIFT"
-
 #~ msgid "Both"
 #~ msgstr "Ambele"