Merged jpcgt/flatcam/Beta into Beta
This commit is contained in:
commit
c3505b434a
|
@ -9101,7 +9101,7 @@ class App(QtCore.QObject):
|
|||
|
||||
tsize = fsize + int(fsize / 2)
|
||||
|
||||
selected_text = _('''
|
||||
selected_text = (_('''
|
||||
<p><span style="font-size:{tsize}px"><strong>Selected Tab - Choose an Item from Project Tab</strong></span></p>
|
||||
|
||||
<p><span style="font-size:{fsize}px"><strong>Details</strong>:<br />
|
||||
|
@ -9123,7 +9123,7 @@ The normal flow when working in FlatCAM is the following:</span></p>
|
|||
|
||||
<p><span style="font-size:{fsize}px">A list of key shortcuts is available through an menu entry in <strong>Help -> Shortcuts List</strong> or through it's own key shortcut: <strng>F3</strong>.</span></p>
|
||||
|
||||
'''.format(fsize=fsize, tsize=tsize))
|
||||
''').format(fsize=fsize, tsize=tsize))
|
||||
|
||||
sel_title.setText(selected_text)
|
||||
sel_title.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -1061,8 +1061,7 @@ msgstr ""
|
|||
msgid "<b>Shortcut Key List</b>"
|
||||
msgstr ""
|
||||
|
||||
#: FlatCAMApp.py:8946
|
||||
#, python-brace-format
|
||||
#: FlatCAMApp.py:8954
|
||||
msgid ""
|
||||
"\n"
|
||||
"<p><span style=\"font-size:{tsize}px\"><strong>Selected Tab - Choose an Item "
|
||||
|
@ -2220,7 +2219,6 @@ msgstr ""
|
|||
|
||||
#: flatcamEditors/FlatCAMGeoEditor.py:447 flatcamGUI/FlatCAMGUI.py:6717
|
||||
#: flatcamTools/ToolPaint.py:207
|
||||
#, python-format
|
||||
msgid ""
|
||||
"How much (fraction) of the tool width to overlap each tool pass.\n"
|
||||
"Example:\n"
|
||||
|
@ -6048,7 +6046,6 @@ msgid "Pass overlap"
|
|||
msgstr ""
|
||||
|
||||
#: flatcamGUI/FlatCAMGUI.py:4314 flatcamGUI/ObjectUI.py:285
|
||||
#, python-format
|
||||
msgid ""
|
||||
"How much (fraction) of the tool width to overlap each tool pass.\n"
|
||||
"Example:\n"
|
||||
|
@ -7358,7 +7355,6 @@ msgid "Overlap Rate"
|
|||
msgstr ""
|
||||
|
||||
#: flatcamGUI/FlatCAMGUI.py:6386 flatcamTools/ToolNonCopperClear.py:203
|
||||
#, python-format
|
||||
msgid ""
|
||||
"How much (fraction) of the tool width to overlap each tool pass.\n"
|
||||
"Example:\n"
|
||||
|
|
Loading…
Reference in New Issue