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

- fixed some of the strings that were left in the old way

Browse Source 
- updated the POT file
- updated Romanian language partially
This commit is contained in:
Marius Stanciu
2019-09-13 18:27:00 +03:00
parent 6ea9b80ad6
commit f6cd63021e
21 changed files with 10467 additions and 9636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatcamTools/ToolCutOut.py
View File

@@ -572,7 +572,7 @@ class CutOut(FlatCAMTool):
return "Could not retrieve object: %s" % name
if cutout_obj is None:
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Object not found: %s"), cutout_obj))
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Object not found"), str(name)))
try:
dia = float(self.dia.get_value())

4
flatcamTools/ToolNonCopperClear.py
View File

@@ -1080,11 +1080,11 @@ class NonCopperClear(FlatCAMTool, Gerber):
try:
self.ncc_obj = self.app.collection.get_by_name(self.obj_name)
except Exception as e:
self.app.inform.emit('[ERROR_NOTCL] %s' % _("Could not retrieve object: %s") % self.obj_name)
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), str(self.obj_name)))
return "Could not retrieve object: %s" % self.obj_name
if self.ncc_obj is None:
self.app.inform.emit('[ERROR_NOTCL] %s' % _("Object not found: %s") % self.ncc_obj)
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Object not found"), str(self.obj_name)))
return
# use the selected tools in the tool table; get diameters for non-copper clear

2
flatcamTools/ToolPDF.py
View File

@@ -217,7 +217,7 @@ class ToolPDF(FlatCAMTool):
time.sleep(0.1)
except Exception as e:
log.debug("ToolPDF.open_pdf() --> %s" % str(e))
self.app.inform.emit(_("[success] Opened: %s") % filename)
self.app.inform.emit('[success] %s: %s' % (_("Opened"), str(filename)))
def layer_rendering_as_excellon(self, filename, ap_dict, layer_nr):
outname = filename.split('/')[-1].split('\\')[-1] + "_%s" % str(layer_nr)

20
flatcamTools/ToolPaint.py
View File

@@ -1233,11 +1233,11 @@ class ToolPaint(FlatCAMTool, Gerber):
# No polygon?
if poly is None:
self.app.log.warning('No polygon found.')
self.app.inform.emit(_('[WARNING] No polygon found.'))
self.app.inform.emit('[WARNING] %s' % _('No polygon found.'))
return
proc = self.app.proc_container.new(_("Painting polygon..."))
self.app.inform.emit(_("Paint Tool. Painting polygon at location: %s") % str(inside_pt))
self.app.inform.emit('%s: %s' % (_("Paint Tool. Painting polygon at location"), str(inside_pt)))
name = outname if outname is not None else self.obj_name + "_paint"
@@ -1748,7 +1748,7 @@ class ToolPaint(FlatCAMTool, Gerber):
# print("Indexing...", end=' ')
# geo_obj.make_index()
self.app.inform.emit(_("[success] Paint All Done."))
self.app.inform.emit('[success] %s' % _("Paint All Done."))
# Initializes the new geometry object
def gen_paintarea_rest_machining(geo_obj, app_obj):
@@ -2149,9 +2149,9 @@ class ToolPaint(FlatCAMTool, Gerber):
return "fail"
except Exception as e:
log.debug("Could not Paint the polygons. %s" % str(e))
self.app.inform.emit('[ERROR] %s' %
_("Could not do Paint All. Try a different combination of parameters. "
"Or a different Method of paint\n%s") % str(e))
self.app.inform.emit('[ERROR] %s\n%s' %
(_("Could not do Paint All. Try a different combination of parameters. "
"Or a different Method of paint"), str(e)))
return
pol_nr += 1
@@ -2209,7 +2209,7 @@ class ToolPaint(FlatCAMTool, Gerber):
# print("Indexing...", end=' ')
# geo_obj.make_index()
self.app.inform.emit(_("[success] Paint Area Done."))
self.app.inform.emit('[success] %s' % _("Paint Area Done."))
# Initializes the new geometry object
def gen_paintarea_rest_machining(geo_obj, app_obj):
@@ -2307,9 +2307,9 @@ class ToolPaint(FlatCAMTool, Gerber):
return "fail"
except Exception as e:
log.debug("Could not Paint the polygons. %s" % str(e))
self.app.inform.emit('[ERROR] %s' %
_("Could not do Paint All. Try a different combination of parameters. "
"Or a different Method of paint\n%s") % str(e))
self.app.inform.emit('[ERROR] %s\n%s' %
(_("Could not do Paint All. Try a different combination of parameters. "
"Or a different Method of paint"), str(e)))
return
pol_nr += 1

2
flatcamTools/ToolShell.py
View File

@@ -68,7 +68,7 @@ class TermWidget(QWidget):
if detail is None:
self._edit.setPlainText(_("...proccessing..."))
else:
self._edit.setPlainText(_("...proccessing... [%s]") % detail)
self._edit.setPlainText('%s [%s]' % (_("...proccessing..."), detail))
self._edit.setDisabled(True)
self._edit.setFocus()

4
flatcamTools/ToolSub.py
View File

@@ -311,7 +311,7 @@ class ToolSub(FlatCAMTool):
log.debug("Working on promise: %s" % str(apid))
with self.app.proc_container.new(_("Parsing aperture %s geometry ..." % str(apid))):
with self.app.proc_container.new('%s %s %s...' % (_("Parsing aperture", str(apid), _("geometry")))):
for geo_el in geo:
new_el = dict()
@@ -520,7 +520,7 @@ class ToolSub(FlatCAMTool):
if tool == "single":
text = _("Parsing solid_geometry ...")
else:
text = _("Parsing tool %s geometry ...") % str(tool)
text = '%s %s %s...' % (_("Parsing tool"), str(tool), _("geometry"))
with self.app.proc_container.new(text):
# resulting paths are closed resulting into Polygons

3
flatcamTools/ToolTransform.py
View File

@@ -800,7 +800,8 @@ class ToolTransform(FlatCAMTool):
sel_obj.options['skew_y'] = num
self.app.object_changed.emit(sel_obj)
sel_obj.plot()
self.app.inform.emit(_('[success] Skew on the %s axis done ...') % str(axis))
self.app.inform.emit('[success] %s %s %s...' %
(_('Skew on the'), str(axis), _("axis done")))
self.app.progress.emit(100)
except Exception as e: