Mimetypes renamed to the xdg names using qt4/fix-mimetypes.pl

(note that not all of there renamings are necessary, technically, since a number
of those old names are defined as aliases to the new name;
but better use the canonical names where possible).

svn path=/trunk/KDE/kdebase/konqueror/; revision=644696

diff --git a/src/servicemenus/ark_extract.desktop b/src/servicemenus/ark_extract.desktop
index 1914d05df8f6056ab11ee38477eafa4f11fb9a1f..9d4fcea2ec58a7e44b2aeb02f3be988a19d948f2 100644 (file)
--- a/src/servicemenus/ark_extract.desktop
+++ b/src/servicemenus/ark_extract.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 X-SuSE-translate=true
 Encoding=UTF-8
-ServiceTypes=application/x-tbz,application/x-tgz
+ServiceTypes=application/x-bzip-compressed-tar,application/x-compressed-tar
 Actions=extractHere
 
 [Desktop Action extractHere]

diff --git a/src/servicemenus/installfont.desktop b/src/servicemenus/installfont.desktop
index 9cb0985a0a4c34f944db869854be634cbd74ffe6..7bdeaf7dd4d036cf756ef4e75bfe41529f75da78 100644 (file)
--- a/src/servicemenus/installfont.desktop
+++ b/src/servicemenus/installfont.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttc,application/x-afm
+ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttf,application/x-font-afm
 Actions=installFont;
 
 X-SuSE-translate=true

diff --git a/src/servicemenus/isoservice.desktop b/src/servicemenus/isoservice.desktop
index 48cfe21f0f5aceb8675c09fc659574574a774f13..4543856fef219b73c906a90ace6fc3521984d863 100644 (file)
--- a/src/servicemenus/isoservice.desktop
+++ b/src/servicemenus/isoservice.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Actions=OpenISO
-ServiceTypes=inode/blockdevice,application/x-iso
+ServiceTypes=inode/blockdevice,application/x-cd-image
 
 [Desktop Action OpenISO]
 Comment=ISO9660 View

diff --git a/src/servicemenus/k3b_create_audio_cd.desktop b/src/servicemenus/k3b_create_audio_cd.desktop
index e6e7af3c8eb297fab5a2dee752860a43d159b7d8..bec84f5ce1352d208aa3d355758711651797da95 100644 (file)
--- a/src/servicemenus/k3b_create_audio_cd.desktop
+++ b/src/servicemenus/k3b_create_audio_cd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=CreateK3bAudioProject;
 Encoding=UTF-8
-ServiceTypes=audio/x-mp3,audio/x-vorbis,application/x-ogg,audio/x-mp2,audio/x-mpegurl,audio/x-wav,media/blankcd
+ServiceTypes=audio/mpeg,audio/x-vorbis+ogg,application/ogg,audio/x-mp2,audio/x-mpegurl,audio/x-wav,media/blankcd
 
 X-SuSE-translate=true
 X-SuSE-translate=true

diff --git a/src/servicemenus/k3b_write_iso_image.desktop b/src/servicemenus/k3b_write_iso_image.desktop
index 4d4295d56ba683a87d32f188a56baf4afc776bf0..ce7a544b0dc259a96c2a2ab89552a565ba09ce6f 100644 (file)
--- a/src/servicemenus/k3b_write_iso_image.desktop
+++ b/src/servicemenus/k3b_write_iso_image.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=WriteCdImage;
 Encoding=UTF-8
-ServiceTypes=application/x-iso,inode/ISO-image
+ServiceTypes=application/x-cd-image,inode/ISO-image
 
 X-SuSE-translate=true
 X-SuSE-translate=true