Sync with MCC

11 files changed, 26 insertions, 33 deletions

diff --git a/data/Client.desktop.in b/data/Client.desktop.in
index 0f0083ca..87f69be7 100644
--- a/data/Client.desktop.in
+++ b/data/Client.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=DNS Client
-Icon=/usr/share/mcc/themes/default/server-mdk.png
+_Name=Add a DNS Client
+Icon=/usr/share/mcc/themes/default/dns_client-mdk.png
 Exec=/usr/sbin/drakwizard Bind_client
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/DHCP.desktop.in b/data/DHCP.desktop.in
index 83d71186..f424f1ad 100644
--- a/data/DHCP.desktop.in
+++ b/data/DHCP.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=DHCP
-Icon=internet-mdk.png
+_Name=Configure DHCP
+Icon=/usr/share/mcc/themes/default/dhcp_server-mdk.png
 Exec=/usr/sbin/drakwizard Dhcp
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/DNS.desktop.in b/data/DNS.desktop.in
index c0347ddd..37e5318c 100644
--- a/data/DNS.desktop.in
+++ b/data/DNS.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=DNS
-Icon=/usr/share/mcc/themes/default/server-mdk.png
+_Name=Configure DNS
+Icon=/usr/share/mcc/themes/default/dns_server-mdk.png
 Exec=/usr/sbin/drakwizard Bind
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/Time.desktop.in b/data/Time.desktop.in
index 6f8b11ac..ec4c5e55 100644
--- a/data/Time.desktop.in
+++ b/data/Time.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Time
-Icon=/usr/share/mcc/themes/default/time-mdk.png
+_Name=Configure Time
+Icon=/usr/share/mcc/themes/default/ntp_server-mdk.png
 Exec=/usr/sbin/drakwizard Ntp
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/Web.desktop.in b/data/Web.desktop.in
index 06f8c71a..b5265a22 100644
--- a/data/Web.desktop.in
+++ b/data/Web.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Web
-Icon=internet-mdk.png
+_Name=Configure Web
+Icon=/usr/share/mcc/themes/default/web_server-mdk.png
 Exec=/usr/sbin/drakwizard Apache
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/ftp.desktop.in b/data/ftp.desktop.in
index c2bfd0cc..1597f117 100644
--- a/data/ftp.desktop.in
+++ b/data/ftp.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=FTP
+_Name=Configure FTP
 Icon=/usr/share/mcc/themes/default/ftp-mdk.png
 Exec=/usr/sbin/drakwizard Proftpd
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/news.desktop.in b/data/news.desktop.in
index 3ab6d8dc..285efef6 100644
--- a/data/news.desktop.in
+++ b/data/news.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=News
+_Name=Configure News
 Icon=/usr/share/mcc/themes/default/news-mdk.png
 Exec=/usr/sbin/drakwizard Inn
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/postfix.desktop.in b/data/postfix.desktop.in
index 7ea90ffd..223eda28 100644
--- a/data/postfix.desktop.in
+++ b/data/postfix.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Postfix
+_Name=Configure mail
 Icon=/usr/share/mcc/themes/default/postfix-mdk.png
 Exec=/usr/sbin/drakwizard Postfix
 Terminal=0
diff --git a/data/proxy.desktop.in b/data/proxy.desktop.in
index aef3d049..7373e922 100644
--- a/data/proxy.desktop.in
+++ b/data/proxy.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Proxy
-Icon=internet-mdk.png
+_Name=Configure Proxy
+Icon=/usr/share/mcc/themes/default/drakproxy-mdk.png
 Exec=/usr/sbin/drakwizard Squid
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/samba.desktop.in b/data/samba.desktop.in
index 3fab77de..7a2b42af 100644
--- a/data/samba.desktop.in
+++ b/data/samba.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Samba
-Icon=/usr/share/mcc/themes/default/diskdrake_samba.png
+_Name=Configure Samba
+Icon=/usr/share/mcc/themes/default/samba_server-mdk.png
 Exec=/usr/sbin/drakwizard Samba
-Terminal=0
+Terminal=false
 Type=Application
 Categories=System;X-Mandrake-ServerSettings
diff --git a/data/server.desktop.in b/data/server.desktop.in
deleted file mode 100644
index 7d081977..00000000
--- a/data/server.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Server
-Icon=internet-mdk.png
-Exec=/usr/sbin/drakwizard /usr/share/wizards/server_wizard/server.wiz
-Terminal=0
-Type=Application
-Categories=System;X-Mandrake-ServerSettings
\ No newline at end of file