- add the Encoding key where missing

- end the lists with the separator

svn path=/trunk/KDE/kdebase/apps/; revision=676260

diff --git a/src/servicemenus/amarok_append.desktop b/src/servicemenus/amarok_append.desktop
index 2566c5eae579712578f0a6fdd69878b02e88a791..799acbbc60682ffd6e998b88f05be7b5b442550f 100644 (file)
--- a/src/servicemenus/amarok_append.desktop
+++ b/src/servicemenus/amarok_append.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 [Desktop Entry]

+Encoding=UTF-8

 ServiceTypes=application/asx,audio/*
 Actions=appendToPlaylist;appendAndPlay;queueTrack;
 X-KDE-Submenu=Amarok
 ServiceTypes=application/asx,audio/*
 Actions=appendToPlaylist;appendAndPlay;queueTrack;
 X-KDE-Submenu=Amarok

diff --git a/src/servicemenus/ark_compress.desktop b/src/servicemenus/ark_compress.desktop
index 18cc58b728e805b4e45545cc7c9817237034f9ca..e37ab5697c9a520d6e2be0937f5c94d4c00ea3fa 100644 (file)
--- a/src/servicemenus/ark_compress.desktop
+++ b/src/servicemenus/ark_compress.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 ServiceTypes=inode/directory
 [Desktop Entry]
 Encoding=UTF-8
 ServiceTypes=inode/directory

-Actions=compressHere
+Actions=compressHere;

 
 [Desktop Action compressHere]
 Name=Compress Here
 
 [Desktop Action compressHere]
 Name=Compress Here

diff --git a/src/servicemenus/ark_extract.desktop b/src/servicemenus/ark_extract.desktop
index daac24c44b5dbf663a5a0c350db570ad733194a4..8279124609b336f96726a32a69691754fc907cd3 100644 (file)
--- a/src/servicemenus/ark_extract.desktop
+++ b/src/servicemenus/ark_extract.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 ServiceTypes=application/x-bzip-compressed-tar,application/x-compressed-tar
 [Desktop Entry]
 Encoding=UTF-8
 ServiceTypes=application/x-bzip-compressed-tar,application/x-compressed-tar

-Actions=extractHere
+Actions=extractHere;

 
 [Desktop Action extractHere]
 Name=Extract Here
 
 [Desktop Action extractHere]
 Name=Extract Here

diff --git a/src/servicemenus/dolphin_su.desktop b/src/servicemenus/dolphin_su.desktop
index 60158d79297eb9f735a79a0a9309727c92081396..77da61731f8988f9ea5670fad66d0acf9e92bec4 100644 (file)
--- a/src/servicemenus/dolphin_su.desktop
+++ b/src/servicemenus/dolphin_su.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 [Desktop Entry]

+Enconding=UTF-8

 ServiceTypes=inode/directory
 Actions=DolphinSU;
 
 ServiceTypes=inode/directory
 Actions=DolphinSU;
 

diff --git a/src/servicemenus/floppy_format.desktop b/src/servicemenus/floppy_format.desktop
index 56d53939aa8e270d0c035561cfc45fc8ab58f9cc..b55719dc6e421e95b2f1607aff3fe862701e1e9d 100644 (file)
--- a/src/servicemenus/floppy_format.desktop
+++ b/src/servicemenus/floppy_format.desktop
@@ -1,4 +1,5 @@
 [Desktop Action Format]
 [Desktop Action Format]

+Encoding=UTF-8

 Exec=kfloppy %u
 Icon=kfloppy
 Name=Format
 Exec=kfloppy %u
 Icon=kfloppy
 Name=Format

diff --git a/src/servicemenus/imageconverter.desktop b/src/servicemenus/imageconverter.desktop
index dd22cbaded40111f15f95beb5aca12e785017c0f..98a5880fdc128d5ef700a61c5dc4d19d4b4cc98c 100644 (file)
--- a/src/servicemenus/imageconverter.desktop
+++ b/src/servicemenus/imageconverter.desktop
@@ -3,6 +3,7 @@
 # Released under the same license as the KDE core distribution (GPL 2.0).
 #
 [Desktop Entry]
 # Released under the same license as the KDE core distribution (GPL 2.0).
 #
 [Desktop Entry]

+Enconding=UTF-8

 ServiceTypes=image/*
 Actions=convToJPEG;convToPNG;convToGIF;convToTIF;
 X-KDE-Submenu=Convert To
 ServiceTypes=image/*
 Actions=convToJPEG;convToPNG;convToGIF;convToTIF;
 X-KDE-Submenu=Convert To

diff --git a/src/servicemenus/installfont.desktop b/src/servicemenus/installfont.desktop
index d8c3a540dc5901c14fb32c87f5e12349c1688bba..6acb94eac241fa0b586c9f9a328dadccb3abfdb3 100644 (file)
--- a/src/servicemenus/installfont.desktop
+++ b/src/servicemenus/installfont.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 [Desktop Entry]

+Enconding=UTF-8

 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;
 [Desktop Action installFont]
 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;
 [Desktop Action installFont]

diff --git a/src/servicemenus/isoservice.desktop b/src/servicemenus/isoservice.desktop
index 76755901d93fdc76ba6cbdf679d95497fdfaaf4f..5003880e6ae1ae1ff1d18ca8f83486ae69b9e8c0 100644 (file)
--- a/src/servicemenus/isoservice.desktop
+++ b/src/servicemenus/isoservice.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 [Desktop Entry]
 Encoding=UTF-8

-Actions=OpenISO
+Actions=OpenISO;

 ServiceTypes=inode/blockdevice,application/x-cd-image
 
 [Desktop Action OpenISO]
 ServiceTypes=inode/blockdevice,application/x-cd-image
 
 [Desktop Action OpenISO]

diff --git a/src/servicemenus/jpegorient.desktop b/src/servicemenus/jpegorient.desktop
index fc949c2f2b6ce0f53dc9a722487f87dc9b122717..b0b2be4c56c43c1dcff8adf81da39ff9736eec8a 100644 (file)
--- a/src/servicemenus/jpegorient.desktop
+++ b/src/servicemenus/jpegorient.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 [Desktop Entry]

+Encoding=UTF-8

 ServiceTypes=image/jpeg
 Actions=jpegRot90;jpegRot270;jpegFlipV;jpegFlipH;
 X-KDE-Submenu=Transform Image
 ServiceTypes=image/jpeg
 Actions=jpegRot90;jpegRot270;jpegFlipV;jpegFlipH;
 X-KDE-Submenu=Transform Image

diff --git a/src/servicemenus/mail_as_attachment.desktop b/src/servicemenus/mail_as_attachment.desktop
index 12fa82bcfcd0ee4ffa476db53bb9c252e78855fe..1ab028ffd98e4bab6a36c22388dc799e35aff57d 100644 (file)
--- a/src/servicemenus/mail_as_attachment.desktop
+++ b/src/servicemenus/mail_as_attachment.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 ServiceTypes=all/allfiles
 [Desktop Entry]
 Encoding=UTF-8
 ServiceTypes=all/allfiles

-Actions=mail_as_attachment
+Actions=mail_as_attachment;

 
 [Desktop Action mail_as_attachment]
 Name=Mail as Attachment...
 
 [Desktop Action mail_as_attachment]
 Name=Mail as Attachment...

diff --git a/src/servicemenus/media_eject.desktop b/src/servicemenus/media_eject.desktop
index 6cd0e855b65623199f70b3d6dc2c221724fbffc7..01d56f93fbdf01527c40f8f202d3eb8c1a1fc93e 100644 (file)
--- a/src/servicemenus/media_eject.desktop
+++ b/src/servicemenus/media_eject.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 [Desktop Entry]

+Encoding=UTF-8

 ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaEject;
 X-KDE-Priority=TopLevel
 ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaEject;
 X-KDE-Priority=TopLevel

diff --git a/src/servicemenus/media_mount.desktop b/src/servicemenus/media_mount.desktop
index 27c6a5b88e25e625e7b39c83b0f2f7ad475c747e..078cb2baff435a0ec415e73304c10fcf17729227 100644 (file)
--- a/src/servicemenus/media_mount.desktop
+++ b/src/servicemenus/media_mount.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 [Desktop Entry]

+Encoding=UTF-8

 ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
 Actions=MediaMount;
 X-KDE-Priority=TopLevel
 ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
 Actions=MediaMount;
 X-KDE-Priority=TopLevel

diff --git a/src/servicemenus/media_realfolder.desktop b/src/servicemenus/media_realfolder.desktop
index d32579de2d3feab7233aacd74b64149a1974b100..dd75bf4849440bf9dd31b63e6f972c5be8257e13 100644 (file)
--- a/src/servicemenus/media_realfolder.desktop
+++ b/src/servicemenus/media_realfolder.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 [Desktop Entry]

+Encoding=UTF-8

 ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted
 ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted

-Actions=MediaRealFolder
+Actions=MediaRealFolder;

 X-KDE-Priority=TopLevel
 X-KDE-MediaNotifierHide=true
 [Desktop Action MediaRealFolder]
 X-KDE-Priority=TopLevel
 X-KDE-MediaNotifierHide=true
 [Desktop Action MediaRealFolder]

diff --git a/src/servicemenus/media_safelyremove.desktop b/src/servicemenus/media_safelyremove.desktop
index 82bde8d464d4c1ee8c6c8bd8985f1cc621cee3e5..7149b4e512297e740b35328ea5016247815493f6 100644 (file)
--- a/src/servicemenus/media_safelyremove.desktop
+++ b/src/servicemenus/media_safelyremove.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
 [Desktop Entry]

+Encoding=UTF-8

 ServiceTypes=media/removable_mounted,media/removable_unmounted,media/camera_mounted,media/camera_unmounted
 Actions=MediaSafelyRemove;
 X-KDE-Priority=TopLevel
 ServiceTypes=media/removable_mounted,media/removable_unmounted,media/camera_mounted,media/camera_unmounted
 Actions=MediaSafelyRemove;
 X-KDE-Priority=TopLevel

diff --git a/src/servicemenus/open_in_digikam.desktop b/src/servicemenus/open_in_digikam.desktop
index 4a3798d579646dc817da69b2905d3f51c763039a..670c0c749c7f3898d7feaa36d405282d8ba1b274 100644 (file)
--- a/src/servicemenus/open_in_digikam.desktop
+++ b/src/servicemenus/open_in_digikam.desktop
@@ -17,5 +17,6 @@ Name[x-test]=xxOpen in Digikamxx
 Name[zh_TW]=在 Digikam 中開啟
 
 [Desktop Entry]
 Name[zh_TW]=在 Digikam 中開啟
 
 [Desktop Entry]

+Enconding=UTF-8

 Actions=OpenDigikam;
 ServiceTypes=media/gphoto2camera,media/camera_mounted,media/camera_unmounted
 Actions=OpenDigikam;
 ServiceTypes=media/gphoto2camera,media/camera_mounted,media/camera_unmounted