7 files changed, 34 insertions, 28 deletions
diff --git a/src/servicemenus/media_eject.desktop b/src/servicemenus/media_eject.desktop
index 5ef8abc..0bb1286 100644
--- a/src/servicemenus/media_eject.desktop
+++ b/src/servicemenus/media_eject.desktop
@@ -1,13 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cd-r_mounted,media/cd-r_unmounted,media/cd-rw_mounted,media/cd-rw_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaEject;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaEject]
-Name=Eject
-#SUSE-Overwrite Name[hu]=Kidobás
-#SUSE-Overwrite Name[km]=ច្រានចេញ
 Exec=tdeio_media_mounthelper -e %u
-
-
+Icon=player_eject
+Name=Eject
diff --git a/src/servicemenus/media_lock.desktop b/src/servicemenus/media_lock.desktop
new file mode 100644
index 0000000..d575653
--- /dev/null
+++ b/src/servicemenus/media_lock.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_unlocked,media/cdrom_encrypted_unlocked,media/cd-r_encrypted_unlocked,media/cd-rw_encrypted_unlocked,media/dvd_encrypted_unlocked,media/hdd_encrypted_unlocked,media/removable_encrypted_unlocked
+Actions=MediaLock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
+
+[Desktop Action MediaLock]
+Exec=tdeio_media_mounthelper -l %u
+Icon=encrypted
+Name=Lock
diff --git a/src/servicemenus/media_mount.desktop b/src/servicemenus/media_mount.desktop
index 003c12d..d6fe01d 100644
--- a/src/servicemenus/media_mount.desktop
+++ b/src/servicemenus/media_mount.desktop
@@ -1,13 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_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
+X-TDE-ServiceTypes=media/bluray_unmounted,media/camera_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_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/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaMount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaMount]
-Name=Mount
-#SUSE-Overwrite Name[km]=រៀបចំ
-#SUSE-Overwrite Name[pa]=ਮਾਊਟ
 Exec=tdeio_media_mounthelper -m %u
-
-
+Icon=drive-harddisk-mounted
+Name=Mount
diff --git a/src/servicemenus/media_realfolder.desktop b/src/servicemenus/media_realfolder.desktop
index f4d48cd..d18facf 100644
--- a/src/servicemenus/media_realfolder.desktop
+++ b/src/servicemenus/media_realfolder.desktop
@@ -5,8 +5,5 @@ X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaRealFolder]
-Name=Open Medium System Folder
-#SUSE-Overwrite Name[pa]=ਮੀਡੀਅਮ ਸਿਸਟਮ ਫੋਲਡਰ ਖੋਲੋ
 Exec=tdeio_media_realfolder %u
-
-
+Name=Open Medium System Folder
diff --git a/src/servicemenus/media_safelyremove.desktop b/src/servicemenus/media_safelyremove.desktop
index 9d01b5f..cf7191c 100644
--- a/src/servicemenus/media_safelyremove.desktop
+++ b/src/servicemenus/media_safelyremove.desktop
@@ -1,13 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted,media/camera_unmounted,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_locked,media/removable_encrypted_unlocked
 Actions=MediaSafelyRemove;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaSafelyRemove]
-Name=Safely Remove
-#SUSE-Overwrite Name[km]=យកចេញដោយសុវត្ថិភាព
-#SUSE-Overwrite Name[pa]=ਸੁਰੱਖਿਅਤ ਹਟਾਓ
 Exec=tdeio_media_mounthelper -s %u
-
-
+Icon=player_safe_removal
+Name=Safely Remove
diff --git a/src/servicemenus/media_unlock.desktop b/src/servicemenus/media_unlock.desktop
new file mode 100644
index 0000000..85b2519
--- /dev/null
+++ b/src/servicemenus/media_unlock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked,media/hdd_encrypted_locked,media/removable_encrypted_locked
+Actions=MediaLock;
+Actions=MediaUnlock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
+
+[Desktop Action MediaUnlock]
+Exec=tdeio_media_mounthelper -k %u
+Icon=decrypted
+Name=Unlock
diff --git a/src/servicemenus/media_unmount.desktop b/src/servicemenus/media_unmount.desktop
index d4650f5..38370dd 100644
--- a/src/servicemenus/media_unmount.desktop
+++ b/src/servicemenus/media_unmount.desktop
@@ -1,13 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=media/bluray_mounted,media/camera_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/removable_mounted,media/smb_mounted,media/zip_mounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaUnmount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaUnmount]
-Name=Unmount
-#SUSE-Overwrite Name[km]=មិនរៀបចំ
-#SUSE-Overwrite Name[pa]=ਅਨਮਾਉਟ
 Exec=tdeio_media_mounthelper -u %u
-
-
+Icon=drive-harddisk-unmounted
+Name=Unmount