Merge branch 'master' of ssh://github.com/LinuxCNC/linuxcnc

Author: pcw-mesa

docs/po/de.po

@@ -7,20 +7,21 @@
 # 陈浩 <748812963@qq.com>, 2022.
 # panming <1042253456@qq.com>, 2022.
 # zhuxunyu <wuzhi_01@163.com>, 2023.
+# gnix_oag <gnix.oag@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: emc-developers@lists.sourceforge.net\n"
 "POT-Creation-Date: 2023-05-03 08:21+0200\n"
-"PO-Revision-Date: 2023-03-12 05:21+0000\n"
-"Last-Translator: zhuxunyu <wuzhi_01@163.com>\n"
+"PO-Revision-Date: 2023-05-05 15:16+0000\n"
+"Last-Translator: gnix_oag <gnix.oag@gmail.com>\n"
 "Language-Team: none\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.16.2-dev\n"
+"X-Generator: Weblate 4.18-dev\n"
 
 #.  vim: set syntax=asciidoc:
 #. type: Attribute :lang:
@@ -219,7 +220,7 @@ msgstr "G-code 编程"
 #: src/Master_Documentation.adoc:253 src/user/user-intro.adoc:145
 #, no-wrap
 msgid "Virtual Control Panels"
-msgstr "伪用户操作面板"
+msgstr "虚拟控制面板"
 
 #. type: Title =
 #: src/Master_Documentation.adoc:282

docs/po/zh_CN.po

@@ -271,8 +271,8 @@ Descriptions of the interfaces are in the Interfaces section of the User Manual.
 * `MAX_SPINDLE_0_SPEED = 20000` - The maximum RPM that can be manually selected.
   On multi spindle machine there will be entries for each spindle number. Only used by the QtVCP-based user interfaces.
   - _deprecated_ - use the [SPINDLE_n] section instead.
-* `PROGRAM_PREFIX = ~/linuxcnc/nc_files` - The default location for G-code files and the location for user-defined M-codes.
-  This location is searched for the file name before the subroutine path and user M path if specified in the [RS274NGC] section.
+* `PROGRAM_PREFIX = ~/linuxcnc/nc_files` - The default directory for G-code files, named subroutines, and user-defined M-codes.
+  The `PROGRAM_PREFIX` directory is searched before the directories listed in `[RS274]SUBROUTINE_PATH` and `[RS274]USER_M_PATH`.
 * `INTRO_GRAPHIC = emc2.gif` - The image shown on the splash screen.
 * `INTRO_TIME = 5` - The maximum time to show the splash screen, in seconds.
 * `CYCLE_TIME = 100` - Cycle time of the display GUI.