diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 4dd32460..e1924f2d 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -2221,7 +2221,7 @@ class App(QtCore.QObject): # set call source to the Editor we go into self.call_source = 'exc_editor' else: - self.inform.emit(_("[WARNING_NOTCL]Select a Geometry or Excellon Object to edit.")) + self.inform.emit(_("[WARNING_NOTCL] Select a Geometry or Excellon Object to edit.")) return # make sure that we can't select another object while in Editor Mode: @@ -2232,7 +2232,7 @@ class App(QtCore.QObject): self.ui.plot_tab_area.setTabText(0, "EDITOR Area") self.ui.plot_tab_area.protectTab(0) - self.inform.emit(_("[WARNING_NOTCL]Editor is activated ...")) + self.inform.emit(_("[WARNING_NOTCL] Editor is activated ...")) self.should_we_save = True @@ -2280,7 +2280,7 @@ class App(QtCore.QObject): self.exc_editor.deactivate() else: - self.inform.emit(_("[WARNING_NOTCL]Select a Geometry or Excellon Object to update.")) + self.inform.emit(_("[WARNING_NOTCL] Select a Geometry or Excellon Object to update.")) return # if notebook is hidden we show it @@ -2657,7 +2657,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]FlatCAM preferences import cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] FlatCAM preferences import cancelled.")) else: try: f = open(filename) @@ -2676,7 +2676,7 @@ class App(QtCore.QObject): self.inform.emit(_("[ERROR_NOTCL] Failed to parse defaults file.")) return self.defaults.update(defaults_from_file) - self.inform.emit(_("[success]Imported Defaults from %s") %filename) + self.inform.emit(_("[success] Imported Defaults from %s") %filename) def on_export_preferences(self): @@ -2696,7 +2696,7 @@ class App(QtCore.QObject): defaults_from_file = {} if filename == "": - self.inform.emit(_("[WARNING_NOTCL]FlatCAM preferences export cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] FlatCAM preferences export cancelled.")) return else: try: @@ -2712,7 +2712,7 @@ class App(QtCore.QObject): e = sys.exc_info()[0] App.log.error("Could not load defaults file.") App.log.error(str(e)) - self.inform.emit(_("[ERROR_NOTCL]Could not load defaults file.")) + self.inform.emit(_("[ERROR_NOTCL] Could not load defaults file.")) return try: @@ -2735,7 +2735,7 @@ class App(QtCore.QObject): return self.file_saved.emit("preferences", filename) - self.inform.emit("[success]Exported Defaults to %s" % filename) + self.inform.emit("[success] Exported Defaults to %s" % filename) def on_preferences_open_folder(self): self.report_usage("on_preferences_open_folder()") @@ -2746,7 +2746,7 @@ class App(QtCore.QObject): os.system('open "%s"' % self.data_path) else: subprocess.Popen(['xdg-open', self.data_path]) - self.inform.emit("[success]FlatCAM Preferences Folder opened.") + self.inform.emit("[success] FlatCAM Preferences Folder opened.") def save_geometry(self, x, y, width, height, notebook_width): self.defaults["global_def_win_x"] = x @@ -2783,7 +2783,7 @@ class App(QtCore.QObject): f = open(self.data_path + '/recent.json', 'w') except IOError: App.log.error("Failed to open recent items file for writing.") - self.inform.emit(_('[ERROR_NOTCL]Failed to open recent files file for writing.')) + self.inform.emit(_('[ERROR_NOTCL] Failed to open recent files file for writing.')) return #try: @@ -2947,16 +2947,16 @@ class App(QtCore.QObject): # self.inform.emit('[selected] %s created & selected: %s' % # (str(obj.kind).capitalize(), str(obj.options['name']))) if obj.kind == 'gerber': - self.inform.emit(_('[selected]{kind} created/selected: {name}').format( + self.inform.emit(_('[selected] {kind} created/selected: {name}').format( kind=obj.kind.capitalize(), color='green', name=str(obj.options['name']))) elif obj.kind == 'excellon': - self.inform.emit(_('[selected]{kind} created/selected: {name}').format( + self.inform.emit(_('[selected] {kind} created/selected: {name}').format( kind=obj.kind.capitalize(), color='brown', name=str(obj.options['name']))) elif obj.kind == 'cncjob': - self.inform.emit(_('[selected]{kind} created/selected: {name}').format( + self.inform.emit(_('[selected] {kind} created/selected: {name}').format( kind=obj.kind.capitalize(), color='blue', name=str(obj.options['name']))) elif obj.kind == 'geometry': - self.inform.emit(_('[selected]{kind} created/selected: {name}').format( + self.inform.emit(_('[selected] {kind} created/selected: {name}').format( kind=obj.kind.capitalize(), color='red', name=str(obj.options['name']))) # update the SHELL auto-completer model with the name of the new object @@ -3200,7 +3200,7 @@ class App(QtCore.QObject): self.defaults["global_toolbar_view"] = tb_status if not silent: - self.inform.emit(_("[success]Defaults saved.")) + self.inform.emit(_("[success] Defaults saved.")) def save_factory_defaults(self, silent=False): """ @@ -3357,7 +3357,7 @@ class App(QtCore.QObject): for obj in objs: if not isinstance(obj, FlatCAMExcellon): - self.inform.emit(_("[ERROR_NOTCL]Failed. Excellon joining works only on Excellon objects.")) + self.inform.emit(_("[ERROR_NOTCL] Failed. Excellon joining works only on Excellon objects.")) return def initialize(obj, app): @@ -3379,7 +3379,7 @@ class App(QtCore.QObject): for obj in objs: if not isinstance(obj, FlatCAMGerber): - self.inform.emit(_("[ERROR_NOTCL]Failed. Gerber joining works only on Gerber objects.")) + self.inform.emit(_("[ERROR_NOTCL] Failed. Gerber joining works only on Gerber objects.")) return def initialize(obj, app): @@ -3394,11 +3394,11 @@ class App(QtCore.QObject): obj = self.collection.get_active() if obj is None: - self.inform.emit(_("[ERROR_NOTCL]Failed. Select a Geometry Object and try again.")) + self.inform.emit(_("[ERROR_NOTCL] Failed. Select a Geometry Object and try again.")) return if not isinstance(obj, FlatCAMGeometry): - self.inform.emit(_("[ERROR_NOTCL]Expected a FlatCAMGeometry, got %s") % type(obj)) + self.inform.emit(_("[ERROR_NOTCL] Expected a FlatCAMGeometry, got %s") % type(obj)) return obj.multigeo = True @@ -3419,11 +3419,11 @@ class App(QtCore.QObject): obj = self.collection.get_active() if obj is None: - self.inform.emit(_("[ERROR_NOTCL]Failed. Select a Geometry Object and try again.")) + self.inform.emit(_("[ERROR_NOTCL] Failed. Select a Geometry Object and try again.")) return if not isinstance(obj, FlatCAMGeometry): - self.inform.emit(_("[ERROR_NOTCL]Expected a FlatCAMGeometry, got %s") % type(obj)) + self.inform.emit(_("[ERROR_NOTCL] Expected a FlatCAMGeometry, got %s") % type(obj)) return obj.multigeo = False @@ -3623,7 +3623,7 @@ class App(QtCore.QObject): current.to_form() self.plot_all() - self.inform.emit(_("[success]Converted units to %s") % self.defaults["units"]) + self.inform.emit(_("[success] Converted units to %s") % self.defaults["units"]) # self.ui.units_label.setText("[" + self.options["units"] + "]") self.set_screen_units(self.defaults["units"]) else: @@ -3634,7 +3634,7 @@ class App(QtCore.QObject): else: self.ui.general_defaults_form.general_app_group.units_radio.set_value('MM') self.toggle_units_ignore = False - self.inform.emit(_("[WARNING_NOTCL]Units conversion cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Units conversion cancelled.")) self.options_read_form() self.defaults_read_form() @@ -4244,7 +4244,7 @@ class App(QtCore.QObject): filename = str(QtWidgets.QFileDialog.getSaveFileName(caption=_("Export G-Code ..."), filter=_filter_)[0]) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]Export Code cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Export Code cancelled.")) return else: try: @@ -5014,7 +5014,7 @@ class App(QtCore.QObject): name = obj.options["name"] except AttributeError: log.debug("on_copy_name() --> No object selected to copy it's name") - self.inform.emit(_("[WARNING_NOTCL]No object selected to copy it's name")) + self.inform.emit(_("[WARNING_NOTCL] No object selected to copy it's name")) return self.clipboard.setText(name) @@ -5666,7 +5666,7 @@ class App(QtCore.QObject): filenames = [str(filename) for filename in filenames] if len(filenames) == 0: - self.inform.emit(_("[WARNING_NOTCL]Open Excellon cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Open Excellon cancelled.")) else: for filename in filenames: if filename != '': @@ -5696,7 +5696,7 @@ class App(QtCore.QObject): filenames = [str(filename) for filename in filenames] if len(filenames) == 0: - self.inform.emit(_("[WARNING_NOTCL]Open G-Code cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Open G-Code cancelled.")) else: for filename in filenames: if filename != '': @@ -5725,7 +5725,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]Open Project cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Open Project cancelled.")) else: # self.worker_task.emit({'fcn': self.open_project, # 'params': [filename]}) @@ -5751,7 +5751,7 @@ class App(QtCore.QObject): filter = _filter_) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]Open Config cancelled.")) + self.inform.emit(_("[WARNING_NOTCL Open Config cancelled.")) else: self.open_config_file(filename) @@ -5800,7 +5800,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]Export SVG cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Export SVG cancelled.")) return else: self.export_svg(name, filename) @@ -5946,7 +5946,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]Export Excellon cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Export Excellon cancelled.")) return else: self.export_excellon(name, filename) @@ -6055,7 +6055,7 @@ class App(QtCore.QObject): filenames = [str(filename) for filename in filenames] if len(filenames) == 0: - self.inform.emit(_("[WARNING_NOTCL]Open DXF cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Open DXF cancelled.")) else: for filename in filenames: if filename != '': @@ -6179,7 +6179,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]Open TCL script cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Open TCL script cancelled.")) else: self.on_filenewscript() @@ -6228,7 +6228,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit(_("[WARNING_NOTCL]Run TCL script cancelled.")) + self.inform.emit(_("[WARNING_NOTCL] Run TCL script cancelled.")) else: try: with open(filename, "r") as tcl_script: @@ -6392,7 +6392,7 @@ class App(QtCore.QObject): return "Could not retrieve object: %s" % box_name if box is None: - self.inform.emit(_("[WARNING_NOTCL]No object Box. Using instead %s") % obj) + self.inform.emit(_("[WARNING_NOTCL] No object Box. Using instead %s") % obj) box = obj def make_negative_film(): @@ -6512,7 +6512,7 @@ class App(QtCore.QObject): return "Could not retrieve object: %s" % box_name if box is None: - self.inform.emit(_("[WARNING_NOTCL]No object Box. Using instead %s") % obj) + self.inform.emit(_("[WARNING_NOTCL] No object Box. Using instead %s") % obj) box = obj def make_black_film(): @@ -7791,19 +7791,19 @@ The normal flow when working in FlatCAM is the following:
self.report_usage("disable_all_plots()") self.disable_plots(self.collection.get_list()) - self.inform.emit(_("[success]All plots disabled.")) + self.inform.emit(_("[success] All plots disabled.")) def disable_other_plots(self): self.report_usage("disable_other_plots()") self.disable_plots(self.collection.get_non_selected()) - self.inform.emit(_("[success]All non selected plots disabled.")) + self.inform.emit(_("[success] All non selected plots disabled.")) def enable_all_plots(self): self.report_usage("enable_all_plots()") self.enable_plots(self.collection.get_list()) - self.inform.emit(_("[success]All plots enabled.")) + self.inform.emit(_("[success] All plots enabled.")) # TODO: FIX THIS ''' diff --git a/FlatCAMEditor.py b/FlatCAMEditor.py index 1a955134..66ecbd0e 100644 --- a/FlatCAMEditor.py +++ b/FlatCAMEditor.py @@ -1057,7 +1057,7 @@ class TransformEditorTool(FlatCAMTool): try: value = float(self.rotate_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Rotate, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Rotate, " "use a number.")) return self.app.worker_task.emit({'fcn': self.on_rotate_action, @@ -1094,7 +1094,7 @@ class TransformEditorTool(FlatCAMTool): try: value = float(self.skewx_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew X, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew X, " "use a number.")) return @@ -1115,7 +1115,7 @@ class TransformEditorTool(FlatCAMTool): try: value = float(self.skewy_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew Y, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew Y, " "use a number.")) return @@ -1136,7 +1136,7 @@ class TransformEditorTool(FlatCAMTool): try: xvalue = float(self.scalex_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale X, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale X, " "use a number.")) return @@ -1173,7 +1173,7 @@ class TransformEditorTool(FlatCAMTool): try: yvalue = float(self.scaley_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale Y, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale Y, " "use a number.")) return @@ -1205,7 +1205,7 @@ class TransformEditorTool(FlatCAMTool): try: value = float(self.offx_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset X, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset X, " "use a number.")) return @@ -1226,7 +1226,7 @@ class TransformEditorTool(FlatCAMTool): try: value = float(self.offy_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset Y, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset Y, " "use a number.")) return @@ -1922,7 +1922,7 @@ class FCCircle(FCShapeTool): radius = distance(p1, p2) self.geometry = DrawToolShape(Point(p1).buffer(radius, int(self.steps_per_circ / 4))) self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Adding Circle completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Adding Circle completed.")) class FCArc(FCShapeTool): @@ -2108,7 +2108,7 @@ class FCArc(FCShapeTool): self.geometry = DrawToolShape(LineString(arc(center, radius, startangle, stopangle, self.direction, self.steps_per_circ))) self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Arc completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Arc completed.")) class FCRectangle(FCShapeTool): @@ -2148,7 +2148,7 @@ class FCRectangle(FCShapeTool): # self.geometry = LinearRing([p1, (p2[0], p1[1]), p2, (p1[0], p2[1])]) self.geometry = DrawToolShape(Polygon([p1, (p2[0], p1[1]), p2, (p1[0], p2[1])])) self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Rectangle completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Rectangle completed.")) class FCPolygon(FCShapeTool): @@ -2190,7 +2190,7 @@ class FCPolygon(FCShapeTool): self.geometry = DrawToolShape(Polygon(self.points)) self.draw_app.in_action = False self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Polygon completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Polygon completed.")) def on_key(self, key): if key == 'backspace': @@ -2209,7 +2209,7 @@ class FCPath(FCPolygon): self.draw_app.in_action = False self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Path completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Path completed.")) def utility_geometry(self, data=None): if len(self.points) > 0: @@ -2507,7 +2507,7 @@ class FCMove(FCShapeTool): # self.draw_app.set_selected(g) self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Geometry(s) Move completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Geometry(s) Move completed.")) def utility_geometry(self, data=None): """ @@ -2552,7 +2552,7 @@ class FCCopy(FCMove): self.geometry = [DrawToolShape(affinity.translate(geom.geo, xoff=dx, yoff=dy)) for geom in self.draw_app.get_selected()] self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Geometry(s) Copy completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Geometry(s) Copy completed.")) class FCText(FCShapeTool): @@ -2588,7 +2588,7 @@ class FCText(FCShapeTool): self.text_gui.text_path = [] self.text_gui.hide_tool() self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Adding Text completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Adding Text completed.")) def utility_geometry(self, data=None): """ @@ -2649,7 +2649,7 @@ class FCBuffer(FCShapeTool): self.draw_app.app.ui.splitter.setSizes([0, 1]) self.disactivate() - self.draw_app.app.inform.emit(_("[success]Done. Buffer Tool completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Buffer Tool completed.")) def on_buffer_int(self): if not self.draw_app.selected: @@ -2675,7 +2675,7 @@ class FCBuffer(FCShapeTool): self.draw_app.app.ui.splitter.setSizes([0, 1]) self.disactivate() - self.draw_app.app.inform.emit(_("[success]Done. Buffer Int Tool completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Buffer Int Tool completed.")) def on_buffer_ext(self): if not self.draw_app.selected: @@ -2701,7 +2701,7 @@ class FCBuffer(FCShapeTool): self.draw_app.app.ui.splitter.setSizes([0, 1]) self.disactivate() - self.draw_app.app.inform.emit(_("[success]Done. Buffer Ext Tool completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Buffer Ext Tool completed.")) def activate(self): self.buff_tool.buffer_button.clicked.disconnect() @@ -2822,7 +2822,7 @@ class FCDrillAdd(FCShapeTool): self.draw_app.current_storage = self.draw_app.storage_dict[self.selected_dia] self.geometry = DrawToolShape(self.util_shape(self.points)) self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Drill added.")) + self.draw_app.app.inform.emit(_("[success] Done. Drill added.")) class FCDrillArray(FCShapeTool): @@ -3007,7 +3007,7 @@ class FCDrillArray(FCShapeTool): self.geometry.append(DrawToolShape(geo)) else: if (self.drill_angle * self.drill_array_size) > 360: - self.draw_app.app.inform.emit(_("[WARNING_NOTCL]Too many drills for the selected spacing angle.")) + self.draw_app.app.inform.emit(_("[WARNING_NOTCL] Too many drills for the selected spacing angle.")) return radius = distance(self.destination, self.origin) @@ -3024,7 +3024,7 @@ class FCDrillArray(FCShapeTool): geo = self.util_shape((x, y)) self.geometry.append(DrawToolShape(geo)) self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Drill Array added.")) + self.draw_app.app.inform.emit(_("[success] Done. Drill Array added.")) self.draw_app.in_action = True self.draw_app.array_frame.hide() return @@ -3055,7 +3055,7 @@ class FCDrillResize(FCShapeTool): try: new_dia = self.draw_app.resdrill_entry.get_value() except: - self.draw_app.app.inform.emit(_("[ERROR_NOTCL]Resize drill(s) failed. Please enter a diameter for resize.")) + self.draw_app.app.inform.emit(_("[ERROR_NOTCL] Resize drill(s) failed. Please enter a diameter for resize.")) return if new_dia not in self.draw_app.olddia_newdia: @@ -3127,7 +3127,7 @@ class FCDrillResize(FCShapeTool): self.draw_app.resize_frame.hide() self.complete = True - self.draw_app.app.inform.emit(_("[success]Done. Drill Resize completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Drill Resize completed.")) # MS: always return to the Select Tool self.draw_app.select_tool("select") @@ -3202,7 +3202,7 @@ class FCDrillMove(FCShapeTool): sel_shapes_to_be_deleted = [] self.draw_app.build_ui() - self.draw_app.app.inform.emit(_("[success]Done. Drill(s) Move completed.")) + self.draw_app.app.inform.emit(_("[success] Done. Drill(s) Move completed.")) def utility_geometry(self, data=None): """ @@ -3255,7 +3255,7 @@ class FCDrillCopy(FCDrillMove): sel_shapes_to_be_deleted = [] self.draw_app.build_ui() - self.draw_app.app.inform.emit(_("[success]Done. Drill(s) copied.")) + self.draw_app.app.inform.emit(_("[success] Done. Drill(s) copied.")) ######################## @@ -3916,7 +3916,7 @@ class FlatCAMGeoEditor(QtCore.QObject): self.active_tool.make() if self.active_tool.complete: self.on_shape_complete() - self.app.inform.emit(_("[success]Done.")) + self.app.inform.emit(_("[success] Done.")) # MS: always return to the Select Tool if modifier key is not pressed # else return to the current tool @@ -4304,7 +4304,7 @@ class FlatCAMGeoEditor(QtCore.QObject): results = shapes[0].geo except Exception as e: log.debug("FlatCAMGeoEditor.intersection() --> %s" % str(e)) - self.app.inform.emit(_("[WARNING_NOTCL]A selection of at least 2 geo items is required to do Intersection.")) + self.app.inform.emit(_("[WARNING_NOTCL] A selection of at least 2 geo items is required to do Intersection.")) self.select_tool('select') return @@ -4342,7 +4342,7 @@ class FlatCAMGeoEditor(QtCore.QObject): if buf_distance < 0: self.app.inform.emit( - _( "[ERROR_NOTCL]Negative buffer value is not accepted. Use Buffer interior to generate an 'inside' shape")) + _( "[ERROR_NOTCL] Negative buffer value is not accepted. Use Buffer interior to generate an 'inside' shape")) # deselect everything self.selected = [] @@ -4364,7 +4364,7 @@ class FlatCAMGeoEditor(QtCore.QObject): pre_buffer = cascaded_union([t.geo for t in selected]) results = pre_buffer.buffer(buf_distance - 1e-10, resolution=32, join_style=join_style) if results.is_empty: - self.app.inform.emit(_("[ERROR_NOTCL]Failed, the result is empty. Choose a different buffer value.")) + self.app.inform.emit(_("[ERROR_NOTCL] Failed, the result is empty. Choose a different buffer value.")) # deselect everything self.selected = [] self.replot() @@ -4372,14 +4372,14 @@ class FlatCAMGeoEditor(QtCore.QObject): self.add_shape(DrawToolShape(results)) self.replot() - self.app.inform.emit(_("[success]Full buffer geometry created.")) + self.app.inform.emit(_("[success] Full buffer geometry created.")) def buffer_int(self, buf_distance, join_style): selected = self.get_selected() if buf_distance < 0: self.app.inform.emit( - _("[ERROR_NOTCL]Negative buffer value is not accepted. " + _("[ERROR_NOTCL] Negative buffer value is not accepted. " "Use Buffer interior to generate an 'inside' shape") ) # deselect everything @@ -4401,7 +4401,7 @@ class FlatCAMGeoEditor(QtCore.QObject): pre_buffer = cascaded_union([t.geo for t in selected]) results = pre_buffer.buffer(-buf_distance + 1e-10, resolution=32, join_style=join_style) if results.is_empty: - self.app.inform.emit(_("[ERROR_NOTCL]Failed, the result is empty. Choose a smaller buffer value.")) + self.app.inform.emit(_("[ERROR_NOTCL] Failed, the result is empty. Choose a smaller buffer value.")) # deselect everything self.selected = [] self.replot() @@ -4413,7 +4413,7 @@ class FlatCAMGeoEditor(QtCore.QObject): self.add_shape(DrawToolShape(results.exterior)) self.replot() - self.app.inform.emit(_("[success]Exterior buffer geometry created.")) + self.app.inform.emit(_("[success] Exterior buffer geometry created.")) # selected = self.get_selected() # # if len(selected) == 0: @@ -4451,7 +4451,7 @@ class FlatCAMGeoEditor(QtCore.QObject): selected = self.get_selected() if buf_distance < 0: - self.app.inform.emit(_("[ERROR_NOTCL]Negative buffer value is not accepted. " + self.app.inform.emit(_("[ERROR_NOTCL] Negative buffer value is not accepted. " "Use Buffer interior to generate an 'inside' shape")) # deselect everything self.selected = [] @@ -4472,7 +4472,7 @@ class FlatCAMGeoEditor(QtCore.QObject): pre_buffer = cascaded_union([t.geo for t in selected]) results = pre_buffer.buffer(buf_distance - 1e-10, resolution=32, join_style=join_style) if results.is_empty: - self.app.inform.emit(_("[ERROR_NOTCL]Failed, the result is empty. Choose a different buffer value.")) + self.app.inform.emit(_("[ERROR_NOTCL] Failed, the result is empty. Choose a different buffer value.")) # deselect everything self.selected = [] self.replot() @@ -4484,7 +4484,7 @@ class FlatCAMGeoEditor(QtCore.QObject): self.add_shape(DrawToolShape(results.exterior)) self.replot() - self.app.inform.emit(_("[success]Exterior buffer geometry created.")) + self.app.inform.emit(_("[success] Exterior buffer geometry created.")) # def paint(self, tooldia, overlap, margin, method): # selected = self.get_selected() @@ -4548,7 +4548,7 @@ class FlatCAMGeoEditor(QtCore.QObject): selected = self.get_selected() if len(selected) == 0: - self.app.inform.emit(_("[WARNING_NOTCL]Nothing selected for painting.")) + self.app.inform.emit(_("[WARNING_NOTCL] Nothing selected for painting.")) return for param in [tooldia, overlap, margin]: @@ -5331,7 +5331,7 @@ class FlatCAMExcEditor(QtCore.QObject): try: tool_dia = float(self.addtool_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.") ) return @@ -5344,7 +5344,7 @@ class FlatCAMExcEditor(QtCore.QObject): # each time a tool diameter is edited or added self.olddia_newdia[tool_dia] = tool_dia else: - self.app.inform.emit(_("[WARNING_NOTCL]Tool already in the original or actual tool list.\n" + self.app.inform.emit(_("[WARNING_NOTCL] Tool already in the original or actual tool list.\n" "Save and reedit Excellon if you need to add this tool. ") ) return @@ -5353,7 +5353,7 @@ class FlatCAMExcEditor(QtCore.QObject): # we add a new entry in the tool2tooldia dict self.tool2tooldia[len(self.olddia_newdia)] = tool_dia - self.app.inform.emit(_("[success]Added new tool with dia: {dia} {units}").format(dia=str(tool_dia), units=str(self.units))) + self.app.inform.emit(_("[success] Added new tool with dia: {dia} {units}").format(dia=str(tool_dia), units=str(self.units))) self.build_ui() @@ -5384,7 +5384,7 @@ class FlatCAMExcEditor(QtCore.QObject): else: deleted_tool_dia_list.append(float('%.4f' % dia)) except: - self.app.inform.emit(_("[WARNING_NOTCL]Select a tool in Tool Table")) + self.app.inform.emit(_("[WARNING_NOTCL] Select a tool in Tool Table")) return for deleted_tool_dia in deleted_tool_dia_list: @@ -5417,7 +5417,7 @@ class FlatCAMExcEditor(QtCore.QObject): self.olddia_newdia.pop(deleted_tool_dia, None) - self.app.inform.emit(_("[success]Deleted tool with dia: {del_dia} {units}").format(del_dia=str(deleted_tool_dia), units=str(self.units))) + self.app.inform.emit(_("[success] Deleted tool with dia: {del_dia} {units}").format(del_dia=str(deleted_tool_dia), units=str(self.units))) self.replot() # self.app.inform.emit("Could not delete selected tool") @@ -5832,7 +5832,7 @@ class FlatCAMExcEditor(QtCore.QObject): self.app.progress.emit(100) return - self.app.inform.emit(_("[success]Excellon editing finished.")) + self.app.inform.emit(_("[success] Excellon editing finished.")) # self.progress.emit(100) def on_tool_select(self, tool): @@ -5849,7 +5849,7 @@ class FlatCAMExcEditor(QtCore.QObject): # self.draw_app.select_tool('select') self.complete = True current_tool = 'select' - self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. There is no Tool/Drill selected")) + self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. There is no Tool/Drill selected")) # This is to make the group behave as radio group if current_tool in self.tools_exc: @@ -6331,7 +6331,7 @@ class FlatCAMExcEditor(QtCore.QObject): self.selected = [] self.build_ui() - self.app.inform.emit(_("[success]Done. Drill(s) deleted.")) + self.app.inform.emit(_("[success] Done. Drill(s) deleted.")) def delete_shape(self, shape): self.is_modified = True diff --git a/FlatCAMObj.py b/FlatCAMObj.py index f18ff35d..56409e79 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -191,7 +191,7 @@ class FlatCAMObj(QtCore.QObject): log.debug("on_name_activate() --> Could not remove the old object name from auto-completer model list") self.options["name"] = self.ui.name_entry.get_value() - self.app.inform.emit(_("[success]Name changed from {old} to {new}").format(old=old_name, new=new_name)) + self.app.inform.emit(_("[success] Name changed from {old} to {new}").format(old=old_name, new=new_name)) def on_offset_button_click(self): self.app.report_usage("obj_on_offset_button") @@ -907,7 +907,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber): for g in geo_obj.solid_geometry: if g: app_obj.inform.emit(_( - "[success]Isolation geometry created: %s" + "[success] Isolation geometry created: %s" ) % geo_obj.options["name"]) break else: @@ -962,7 +962,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber): for g in geo_obj.solid_geometry: if g: app_obj.inform.emit(_( - "[success]Isolation geometry created: %s" + "[success] Isolation geometry created: %s" ) % geo_obj.options["name"]) break else: @@ -1171,7 +1171,7 @@ class FlatCAMGerber(FlatCAMObj, Gerber): ret = self.app.new_object("gerber", name, obj_init, autoselected=False) if ret == 'fail': self.app.inform.emit(_( - '[ERROR_NOTCL] Cretion of Gerber failed.' + '[ERROR_NOTCL] Creation of Gerber failed.' )) return @@ -1985,7 +1985,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): self.ui.tools_table.currentItem().text().replace(',', '.')) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, use a number." + "[ERROR_NOTCL] Wrong value format entered, use a number." )) self.ui.tools_table.currentItem().setText(str(self.tool_offset[dia])) return @@ -2209,7 +2209,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): if len(tools) == 0: self.app.inform.emit(_( - "[ERROR_NOTCL]Please select one or more tools from the list and try again." + "[ERROR_NOTCL] Please select one or more tools from the list and try again." )) return False, "Error: No tools." @@ -2300,7 +2300,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): if len(tools) == 0: self.app.inform.emit(_( - "[ERROR_NOTCL]Please select one or more tools from the list and try again." + "[ERROR_NOTCL] Please select one or more tools from the list and try again." )) return False, "Error: No tools." @@ -2415,7 +2415,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): tools.append(self.ui.tools_table.item(0, 0).text()) else: self.app.inform.emit(_( - "[ERROR_NOTCL]Please select one or more tools from the list and try again." + "[ERROR_NOTCL] Please select one or more tools from the list and try again." )) return @@ -2475,7 +2475,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' + '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' )) try: @@ -2487,7 +2487,7 @@ class FlatCAMExcellon(FlatCAMObj, Excellon): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] ' + '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] ' 'or self.options["feedrate_probe"]' ) ) @@ -3250,7 +3250,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): ) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." ) ) @@ -3471,7 +3471,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): else: change_message = False self.app.inform.emit(_( - "[ERROR_NOTCL]Default Tool added. Wrong value format entered." + "[ERROR_NOTCL] Default Tool added. Wrong value format entered." )) self.build_ui() @@ -3501,7 +3501,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): self.tools[int(max_uid)] = deepcopy(self.tools[tooluid_copy]) except AttributeError: self.app.inform.emit(_( - "[WARNING_NOTCL]Failed. Select a tool to copy." + "[WARNING_NOTCL] Failed. Select a tool to copy." )) self.build_ui() return @@ -3511,7 +3511,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): # self.ui.geo_tools_table.clearSelection() else: self.app.inform.emit(_( - "[WARNING_NOTCL]Failed. Select a tool to copy." + "[WARNING_NOTCL] Failed. Select a tool to copy." )) self.build_ui() return @@ -3556,7 +3556,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): d = float(self.ui.geo_tools_table.item(current_row, 1).text().replace(',', '.')) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." )) return @@ -3604,7 +3604,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): temp_tools.clear() except AttributeError: self.app.inform.emit(_( - "[WARNING_NOTCL]Failed. Select a tool to delete." + "[WARNING_NOTCL] Failed. Select a tool to delete." )) self.build_ui() return @@ -3614,7 +3614,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): # self.ui.geo_tools_table.clearSelection() else: self.app.inform.emit(_( - "[WARNING_NOTCL]Failed. Select a tool to delete." + "[WARNING_NOTCL] Failed. Select a tool to delete." )) self.build_ui() return @@ -3743,7 +3743,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): vdia = float(self.ui.tipdia_entry.get_value().replace(',', '.')) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." )) return @@ -3756,7 +3756,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): half_vangle = float(self.ui.tipangle_entry.get_value().replace(',', '.')) / 2 except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." )) return @@ -3873,7 +3873,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): ) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." )) return @@ -4052,7 +4052,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): try: if self.special_group: self.app.inform.emit(_( - "[WARNING_NOTCL]This Geometry can't be processed because it is %s geometry." + "[WARNING_NOTCL] This Geometry can't be processed because it is %s geometry." ) % str(self.special_group)) return except AttributeError: @@ -4069,7 +4069,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): tooldia = float(self.ui.geo_tools_table.item(x.row(), 1).text().replace(',', '.')) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong Tool Dia value format entered, " + "[ERROR_NOTCL] Wrong Tool Dia value format entered, " "use a number." )) return @@ -4169,7 +4169,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' + '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' )) try: @@ -4181,7 +4181,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] ' + '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] ' 'or self.options["feedrate_probe"]' )) @@ -4281,7 +4281,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): ) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." )) return @@ -4380,7 +4380,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' + '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' )) try: @@ -4392,7 +4392,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] ' + '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] ' 'or self.options["feedrate_probe"]' )) @@ -4404,7 +4404,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): a += 1 if a == len(self.tools): self.app.inform.emit(_( - '[ERROR_NOTCL]Cancelled. Empty file, it has no geometry...' + '[ERROR_NOTCL] Cancelled. Empty file, it has no geometry...' )) return 'fail' @@ -4514,7 +4514,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): ) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." )) return @@ -4584,12 +4584,12 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): if self.solid_geometry: with self.app.proc_container.new(_("Generating CNC Code")): if app_obj.new_object("cncjob", outname, job_init_single_geometry) != 'fail': - app_obj.inform.emit("[success]CNCjob created: %s" % outname) + app_obj.inform.emit("[success] CNCjob created: %s" % outname) app_obj.progress.emit(100) else: with self.app.proc_container.new(_("Generating CNC Code")): if app_obj.new_object("cncjob", outname, job_init_multi_geometry) != 'fail': - app_obj.inform.emit("[success]CNCjob created: %s" % outname) + app_obj.inform.emit("[success] CNCjob created: %s" % outname) app_obj.progress.emit(100) # Create a promise with the name @@ -4695,7 +4695,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' + '[ERROR_NOTCL] Wrong value format for self.defaults["z_pdepth"] or self.options["z_pdepth"]' )) try: @@ -4707,7 +4707,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): except ValueError: self.app.inform.emit( _( - '[ERROR_NOTCL]Wrong value format for self.defaults["feedrate_probe"] ' + '[ERROR_NOTCL] Wrong value format for self.defaults["feedrate_probe"] ' 'or self.options["feedrate_probe"]' )) @@ -4735,7 +4735,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): def job_thread(app_obj): with self.app.proc_container.new(_("Generating CNC Code")): app_obj.new_object("cncjob", outname, job_init) - app_obj.inform.emit("[success]CNCjob created: %s" % outname) + app_obj.inform.emit("[success] CNCjob created: %s" % outname) app_obj.progress.emit(100) # Create a promise with the name @@ -4796,7 +4796,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): # else: # self.solid_geometry = affinity.scale(self.solid_geometry, xfactor, yfactor, # origin=(px, py)) - # self.app.inform.emit("[success]Geometry Scale done.") + # self.app.inform.emit("[success] Geometry Scale done.") def scale_recursion(geom): if type(geom) == list: @@ -4814,7 +4814,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): self.solid_geometry=scale_recursion(self.solid_geometry) self.app.inform.emit(_( - "[success]Geometry Scale done." + "[success] Geometry Scale done." )) def offset(self, vect): @@ -4831,7 +4831,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): dx, dy = vect except TypeError: self.app.inform.emit(_( - "[ERROR_NOTCL]An (x,y) pair of values are needed. " + "[ERROR_NOTCL] An (x,y) pair of values are needed. " "Probable you entered only one value in the Offset field." )) return @@ -4851,7 +4851,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): else: self.solid_geometry=translate_recursion(self.solid_geometry) self.app.inform.emit(_( - "[success]Geometry Offset done." + "[success] Geometry Offset done." )) def convert_units(self, units): @@ -4920,7 +4920,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry): ) except ValueError: self.app.inform.emit(_( - "[ERROR_NOTCL]Wrong value format entered, " + "[ERROR_NOTCL] Wrong value format entered, " "use a number." )) return @@ -5407,7 +5407,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): if filename == '': self.app.inform.emit(_( - "[WARNING_NOTCL]Export Machine Code cancelled ...")) + "[WARNING_NOTCL] Export Machine Code cancelled ...")) return preamble = str(self.ui.prepend_text.get_value()) @@ -5546,7 +5546,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): try: if self.special_group: - self.app.inform.emit(_("[WARNING_NOTCL]This CNCJob object can't be processed because " + self.app.inform.emit(_("[WARNING_NOTCL] This CNCJob object can't be processed because " "it is a %s CNCJob object.") % str(self.special_group)) return 'fail' except AttributeError: diff --git a/README.md b/README.md index c231a2f2..3271c38a 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ CAD program, and create G-Code for Isolation routing. - About 45% progress in German translation - new feature: added ability to edit MultiGeo geometry (geometry from Paint Tool) +- changed all the info messages that are of type warning, error or success so they have a space added after the keyword +- changed the Romanian translation by adding more diacritics 27.03.2019 diff --git a/camlib.py b/camlib.py index acd14979..5b03fc00 100644 --- a/camlib.py +++ b/camlib.py @@ -1384,7 +1384,7 @@ class Geometry(object): self.tools[tool]['solid_geometry'] = mirror_geom(self.tools[tool]['solid_geometry']) else: self.solid_geometry = mirror_geom(self.solid_geometry) - self.app.inform.emit(_('[success]Object was mirrored ...')) + self.app.inform.emit(_('[success] Object was mirrored ...')) except AttributeError: self.app.inform.emit(_("[ERROR_NOTCL] Failed to mirror. No object selected")) @@ -1422,7 +1422,7 @@ class Geometry(object): self.tools[tool]['solid_geometry'] = rotate_geom(self.tools[tool]['solid_geometry']) else: self.solid_geometry = rotate_geom(self.solid_geometry) - self.app.inform.emit(_('[success]Object was rotated ...')) + self.app.inform.emit(_('[success] Object was rotated ...')) except AttributeError: self.app.inform.emit(_("[ERROR_NOTCL] Failed to rotate. No object selected")) @@ -1458,7 +1458,7 @@ class Geometry(object): self.tools[tool]['solid_geometry'] = skew_geom(self.tools[tool]['solid_geometry']) else: self.solid_geometry = skew_geom(self.solid_geometry) - self.app.inform.emit(_('[success]Object was skewed ...')) + self.app.inform.emit(_('[success] Object was skewed ...')) except AttributeError: self.app.inform.emit(_("[ERROR_NOTCL] Failed to skew. No object selected")) @@ -3264,7 +3264,7 @@ class Gerber (Geometry): except Exception as e: log.debug('FlatCAMGeometry.scale() --> %s' % str(e)) - self.app.inform.emit(_("[success]Gerber Scale done.")) + self.app.inform.emit(_("[success] Gerber Scale done.")) ## solid_geometry ??? @@ -3297,7 +3297,7 @@ class Gerber (Geometry): try: dx, dy = vect except TypeError: - self.app.inform.emit(_("[ERROR_NOTCL]An (x,y) pair of values are needed. " + self.app.inform.emit(_("[ERROR_NOTCL] An (x,y) pair of values are needed. " "Probable you entered only one value in the Offset field.")) return @@ -3321,7 +3321,7 @@ class Gerber (Geometry): except Exception as e: log.debug('FlatCAMGeometry.offset() --> %s' % str(e)) - self.app.inform.emit(_("[success]Gerber Offset done.")) + self.app.inform.emit(_("[success] Gerber Offset done.")) def mirror(self, axis, point): """ @@ -5138,7 +5138,7 @@ class CNCjob(Geometry): else: log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> " "The loaded Excellon file has no drills ...") - self.app.inform.emit(_('[ERROR_NOTCL]The loaded Excellon file has no drills ...')) + self.app.inform.emit(_('[ERROR_NOTCL] The loaded Excellon file has no drills ...')) return 'fail' log.debug("The total travel distance with OR-TOOLS Metaheuristics is: %s" % str(measured_distance)) @@ -5233,7 +5233,7 @@ class CNCjob(Geometry): else: log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> " "The loaded Excellon file has no drills ...") - self.app.inform.emit(_('[ERROR_NOTCL]The loaded Excellon file has no drills ...')) + self.app.inform.emit(_('[ERROR_NOTCL] The loaded Excellon file has no drills ...')) return 'fail' log.debug("The total travel distance with OR-TOOLS Basic Algorithm is: %s" % str(measured_distance)) @@ -5284,7 +5284,7 @@ class CNCjob(Geometry): else: log.debug("camlib.CNCJob.generate_from_excellon_by_tool() --> " "The loaded Excellon file has no drills ...") - self.app.inform.emit(_('[ERROR_NOTCL]The loaded Excellon file has no drills ...')) + self.app.inform.emit(_('[ERROR_NOTCL] The loaded Excellon file has no drills ...')) return 'fail' log.debug("The total travel distance with Travelling Salesman Algorithm is: %s" % str(measured_distance)) @@ -5547,7 +5547,7 @@ class CNCjob(Geometry): # if solid_geometry is empty raise an exception if not geometry.solid_geometry: - self.app.inform.emit(_("[ERROR_NOTCL]Trying to generate a CNC Job " + self.app.inform.emit(_("[ERROR_NOTCL] Trying to generate a CNC Job " "from a Geometry object without solid_geometry.")) temp_solid_geometry = [] @@ -5586,7 +5586,7 @@ class CNCjob(Geometry): # if the offset is less than half of the total length or less than half of the total width of the # solid geometry it's obvious we can't do the offset if -offset > ((c - a) / 2) or -offset > ((d - b) / 2): - self.app.inform.emit(_("[ERROR_NOTCL]The Tool Offset value is too negative to use " + self.app.inform.emit(_("[ERROR_NOTCL] The Tool Offset value is too negative to use " "for the current_geometry.\n" "Raise the value (in module) and try again.")) return 'fail' diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 26371233..3b0ec0c9 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -2128,7 +2128,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if self.app.geo_editor.active_tool.complete: self.app.geo_editor.on_shape_complete() - self.app.inform.emit(_("[success]Done.")) + self.app.inform.emit(_("[success] Done.")) # automatically make the selection tool active after completing current action self.app.geo_editor.select_tool('select') return @@ -2140,7 +2140,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if self.app.geo_editor.active_tool.complete: self.app.geo_editor.on_shape_complete() - self.app.inform.emit(_("[success]Done.")) + self.app.inform.emit(_("[success] Done.")) # automatically make the selection tool active after completing current action self.app.geo_editor.select_tool('select') @@ -2148,7 +2148,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if key == QtCore.Qt.Key_Escape or key == 'Escape': # TODO: ...? # self.on_tool_select("select") - self.app.inform.emit(_("[WARNING_NOTCL]Cancelled.")) + self.app.inform.emit(_("[WARNING_NOTCL] Cancelled.")) self.app.geo_editor.delete_utility_geometry() @@ -2342,7 +2342,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if key == QtCore.Qt.Key_Escape or key == 'Escape': # TODO: ...? # self.on_tool_select("select") - self.app.inform.emit(_("[WARNING_NOTCL]Cancelled.")) + self.app.inform.emit(_("[WARNING_NOTCL] Cancelled.")) self.app.exc_editor.delete_utility_geometry() @@ -2359,7 +2359,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.app.exc_editor.delete_selected() self.app.exc_editor.replot() else: - self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. Nothing selected to delete.")) + self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. Nothing selected to delete.")) return # Delete tools in tools table if delete key event comes from the Selected Tab @@ -2426,7 +2426,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.app.exc_editor.active_tool.set_origin( (self.app.exc_editor.snap_x, self.app.exc_editor.snap_y)) else: - self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. Nothing selected to copy.")) + self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. Nothing selected to copy.")) return # Add Drill Hole Tool @@ -2472,7 +2472,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.app.exc_editor.active_tool.set_origin( (self.app.exc_editor.snap_x, self.app.exc_editor.snap_y)) else: - self.app.inform.emit(_("[WARNING_NOTCL]Cancelled. Nothing selected to move.")) + self.app.inform.emit(_("[WARNING_NOTCL] Cancelled. Nothing selected to move.")) return # Resize Tool @@ -2495,7 +2495,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if ok: self.app.exc_editor.on_tool_add(tooldia=val) self.app.inform.emit( - _("[success]Added new tool with dia: {dia} {units}").format(dia='%.4f' % float(val), units=str(self.units))) + _("[success] Added new tool with dia: {dia} {units}").format(dia='%.4f' % float(val), units=str(self.units))) else: self.app.inform.emit( _("[WARNING_NOTCL] Adding Tool cancelled ...")) diff --git a/flatcamTools/ToolCalculators.py b/flatcamTools/ToolCalculators.py index 0ea49b8d..6a261e39 100644 --- a/flatcamTools/ToolCalculators.py +++ b/flatcamTools/ToolCalculators.py @@ -304,7 +304,7 @@ class ToolCalculator(FlatCAMTool): try: tip_diameter = float(self.tipDia_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -315,7 +315,7 @@ class ToolCalculator(FlatCAMTool): try: half_tip_angle = float(self.tipAngle_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return half_tip_angle /= 2 @@ -327,7 +327,7 @@ class ToolCalculator(FlatCAMTool): try: cut_depth = float(self.cutDepth_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -342,7 +342,7 @@ class ToolCalculator(FlatCAMTool): try: mm_val = float(self.mm_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return self.inch_entry.set_value('%.6f' % (mm_val / 25.4)) @@ -355,7 +355,7 @@ class ToolCalculator(FlatCAMTool): try: inch_val = float(self.inch_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return self.mm_entry.set_value('%.6f' % (inch_val * 25.4)) @@ -369,7 +369,7 @@ class ToolCalculator(FlatCAMTool): try: length = float(self.pcblength_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -380,7 +380,7 @@ class ToolCalculator(FlatCAMTool): try: width = float(self.pcbwidth_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -391,7 +391,7 @@ class ToolCalculator(FlatCAMTool): try: density = float(self.cdensity_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -402,7 +402,7 @@ class ToolCalculator(FlatCAMTool): try: copper = float(self.growth_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return diff --git a/flatcamTools/ToolCutOut.py b/flatcamTools/ToolCutOut.py index f379eb39..687e1c29 100644 --- a/flatcamTools/ToolCutOut.py +++ b/flatcamTools/ToolCutOut.py @@ -326,11 +326,11 @@ class CutOut(FlatCAMTool): try: cutout_obj = self.app.collection.get_by_name(str(name)) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % name) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % name) return "Could not retrieve object: %s" % name if cutout_obj is None: - self.app.inform.emit(_("[ERROR_NOTCL]There is no object selected for Cutout.\nSelect one and try again.")) + self.app.inform.emit(_("[ERROR_NOTCL] There is no object selected for Cutout.\nSelect one and try again.")) return try: @@ -346,8 +346,8 @@ class CutOut(FlatCAMTool): if 0 in {dia}: - self.app.inform.emit(_("[WARNING_NOTCL]Tool Diameter is zero value. Change it to a positive integer.")) - return "Tool Diameter is zero value. Change it to a positive integer." + self.app.inform.emit(_("[WARNING_NOTCL] Tool Diameter is zero value. Change it to a positive real number.")) + return "Tool Diameter is zero value. Change it to a positive real number." try: margin = float(self.margin.get_value()) @@ -465,11 +465,11 @@ class CutOut(FlatCAMTool): try: cutout_obj = self.app.collection.get_by_name(str(name)) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % name) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % name) return "Could not retrieve object: %s" % name if cutout_obj is None: - self.app.inform.emit(_("[ERROR_NOTCL]Object not found: %s") % cutout_obj) + self.app.inform.emit(_("[ERROR_NOTCL] Object not found: %s") % cutout_obj) try: dia = float(self.dia.get_value()) @@ -483,8 +483,8 @@ class CutOut(FlatCAMTool): return if 0 in {dia}: - self.app.inform.emit(_("[ERROR_NOTCL]Tool Diameter is zero value. Change it to a positive integer.")) - return "Tool Diameter is zero value. Change it to a positive integer." + self.app.inform.emit(_("[ERROR_NOTCL] Tool Diameter is zero value. Change it to a positive real number.")) + return "Tool Diameter is zero value. Change it to a positive real number." try: margin = float(self.margin.get_value()) @@ -603,8 +603,8 @@ class CutOut(FlatCAMTool): return if 0 in {self.cutting_dia}: - self.app.inform.emit(_("[ERROR_NOTCL]Tool Diameter is zero value. Change it to a positive integer.")) - return "Tool Diameter is zero value. Change it to a positive integer." + self.app.inform.emit(_("[ERROR_NOTCL] Tool Diameter is zero value. Change it to a positive real number.")) + return "Tool Diameter is zero value. Change it to a positive real number." try: self.cutting_gapsize = float(self.gapsize.get_value()) @@ -652,11 +652,11 @@ class CutOut(FlatCAMTool): try: cutout_obj = self.app.collection.get_by_name(str(name)) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve Geoemtry object: %s") % name) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve Geometry object: %s") % name) return "Could not retrieve object: %s" % name if cutout_obj is None: - self.app.inform.emit(_("[ERROR_NOTCL]Geometry object for manual cutout not found: %s") % cutout_obj) + self.app.inform.emit(_("[ERROR_NOTCL] Geometry object for manual cutout not found: %s") % cutout_obj) return # use the snapped position as reference @@ -683,16 +683,16 @@ class CutOut(FlatCAMTool): try: cutout_obj = self.app.collection.get_by_name(str(name)) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve Gerber object: %s") % name) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve Gerber object: %s") % name) return "Could not retrieve object: %s" % name if cutout_obj is None: - self.app.inform.emit(_("[ERROR_NOTCL]There is no Gerber object selected for Cutout.\n" + self.app.inform.emit(_("[ERROR_NOTCL] There is no Gerber object selected for Cutout.\n" "Select one and try again.")) return if not isinstance(cutout_obj, FlatCAMGerber): - self.app.inform.emit(_("[ERROR_NOTCL]The selected object has to be of Gerber type.\n" + self.app.inform.emit(_("[ERROR_NOTCL] The selected object has to be of Gerber type.\n" "Select a Gerber file and try again.")) return @@ -708,8 +708,8 @@ class CutOut(FlatCAMTool): return if 0 in {dia}: - self.app.inform.emit(_("[ERROR_NOTCL]Tool Diameter is zero value. Change it to a positive integer.")) - return "Tool Diameter is zero value. Change it to a positive integer." + self.app.inform.emit(_("[ERROR_NOTCL] Tool Diameter is zero value. Change it to a positive real number.")) + return "Tool Diameter is zero value. Change it to a positive real number." try: margin = float(self.margin.get_value()) diff --git a/flatcamTools/ToolDblSided.py b/flatcamTools/ToolDblSided.py index 4fecfcf2..1a7f7786 100644 --- a/flatcamTools/ToolDblSided.py +++ b/flatcamTools/ToolDblSided.py @@ -365,7 +365,7 @@ class DblSidedTool(FlatCAMTool): return if dia is '': - self.app.inform.emit(_("[WARNING_NOTCL]No value or wrong format in Drill Dia entry. Add it and retry.")) + self.app.inform.emit(_("[WARNING_NOTCL] No value or wrong format in Drill Dia entry. Add it and retry.")) return tools = {"1": {"C": dia}} diff --git a/flatcamTools/ToolFilm.py b/flatcamTools/ToolFilm.py index 51463da1..46a96da5 100644 --- a/flatcamTools/ToolFilm.py +++ b/flatcamTools/ToolFilm.py @@ -238,14 +238,14 @@ class Film(FlatCAMTool): try: border = float(self.boundary_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return try: scale_stroke_width = int(self.film_scale_entry.get_value()) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -266,7 +266,7 @@ class Film(FlatCAMTool): filename = str(filename) if str(filename) == "": - self.app.inform.emit(_("[WARNING_NOTCL]Export SVG positive cancelled.")) + self.app.inform.emit(_("[WARNING_NOTCL] Export SVG positive cancelled.")) return else: self.app.export_svg_black(name, boxname, filename, scale_factor=scale_stroke_width) @@ -282,7 +282,7 @@ class Film(FlatCAMTool): filename = str(filename) if str(filename) == "": - self.app.inform.emit(_("[WARNING_NOTCL]Export SVG negative cancelled.")) + self.app.inform.emit(_("[WARNING_NOTCL] Export SVG negative cancelled.")) return else: self.app.export_svg_negative(name, boxname, filename, border, scale_factor=scale_stroke_width) diff --git a/flatcamTools/ToolMove.py b/flatcamTools/ToolMove.py index f45ffda7..2d42b345 100644 --- a/flatcamTools/ToolMove.py +++ b/flatcamTools/ToolMove.py @@ -161,7 +161,7 @@ class ToolMove(FlatCAMTool): proc.done() # delete the selection bounding box self.delete_shape() - self.app.inform.emit(_('[success]%s object was moved ...') % + self.app.inform.emit(_('[success] %s object was moved ...') % str(sel_obj.kind).capitalize()) self.app.worker_task.emit({'fcn': job_move, 'params': [self]}) @@ -199,7 +199,7 @@ class ToolMove(FlatCAMTool): def on_key_press(self, event): if event.key == 'escape': # abort the move action - self.app.inform.emit(_("[WARNING_NOTCL]Move action cancelled.")) + self.app.inform.emit(_("[WARNING_NOTCL] Move action cancelled.")) self.toggle() return @@ -211,7 +211,7 @@ class ToolMove(FlatCAMTool): obj_list = self.app.collection.get_selected() if not obj_list: - self.app.inform.emit(_("[WARNING_NOTCL]Object(s) not selected")) + self.app.inform.emit(_("[WARNING_NOTCL] Object(s) not selected")) self.toggle() else: # if we have an object selected then we can safely activate the mouse events diff --git a/flatcamTools/ToolNonCopperClear.py b/flatcamTools/ToolNonCopperClear.py index ff6f3af0..aab53abc 100644 --- a/flatcamTools/ToolNonCopperClear.py +++ b/flatcamTools/ToolNonCopperClear.py @@ -476,7 +476,7 @@ class NonCopperClear(FlatCAMTool, Gerber): try: tool_dia = float(self.addtool_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return if tool_dia is None: @@ -509,7 +509,7 @@ class NonCopperClear(FlatCAMTool, Gerber): if float('%.4f' % tool_dia) in tool_dias: if muted is None: - self.app.inform.emit(_("[WARNING_NOTCL]Adding tool cancelled. Tool already in Tool Table.")) + self.app.inform.emit(_("[WARNING_NOTCL] Adding tool cancelled. Tool already in Tool Table.")) self.tools_table.itemChanged.connect(self.on_tool_edit) return else: @@ -606,7 +606,7 @@ class NonCopperClear(FlatCAMTool, Gerber): self.ncc_tools.pop(t, None) except AttributeError: - self.app.inform.emit(_("[WARNING_NOTCL]Delete failed. Select a tool to delete.")) + self.app.inform.emit(_("[WARNING_NOTCL] Delete failed. Select a tool to delete.")) return except Exception as e: log.debug(str(e)) @@ -623,7 +623,7 @@ class NonCopperClear(FlatCAMTool, Gerber): try: over = float(self.ncc_overlap_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return over = over if over else self.app.defaults["tools_nccoverlap"] @@ -635,7 +635,7 @@ class NonCopperClear(FlatCAMTool, Gerber): try: margin = float(self.ncc_margin_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return margin = margin if margin else self.app.defaults["tools_nccmargin"] @@ -657,14 +657,14 @@ class NonCopperClear(FlatCAMTool, Gerber): try: self.ncc_obj = self.app.collection.get_by_name(self.obj_name) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % self.obj_name) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % self.obj_name) return "Could not retrieve object: %s" % self.obj_name # Prepare non-copper polygons try: bounding_box = self.ncc_obj.solid_geometry.envelope.buffer(distance=margin, join_style=base.JOIN_STYLE.mitre) except AttributeError: - self.app.inform.emit(_("[ERROR_NOTCL]No Gerber file available.")) + self.app.inform.emit(_("[ERROR_NOTCL] No Gerber file available.")) return # calculate the empty area by subtracting the solid_geometry from the object bounding box geometry diff --git a/flatcamTools/ToolPaint.py b/flatcamTools/ToolPaint.py index 48751947..d2627093 100644 --- a/flatcamTools/ToolPaint.py +++ b/flatcamTools/ToolPaint.py @@ -534,7 +534,7 @@ class ToolPaint(FlatCAMTool, Gerber): try: tool_dia = float(self.addtool_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -564,7 +564,7 @@ class ToolPaint(FlatCAMTool, Gerber): if float('%.4f' % tool_dia) in tool_dias: if muted is None: - self.app.inform.emit(_("[WARNING_NOTCL]Adding tool cancelled. Tool already in Tool Table.")) + self.app.inform.emit(_("[WARNING_NOTCL] Adding tool cancelled. Tool already in Tool Table.")) self.tools_table.itemChanged.connect(self.on_tool_edit) return else: @@ -604,7 +604,7 @@ class ToolPaint(FlatCAMTool, Gerber): try: new_tool_dia = float(self.tools_table.item(row, 1).text().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return tooluid = int(self.tools_table.item(row, 3).text()) @@ -656,7 +656,7 @@ class ToolPaint(FlatCAMTool, Gerber): # print("COPIED", self.paint_tools[td]) # self.build_ui() # except AttributeError: - # self.app.inform.emit("[WARNING_NOTCL]Failed. Select a tool to copy.") + # self.app.inform.emit("[WARNING_NOTCL] Failed. Select a tool to copy.") # self.build_ui() # return # except Exception as e: @@ -664,7 +664,7 @@ class ToolPaint(FlatCAMTool, Gerber): # # deselect the table # # self.ui.geo_tools_table.clearSelection() # else: - # self.app.inform.emit("[WARNING_NOTCL]Failed. Select a tool to copy.") + # self.app.inform.emit("[WARNING_NOTCL] Failed. Select a tool to copy.") # self.build_ui() # return # else: @@ -720,7 +720,7 @@ class ToolPaint(FlatCAMTool, Gerber): self.paint_tools.pop(t, None) except AttributeError: - self.app.inform.emit(_("[WARNING_NOTCL]Delete failed. Select a tool to delete.")) + self.app.inform.emit(_("[WARNING_NOTCL] Delete failed. Select a tool to delete.")) return except Exception as e: log.debug(str(e)) @@ -732,7 +732,7 @@ class ToolPaint(FlatCAMTool, Gerber): self.app.report_usage(_("geometry_on_paint_button")) # self.app.call_source = 'paint' - self.app.inform.emit(_("[WARNING_NOTCL]Click inside the desired polygon.")) + self.app.inform.emit(_("[WARNING_NOTCL] Click inside the desired polygon.")) try: overlap = float(self.paintoverlap_entry.get_value()) except ValueError: @@ -740,7 +740,7 @@ class ToolPaint(FlatCAMTool, Gerber): try: overlap = float(self.paintoverlap_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -754,11 +754,11 @@ class ToolPaint(FlatCAMTool, Gerber): try: self.paint_obj = self.app.collection.get_by_name(str(self.obj_name)) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % self.obj_name) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % self.obj_name) return if self.paint_obj is None: - self.app.inform.emit(_("[ERROR_NOTCL]Object not found: %s") % self.paint_obj) + self.app.inform.emit(_("[ERROR_NOTCL] Object not found: %s") % self.paint_obj) return # test if the Geometry Object is multigeo and return Fail if True because @@ -777,7 +777,7 @@ class ToolPaint(FlatCAMTool, Gerber): contour=contour) if select_method == "single": - self.app.inform.emit(_("[WARNING_NOTCL]Click inside the desired polygon.")) + self.app.inform.emit(_("[WARNING_NOTCL] Click inside the desired polygon.")) # use the first tool in the tool table; get the diameter tooldia = float('%.4f' % float(self.tools_table.item(0, 1).text())) @@ -830,7 +830,7 @@ class ToolPaint(FlatCAMTool, Gerber): try: paint_margin = float(self.paintmargin_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -985,7 +985,7 @@ class ToolPaint(FlatCAMTool, Gerber): try: paint_margin = float(self.paintmargin_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return diff --git a/flatcamTools/ToolPanelize.py b/flatcamTools/ToolPanelize.py index 2d2cf3ea..40db1004 100644 --- a/flatcamTools/ToolPanelize.py +++ b/flatcamTools/ToolPanelize.py @@ -290,13 +290,13 @@ class Panelize(FlatCAMTool): try: obj = self.app.collection.get_by_name(str(name)) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % name) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % name) return "Could not retrieve object: %s" % name panel_obj = obj if panel_obj is None: - self.app.inform.emit(_("[ERROR_NOTCL]Object not found: %s") % panel_obj) + self.app.inform.emit(_("[ERROR_NOTCL] Object not found: %s") % panel_obj) return "Object not found: %s" % panel_obj boxname = self.box_combo.currentText() @@ -304,7 +304,7 @@ class Panelize(FlatCAMTool): try: box = self.app.collection.get_by_name(boxname) except: - self.app.inform.emit(_("[ERROR_NOTCL]Could not retrieve object: %s") % boxname) + self.app.inform.emit(_("[ERROR_NOTCL] Could not retrieve object: %s") % boxname) return "Could not retrieve object: %s" % boxname if box is None: @@ -320,7 +320,7 @@ class Panelize(FlatCAMTool): try: spacing_columns = float(self.spacing_columns.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return spacing_columns = spacing_columns if spacing_columns is not None else 0 @@ -332,7 +332,7 @@ class Panelize(FlatCAMTool): try: spacing_rows = float(self.spacing_rows.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return spacing_rows = spacing_rows if spacing_rows is not None else 0 @@ -345,7 +345,7 @@ class Panelize(FlatCAMTool): rows = float(self.rows.get_value().replace(',', '.')) rows = int(rows) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return rows = rows if rows is not None else 1 @@ -358,7 +358,7 @@ class Panelize(FlatCAMTool): columns = float(self.columns.get_value().replace(',', '.')) columns = int(columns) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return columns = columns if columns is not None else 1 @@ -370,7 +370,7 @@ class Panelize(FlatCAMTool): try: constrain_dx = float(self.x_width_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -381,7 +381,7 @@ class Panelize(FlatCAMTool): try: constrain_dy = float(self.y_height_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return @@ -389,7 +389,7 @@ class Panelize(FlatCAMTool): if 0 in {columns, rows}: - self.app.inform.emit(_("[ERROR_NOTCL]Columns or Rows are zero value. Change them to a positive integer.")) + self.app.inform.emit(_("[ERROR_NOTCL] Columns or Rows are zero value. Change them to a positive integer.")) return "Columns or Rows are zero value. Change them to a positive integer." xmin, ymin, xmax, ymax = box.bounds() @@ -517,7 +517,7 @@ class Panelize(FlatCAMTool): plot=True, autoselected=True) if self.constrain_flag is False: - self.app.inform.emit(_("[success]Panel done...")) + self.app.inform.emit(_("[success] Panel done...")) else: self.constrain_flag = False self.app.inform.emit(_("[WARNING] Too big for the constrain area. Final panel has {col} columns and {row} rows").format( @@ -528,7 +528,7 @@ class Panelize(FlatCAMTool): def job_thread(app_obj): try: panelize_2() - self.app.inform.emit(_("[success]Panel created successfully.")) + self.app.inform.emit(_("[success] Panel created successfully.")) except Exception as e: proc.done() log.debug(str(e)) diff --git a/flatcamTools/ToolSolderPaste.py b/flatcamTools/ToolSolderPaste.py index 92732f3e..477c055f 100644 --- a/flatcamTools/ToolSolderPaste.py +++ b/flatcamTools/ToolSolderPaste.py @@ -752,7 +752,7 @@ class SolderPaste(FlatCAMTool): try: tool_dia = float(self.addtool_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return if tool_dia is None: @@ -823,7 +823,7 @@ class SolderPaste(FlatCAMTool): try: new_tool_dia = float(self.tools_table.item(row, 1).text().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered, " "use a number.")) return diff --git a/flatcamTools/ToolTransform.py b/flatcamTools/ToolTransform.py index 25e5eae5..ba827dcf 100644 --- a/flatcamTools/ToolTransform.py +++ b/flatcamTools/ToolTransform.py @@ -465,7 +465,7 @@ class ToolTransform(FlatCAMTool): try: value = float(self.rotate_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Rotate, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Rotate, " "use a number.")) return self.app.worker_task.emit({'fcn': self.on_rotate_action, @@ -499,7 +499,7 @@ class ToolTransform(FlatCAMTool): try: value = float(self.skewx_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew X, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew X, " "use a number.")) return @@ -517,7 +517,7 @@ class ToolTransform(FlatCAMTool): try: value = float(self.skewy_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Skew Y, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Skew Y, " "use a number.")) return @@ -535,7 +535,7 @@ class ToolTransform(FlatCAMTool): try: xvalue = float(self.scalex_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale X, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale X, " "use a number.")) return @@ -569,7 +569,7 @@ class ToolTransform(FlatCAMTool): try: yvalue = float(self.scaley_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Scale Y, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Scale Y, " "use a number.")) return @@ -598,7 +598,7 @@ class ToolTransform(FlatCAMTool): try: value = float(self.offx_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset X, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset X, " "use a number.")) return @@ -616,7 +616,7 @@ class ToolTransform(FlatCAMTool): try: value = float(self.offy_entry.get_value().replace(',', '.')) except ValueError: - self.app.inform.emit(_("[ERROR_NOTCL]Wrong value format entered for Offset Y, " + self.app.inform.emit(_("[ERROR_NOTCL] Wrong value format entered for Offset Y, " "use a number.")) return @@ -671,7 +671,7 @@ class ToolTransform(FlatCAMTool): # add information to the object that it was changed and how much sel_obj.options['rotate'] = num - self.app.inform.emit(_('[success]Rotate done ...')) + self.app.inform.emit(_('[success] Rotate done ...')) self.app.progress.emit(100) except Exception as e: @@ -732,7 +732,7 @@ class ToolTransform(FlatCAMTool): else: obj.options['mirror_y'] = True obj.plot() - self.app.inform.emit(_('[success]Flip on the Y axis done ...')) + self.app.inform.emit(_('[success] Flip on the Y axis done ...')) elif axis is 'Y': obj.mirror('Y', (px, py)) # add information to the object that it was changed and how much @@ -742,7 +742,7 @@ class ToolTransform(FlatCAMTool): else: obj.options['mirror_x'] = True obj.plot() - self.app.inform.emit(_('[success]Flip on the X axis done ...')) + self.app.inform.emit(_('[success] Flip on the X axis done ...')) self.app.object_changed.emit(obj) self.app.progress.emit(100) @@ -790,7 +790,7 @@ class ToolTransform(FlatCAMTool): obj.options['skew_y'] = num obj.plot() self.app.object_changed.emit(obj) - self.app.inform.emit(_('[success]Skew on the %s axis done ...') % str(axis)) + self.app.inform.emit(_('[success] Skew on the %s axis done ...') % str(axis)) self.app.progress.emit(100) except Exception as e: @@ -891,7 +891,7 @@ class ToolTransform(FlatCAMTool): obj.options['offset_y'] = num obj.plot() self.app.object_changed.emit(obj) - self.app.inform.emit(_('[success]Offset on the %s axis done ...') % str(axis)) + self.app.inform.emit(_('[success] Offset on the %s axis done ...') % str(axis)) self.app.progress.emit(100) except Exception as e: diff --git a/locale/de/LC_MESSAGES/strings.mo b/locale/de/LC_MESSAGES/strings.mo index e0e0f327..a8da3ac5 100644 Binary files a/locale/de/LC_MESSAGES/strings.mo and b/locale/de/LC_MESSAGES/strings.mo differ diff --git a/locale/de/LC_MESSAGES/strings.po b/locale/de/LC_MESSAGES/strings.po index 32750d34..1ffae409 100644 --- a/locale/de/LC_MESSAGES/strings.po +++ b/locale/de/LC_MESSAGES/strings.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2019-03-25 15:11+0200\n" -"PO-Revision-Date: 2019-03-28 16:18+0200\n" +"POT-Creation-Date: 2019-03-29 00:15+0200\n" +"PO-Revision-Date: 2019-03-29 00:23+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: de\n" @@ -10,8 +10,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.2.1\n" -"X-Poedit-Basepath: .\n" +"X-Poedit-Basepath: ../../..\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-SearchPath-0: .\n" +"X-Poedit-SearchPathExcluded-0: build\n" +"X-Poedit-SearchPathExcluded-1: doc\n" +"X-Poedit-SearchPathExcluded-2: tests\n" #: FlatCAMApp.py:845 msgid "[ERROR] Could not find the Language files. The App strings are missing." @@ -31,93 +35,92 @@ msgstr "Open Config-Datei ist fehlgeschlagen." msgid "Open Script file failed." msgstr "Open Script-Datei ist fehlgeschlagen." -#: FlatCAMApp.py:2200 +#: FlatCAMApp.py:2204 msgid "" -"[WARNING_NOTCL] Editing a MultiGeo Geometry is not possible for the moment." +"[WARNING_NOTCL] Simultanoeus editing of tools geometry in a MultiGeo " +"Geometry is not possible.\n" +" Edit only one geometry at a time." msgstr "" -"[WARNING_NOTCL] Das Bearbeiten einer MultiGeo-Geometrie ist momentan nicht " -"möglich." +"[WARNING_NOTCL] Die gleichzeitige Bearbeitung der Werkzeuggeometrie in einer " +"Multi-Geo-Geometrie ist nicht möglich. Bearbeiten Sie jeweils nur eine " +"Geometrie." -#: FlatCAMApp.py:2221 -msgid "[WARNING_NOTCL]Select a Geometry or Excellon Object to edit." +#: FlatCAMApp.py:2224 +msgid "[WARNING_NOTCL] Select a Geometry or Excellon Object to edit." msgstr "" "[WARNING_NOTCL] Wählen Sie ein Geometrie- oder Excellon-Objekt zum " "Bearbeiten aus." -#: FlatCAMApp.py:2232 -msgid "[WARNING_NOTCL]Editor is activated ..." +#: FlatCAMApp.py:2235 +msgid "[WARNING_NOTCL] Editor is activated ..." msgstr "[WARNING_NOTCL] Editor ist aktiviert ..." -#: FlatCAMApp.py:2271 +#: FlatCAMApp.py:2274 msgid "[WARNING] Object empty after edit." msgstr "[WARNING] Das Objekt ist nach der Bearbeitung leer." -#: FlatCAMApp.py:2280 -msgid "[WARNING_NOTCL]Select a Geometry or Excellon Object to update." +#: FlatCAMApp.py:2283 +msgid "[WARNING_NOTCL] Select a Geometry or Excellon Object to update." msgstr "" "[WARNING_NOTCL] Wählen Sie ein zu aktualisierendes Geometrie- oder Excellon-" "Objekt aus." -#: FlatCAMApp.py:2293 +#: FlatCAMApp.py:2296 #, python-format msgid "[selected] %s is updated, returning to App..." msgstr "[selected] %s wird aktualisiert und kehrt zur App zurück ..." -#: FlatCAMApp.py:2616 +#: FlatCAMApp.py:2619 msgid "[ERROR] Could not load defaults file." msgstr "[ERROR] Standarddatei konnte nicht geladen werden." -#: FlatCAMApp.py:2628 +#: FlatCAMApp.py:2631 msgid "[ERROR] Failed to parse defaults file." msgstr "[ERROR] Fehler beim Parsen der Standarddatei." -#: FlatCAMApp.py:2649 FlatCAMApp.py:2652 +#: FlatCAMApp.py:2652 FlatCAMApp.py:2655 msgid "Import FlatCAM Preferences" msgstr "FlatCAM-Voreinstellungen importieren" -#: FlatCAMApp.py:2657 -msgid "[WARNING_NOTCL]FlatCAM preferences import cancelled." +#: FlatCAMApp.py:2660 +msgid "[WARNING_NOTCL] FlatCAM preferences import cancelled." msgstr "[WARNING_NOTCL] Import der FlatCAM-Einstellungen wurde abgebrochen." -#: FlatCAMApp.py:2665 FlatCAMApp.py:3145 +#: FlatCAMApp.py:2668 FlatCAMApp.py:2715 FlatCAMApp.py:3148 msgid "[ERROR_NOTCL] Could not load defaults file." msgstr "[ERROR_NOTCL] Standarddatei konnte nicht geladen werden." -#: FlatCAMApp.py:2673 FlatCAMApp.py:3154 +#: FlatCAMApp.py:2676 FlatCAMApp.py:3157 msgid "[ERROR_NOTCL] Failed to parse defaults file." msgstr "[ERROR_NOTCL] Fehler beim Parsen der Standarddatei." -#: FlatCAMApp.py:2676 +#: FlatCAMApp.py:2679 #, python-format -msgid "[success]Imported Defaults from %s" +msgid "[success] Imported Defaults from %s" msgstr "[success] Importierte Standardwerte aus %s" -#: FlatCAMApp.py:2686 FlatCAMApp.py:2690 +#: FlatCAMApp.py:2689 FlatCAMApp.py:2693 msgid "Export FlatCAM Preferences" msgstr "FlatCAM-Voreinstellungen exportieren" -#: FlatCAMApp.py:2696 -msgid "[WARNING_NOTCL]FlatCAM preferences export cancelled." +#: FlatCAMApp.py:2699 +msgid "[WARNING_NOTCL] FlatCAM preferences export cancelled." msgstr "[WARNING_NOTCL] Export der FlatCAM-Einstellungen wurde abgebrochen." -#: FlatCAMApp.py:2712 -msgid "[ERROR_NOTCL]Could not load defaults file." -msgstr "[ERROR_NOTCL] Standarddatei konnte nicht geladen werden." - -#: FlatCAMApp.py:2731 FlatCAMApp.py:3168 +#: FlatCAMApp.py:2734 FlatCAMApp.py:3171 msgid "[ERROR_NOTCL] Failed to write defaults to file." msgstr "[ERROR_NOTCL] Fehler beim Schreiben der Standardwerte in die Datei." -#: FlatCAMApp.py:2783 -msgid "[ERROR_NOTCL]Failed to open recent files file for writing." +#: FlatCAMApp.py:2786 +msgid "[ERROR_NOTCL] Failed to open recent files file for writing." msgstr "" "[ERROR_NOTCL] Fehler beim Öffnen der zuletzt geöffneten Datei zum Schreiben." -#: FlatCAMApp.py:2868 camlib.py:4229 +#: FlatCAMApp.py:2871 camlib.py:4228 msgid "[ERROR_NOTCL] An internal error has ocurred. See shell.\n" msgstr "[ERROR_NOTCL] Ein interner Fehler ist aufgetreten. Siehe Shell.\n" -#: FlatCAMApp.py:2869 +#: FlatCAMApp.py:2872 #, python-brace-format msgid "" "Object ({kind}) failed because: {error} \n" @@ -126,20 +129,20 @@ msgstr "" "Objekt ({kind}) gescheitert weil: {error} \n" "\n" -#: FlatCAMApp.py:2889 +#: FlatCAMApp.py:2892 msgid "Converting units to " msgstr "Einheiten in umrechnen " -#: FlatCAMApp.py:2947 FlatCAMApp.py:2950 FlatCAMApp.py:2953 FlatCAMApp.py:2956 +#: FlatCAMApp.py:2950 FlatCAMApp.py:2953 FlatCAMApp.py:2956 FlatCAMApp.py:2959 #, python-brace-format msgid "" -"[selected]{kind} created/selected: {name}" +"[selected] {kind} created/selected: {name}" "span>" msgstr "" "[selected]{kind} erstellt / ausgewählt: {name}" "" -#: FlatCAMApp.py:3050 +#: FlatCAMApp.py:3053 #, python-brace-format msgid "" "FlatCAMSelected Tab - Choose an Item from "
@@ -1053,27 +1051,27 @@ msgstr ""
"strong> oder über eine eigene Tastenkombination:
Selected Tab - Choose an Item from " @@ -1018,7 +1010,7 @@ msgstr "" "Tab-ul Proiect
\n" "\n" "Detalii:
\n"
-"Fluxul normal când se lucrează in FlatCAM este urmatorul:
Selected Tab - Choose an Item from "
@@ -904,64 +897,64 @@ msgid ""
" "
msgstr ""
-#: FlatCAMApp.py:7748
+#: FlatCAMApp.py:7750
msgid "[WARNING_NOTCL] Failed checking for latest version. Could not connect."
msgstr ""
-#: FlatCAMApp.py:7755
+#: FlatCAMApp.py:7757
msgid "[ERROR_NOTCL] Could not parse information about latest version."
msgstr ""
-#: FlatCAMApp.py:7765
+#: FlatCAMApp.py:7767
msgid "[success] FlatCAM is up to date!"
msgstr ""
-#: FlatCAMApp.py:7770
+#: FlatCAMApp.py:7772
msgid "Newer Version Available"
msgstr ""
-#: FlatCAMApp.py:7771
+#: FlatCAMApp.py:7773
msgid ""
"There is a newer version of FlatCAM available for download:\n"
"\n"
msgstr ""
-#: FlatCAMApp.py:7773
+#: FlatCAMApp.py:7775
msgid "info"
msgstr ""
-#: FlatCAMApp.py:7792
-msgid "[success]All plots disabled."
+#: FlatCAMApp.py:7794
+msgid "[success] All plots disabled."
msgstr ""
-#: FlatCAMApp.py:7798
-msgid "[success]All non selected plots disabled."
+#: FlatCAMApp.py:7800
+msgid "[success] All non selected plots disabled."
msgstr ""
-#: FlatCAMApp.py:7804
-msgid "[success]All plots enabled."
+#: FlatCAMApp.py:7806
+msgid "[success] All plots enabled."
msgstr ""
-#: FlatCAMApp.py:7914
+#: FlatCAMApp.py:7916
msgid "Saving FlatCAM Project"
msgstr ""
-#: FlatCAMApp.py:7935 FlatCAMApp.py:7966
+#: FlatCAMApp.py:7937 FlatCAMApp.py:7968
#, python-format
msgid "[success] Project saved to: %s"
msgstr ""
-#: FlatCAMApp.py:7953
+#: FlatCAMApp.py:7955
#, python-format
msgid "[ERROR_NOTCL] Failed to verify project file: %s. Retry to save it."
msgstr ""
-#: FlatCAMApp.py:7960
+#: FlatCAMApp.py:7962
#, python-format
msgid "[ERROR_NOTCL] Failed to parse saved project file: %s. Retry to save it."
msgstr ""
-#: FlatCAMApp.py:7968
+#: FlatCAMApp.py:7970
#, python-format
msgid "[ERROR_NOTCL] Failed to save project file: %s. Retry to save it."
msgstr ""
@@ -1020,7 +1013,7 @@ msgstr ""
#: FlatCAMEditor.py:416 flatcamGUI/FlatCAMGUI.py:3419
#: flatcamGUI/FlatCAMGUI.py:4625 flatcamGUI/FlatCAMGUI.py:4901
-#: flatcamGUI/FlatCAMGUI.py:5032 flatcamGUI/ObjectUI.py:331
+#: flatcamGUI/FlatCAMGUI.py:5032 flatcamGUI/ObjectUI.py:346
msgid "Tool dia:"
msgstr ""
@@ -1031,7 +1024,7 @@ msgid ""
msgstr ""
#: FlatCAMEditor.py:427 flatcamGUI/FlatCAMGUI.py:4807
-#: flatcamGUI/FlatCAMGUI.py:5043 flatcamTools/ToolNonCopperClear.py:164
+#: flatcamGUI/FlatCAMGUI.py:5043 flatcamTools/ToolNonCopperClear.py:165
#: flatcamTools/ToolPaint.py:160
msgid "Overlap:"
msgstr ""
@@ -1053,7 +1046,7 @@ msgstr ""
#: FlatCAMEditor.py:445 flatcamGUI/FlatCAMGUI.py:4823
#: flatcamGUI/FlatCAMGUI.py:4909 flatcamGUI/FlatCAMGUI.py:5053
-#: flatcamTools/ToolCutOut.py:86 flatcamTools/ToolNonCopperClear.py:180
+#: flatcamTools/ToolCutOut.py:86 flatcamTools/ToolNonCopperClear.py:181
#: flatcamTools/ToolPaint.py:177
msgid "Margin:"
msgstr ""
@@ -1067,7 +1060,7 @@ msgid ""
msgstr ""
#: FlatCAMEditor.py:456 flatcamGUI/FlatCAMGUI.py:4832
-#: flatcamGUI/FlatCAMGUI.py:5064 flatcamTools/ToolNonCopperClear.py:189
+#: flatcamGUI/FlatCAMGUI.py:5064 flatcamTools/ToolNonCopperClear.py:190
#: flatcamTools/ToolPaint.py:188
msgid "Method:"
msgstr ""
@@ -1094,13 +1087,13 @@ msgid "Straight lines"
msgstr ""
#: FlatCAMEditor.py:471 flatcamGUI/FlatCAMGUI.py:4848
-#: flatcamGUI/FlatCAMGUI.py:5079 flatcamTools/ToolNonCopperClear.py:205
+#: flatcamGUI/FlatCAMGUI.py:5079 flatcamTools/ToolNonCopperClear.py:206
#: flatcamTools/ToolPaint.py:204
msgid "Connect:"
msgstr ""
#: FlatCAMEditor.py:473 flatcamGUI/FlatCAMGUI.py:4850
-#: flatcamGUI/FlatCAMGUI.py:5081 flatcamTools/ToolNonCopperClear.py:207
+#: flatcamGUI/FlatCAMGUI.py:5081 flatcamTools/ToolNonCopperClear.py:208
#: flatcamTools/ToolPaint.py:206
msgid ""
"Draw lines between resulting\n"
@@ -1108,13 +1101,13 @@ msgid ""
msgstr ""
#: FlatCAMEditor.py:480 flatcamGUI/FlatCAMGUI.py:4857
-#: flatcamGUI/FlatCAMGUI.py:5089 flatcamTools/ToolNonCopperClear.py:214
+#: flatcamGUI/FlatCAMGUI.py:5089 flatcamTools/ToolNonCopperClear.py:215
#: flatcamTools/ToolPaint.py:213
msgid "Contour:"
msgstr ""
#: FlatCAMEditor.py:482 flatcamGUI/FlatCAMGUI.py:4859
-#: flatcamGUI/FlatCAMGUI.py:5091 flatcamTools/ToolNonCopperClear.py:216
+#: flatcamGUI/FlatCAMGUI.py:5091 flatcamTools/ToolNonCopperClear.py:217
#: flatcamTools/ToolPaint.py:215
msgid ""
"Cut around the perimeter of the polygon\n"
@@ -1126,7 +1119,7 @@ msgid "Paint"
msgstr ""
#: FlatCAMEditor.py:512 flatcamGUI/FlatCAMGUI.py:585
-#: flatcamGUI/FlatCAMGUI.py:1634 flatcamGUI/ObjectUI.py:1379
+#: flatcamGUI/FlatCAMGUI.py:1634 flatcamGUI/ObjectUI.py:1394
#: flatcamTools/ToolPaint.py:340
msgid "Paint Tool"
msgstr ""
@@ -1155,7 +1148,7 @@ msgid ""
msgstr ""
#: FlatCAMEditor.py:591 FlatCAMEditor.py:2648 FlatCAMEditor.py:2674
-#: FlatCAMEditor.py:2700 flatcamTools/ToolNonCopperClear.py:806
+#: FlatCAMEditor.py:2700 flatcamTools/ToolNonCopperClear.py:807
#: flatcamTools/ToolProperties.py:104
msgid "Tools"
msgstr ""
@@ -1174,7 +1167,7 @@ msgstr ""
msgid "Skew/Shear"
msgstr ""
-#: FlatCAMEditor.py:605 flatcamGUI/ObjectUI.py:100 flatcamGUI/ObjectUI.py:265
+#: FlatCAMEditor.py:605 flatcamGUI/ObjectUI.py:100 flatcamGUI/ObjectUI.py:280
#: flatcamTools/ToolTransform.py:26
msgid "Scale"
msgstr ""
@@ -1183,8 +1176,8 @@ msgstr ""
msgid "Mirror (Flip)"
msgstr ""
-#: FlatCAMEditor.py:607 flatcamGUI/ObjectUI.py:127 flatcamGUI/ObjectUI.py:959
-#: flatcamGUI/ObjectUI.py:1517 flatcamTools/ToolTransform.py:28
+#: FlatCAMEditor.py:607 flatcamGUI/ObjectUI.py:127 flatcamGUI/ObjectUI.py:974
+#: flatcamGUI/ObjectUI.py:1532 flatcamTools/ToolTransform.py:28
msgid "Offset"
msgstr ""
@@ -1193,7 +1186,7 @@ msgstr ""
msgid "Editor %s"
msgstr ""
-#: FlatCAMEditor.py:650 FlatCAMEditor.py:4851 FlatCAMEditor.py:4887
+#: FlatCAMEditor.py:650 FlatCAMEditor.py:4869 FlatCAMEditor.py:4905
#: flatcamTools/ToolTransform.py:68
msgid "Angle:"
msgstr ""
@@ -1371,9 +1364,9 @@ msgid ""
"the 'y' in (x, y) will be used when using Flip on Y."
msgstr ""
-#: FlatCAMEditor.py:922 flatcamGUI/ObjectUI.py:1059
+#: FlatCAMEditor.py:922 flatcamGUI/ObjectUI.py:1074
#: flatcamTools/ToolDblSided.py:160 flatcamTools/ToolDblSided.py:208
-#: flatcamTools/ToolNonCopperClear.py:133 flatcamTools/ToolPaint.py:131
+#: flatcamTools/ToolNonCopperClear.py:134 flatcamTools/ToolPaint.py:131
#: flatcamTools/ToolSolderPaste.py:115 flatcamTools/ToolSolderPaste.py:478
#: flatcamTools/ToolTransform.py:337
msgid "Add"
@@ -1391,31 +1384,31 @@ msgid "[WARNING_NOTCL] Transformation cancelled. No shape selected."
msgstr ""
#: FlatCAMEditor.py:1060 flatcamTools/ToolTransform.py:468
-msgid "[ERROR_NOTCL]Wrong value format entered for Rotate, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered for Rotate, use a number."
msgstr ""
#: FlatCAMEditor.py:1097 flatcamTools/ToolTransform.py:502
-msgid "[ERROR_NOTCL]Wrong value format entered for Skew X, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered for Skew X, use a number."
msgstr ""
#: FlatCAMEditor.py:1118 flatcamTools/ToolTransform.py:520
-msgid "[ERROR_NOTCL]Wrong value format entered for Skew Y, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered for Skew Y, use a number."
msgstr ""
#: FlatCAMEditor.py:1139 flatcamTools/ToolTransform.py:538
-msgid "[ERROR_NOTCL]Wrong value format entered for Scale X, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered for Scale X, use a number."
msgstr ""
#: FlatCAMEditor.py:1176 flatcamTools/ToolTransform.py:572
-msgid "[ERROR_NOTCL]Wrong value format entered for Scale Y, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered for Scale Y, use a number."
msgstr ""
#: FlatCAMEditor.py:1208 flatcamTools/ToolTransform.py:601
-msgid "[ERROR_NOTCL]Wrong value format entered for Offset X, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered for Offset X, use a number."
msgstr ""
#: FlatCAMEditor.py:1229 flatcamTools/ToolTransform.py:619
-msgid "[ERROR_NOTCL]Wrong value format entered for Offset Y, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered for Offset Y, use a number."
msgstr ""
#: FlatCAMEditor.py:1247
@@ -1438,11 +1431,11 @@ msgstr ""
msgid "Applying Flip"
msgstr ""
-#: FlatCAMEditor.py:1327
+#: FlatCAMEditor.py:1327 flatcamTools/ToolTransform.py:735
msgid "[success] Flip on the Y axis done ..."
msgstr ""
-#: FlatCAMEditor.py:1330
+#: FlatCAMEditor.py:1330 flatcamTools/ToolTransform.py:745
msgid "[success] Flip on the X axis done ..."
msgstr ""
@@ -1454,7 +1447,7 @@ msgstr ""
msgid "Applying Skew"
msgstr ""
-#: FlatCAMEditor.py:1377
+#: FlatCAMEditor.py:1377 flatcamTools/ToolTransform.py:793
#, python-format
msgid "[success] Skew on the %s axis done ..."
msgstr ""
@@ -1490,7 +1483,7 @@ msgstr ""
msgid "Applying Offset"
msgstr ""
-#: FlatCAMEditor.py:1467
+#: FlatCAMEditor.py:1467 flatcamTools/ToolTransform.py:894
#, python-format
msgid "[success] Offset on the %s axis done ..."
msgstr ""
@@ -1578,7 +1571,7 @@ msgid "Click on Circle perimeter point to complete ..."
msgstr ""
#: FlatCAMEditor.py:1925
-msgid "[success]Done. Adding Circle completed."
+msgid "[success] Done. Adding Circle completed."
msgstr ""
#: FlatCAMEditor.py:1952
@@ -1590,13 +1583,17 @@ msgid "Click on End arc point to complete ..."
msgstr ""
#: FlatCAMEditor.py:2111
-msgid "[success]Done. Arc completed."
+msgid "[success] Done. Arc completed."
msgstr ""
#: FlatCAMEditor.py:2123
msgid "Click on 1st corner ..."
msgstr ""
+#: FlatCAMEditor.py:2151
+msgid "[success] Done. Rectangle completed."
+msgstr ""
+
#: FlatCAMEditor.py:2163
msgid "Click on 1st point ..."
msgstr ""
@@ -1606,14 +1603,14 @@ msgid "Click on next Point or click Right mouse button to complete ..."
msgstr ""
#: FlatCAMEditor.py:2193
-msgid "[success]Done. Polygon completed."
+msgid "[success] Done. Polygon completed."
msgstr ""
#: FlatCAMEditor.py:2212
-msgid "[success]Done. Path completed."
+msgid "[success] Done. Path completed."
msgstr ""
-#: FlatCAMEditor.py:2472 FlatCAMEditor.py:4034
+#: FlatCAMEditor.py:2472 FlatCAMEditor.py:4045
msgid "[WARNING_NOTCL] Move cancelled. No shape selected."
msgstr ""
@@ -1626,11 +1623,11 @@ msgid "Click on destination point."
msgstr ""
#: FlatCAMEditor.py:2510
-msgid "[success]Done. Geometry(s) Move completed."
+msgid "[success] Done. Geometry(s) Move completed."
msgstr ""
#: FlatCAMEditor.py:2555
-msgid "[success]Done. Geometry(s) Copy completed."
+msgid "[success] Done. Geometry(s) Copy completed."
msgstr ""
#: FlatCAMEditor.py:2567
@@ -1645,7 +1642,7 @@ msgid ""
msgstr ""
#: FlatCAMEditor.py:2591
-msgid "[success]Done. Adding Text completed."
+msgid "[success] Done. Adding Text completed."
msgstr ""
#: FlatCAMEditor.py:2619
@@ -1657,15 +1654,15 @@ msgid "[WARNING_NOTCL] Buffer cancelled. No shape selected."
msgstr ""
#: FlatCAMEditor.py:2652
-msgid "[success]Done. Buffer Tool completed."
+msgid "[success] Done. Buffer Tool completed."
msgstr ""
#: FlatCAMEditor.py:2678
-msgid "[success]Done. Buffer Int Tool completed."
+msgid "[success] Done. Buffer Int Tool completed."
msgstr ""
#: FlatCAMEditor.py:2704
-msgid "[success]Done. Buffer Ext Tool completed."
+msgid "[success] Done. Buffer Ext Tool completed."
msgstr ""
#: FlatCAMEditor.py:2737
@@ -1686,7 +1683,7 @@ msgid "Click on target location ..."
msgstr ""
#: FlatCAMEditor.py:2825
-msgid "[success]Done. Drill added."
+msgid "[success] Done. Drill added."
msgstr ""
#: FlatCAMEditor.py:2867
@@ -1708,11 +1705,11 @@ msgid "[ERROR_NOTCL] The value is mistyped. Check the value."
msgstr ""
#: FlatCAMEditor.py:3010
-msgid "[WARNING_NOTCL]Too many drills for the selected spacing angle."
+msgid "[WARNING_NOTCL] Too many drills for the selected spacing angle."
msgstr ""
#: FlatCAMEditor.py:3027
-msgid "[success]Done. Drill Array added."
+msgid "[success] Done. Drill Array added."
msgstr ""
#: FlatCAMEditor.py:3038
@@ -1721,11 +1718,11 @@ msgstr ""
#: FlatCAMEditor.py:3058
msgid ""
-"[ERROR_NOTCL]Resize drill(s) failed. Please enter a diameter for resize."
+"[ERROR_NOTCL] Resize drill(s) failed. Please enter a diameter for resize."
msgstr ""
#: FlatCAMEditor.py:3130
-msgid "[success]Done. Drill Resize completed."
+msgid "[success] Done. Drill Resize completed."
msgstr ""
#: FlatCAMEditor.py:3150
@@ -1733,80 +1730,85 @@ msgid "Click on reference location ..."
msgstr ""
#: FlatCAMEditor.py:3205
-msgid "[success]Done. Drill(s) Move completed."
+msgid "[success] Done. Drill(s) Move completed."
msgstr ""
#: FlatCAMEditor.py:3258
-msgid "[success]Done. Drill(s) copied."
+msgid "[success] Done. Drill(s) copied."
msgstr ""
-#: FlatCAMEditor.py:3908 flatcamGUI/FlatCAMGUI.py:2131
+#: FlatCAMEditor.py:3678
+#, python-brace-format
+msgid "[WARNING] Editing MultiGeo Geometry, tool: {tool} with diameter: {dia}"
+msgstr ""
+
+#: FlatCAMEditor.py:3919 flatcamGUI/FlatCAMGUI.py:2131
#: flatcamGUI/FlatCAMGUI.py:2143
-msgid "[success]Done."
+msgid "[success] Done."
msgstr ""
-#: FlatCAMEditor.py:4041
+#: FlatCAMEditor.py:4052
msgid "[WARNING_NOTCL] Copy cancelled. No shape selected."
msgstr ""
-#: FlatCAMEditor.py:4048 flatcamGUI/FlatCAMGUI.py:2423
+#: FlatCAMEditor.py:4059 flatcamGUI/FlatCAMGUI.py:2423
#: flatcamGUI/FlatCAMGUI.py:2435 flatcamGUI/FlatCAMGUI.py:2469
msgid "Click on target point."
msgstr ""
-#: FlatCAMEditor.py:4289
+#: FlatCAMEditor.py:4307
msgid ""
-"[WARNING_NOTCL]A selection of at least 2 geo items is required to do "
+"[WARNING_NOTCL] A selection of at least 2 geo items is required to do "
"Intersection."
msgstr ""
-#: FlatCAMEditor.py:4327 FlatCAMEditor.py:4364 FlatCAMEditor.py:4436
+#: FlatCAMEditor.py:4345 FlatCAMEditor.py:4382 FlatCAMEditor.py:4454
msgid ""
-"[ERROR_NOTCL]Negative buffer value is not accepted. Use Buffer interior to "
+"[ERROR_NOTCL] Negative buffer value is not accepted. Use Buffer interior to "
"generate an 'inside' shape"
msgstr ""
-#: FlatCAMEditor.py:4335 FlatCAMEditor.py:4373 FlatCAMEditor.py:4444
+#: FlatCAMEditor.py:4353 FlatCAMEditor.py:4391 FlatCAMEditor.py:4462
msgid "[WARNING_NOTCL] Nothing selected for buffering."
msgstr ""
-#: FlatCAMEditor.py:4339 FlatCAMEditor.py:4377 FlatCAMEditor.py:4448
+#: FlatCAMEditor.py:4357 FlatCAMEditor.py:4395 FlatCAMEditor.py:4466
msgid "[WARNING_NOTCL] Invalid distance for buffering."
msgstr ""
-#: FlatCAMEditor.py:4349 FlatCAMEditor.py:4457
+#: FlatCAMEditor.py:4367 FlatCAMEditor.py:4475
msgid ""
-"[ERROR_NOTCL]Failed, the result is empty. Choose a different buffer value."
+"[ERROR_NOTCL] Failed, the result is empty. Choose a different buffer value."
msgstr ""
-#: FlatCAMEditor.py:4357
-msgid "[success]Full buffer geometry created."
+#: FlatCAMEditor.py:4375
+msgid "[success] Full buffer geometry created."
msgstr ""
-#: FlatCAMEditor.py:4386
+#: FlatCAMEditor.py:4404
msgid ""
-"[ERROR_NOTCL]Failed, the result is empty. Choose a smaller buffer value."
+"[ERROR_NOTCL] Failed, the result is empty. Choose a smaller buffer value."
msgstr ""
-#: FlatCAMEditor.py:4398 FlatCAMEditor.py:4469
-msgid "[success]Exterior buffer geometry created."
+#: FlatCAMEditor.py:4416 FlatCAMEditor.py:4487
+msgid "[success] Exterior buffer geometry created."
msgstr ""
-#: FlatCAMEditor.py:4533
-msgid "[WARNING_NOTCL]Nothing selected for painting."
+#: FlatCAMEditor.py:4551
+msgid "[WARNING_NOTCL] Nothing selected for painting."
msgstr ""
-#: FlatCAMEditor.py:4539
+#: FlatCAMEditor.py:4557
msgid "[WARNING] Invalid value for {}"
msgstr ""
-#: FlatCAMEditor.py:4545
+#: FlatCAMEditor.py:4563
msgid ""
"[ERROR_NOTCL] Could not do Paint. Overlap value has to be less than 1.00 "
"(100%)."
msgstr ""
-#: FlatCAMEditor.py:4604
+#: FlatCAMEditor.py:4622
#, python-format
msgid ""
"[ERROR] Could not do Paint. Try a different combination of parameters. Or a "
@@ -1814,133 +1816,133 @@ msgid ""
"%s"
msgstr ""
-#: FlatCAMEditor.py:4615
+#: FlatCAMEditor.py:4633
msgid "[success] Paint done."
msgstr ""
-#: FlatCAMEditor.py:4647
+#: FlatCAMEditor.py:4665
msgid "Excellon Editor"
msgstr ""
-#: FlatCAMEditor.py:4654
+#: FlatCAMEditor.py:4672
msgid "Name:"
msgstr ""
-#: FlatCAMEditor.py:4674 flatcamTools/ToolNonCopperClear.py:71
+#: FlatCAMEditor.py:4692 flatcamTools/ToolNonCopperClear.py:72
#: flatcamTools/ToolPaint.py:69 flatcamTools/ToolSolderPaste.py:70
msgid "Tools Table"
msgstr ""
-#: FlatCAMEditor.py:4676 flatcamGUI/ObjectUI.py:609
+#: FlatCAMEditor.py:4694 flatcamGUI/ObjectUI.py:624
msgid ""
"Tools in this Excellon object\n"
"when are used for drilling."
msgstr ""
-#: FlatCAMEditor.py:4685 FlatCAMEditor.py:5745 FlatCAMObj.py:2213
-#: FlatCAMObj.py:2307 FlatCAMObj.py:2418 flatcamGUI/ObjectUI.py:627
-#: flatcamTools/ToolNonCopperClear.py:82 flatcamTools/ToolPaint.py:80
+#: FlatCAMEditor.py:4703 FlatCAMEditor.py:5763 FlatCAMObj.py:2233
+#: FlatCAMObj.py:2327 FlatCAMObj.py:2438 flatcamGUI/ObjectUI.py:642
+#: flatcamTools/ToolNonCopperClear.py:83 flatcamTools/ToolPaint.py:80
#: flatcamTools/ToolSolderPaste.py:81
msgid "Diameter"
msgstr ""
-#: FlatCAMEditor.py:4693
+#: FlatCAMEditor.py:4711
msgid "Add/Delete Tool"
msgstr ""
-#: FlatCAMEditor.py:4695
+#: FlatCAMEditor.py:4713
msgid ""
"Add/Delete a tool to the tool list\n"
"for this Excellon object."
msgstr ""
-#: FlatCAMEditor.py:4703 flatcamTools/ToolCutOut.py:77
+#: FlatCAMEditor.py:4721 flatcamTools/ToolCutOut.py:77
msgid "Tool Dia:"
msgstr ""
-#: FlatCAMEditor.py:4705 flatcamGUI/ObjectUI.py:1046
+#: FlatCAMEditor.py:4723 flatcamGUI/ObjectUI.py:1061
msgid "Diameter for the new tool"
msgstr ""
-#: FlatCAMEditor.py:4714
+#: FlatCAMEditor.py:4732
msgid "Add Tool"
msgstr ""
-#: FlatCAMEditor.py:4716
+#: FlatCAMEditor.py:4734
msgid ""
"Add a new tool to the tool list\n"
"with the diameter specified above."
msgstr ""
-#: FlatCAMEditor.py:4726
+#: FlatCAMEditor.py:4744
msgid "Delete Tool"
msgstr ""
-#: FlatCAMEditor.py:4728
+#: FlatCAMEditor.py:4746
msgid ""
"Delete a tool in the tool list\n"
"by selecting a row in the tool table."
msgstr ""
-#: FlatCAMEditor.py:4746
+#: FlatCAMEditor.py:4764
msgid "Resize Drill(s)"
msgstr ""
-#: FlatCAMEditor.py:4748
+#: FlatCAMEditor.py:4766
msgid "Resize a drill or a selection of drills."
msgstr ""
-#: FlatCAMEditor.py:4755
+#: FlatCAMEditor.py:4773
msgid "Resize Dia:"
msgstr ""
-#: FlatCAMEditor.py:4757
+#: FlatCAMEditor.py:4775
msgid "Diameter to resize to."
msgstr ""
-#: FlatCAMEditor.py:4765
+#: FlatCAMEditor.py:4783
msgid "Resize"
msgstr ""
-#: FlatCAMEditor.py:4767
+#: FlatCAMEditor.py:4785
msgid "Resize drill(s)"
msgstr ""
-#: FlatCAMEditor.py:4789 flatcamGUI/FlatCAMGUI.py:1394
+#: FlatCAMEditor.py:4807 flatcamGUI/FlatCAMGUI.py:1394
msgid "Add Drill Array"
msgstr ""
-#: FlatCAMEditor.py:4791
+#: FlatCAMEditor.py:4809
msgid "Add an array of drills (linear or circular array)"
msgstr ""
-#: FlatCAMEditor.py:4797
+#: FlatCAMEditor.py:4815
msgid ""
"Select the type of drills array to create.\n"
"It can be Linear X(Y) or Circular"
msgstr ""
-#: FlatCAMEditor.py:4800
+#: FlatCAMEditor.py:4818
msgid "Linear"
msgstr ""
-#: FlatCAMEditor.py:4801
+#: FlatCAMEditor.py:4819
msgid "Circular"
msgstr ""
-#: FlatCAMEditor.py:4808
+#: FlatCAMEditor.py:4826
msgid "Nr of drills:"
msgstr ""
-#: FlatCAMEditor.py:4810
+#: FlatCAMEditor.py:4828
msgid "Specify how many drills to be in the array."
msgstr ""
-#: FlatCAMEditor.py:4827 FlatCAMEditor.py:4872
+#: FlatCAMEditor.py:4845 FlatCAMEditor.py:4890
msgid "Direction:"
msgstr ""
-#: FlatCAMEditor.py:4829
+#: FlatCAMEditor.py:4847
msgid ""
"Direction on which the linear array is oriented:\n"
"- 'X' - horizontal axis \n"
@@ -1948,19 +1950,19 @@ msgid ""
"- 'Angle' - a custom angle for the array inclination"
msgstr ""
-#: FlatCAMEditor.py:4838
+#: FlatCAMEditor.py:4856
msgid "Angle"
msgstr ""
-#: FlatCAMEditor.py:4842
+#: FlatCAMEditor.py:4860
msgid "Pitch:"
msgstr ""
-#: FlatCAMEditor.py:4844
+#: FlatCAMEditor.py:4862
msgid "Pitch = Distance between elements of the array."
msgstr ""
-#: FlatCAMEditor.py:4853
+#: FlatCAMEditor.py:4871
msgid ""
"Angle at which the linear array is placed.\n"
"The precision is of max 2 decimals.\n"
@@ -1968,360 +1970,363 @@ msgid ""
"Max value is: 360.00 degrees."
msgstr ""
-#: FlatCAMEditor.py:4874
+#: FlatCAMEditor.py:4892
msgid ""
"Direction for circular array.Can be CW = clockwise or CCW = counter "
"clockwise."
msgstr ""
-#: FlatCAMEditor.py:4889
+#: FlatCAMEditor.py:4907
msgid "Angle at which each element in circular array is placed."
msgstr ""
-#: FlatCAMEditor.py:5210 FlatCAMObj.py:1735
+#: FlatCAMEditor.py:5228 FlatCAMObj.py:1755
msgid "Total Drills"
msgstr ""
-#: FlatCAMEditor.py:5242 FlatCAMObj.py:1761
+#: FlatCAMEditor.py:5260 FlatCAMObj.py:1781
msgid "Total Slots"
msgstr ""
-#: FlatCAMEditor.py:5316 FlatCAMObj.py:1968 FlatCAMObj.py:3231
-#: FlatCAMObj.py:3537 FlatCAMObj.py:3724 FlatCAMObj.py:3737 FlatCAMObj.py:3854
-#: FlatCAMObj.py:4262 FlatCAMObj.py:4495 FlatCAMObj.py:4901
+#: FlatCAMEditor.py:5334 FlatCAMObj.py:1988 FlatCAMObj.py:3253
+#: FlatCAMObj.py:3559 FlatCAMObj.py:3746 FlatCAMObj.py:3759 FlatCAMObj.py:3876
+#: FlatCAMObj.py:4284 FlatCAMObj.py:4517 FlatCAMObj.py:4923
#: flatcamTools/ToolCalculators.py:307 flatcamTools/ToolCalculators.py:318
#: flatcamTools/ToolCalculators.py:330 flatcamTools/ToolCalculators.py:345
#: flatcamTools/ToolCalculators.py:358 flatcamTools/ToolCalculators.py:372
#: flatcamTools/ToolCalculators.py:383 flatcamTools/ToolCalculators.py:394
#: flatcamTools/ToolCalculators.py:405 flatcamTools/ToolFilm.py:241
-#: flatcamTools/ToolFilm.py:248 flatcamTools/ToolNonCopperClear.py:478
-#: flatcamTools/ToolNonCopperClear.py:625
-#: flatcamTools/ToolNonCopperClear.py:637 flatcamTools/ToolPaint.py:537
+#: flatcamTools/ToolFilm.py:248 flatcamTools/ToolNonCopperClear.py:479
+#: flatcamTools/ToolNonCopperClear.py:550
+#: flatcamTools/ToolNonCopperClear.py:626
+#: flatcamTools/ToolNonCopperClear.py:638 flatcamTools/ToolPaint.py:537
#: flatcamTools/ToolPaint.py:607 flatcamTools/ToolPaint.py:743
#: flatcamTools/ToolPaint.py:833 flatcamTools/ToolPaint.py:988
#: flatcamTools/ToolPanelize.py:323 flatcamTools/ToolPanelize.py:335
#: flatcamTools/ToolPanelize.py:348 flatcamTools/ToolPanelize.py:361
#: flatcamTools/ToolPanelize.py:373 flatcamTools/ToolPanelize.py:384
#: flatcamTools/ToolSolderPaste.py:755 flatcamTools/ToolSolderPaste.py:826
-msgid "[ERROR_NOTCL]Wrong value format entered, use a number."
+msgid "[ERROR_NOTCL] Wrong value format entered, use a number."
msgstr ""
-#: FlatCAMEditor.py:5329
+#: FlatCAMEditor.py:5347
msgid ""
-"[WARNING_NOTCL]Tool already in the original or actual tool list.\n"
+"[WARNING_NOTCL] Tool already in the original or actual tool list.\n"
"Save and reedit Excellon if you need to add this tool. "
msgstr ""
-#: FlatCAMEditor.py:5338 flatcamGUI/FlatCAMGUI.py:2498
+#: FlatCAMEditor.py:5356 flatcamGUI/FlatCAMGUI.py:2498
#, python-brace-format
-msgid "[success]Added new tool with dia: {dia} {units}"
+msgid "[success] Added new tool with dia: {dia} {units}"
msgstr ""
-#: FlatCAMEditor.py:5369
-msgid "[WARNING_NOTCL]Select a tool in Tool Table"
+#: FlatCAMEditor.py:5387
+msgid "[WARNING_NOTCL] Select a tool in Tool Table"
msgstr ""
-#: FlatCAMEditor.py:5402
+#: FlatCAMEditor.py:5420
#, python-brace-format
-msgid "[success]Deleted tool with dia: {del_dia} {units}"
+msgid "[success] Deleted tool with dia: {del_dia} {units}"
msgstr ""
-#: FlatCAMEditor.py:5799
+#: FlatCAMEditor.py:5817
msgid ""
"[ERROR_NOTCL] There are no Tools definitions in the file. Aborting Excellon "
"creation."
msgstr ""
-#: FlatCAMEditor.py:5808
+#: FlatCAMEditor.py:5826
msgid "Creating Excellon."
msgstr ""
-#: FlatCAMEditor.py:5817
-msgid "[success]Excellon editing finished."
+#: FlatCAMEditor.py:5835
+msgid "[success] Excellon editing finished."
msgstr ""
-#: FlatCAMEditor.py:5834
-msgid "[WARNING_NOTCL]Cancelled. There is no Tool/Drill selected"
+#: FlatCAMEditor.py:5852
+msgid "[WARNING_NOTCL] Cancelled. There is no Tool/Drill selected"
msgstr ""
-#: FlatCAMEditor.py:6316
-msgid "[success]Done. Drill(s) deleted."
+#: FlatCAMEditor.py:6334
+msgid "[success] Done. Drill(s) deleted."
msgstr ""
-#: FlatCAMEditor.py:6386
+#: FlatCAMEditor.py:6404
msgid "Click on the circular array Center position"
msgstr ""
#: FlatCAMObj.py:194
#, python-brace-format
-msgid "[success]Name changed from {old} to {new}"
+msgid "[success] Name changed from {old} to {new}"
msgstr ""
-#: FlatCAMObj.py:542 FlatCAMObj.py:1896 FlatCAMObj.py:3159 FlatCAMObj.py:5306
+#: FlatCAMObj.py:543 FlatCAMObj.py:1916 FlatCAMObj.py:3181 FlatCAMObj.py:5331
msgid "Basic"
msgstr ""
-#: FlatCAMObj.py:554 FlatCAMObj.py:1912 FlatCAMObj.py:3181 FlatCAMObj.py:5312
+#: FlatCAMObj.py:555 FlatCAMObj.py:1932 FlatCAMObj.py:3203 FlatCAMObj.py:5337
msgid "Advanced"
msgstr ""
-#: FlatCAMObj.py:909 FlatCAMObj.py:964
+#: FlatCAMObj.py:910 FlatCAMObj.py:965
#, python-format
-msgid "[success]Isolation geometry created: %s"
+msgid "[success] Isolation geometry created: %s"
msgstr ""
-#: FlatCAMObj.py:1039
+#: FlatCAMObj.py:1059
msgid ""
"[ERROR_NOTCL] The aperture scale factor value is missing or wrong format."
msgstr ""
-#: FlatCAMObj.py:1054 FlatCAMObj.py:1089
+#: FlatCAMObj.py:1074 FlatCAMObj.py:1109
msgid ""
"[WARNING_NOTCL] No aperture to scale. Select at least one aperture and try "
"again."
msgstr ""
-#: FlatCAMObj.py:1074
+#: FlatCAMObj.py:1094
msgid "[ERROR_NOTCL] The aperture buffer value is missing or wrong format."
msgstr ""
-#: FlatCAMObj.py:1146
+#: FlatCAMObj.py:1166
msgid "Generating Gerber"
msgstr ""
-#: FlatCAMObj.py:1154
-msgid "[ERROR_NOTCL] Cretion of Gerber failed."
+#: FlatCAMObj.py:1174
+msgid "[ERROR_NOTCL] Creation of Gerber failed."
msgstr ""
-#: FlatCAMObj.py:1161
+#: FlatCAMObj.py:1181
#, python-format
msgid "[success] Created: %s"
msgstr ""
-#: FlatCAMObj.py:1281
+#: FlatCAMObj.py:1301
msgid "Plotting Apertures"
msgstr ""
-#: FlatCAMObj.py:2192 FlatCAMObj.py:2283 FlatCAMObj.py:2398
+#: FlatCAMObj.py:2212 FlatCAMObj.py:2303 FlatCAMObj.py:2418
msgid ""
-"[ERROR_NOTCL]Please select one or more tools from the list and try again."
+"[ERROR_NOTCL] Please select one or more tools from the list and try again."
msgstr ""
-#: FlatCAMObj.py:2199
+#: FlatCAMObj.py:2219
msgid ""
"[ERROR_NOTCL] Milling tool for DRILLS is larger than hole size. Cancelled."
msgstr ""
-#: FlatCAMObj.py:2213 FlatCAMObj.py:2307 FlatCAMObj.py:2418
+#: FlatCAMObj.py:2233 FlatCAMObj.py:2327 FlatCAMObj.py:2438
msgid "Tool_nr"
msgstr ""
-#: FlatCAMObj.py:2213 FlatCAMObj.py:2307 FlatCAMObj.py:2418
+#: FlatCAMObj.py:2233 FlatCAMObj.py:2327 FlatCAMObj.py:2438
msgid "Drills_Nr"
msgstr ""
-#: FlatCAMObj.py:2213 FlatCAMObj.py:2307 FlatCAMObj.py:2418
+#: FlatCAMObj.py:2233 FlatCAMObj.py:2327 FlatCAMObj.py:2438
msgid "Slots_Nr"
msgstr ""
-#: FlatCAMObj.py:2293
+#: FlatCAMObj.py:2313
msgid ""
"[ERROR_NOTCL] Milling tool for SLOTS is larger than hole size. Cancelled."
msgstr ""
-#: FlatCAMObj.py:2456 FlatCAMObj.py:4150 FlatCAMObj.py:4361 FlatCAMObj.py:4676
+#: FlatCAMObj.py:2478 FlatCAMObj.py:4172 FlatCAMObj.py:4383 FlatCAMObj.py:4698
msgid ""
-"[ERROR_NOTCL]Wrong value format for self.defaults[\"z_pdepth\"] or self."
+"[ERROR_NOTCL] Wrong value format for self.defaults[\"z_pdepth\"] or self."
"options[\"z_pdepth\"]"
msgstr ""
-#: FlatCAMObj.py:2468 FlatCAMObj.py:4162 FlatCAMObj.py:4373 FlatCAMObj.py:4688
+#: FlatCAMObj.py:2490 FlatCAMObj.py:4184 FlatCAMObj.py:4395 FlatCAMObj.py:4710
msgid ""
-"[ERROR_NOTCL]Wrong value format for self.defaults[\"feedrate_probe\"] or "
+"[ERROR_NOTCL] Wrong value format for self.defaults[\"feedrate_probe\"] or "
"self.options[\"feedrate_probe\"]"
msgstr ""
-#: FlatCAMObj.py:2500 FlatCAMObj.py:4563 FlatCAMObj.py:4568 FlatCAMObj.py:4714
+#: FlatCAMObj.py:2522 FlatCAMObj.py:4585 FlatCAMObj.py:4590 FlatCAMObj.py:4736
msgid "Generating CNC Code"
msgstr ""
-#: FlatCAMObj.py:2526 FlatCAMObj.py:4860 camlib.py:4929 camlib.py:5365
-#: camlib.py:5636
+#: FlatCAMObj.py:2548 FlatCAMObj.py:4882 camlib.py:4939 camlib.py:5375
+#: camlib.py:5646
msgid ""
"[ERROR]The Toolchange X,Y field in Edit -> Preferences has to be in the "
"format (x, y) \n"
"but now there is only one value, not two. "
msgstr ""
-#: FlatCAMObj.py:2873 FlatCAMObj.py:3115 FlatCAMObj.py:3400
+#: FlatCAMObj.py:2895 FlatCAMObj.py:3137 FlatCAMObj.py:3422
msgid "Path"
msgstr ""
-#: FlatCAMObj.py:2873
+#: FlatCAMObj.py:2895
msgid "In"
msgstr ""
-#: FlatCAMObj.py:2873
+#: FlatCAMObj.py:2895
msgid "Out"
msgstr ""
-#: FlatCAMObj.py:2873 FlatCAMObj.py:3196 FlatCAMObj.py:3769
+#: FlatCAMObj.py:2895 FlatCAMObj.py:3218 FlatCAMObj.py:3791
msgid "Custom"
msgstr ""
-#: FlatCAMObj.py:2874 FlatCAMObj.py:3780 FlatCAMObj.py:3781 FlatCAMObj.py:3790
+#: FlatCAMObj.py:2896 FlatCAMObj.py:3802 FlatCAMObj.py:3803 FlatCAMObj.py:3812
msgid "Iso"
msgstr ""
-#: FlatCAMObj.py:2874 FlatCAMObj.py:3117 FlatCAMObj.py:3402
+#: FlatCAMObj.py:2896 FlatCAMObj.py:3139 FlatCAMObj.py:3424
msgid "Rough"
msgstr ""
-#: FlatCAMObj.py:2874
+#: FlatCAMObj.py:2896
msgid "Finish"
msgstr ""
-#: FlatCAMObj.py:3152 flatcamGUI/FlatCAMGUI.py:473
-#: flatcamGUI/FlatCAMGUI.py:1398 flatcamGUI/ObjectUI.py:1067
+#: FlatCAMObj.py:3174 flatcamGUI/FlatCAMGUI.py:473
+#: flatcamGUI/FlatCAMGUI.py:1398 flatcamGUI/ObjectUI.py:1082
msgid "Copy"
msgstr ""
-#: FlatCAMObj.py:3154 flatcamGUI/FlatCAMGUI.py:474
-#: flatcamGUI/FlatCAMGUI.py:1399 flatcamGUI/ObjectUI.py:1075
-#: flatcamTools/ToolNonCopperClear.py:145 flatcamTools/ToolPaint.py:143
-#: flatcamTools/ToolSolderPaste.py:121 flatcamTools/ToolSolderPaste.py:480
+#: FlatCAMObj.py:3176 flatcamGUI/FlatCAMGUI.py:474
+#: flatcamGUI/FlatCAMGUI.py:1399 flatcamGUI/ObjectUI.py:259
+#: flatcamGUI/ObjectUI.py:1090 flatcamTools/ToolNonCopperClear.py:146
+#: flatcamTools/ToolPaint.py:143 flatcamTools/ToolSolderPaste.py:121
+#: flatcamTools/ToolSolderPaste.py:480
msgid "Delete"
msgstr ""
-#: FlatCAMObj.py:3372
+#: FlatCAMObj.py:3394
msgid "[ERROR_NOTCL] Please enter the desired tool diameter in Float format."
msgstr ""
-#: FlatCAMObj.py:3447
+#: FlatCAMObj.py:3469
msgid "[success] Tool added in Tool Table."
msgstr ""
-#: FlatCAMObj.py:3452
-msgid "[ERROR_NOTCL]Default Tool added. Wrong value format entered."
+#: FlatCAMObj.py:3474
+msgid "[ERROR_NOTCL] Default Tool added. Wrong value format entered."
msgstr ""
-#: FlatCAMObj.py:3482 FlatCAMObj.py:3492
-msgid "[WARNING_NOTCL]Failed. Select a tool to copy."
+#: FlatCAMObj.py:3504 FlatCAMObj.py:3514
+msgid "[WARNING_NOTCL] Failed. Select a tool to copy."
msgstr ""
-#: FlatCAMObj.py:3521
+#: FlatCAMObj.py:3543
msgid "[success] Tool was copied in Tool Table."
msgstr ""
-#: FlatCAMObj.py:3554
+#: FlatCAMObj.py:3576
msgid "[success] Tool was edited in Tool Table."
msgstr ""
-#: FlatCAMObj.py:3585 FlatCAMObj.py:3595
-msgid "[WARNING_NOTCL]Failed. Select a tool to delete."
+#: FlatCAMObj.py:3607 FlatCAMObj.py:3617
+msgid "[WARNING_NOTCL] Failed. Select a tool to delete."
msgstr ""
-#: FlatCAMObj.py:3619
+#: FlatCAMObj.py:3641
msgid "[success] Tool was deleted in Tool Table."
msgstr ""
-#: FlatCAMObj.py:4033
+#: FlatCAMObj.py:4055
#, python-format
msgid ""
-"[WARNING_NOTCL]This Geometry can't be processed because it is %s geometry."
+"[WARNING_NOTCL] This Geometry can't be processed because it is %s geometry."
msgstr ""
-#: FlatCAMObj.py:4050
-msgid "[ERROR_NOTCL]Wrong Tool Dia value format entered, use a number."
+#: FlatCAMObj.py:4072
+msgid "[ERROR_NOTCL] Wrong Tool Dia value format entered, use a number."
msgstr ""
-#: FlatCAMObj.py:4077
+#: FlatCAMObj.py:4099
msgid "[ERROR_NOTCL] Failed. No tool selected in the tool table ..."
msgstr ""
-#: FlatCAMObj.py:4115
+#: FlatCAMObj.py:4137
#, python-format
msgid "FlatCAMObj.FlatCAMGeometry.mtool_gen_cncjob() --> %s"
msgstr ""
-#: FlatCAMObj.py:4271 FlatCAMObj.py:4504
+#: FlatCAMObj.py:4293 FlatCAMObj.py:4526
msgid ""
"[WARNING] Tool Offset is selected in Tool Table but no value is provided.\n"
"Add a Tool Offset or change the Offset Type."
msgstr ""
-#: FlatCAMObj.py:4385
-msgid "[ERROR_NOTCL]Cancelled. Empty file, it has no geometry..."
+#: FlatCAMObj.py:4407 flatcamTools/ToolSolderPaste.py:1106
+#: flatcamTools/ToolSolderPaste.py:1161
+msgid "[ERROR_NOTCL] Cancelled. Empty file, it has no geometry..."
msgstr ""
-#: FlatCAMObj.py:4747 FlatCAMObj.py:4757 camlib.py:3229 camlib.py:3238
+#: FlatCAMObj.py:4769 FlatCAMObj.py:4779 camlib.py:3229 camlib.py:3238
msgid "[ERROR_NOTCL] Scale factor has to be a number: integer or float."
msgstr ""
-#: FlatCAMObj.py:4795
-msgid "[success]Geometry Scale done."
+#: FlatCAMObj.py:4817
+msgid "[success] Geometry Scale done."
msgstr ""
-#: FlatCAMObj.py:4812 camlib.py:3300
+#: FlatCAMObj.py:4834 camlib.py:3300
msgid ""
-"[ERROR_NOTCL]An (x,y) pair of values are needed. Probable you entered only "
+"[ERROR_NOTCL] An (x,y) pair of values are needed. Probable you entered only "
"one value in the Offset field."
msgstr ""
-#: FlatCAMObj.py:4832
-msgid "[success]Geometry Offset done."
+#: FlatCAMObj.py:4854
+msgid "[success] Geometry Offset done."
msgstr ""
-#: FlatCAMObj.py:5374 FlatCAMObj.py:5379 flatcamTools/ToolSolderPaste.py:1360
+#: FlatCAMObj.py:5399 FlatCAMObj.py:5404 flatcamTools/ToolSolderPaste.py:1360
msgid "Export Machine Code ..."
msgstr ""
-#: FlatCAMObj.py:5385
-msgid "[WARNING_NOTCL]Export Machine Code cancelled ..."
+#: FlatCAMObj.py:5410 flatcamTools/ToolSolderPaste.py:1363
+msgid "[WARNING_NOTCL] Export Machine Code cancelled ..."
msgstr ""
-#: FlatCAMObj.py:5396
+#: FlatCAMObj.py:5421
#, python-format
msgid "[success] Machine Code file saved to: %s"
msgstr ""
-#: FlatCAMObj.py:5418
+#: FlatCAMObj.py:5443
#, python-format
msgid "[ERROR]FlatCAMCNNJob.on_edit_code_click() -->%s"
msgstr ""
-#: FlatCAMObj.py:5524
+#: FlatCAMObj.py:5549
#, python-format
msgid ""
-"[WARNING_NOTCL]This CNCJob object can't be processed because it is a %s "
+"[WARNING_NOTCL] This CNCJob object can't be processed because it is a %s "
"CNCJob object."
msgstr ""
-#: FlatCAMObj.py:5577
+#: FlatCAMObj.py:5602
msgid "[ERROR_NOTCL] G-code does not have a units code: either G20 or G21"
msgstr ""
-#: FlatCAMObj.py:5590
+#: FlatCAMObj.py:5615
msgid ""
"[ERROR_NOTCL] Cancelled. The Toolchange Custom code is enabled but it's "
"empty."
msgstr ""
-#: FlatCAMObj.py:5597
+#: FlatCAMObj.py:5622
msgid "[success] Toolchange G-code was replaced by a custom code."
msgstr ""
-#: FlatCAMObj.py:5612 flatcamTools/ToolSolderPaste.py:1389
+#: FlatCAMObj.py:5637 flatcamTools/ToolSolderPaste.py:1389
msgid "[WARNING_NOTCL] No such file or directory"
msgstr ""
-#: FlatCAMObj.py:5631 FlatCAMObj.py:5643
+#: FlatCAMObj.py:5656 FlatCAMObj.py:5668
msgid ""
"[WARNING_NOTCL] The used postprocessor file has to have in it's name: "
"'toolchange_custom'"
msgstr ""
-#: FlatCAMObj.py:5649
+#: FlatCAMObj.py:5674
msgid "[ERROR] There is no postprocessor file."
msgstr ""
@@ -2340,7 +2345,7 @@ msgid "[ERROR_NOTCL] self.solid_geometry is neither BaseGeometry or list."
msgstr ""
#: camlib.py:1387
-msgid "[success]Object was mirrored ..."
+msgid "[success] Object was mirrored ..."
msgstr ""
#: camlib.py:1389
@@ -2348,7 +2353,7 @@ msgid "[ERROR_NOTCL] Failed to mirror. No object selected"
msgstr ""
#: camlib.py:1425
-msgid "[success]Object was rotated ..."
+msgid "[success] Object was rotated ..."
msgstr ""
#: camlib.py:1427
@@ -2356,7 +2361,7 @@ msgid "[ERROR_NOTCL] Failed to rotate. No object selected"
msgstr ""
#: camlib.py:1461
-msgid "[success]Object was skewed ..."
+msgid "[success] Object was skewed ..."
msgstr ""
#: camlib.py:1463
@@ -2387,38 +2392,38 @@ msgid ""
msgstr ""
#: camlib.py:3267
-msgid "[success]Gerber Scale done."
+msgid "[success] Gerber Scale done."
msgstr ""
#: camlib.py:3324
-msgid "[success]Gerber Offset done."
+msgid "[success] Gerber Offset done."
msgstr ""
-#: camlib.py:3700
+#: camlib.py:3699
#, python-format
msgid "[ERROR_NOTCL] This is GCODE mark: %s"
msgstr ""
-#: camlib.py:4230
+#: camlib.py:4229
#, python-brace-format
msgid ""
"[ERROR] Excellon Parser error.\n"
"Parsing Failed. Line {l_nr}: {line}\n"
msgstr ""
-#: camlib.py:4307
+#: camlib.py:4306
msgid ""
"[WARNING] Excellon.create_geometry() -> a drill location was skipped due of "
"not having a tool associated.\n"
"Check the resulting GCode."
msgstr ""
-#: camlib.py:4843
+#: camlib.py:4848
#, python-format
msgid "[ERROR] There is no such parameter: %s"
msgstr ""
-#: camlib.py:4908
+#: camlib.py:4918
msgid ""
"[WARNING] The Cut Z parameter has positive value. It is the depth value to "
"drill into material.\n"
@@ -2427,27 +2432,27 @@ msgid ""
"CNC code (Gcode etc)."
msgstr ""
-#: camlib.py:4915 camlib.py:5388 camlib.py:5659
+#: camlib.py:4925 camlib.py:5398 camlib.py:5669
#, python-format
msgid ""
"[WARNING] The Cut Z parameter is zero. There will be no cut, skipping %s file"
msgstr ""
-#: camlib.py:5131 camlib.py:5226 camlib.py:5277
-msgid "[ERROR_NOTCL]The loaded Excellon file has no drills ..."
+#: camlib.py:5141 camlib.py:5236 camlib.py:5287
+msgid "[ERROR_NOTCL] The loaded Excellon file has no drills ..."
msgstr ""
-#: camlib.py:5231
+#: camlib.py:5241
msgid "[ERROR_NOTCL] Wrong optimization type selected."
msgstr ""
-#: camlib.py:5376 camlib.py:5647
+#: camlib.py:5386 camlib.py:5657
msgid ""
"[ERROR_NOTCL] Cut_Z parameter is None or zero. Most likely a bad "
"combinations of other parameters."
msgstr ""
-#: camlib.py:5381 camlib.py:5652
+#: camlib.py:5391 camlib.py:5662
msgid ""
"[WARNING] The Cut Z parameter has positive value. It is the depth value to "
"cut into material.\n"
@@ -2456,11 +2461,11 @@ msgid ""
"code (Gcode etc)."
msgstr ""
-#: camlib.py:5393 camlib.py:5664
+#: camlib.py:5403 camlib.py:5674
msgid "[ERROR_NOTCL] Travel Z parameter is None or zero."
msgstr ""
-#: camlib.py:5397 camlib.py:5668
+#: camlib.py:5407 camlib.py:5678
msgid ""
"[WARNING] The Travel Z parameter has negative value. It is the height value "
"to travel between cuts.\n"
@@ -2469,31 +2474,31 @@ msgid ""
"code (Gcode etc)."
msgstr ""
-#: camlib.py:5404 camlib.py:5675
+#: camlib.py:5414 camlib.py:5685
#, python-format
msgid ""
"[WARNING] The Z Travel parameter is zero. This is dangerous, skipping %s file"
msgstr ""
-#: camlib.py:5534
+#: camlib.py:5544
#, python-format
msgid "[ERROR]Expected a Geometry, got %s"
msgstr ""
-#: camlib.py:5540
+#: camlib.py:5550
msgid ""
-"[ERROR_NOTCL]Trying to generate a CNC Job from a Geometry object without "
+"[ERROR_NOTCL] Trying to generate a CNC Job from a Geometry object without "
"solid_geometry."
msgstr ""
-#: camlib.py:5579
+#: camlib.py:5589
msgid ""
-"[ERROR_NOTCL]The Tool Offset value is too negative to use for the "
+"[ERROR_NOTCL] The Tool Offset value is too negative to use for the "
"current_geometry.\n"
"Raise the value (in module) and try again."
msgstr ""
-#: camlib.py:5801
+#: camlib.py:5811
msgid "[ERROR_NOTCL] There is no tool data in the SolderPaste geometry."
msgstr ""
@@ -3086,7 +3091,7 @@ msgid "&Cutout Tool"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:584 flatcamGUI/FlatCAMGUI.py:1633
-#: flatcamGUI/ObjectUI.py:463 flatcamTools/ToolNonCopperClear.py:283
+#: flatcamGUI/ObjectUI.py:478 flatcamTools/ToolNonCopperClear.py:284
msgid "NCC Tool"
msgstr ""
@@ -3843,7 +3848,7 @@ msgid "Rectangle"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:1388 flatcamGUI/FlatCAMGUI.py:4607
-#: flatcamGUI/ObjectUI.py:1431
+#: flatcamGUI/ObjectUI.py:1446
msgid "Cut"
msgstr ""
@@ -3885,7 +3890,7 @@ msgid "Replace With"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:1437 flatcamGUI/FlatCAMGUI.py:4605
-#: flatcamGUI/FlatCAMGUI.py:5106 flatcamGUI/ObjectUI.py:1429
+#: flatcamGUI/FlatCAMGUI.py:5106 flatcamGUI/ObjectUI.py:1444
msgid "All"
msgstr ""
@@ -3949,7 +3954,7 @@ msgid "Warning"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:2151 flatcamGUI/FlatCAMGUI.py:2345
-msgid "[WARNING_NOTCL]Cancelled."
+msgid "[WARNING_NOTCL] Cancelled."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:2211
@@ -3971,15 +3976,15 @@ msgid ""
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:2362
-msgid "[WARNING_NOTCL]Cancelled. Nothing selected to delete."
+msgid "[WARNING_NOTCL] Cancelled. Nothing selected to delete."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:2429
-msgid "[WARNING_NOTCL]Cancelled. Nothing selected to copy."
+msgid "[WARNING_NOTCL] Cancelled. Nothing selected to copy."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:2475
-msgid "[WARNING_NOTCL]Cancelled. Nothing selected to move."
+msgid "[WARNING_NOTCL] Cancelled. Nothing selected to move."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:2489
@@ -4361,13 +4366,13 @@ msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3359 flatcamGUI/FlatCAMGUI.py:3600
#: flatcamGUI/FlatCAMGUI.py:4255 flatcamGUI/FlatCAMGUI.py:4579
-#: flatcamGUI/ObjectUI.py:150 flatcamGUI/ObjectUI.py:576
-#: flatcamGUI/ObjectUI.py:901 flatcamGUI/ObjectUI.py:1415
+#: flatcamGUI/ObjectUI.py:150 flatcamGUI/ObjectUI.py:591
+#: flatcamGUI/ObjectUI.py:916 flatcamGUI/ObjectUI.py:1430
msgid "Plot Options:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3366 flatcamGUI/FlatCAMGUI.py:3612
-#: flatcamGUI/ObjectUI.py:577
+#: flatcamGUI/ObjectUI.py:592
msgid "Solid"
msgstr ""
@@ -4389,8 +4394,8 @@ msgid "Plot"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3382 flatcamGUI/FlatCAMGUI.py:4261
-#: flatcamGUI/ObjectUI.py:174 flatcamGUI/ObjectUI.py:617
-#: flatcamGUI/ObjectUI.py:947 flatcamGUI/ObjectUI.py:1502
+#: flatcamGUI/ObjectUI.py:174 flatcamGUI/ObjectUI.py:632
+#: flatcamGUI/ObjectUI.py:962 flatcamGUI/ObjectUI.py:1517
msgid "Plot (show) this object."
msgstr ""
@@ -4409,19 +4414,19 @@ msgstr ""
msgid "Gerber Options"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3408 flatcamGUI/ObjectUI.py:322
+#: flatcamGUI/FlatCAMGUI.py:3408 flatcamGUI/ObjectUI.py:337
msgid "Isolation Routing:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3410 flatcamGUI/ObjectUI.py:324
+#: flatcamGUI/FlatCAMGUI.py:3410 flatcamGUI/ObjectUI.py:339
msgid ""
"Create a Geometry object with\n"
"toolpaths to cut outside polygons."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3421 flatcamGUI/FlatCAMGUI.py:3978
-#: flatcamGUI/FlatCAMGUI.py:4903 flatcamGUI/ObjectUI.py:856
-#: flatcamGUI/ObjectUI.py:872
+#: flatcamGUI/FlatCAMGUI.py:4903 flatcamGUI/ObjectUI.py:871
+#: flatcamGUI/ObjectUI.py:887
msgid "Diameter of the cutting tool."
msgstr ""
@@ -4429,17 +4434,17 @@ msgstr ""
msgid "Width (# passes):"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3430 flatcamGUI/ObjectUI.py:346
+#: flatcamGUI/FlatCAMGUI.py:3430 flatcamGUI/ObjectUI.py:361
msgid ""
"Width of the isolation gap in\n"
"number (integer) of tool widths."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3438 flatcamGUI/ObjectUI.py:354
+#: flatcamGUI/FlatCAMGUI.py:3438 flatcamGUI/ObjectUI.py:369
msgid "Pass overlap:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3440 flatcamGUI/ObjectUI.py:356
+#: flatcamGUI/FlatCAMGUI.py:3440 flatcamGUI/ObjectUI.py:371
#, python-format
msgid ""
"How much (fraction) of the tool width to overlap each tool pass.\n"
@@ -4448,22 +4453,22 @@ msgid ""
"above."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3448 flatcamGUI/ObjectUI.py:366
+#: flatcamGUI/FlatCAMGUI.py:3448 flatcamGUI/ObjectUI.py:381
msgid "Milling Type:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3450 flatcamGUI/ObjectUI.py:368
+#: flatcamGUI/FlatCAMGUI.py:3450 flatcamGUI/ObjectUI.py:383
msgid ""
"Milling type:\n"
"- climb / best for precision milling and to reduce tool usage\n"
"- conventional / useful when there is no backlash compensation"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3455 flatcamGUI/ObjectUI.py:373
+#: flatcamGUI/FlatCAMGUI.py:3455 flatcamGUI/ObjectUI.py:388
msgid "Climb"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3456 flatcamGUI/ObjectUI.py:374
+#: flatcamGUI/FlatCAMGUI.py:3456 flatcamGUI/ObjectUI.py:389
msgid "Conv."
msgstr ""
@@ -4471,7 +4476,7 @@ msgstr ""
msgid "Combine Passes"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3462 flatcamGUI/ObjectUI.py:380
+#: flatcamGUI/FlatCAMGUI.py:3462 flatcamGUI/ObjectUI.py:395
msgid "Combine all passes into one object"
msgstr ""
@@ -4480,18 +4485,18 @@ msgid "Clear non-copper:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3469 flatcamGUI/FlatCAMGUI.py:4791
-#: flatcamGUI/ObjectUI.py:457
+#: flatcamGUI/ObjectUI.py:472
msgid ""
"Create a Geometry object with\n"
"toolpaths to cut all non-copper regions."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3478 flatcamGUI/FlatCAMGUI.py:3504
-#: flatcamGUI/ObjectUI.py:501 flatcamGUI/ObjectUI.py:535
+#: flatcamGUI/ObjectUI.py:516 flatcamGUI/ObjectUI.py:550
msgid "Boundary Margin:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3480 flatcamGUI/ObjectUI.py:503
+#: flatcamGUI/FlatCAMGUI.py:3480 flatcamGUI/ObjectUI.py:518
msgid ""
"Specify the edge of the PCB\n"
"by drawing a box around all\n"
@@ -4509,17 +4514,17 @@ msgid ""
"covering the copper-free areas of the PCB."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3498 flatcamGUI/ObjectUI.py:525
+#: flatcamGUI/FlatCAMGUI.py:3498 flatcamGUI/ObjectUI.py:540
msgid "Bounding Box:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3506 flatcamGUI/ObjectUI.py:537
+#: flatcamGUI/FlatCAMGUI.py:3506 flatcamGUI/ObjectUI.py:552
msgid ""
"Distance of the edges of the box\n"
"to the nearest polygon."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3515 flatcamGUI/ObjectUI.py:547
+#: flatcamGUI/FlatCAMGUI.py:3515 flatcamGUI/ObjectUI.py:562
msgid ""
"If the bounding box is \n"
"to have rounded corners\n"
@@ -4542,11 +4547,11 @@ msgid ""
"Advanced App. Level."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3545 flatcamGUI/ObjectUI.py:385
+#: flatcamGUI/FlatCAMGUI.py:3545 flatcamGUI/ObjectUI.py:400
msgid "\"Follow\""
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3547 flatcamGUI/ObjectUI.py:387
+#: flatcamGUI/FlatCAMGUI.py:3547 flatcamGUI/ObjectUI.py:402
msgid ""
"Generate a 'Follow' geometry.\n"
"This means that it will cut through\n"
@@ -4568,7 +4573,7 @@ msgstr ""
msgid "Ap. Scale Factor:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3567 flatcamGUI/ObjectUI.py:254
+#: flatcamGUI/FlatCAMGUI.py:3567 flatcamGUI/ObjectUI.py:269
msgid ""
"Change the size of the selected apertures.\n"
"Factor by which to multiply\n"
@@ -4579,7 +4584,7 @@ msgstr ""
msgid "Ap. Buffer Factor:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3579 flatcamGUI/ObjectUI.py:275
+#: flatcamGUI/FlatCAMGUI.py:3579 flatcamGUI/ObjectUI.py:290
msgid ""
"Change the size of the selected apertures.\n"
"Factor by which to expand/shrink\n"
@@ -4745,7 +4750,7 @@ msgstr ""
msgid "Excellon Options"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3853 flatcamGUI/ObjectUI.py:655
+#: flatcamGUI/FlatCAMGUI.py:3853 flatcamGUI/ObjectUI.py:670
msgid "Create CNC Job"
msgstr ""
@@ -4756,23 +4761,23 @@ msgid ""
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3863 flatcamGUI/FlatCAMGUI.py:4319
-#: flatcamGUI/FlatCAMGUI.py:5318 flatcamGUI/ObjectUI.py:666
-#: flatcamGUI/ObjectUI.py:1130 flatcamTools/ToolCalculators.py:108
+#: flatcamGUI/FlatCAMGUI.py:5318 flatcamGUI/ObjectUI.py:681
+#: flatcamGUI/ObjectUI.py:1145 flatcamTools/ToolCalculators.py:108
msgid "Cut Z:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3865 flatcamGUI/ObjectUI.py:668
+#: flatcamGUI/FlatCAMGUI.py:3865 flatcamGUI/ObjectUI.py:683
msgid ""
"Drill depth (negative)\n"
"below the copper surface."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3872 flatcamGUI/FlatCAMGUI.py:4352
-#: flatcamGUI/ObjectUI.py:676 flatcamGUI/ObjectUI.py:1166
+#: flatcamGUI/ObjectUI.py:691 flatcamGUI/ObjectUI.py:1181
msgid "Travel Z:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3874 flatcamGUI/ObjectUI.py:678
+#: flatcamGUI/FlatCAMGUI.py:3874 flatcamGUI/ObjectUI.py:693
msgid ""
"Tool height when travelling\n"
"across the XY plane."
@@ -4783,7 +4788,7 @@ msgid "Tool change:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3884 flatcamGUI/FlatCAMGUI.py:4364
-#: flatcamGUI/ObjectUI.py:688
+#: flatcamGUI/ObjectUI.py:703
msgid ""
"Include tool-change sequence\n"
"in G-Code (Pause for tool change)."
@@ -4812,19 +4817,19 @@ msgid "Spindle Speed:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3911 flatcamGUI/FlatCAMGUI.py:4404
-#: flatcamGUI/ObjectUI.py:752
+#: flatcamGUI/ObjectUI.py:767
msgid ""
"Speed of the spindle\n"
"in RPM (optional)"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3919 flatcamGUI/FlatCAMGUI.py:4412
-#: flatcamGUI/ObjectUI.py:760 flatcamGUI/ObjectUI.py:1289
+#: flatcamGUI/ObjectUI.py:775 flatcamGUI/ObjectUI.py:1304
msgid "Dwell:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3921 flatcamGUI/FlatCAMGUI.py:4414
-#: flatcamGUI/ObjectUI.py:762 flatcamGUI/ObjectUI.py:1292
+#: flatcamGUI/ObjectUI.py:777 flatcamGUI/ObjectUI.py:1307
msgid ""
"Pause to allow the spindle to reach its\n"
"speed before cutting."
@@ -4835,12 +4840,12 @@ msgid "Duration:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3926 flatcamGUI/FlatCAMGUI.py:4419
-#: flatcamGUI/ObjectUI.py:767 flatcamGUI/ObjectUI.py:1299
+#: flatcamGUI/ObjectUI.py:782 flatcamGUI/ObjectUI.py:1314
msgid "Number of milliseconds for spindle to dwell."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:3938 flatcamGUI/FlatCAMGUI.py:4429
-#: flatcamGUI/ObjectUI.py:775
+#: flatcamGUI/ObjectUI.py:790
msgid "Postprocessor:"
msgstr ""
@@ -4862,25 +4867,25 @@ msgid ""
"converted to drills."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3957 flatcamGUI/ObjectUI.py:627
-#: flatcamGUI/ObjectUI.py:823
+#: flatcamGUI/FlatCAMGUI.py:3957 flatcamGUI/ObjectUI.py:642
+#: flatcamGUI/ObjectUI.py:838
msgid "Drills"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3958 flatcamGUI/ObjectUI.py:627
-#: flatcamGUI/ObjectUI.py:824
+#: flatcamGUI/FlatCAMGUI.py:3958 flatcamGUI/ObjectUI.py:642
+#: flatcamGUI/ObjectUI.py:839
msgid "Slots"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3959 flatcamGUI/ObjectUI.py:825
+#: flatcamGUI/FlatCAMGUI.py:3959 flatcamGUI/ObjectUI.py:840
msgid "Both"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3968 flatcamGUI/ObjectUI.py:840
+#: flatcamGUI/FlatCAMGUI.py:3968 flatcamGUI/ObjectUI.py:855
msgid "Mill Holes"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:3970 flatcamGUI/ObjectUI.py:842
+#: flatcamGUI/FlatCAMGUI.py:3970 flatcamGUI/ObjectUI.py:857
msgid "Create Geometry for milling holes."
msgstr ""
@@ -4920,7 +4925,7 @@ msgstr ""
msgid "Offset Z:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4028 flatcamGUI/ObjectUI.py:645
+#: flatcamGUI/FlatCAMGUI.py:4028 flatcamGUI/ObjectUI.py:660
msgid ""
"Some drill bits (the larger ones) need to drill deeper\n"
"to create the desired exit hole diameter due of the tip shape.\n"
@@ -4936,7 +4941,7 @@ msgid "Toolchange X,Y position."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4043 flatcamGUI/FlatCAMGUI.py:4472
-#: flatcamGUI/ObjectUI.py:705
+#: flatcamGUI/ObjectUI.py:720
msgid "Start move Z:"
msgstr ""
@@ -4947,7 +4952,7 @@ msgid ""
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4052 flatcamGUI/FlatCAMGUI.py:4482
-#: flatcamGUI/ObjectUI.py:715 flatcamGUI/ObjectUI.py:1212
+#: flatcamGUI/ObjectUI.py:730 flatcamGUI/ObjectUI.py:1227
msgid "End move Z:"
msgstr ""
@@ -4958,11 +4963,11 @@ msgid ""
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4061 flatcamGUI/FlatCAMGUI.py:4492
-#: flatcamGUI/ObjectUI.py:736
+#: flatcamGUI/ObjectUI.py:751
msgid "Feedrate Rapids:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4063 flatcamGUI/ObjectUI.py:738
+#: flatcamGUI/FlatCAMGUI.py:4063 flatcamGUI/ObjectUI.py:753
msgid ""
"Tool speed while drilling\n"
"(in units per minute).\n"
@@ -4972,24 +4977,24 @@ msgid ""
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4074 flatcamGUI/FlatCAMGUI.py:4516
-#: flatcamGUI/ObjectUI.py:786 flatcamGUI/ObjectUI.py:1321
+#: flatcamGUI/ObjectUI.py:801 flatcamGUI/ObjectUI.py:1336
msgid "Probe Z depth:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4076 flatcamGUI/FlatCAMGUI.py:4518
-#: flatcamGUI/ObjectUI.py:788 flatcamGUI/ObjectUI.py:1324
+#: flatcamGUI/ObjectUI.py:803 flatcamGUI/ObjectUI.py:1339
msgid ""
"The maximum depth that the probe is allowed\n"
"to probe. Negative value, in current units."
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4084 flatcamGUI/FlatCAMGUI.py:4526
-#: flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1335
+#: flatcamGUI/ObjectUI.py:813 flatcamGUI/ObjectUI.py:1350
msgid "Feedrate Probe:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4086 flatcamGUI/FlatCAMGUI.py:4528
-#: flatcamGUI/ObjectUI.py:800 flatcamGUI/ObjectUI.py:1338
+#: flatcamGUI/ObjectUI.py:815 flatcamGUI/ObjectUI.py:1353
msgid "The feedrate used while the probe is probing."
msgstr ""
@@ -5127,7 +5132,7 @@ msgid ""
"Geometry object."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4321 flatcamGUI/ObjectUI.py:1133
+#: flatcamGUI/FlatCAMGUI.py:4321 flatcamGUI/ObjectUI.py:1148
msgid ""
"Cutting depth (negative)\n"
"below the copper surface."
@@ -5154,17 +5159,17 @@ msgid ""
"which has negative value."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4354 flatcamGUI/ObjectUI.py:1169
+#: flatcamGUI/FlatCAMGUI.py:4354 flatcamGUI/ObjectUI.py:1184
msgid ""
"Height of the tool when\n"
"moving without cutting."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4381 flatcamGUI/ObjectUI.py:1224
+#: flatcamGUI/FlatCAMGUI.py:4381 flatcamGUI/ObjectUI.py:1239
msgid "Feed Rate X-Y:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4383 flatcamGUI/ObjectUI.py:1227
+#: flatcamGUI/FlatCAMGUI.py:4383 flatcamGUI/ObjectUI.py:1242
msgid ""
"Cutting speed in the XY\n"
"plane in units per minute"
@@ -5181,8 +5186,8 @@ msgid ""
"It is called also Plunge."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4402 flatcamGUI/ObjectUI.py:750
-#: flatcamGUI/ObjectUI.py:1276
+#: flatcamGUI/FlatCAMGUI.py:4402 flatcamGUI/ObjectUI.py:765
+#: flatcamGUI/ObjectUI.py:1291
msgid "Spindle speed:"
msgstr ""
@@ -5221,7 +5226,7 @@ msgstr ""
msgid "Re-cut 1st pt."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4508 flatcamGUI/ObjectUI.py:1267
+#: flatcamGUI/FlatCAMGUI.py:4508 flatcamGUI/ObjectUI.py:1282
msgid ""
"In order to remove possible\n"
"copper leftovers where first cut\n"
@@ -5255,8 +5260,8 @@ msgstr ""
msgid "CNC Job General"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4589 flatcamGUI/ObjectUI.py:615
-#: flatcamGUI/ObjectUI.py:945 flatcamGUI/ObjectUI.py:1499
+#: flatcamGUI/FlatCAMGUI.py:4589 flatcamGUI/ObjectUI.py:630
+#: flatcamGUI/ObjectUI.py:960 flatcamGUI/ObjectUI.py:1514
msgid "Plot Object"
msgstr ""
@@ -5264,7 +5269,7 @@ msgstr ""
msgid "Plot kind:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4598 flatcamGUI/ObjectUI.py:1421
+#: flatcamGUI/FlatCAMGUI.py:4598 flatcamGUI/ObjectUI.py:1436
msgid ""
"This selects the kind of geometries on the canvas to plot.\n"
"Those can be either of type 'Travel' which means the moves\n"
@@ -5272,7 +5277,7 @@ msgid ""
"which means the moves that cut into the material."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4606 flatcamGUI/ObjectUI.py:1430
+#: flatcamGUI/FlatCAMGUI.py:4606 flatcamGUI/ObjectUI.py:1445
msgid "Travel"
msgstr ""
@@ -5317,7 +5322,7 @@ msgid "Export G-Code:"
msgstr ""
#: flatcamGUI/FlatCAMGUI.py:4667 flatcamGUI/FlatCAMGUI.py:4708
-#: flatcamGUI/ObjectUI.py:1535
+#: flatcamGUI/ObjectUI.py:1550
msgid ""
"Export and save G-Code to\n"
"make this object to a file."
@@ -5337,7 +5342,7 @@ msgstr ""
msgid "Append to G-Code:"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4686 flatcamGUI/ObjectUI.py:1557
+#: flatcamGUI/FlatCAMGUI.py:4686 flatcamGUI/ObjectUI.py:1572
msgid ""
"Type here any G-Code commands you would\n"
"like to append to the generated file.\n"
@@ -5348,7 +5353,7 @@ msgstr ""
msgid "CNC Job Adv. Options"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4714 flatcamGUI/ObjectUI.py:1575
+#: flatcamGUI/FlatCAMGUI.py:4714 flatcamGUI/ObjectUI.py:1590
msgid "Toolchange G-Code:"
msgstr ""
@@ -5360,52 +5365,52 @@ msgid ""
"or a Toolchange Macro."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4730 flatcamGUI/ObjectUI.py:1597
+#: flatcamGUI/FlatCAMGUI.py:4730 flatcamGUI/ObjectUI.py:1612
msgid "Use Toolchange Macro"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4732 flatcamGUI/ObjectUI.py:1600
+#: flatcamGUI/FlatCAMGUI.py:4732 flatcamGUI/ObjectUI.py:1615
msgid ""
"Check this box if you want to use\n"
"a Custom Toolchange GCode (macro)."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4744 flatcamGUI/ObjectUI.py:1616
+#: flatcamGUI/FlatCAMGUI.py:4744 flatcamGUI/ObjectUI.py:1624
msgid ""
"A list of the FlatCAM variables that can be used\n"
"in the Toolchange event.\n"
"They have to be surrounded by the '%' symbol"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4751 flatcamGUI/ObjectUI.py:1624
+#: flatcamGUI/FlatCAMGUI.py:4751 flatcamGUI/ObjectUI.py:1631
msgid "Parameters"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4754 flatcamGUI/ObjectUI.py:1627
+#: flatcamGUI/FlatCAMGUI.py:4754 flatcamGUI/ObjectUI.py:1634
msgid "FlatCAM CNC parameters"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4755 flatcamGUI/ObjectUI.py:1628
+#: flatcamGUI/FlatCAMGUI.py:4755 flatcamGUI/ObjectUI.py:1635
msgid "tool = tool number"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4756 flatcamGUI/ObjectUI.py:1629
+#: flatcamGUI/FlatCAMGUI.py:4756 flatcamGUI/ObjectUI.py:1636
msgid "tooldia = tool diameter"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4757 flatcamGUI/ObjectUI.py:1630
+#: flatcamGUI/FlatCAMGUI.py:4757 flatcamGUI/ObjectUI.py:1637
msgid "t_drills = for Excellon, total number of drills"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4758 flatcamGUI/ObjectUI.py:1631
+#: flatcamGUI/FlatCAMGUI.py:4758 flatcamGUI/ObjectUI.py:1638
msgid "x_toolchange = X coord for Toolchange"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4759 flatcamGUI/ObjectUI.py:1632
+#: flatcamGUI/FlatCAMGUI.py:4759 flatcamGUI/ObjectUI.py:1639
msgid "y_toolchange = Y coord for Toolchange"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4760 flatcamGUI/ObjectUI.py:1633
+#: flatcamGUI/FlatCAMGUI.py:4760 flatcamGUI/ObjectUI.py:1640
msgid "z_toolchange = Z coord for Toolchange"
msgstr ""
@@ -5417,15 +5422,15 @@ msgstr ""
msgid "z_move = Z height for travel"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4763 flatcamGUI/ObjectUI.py:1636
+#: flatcamGUI/FlatCAMGUI.py:4763 flatcamGUI/ObjectUI.py:1643
msgid "z_depthpercut = the step value for multidepth cut"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4764 flatcamGUI/ObjectUI.py:1637
+#: flatcamGUI/FlatCAMGUI.py:4764 flatcamGUI/ObjectUI.py:1644
msgid "spindlesspeed = the value for the spindle speed"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4765 flatcamGUI/ObjectUI.py:1638
+#: flatcamGUI/FlatCAMGUI.py:4765 flatcamGUI/ObjectUI.py:1645
msgid "dwelltime = time to dwell to allow the spindle to reach it's set RPM"
msgstr ""
@@ -5448,7 +5453,7 @@ msgstr ""
msgid "Diameters of the cutting tools, separated by ','"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4809 flatcamTools/ToolNonCopperClear.py:166
+#: flatcamGUI/FlatCAMGUI.py:4809 flatcamTools/ToolNonCopperClear.py:167
#, python-format
msgid ""
"How much (fraction) of the tool width to overlap each tool pass.\n"
@@ -5463,11 +5468,11 @@ msgid ""
"due of too many paths."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4825 flatcamTools/ToolNonCopperClear.py:182
+#: flatcamGUI/FlatCAMGUI.py:4825 flatcamTools/ToolNonCopperClear.py:183
msgid "Bounding box margin."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4834 flatcamTools/ToolNonCopperClear.py:191
+#: flatcamGUI/FlatCAMGUI.py:4834 flatcamTools/ToolNonCopperClear.py:192
#: flatcamTools/ToolPaint.py:190
msgid ""
"Algorithm for non-copper clearing:
Standard: Fixed step inwards."
@@ -5475,7 +5480,7 @@ msgid ""
"lines."
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4866 flatcamTools/ToolNonCopperClear.py:223
+#: flatcamGUI/FlatCAMGUI.py:4866 flatcamTools/ToolNonCopperClear.py:224
#: flatcamTools/ToolPaint.py:222
msgid "Rest M.:"
msgstr ""
@@ -5494,7 +5499,7 @@ msgstr ""
msgid "Cutout Tool Options"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:4892 flatcamGUI/ObjectUI.py:473
+#: flatcamGUI/FlatCAMGUI.py:4892 flatcamGUI/ObjectUI.py:488
msgid ""
"Create toolpaths to cut around\n"
"the PCB and separate it from\n"
@@ -5593,7 +5598,7 @@ msgstr ""
msgid "Paint Tool Options"
msgstr ""
-#: flatcamGUI/FlatCAMGUI.py:5021 flatcamGUI/ObjectUI.py:1370
+#: flatcamGUI/FlatCAMGUI.py:5021 flatcamGUI/ObjectUI.py:1385
msgid ""
"Creates tool paths to cover the\n"
"whole area of a polygon (remove\n"
@@ -6206,8 +6211,8 @@ msgstr ""
msgid "M-Color "
msgstr ""
-#: flatcamGUI/ObjectUI.py:182 flatcamGUI/ObjectUI.py:588
-#: flatcamGUI/ObjectUI.py:907 flatcamGUI/ObjectUI.py:1437
+#: flatcamGUI/ObjectUI.py:182 flatcamGUI/ObjectUI.py:603
+#: flatcamGUI/ObjectUI.py:922 flatcamGUI/ObjectUI.py:1452
msgid "Name:"
msgstr ""
@@ -6241,8 +6246,8 @@ msgstr ""
msgid "Code"
msgstr ""
-#: flatcamGUI/ObjectUI.py:228 flatcamGUI/ObjectUI.py:959
-#: flatcamGUI/ObjectUI.py:1517
+#: flatcamGUI/ObjectUI.py:228 flatcamGUI/ObjectUI.py:974
+#: flatcamGUI/ObjectUI.py:1532
msgid "Type"
msgstr ""
@@ -6282,44 +6287,52 @@ msgid "Mark the aperture instances on canvas."
msgstr ""
#: flatcamGUI/ObjectUI.py:252
-msgid "Scale Factor:"
+msgid "Delete aperture:"
+msgstr ""
+
+#: flatcamGUI/ObjectUI.py:254 flatcamGUI/ObjectUI.py:261
+msgid "Delete selected apertures."
msgstr ""
#: flatcamGUI/ObjectUI.py:267
+msgid "Scale Factor:"
+msgstr ""
+
+#: flatcamGUI/ObjectUI.py:282
msgid "Perform scaling operation on the selected apertures."
msgstr ""
-#: flatcamGUI/ObjectUI.py:273
+#: flatcamGUI/ObjectUI.py:288
msgid "Buffer Factor:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:286
+#: flatcamGUI/ObjectUI.py:301
msgid "Buffer"
msgstr ""
-#: flatcamGUI/ObjectUI.py:288
+#: flatcamGUI/ObjectUI.py:303
msgid "Perform buffer operation on the selected apertures."
msgstr ""
-#: flatcamGUI/ObjectUI.py:296
+#: flatcamGUI/ObjectUI.py:311
msgid "Generate new Gerber Object:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:298
+#: flatcamGUI/ObjectUI.py:313
msgid "Will generate a new Gerber object from the changed apertures."
msgstr ""
-#: flatcamGUI/ObjectUI.py:304
+#: flatcamGUI/ObjectUI.py:319
msgid "Go"
msgstr ""
-#: flatcamGUI/ObjectUI.py:306
+#: flatcamGUI/ObjectUI.py:321
msgid ""
"Will generate a new Gerber object from the changed apertures.\n"
"This new object can then be isolated etc."
msgstr ""
-#: flatcamGUI/ObjectUI.py:333
+#: flatcamGUI/ObjectUI.py:348
msgid ""
"Diameter of the cutting tool.\n"
"If you want to have an isolation path\n"
@@ -6328,19 +6341,19 @@ msgid ""
"this parameter."
msgstr ""
-#: flatcamGUI/ObjectUI.py:344
+#: flatcamGUI/ObjectUI.py:359
msgid "Passes:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:378
+#: flatcamGUI/ObjectUI.py:393
msgid "Combine"
msgstr ""
-#: flatcamGUI/ObjectUI.py:394
+#: flatcamGUI/ObjectUI.py:409
msgid "Generate Isolation Geometry:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:396
+#: flatcamGUI/ObjectUI.py:411
msgid ""
"Create a Geometry object with toolpaths to cut \n"
"isolation outside, inside or on both sides of the\n"
@@ -6353,68 +6366,68 @@ msgid ""
"diameter above."
msgstr ""
-#: flatcamGUI/ObjectUI.py:415
+#: flatcamGUI/ObjectUI.py:430
msgid "FULL Geo"
msgstr ""
-#: flatcamGUI/ObjectUI.py:417
+#: flatcamGUI/ObjectUI.py:432
msgid ""
"Create the Geometry Object\n"
"for isolation routing. It contains both\n"
"the interiors and exteriors geometry."
msgstr ""
-#: flatcamGUI/ObjectUI.py:426
+#: flatcamGUI/ObjectUI.py:441
msgid "Ext Geo"
msgstr ""
-#: flatcamGUI/ObjectUI.py:428
+#: flatcamGUI/ObjectUI.py:443
msgid ""
"Create the Geometry Object\n"
"for isolation routing containing\n"
"only the exteriors geometry."
msgstr ""
-#: flatcamGUI/ObjectUI.py:435
+#: flatcamGUI/ObjectUI.py:450
msgid "Int Geo"
msgstr ""
-#: flatcamGUI/ObjectUI.py:437
+#: flatcamGUI/ObjectUI.py:452
msgid ""
"Create the Geometry Object\n"
"for isolation routing containing\n"
"only the interiors geometry."
msgstr ""
-#: flatcamGUI/ObjectUI.py:455
+#: flatcamGUI/ObjectUI.py:470
msgid "Clear N-copper:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:465 flatcamTools/ToolNonCopperClear.py:239
+#: flatcamGUI/ObjectUI.py:480 flatcamTools/ToolNonCopperClear.py:240
msgid ""
"Create the Geometry Object\n"
"for non-copper routing."
msgstr ""
-#: flatcamGUI/ObjectUI.py:471
+#: flatcamGUI/ObjectUI.py:486
msgid "Board cutout:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:479
+#: flatcamGUI/ObjectUI.py:494
msgid "Cutout Tool"
msgstr ""
-#: flatcamGUI/ObjectUI.py:481
+#: flatcamGUI/ObjectUI.py:496
msgid ""
"Generate the geometry for\n"
"the board cutout."
msgstr ""
-#: flatcamGUI/ObjectUI.py:487
+#: flatcamGUI/ObjectUI.py:502
msgid "Non-copper regions:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:489
+#: flatcamGUI/ObjectUI.py:504
msgid ""
"Create polygons covering the\n"
"areas without copper on the PCB.\n"
@@ -6423,136 +6436,136 @@ msgid ""
"copper from a specified region."
msgstr ""
-#: flatcamGUI/ObjectUI.py:514 flatcamGUI/ObjectUI.py:545
+#: flatcamGUI/ObjectUI.py:529 flatcamGUI/ObjectUI.py:560
msgid "Rounded Geo"
msgstr ""
-#: flatcamGUI/ObjectUI.py:516
+#: flatcamGUI/ObjectUI.py:531
msgid "Resulting geometry will have rounded corners."
msgstr ""
-#: flatcamGUI/ObjectUI.py:521 flatcamGUI/ObjectUI.py:555
+#: flatcamGUI/ObjectUI.py:536 flatcamGUI/ObjectUI.py:570
#: flatcamTools/ToolCutOut.py:159 flatcamTools/ToolCutOut.py:179
#: flatcamTools/ToolCutOut.py:230 flatcamTools/ToolSolderPaste.py:127
msgid "Generate Geo"
msgstr ""
-#: flatcamGUI/ObjectUI.py:527
+#: flatcamGUI/ObjectUI.py:542
msgid ""
"Create a geometry surrounding the Gerber object.\n"
"Square shape."
msgstr ""
-#: flatcamGUI/ObjectUI.py:557
+#: flatcamGUI/ObjectUI.py:572
msgid "Generate the Geometry object."
msgstr ""
-#: flatcamGUI/ObjectUI.py:568
+#: flatcamGUI/ObjectUI.py:583
msgid "Excellon Object"
msgstr ""
-#: flatcamGUI/ObjectUI.py:579
+#: flatcamGUI/ObjectUI.py:594
msgid "Solid circles."
msgstr ""
-#: flatcamGUI/ObjectUI.py:607 flatcamGUI/ObjectUI.py:926
+#: flatcamGUI/ObjectUI.py:622 flatcamGUI/ObjectUI.py:941
msgid "Tools Table"
msgstr ""
-#: flatcamGUI/ObjectUI.py:628
+#: flatcamGUI/ObjectUI.py:643
msgid "Offset Z"
msgstr ""
-#: flatcamGUI/ObjectUI.py:632
+#: flatcamGUI/ObjectUI.py:647
msgid ""
"This is the Tool Number.\n"
"When ToolChange is checked, on toolchange event this value\n"
"will be showed as a T1, T2 ... Tn in the Machine Code."
msgstr ""
-#: flatcamGUI/ObjectUI.py:636 flatcamGUI/ObjectUI.py:972
-#: flatcamTools/ToolNonCopperClear.py:96 flatcamTools/ToolPaint.py:94
+#: flatcamGUI/ObjectUI.py:651 flatcamGUI/ObjectUI.py:987
+#: flatcamTools/ToolNonCopperClear.py:97 flatcamTools/ToolPaint.py:94
msgid ""
"Tool Diameter. It's value (in current FlatCAM units) \n"
"is the cut width into the material."
msgstr ""
-#: flatcamGUI/ObjectUI.py:639
+#: flatcamGUI/ObjectUI.py:654
msgid ""
"The number of Drill holes. Holes that are drilled with\n"
"a drill bit."
msgstr ""
-#: flatcamGUI/ObjectUI.py:642
+#: flatcamGUI/ObjectUI.py:657
msgid ""
"The number of Slot holes. Holes that are created by\n"
"milling them with an endmill bit."
msgstr ""
-#: flatcamGUI/ObjectUI.py:649
+#: flatcamGUI/ObjectUI.py:664
msgid "Toggle display of the drills for the current tool."
msgstr ""
-#: flatcamGUI/ObjectUI.py:657
+#: flatcamGUI/ObjectUI.py:672
msgid ""
"Create a CNC Job object\n"
"for this drill object."
msgstr ""
-#: flatcamGUI/ObjectUI.py:686 flatcamGUI/ObjectUI.py:1186
+#: flatcamGUI/ObjectUI.py:701 flatcamGUI/ObjectUI.py:1201
msgid "Tool change"
msgstr ""
-#: flatcamGUI/ObjectUI.py:694 flatcamGUI/ObjectUI.py:1179
+#: flatcamGUI/ObjectUI.py:709 flatcamGUI/ObjectUI.py:1194
msgid "Tool change Z:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:696 flatcamGUI/ObjectUI.py:1182
+#: flatcamGUI/ObjectUI.py:711 flatcamGUI/ObjectUI.py:1197
msgid ""
"Z-axis position (height) for\n"
"tool change."
msgstr ""
-#: flatcamGUI/ObjectUI.py:707
+#: flatcamGUI/ObjectUI.py:722
msgid ""
"Tool height just before starting the work.\n"
"Delete the value if you don't need this feature."
msgstr ""
-#: flatcamGUI/ObjectUI.py:717
+#: flatcamGUI/ObjectUI.py:732
msgid ""
"Z-axis position (height) for\n"
"the last move."
msgstr ""
-#: flatcamGUI/ObjectUI.py:725
+#: flatcamGUI/ObjectUI.py:740
msgid "Feedrate (Plunge):"
msgstr ""
-#: flatcamGUI/ObjectUI.py:727
+#: flatcamGUI/ObjectUI.py:742
msgid ""
"Tool speed while drilling\n"
"(in units per minute).\n"
"This is for linear move G01."
msgstr ""
-#: flatcamGUI/ObjectUI.py:777
+#: flatcamGUI/ObjectUI.py:792
msgid ""
"The json file that dictates\n"
"gcode output."
msgstr ""
-#: flatcamGUI/ObjectUI.py:809
+#: flatcamGUI/ObjectUI.py:824
msgid ""
"Select from the Tools Table above\n"
"the tools you want to include."
msgstr ""
-#: flatcamGUI/ObjectUI.py:816
+#: flatcamGUI/ObjectUI.py:831
msgid "Type: "
msgstr ""
-#: flatcamGUI/ObjectUI.py:818
+#: flatcamGUI/ObjectUI.py:833
msgid ""
"Choose what to use for GCode generation:\n"
"'Drills', 'Slots' or 'Both'.\n"
@@ -6560,53 +6573,53 @@ msgid ""
"converted to a series of drills."
msgstr ""
-#: flatcamGUI/ObjectUI.py:833
+#: flatcamGUI/ObjectUI.py:848
msgid "Create GCode"
msgstr ""
-#: flatcamGUI/ObjectUI.py:835
+#: flatcamGUI/ObjectUI.py:850
msgid "Generate the CNC Job."
msgstr ""
-#: flatcamGUI/ObjectUI.py:847
+#: flatcamGUI/ObjectUI.py:862
msgid ""
"Select from the Tools Table above\n"
" the hole dias that are to be milled."
msgstr ""
-#: flatcamGUI/ObjectUI.py:854
+#: flatcamGUI/ObjectUI.py:869
msgid "Drills Tool dia:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:861
+#: flatcamGUI/ObjectUI.py:876
msgid "Mill Drills Geo"
msgstr ""
-#: flatcamGUI/ObjectUI.py:863
+#: flatcamGUI/ObjectUI.py:878
msgid ""
"Create the Geometry Object\n"
"for milling DRILLS toolpaths."
msgstr ""
-#: flatcamGUI/ObjectUI.py:870
+#: flatcamGUI/ObjectUI.py:885
msgid "Slots Tool dia:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:877
+#: flatcamGUI/ObjectUI.py:892
msgid "Mill Slots Geo"
msgstr ""
-#: flatcamGUI/ObjectUI.py:879
+#: flatcamGUI/ObjectUI.py:894
msgid ""
"Create the Geometry Object\n"
"for milling SLOTS toolpaths."
msgstr ""
-#: flatcamGUI/ObjectUI.py:897
+#: flatcamGUI/ObjectUI.py:912
msgid "Geometry Object"
msgstr ""
-#: flatcamGUI/ObjectUI.py:928
+#: flatcamGUI/ObjectUI.py:943
msgid ""
"Tools in this Geometry object used for cutting.\n"
"The 'Offset' entry will set an offset for the cut.\n"
@@ -6622,22 +6635,22 @@ msgid ""
"showed UI form entries named V-Tip Dia and V-Tip Angle."
msgstr ""
-#: flatcamGUI/ObjectUI.py:959 flatcamGUI/ObjectUI.py:1517
+#: flatcamGUI/ObjectUI.py:974 flatcamGUI/ObjectUI.py:1532
msgid "Dia"
msgstr ""
-#: flatcamGUI/ObjectUI.py:959 flatcamGUI/ObjectUI.py:1517
+#: flatcamGUI/ObjectUI.py:974 flatcamGUI/ObjectUI.py:1532
msgid "TT"
msgstr ""
-#: flatcamGUI/ObjectUI.py:966
+#: flatcamGUI/ObjectUI.py:981
msgid ""
"This is the Tool Number.\n"
"When ToolChange is checked, on toolchange event this value\n"
"will be showed as a T1, T2 ... Tn"
msgstr ""
-#: flatcamGUI/ObjectUI.py:977
+#: flatcamGUI/ObjectUI.py:992
msgid ""
"The value for the Offset can be:\n"
"- Path -> There is no offset, the tool cut will be done through the geometry "
@@ -6647,7 +6660,7 @@ msgid ""
"- Out(side) -> The tool cut will follow the geometry line on the outside."
msgstr ""
-#: flatcamGUI/ObjectUI.py:984
+#: flatcamGUI/ObjectUI.py:999
msgid ""
"The (Operation) Type has only informative value. Usually the UI form "
"values \n"
@@ -6659,7 +6672,7 @@ msgid ""
"tip."
msgstr ""
-#: flatcamGUI/ObjectUI.py:993
+#: flatcamGUI/ObjectUI.py:1008
msgid ""
"The Tool Type (TT) can be:\n"
"- Circular with 1 ... 4 teeth -> it is informative only. Being circular the "
@@ -6676,7 +6689,7 @@ msgid ""
"as Isolation."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1004
+#: flatcamGUI/ObjectUI.py:1019
msgid ""
"Plot column. It is visible only for MultiGeo geometries, meaning geometries "
"that holds the geometry\n"
@@ -6687,11 +6700,11 @@ msgid ""
"for the corresponding tool."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1017
+#: flatcamGUI/ObjectUI.py:1032
msgid "Tool Offset:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1020
+#: flatcamGUI/ObjectUI.py:1035
msgid ""
"The value to offset the cut when \n"
"the Offset type selected is 'Offset'.\n"
@@ -6699,62 +6712,62 @@ msgid ""
"cut and negative for 'inside' cut."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1043
+#: flatcamGUI/ObjectUI.py:1058
msgid "Tool Dia:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1062 flatcamTools/ToolNonCopperClear.py:135
+#: flatcamGUI/ObjectUI.py:1077 flatcamTools/ToolNonCopperClear.py:136
#: flatcamTools/ToolPaint.py:133
msgid ""
"Add a new tool to the Tool Table\n"
"with the diameter specified above."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1070
+#: flatcamGUI/ObjectUI.py:1085
msgid ""
"Copy a selection of tools in the Tool Table\n"
"by first selecting a row in the Tool Table."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1078
+#: flatcamGUI/ObjectUI.py:1093
msgid ""
"Delete a selection of tools in the Tool Table\n"
"by first selecting a row in the Tool Table."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1094
+#: flatcamGUI/ObjectUI.py:1109
msgid "Tool Data"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1097
+#: flatcamGUI/ObjectUI.py:1112
msgid ""
"The data used for creating GCode.\n"
"Each tool store it's own set of such data."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1107
+#: flatcamGUI/ObjectUI.py:1122
msgid "V-Tip Dia:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1110
+#: flatcamGUI/ObjectUI.py:1125
msgid "The tip diameter for V-Shape Tool"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1118
+#: flatcamGUI/ObjectUI.py:1133
msgid "V-Tip Angle:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1121
+#: flatcamGUI/ObjectUI.py:1136
msgid ""
"The tip angle for V-Shape Tool.\n"
"In degree."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1142
+#: flatcamGUI/ObjectUI.py:1157
msgid "Multi-Depth:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1145
+#: flatcamGUI/ObjectUI.py:1160
msgid ""
"Use multiple passes to limit\n"
"the cut depth in each pass. Will\n"
@@ -6764,37 +6777,37 @@ msgid ""
"each pass (positive value)."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1158
+#: flatcamGUI/ObjectUI.py:1173
msgid "Depth of each pass (positive)."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1189
+#: flatcamGUI/ObjectUI.py:1204
msgid ""
"Include tool-change sequence\n"
"in the Machine Code (Pause for tool change)."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1215
+#: flatcamGUI/ObjectUI.py:1230
msgid ""
"This is the height (Z) at which the CNC\n"
"will go as the last move."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1236
+#: flatcamGUI/ObjectUI.py:1251
msgid "Feed Rate Z (Plunge):"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1239
+#: flatcamGUI/ObjectUI.py:1254
msgid ""
"Cutting speed in the Z\n"
"plane in units per minute"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1248
+#: flatcamGUI/ObjectUI.py:1263
msgid "Feed Rate Rapids:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1251
+#: flatcamGUI/ObjectUI.py:1266
msgid ""
"Cutting speed in the XY\n"
"plane in units per minute\n"
@@ -6804,73 +6817,73 @@ msgid ""
"ignore for any other cases."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1264
+#: flatcamGUI/ObjectUI.py:1279
msgid "Cut over 1st pt"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1279
+#: flatcamGUI/ObjectUI.py:1294
msgid ""
"Speed of the spindle in RPM (optional).\n"
"If LASER postprocessor is used,\n"
"this value is the power of laser."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1308
+#: flatcamGUI/ObjectUI.py:1323
msgid "PostProcessor:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1311
+#: flatcamGUI/ObjectUI.py:1326
msgid ""
"The Postprocessor file that dictates\n"
"the Machine Code (like GCode, RML, HPGL) output."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1349
+#: flatcamGUI/ObjectUI.py:1364
msgid ""
"Add at least one tool in the tool-table.\n"
"Click the header to select all, or Ctrl + LMB\n"
"for custom selection of tools."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1356
+#: flatcamGUI/ObjectUI.py:1371
msgid "Generate"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1359
+#: flatcamGUI/ObjectUI.py:1374
msgid "Generate the CNC Job object."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1367
+#: flatcamGUI/ObjectUI.py:1382
msgid "Paint Area:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1382
+#: flatcamGUI/ObjectUI.py:1397
msgid "Launch Paint Tool in Tools Tab."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1399
+#: flatcamGUI/ObjectUI.py:1414
msgid "CNC Job Object"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1418
+#: flatcamGUI/ObjectUI.py:1433
msgid "Plot kind:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1443
+#: flatcamGUI/ObjectUI.py:1458
msgid "Travelled dist.:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1446 flatcamGUI/ObjectUI.py:1453
+#: flatcamGUI/ObjectUI.py:1461 flatcamGUI/ObjectUI.py:1468
msgid ""
"This is the total travelled distance on X-Y plane.\n"
"In current units."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1481
+#: flatcamGUI/ObjectUI.py:1496
msgid "CNC Tools Table"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1484
+#: flatcamGUI/ObjectUI.py:1499
msgid ""
"Tools in this CNCJob object used for cutting.\n"
"The tool diameter is used for plotting on canvas.\n"
@@ -6883,37 +6896,37 @@ msgid ""
"ball(B), or V-Shaped(V)."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1518
+#: flatcamGUI/ObjectUI.py:1533
msgid "P"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1524
+#: flatcamGUI/ObjectUI.py:1539
msgid "Update Plot"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1526
+#: flatcamGUI/ObjectUI.py:1541
msgid "Update the plot."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1533
+#: flatcamGUI/ObjectUI.py:1548
msgid "Export CNC Code:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1541
+#: flatcamGUI/ObjectUI.py:1556
msgid "Prepend to CNC Code:"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1544
+#: flatcamGUI/ObjectUI.py:1559
msgid ""
"Type here any G-Code commands you would\n"
"like to add to the beginning of the generated file."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1554
+#: flatcamGUI/ObjectUI.py:1569
msgid "Append to CNC Code"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1578
+#: flatcamGUI/ObjectUI.py:1593
msgid ""
"Type here any G-Code commands you would\n"
"like to be executed when Toolchange event is encountered.\n"
@@ -6926,29 +6939,29 @@ msgid ""
"having as template the 'Toolchange Custom' posprocessor file."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1634
+#: flatcamGUI/ObjectUI.py:1641
msgid "z_cut = depth where to cut"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1635
+#: flatcamGUI/ObjectUI.py:1642
msgid "z_move = height where to travel"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1656
+#: flatcamGUI/ObjectUI.py:1660
msgid "View CNC Code"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1659
+#: flatcamGUI/ObjectUI.py:1663
msgid ""
"Opens TAB to view/modify/print G-Code\n"
"file."
msgstr ""
-#: flatcamGUI/ObjectUI.py:1665
+#: flatcamGUI/ObjectUI.py:1669
msgid "Save CNC Code"
msgstr ""
-#: flatcamGUI/ObjectUI.py:1668
+#: flatcamGUI/ObjectUI.py:1672
msgid ""
"Opens dialog to save G-Code\n"
"file."
@@ -7205,21 +7218,21 @@ msgid ""
msgstr ""
#: flatcamTools/ToolCutOut.py:329 flatcamTools/ToolCutOut.py:468
-#: flatcamTools/ToolNonCopperClear.py:659 flatcamTools/ToolPaint.py:757
+#: flatcamTools/ToolNonCopperClear.py:660 flatcamTools/ToolPaint.py:757
#: flatcamTools/ToolPanelize.py:293 flatcamTools/ToolPanelize.py:307
#, python-format
-msgid "[ERROR_NOTCL]Could not retrieve object: %s"
+msgid "[ERROR_NOTCL] Could not retrieve object: %s"
msgstr ""
#: flatcamTools/ToolCutOut.py:333
msgid ""
-"[ERROR_NOTCL]There is no object selected for Cutout.\n"
+"[ERROR_NOTCL] There is no object selected for Cutout.\n"
"Select one and try again."
msgstr ""
#: flatcamTools/ToolCutOut.py:349
msgid ""
-"[WARNING_NOTCL]Tool Diameter is zero value. Change it to a positive integer."
+"[WARNING_NOTCL] Tool Diameter is zero value. Change it to a positive integer."
msgstr ""
#: flatcamTools/ToolCutOut.py:359 flatcamTools/ToolCutOut.py:496
@@ -7259,13 +7272,13 @@ msgstr ""
#: flatcamTools/ToolCutOut.py:472 flatcamTools/ToolPaint.py:761
#: flatcamTools/ToolPanelize.py:299
#, python-format
-msgid "[ERROR_NOTCL]Object not found: %s"
+msgid "[ERROR_NOTCL] Object not found: %s"
msgstr ""
#: flatcamTools/ToolCutOut.py:486 flatcamTools/ToolCutOut.py:606
#: flatcamTools/ToolCutOut.py:711
msgid ""
-"[ERROR_NOTCL]Tool Diameter is zero value. Change it to a positive integer."
+"[ERROR_NOTCL] Tool Diameter is zero value. Change it to a positive integer."
msgstr ""
#: flatcamTools/ToolCutOut.py:591
@@ -7279,12 +7292,12 @@ msgstr ""
#: flatcamTools/ToolCutOut.py:655
#, python-format
-msgid "[ERROR_NOTCL]Could not retrieve Geoemtry object: %s"
+msgid "[ERROR_NOTCL] Could not retrieve Geoemtry object: %s"
msgstr ""
#: flatcamTools/ToolCutOut.py:659
#, python-format
-msgid "[ERROR_NOTCL]Geometry object for manual cutout not found: %s"
+msgid "[ERROR_NOTCL] Geometry object for manual cutout not found: %s"
msgstr ""
#: flatcamTools/ToolCutOut.py:669
@@ -7293,18 +7306,18 @@ msgstr ""
#: flatcamTools/ToolCutOut.py:686
#, python-format
-msgid "[ERROR_NOTCL]Could not retrieve Gerber object: %s"
+msgid "[ERROR_NOTCL] Could not retrieve Gerber object: %s"
msgstr ""
#: flatcamTools/ToolCutOut.py:690
msgid ""
-"[ERROR_NOTCL]There is no Gerber object selected for Cutout.\n"
+"[ERROR_NOTCL] There is no Gerber object selected for Cutout.\n"
"Select one and try again."
msgstr ""
#: flatcamTools/ToolCutOut.py:695
msgid ""
-"[ERROR_NOTCL]The selected object has to be of Gerber type.\n"
+"[ERROR_NOTCL] The selected object has to be of Gerber type.\n"
"Select a Gerber file and try again."
msgstr ""
@@ -7443,7 +7456,8 @@ msgstr ""
#: flatcamTools/ToolDblSided.py:368
msgid ""
-"[WARNING_NOTCL]No value or wrong format in Drill Dia entry. Add it and retry."
+"[WARNING_NOTCL] No value or wrong format in Drill Dia entry. Add it and "
+"retry."
msgstr ""
#: flatcamTools/ToolDblSided.py:375
@@ -7586,7 +7600,7 @@ msgid "Export SVG positive"
msgstr ""
#: flatcamTools/ToolFilm.py:269
-msgid "[WARNING_NOTCL]Export SVG positive cancelled."
+msgid "[WARNING_NOTCL] Export SVG positive cancelled."
msgstr ""
#: flatcamTools/ToolFilm.py:276 flatcamTools/ToolFilm.py:280
@@ -7594,7 +7608,7 @@ msgid "Export SVG negative"
msgstr ""
#: flatcamTools/ToolFilm.py:285
-msgid "[WARNING_NOTCL]Export SVG negative cancelled."
+msgid "[WARNING_NOTCL] Export SVG negative cancelled."
msgstr ""
#: flatcamTools/ToolImage.py:25
@@ -7782,7 +7796,7 @@ msgstr ""
#: flatcamTools/ToolMove.py:164
#, python-format
-msgid "[success]%s object was moved ..."
+msgid "[success] %s object was moved ..."
msgstr ""
#: flatcamTools/ToolMove.py:174
@@ -7790,28 +7804,28 @@ msgid "[ERROR_NOTCL] ToolMove.on_left_click() --> Error when mouse left click."
msgstr ""
#: flatcamTools/ToolMove.py:202
-msgid "[WARNING_NOTCL]Move action cancelled."
+msgid "[WARNING_NOTCL] Move action cancelled."
msgstr ""
#: flatcamTools/ToolMove.py:214
-msgid "[WARNING_NOTCL]Object(s) not selected"
+msgid "[WARNING_NOTCL] Object(s) not selected"
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:25
+#: flatcamTools/ToolNonCopperClear.py:26
msgid "Non-Copper Clearing"
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:63
+#: flatcamTools/ToolNonCopperClear.py:64
msgid "Gerber object to be cleared of excess copper. "
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:73
+#: flatcamTools/ToolNonCopperClear.py:74
msgid ""
"Tools pool from which the algorithm\n"
"will pick the ones used for copper clearing."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:88
+#: flatcamTools/ToolNonCopperClear.py:89
msgid ""
"This is the Tool Number.\n"
"Non copper clearing will start with the tool with the biggest \n"
@@ -7821,7 +7835,7 @@ msgid ""
"this function will not be able to create painting geometry."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:100 flatcamTools/ToolPaint.py:98
+#: flatcamTools/ToolNonCopperClear.py:101 flatcamTools/ToolPaint.py:98
msgid ""
"The Tool Type (TT) can be:
- Circular with 1 ... 4 teeth -> it is "
"informative only. Being circular,
the cut width in material is exactly "
@@ -7835,22 +7849,22 @@ msgid ""
"the Operation Type in the resulting geometry as Isolation."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:119 flatcamTools/ToolPaint.py:117
+#: flatcamTools/ToolNonCopperClear.py:120 flatcamTools/ToolPaint.py:117
msgid "Tool Dia"
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:121
+#: flatcamTools/ToolNonCopperClear.py:122
msgid "Diameter for the new tool to add in the Tool Table"
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:147 flatcamTools/ToolPaint.py:145
+#: flatcamTools/ToolNonCopperClear.py:148 flatcamTools/ToolPaint.py:145
#: flatcamTools/ToolSolderPaste.py:123
msgid ""
"Delete a selection of tools in the Tool Table\n"
"by first selecting a row(s) in the Tool Table."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:225
+#: flatcamTools/ToolNonCopperClear.py:226
msgid ""
"If checked, use 'rest machining'.\n"
"Basically it will clear copper outside PCB features,\n"
@@ -7861,86 +7875,82 @@ msgid ""
"If not checked, use the standard algorithm."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:237
+#: flatcamTools/ToolNonCopperClear.py:238
msgid "Generate Geometry"
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:483 flatcamTools/ToolPaint.py:543
+#: flatcamTools/ToolNonCopperClear.py:484 flatcamTools/ToolPaint.py:543
#: flatcamTools/ToolSolderPaste.py:760
msgid "[WARNING_NOTCL] Please enter a tool diameter to add, in Float format."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:511 flatcamTools/ToolPaint.py:567
-msgid "[WARNING_NOTCL]Adding tool cancelled. Tool already in Tool Table."
+#: flatcamTools/ToolNonCopperClear.py:512 flatcamTools/ToolPaint.py:567
+msgid "[WARNING_NOTCL] Adding tool cancelled. Tool already in Tool Table."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:516 flatcamTools/ToolPaint.py:572
+#: flatcamTools/ToolNonCopperClear.py:517 flatcamTools/ToolPaint.py:572
msgid "[success] New tool added to Tool Table."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:549
-msgid "[ERROR_NOTCL] Wrong value format entered, use a number."
-msgstr ""
-
-#: flatcamTools/ToolNonCopperClear.py:558 flatcamTools/ToolPaint.py:615
+#: flatcamTools/ToolNonCopperClear.py:559 flatcamTools/ToolPaint.py:615
msgid "[success] Tool from Tool Table was edited."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:569 flatcamTools/ToolPaint.py:626
+#: flatcamTools/ToolNonCopperClear.py:570 flatcamTools/ToolPaint.py:626
#: flatcamTools/ToolSolderPaste.py:846
msgid ""
"[WARNING_NOTCL] Edit cancelled. New diameter value is already in the Tool "
"Table."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:608 flatcamTools/ToolPaint.py:723
-msgid "[WARNING_NOTCL]Delete failed. Select a tool to delete."
+#: flatcamTools/ToolNonCopperClear.py:609 flatcamTools/ToolPaint.py:723
+msgid "[WARNING_NOTCL] Delete failed. Select a tool to delete."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:613 flatcamTools/ToolPaint.py:728
+#: flatcamTools/ToolNonCopperClear.py:614 flatcamTools/ToolPaint.py:728
msgid "[success] Tool(s) deleted from Tool Table."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:666
-msgid "[ERROR_NOTCL]No Gerber file available."
+#: flatcamTools/ToolNonCopperClear.py:667
+msgid "[ERROR_NOTCL] No Gerber file available."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:704
-#: flatcamTools/ToolNonCopperClear.py:826
+#: flatcamTools/ToolNonCopperClear.py:705
+#: flatcamTools/ToolNonCopperClear.py:827
msgid "Clearing Non-Copper areas."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:722
+#: flatcamTools/ToolNonCopperClear.py:723
#, python-format
msgid "[success] Non-Copper Clearing with ToolDia = %s started."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:791
+#: flatcamTools/ToolNonCopperClear.py:792
#, python-format
msgid "[ERROR_NOTCL] NCCTool.clear_non_copper() --> %s"
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:796
+#: flatcamTools/ToolNonCopperClear.py:797
msgid "[success] NCC Tool finished."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:798
+#: flatcamTools/ToolNonCopperClear.py:799
msgid ""
"[WARNING_NOTCL] NCC Tool finished but some PCB features could not be "
"cleared. Check the result."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:844
+#: flatcamTools/ToolNonCopperClear.py:845
#, python-format
msgid "[success] Non-Copper Rest Clearing with ToolDia = %s started."
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:942
+#: flatcamTools/ToolNonCopperClear.py:943
#, python-format
msgid "[ERROR_NOTCL] NCCTool.clear_non_copper_rest() --> %s"
msgstr ""
-#: flatcamTools/ToolNonCopperClear.py:950
+#: flatcamTools/ToolNonCopperClear.py:951
msgid ""
"[ERROR_NOTCL] NCC Tool finished but could not clear the object with current "
"settings."
@@ -8014,7 +8024,7 @@ msgid "geometry_on_paint_button"
msgstr ""
#: flatcamTools/ToolPaint.py:735 flatcamTools/ToolPaint.py:780
-msgid "[WARNING_NOTCL]Click inside the desired polygon."
+msgid "[WARNING_NOTCL] Click inside the desired polygon."
msgstr ""
#: flatcamTools/ToolPaint.py:767
@@ -8147,7 +8157,7 @@ msgstr ""
#: flatcamTools/ToolPanelize.py:392
msgid ""
-"[ERROR_NOTCL]Columns or Rows are zero value. Change them to a positive "
+"[ERROR_NOTCL] Columns or Rows are zero value. Change them to a positive "
"integer."
msgstr ""
@@ -8156,7 +8166,7 @@ msgid "Generating panel ... Please wait."
msgstr ""
#: flatcamTools/ToolPanelize.py:520
-msgid "[success]Panel done..."
+msgid "[success] Panel done..."
msgstr ""
#: flatcamTools/ToolPanelize.py:523
@@ -8167,7 +8177,7 @@ msgid ""
msgstr ""
#: flatcamTools/ToolPanelize.py:531
-msgid "[success]Panel created successfully."
+msgid "[success] Panel created successfully."
msgstr ""
#: flatcamTools/ToolProperties.py:103
@@ -8374,10 +8384,6 @@ msgstr ""
msgid "[WARNING_NOTCL] No Nozzle tools in the tool table."
msgstr ""
-#: flatcamTools/ToolSolderPaste.py:1106 flatcamTools/ToolSolderPaste.py:1161
-msgid "[ERROR_NOTCL] Cancelled. Empty file, it has no geometry..."
-msgstr ""
-
#: flatcamTools/ToolSolderPaste.py:1109
msgid "[success] Solder Paste geometry generated successfully..."
msgstr ""
@@ -8427,10 +8433,6 @@ msgstr ""
msgid "Export GCode ..."
msgstr ""
-#: flatcamTools/ToolSolderPaste.py:1363
-msgid "[WARNING_NOTCL] Export Machine Code cancelled ..."
-msgstr ""
-
#: flatcamTools/ToolSolderPaste.py:1393
#, python-format
msgid "[success] Solder paste dispenser GCode file saved to: %s"
@@ -8490,7 +8492,7 @@ msgid "CNCJob objects can't be rotated."
msgstr ""
#: flatcamTools/ToolTransform.py:674
-msgid "[success]Rotate done ..."
+msgid "[success] Rotate done ..."
msgstr ""
#: flatcamTools/ToolTransform.py:689
@@ -8501,14 +8503,6 @@ msgstr ""
msgid "CNCJob objects can't be mirrored/flipped."
msgstr ""
-#: flatcamTools/ToolTransform.py:735
-msgid "[success]Flip on the Y axis done ..."
-msgstr ""
-
-#: flatcamTools/ToolTransform.py:745
-msgid "[success]Flip on the X axis done ..."
-msgstr ""
-
#: flatcamTools/ToolTransform.py:759
msgid ""
"[WARNING_NOTCL] No object selected. Please Select an object to shear/skew!"
@@ -8518,11 +8512,6 @@ msgstr ""
msgid "CNCJob objects can't be skewed."
msgstr ""
-#: flatcamTools/ToolTransform.py:793
-#, python-format
-msgid "[success]Skew on the %s axis done ..."
-msgstr ""
-
#: flatcamTools/ToolTransform.py:808
msgid "[WARNING_NOTCL] No object selected. Please Select an object to scale!"
msgstr ""
@@ -8539,11 +8528,6 @@ msgstr ""
msgid "CNCJob objects can't be offseted."
msgstr ""
-#: flatcamTools/ToolTransform.py:894
-#, python-format
-msgid "[success]Offset on the %s axis done ..."
-msgstr ""
-
#~ msgid ""
#~ "How much (fraction) of the tool width to overlap each tool pass.\n"
#~ "Example:\n"
diff --git a/tclCommands/TclCommandCutout.py b/tclCommands/TclCommandCutout.py
index df40ab92..ce1c26d7 100644
--- a/tclCommands/TclCommandCutout.py
+++ b/tclCommands/TclCommandCutout.py
@@ -121,6 +121,6 @@ class TclCommandCutout(TclCommand):
try:
obj.app.new_object("geometry", name + "_cutout", geo_init_me)
- self.app.inform.emit("[success]Rectangular-form Cutout operation finished.")
+ self.app.inform.emit("[success] Rectangular-form Cutout operation finished.")
except Exception as e:
return "Operation failed: %s" % str(e)
diff --git a/tclCommands/TclCommandGeoCutout.py b/tclCommands/TclCommandGeoCutout.py
index 749bce35..9d70b367 100644
--- a/tclCommands/TclCommandGeoCutout.py
+++ b/tclCommands/TclCommandGeoCutout.py
@@ -155,8 +155,8 @@ class TclCommandGeoCutout(TclCommandSignaled):
return "Could not retrieve object: %s" % name
if 0 in {dia}:
- self.app.inform.emit("[WARNING]Tool Diameter is zero value. Change it to a positive integer.")
- return "Tool Diameter is zero value. Change it to a positive integer."
+ self.app.inform.emit("[WARNING]Tool Diameter is zero value. Change it to a positive real number.")
+ return "Tool Diameter is zero value. Change it to a positive real number."
if gaps not in ['lr', 'tb', '2lr', '2tb', 4, 8]:
self.app.inform.emit("[WARNING]Gaps value can be only one of: 'lr', 'tb', '2lr', '2tb', 4 or 8. "
@@ -220,7 +220,7 @@ class TclCommandGeoCutout(TclCommandSignaled):
ymax + gapsize)
cutout_obj.plot()
- self.app.inform.emit("[success]Any-form Cutout operation finished.")
+ self.app.inform.emit("[success] Any-form Cutout operation finished.")
elif isinstance(cutout_obj, FlatCAMGerber):
def geo_init(geo_obj, app_obj):
diff --git a/tclCommands/TclCommandOpenGerber.py b/tclCommands/TclCommandOpenGerber.py
index 2d4b5b48..16e82b2a 100644
--- a/tclCommands/TclCommandOpenGerber.py
+++ b/tclCommands/TclCommandOpenGerber.py
@@ -89,4 +89,4 @@ class TclCommandOpenGerber(TclCommandSignaled):
self.app.progress.emit(100)
# GUI feedback
- self.app.inform.emit("[success]Opened: " + filename)
+ self.app.inform.emit("[success] Opened: " + filename)
diff --git a/tclCommands/TclCommandPanelize.py b/tclCommands/TclCommandPanelize.py
index abfc50ee..8c2f8d67 100644
--- a/tclCommands/TclCommandPanelize.py
+++ b/tclCommands/TclCommandPanelize.py
@@ -276,7 +276,7 @@ class TclCommandPanelize(TclCommand):
def job_thread(app_obj):
try:
panelize_2()
- self.app.inform.emit("[success]Panel created successfully.")
+ self.app.inform.emit("[success] Panel created successfully.")
except Exception as e:
proc.done()
log.debug(str(e))
@@ -287,4 +287,4 @@ class TclCommandPanelize(TclCommand):
self.app.worker_task.emit({'fcn': job_thread, 'params': [self.app]})
else:
panelize_2()
- self.app.inform.emit("[success]Panel created successfully.")
+ self.app.inform.emit("[success] Panel created successfully.")