Fixed german translation

.gitignore

@@ -1,7 +1,7 @@
-*.pyc
-catalogs/*/current_work.xml
-debian/nativecam/
-debian/tmp/
-debian/nativecam.debhelper.log
-debian/nativecam.substvars
-debian/files
+*.pyc
+catalogs/*/current_work.xml
+debian/nativecam/
+debian/tmp/
+debian/nativecam.debhelper.log
+debian/nativecam.substvars
+debian/files

catalogs/lathe/menu.xml

@@ -9,6 +9,7 @@
 			<menuitem action='turning'  name=_("External Turning")_ tool_tip= _("Does straight turning")_ icon="lathe-surface.png" src="lathe/turning.cfg"/>
 			<menuitem action='parting'  name=_("Parting Off")_ tool_tip= _("Cut your part from initial material")_ icon="parting.png" src="lathe/parting.cfg"/>
 			<menuitem action='threading'  name=_("Threading")_ tool_tip= _("External or internal threads, metric or imperial")_ icon="threading.png" src="lathe/threading.cfg"/>
+			<menuitem action='drilling'  name=_("Drilling")_ tool_tip= _("Drilling using canned cycle")_ icon="drill.png" src="lathe/drilling.cfg"/>
 			<menuitem action='boring'  name=_("Internal Boring")_ tool_tip= _("Does straight boring")_ icon="lathe-surface-id.png" src="lathe/boring.cfg"/>
 			<menuitem action='taper_oda'  name=_("Taper ODA")_ tool_tip= _("External taper by angle and diameters")_ icon="taper-oda.png" src="lathe/taper_oda.cfg"/>
 			<menuitem action='taper_odl'  name=_("Taper ODL")_ tool_tip= _("External taper by length and diameters")_ icon="taper-odl.png" src="lathe/taper_odl.cfg"/>

cfg/lathe/drilling.cfg

@@ -0,0 +1,94 @@
+[SUBROUTINE]
+version = 1.00
+icon = drill.png
+name = _("Drilling")
+type = drilling
+help = _("<b>Drilling a hole using a drill on the lathe.")
+order = act hloc loc_x loc_z loc_r h2 optdwell optpeck
+
+[PARAM_ACT]
+name = _("Active")
+icon = enable.png
+type = bool
+value = 1
+
+[PARAM_HLOC]
+name = _("Location")
+type = sub-header
+
+[PARAM_LOC_X]
+name = _("X hole location")
+type = float
+icon = x.png
+value = 0.0
+metric_value = 0.0
+header = hloc
+
+[PARAM_LOC_Z]
+name = _("Z drill end depth")
+type = float
+icon = drill-end.png
+value = 0.0
+metric_value = 0.0
+header = hloc
+
+
+[PARAM_LOC_R]
+name = _("Retract height")
+type = float
+icon = drill-retract.png
+value = 0.1
+metric_value = 2.5
+header = hloc
+
+[PARAM_H2]
+name = _("Options")
+type = sub-header
+
+[PARAM_OPTDWELL]
+name = _("Dwell time")
+icon = drill-dwell.png
+value = 0.0
+metric_value = 0.0
+minimum_value = 0.0
+header = h2
+
+[PARAM_OPTPECK]
+name = _("Pecking distance")
+icon = tool-depth.png
+value = 0.0
+metric_value = 0.0
+minimum_value = 0.0
+header = h2
+
+[VALIDATION]
+content =
+	if #param_act == 1 :
+		dwell = self.check_hash('#param_optdwell', 0.0)
+		peck = self.check_hash('#param_optpeck', 0.0)
+		if ((peck > 0) and (dwell > 0)) :
+			self.msg_inv(_('You cannot use peck and dwell - set either to 0 to continue.'), 2)
+			VALIDATED = False
+		retr = self.check_hash('#param_loc_r', 0.0)
+		zheight = self.check_hash('#param_loc_z', 0.0)
+		if (zheight > retr) :
+			self.msg_inv(_('You cannot have retract height less than drill depth.'), 2)
+			VALIDATED = False
+
+[CALL]
+content =
+	(begin #sub_name)
+	(author : Daniel Hahn)
+
+	o<#self_id_active> if [#param_act] (if active)
+	G17
+	o<#self_id_act> if [#param_optdwell GT 0]
+		G82 X#param_loc_x Z#param_loc_z R#param_loc_r P#param_optdwell
+	o<#self_id_act> else if [#param_optpeck GT 0]
+		G83 X#param_loc_x Z#param_loc_z R#param_loc_r Q#param_optpeck
+	o<#self_id_act> else
+		G81 X#param_loc_x Z#param_loc_z R#param_loc_r
+	o<#self_id_act> endif
+	G18
+	o<#self_id_active> endif
+	(end #sub_name)

cfg/lathe/material.cfg

@@ -74,15 +74,15 @@ value = 1.0
 metric_value = 25.0
 minimum_value = 0.0
 not_allowed = 0
-tool_tip = _("When job is done")
+tool_tip = _("Distance for G0 / rapid move")
 header = h2
 
 [PARAM_Z_RAP]
 name = _("Safe Z rapid")
 type = float
 icon = lathe-rappid-z.png
 header = h3
-tool_tip = _("When job is done")
+tool_tip = _("Distance for G0 / rapid move")
 value = 1.0
 metric_value = 25.0
 minimum_value = 0.0

cfg/lathe/tool-change.cfg

@@ -1,10 +1,10 @@
 [SUBROUTINE]
-version = 1.15
+version = 1.16
 icon = lathe-tool-change.png
 name = _("Tool Change")
 type = tool_change
 help = _("<b>Change Tool and/or settings</b>&#10;Changes setting accordingly even if disabled")
-order = act h1 dnum us tlc spindle_dir cooling h2 mode speed surf_speed h8 r_feed c_dpt h4 f_feed fc_dpt hc rx rix rz
+order = act h1 dnum us tlc spindle_dir cooling h2 mode speed surf_speed h8 feedmode r_feed c_dpt h4 f_feed fc_dpt hc rx rix rz
 
 [PARAM_ACT]
 name = _("Active")
@@ -70,7 +70,8 @@ name = _("Mode")
 icon = lathe-chuck.png
 type = combo
 header = h2
-options = _("Constant surface speed=0:RPM=1")
+options = _("G96=0:G97=1")
+tool_tip = _("G96 constant surface velocity, G97 constant RPM")
 value = 1
 value_changed = 
 	parent.get_param('param_surf_speed').set_grayed(new_val == '1')
@@ -83,7 +84,7 @@ value_changed =
 name = _("Max spindle")
 header = h2
 type = int
-minimum_value = 10
+minimum_value = 1
 icon = tool-spindle.png
 tool_tip = _("RPM spindle speed")
 value = 500
@@ -103,6 +104,15 @@ name = _("Roughing")
 type = sub-header
 tool_tip = _("Set these when usage is roughing")
 
+[PARAM_FEEDMODE]
+name = _("Feedmode")
+header = h8
+type = combo
+options = _("G94=0:G95=1")
+icon = lathe-feed.png
+tool_tip = _("G94 is feed per min, G95 is feed per rev")
+value = 0
+
 [PARAM_R_FEED]
 name = _("Feed")
 header = h8
@@ -249,6 +259,12 @@ content =
 	#<_x_clear>  = [[#5410 + #param_rx] * #<_diameter_mode>]
 	#<_ix_clear> = [#param_rix * #<_diameter_mode>]
 
+	o<#self_feedmode> if [#param_feedmode EQ 0]
+	        G94
+	o<#self_feedmode> else
+		G95
+	o<#self_feedmode> endif
+
 	F#<_rough_feed>
 
 	(end #sub_name)

debian/changelog

@@ -1,8 +1,18 @@
-nativecam (0.1.14a) UNRELEASED; urgency=medium
+nativecam (0.1.15a2) UNRELEASED; urgency=medium
 
-  fix bug of rotation multiplied by 25.4
+  bugfix german translation 
+  even more bugfixes for translation
+
+ -- Daniel <mydani@gmx.de>  Wed, 11 Oct 2020 16:11:00 +0100
+
+nativecam (0.1.15) UNRELEASED; urgency=medium
+
+  added german translation 
+  homing check removed (did not work)
+  added lathe drilling operation
+
+ -- Daniel <mydani@gmx.de>  Wed, 07 Oct 2020 20:46:00 +0100
 
- -- Fernand Veilleux <fernveilleux@gmail.com>  Tue, 28 Nov 2017 08:07:00 -0500
 
 nativecam (0.1.14) UNRELEASED; urgency=medium
 

debian/makedeb.sh

@@ -8,12 +8,12 @@ head -10 changelog
 echo "..."
 echo "================================================="
 echo
-echo "Is changelog up-to-date? (y|n)"
-read ans
-case $ans in
-  y*|Y*) echo Building deb;;
-  *)     echo bye; echo; exit 1;;
-esac
+#echo "Is changelog up-to-date? (y|n)"
+#read ans
+#case $ans in
+#  y*|Y*) echo Building deb;;
+#  *)     echo bye; echo; exit 1;;
+#esac
 # make the debs:
 # -us Do not sign the source package
 # -uc Do not sign the .changes file

locale/de/LC_MESSAGES/README

@@ -0,0 +1,8 @@
+For CFG files add new extractor
+
+*.cfg
+xgettext --language=Python --extract-all --add-comments="TRANSLATORS:" --force-po -o %o %C %K %F
+-k%k
+%f
+‪--from-code=%c
+