Merge pull request #1913 from smoe/atom-edited-changes-during-translations

And more changes triggered by translation work.

Author: petterreinholdtsen

docs/man/man9/classicladder.9

@@ -1,5 +1,5 @@
 .\"
-.TH CLASSICLADDER "9" "2008-11-23" "LinuxCNC Documentation" "HAL Component" 
+.TH CLASSICLADDER "9" "2008-11-23" "LinuxCNC Documentation" "HAL Component"
 
 .SH NAME
 classicladder \- realtime software plc based on ladder logic
@@ -13,33 +13,33 @@ These pins and parameters are created by the realtime \fBclassicladder_rt\fR mod
 
 .TP
 \fBclassicladder.0.in\-\fINN\fB\fR IN bit
-These bit signal pins map to \fB%I\fINN\fR variables in classicladder
+These bit signal pins map to \fB%I\fINN\fR variables in classicladder.
 
 .TP
 \fBclassicladder.0.out\-\fINN\fB\fR OUT bit
-These bit signal pins map to \fB%Q\fINN\fR variables in classicladder
-Output from classicladder
+These bit signal pins map to \fB%Q\fINN\fR variables in classicladder.
+Output from classicladder.
 
 .TP
 \fBclassicladder.0.s32in\-\fINN\fB\fR IN s32
-Integer input from classicladder
-These s32 signal pins map to \fB%IW\fINN\fR variables in classicladder
+Integer input from classicladder.
+These s32 signal pins map to \fB%IW\fINN\fR variables in classicladder.
 
 .TP
 \fBclassicladder.0.s32out\-\fINN\fB\fR OUT s32
-Integer output from classicladder
-These s32 signal pins map to \fB%QW\fINN\fR variables in classicladder
+Integer output from classicladder.
+These s32 signal pins map to \fB%QW\fINN\fR variables in classicladder.
 
 .TP
 \fBclassicladder.0.floatin\-\fINN\fB\fR IN float
-Integer input from classicladder
-These float signal pins map to \fB%IF\fINN\fR variables in classicladder
-These are truncated to S32 values internally. eg 7.5 will be 7
+Integer input from classicladder.
+These float signal pins map to \fB%IF\fINN\fR variables in classicladder.
+These are truncated to S32 values internally. eg 7.5 will be 7.
 
 .TP
 \fBclassicladder.0.floatout\-\fINN\fB\fR OUT float
-Float output from classicladder
-These float signal pins map to \fB%QF\fINN\fR variables in classicladder
+Float output from classicladder.
+These float signal pins map to \fB%QF\fINN\fR variables in classicladder.
 
 .TP
 \fBclassicladder.0.hide_gui IN bit
@@ -51,27 +51,28 @@ code to run.
 
 .TP
 \fBclassicladder.0.refresh.time\fR RO s32
-Tells you how long the last refresh took
+Tells you how long the last refresh took.
 
 .TP
 \fBclassicladder.0.refresh.tmax\fR RW s32
-Tells you how long the longest refresh took
+Tells you how long the longest refresh took.
 
 .TP
 \fBclassicladder.0.ladder\-state\fR RO s32
 Tells you if the program is running or not
+
 .SH FUNCTIONS
 
 .TP
-\fBclassicladder.0.refresh\fR FP 
+\fBclassicladder.0.refresh\fR FP
 The rung update rate. Add this to the servo thread.
-You can added it to a faster thread but it
+You can added it to a faster thread but it.
 Will update no faster than once every 1 millisecond (1000000 ns).
 
 .SH BUGS
 See http://wiki.linuxcnc.org/cgi\-bin/wiki.pl?ClassicLadder_Ver_7.124 for the latest.
 
 .SH SEE ALSO
-\fIClassicladder\fR chapters in the LinuxCNC documentation for a full description of the \fBClassicladder\fR syntax and examples
+\fIClassicladder\fR chapters in the LinuxCNC documentation for a full description of the \fBClassicLadder\fR syntax and examples.
 
 http://wiki.linuxcnc.org/cgi\-bin/wiki.pl?ClassicLadder_Ver_7.124

docs/src/config/pncconf.adoc

@@ -175,7 +175,7 @@ TOUCHY
 * Touchy was designed to be used with a touchscreen, some minimal physical switches and a MPG wheel.
 * requires cycle-start, abort, and single-step signals and buttons
 * It also requires shared axis MPG jogging to be selected.
-* is GTK based so integrates GLADE VCP (virtual control panels) naturally.
+* is GTK based so integrates GladeVCP (virtual control panels) naturally.
 * allows VCP panels integrated in the center Tab
 * has no graphical window
 * look can be changed with custom themes
@@ -270,7 +270,7 @@ VCP options::
 Virtual Control Panels allow one to add custom controls and displays to the
 screen. AXIS and Touchy can integrate these controls inside the screen in
 designated positions. There are two kinds of VCPs -
-pyVCP which uses 'Tkinter' to draw the screen and GLADE VCP that uses 'GTK' to
+PyVCP which uses 'Tkinter' to draw the screen and GladeVCP that uses 'GTK' to
 draw the screen.
 
 PyVCP::
@@ -292,21 +292,21 @@ You can use the geometry options to size and move the panel, for instance to
 move it to a second screen if the system is capable. If you press the 'Display
 sample panel' button the size and placement options will be honored.
 
-GLADE VCP::
-GLADE VCPs fit naturally inside of TOUCHY screen as they both use GTK to draw
-them, but by changing GLADE VCP's theme it can be made to blend pretty well in
+GladeVCP::
+GladeVCPs fit naturally inside of TOUCHY screen as they both use GTK to draw
+them, but by changing GladeVCP's theme it can be made to blend pretty well in
 AXIS (try Redmond).
 
 It uses a graphical editor to build its XML files.
 HAL pins are created for the user to connect to, inside of their custom HAL
 file.
 
-GLADE VCP also allows much more sophisticated (and complicated) programming
-interaction, which PnCconf currently doesn't leverage (see GLADE VCP in the
+GladeVCP also allows much more sophisticated (and complicated) programming
+interaction, which PnCconf currently doesn't leverage (see GladeVCP in the
 manual)
 
 PnCconf has sample panels for the user to use as-is or build on.
-With GLADE VCP PnCconf will allow you to select different options on your
+With GladeVCP PnCconf will allow you to select different options on your
 sample display.
 
 Under 'sample options' select which ones you would like.
@@ -326,7 +326,7 @@ the system is capable.
 You can select a GTK theme which sets the basic look and feel of the panel.
 You Usually want this to match the front-end screen.
 These options will be used if you press the 'Display sample button'.
-With GLADE VCP depending on the front-end screen, you can select where the panel will display.
+With GladeVCP depending on the front-end screen, you can select where the panel will display.
 
 You can force it to be stand-alone or with AXIS it can be in the center or on
 the right side, with Touchy it can be in the center.
@@ -791,20 +791,20 @@ There are some differences:
 
 == Advanced Options
 
-This allows setting of HALUI commands and loading of classicladder and sample
+This allows setting of HALUI commands and loading of ClassicLadder and sample
 ladder programs.
-If you selected GLADE VCP options such as for zeroing axis, there will be
+If you selected GladeVCP options such as for zeroing axis, there will be
 commands showing.
 See the <<cha:hal-user-interface,HALUI Chapter>> for more info on using custom
 halcmds.
 There are several ladder program options.
 The Estop program allows an external ESTOP switch or the GUI frontend to throw
 an Estop. It also has a timed lube pump signal.
-The Z auto touch-off is with a touch-off plate, the GLADE VCP touch-off button
+The Z auto touch-off is with a touch-off plate, the GladeVCP touch-off button
 and special HALUI commands to set the current user origin to zero and rapid
 clear.
 The serial modbus program is basically a blank template program that sets up
-classicladder for serial modbus. See the << cha:classicladder,Classicladder Chapter >>
+ClassicLadder for serial modbus. See the << cha:classicladder,Classicladder Chapter >>
 in the manual.
 
 .PnCConf, advanced options
@@ -916,7 +916,7 @@ There are four custom files that you can use to add HAL commands to:
   loads. It is run after the configuration-named HAL file.
 * custom_postgui.hal is for commands that must be run after AXIS loads or a
   standalone PyVCP display loads.
-* custom_gvcp.hal is for commands that must be run after glade VCP is loaded.
+* custom_gvcp.hal is for commands that must be run after GladeVCP is loaded.
 * shutdown.hal is for commands to run when LinuxCNC shuts down in a controlled manner.
 
 // vim: set syntax=asciidoc:

docs/src/gcode/g-code.adoc

@@ -2687,7 +2687,7 @@ G97 S- <$-> (RPM Mode)
 
 * 'G96 S- <D->' - selects constant surface speed of 'S':
 ** In feet per minute if G20 is in effect,
-** Or meters per minute if G21 is in effect.
+** or meters per minute if G21 is in effect.
 
 When using G96, ensure that X0 in
 the current coordinate system (including offsets and tool lengths) is

docs/src/gcode/m-code.adoc

@@ -189,7 +189,7 @@ in that case, the spindle will be empty after the tool change.
 If slot zero was last selected,
 there will definitely be no tool in the spindle after a tool change. The tool
 changer will have to be setup to perform the tool change in HAL and possibly
-classicladder.
+ClassicLadder.
 
 [[mcode:m7-m8-m9]]
 == M7, M8, M9 Coolant Control(((M7, M8, M9 Coolant Control)))

docs/src/gcode/overview.adoc

@@ -968,8 +968,7 @@ control.
 [[gcode:comments]]
 == Comments(((Comments)))
 
-Comments are purely informative and have no
-influence on machine behaviour
+Comments are purely informative and have no influence on machine behaviour.
 
 Comments can be added to lines of G-code to help clear up the
 intention of the programmer. Comments can be embedded in a line using
@@ -1075,20 +1074,20 @@ are replaced by the value of the named parameter. Named parameters
 will have white space removed from them. So, '\#<named parameter>'
 will be converted to '#<namedparameter>'.
 
-Parameter numbers can be formatted. eg:
+Parameter numbers can be formatted, e.g.:
 
 ----
 (DEBUG, value = %d#<some_value>)
 ----
 will print the value rounded to an integer.
 
-* %lf is default if there is no formatting string
+* %lf is default if there is no formatting string.
 * %d = 0 decimals
 * %f = four decimals
 * %.xf = x (0-9) number of decimals
 
 The formatting will be preformed on all parameters in the same line unless
-changed. ie. multiple formatting is allowed in one line.
+changed, i.e., multiple formatting is allowed in one line.
 
 The formatting string does not need to be right beside the parameter.
 

docs/src/getting-started/about-linuxcnc.adoc

@@ -17,7 +17,7 @@
 ** easy installation from the Live CD
 ** easy to use graphical configuration wizards to rapidly create a configuration
    specific to the machine
-** directly offered with recent releases of Debian (since Bookworm) and Ubuntu (since Kinetic Kudu)
+** directly available as regular packages of recent releases of Debian (since Bookworm) and Ubuntu (since Kinetic Kudu)
 ** a graphical user interface (actually several interfaces to choose from)
 ** a graphical interface creation tool (Glade)
 ** an interpreter for 'G-code' (the RS-274 machine tool programming

docs/src/getting-started/updating-linuxcnc.adoc

@@ -1209,7 +1209,7 @@ motion.homing-inhibit (see motion manpage)
 
 ==== xhc_hb04_util.comp (helper component)
 
-Remove unused pin 'jogenable-off'
+Remove unused pin 'jogenable-off'.
 
 Add pin 'amux-enable' so that the multiplexed acceleration reductions are now
 enabled by the ANDing the pins: 'is-manual' and 'amux-enable'.  These two pins
@@ -1218,7 +1218,7 @@ respectively.
 
 ==== xhc_hb04.tcl (optional LIB configuration HAL file)
 
-Remove signal pendant:jogenable-off for removed pin 'pendant_util.jogenable-off'
+Remove signal pendant:jogenable-off for removed pin 'pendant_util.jogenable-off'.
 
 Support new motion pins for reduced accelerations
 (axis.L.jog-accel-fraction, joint.N.jog-accel-fraction) for wheel jogging.
@@ -1266,13 +1266,13 @@ The master branch is version-tagged with prerelease notation, typically
 
 2.9 changed to Python3 and GTK3. This only affects you if you have custom glade or python handlers in your config.
 
-. run py3clean in your config directory to remove any temporary files.
-. run py3clean in your LinuxCNC source directory if you compile from source
-. run 2to3 -w on any .py files you have written
-. make sure the interpreter in the first line of the script is python3, not python2
-. open the ui file in glade, and save it. It should convert everything that can be converted automatically, and give you warnings.
+. Run py3clean in your config directory to remove any temporary files.
+. Run py3clean in your LinuxCNC source directory if you compile from source.
+. Run 2to3 -w on any .py files you have written.
+. Make sure the interpreter in the first line of the script is python3, not python2.
+. Open the ui file in glade, and save it. It should convert everything that can be converted automatically, and give you warnings.
 
-=== LinuxCNC startup
+=== LinuxCNC Startup
 
 The main script, *linuxcnc*, supports a new option (-H dirname) to
 specify an additional user-specified directory for HAL files.  This

docs/src/gui/axis.adoc

@@ -137,9 +137,8 @@ file configured. For more information on configuration see the
 * 'Edit tool table...' - Same as Edit if you have defined an editor
   you can open the tool table and edit it.
 * 'Reload tool table' - After editing the tool table you must reload it.
-* 'Ladder editor' - If you have loaded Classic Ladder you can edit it from
-  here. See the <<cha:classicladder,Classicladder chapter>>
-  for more information.
+* 'Ladder editor' - If you have loaded ClassicLadder you can edit it from
+  here. See the <<cha:classicladder,ClassicLadder chapter>> for more information.
 * 'Quit' - Terminates the current LinuxCNC session.
 
 [[sub:axis-machine-menu]]
@@ -219,7 +218,7 @@ positive Z up. This is true for vertical mills, which is probably the most
 popular application, and also true for almost all EDM machines, and even
 vertical turret lathes, where the part is turning below the tool.
 
-The terms 'Top', 'Front', and 'Side' might be confusing however, in other
+The terms 'Top', 'Front', and 'Side' might be confusing in other
 CNC machines, such as a standard lathe, where the Z axis is horizontal, or
 a horizontal mill, again where the Z axis is horizontal, or even an inverted
 vertical turret lathe, where the part is turning above the tool, and the Z axis
@@ -664,7 +663,7 @@ shown on a red background.
 
 AXIS includes a program called `mdi` which allows text-mode entry of
 MDI commands to a running LinuxCNC session. You can run this program by
-opening a terminal and typing
+opening a terminal and typing:
 
 ----
 mdi
@@ -674,7 +673,7 @@ Once it is running, it displays the prompt 'MDI>'. When a blank line
 is entered, the machine's current position is shown.
 When a command is entered, it is sent to LinuxCNC to be executed.
 
-This is a sample session of mdi.
+This is a sample session of mdi:
 
 ----
 $ mdi
@@ -854,10 +853,10 @@ should be used by any filter that runs for a long time.
 The colors of most elements of the AXIS user interface can be
 customized through the X Resource Database. The sample file
 'axis_light_background' changes the colors of the backplot window to a
-'dark lines on white
-background' scheme, and also serves as a reference for the configurable
-items in the display area. The sample file 'axis_big_dro' changes the
-position readout to a larger size font. To use these files:
+'dark lines on white background' scheme,
+and also serves as a reference for the configurable items in the display area.
+The sample file 'axis_big_dro' changes the position readout to a larger size font.
+To use these files:
 
 ----
 xrdb -merge /usr/share/doc/emc2/axis_light_background

docs/src/gui/filter-programs.adoc

@@ -11,9 +11,9 @@
 :hal: {basebackend@docbook:'':hal}
 :ngc: {basebackend@docbook:'':ngc}
 
-Most of LinuxCNC's screens have the ability to send loaded files through a 'filter program' or +
-use the filter program to make Gcode.
-This filter can do any desired task: Something as simple as making sure
+Most of LinuxCNC's screens have the ability to send loaded files through a
+'filter program' or use the filter program to make G-code.
+Such a filter can do any desired task: Something as simple as making sure
 the file ends with 'M2', or something as complicated as generating
 G-code from an image.