Просмотр исходного кода

- 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)

Marius Stanciu 6 лет назад
Родитель
Сommit
1e7421ebe9

+ 35 - 1
FlatCAMApp.py

@@ -1462,7 +1462,7 @@ class App(QtCore.QObject):
         self.connect_toolbar_signals()
 
         # Context Menu
-        self.ui.popmenu_disable.triggered.connect(lambda: self.disable_plots(self.collection.get_selected()))
+        self.ui.popmenu_disable.triggered.connect(lambda: self.toggle_plots(self.collection.get_selected()))
         self.ui.popmenu_panel_toggle.triggered.connect(self.on_toggle_notebook)
 
         self.ui.popmenu_new_geo.triggered.connect(self.new_geometry_object)
@@ -8532,12 +8532,46 @@ The normal flow when working in FlatCAM is the following:</span></p>
         :return:
         """
 
+        # if no objects selected then do nothing
+        if not self.collection.get_selected():
+            return
+
+        # if at least one object is visible then do the disable
+        exit_flag = True
+        for obj in objects:
+            if obj.options['plot'] is True:
+                exit_flag = False
+                break
+
+        if exit_flag:
+            return
+
         log.debug("Disabling plots ...")
         self.inform.emit(_("Working ..."))
         for obj in objects:
             obj.options['plot'] = False
         self.plots_updated.emit()
 
+    def toggle_plots(self, objects):
+        """
+        Toggle plots visibility
+        :param objects: list of Objects for which to be toggled the visibility
+        :return:
+        """
+
+        # if no objects selected then do nothing
+        if not self.collection.get_selected():
+            return
+
+        log.debug("Toggling plots ...")
+        self.inform.emit(_("Working ..."))
+        for obj in objects:
+            if obj.options['plot'] is False:
+                obj.options['plot'] = True
+            else:
+                obj.options['plot'] = False
+        self.plots_updated.emit()
+
     def clear_plots(self):
 
         objects = self.collection.get_list()

+ 2 - 0
README.md

@@ -14,6 +14,8 @@ CAD program, and create G-Code for Isolation routing.
 - fixed bug that crashed the software when trying to edit a GUI value in Geometry selected tab without having a tool in the Tools Table
 - fixed bug that crashed the app when trying to add a tool without a tool diameter value
 - 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)
 
 28.07.2019
 

+ 1 - 1
flatcamGUI/FlatCAMGUI.py

@@ -1585,7 +1585,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         # ########################################################### ##
         self.popMenu = FCMenu()
 
-        self.popmenu_disable = self.popMenu.addAction(QtGui.QIcon('share/disable32.png'), _("Disable Plot"))
+        self.popmenu_disable = self.popMenu.addAction(QtGui.QIcon('share/disable32.png'), _("Toggle Visibility"))
         self.popmenu_panel_toggle = self.popMenu.addAction(QtGui.QIcon('share/notebook16.png'), _("Toggle Panel"))
 
         self.popMenu.addSeparator()

BIN
locale/de/LC_MESSAGES/strings.mo


+ 15 - 11
locale/de/LC_MESSAGES/strings.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 13:12+0300\n"
-"PO-Revision-Date: 2019-07-30 13:12+0300\n"
+"POT-Creation-Date: 2019-07-30 19:00+0300\n"
+"PO-Revision-Date: 2019-07-30 19:01+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -624,8 +624,8 @@ msgstr "Offene Einstellungsdatei"
 msgid "[WARNING_NOTCL] Open Config cancelled."
 msgstr "[WARNING_NOTCL] Offene Konfiguration abgebrochen."
 
-#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8701 FlatCAMApp.py:8721
-#: FlatCAMApp.py:8742 FlatCAMApp.py:8764
+#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8735 FlatCAMApp.py:8755
+#: FlatCAMApp.py:8776 FlatCAMApp.py:8798
 msgid "[WARNING_NOTCL] No object selected."
 msgstr "[WARNING_NOTCL] Kein Objekt ausgewählt"
 
@@ -1252,34 +1252,34 @@ msgstr "[success] Ausgewählte Grundstücke aktiviert ..."
 msgid "[success] Selected plots disabled..."
 msgstr "[success] Ausgewählte Grundstücke deaktiviert ..."
 
-#: FlatCAMApp.py:8523 FlatCAMApp.py:8536
+#: FlatCAMApp.py:8523 FlatCAMApp.py:8550 FlatCAMApp.py:8567
 msgid "Working ..."
 msgstr "Arbeiten ..."
 
-#: FlatCAMApp.py:8570
+#: FlatCAMApp.py:8604
 msgid "Saving FlatCAM Project"
 msgstr "FlatCAM-Projekt speichern"
 
-#: FlatCAMApp.py:8591 FlatCAMApp.py:8622
+#: FlatCAMApp.py:8625 FlatCAMApp.py:8656
 #, python-format
 msgid "[success] Project saved to: %s"
 msgstr "[success] Projekt gespeichert in: %s"
 
-#: FlatCAMApp.py:8609
+#: FlatCAMApp.py:8643
 #, python-format
 msgid "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Fehler beim Überprüfen der Projektdatei:%s. Versuchen Sie es "
 "erneut zu speichern."
 
-#: FlatCAMApp.py:8616
+#: FlatCAMApp.py:8650
 #, python-format
 msgid "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Die gespeicherte Projektdatei konnte nicht analysiert werden:"
 "%s. Versuchen Sie es erneut zu speichern."
 
-#: FlatCAMApp.py:8624
+#: FlatCAMApp.py:8658
 #, python-format
 msgid "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
 msgstr ""
@@ -4445,7 +4445,7 @@ msgstr "Transformationswerkzeug\tSTRG+R"
 msgid "Enable Plot"
 msgstr "Diagramm aktivieren"
 
-#: flatcamGUI/FlatCAMGUI.py:516 flatcamGUI/FlatCAMGUI.py:1588
+#: flatcamGUI/FlatCAMGUI.py:516
 msgid "Disable Plot"
 msgstr "Diagramm deaktivieren"
 
@@ -6078,6 +6078,10 @@ msgstr ""
 "            </table>\n"
 "                    "
 
+#: flatcamGUI/FlatCAMGUI.py:1588
+msgid "Toggle Visibility"
+msgstr "Sichtbarkeit umschalten"
+
 #: flatcamGUI/FlatCAMGUI.py:1589
 msgid "Toggle Panel"
 msgstr "Panel umschalten"

BIN
locale/en/LC_MESSAGES/strings.mo


+ 16 - 12
locale/en/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 13:12+0300\n"
-"PO-Revision-Date: 2019-07-30 13:12+0300\n"
+"POT-Creation-Date: 2019-07-30 19:01+0300\n"
+"PO-Revision-Date: 2019-07-30 19:01+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en\n"
@@ -607,8 +607,8 @@ msgstr "Open Configuration File"
 msgid "[WARNING_NOTCL] Open Config cancelled."
 msgstr "[WARNING_NOTCL] Open Config cancelled."
 
-#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8701 FlatCAMApp.py:8721
-#: FlatCAMApp.py:8742 FlatCAMApp.py:8764
+#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8735 FlatCAMApp.py:8755
+#: FlatCAMApp.py:8776 FlatCAMApp.py:8798
 msgid "[WARNING_NOTCL] No object selected."
 msgstr "[WARNING_NOTCL] No object selected."
 
@@ -1212,31 +1212,31 @@ msgstr "[success] Selected plots enabled..."
 msgid "[success] Selected plots disabled..."
 msgstr "[success] Selected plots disabled..."
 
-#: FlatCAMApp.py:8523 FlatCAMApp.py:8536
+#: FlatCAMApp.py:8523 FlatCAMApp.py:8550 FlatCAMApp.py:8567
 msgid "Working ..."
 msgstr "Working ..."
 
-#: FlatCAMApp.py:8570
+#: FlatCAMApp.py:8604
 msgid "Saving FlatCAM Project"
 msgstr "Saving FlatCAM Project"
 
-#: FlatCAMApp.py:8591 FlatCAMApp.py:8622
+#: FlatCAMApp.py:8625 FlatCAMApp.py:8656
 #, python-format
 msgid "[success] Project saved to: %s"
 msgstr "[success] Project saved to: %s"
 
-#: FlatCAMApp.py:8609
+#: FlatCAMApp.py:8643
 #, python-format
 msgid "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
 msgstr "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
 
-#: FlatCAMApp.py:8616
+#: FlatCAMApp.py:8650
 #, python-format
 msgid "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
 
-#: FlatCAMApp.py:8624
+#: FlatCAMApp.py:8658
 #, python-format
 msgid "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
 msgstr "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
@@ -1388,7 +1388,6 @@ msgid "[success] Tool added in Tool Table."
 msgstr "[success] Tool added in Tool Table."
 
 #: FlatCAMObj.py:3671
-#| msgid "[ERROR_NOTCL] Default Tool added. Wrong value format entered."
 msgid "[WARNING_NOTCL] Default Tool added. Wrong value format entered."
 msgstr "[WARNING_NOTCL] Default Tool added. Wrong value format entered."
 
@@ -4311,7 +4310,7 @@ msgstr "Transform\tALT+R"
 msgid "Enable Plot"
 msgstr "Enable Plot"
 
-#: flatcamGUI/FlatCAMGUI.py:516 flatcamGUI/FlatCAMGUI.py:1588
+#: flatcamGUI/FlatCAMGUI.py:516
 msgid "Disable Plot"
 msgstr "Disable Plot"
 
@@ -5934,6 +5933,11 @@ msgstr ""
 "            </table>\n"
 "                    "
 
+#: flatcamGUI/FlatCAMGUI.py:1588
+#| msgid "Toggle Units"
+msgid "Toggle Visibility"
+msgstr "Toggle Visibility"
+
 #: flatcamGUI/FlatCAMGUI.py:1589
 msgid "Toggle Panel"
 msgstr "Toggle Panel"

BIN
locale/es/LC_MESSAGES/strings.mo


Разница между файлами не показана из-за своего большого размера
+ 264 - 111
locale/es/LC_MESSAGES/strings.po


BIN
locale/pt_BR/LC_MESSAGES/strings.mo


+ 15 - 11
locale/pt_BR/LC_MESSAGES/strings.po

@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 13:13+0300\n"
-"PO-Revision-Date: 2019-07-30 13:13+0300\n"
+"POT-Creation-Date: 2019-07-30 19:01+0300\n"
+"PO-Revision-Date: 2019-07-30 19:02+0300\n"
 "Last-Translator: Carlos Stein <carlos.stein@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -619,8 +619,8 @@ msgstr "Abrir Arquivo de Configuração"
 msgid "[WARNING_NOTCL] Open Config cancelled."
 msgstr "[WARNING_NOTCL] Abrir Arquivo de Configuração cancelado."
 
-#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8701 FlatCAMApp.py:8721
-#: FlatCAMApp.py:8742 FlatCAMApp.py:8764
+#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8735 FlatCAMApp.py:8755
+#: FlatCAMApp.py:8776 FlatCAMApp.py:8798
 msgid "[WARNING_NOTCL] No object selected."
 msgstr "[WARNING_NOTCL] Nenhum objeto selecionado."
 
@@ -1241,34 +1241,34 @@ msgstr "[success] Gráficos selecionados habilitados ..."
 msgid "[success] Selected plots disabled..."
 msgstr "[success] Gráficos selecionados desabilitados..."
 
-#: FlatCAMApp.py:8523 FlatCAMApp.py:8536
+#: FlatCAMApp.py:8523 FlatCAMApp.py:8550 FlatCAMApp.py:8567
 msgid "Working ..."
 msgstr "Trabalhando ..."
 
-#: FlatCAMApp.py:8570
+#: FlatCAMApp.py:8604
 msgid "Saving FlatCAM Project"
 msgstr "Salvando o Projeto FlatCAM"
 
-#: FlatCAMApp.py:8591 FlatCAMApp.py:8622
+#: FlatCAMApp.py:8625 FlatCAMApp.py:8656
 #, python-format
 msgid "[success] Project saved to: %s"
 msgstr "[success] Projeto salvo em: %s"
 
-#: FlatCAMApp.py:8609
+#: FlatCAMApp.py:8643
 #, python-format
 msgid "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Falha ao verificar o arquivo do projeto: %s . Tente salvá-lo "
 "novamente."
 
-#: FlatCAMApp.py:8616
+#: FlatCAMApp.py:8650
 #, python-format
 msgid "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Falha ao analisar o arquivo de projeto salvo: %s . Tente salvá-"
 "lo novamente."
 
-#: FlatCAMApp.py:8624
+#: FlatCAMApp.py:8658
 #, python-format
 msgid "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
 msgstr ""
@@ -4398,7 +4398,7 @@ msgstr "Transformar\tALT+R"
 msgid "Enable Plot"
 msgstr "Habilitar Gráfico"
 
-#: flatcamGUI/FlatCAMGUI.py:516 flatcamGUI/FlatCAMGUI.py:1588
+#: flatcamGUI/FlatCAMGUI.py:516
 msgid "Disable Plot"
 msgstr "Desabilitar Gráfico"
 
@@ -6026,6 +6026,10 @@ msgstr ""
 "            </table>\n"
 "                    "
 
+#: flatcamGUI/FlatCAMGUI.py:1588
+msgid "Toggle Visibility"
+msgstr "Alternar Visibilidade"
+
 #: flatcamGUI/FlatCAMGUI.py:1589
 msgid "Toggle Panel"
 msgstr "Alternar Painel"

BIN
locale/ro/LC_MESSAGES/strings.mo


+ 15 - 11
locale/ro/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 13:13+0300\n"
-"PO-Revision-Date: 2019-07-30 13:13+0300\n"
+"POT-Creation-Date: 2019-07-30 19:02+0300\n"
+"PO-Revision-Date: 2019-07-30 19:02+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ro\n"
@@ -629,8 +629,8 @@ msgstr "Încarcă un fişier de Configurare"
 msgid "[WARNING_NOTCL] Open Config cancelled."
 msgstr "[WARNING_NOTCL] Incărcarea unui fişier de Configurare este anulată."
 
-#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8701 FlatCAMApp.py:8721
-#: FlatCAMApp.py:8742 FlatCAMApp.py:8764
+#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8735 FlatCAMApp.py:8755
+#: FlatCAMApp.py:8776 FlatCAMApp.py:8798
 msgid "[WARNING_NOTCL] No object selected."
 msgstr "[WARNING_NOTCL] Nici-un obiect selectat."
 
@@ -1254,34 +1254,34 @@ msgstr "[success] Toate afişările sunt activate..."
 msgid "[success] Selected plots disabled..."
 msgstr "[success] Toate afişările sunt dezactivate..."
 
-#: FlatCAMApp.py:8523 FlatCAMApp.py:8536
+#: FlatCAMApp.py:8523 FlatCAMApp.py:8550 FlatCAMApp.py:8567
 msgid "Working ..."
 msgstr "Se lucrează..."
 
-#: FlatCAMApp.py:8570
+#: FlatCAMApp.py:8604
 msgid "Saving FlatCAM Project"
 msgstr "Proiectul FlatCAM este in curs de salvare"
 
-#: FlatCAMApp.py:8591 FlatCAMApp.py:8622
+#: FlatCAMApp.py:8625 FlatCAMApp.py:8656
 #, python-format
 msgid "[success] Project saved to: %s"
 msgstr "[success] Proiectul s-a salvat in: %s"
 
-#: FlatCAMApp.py:8609
+#: FlatCAMApp.py:8643
 #, python-format
 msgid "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Verificarea proiectului salvat a eșuat: %s. Incearcă să il "
 "salvezi din nou."
 
-#: FlatCAMApp.py:8616
+#: FlatCAMApp.py:8650
 #, python-format
 msgid "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Parsarea proiectului salvat a eșuat: %s. Incearcă să il "
 "salvezi din nou."
 
-#: FlatCAMApp.py:8624
+#: FlatCAMApp.py:8658
 #, python-format
 msgid "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
 msgstr ""
@@ -4441,7 +4441,7 @@ msgstr "Unealta Transformare\tALT+R"
 msgid "Enable Plot"
 msgstr "Activează Afișare"
 
-#: flatcamGUI/FlatCAMGUI.py:516 flatcamGUI/FlatCAMGUI.py:1588
+#: flatcamGUI/FlatCAMGUI.py:516
 msgid "Disable Plot"
 msgstr "Dezactivează Afișare"
 
@@ -6067,6 +6067,10 @@ msgstr ""
 "            </table>\n"
 "                    "
 
+#: flatcamGUI/FlatCAMGUI.py:1588
+msgid "Toggle Visibility"
+msgstr "Comută Vizibilitate"
+
 #: flatcamGUI/FlatCAMGUI.py:1589
 msgid "Toggle Panel"
 msgstr "Comută Panel"

BIN
locale/ru/LC_MESSAGES/strings.mo


+ 89 - 30
locale/ru/LC_MESSAGES/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 13:13+0300\n"
+"POT-Creation-Date: 2019-07-30 19:02+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andrey Kultyapov <camellan@yandex.ru>\n"
 "Language-Team: \n"
@@ -611,8 +611,8 @@ msgstr "Открыть файл конфигурации"
 msgid "[WARNING_NOTCL] Open Config cancelled."
 msgstr "[WARNING_NOTCL] Открытие конфигурации отменено."
 
-#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8701 FlatCAMApp.py:8721
-#: FlatCAMApp.py:8742 FlatCAMApp.py:8764
+#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8735 FlatCAMApp.py:8755
+#: FlatCAMApp.py:8776 FlatCAMApp.py:8798
 msgid "[WARNING_NOTCL] No object selected."
 msgstr "[WARNING_NOTCL] Нет выбранных объектов."
 
@@ -1226,33 +1226,33 @@ msgstr "[success] Выбранные участки включены..."
 msgid "[success] Selected plots disabled..."
 msgstr "[success] Выбранные участки отключены..."
 
-#: FlatCAMApp.py:8523 FlatCAMApp.py:8536
+#: FlatCAMApp.py:8523 FlatCAMApp.py:8550 FlatCAMApp.py:8567
 msgid "Working ..."
 msgstr "Обработка…"
 
-#: FlatCAMApp.py:8570
+#: FlatCAMApp.py:8604
 msgid "Saving FlatCAM Project"
 msgstr "Сохранение проекта FlatCAM"
 
-#: FlatCAMApp.py:8591 FlatCAMApp.py:8622
+#: FlatCAMApp.py:8625 FlatCAMApp.py:8656
 #, python-format
 msgid "[success] Project saved to: %s"
 msgstr "[success] Проект сохранён в: %s"
 
-#: FlatCAMApp.py:8609
+#: FlatCAMApp.py:8643
 #, python-format
 msgid "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Не удалось проверить файл проекта: %s. Повторите попытку."
 
-#: FlatCAMApp.py:8616
+#: FlatCAMApp.py:8650
 #, python-format
 msgid "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
 msgstr ""
 "[ERROR_NOTCL] Не удалось проанализировать сохраняемый файл проекта: %s. "
 "Повторите попытку сохранения."
 
-#: FlatCAMApp.py:8624
+#: FlatCAMApp.py:8658
 #, python-format
 msgid "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
 msgstr ""
@@ -1408,11 +1408,9 @@ msgid "[success] Tool added in Tool Table."
 msgstr "[success] Инструмент добавлен в таблицу инструментов."
 
 #: FlatCAMObj.py:3671
-#, fuzzy
-#| msgid "[ERROR_NOTCL] Default Tool added. Wrong value format entered."
 msgid "[WARNING_NOTCL] Default Tool added. Wrong value format entered."
 msgstr ""
-"[ERROR_NOTCL] Добавлен инструмент по умолчанию. Введен неправильный формат "
+"[WARNING_NOTCL] Добавлен инструмент по умолчанию. Введен неправильный формат "
 "значения."
 
 #: FlatCAMObj.py:3705 FlatCAMObj.py:3715
@@ -4374,7 +4372,7 @@ msgstr "Трансформировать\tALT+R"
 msgid "Enable Plot"
 msgstr "Включить участок"
 
-#: flatcamGUI/FlatCAMGUI.py:516 flatcamGUI/FlatCAMGUI.py:1588
+#: flatcamGUI/FlatCAMGUI.py:516
 msgid "Disable Plot"
 msgstr "Отключить участок"
 
@@ -5393,6 +5391,10 @@ msgid ""
 "                    "
 msgstr ""
 
+#: flatcamGUI/FlatCAMGUI.py:1588
+msgid "Toggle Visibility"
+msgstr "Переключить видимость"
+
 #: flatcamGUI/FlatCAMGUI.py:1589
 msgid "Toggle Panel"
 msgstr "Переключить бок. панель"
@@ -6467,11 +6469,16 @@ msgid ""
 "If TZ is checked then Trailing Zeros are removed\n"
 "and Leading Zeros are kept."
 msgstr ""
+"Это устанавливает тип нулей Гербера.\n"
+"Если LZ, то Ведущие нули удаляются и\n"
+"Замыкающие нули сохраняются.\n"
+"Если TZ отмечен, то завершающие нули удаляются\n"
+"и ведущие нули сохраняются."
 
 #: flatcamGUI/FlatCAMGUI.py:4322 flatcamGUI/FlatCAMGUI.py:4504
 #: flatcamGUI/FlatCAMGUI.py:4999 flatcamTools/ToolPcbWizard.py:111
 msgid "LZ"
-msgstr ""
+msgstr "LZ"
 
 #: flatcamGUI/FlatCAMGUI.py:4323 flatcamGUI/FlatCAMGUI.py:4505
 #: flatcamGUI/FlatCAMGUI.py:5000 flatcamTools/ToolPcbWizard.py:112
@@ -6686,7 +6693,7 @@ msgstr ""
 
 #: flatcamGUI/FlatCAMGUI.py:4555
 msgid "MH"
-msgstr ""
+msgstr "MH"
 
 #: flatcamGUI/FlatCAMGUI.py:4569
 msgid "Optimization Time:   "
@@ -7076,14 +7083,20 @@ msgid ""
 "Also it will have to be specified if LZ = leading zeros are kept\n"
 "or TZ = trailing zeros are kept."
 msgstr ""
+"Выберите тип используемого формата координат.\n"
+"Координаты могут быть сохранены с десятичной точкой или без.\n"
+"Когда нет десятичной точки, необходимо указать\n"
+"количество цифр для целой части и количество десятичных знаков.\n"
+"Также это должно быть указано, если LZ = ведущие нули сохраняются\n"
+"или TZ = конечные нули сохраняются."
 
 #: flatcamGUI/FlatCAMGUI.py:4975
 msgid "Decimal"
-msgstr ""
+msgstr "Десятичный"
 
 #: flatcamGUI/FlatCAMGUI.py:4976
 msgid "No-Decimal"
-msgstr ""
+msgstr "Не-десятичный"
 
 #: flatcamGUI/FlatCAMGUI.py:5002
 msgid ""
@@ -7093,6 +7106,11 @@ msgid ""
 "If TZ is checked then Trailing Zeros are kept\n"
 "and Leading Zeros are removed."
 msgstr ""
+"Это устанавливает тип по умолчанию нулей Excellon.\n"
+"Если LZ, то ведущие нули сохраняются и\n"
+"Замыкающие нули удаляются.\n"
+"Если проверен TZ, то сохраняются нулевые трейлеры\n"
+"и ведущие нули удаляются."
 
 #: flatcamGUI/FlatCAMGUI.py:5032
 msgid "A list of Excellon Editor parameters."
@@ -7106,6 +7124,11 @@ msgid ""
 "Increases the performance when moving a\n"
 "large number of geometric elements."
 msgstr ""
+"Установить количество выбранной геометрии Excellon\n"
+"предметы, над которыми полезна геометрия\n"
+"становится просто прямоугольником выбора.\n"
+"Увеличивает производительность при перемещении\n"
+"большое количество геометрических элементов."
 
 #: flatcamGUI/FlatCAMGUI.py:5054
 msgid "New Tool Dia:"
@@ -7117,7 +7140,7 @@ msgstr "<b>Линейный массив:</b>"
 
 #: flatcamGUI/FlatCAMGUI.py:5081
 msgid "Linear Dir.:"
-msgstr ""
+msgstr "инейное нап.:"
 
 #: flatcamGUI/FlatCAMGUI.py:5117
 msgid "<b>Circular Drill Array:</b>"
@@ -7125,7 +7148,7 @@ msgstr "<b>Круговой массив:</b>"
 
 #: flatcamGUI/FlatCAMGUI.py:5121
 msgid "Circular Dir.:"
-msgstr ""
+msgstr "Круговое нап.:"
 
 #: flatcamGUI/FlatCAMGUI.py:5123
 msgid ""
@@ -7137,7 +7160,7 @@ msgstr ""
 
 #: flatcamGUI/FlatCAMGUI.py:5134
 msgid "Circ. Angle:"
-msgstr ""
+msgstr "Круг. угол:"
 
 #: flatcamGUI/FlatCAMGUI.py:5151
 msgid "Geometry General"
@@ -7148,6 +7171,8 @@ msgid ""
 "The number of circle steps for <b>Geometry</b> \n"
 "circle and arc shapes linear approximation."
 msgstr ""
+"Количество шагов круга для <b>геометрии</b>\n"
+"линейная аппроксимация окружности и дуги"
 
 #: flatcamGUI/FlatCAMGUI.py:5178
 msgid "<b>Tools:</b>"
@@ -7155,7 +7180,7 @@ msgstr "<b>Инструменты:</b>"
 
 #: flatcamGUI/FlatCAMGUI.py:5184 flatcamGUI/FlatCAMGUI.py:5793
 msgid "Diameters of the cutting tools, separated by ','"
-msgstr ""
+msgstr "Диаметры режущих инструментов, разделенные знаком ','"
 
 #: flatcamGUI/FlatCAMGUI.py:5198
 msgid "Geometry Options"
@@ -7189,7 +7214,7 @@ msgstr "Мультипроход"
 
 #: flatcamGUI/FlatCAMGUI.py:5227
 msgid "Multidepth usage: True or False."
-msgstr ""
+msgstr "Многократное использование: Истина или Ложь."
 
 #: flatcamGUI/FlatCAMGUI.py:5232
 msgid "Depth/Pass:"
@@ -7203,6 +7228,11 @@ msgid ""
 "it is a fraction from the depth\n"
 "which has negative value."
 msgstr ""
+"Глубина резания на каждом проходе,\n"
+"когда multidepth включен.\n"
+"Это имеет положительное значение, хотя\n"
+"это доля от глубины\n"
+"который имеет отрицательное значение."
 
 #: flatcamGUI/FlatCAMGUI.py:5250 flatcamGUI/ObjectUI.py:1107
 msgid ""
@@ -7232,6 +7262,9 @@ msgid ""
 "plane in units per minute.\n"
 "It is called also Plunge."
 msgstr ""
+"Скорость резания в XY\n"
+"самолет в единицах в минуту.\n"
+"Это называется также Плунге."
 
 #: flatcamGUI/FlatCAMGUI.py:5298 flatcamGUI/ObjectUI.py:679
 #: flatcamGUI/ObjectUI.py:1217
@@ -7243,6 +7276,8 @@ msgid ""
 "The postprocessor file that dictates\n"
 "Machine Code output."
 msgstr ""
+"Файл постпроцессора, который диктует\n"
+"Вывод машинного кода."
 
 #: flatcamGUI/FlatCAMGUI.py:5357
 msgid "Geometry Adv. Options"
@@ -7321,6 +7356,11 @@ msgid ""
 "Increases the performance when moving a\n"
 "large number of geometric elements."
 msgstr ""
+"Установить номер выбранной геометрии\n"
+"предметы, над которыми полезна геометрия\n"
+"становится просто прямоугольником выбора.\n"
+"Увеличивает производительность при перемещении\n"
+"большое количество геометрических элементов."
 
 #: flatcamGUI/FlatCAMGUI.py:5520
 msgid "CNC Job General"
@@ -7333,7 +7373,7 @@ msgstr "Рисовать объекты"
 
 #: flatcamGUI/FlatCAMGUI.py:5540
 msgid "Plot kind:"
-msgstr ""
+msgstr "Рисовать участка:"
 
 #: flatcamGUI/FlatCAMGUI.py:5542 flatcamGUI/ObjectUI.py:1361
 msgid ""
@@ -7342,6 +7382,10 @@ msgid ""
 "above the work piece or it can be of type 'Cut',\n"
 "which means the moves that cut into the material."
 msgstr ""
+"Это выбирает вид геометрии на холсте для построения графика.\n"
+"Они могут быть любого типа «Путешествие», что означает ходы\n"
+"над заготовкой или она может быть типа \"Cut\",\n"
+"что означает ходы, которые врезаются в материал."
 
 #: flatcamGUI/FlatCAMGUI.py:5550 flatcamGUI/ObjectUI.py:1370
 msgid "Travel"
@@ -7357,6 +7401,10 @@ msgid ""
 "When checked it will display numbers in order for each end\n"
 "of a travel line."
 msgstr ""
+"Это выбирает, если отображать текстовую аннотацию на графике.\n"
+"Когда установлен этот флажок, он будет отображать числа в порядке для "
+"каждого конца\n"
+"линии путешествия."
 
 #: flatcamGUI/FlatCAMGUI.py:5573
 msgid "Annotation Size:"
@@ -7364,7 +7412,7 @@ msgstr "Размер аннотации:"
 
 #: flatcamGUI/FlatCAMGUI.py:5575
 msgid "The font size of the annotation text. In pixels."
-msgstr ""
+msgstr "Размер шрифта текста аннотации. В пикселях."
 
 #: flatcamGUI/FlatCAMGUI.py:5583
 msgid "Annotation Color:"
@@ -7481,6 +7529,8 @@ msgid ""
 "Check this box if you want to use\n"
 "a Custom Toolchange GCode (macro)."
 msgstr ""
+"Установите этот флажок, если хотите использовать\n"
+"пользовательский GCode смены инструментов (макрос)."
 
 #: flatcamGUI/FlatCAMGUI.py:5735 flatcamGUI/ObjectUI.py:1562
 msgid ""
@@ -7628,10 +7678,8 @@ msgid "Single"
 msgstr "Одиночный"
 
 #: flatcamGUI/FlatCAMGUI.py:5912 flatcamTools/ToolCutOut.py:86
-#, fuzzy
-#| msgid "Panel Tool"
 msgid "Panel"
-msgstr "Панелизация"
+msgstr "Панел"
 
 #: flatcamGUI/FlatCAMGUI.py:5918
 msgid ""
@@ -7686,7 +7734,7 @@ msgstr "Закруглять углы:"
 
 #: flatcamGUI/FlatCAMGUI.py:5960
 msgid "Create a convex shape surrounding the entire PCB."
-msgstr ""
+msgstr "Создайте выпуклую форму, окружающую печатную плату."
 
 #: flatcamGUI/FlatCAMGUI.py:5973
 msgid "2Sided Tool Options"
@@ -7723,11 +7771,11 @@ msgstr "Точка"
 
 #: flatcamGUI/FlatCAMGUI.py:6011 flatcamTools/ToolDblSided.py:132
 msgid "Box"
-msgstr ""
+msgstr "коробка"
 
 #: flatcamGUI/FlatCAMGUI.py:6012 flatcamTools/ToolDblSided.py:133
 msgid "Axis Ref:"
-msgstr ""
+msgstr "Ось ссылка:"
 
 #: flatcamGUI/FlatCAMGUI.py:6014
 msgid ""
@@ -7780,6 +7828,9 @@ msgid ""
 "FlatCAM object.\n"
 "The file is saved in SVG format."
 msgstr ""
+"Создайте фильм на печатной плате из Gerber или Geometry\n"
+"Объект FlatCAM.\n"
+"Файл сохраняется в формате SVG."
 
 #: flatcamGUI/FlatCAMGUI.py:6151 flatcamTools/ToolFilm.py:116
 msgid "Film Type:"
@@ -7816,6 +7867,14 @@ msgid ""
 "white color like the rest and which may confound with the\n"
 "surroundings if not for this border."
 msgstr ""
+"Укажите границу вокруг объекта.\n"
+"Только для негативного фильма.\n"
+"Это помогает, если мы используем в качестве объекта Box то же самое\n"
+"объект как в фильме объекта. Это создаст толстый\n"
+"черная полоса вокруг фактической печати с учетом\n"
+"лучшее разграничение контуров\n"
+"белый цвет как у остальных и который может смешаться с\n"
+"окружение, если бы не эта граница."
 
 #: flatcamGUI/FlatCAMGUI.py:6179 flatcamTools/ToolFilm.py:144
 msgid "Scale Stroke:"

+ 14 - 10
locale_template/strings.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-30 13:11+0300\n"
+"POT-Creation-Date: 2019-07-30 19:00+0300\n"
 "PO-Revision-Date: 2019-03-25 15:08+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "[WARNING_NOTCL] Open Config cancelled."
 msgstr ""
 
-#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8701 FlatCAMApp.py:8721
-#: FlatCAMApp.py:8742 FlatCAMApp.py:8764
+#: FlatCAMApp.py:6297 FlatCAMApp.py:6548 FlatCAMApp.py:8735 FlatCAMApp.py:8755
+#: FlatCAMApp.py:8776 FlatCAMApp.py:8798
 msgid "[WARNING_NOTCL] No object selected."
 msgstr ""
 
@@ -1083,30 +1083,30 @@ msgstr ""
 msgid "[success] Selected plots disabled..."
 msgstr ""
 
-#: FlatCAMApp.py:8523 FlatCAMApp.py:8536
+#: FlatCAMApp.py:8523 FlatCAMApp.py:8550 FlatCAMApp.py:8567
 msgid "Working ..."
 msgstr ""
 
-#: FlatCAMApp.py:8570
+#: FlatCAMApp.py:8604
 msgid "Saving FlatCAM Project"
 msgstr ""
 
-#: FlatCAMApp.py:8591 FlatCAMApp.py:8622
+#: FlatCAMApp.py:8625 FlatCAMApp.py:8656
 #, python-format
 msgid "[success] Project saved to: %s"
 msgstr ""
 
-#: FlatCAMApp.py:8609
+#: FlatCAMApp.py:8643
 #, python-format
 msgid "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
 msgstr ""
 
-#: FlatCAMApp.py:8616
+#: FlatCAMApp.py:8650
 #, python-format
 msgid "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
 msgstr ""
 
-#: FlatCAMApp.py:8624
+#: FlatCAMApp.py:8658
 #, python-format
 msgid "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
 msgstr ""
@@ -3931,7 +3931,7 @@ msgstr ""
 msgid "Enable Plot"
 msgstr ""
 
-#: flatcamGUI/FlatCAMGUI.py:516 flatcamGUI/FlatCAMGUI.py:1588
+#: flatcamGUI/FlatCAMGUI.py:516
 msgid "Disable Plot"
 msgstr ""
 
@@ -4939,6 +4939,10 @@ msgid ""
 "                    "
 msgstr ""
 
+#: flatcamGUI/FlatCAMGUI.py:1588
+msgid "Toggle Visibility"
+msgstr ""
+
 #: flatcamGUI/FlatCAMGUI.py:1589
 msgid "Toggle Panel"
 msgstr ""

Некоторые файлы не были показаны из-за большого количества измененных файлов