Clean up Linux XDG menu entry information

petterreinholdtsen · petterreinholdtsen · commit bece5d38a969 · 2022-08-21T14:56:11.000+02:00
Make sure all doc entries use category X-CNC-DOC and not category Utility. Make sure all entries use Keywords and ensure all entries use the same value ordering. Removed obsolete menu entries and ensure es, fr and zh_CN have the same set of documentation related menu entries. Fixes #1930.
diff --git a/debian/extras/usr/share/applications/linuxcnc-documentation.desktop b/debian/extras/usr/share/applications/linuxcnc-documentation.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=User Manual - EN
+Comment=LinuxCNC Documentation
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Documentation.pdf
 Icon=linuxcnc_en
 X-GNOME-DocPath=
 Terminal=false
-Name=User Manual - EN
-Comment=LinuxCNC Documentation
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-documentation_es.desktop b/debian/extras/usr/share/applications/linuxcnc-documentation_es.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=User Manual - ES
+Comment=LinuxCNC Documentation
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Documentation_es.pdf
 Icon=linuxcnc_es
 X-GNOME-DocPath=
 Terminal=false
-Name=User Manual - ES
-Comment=LinuxCNC Documentation
 StartupNotify=false
-Categories=Science;X-CNC-DOC;
-Keywords=cnc;linuxcnc;
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-documentation_fr.desktop b/debian/extras/usr/share/applications/linuxcnc-documentation_fr.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=User Manual - FR
+Comment=LinuxCNC Documentation
+Type=Application
+Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Documentation_fr.pdf
+Icon=linuxcnc_fr
+X-GNOME-DocPath=
+Terminal=false
+StartupNotify=false
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-documentation_zh_CN.desktop b/debian/extras/usr/share/applications/linuxcnc-documentation_zh_CN.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=User Manual - zh_CN
+Comment=LinuxCNC Documentation
+Type=Application
+Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Documentation_zh_CN.pdf
+Icon=linuxcnc_zh_CN
+X-GNOME-DocPath=
+Terminal=false
+StartupNotify=false
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-gcoderef.desktop b/debian/extras/usr/share/applications/linuxcnc-gcoderef.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=G-Code Quick Reference - EN
+Comment=Quick reference for G, M, and O codes in LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/gcode.html
 Icon=linuxcnc_en
 X-GNOME-DocPath=
 Terminal=false
-Name=G-Code Quick Reference - EN
-Comment=Quick reference for G, M, and O codes in LinuxCNC
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-gcoderef_es.desktop b/debian/extras/usr/share/applications/linuxcnc-gcoderef_es.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=G-Code Quick Reference - ES
+Comment=Quick reference for G, M and O codes in LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/gcode_es.html
 Icon=linuxcnc_es
 X-GNOME-DocPath=
 Terminal=false
-Name=G-Code Quick Reference - ES
-Comment=Quick reference for G, M and O codes in LinuxCNC
 StartupNotify=false
-Categories=Science;X-CNC-REF;
-Keywords=cnc;linuxcnc;
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-gcoderef_fr.desktop b/debian/extras/usr/share/applications/linuxcnc-gcoderef_fr.desktop
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=G-Code Quick Reference - FR
+Comment=Quick reference for G, M and O codes in LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/gcode_fr.html
 Icon=linuxcnc_fr
 X-GNOME-DocPath=
 Terminal=false
-Name=G-Code Quick Reference - FR
-Comment=Quick reference for G, M and O codes in LinuxCNC
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
-
diff --git a/debian/extras/usr/share/applications/linuxcnc-gcoderef_vi.desktop b/debian/extras/usr/share/applications/linuxcnc-gcoderef_vi.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=G-Code Quick Reference - VI
+Comment=Quick reference for G, M and O codes in LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/gcode_vi.html
 Icon=linuxcnc_vi
 X-GNOME-DocPath=
 Terminal=false
-Name=G-Code Quick Reference - VI
-Comment=Quick reference for G, M and O codes in LinuxCNC
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-gcoderef_zh_CN.desktop b/debian/extras/usr/share/applications/linuxcnc-gcoderef_zh_CN.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=G-Code Quick Reference - zn_CN
+Comment=Quick reference for G, M and O codes in LinuxCNC
+Type=Application
+Exec=xdg-open /usr/share/doc/linuxcnc/gcode_zn_CN.html
+Icon=linuxcnc_zn_CN
+X-GNOME-DocPath=
+Terminal=false
+StartupNotify=false
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-gettingstarted.desktop b/debian/extras/usr/share/applications/linuxcnc-gettingstarted.desktop
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=Getting Started Guide - EN
+Comment=Information on how to download and install LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
 Icon=linuxcnc_en
 X-GNOME-DocPath=
 Terminal=false
-Comment=Information on how to download and install LinuxCNC
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
-
diff --git a/debian/extras/usr/share/applications/linuxcnc-gettingstarted_es.desktop b/debian/extras/usr/share/applications/linuxcnc-gettingstarted_es.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=Getting Started Guide - ES
+Comment=Information on how to download and install LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_es.pdf
 Icon=linuxcnc_es
 X-GNOME-DocPath=
 Terminal=false
-Comment=Information on how to download and install LinuxCNC
 StartupNotify=false
-Categories=Science;X-CNC-DOC;
-Keywords=cnc;linuxcnc;
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-gettingstarted_fr.desktop b/debian/extras/usr/share/applications/linuxcnc-gettingstarted_fr.desktop
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=Getting Started Guide - FR
+Comment=Information on how to download and install LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_fr.pdf
 Icon=linuxcnc_fr
 X-GNOME-DocPath=
 Terminal=false
-Comment=Information on how to download and install LinuxCNC
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC=DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
-
diff --git a/debian/extras/usr/share/applications/linuxcnc-gettingstarted_zh_CN.desktop b/debian/extras/usr/share/applications/linuxcnc-gettingstarted_zh_CN.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=Getting Started Guide - ZH
+Comment=Information on how to download and install LinuxCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_zh_CN.pdf
 Icon=linuxcnc_zh_CN
 X-GNOME-DocPath=
 Terminal=false
-Comment=Information on how to download and install LinuxCNC
 StartupNotify=false
-Categories=Science;X-CNC-DOC;
-Keywords=cnc;linuxcnc;
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-halmanual_fr.desktop b/debian/extras/usr/share/applications/linuxcnc-halmanual_fr.desktop
diff --git a/debian/extras/usr/share/applications/linuxcnc-integratorinfo.desktop b/debian/extras/usr/share/applications/linuxcnc-integratorinfo.desktop
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=Integrator Information - EN
+Comment=Documentation for the integrator of LinucCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf
 Icon=linuxcnc_en
 X-GNOME-DocPath=
 Terminal=false
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-integratormanual_es.desktop b/debian/extras/usr/share/applications/linuxcnc-integratormanual_es.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=Integrator Information - ES
+Comment=Documentation for the integrator of LinucCNC
+Type=Application
+Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Integrator_es.pdf
+Icon=linuxcnc_es
+X-GNOME-DocPath=
+Terminal=false
+StartupNotify=false
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-integratormanual_fr.desktop b/debian/extras/usr/share/applications/linuxcnc-integratormanual_fr.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
 Name=Integrator Information - FR
+Comment=Documentation for the integrator of LinucCNC
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Integrator_fr.pdf
 Icon=linuxcnc_fr
 X-GNOME-DocPath=
 Terminal=false
-Comment=Installation and Configuration Manual (French)
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-integratormanual_zh_CN.desktop b/debian/extras/usr/share/applications/linuxcnc-integratormanual_zh_CN.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=Integrator Information - zh_CN
+Comment=Documentation for the integrator of LinucCNC
+Type=Application
+Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Integrator_zh_CN.pdf
+Icon=linuxcnc_zh_CN
+X-GNOME-DocPath=
+Terminal=false
+StartupNotify=false
+Categories=Science;Engineering;X-CNC-DOC;
+Keywords=cnc;linuxcnc;cncdoc;
diff --git a/debian/extras/usr/share/applications/linuxcnc-manualpages.desktop b/debian/extras/usr/share/applications/linuxcnc-manualpages.desktop
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Version=1.0
-Name=Manual Pages
+Name=LinuxCNC Manual Pages
+Comment=Integrator Information
 Type=Application
 Exec=xdg-open /usr/share/doc/linuxcnc/LinuxCNC_Manual_Pages.pdf
 Icon=linuxcncicon
 X-GNOME-DocPath=
 Terminal=false
-Comment=Integrator Information
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC-DOC;
+Categories=Science;Engineering;X-CNC-DOC;
 Keywords=cnc;linuxcnc;cncdoc;
-Name[en_US]=LinuxCNC Manual Pages
diff --git a/debian/extras/usr/share/applications/linuxcnc-usermanual_fr.desktop b/debian/extras/usr/share/applications/linuxcnc-usermanual_fr.desktop
diff --git a/share/applications/linuxcnc-latency-histogram.desktop.in b/share/applications/linuxcnc-latency-histogram.desktop.in
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=Latency Histogram@EMC2_SUFFIX@
+Comment=Show histogram of your machine's latency
 Type=Application
 Exec=@EMC2_LATENCY_HISTOGRAM_SCRIPT@
 Icon=@EMC2_ICON@
 X-GNOME-DocPath=
 Terminal=false
-Name=Latency Histogram@EMC2_SUFFIX@
-Comment=Show histogram of your machine's latency
 StartupNotify=false
-Categories=Science;X-CNC;
+Categories=Science;Utility;Engineering;X-CNC;
+Keywords=cnc;linuxcnc;cncprog;benchmark;
diff --git a/share/applications/linuxcnc-latency.desktop.in b/share/applications/linuxcnc-latency.desktop.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=Latency Test@EMC2_SUFFIX@
+Comment=Measure your machine's latency
 Type=Application
 Exec=@EMC2_LATENCY_SCRIPT@
 Icon=@EMC2_ICON@
 X-GNOME-DocPath=
 Terminal=false
-Name=Latency Test@EMC2_SUFFIX@
-Comment=Determine your machine's latency
 StartupNotify=false
-Categories=Science;Utility;Engineering;X-CNC-DOC;
+Categories=Science;Utility;Engineering;X-CNC;
 Keywords=cnc;linuxcnc;cncprog;benchmark;
diff --git a/share/applications/linuxcnc-pncconf.desktop.in b/share/applications/linuxcnc-pncconf.desktop.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=LinuxCNC Pncconf Wizard
+Comment=Configuration Wizard For Mesa I/O Cards
 Type=Application
 Exec=@EMC2_BIN_DIR@/pncconf
 Icon=linuxcncicon
 X-GNOME-DocPath=
 Terminal=false
-Comment=Configuration Wizard For Mesa I/O Cards
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC;
-Name=LinuxCNC Pncconf Wizard
+Categories=Science;Utility;Engineering;X-CNC;
 Keywords=cnc;linuxcnc;cncprog;cncconfig;
diff --git a/share/applications/linuxcnc-stepconf.desktop.in b/share/applications/linuxcnc-stepconf.desktop.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=LinuxCNC Stepconf Wizard
+Comment=Stepper Configuration Wizard
 Type=Application
 Exec=@EMC2_BIN_DIR@/stepconf
 Icon=linuxcncicon
 X-GNOME-DocPath=
 Terminal=false
-Name=Stepconf Wizard
-Comment=Stepper Configuration Wizard
 StartupNotify=false
-Categories=Utility;Engineering;X-CNC;
+Categories=Science;Utility;Engineering;X-CNC;
 Keywords=cnc;linuxcnc;cncprog;cncconfig;
diff --git a/share/applications/linuxcnc.desktop.in b/share/applications/linuxcnc.desktop.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Version=1.0
+Name=LinuxCNC@EMC2_SUFFIX@
+Comment=Linuxcnc Machine Controller
 Type=Application
 Exec=@EMC2_SCRIPT@
 Icon=@EMC2_ICON@
 X-GNOME-DocPath=
 Terminal=false
-Name=LinuxCNC@EMC2_SUFFIX@
-Comment=Linuxcnc Machine Controller
 StartupNotify=false
 Categories=Science;Utility;Engineering;X-CNC;
 Keywords=cnc;linuxcnc;cncprog;
