- some strings changed to be easier for translation
- updated the .POT file and the translation files - updated and corrected the Romanian and Spanish translations - updated the .PO files for the rest of the translations, they need to be filled in.
This commit is contained in:
Marius Stanciu
Marius
parent
eeae3ff6c5
commit
183d4b7966
|
|
@ -10912,50 +10912,56 @@ class App(QtCore.QObject):
|
|||
# ''').format(fsize=fsize, tsize=tsize))
|
||||
|
||||
selected_text = '''
|
||||
<p><span style="font-size:{tsize}px"><strong>%s</strong></span></p>
|
||||
<p><span style="font-size:{tsize}px"><strong>{title}</strong></span></p>
|
||||
|
||||
<p><span style="font-size:{fsize}px"><strong>%s</strong>:<br />
|
||||
%s:</span></p>
|
||||
<p><span style="font-size:{fsize}px"><strong>{subtitle}</strong>:<br />
|
||||
{s1}</span></p>
|
||||
|
||||
<ol>
|
||||
<li><span style="font-size:{fsize}px">%s menu's, %s.<br />
|
||||
<li><span style="font-size:{fsize}px">{s2}<br />
|
||||
<br />
|
||||
%s & %s.</span><br />
|
||||
{s3}</span><br />
|
||||
</li>
|
||||
<li><span style="font-size:{fsize}px">{s4}<br />
|
||||
</li>
|
||||
<li><span style="font-size:{fsize}px">%s <strong>%s</strong> (%s), <strong>%s</strong> %s it-s %s.<br />
|
||||
<br />
|
||||
%s <strong>%s</strong> %s <strong>%s</strong> %s.<br />
|
||||
<li><span style="font-size:{fsize}px">{s5}<br />
|
||||
</li>
|
||||
<br />
|
||||
%s:<br />
|
||||
<li><span style="font-size:{fsize}px">{s6}<br />
|
||||
<br />
|
||||
<strong>%s</strong> -> %s -> %s -><strong> %s </strong> -> %s -> %s -><strong> %s
|
||||
</strong>-> %s <strong>%s) </strong>-> %s</span></li>
|
||||
{s7}</span></li>
|
||||
</ol>
|
||||
|
||||
<p><span style="font-size:{fsize}px">%s <strong>%s -> %s</strong> %s it's %s:
|
||||
<strong>F3</strong>.</span></p>
|
||||
''' % (
|
||||
_("Selected Tab - Choose an Item from Project Tab"), _("Details"),
|
||||
_("The normal flow when working in FlatCAM is the following"),
|
||||
_("Load/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG file into FlatCAM using either the"),
|
||||
_("toolbars, key shortcuts or even dragging and dropping the files on the GUI"),
|
||||
_("You can also load a FlatCAM project by double clicking on the project file, drag"),
|
||||
_("drop of the file into the FLATCAM GUI or through the menu/toolbar links offered within the app"),
|
||||
_("Once an object is available in the Project Tab, by selecting it and then focusing on"),
|
||||
_("SELECTED TAB"), _("more simpler is to double click the object name in the Project Tab"),
|
||||
_("SELECTED TAB"), _("will be updated with the object properties according to"),
|
||||
_("kind: Gerber, Excellon, Geometry or CNCJob object"),
|
||||
_("If the selection of the object is done on the canvas by single click instead, and the"),
|
||||
_("SELECTED TAB"),
|
||||
_("is in focus, again the object properties will be displayed into the Selected Tab. Alternatively, "
|
||||
"double clicking on the object on the canvas will bring the"),
|
||||
_("SELECTED TAB"), _("and populate it even if it was out of focus"),
|
||||
_("You can change the parameters in this screen and the flow direction is like this"),
|
||||
_("Gerber/Excellon Object"), _("Change Parameter"), _("Generate Geometry"), _("Geometry Object"),
|
||||
_("Add tools (change param in Selected Tab)"), _("Generate CNCJob"), _("CNCJob Object"),
|
||||
_("Verify GCode (through Edit CNC Code) and/or append/prepend to GCode (again, done in"), _("SELECTED TAB"),
|
||||
_("Save GCode"), _("A list of key shortcuts is available through an menu entry in"), _("Help"),
|
||||
_("Shortcuts List"), _("or through"), _("own key shortcut"),
|
||||
<p><span style="font-size:{fsize}px">{s8}</span></p>
|
||||
'''.format(
|
||||
title=_("Selected Tab - Choose an Item from Project Tab"),
|
||||
subtitle=_("Details"),
|
||||
|
||||
s1=_("The normal flow when working in FlatCAM is the following:"),
|
||||
s2=_("Load/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG file into FlatCAM "
|
||||
"using either the toolbars, key shortcuts or even dragging and dropping the "
|
||||
"files on the GUI."),
|
||||
s3=_("You can also load a FlatCAM project by double clicking on the project file, "
|
||||
"drag and drop of the file into the FLATCAM GUI or through the menu (or toolbar) "
|
||||
"actions offered within the app."),
|
||||
s4=_("Once an object is available in the Project Tab, by selecting it and then focusing "
|
||||
"on SELECTED TAB (more simpler is to double click the object name in the Project Tab, "
|
||||
"SELECTED TAB will be updated with the object properties according to its kind: "
|
||||
"Gerber, Excellon, Geometry or CNCJob object."),
|
||||
s5=_("If the selection of the object is done on the canvas by single click instead, "
|
||||
"and the SELECTED TAB is in focus, again the object properties will be displayed into the "
|
||||
"Selected Tab. Alternatively, double clicking on the object on the canvas will bring "
|
||||
"the SELECTED TAB and populate it even if it was out of focus."),
|
||||
s6=_("You can change the parameters in this screen and the flow direction is like this:"),
|
||||
s7=_("Gerber/Excellon Object --> Change Parameter --> Generate Geometry --> Geometry Object --> "
|
||||
"Add tools (change param in Selected Tab) --> Generate CNCJob --> CNCJob Object --> "
|
||||
"Verify GCode (through Edit CNC Code) and/or append/prepend to GCode "
|
||||
"(again, done in SELECTED TAB) --> Save GCode."),
|
||||
s8=_("A list of key shortcuts is available through an menu entry in Help --> Shortcuts List "
|
||||
"or through its own key shortcut: <b>F3</b>."),
|
||||
tsize=tsize,
|
||||
fsize=fsize
|
||||
)
|
||||
|
||||
sel_title.setText(selected_text)
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@ CAD program, and create G-Code for Isolation routing.
|
|||
- fixed the MultiColor plot option Gerber selected tab to work in legacy graphic engine
|
||||
- documented some methods in the ShapeCollectionLegacy class
|
||||
- updated the files: setup_ubuntu.sh and requirements.txt
|
||||
- some strings changed to be easier for translation
|
||||
- updated the .POT file and the translation files
|
||||
- updated and corrected the Romanian and Spanish translations
|
||||
- updated the .PO files for the rest of the translations, they need to be filled in.
|
||||
|
||||
21.09.2019
|
||||
|
||||
|
|
|
|||
|
|
@ -3438,7 +3438,7 @@ class Gerber (Geometry):
|
|||
return 'fail'
|
||||
|
||||
log.warning("Joining %d polygons." % len(poly_buffer))
|
||||
self.app.inform.emit('%s %d %s.' % (_("Gerber processing. Joining"), len(poly_buffer), _("polygons")))
|
||||
self.app.inform.emit('%s: %d.' % (_("Gerber processing. Joining polygons"), len(poly_buffer)))
|
||||
|
||||
if self.use_buffer_for_union:
|
||||
log.debug("Union by buffer...")
|
||||
|
|
|
|||
|
|
@ -3809,8 +3809,8 @@ class FlatCAMGrbEditor(QtCore.QObject):
|
|||
|
||||
# and then add it to the storage elements (each storage elements is a member of a list
|
||||
def job_thread(aperture_id):
|
||||
with self.app.proc_container.new('%s: %s %s...' %
|
||||
(_("Adding aperture"), str(aperture_id), _("geo"))):
|
||||
with self.app.proc_container.new('%s: %s ...' %
|
||||
(_("Adding geometry for aperture"), str(aperture_id))):
|
||||
storage_elem = []
|
||||
self.storage_dict[aperture_id] = {}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@ class Measurement(FlatCAMTool):
|
|||
self.units_value = QtWidgets.QLabel("%s" % str({'mm': _("METRIC (mm)"), 'in': _("INCH (in)")}[self.units]))
|
||||
self.units_value.setDisabled(True)
|
||||
|
||||
self.start_label = QtWidgets.QLabel("<b>%s</b> %s:" % (_('Start'), _('Coords')))
|
||||
self.start_label = QtWidgets.QLabel("%s:" % _('Start Coords'))
|
||||
self.start_label.setToolTip(_("This is measuring Start point coordinates."))
|
||||
|
||||
self.stop_label = QtWidgets.QLabel("<b>%s</b> %s:" % (_('Stop'), _('Coords')))
|
||||
self.stop_label = QtWidgets.QLabel("%s:" % _('Stop Coords'))
|
||||
self.stop_label.setToolTip(_("This is the measuring Stop point coordinates."))
|
||||
|
||||
self.distance_x_label = QtWidgets.QLabel('%s:' % _("Dx"))
|
||||
|
|
|
|||
|
|
@ -1241,13 +1241,15 @@ class ToolPaint(FlatCAMTool, Gerber):
|
|||
# poly = find_polygon(self.solid_geometry, inside_pt)
|
||||
if isinstance(obj, FlatCAMGerber):
|
||||
if self.app.defaults["gerber_buffering"] == 'no':
|
||||
self.app.inform.emit('%s %s' %
|
||||
(_("Paint Tool. Normal painting polygon task started."),
|
||||
self.app.inform.emit('%s %s %s' %
|
||||
(_("Paint Tool."), _("Normal painting polygon task started."),
|
||||
_("Buffering geometry...")))
|
||||
else:
|
||||
self.app.inform.emit(_("Paint Tool. Normal painting polygon task started."))
|
||||
self.app.inform.emit('%s %s' %
|
||||
(_("Paint Tool."), _("Normal painting polygon task started.")))
|
||||
else:
|
||||
self.app.inform.emit(_("Paint Tool. Normal painting polygon task started."))
|
||||
self.app.inform.emit('%s %s' %
|
||||
(_("Paint Tool."), _("Normal painting polygon task started.")))
|
||||
|
||||
if isinstance(obj, FlatCAMGerber):
|
||||
if self.app.defaults["tools_paint_plotting"] == 'progressive':
|
||||
|
|
@ -1285,7 +1287,8 @@ class ToolPaint(FlatCAMTool, Gerber):
|
|||
return
|
||||
|
||||
proc = self.app.proc_container.new(_("Painting polygon..."))
|
||||
self.app.inform.emit('%s: %s' % (_("Paint Tool. Painting polygon at location"), str(inside_pt)))
|
||||
self.app.inform.emit('%s %s: %s' %
|
||||
(_("Paint Tool."), _("Painting polygon at location"), str(inside_pt)))
|
||||
|
||||
name = outname if outname is not None else self.obj_name + "_paint"
|
||||
|
||||
|
|
@ -1811,13 +1814,15 @@ class ToolPaint(FlatCAMTool, Gerber):
|
|||
log.debug("Paint Tool. Rest machining painting all task started.")
|
||||
if isinstance(obj, FlatCAMGerber):
|
||||
if app_obj.defaults["gerber_buffering"] == 'no':
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool. Rest machining painting all task started."),
|
||||
app_obj.inform.emit('%s %s %s' %
|
||||
(_("Paint Tool."), _("Rest machining painting all task started."),
|
||||
_("Buffering geometry...")))
|
||||
else:
|
||||
app_obj.inform.emit(_("Paint Tool. Rest machining painting all task started."))
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool."), _("Rest machining painting all task started.")))
|
||||
else:
|
||||
app_obj.inform.emit(_("Paint Tool. Rest machining painting all task started."))
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool."), _("Rest machining painting all task started.")))
|
||||
|
||||
tool_dia = None
|
||||
sorted_tools.sort(reverse=True)
|
||||
|
|
@ -2098,13 +2103,16 @@ class ToolPaint(FlatCAMTool, Gerber):
|
|||
log.debug("Paint Tool. Normal painting area task started.")
|
||||
if isinstance(obj, FlatCAMGerber):
|
||||
if app_obj.defaults["gerber_buffering"] == 'no':
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool. Normal painting area task started."),
|
||||
app_obj.inform.emit('%s %s %s' %
|
||||
(_("Paint Tool."),
|
||||
_("Normal painting area task started."),
|
||||
_("Buffering geometry...")))
|
||||
else:
|
||||
app_obj.inform.emit(_("Paint Tool. Normal painting area task started."))
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool."), _("Normal painting area task started.")))
|
||||
else:
|
||||
app_obj.inform.emit(_("Paint Tool. Normal painting area task started."))
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool."), _("Normal painting area task started.")))
|
||||
|
||||
tool_dia = None
|
||||
if order == 'fwd':
|
||||
|
|
@ -2277,13 +2285,15 @@ class ToolPaint(FlatCAMTool, Gerber):
|
|||
log.debug("Paint Tool. Rest machining painting area task started.")
|
||||
if isinstance(obj, FlatCAMGerber):
|
||||
if app_obj.defaults["gerber_buffering"] == 'no':
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool. Rest machining painting area task started."),
|
||||
app_obj.inform.emit('%s %s %s' %
|
||||
(_("Paint Tool."),
|
||||
_("Rest machining painting area task started."),
|
||||
_("Buffering geometry...")))
|
||||
else:
|
||||
app_obj.inform.emit(_("Paint Tool. Rest machining painting area task started."))
|
||||
else:
|
||||
app_obj.inform.emit(_("Paint Tool. Rest machining painting area task started."))
|
||||
app_obj.inform.emit('%s %s' %
|
||||
(_("Paint Tool."), _("Rest machining painting area task started.")))
|
||||
|
||||
tool_dia = None
|
||||
sorted_tools.sort(reverse=True)
|
||||
|
|
|
|||
|
|
@ -772,8 +772,8 @@ class Panelize(FlatCAMTool):
|
|||
currenty += lenghty
|
||||
|
||||
if panel_type == 'gerber':
|
||||
self.app.inform.emit('%s %s' %
|
||||
(_("Generating panel ..."), _("Adding the Gerber code.")))
|
||||
self.app.inform.emit('%s' %
|
||||
_("Generating panel ... Adding the Gerber code."))
|
||||
obj_fin.source_file = self.app.export_gerber(obj_name=self.outname, filename=None,
|
||||
local_use=obj_fin, use_thread=False)
|
||||
|
||||
|
|
@ -784,8 +784,8 @@ class Panelize(FlatCAMTool):
|
|||
# app_obj.log.debug("Finished creating a cascaded union for the panel.")
|
||||
self.app.proc_container.update_view_text('')
|
||||
|
||||
self.app.inform.emit('%s %s: %d' %
|
||||
(_("Generating panel ..."), _("Spawning copies"), (int(rows * columns))))
|
||||
self.app.inform.emit('%s: %d' %
|
||||
(_("Generating panel... Spawning copies"), (int(rows * columns))))
|
||||
if isinstance(panel_obj, FlatCAMExcellon):
|
||||
self.app.progress.emit(50)
|
||||
self.app.new_object("excellon", self.outname, job_init_excellon, plot=True, autoselected=True)
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ class ToolSub(FlatCAMTool):
|
|||
|
||||
log.debug("Working on promise: %s" % str(apid))
|
||||
|
||||
with self.app.proc_container.new('%s %s %s...' % (_("Parsing aperture", str(apid), _("geometry")))):
|
||||
with self.app.proc_container.new('%s: %s...' % (_("Parsing geometry for aperture", str(apid)))):
|
||||
for geo_el in geo:
|
||||
new_el = dict()
|
||||
|
||||
|
|
@ -520,7 +520,7 @@ class ToolSub(FlatCAMTool):
|
|||
if tool == "single":
|
||||
text = _("Parsing solid_geometry ...")
|
||||
else:
|
||||
text = '%s %s %s...' % (_("Parsing tool"), str(tool), _("geometry"))
|
||||
text = '%s: %s...' % (_("Parsing solid_geometry for tool"), str(tool))
|
||||
|
||||
with self.app.proc_container.new(text):
|
||||
# resulting paths are closed resulting into Polygons
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue