bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in camellan/flatcam/Beta (pull request #205)

Browse Source 
Beta
This commit is contained in:
Camellan
2019-09-16 17:33:53 +00:00
committed by Marius Stanciu
parent a2a4fc1cc4 1fb70b4672
commit f71e6992a1
5 changed files with 2843 additions and 4283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FlatCAMApp.py
View File

@@ -19,7 +19,6 @@ import shutil
from stat import S_IREAD, S_IRGRP, S_IROTH from stat import S_IREAD, S_IRGRP, S_IROTH
import subprocess import subprocess
import ctypes import ctypes
import winreg
import tkinter as tk import tkinter as tk
from PyQt5 import QtPrintSupport from PyQt5 import QtPrintSupport
@@ -62,6 +61,9 @@ import gettext
import FlatCAMTranslation as fcTranslate import FlatCAMTranslation as fcTranslate
import builtins import builtins
if sys.platform == 'win32':
import winreg
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__: if '_' not in builtins.__dict__:
_ = gettext.gettext _ = gettext.gettext
@@ -3878,12 +3880,12 @@ class App(QtCore.QObject):
"{title}<BR>" "{title}<BR>"
"<BR>" "<BR>"
"<BR>" "<BR>"
"<B>{devel}</B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" # "<B>{devel}</B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
"<a href = \"https://bitbucket.org/jpcgt/flatcam/src/Beta/\">here.</a><BR>" "<a href = \"https://bitbucket.org/jpcgt/flatcam/src/Beta/\"><B>{devel}</B></a><BR>"
"<b>{down}</B> area &nbsp;&nbsp;&nbsp;&nbsp;" # "<b>{down}</B> area &nbsp;&nbsp;&nbsp;&nbsp;"
"<a href = \"https://bitbucket.org/jpcgt/flatcam/downloads/\">here.</a><BR>" "<a href = \"https://bitbucket.org/jpcgt/flatcam/downloads/\"><b>{down}</B></a><BR>"
"<b> {issue}</B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" # "<b> {issue}</B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
"<a href = \"https://bitbucket.org/jpcgt/flatcam/issues?status=new&status=open/\">here.</a><BR>". "<a href = \"https://bitbucket.org/jpcgt/flatcam/issues?status=new&status=open/\"><B>{issue}</B></a><BR>".
format(title=_("2D Computer-Aided Printed Circuit Board Manufacturing"), format(title=_("2D Computer-Aided Printed Circuit Board Manufacturing"),
devel=_("Development"), down=_("DOWNLOAD"), issue=_("Issue tracker")) devel=_("Development"), down=_("DOWNLOAD"), issue=_("Issue tracker"))
) )

6
flatcamGUI/FlatCAMGUI.py
View File

@@ -7808,7 +7808,7 @@ class FAExcPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.exc_list_text) self.layout.addWidget(self.exc_list_text)
self.exc_list_btn = FCButton("Apply") self.exc_list_btn = FCButton(_("Apply"))
self.exc_list_btn.setToolTip(_("Apply the file associations between\n" self.exc_list_btn.setToolTip(_("Apply the file associations between\n"
"FlatCAM and the files with above extensions.\n" "FlatCAM and the files with above extensions.\n"
"They will be active after next logon.\n" "They will be active after next logon.\n"
@@ -7841,7 +7841,7 @@ class FAGcoPrefGroupUI(OptionsGroupUI):
self.layout.addWidget(self.gco_list_text) self.layout.addWidget(self.gco_list_text)
self.gco_list_btn = FCButton("Apply") self.gco_list_btn = FCButton(_("Apply"))
self.gco_list_btn.setToolTip(_("Apply the file associations between\n" self.gco_list_btn.setToolTip(_("Apply the file associations between\n"
"FlatCAM and the files with above extensions.\n" "FlatCAM and the files with above extensions.\n"
"They will be active after next logon.\n" "They will be active after next logon.\n"
@@ -7873,7 +7873,7 @@ class FAGrbPrefGroupUI(OptionsGroupUI):
font.setPointSize(12) font.setPointSize(12)
self.grb_list_text.setFont(font) self.grb_list_text.setFont(font)
self.grb_list_btn = FCButton("Apply") self.grb_list_btn = FCButton(_("Apply"))
self.grb_list_btn.setToolTip(_("Apply the file associations between\n" self.grb_list_btn.setToolTip(_("Apply the file associations between\n"
"FlatCAM and the files with above extensions.\n" "FlatCAM and the files with above extensions.\n"
"They will be active after next logon.\n" "They will be active after next logon.\n"

BIN
locale/ru/LC_MESSAGES/strings.mo
View File

Binary file not shown.

7076
locale/ru/LC_MESSAGES/strings.po
View File

File diff suppressed because it is too large Load Diff

4
locale_template/strings.pot
View File

@@ -8454,6 +8454,10 @@ msgid ""
"associated with FlatCAM." "associated with FlatCAM."
msgstr "" msgstr ""
#: flatcamGUI/FlatCAMGUI.py:7747 flatcamGUI/FlatCAMGUI.py:7780 flatcamGUI/FlatCAMGUI.py:7812
msgid "Apply"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:7748 flatcamGUI/FlatCAMGUI.py:7781 #: flatcamGUI/FlatCAMGUI.py:7748 flatcamGUI/FlatCAMGUI.py:7781
#: flatcamGUI/FlatCAMGUI.py:7813 #: flatcamGUI/FlatCAMGUI.py:7813
msgid "" msgid ""