- 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
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user