Merge remote-tracking branch 'origin/master3.4'

data/cl-console-gui-settings.desktop

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Name=Calculate Console
 Name[ru]=Консоль Calculate
-Comment=Calculate Utilities console
+Comment=Calculate Console
 Exec=cl-console-gui
 Icon=calculate-console
 Terminal=false
 Type=Application
-Categories=GTK;Settings;System;
-OnlyShowIn=MATE;
+Categories=Settings;DesktopSettings;LXQt;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
+OnlyShowIn=XFCE;MATE;LXQt;

data/cl-console-gui-update-settings.desktop

@@ -6,6 +6,6 @@ Exec=cl-console-gui --method update
 Icon=calculate-update
 Terminal=false
 Type=Application
+Categories=Settings;DesktopSettings;LXQt;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
 StartupNotify=true
-Categories=GTK;Settings;System;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;MATE;LXQt;

data/cl-console-gui-update-xfce.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Calculate Linux Update
-Name[ru]=Обновление Calculate Linux
-Comment=Calculate Linux updater
-Exec=cl-console-gui --method update
-Icon=calculate-update
-Terminal=false
-Type=Application
-Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
-StartupNotify=true
-OnlyShowIn=XFCE;

data/cl-console-gui-xfce.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Calculate Console
-Name[ru]=Консоль Calculate
-Comment=Calculate Utilities console
-Exec=cl-console-gui
-Icon=calculate-console
-Terminal=false
-Type=Application
-Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
-OnlyShowIn=XFCE;

data/cl-console-gui.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Calculate Console
 Name[ru]=Консоль Calculate
-Comment=Calculate Utilities console
+Comment=Calculate Console
 Exec=cl-console-gui
 Icon=calculate-console
 Terminal=false

setup.py

@@ -40,11 +40,9 @@ data_files.append(('/usr/share/pixmaps',['data/calculate-console-online.png',
 data_files.append(('/usr/share/applications',
                            ['data/cl-console-gui-install.desktop',
                             'data/cl-console-gui-update.desktop',
-                            'data/cl-console-gui-update-xfce.desktop',
-                            'data/cl-console-gui-update-mate.desktop',
+                            'data/cl-console-gui-update-settings.desktop',
                             'data/cl-console-gui.desktop',
-                            'data/cl-console-gui-xfce.desktop',
-                            'data/cl-console-gui-mate.desktop']))
+                            'data/cl-console-gui-settings.desktop']))
 data_files.append(('/etc/xdg/autostart',
                            ['data/cl-update-checker.desktop']))
 data_files.append(('/usr/share/calculate/themes/install',