Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

13 files changed, 15 insertions, 15 deletions

diff --git a/kdesktop/init/Templates/CDROM-Device.desktop b/kdesktop/init/Templates/CDROM-Device.desktop
index 958b602f0..b4201f447 100644
--- a/kdesktop/init/Templates/CDROM-Device.desktop
+++ b/kdesktop/init/Templates/CDROM-Device.desktop
@@ -3,8 +3,8 @@ MountPoint=
 Dev=
 ReadOnly=false
 Type=FSDevice
-Icon=application-x-cdrom_mount
-UnmountIcon=application-x-cdrom_unmount
+Icon=cdrom_mount
+UnmountIcon=cdrom_unmount
 Actions=Eject;
 X-TDE-Priority=TopLevel
 [Desktop Action Eject]
diff --git a/kdesktop/init/Templates/ZIP-Device.desktop b/kdesktop/init/Templates/ZIP-Device.desktop
index 7668447a6..bec34fe73 100644
--- a/kdesktop/init/Templates/ZIP-Device.desktop
+++ b/kdesktop/init/Templates/ZIP-Device.desktop
@@ -3,8 +3,8 @@ MountPoint=
 Dev=
 ReadOnly=false
 Type=FSDevice
-Icon=application-vnd.tde.overlay.zip_mount
-UnmountIcon=application-vnd.tde.overlay.zip_unmount
+Icon=zip_mount
+UnmountIcon=zip_unmount
 Actions=Eject;
 X-TDE-Priority=TopLevel
 [Desktop Action Eject]
diff --git a/kdesktop/init/Templates/linkCDROM.desktop b/kdesktop/init/Templates/linkCDROM.desktop
index e933c7776..b895fe79b 100644
--- a/kdesktop/init/Templates/linkCDROM.desktop
+++ b/kdesktop/init/Templates/linkCDROM.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 CD-ROM 设备
 Comment[zh_TW]=新光碟機設備
 Type=Link
 URL=.source/CDROM-Device.desktop
-Icon=application-x-cdrom_unmount
+Icon=cdrom_unmount
diff --git a/kdesktop/init/Templates/linkZIP.desktop b/kdesktop/init/Templates/linkZIP.desktop
index d7844bc08..9ef9eaee9 100644
--- a/kdesktop/init/Templates/linkZIP.desktop
+++ b/kdesktop/init/Templates/linkZIP.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 ZIP 设备
 Comment[zh_TW]=新 ZIP 設備
 Type=Link
 URL=.source/ZIP-Device.desktop
-Icon=application-vnd.tde.overlay.zip_unmount
+Icon=zip_unmount
diff --git a/tdeioslave/media/mimetypes/cdrom_mounted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted.desktop
index c00879b47..427951b57 100644
--- a/tdeioslave/media/mimetypes/cdrom_mounted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=application-x-cdrom_mount
+Icon=cdrom_mount
 Type=MimeType
 MimeType=media/cdrom_mounted
 Comment=Mounted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
index 05caea6f0..d8bd4f199 100644
--- a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=application-x-cdrom_mount_decrypt
+Icon=cdrom_mount_decrypt
 Type=MimeType
 MimeType=media/cdrom_mounted_decrypted
 Comment=Mounted Decrypted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
index 7133fdd51..3d35eef32 100644
--- a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=application-x-cdrom_unmount
+Icon=cdrom_unmount
 Type=MimeType
 MimeType=media/cdrom_unmounted
 Comment=Unmounted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
index a20eae5f2..c53abbc82 100644
--- a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=application-x-cdrom_unmount_decrypt
+Icon=cdrom_unmount_decrypt
 Type=MimeType
 MimeType=media/cdrom_unmounted_decrypted
 Comment=Unmounted Decrypted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
index 0a64aa9af..f11e43807 100644
--- a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=application-x-cdrom_unmount_encrypt
+Icon=cdrom_unmount_encrypt
 Type=MimeType
 MimeType=media/cdrom_unmounted_encrypted
 Comment=Unmounted Encrypted CD-ROM
diff --git a/tdeioslave/media/mimetypes/svcd.desktop b/tdeioslave/media/mimetypes/svcd.desktop
index 775a0d1f1..68c965a6f 100644
--- a/tdeioslave/media/mimetypes/svcd.desktop
+++ b/tdeioslave/media/mimetypes/svcd.desktop
@@ -47,4 +47,4 @@ Comment[vi]=Đĩa siêu video CD
 Comment[wa]=Super plake lazer CD videyo
 Comment[zh_CN]=超级 VCD
 Comment[zh_TW]=超級視訊 CD
-Icon=application-x-cdrom_unmount
+Icon=cdrom_unmount
diff --git a/tdeioslave/media/mimetypes/vcd.desktop b/tdeioslave/media/mimetypes/vcd.desktop
index 6f5593906..dae4ddcaf 100644
--- a/tdeioslave/media/mimetypes/vcd.desktop
+++ b/tdeioslave/media/mimetypes/vcd.desktop
@@ -47,4 +47,4 @@ Comment[vi]=Đĩa video CD
 Comment[wa]=Plake lazer CD videyo
 Comment[zh_CN]=VCD
 Comment[zh_TW]=視訊 CD
-Icon=application-x-cdrom_unmount
+Icon=cdrom_unmount
diff --git a/tdeioslave/media/mimetypes/zip_mounted.desktop b/tdeioslave/media/mimetypes/zip_mounted.desktop
index 3d36e698b..ce82fe968 100644
--- a/tdeioslave/media/mimetypes/zip_mounted.desktop
+++ b/tdeioslave/media/mimetypes/zip_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=application-vnd.tde.overlay.zip_mount
+Icon=zip_mount
 Type=MimeType
 MimeType=media/zip_mounted
 Comment=Mounted Zip Disk
diff --git a/tdeioslave/media/mimetypes/zip_unmounted.desktop b/tdeioslave/media/mimetypes/zip_unmounted.desktop
index d61d139a4..eaa35577f 100644
--- a/tdeioslave/media/mimetypes/zip_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/zip_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=application-vnd.tde.overlay.zip_unmount
+Icon=zip_unmount
 Type=MimeType
 MimeType=media/zip_unmounted
 Comment=Unmounted Zip Disk