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

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

Browse Source 
Beta
This commit is contained in:
Camellan
2019-06-08 21:27:01 +00:00
committed by Marius Stanciu
parent b824cf6471 facd8301ed
commit c7f65c38bc
9 changed files with 10195 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlatCAMApp.py
View File

@@ -8149,7 +8149,7 @@ class App(QtCore.QObject):
App.log.error("Unsupported file type: %s" % recent["kind"])
# Last action in Recent Files menu is one that Clear the content
clear_action = QtWidgets.QAction(QtGui.QIcon('share/trash32.png'), "Clear Recent files", self)
clear_action = QtWidgets.QAction(QtGui.QIcon('share/trash32.png'), (_("Clear Recent files")), self)
clear_action.triggered.connect(reset_recent)
self.ui.recent.addSeparator()
self.ui.recent.addAction(clear_action)

4
flatcamGUI/FlatCAMGUI.py
View File

@@ -3320,7 +3320,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
def __init__(self, parent=None):
super(GeneralGUIPrefGroupUI, self).__init__(self)
self.setTitle(str("GUI Preferences"))
self.setTitle(str(_("GUI Preferences")))
# Create a form layout for the Application general settings
self.form_box = QtWidgets.QFormLayout()
@@ -4074,7 +4074,7 @@ class GerberOptPrefGroupUI(OptionsGroupUI):
overlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n"
"A value here of 0.25 means an overlap of 25%% from the tool diameter found above.")
"A value here of 0.25 means an overlap of 25% from the tool diameter found above.")
)
grid0.addWidget(overlabel, 2, 0)
self.iso_overlap_entry = FloatEntry()

2
flatcamGUI/ObjectUI.py
View File

@@ -284,7 +284,7 @@ class GerberObjectUI(ObjectUI):
overlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n"
"A value here of 0.25 means an overlap of 25%% from the tool diameter found above.")
"A value here of 0.25 means an overlap of 25% from the tool diameter found above.")
)
overlabel.setFixedWidth(90)
grid1.addWidget(overlabel, 2, 0)

6
flatcamTools/ToolNonCopperClear.py
View File

@@ -196,9 +196,9 @@ class NonCopperClear(FlatCAMTool, Gerber):
)
grid3.addWidget(methodlabel, 3, 0)
self.ncc_method_radio = RadioSet([
{"label": "Standard", "value": "standard"},
{"label": "Seed-based", "value": "seed"},
{"label": "Straight lines", "value": "lines"}
{"label": _("Standard"), "value": "standard"},
{"label": _("Seed-based"), "value": "seed"},
{"label": _("Straight lines"), "value": "lines"}
], orientation='vertical', stretch=False)
grid3.addWidget(self.ncc_method_radio, 3, 1)

16
flatcamTools/ToolPaint.py
View File

@@ -160,14 +160,14 @@ class ToolPaint(FlatCAMTool, Gerber):
ovlabel = QtWidgets.QLabel(_('Overlap Rate:'))
ovlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n"
"A value here of 0.25 means 25% from the tool diameter found above.\n\n"
"Adjust the value starting with lower values\n"
"and increasing it if areas that should be painted are still \n"
"not painted.\n"
"Lower values = faster processing, faster execution on PCB.\n"
"Higher values = slow processing and slow execution on CNC\n"
"due of too many paths.")
"Example:\n"
"A value here of 0.25 means 25% from the tool diameter found above.\n\n"
"Adjust the value starting with lower values\n"
"and increasing it if areas that should be painted are still \n"
"not painted.\n"
"Lower values = faster processing, faster execution on PCB.\n"
"Higher values = slow processing and slow execution on CNC\n"
"due of too many paths.")
)
grid3.addWidget(ovlabel, 1, 0)
self.paintoverlap_entry = FCEntry()

2
flatcamTools/ToolSolderPaste.py
View File

@@ -139,7 +139,7 @@ class SolderPaste(FlatCAMTool):
grid0_1 = QtWidgets.QGridLayout()
self.layout.addLayout(grid0_1)
step1_lbl = QtWidgets.QLabel("<b>%s:</b>" % _('STEP 1'))
step1_lbl = QtWidgets.QLabel("<b>%s:</b>" % _('STEP 1:'))
step1_lbl.setToolTip(
_("First step is to select a number of nozzle tools for usage\n"
"and then optionally modify the GCode parameters bellow.")

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

Binary file not shown.

10146
locale/ru/LC_MESSAGES/strings.po Normal file
View File

File diff suppressed because it is too large Load Diff

34
locale_template/strings.pot
View File

@@ -950,7 +950,15 @@ msgstr ""
msgid "[ERROR_NOTCL] Failed to parse recent item list."
msgstr ""
<<<<<<< HEAD
#: FlatCAMApp.py:8093
msgid "Clear Recent files"
msgstr ""
#: FlatCAMApp.py:8110 flatcamGUI/FlatCAMGUI.py:973
=======
#: FlatCAMApp.py:8169 flatcamGUI/FlatCAMGUI.py:968
>>>>>>> remotes/jpcgt/flatcam/Beta
msgid "<b>Shortcut Key List</b>"
msgstr ""
@@ -1960,7 +1968,23 @@ msgstr ""
msgid "Method:"
msgstr ""
<<<<<<< HEAD
#: flatcamTools/ToolNonCopperClear.py:199
msgid "Standard"
msgstr ""
#: flatcamTools/ToolNonCopperClear.py:200
msgid "Seed-based"
msgstr ""
#: flatcamTools/ToolNonCopperClear.py:201
msgid "Straight lines"
msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:474 flatcamGUI/FlatCAMGUI.py:5905
=======
#: flatcamEditors/FlatCAMGeoEditor.py:474 flatcamGUI/FlatCAMGUI.py:6069
>>>>>>> remotes/jpcgt/flatcam/Beta
msgid ""
"Algorithm to paint the polygon:<BR><B>Standard</B>: Fixed step inwards."
"<BR><B>Seed-based</B>: Outwards from seed."
@@ -4965,7 +4989,15 @@ msgstr ""
msgid "Measurement Tool exit..."
msgstr ""
<<<<<<< HEAD
#: flatcamGUI/FlatCAMGUI.py:3325
msgid "GUI Preferences"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3331
=======
#: flatcamGUI/FlatCAMGUI.py:3329
>>>>>>> remotes/jpcgt/flatcam/Beta
msgid "Grid X value:"
msgstr ""
@@ -5469,7 +5501,7 @@ msgstr ""
msgid ""
"How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n"
"A value here of 0.25 means an overlap of 25%% from the tool diameter found "
"A value here of 0.25 means an overlap of 25% from the tool diameter found "
"above."
msgstr ""