Menu
▾
▴
[Emc-commit] [LinuxCNC/linuxcnc] 95786d: Add a Chinese language translation
|
From: GitHub <no...@gi...> - 2017-09-14 16:20:57
|
Branch: refs/heads/master Home: https://github.com/LinuxCNC/linuxcnc Commit: 95786d5c82f372bed25ac8cb87975ae0d59137af https://github.com/LinuxCNC/linuxcnc/commit/95786d5c82f372bed25ac8cb87975ae0d59137af Author: Solitarily <chu...@gm...> Date: 2017-08-29 (Tue, 29 Aug 2017) Changed paths: M src/emc/usr_intf/axis/scripts/axis.py M src/emc/usr_intf/gmoccapy/gmoccapy.glade M src/hal/utils/scope_trig.c M src/hal/utils/scope_vert.c A src/po/gmoccapy/zh_CN.po M src/po/zh_CN.po Log Message: ----------- Add a Chinese language translation Commit: d36b6244b01476716923263eea19c89dd6bfd66e https://github.com/LinuxCNC/linuxcnc/commit/d36b6244b01476716923263eea19c89dd6bfd66e Author: Solitarily <chu...@gm...> Date: 2017-09-02 (Sat, 02 Sep 2017) Changed paths: M src/emc/usr_intf/gmoccapy/gmoccapy.glade M src/po/gmoccapy/zh_CN.po Log Message: ----------- Fixed gmoccapy in Chinese translation Commit: 63669650fcbc41539d2767ccf473f7cafe02831a https://github.com/LinuxCNC/linuxcnc/commit/63669650fcbc41539d2767ccf473f7cafe02831a Author: Jeff Epler <je...@un...> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M src/emc/usr_intf/stepconf/stepconf.py Log Message: ----------- stepconf: restore translation I didn't investigate closely, but it looks like this line was overlooked when transitioning to the MultiFileBuilder. .. after this, running with LANG=fr_FR.UTF-8 again translates the main buttons. (Many other texts aren't translated, but this seems to be because the translation is out of date) Commit: 2928243ea332f5d52ca27b37dddf3494a37e366a https://github.com/LinuxCNC/linuxcnc/commit/2928243ea332f5d52ca27b37dddf3494a37e366a Author: Jeff Epler <je...@un...> Date: 2017-09-11 (Mon, 11 Sep 2017) Changed paths: M src/emc/usr_intf/pncconf/pncconf.py Log Message: ----------- pncconf: restore translation I didn't investigate closely, but it looks like this line was overlooked when transitioning to the MultiFileBuilder. .. after this, running with LANG=fr_FR.UTF-8 again translates the main buttons. (Many other texts aren't translated, but this seems to be because the translation is out of date) Commit: f074d647f9f5b4a470aa8ea834ace763cd77b00d https://github.com/LinuxCNC/linuxcnc/commit/f074d647f9f5b4a470aa8ea834ace763cd77b00d Author: Sebastian Kuzminsky <se...@hi...> Date: 2017-09-14 (Thu, 14 Sep 2017) Changed paths: M src/emc/usr_intf/pncconf/pncconf.py M src/emc/usr_intf/stepconf/stepconf.py Log Message: ----------- Merge pull request #326 from jepler/for-2.7/i18n-stepconf-pncconf Reenable translation of stepconf, pncconf Commit: 88e6474eb699cff0c6f5f0b63e824736217751f4 https://github.com/LinuxCNC/linuxcnc/commit/88e6474eb699cff0c6f5f0b63e824736217751f4 Author: Sebastian Kuzminsky <se...@hi...> Date: 2017-09-14 (Thu, 14 Sep 2017) Changed paths: M src/emc/usr_intf/axis/scripts/axis.py M src/emc/usr_intf/gmoccapy/gmoccapy.glade M src/hal/utils/scope_trig.c M src/hal/utils/scope_vert.c A src/po/gmoccapy/zh_CN.po M src/po/zh_CN.po Log Message: ----------- Merge pull request #320 from Solitarily/2.7 Add a Chinese language translation Commit: 730d6924577f5c1c8a4ea24b1fedee1a475d12f3 https://github.com/LinuxCNC/linuxcnc/commit/730d6924577f5c1c8a4ea24b1fedee1a475d12f3 Author: Sebastian Kuzminsky <se...@hi...> Date: 2017-09-14 (Thu, 14 Sep 2017) Changed paths: M src/emc/usr_intf/axis/scripts/axis.py M src/emc/usr_intf/pncconf/pncconf.py M src/emc/usr_intf/stepconf/stepconf.py M src/hal/utils/scope_trig.c M src/hal/utils/scope_vert.c A src/po/gmoccapy/zh_CN.po M src/po/zh_CN.po Log Message: ----------- Merge remote-tracking branch 'origin/2.7' Conflicts: src/emc/usr_intf/axis/scripts/axis.py src/emc/usr_intf/gmoccapy/gmoccapy.glade Compare: https://github.com/LinuxCNC/linuxcnc/compare/a458f5b9dc26...730d6924577f |