Distinguish between CD types in media tdeioslave popups

This resolves Bug 1371

14 files changed, 267 insertions, 61 deletions

diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index a79f0522e..ce9d8fb9e 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -499,7 +499,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDR)) {
-			mimeType = "media/cdwriter" + MOUNT_SUFFIX;
+			mimeType = "media/cd-r" + MOUNT_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
 				medium->unmountableState("");
@@ -508,7 +508,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDRW)) {
-			mimeType = "media/cdwriter" + MOUNT_SUFFIX;
+			mimeType = "media/cd-rw" + MOUNT_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
 				medium->unmountableState("");
@@ -517,7 +517,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDMO)) {
-			mimeType = "media/cdwriter" + MOUNT_SUFFIX;
+			mimeType = "media/cd-rw" + MOUNT_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
 				medium->unmountableState("");
@@ -526,7 +526,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRW)) {
-			mimeType = "media/cdwriter" + MOUNT_SUFFIX;
+			mimeType = "media/cd-rw" + MOUNT_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
 				medium->unmountableState("");
@@ -535,7 +535,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRWW)) {
-			mimeType = "media/cdwriter" + MOUNT_SUFFIX;
+			mimeType = "media/cd-rw" + MOUNT_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
 				medium->unmountableState("");
diff --git a/tdeioslave/media/mimetypes/CMakeLists.txt b/tdeioslave/media/mimetypes/CMakeLists.txt
index 5b1946c2d..732441766 100644
--- a/tdeioslave/media/mimetypes/CMakeLists.txt
+++ b/tdeioslave/media/mimetypes/CMakeLists.txt
@@ -24,9 +24,10 @@ install( FILES
     cdrom_unmounted_encrypted.desktop cdrom_unmounted_decrypted.desktop
     dvd_mounted.desktop dvd_unmounted.desktop dvd_mounted_decrypted.desktop
     dvd_unmounted_encrypted.desktop dvd_unmounted_decrypted.desktop
-    cdwriter_mounted.desktop cdwriter_unmounted.desktop
-    cdwriter_mounted_decrypted.desktop cdwriter_unmounted_encrypted.desktop
-    cdwriter_unmounted_decrypted.desktop smb_mounted.desktop
+    cd-r_mounted.desktop cd-r_unmounted.desktop cd-r_mounted_decrypted.desktop
+    cd-r_unmounted_encrypted.desktop cd-r_unmounted_decrypted.desktop
+    cd-rw_mounted.desktop cd-rw_unmounted.desktop cd-rw_mounted_decrypted.desktop
+    cd-rw_unmounted_encrypted.desktop cd-rw_unmounted_decrypted.desktop smb_mounted.desktop
     smb_unmounted.desktop nfs_mounted.desktop nfs_unmounted.desktop
     audiocd.desktop dvdvideo.desktop blankcd.desktop blankdvd.desktop
     svcd.desktop vcd.desktop gphoto2camera.desktop camera_mounted.desktop
diff --git a/tdeioslave/media/mimetypes/cdwriter_mounted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted.desktop
index 88739824f..35490857d 100644
--- a/tdeioslave/media/mimetypes/cdwriter_mounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_mounted.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=cdwriter_mount
 Type=MimeType
-MimeType=media/cdwriter_mounted
-Comment=Mounted CD Writer
+MimeType=media/cd-r_mounted
+Comment=Mounted CD-R
 Comment[af]=Gekoppelde Cd Skrywer
 Comment[ar]=ناسخ أقراص محمّل
 Comment[az]=Bağlanmış CD Yazıcı
@@ -11,18 +11,18 @@ Comment[bg]=Монтиран компактдиск
 Comment[bn]=মাউন্ট করা সিডি-রাইটার
 Comment[br]=Engraver CD marc'het
 Comment[bs]=Montiran CD pisač
-Comment[ca]=CD Writer muntat
+Comment[ca]=CD-R muntat
 Comment[cs]=Připojená vypalovačka CD
 Comment[csb]=Zamòntowóny wëpôlôrz CD
 Comment[cy]=Ysgrifennwr CD wedi'i osod
 Comment[da]=Monteret cd-skriver
-Comment[de]=Eingebundener CD-Brenner
-Comment[el]=Προσαρτημένο CD Writer
+Comment[de]=Eingebundener CD-R
+Comment[el]=Προσαρτημένο CD-R
 Comment[eo]=Surmetita skribebla LD
 Comment[es]=Escritor de CDs montado
 Comment[et]=Ühendatud CD kirjutaja
 Comment[eu]=CD erretzaile muntatua
-Comment[fa]=CD Writer سوارشده
+Comment[fa]=CD-R سوارشده
 Comment[fi]=Liitetty CD-kirjoitin
 Comment[fr]=Graveur de CD monté
 Comment[fy]=Oankeppele Kompaktskiif
@@ -36,8 +36,8 @@ Comment[hu]=Csatlakoztatott CD-író
 Comment[is]=Tengdur geislaskrifari
 Comment[it]=Masterizzatore montato
 Comment[ja]=マウントされている CD ライター
-Comment[ka]=მონტირებული CD Writer
-Comment[kk]=Тіркеген CD Writer
+Comment[ka]=მონტირებული CD-R
+Comment[kk]=Тіркеген CD-R
 Comment[km]=ឧបករណ៍​សរសេរ​ស៊ីឌី​បាន​រៀបចំ
 Comment[lo]= ຈໍພາບ
 Comment[lt]=Sumontuotas CD rašymo įrenginys
@@ -49,14 +49,14 @@ Comment[mt]=CDWriter immontat
 Comment[nb]=Montert CD-brenner
 Comment[nds]=Inhangt CD-Brenner
 Comment[ne]=माउन्ट गरिएको सीडी राइटर
-Comment[nl]=Aangekoppelde cd-writer
+Comment[nl]=Aangekoppelde cd-r
 Comment[nn]=Montert CD-brennar
 Comment[nso]=Sengwadi sa CD seo se Nameleditswego
 Comment[pa]=ਮਾਊਟ CD ਰਾਇਟਰ
 Comment[pl]=Zamontowana nagrywarka CD
 Comment[pt]=Gravador de CDs montado
 Comment[pt_BR]=Gravador de CD Montado
-Comment[ro]=CD Writer montat
+Comment[ro]=CD-R montat
 Comment[ru]=Смонтированный CD (с возможностью записи)
 Comment[rw]=Mwandika CD Yashyizwemo
 Comment[se]=Čatnon CD-čálli
@@ -66,7 +66,7 @@ Comment[sr]=Монтиран CD резач
 Comment[sr@Latn]=Montiran CD rezač
 Comment[sv]=Monterad cd-brännare
 Comment[ta]=ஏற்றப்பட்ட குறுந்தகடு எழுதி
-Comment[tg]=Монтажшудаи CD Writer
+Comment[tg]=Монтажшудаи CD-R
 Comment[th]=เครื่องเขียนซีดีที่เม้านท์แล้ว
 Comment[tr]=Bağlı CD Yazıcı
 Comment[tt]=Totaşqan CD Yazdırğıç
@@ -76,10 +76,10 @@ Comment[uz@cyrillic]=Уланган компакт-диск ёзувчи
 Comment[ven]=Tshinwali tsha CD tsho gonyiswaho
 Comment[vi]=Ổ ghi CD đã kết nối
 Comment[wa]=Plake lazer CD sol broûleu montêye
-Comment[xh]=CD Writer Enyusiweyo
+Comment[xh]=CD-R Enyusiweyo
 Comment[zh_CN]=挂载的刻录机
-Comment[zh_TW]=已掛載的 CD Writer
-Comment[zu]=I-CD-Writer eyenyusiwe
+Comment[zh_TW]=已掛載的 CD-R
+Comment[zu]=I-CD-R eyenyusiwe
 Patterns=
 
 X-TDE-AutoEmbed=true
diff --git a/tdeioslave/media/mimetypes/cdwriter_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop
index e3e8877d1..650555e76 100644
--- a/tdeioslave/media/mimetypes/cdwriter_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop
@@ -2,9 +2,9 @@
 Encoding=UTF-8
 Icon=cdwriter_mount_decrypt
 Type=MimeType
-MimeType=media/cdwriter_mounted_decrypted
-Comment=Mounted Decrypted CD Writer
-Comment[de]=Eingebundener, entschlüsselter CD-Brenner
+MimeType=media/cd-r_mounted_decrypted
+Comment=Mounted Decrypted CD-R
+Comment[de]=Eingebundener, entschlüsselter CD-R
 Patterns=
 
 X-TDE-AutoEmbed=true
diff --git a/tdeioslave/media/mimetypes/cdwriter_unmounted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
index 357e197d4..5dfdde32e 100644
--- a/tdeioslave/media/mimetypes/cdwriter_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=cdwriter_unmount
 Type=MimeType
-MimeType=media/cdwriter_unmounted
-Comment=Unmounted CD Writer
+MimeType=media/cd-r_unmounted
+Comment=Unmounted CD-R
 Comment[af]=Ontkoppelde CD Skrywer
 Comment[ar]=ناسخ أقراص غير محمّل
 Comment[az]=Ayrılmış CD Yazıcı
@@ -11,18 +11,18 @@ Comment[bg]=Демонтиран компактдиск
 Comment[bn]=আনমাউন্ট করা সিডি-রাইটার
 Comment[br]=Engraver CD divarc'het
 Comment[bs]=Demontiran CD pisač
-Comment[ca]=CD Writer desmuntat
+Comment[ca]=CD-R desmuntat
 Comment[cs]=Odpojená vypalovačka CD
 Comment[csb]=Òdmòntowóny wëpôlôrz CD
 Comment[cy]=Ysgrifennwr CD wedi'i ddadosod
 Comment[da]=Afmonteret cd-skriver
-Comment[de]=Nicht eingebundener CD-Brenner
-Comment[el]=Αποπροσαρτημένο CD Writer
+Comment[de]=Nicht eingebundener CD-R
+Comment[el]=Αποπροσαρτημένο CD-R
 Comment[eo]=Demetita skribebla LD
 Comment[es]=Escritor de CDs desmontado
 Comment[et]=Lahutatud CD kirjutaja
 Comment[eu]=CD erretzaile desmuntatua
-Comment[fa]=CD Writer پیاده‌شده
+Comment[fa]=CD-R پیاده‌شده
 Comment[fi]=Irrotettu CD-kirjoitin
 Comment[fr]=Graveur de CD non monté
 Comment[fy]=Ofkeppele Kompaktskiif
@@ -36,8 +36,8 @@ Comment[hu]=Leválasztott CD-író
 Comment[is]=Aftengdur geislaskrifari
 Comment[it]=Masterizzatore smontato
 Comment[ja]=マウントされていない CD ライター
-Comment[ka]=დემონტირებული CD Writer
-Comment[kk]=Ажыратылған CD Writer
+Comment[ka]=დემონტირებული CD-R
+Comment[kk]=Ажыратылған CD-R
 Comment[km]=ឧបករណ៍​សរសេរ​ស៊ីឌី​មិន​បាន​រៀបចំ
 Comment[lo]= ຫັງກາລີ
 Comment[lt]=Išmontuotas CD rašymo įrenginys
@@ -49,14 +49,14 @@ Comment[mt]=CDWriter mhux immontat
 Comment[nb]=Avmontert CD-brenner
 Comment[nds]=Afhangt CD-Brenner
 Comment[ne]=अनमाउन्ट गरिएको सीडी राइटर
-Comment[nl]=Afgekoppelde cd-writer
+Comment[nl]=Afgekoppelde cd-r
 Comment[nn]=Avmontert CD-brennar
 Comment[nso]=Sengwadi sa CD seo se Theositswego
 Comment[pa]=ਅਨਮਾਊਟ CD ਰਾਇਟਰ
 Comment[pl]=Odmontowana nagrywarka CD
 Comment[pt]=Gravador de CDs desmontado
 Comment[pt_BR]=Gravador de CD Desmontado
-Comment[ro]=CD Writer nemontat
+Comment[ro]=CD-R nemontat
 Comment[ru]=Отмонтированный CD (с возможностью записи)
 Comment[rw]=Mwandika CD Yakuwemo
 Comment[se]=Gálgajuvvon CD-čálli
@@ -66,7 +66,7 @@ Comment[sr]=Демонтиран CD резач
 Comment[sr@Latn]=Demontiran CD rezač
 Comment[sv]=Avmonterad cd-brännare
 Comment[ta]=வெளியேற்றிய குறுந்தகடு எழுதி
-Comment[tg]=Ҷудо шудаи CD Writer
+Comment[tg]=Ҷудо шудаи CD-R
 Comment[th]=เครื่องเขียนซีดีที่ไม่ได้กเม้านท์
 Comment[tr]=Ayrılmış CD Yazıcı
 Comment[tt]=Totaşmağan CD Yazdırğıç
@@ -76,10 +76,10 @@ Comment[uz@cyrillic]=Уланмаган компакт-диск ёзувчи
 Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho
 Comment[vi]=Ổ ghi CD đã gỡ ra
 Comment[wa]=Plake lazer CD sol broûleu dismontêye
-Comment[xh]=CD Writer Enganyuswanga
+Comment[xh]=CD-R Enganyuswanga
 Comment[zh_CN]=未挂载的刻录机
-Comment[zh_TW]=未掛載的 CD Writer
-Comment[zu]=I-CD-Writer eyehlisiwe
+Comment[zh_TW]=未掛載的 CD-R
+Comment[zu]=I-CD-R eyehlisiwe
 Patterns=
 
 X-TDE-AutoEmbed=true
diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop
new file mode 100644
index 000000000..a9b5143d7
--- /dev/null
+++ b/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=cdwriter_unmount_decrypt
+Type=MimeType
+MimeType=media/cd-r_unmounted_decrypted
+Comment=Unmounted Decrypted CD-R
+Comment[de]=Nicht eingebundener, entschlüsselter CD-R
+Patterns=
+
+X-TDE-AutoEmbed=true
+X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop
new file mode 100644
index 000000000..596de66b2
--- /dev/null
+++ b/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=cdwriter_unmount_encrypt
+Type=MimeType
+MimeType=media/cd-r_unmounted_encrypted
+Comment=Unmounted Encrypted CD-R
+Comment[de]=Nicht eingebundener, entschlüsselter CD-R
+Patterns=
+
+X-TDE-AutoEmbed=true
+X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_mounted.desktop b/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
new file mode 100644
index 000000000..a1df9c261
--- /dev/null
+++ b/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
@@ -0,0 +1,86 @@
+[Desktop Entry]
+Icon=cdwriter_mount
+Type=MimeType
+MimeType=media/cd-rw_mounted
+Comment=Mounted CD-RW
+Comment[af]=Gekoppelde Cd Skrywer
+Comment[ar]=ناسخ أقراص محمّل
+Comment[az]=Bağlanmış CD Yazıcı
+Comment[be]=Прымацаваны запісвальнік CD
+Comment[bg]=Монтиран компактдиск
+Comment[bn]=মাউন্ট করা সিডি-রাইটার
+Comment[br]=Engraver CD marc'het
+Comment[bs]=Montiran CD pisač
+Comment[ca]=CD-RW muntat
+Comment[cs]=Připojená vypalovačka CD
+Comment[csb]=Zamòntowóny wëpôlôrz CD
+Comment[cy]=Ysgrifennwr CD wedi'i osod
+Comment[da]=Monteret cd-skriver
+Comment[de]=Eingebundener CD-RW
+Comment[el]=Προσαρτημένο CD-RW
+Comment[eo]=Surmetita skribebla LD
+Comment[es]=Escritor de CDs montado
+Comment[et]=Ühendatud CD kirjutaja
+Comment[eu]=CD erretzaile muntatua
+Comment[fa]=CD-RW سوارشده
+Comment[fi]=Liitetty CD-kirjoitin
+Comment[fr]=Graveur de CD monté
+Comment[fy]=Oankeppele Kompaktskiif
+Comment[ga]=Scríbhneoir Feistithe CDanna
+Comment[gl]=Grabadora de CD Montada
+Comment[he]=צורב מחובר
+Comment[hi]=माउन्टेड सीडी-राइटर
+Comment[hr]=Pristupljeni CD snimač
+Comment[hsb]=Montowany CD-palak
+Comment[hu]=Csatlakoztatott CD-író
+Comment[is]=Tengdur geislaskrifari
+Comment[it]=Masterizzatore montato
+Comment[ja]=マウントされている CD ライター
+Comment[ka]=მონტირებული CD-RW
+Comment[kk]=Тіркеген CD-RW
+Comment[km]=ឧបករណ៍​សរសេរ​ស៊ីឌី​បាន​រៀបចំ
+Comment[lo]= ຈໍພາບ
+Comment[lt]=Sumontuotas CD rašymo įrenginys
+Comment[lv]=Piemontēts CD rakstītājs
+Comment[mk]=Монтиран ЦД-снимач
+Comment[mn]=Залгагдсан КД-шарагч
+Comment[ms]=Penulis CD Terlekap
+Comment[mt]=CDWriter immontat
+Comment[nb]=Montert CD-brenner
+Comment[nds]=Inhangt CD-Brenner
+Comment[ne]=माउन्ट गरिएको सीडी राइटर
+Comment[nl]=Aangekoppelde cd-r
+Comment[nn]=Montert CD-brennar
+Comment[nso]=Sengwadi sa CD seo se Nameleditswego
+Comment[pa]=ਮਾਊਟ CD ਰਾਇਟਰ
+Comment[pl]=Zamontowana nagrywarka CD
+Comment[pt]=Gravador de CDs montado
+Comment[pt_BR]=Gravador de CD Montado
+Comment[ro]=CD-RW montat
+Comment[ru]=Смонтированный CD (с возможностью записи)
+Comment[rw]=Mwandika CD Yashyizwemo
+Comment[se]=Čatnon CD-čálli
+Comment[sk]=Pripojená napaľovacia mechanika CD
+Comment[sl]=Priklopljen zapisovalnik CD-jev
+Comment[sr]=Монтиран CD резач
+Comment[sr@Latn]=Montiran CD rezač
+Comment[sv]=Monterad cd-brännare
+Comment[ta]=ஏற்றப்பட்ட குறுந்தகடு எழுதி
+Comment[tg]=Монтажшудаи CD-RW
+Comment[th]=เครื่องเขียนซีดีที่เม้านท์แล้ว
+Comment[tr]=Bağlı CD Yazıcı
+Comment[tt]=Totaşqan CD Yazdırğıç
+Comment[uk]=Змонтований гравер КД
+Comment[uz]=Ulangan kompakt-disk yozuvchi
+Comment[uz@cyrillic]=Уланган компакт-диск ёзувчи
+Comment[ven]=Tshinwali tsha CD tsho gonyiswaho
+Comment[vi]=Ổ ghi CD đã kết nối
+Comment[wa]=Plake lazer CD sol broûleu montêye
+Comment[xh]=CD-RW Enyusiweyo
+Comment[zh_CN]=挂载的刻录机
+Comment[zh_TW]=已掛載的 CD-RW
+Comment[zu]=I-CD-RW eyenyusiwe
+Patterns=
+
+X-TDE-AutoEmbed=true
+X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop
new file mode 100644
index 000000000..05b2d8fca
--- /dev/null
+++ b/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=cdwriter_mount_decrypt
+Type=MimeType
+MimeType=media/cd-rw_mounted_decrypted
+Comment=Mounted Decrypted CD-RW
+Comment[de]=Eingebundener, entschlüsselter CD-RW
+Patterns=
+
+X-TDE-AutoEmbed=true
+X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
new file mode 100644
index 000000000..90a3aebf6
--- /dev/null
+++ b/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
@@ -0,0 +1,86 @@
+[Desktop Entry]
+Icon=cdwriter_unmount
+Type=MimeType
+MimeType=media/cd-rw_unmounted
+Comment=Unmounted CD-RW
+Comment[af]=Ontkoppelde CD Skrywer
+Comment[ar]=ناسخ أقراص غير محمّل
+Comment[az]=Ayrılmış CD Yazıcı
+Comment[be]=Адмацаваны запісвальнік CD
+Comment[bg]=Демонтиран компактдиск
+Comment[bn]=আনমাউন্ট করা সিডি-রাইটার
+Comment[br]=Engraver CD divarc'het
+Comment[bs]=Demontiran CD pisač
+Comment[ca]=CD-RW desmuntat
+Comment[cs]=Odpojená vypalovačka CD
+Comment[csb]=Òdmòntowóny wëpôlôrz CD
+Comment[cy]=Ysgrifennwr CD wedi'i ddadosod
+Comment[da]=Afmonteret cd-skriver
+Comment[de]=Nicht eingebundener CD-RW
+Comment[el]=Αποπροσαρτημένο CD-RW
+Comment[eo]=Demetita skribebla LD
+Comment[es]=Escritor de CDs desmontado
+Comment[et]=Lahutatud CD kirjutaja
+Comment[eu]=CD erretzaile desmuntatua
+Comment[fa]=CD-RW پیاده‌شده
+Comment[fi]=Irrotettu CD-kirjoitin
+Comment[fr]=Graveur de CD non monté
+Comment[fy]=Ofkeppele Kompaktskiif
+Comment[ga]=Scríbhneoir Neamhfheistithe CDanna
+Comment[gl]=Grabadora de CD Non Montada
+Comment[he]=צורב מנותק
+Comment[hi]=अनमाउन्टेड सीडी-राइटर
+Comment[hr]=Nepristupljeni CD snimač
+Comment[hsb]=Njemontowany CD-palak
+Comment[hu]=Leválasztott CD-író
+Comment[is]=Aftengdur geislaskrifari
+Comment[it]=Masterizzatore smontato
+Comment[ja]=マウントされていない CD ライター
+Comment[ka]=დემონტირებული CD-RW
+Comment[kk]=Ажыратылған CD-RW
+Comment[km]=ឧបករណ៍​សរសេរ​ស៊ីឌី​មិន​បាន​រៀបចំ
+Comment[lo]= ຫັງກາລີ
+Comment[lt]=Išmontuotas CD rašymo įrenginys
+Comment[lv]=Nomontēts CD rakstītājs
+Comment[mk]=Одмонтиран ЦД-снимач
+Comment[mn]=Салгагдсан КД-шарагч
+Comment[ms]=Penulis CD Nyahlekap
+Comment[mt]=CDWriter mhux immontat
+Comment[nb]=Avmontert CD-brenner
+Comment[nds]=Afhangt CD-Brenner
+Comment[ne]=अनमाउन्ट गरिएको सीडी राइटर
+Comment[nl]=Afgekoppelde cd-r
+Comment[nn]=Avmontert CD-brennar
+Comment[nso]=Sengwadi sa CD seo se Theositswego
+Comment[pa]=ਅਨਮਾਊਟ CD ਰਾਇਟਰ
+Comment[pl]=Odmontowana nagrywarka CD
+Comment[pt]=Gravador de CDs desmontado
+Comment[pt_BR]=Gravador de CD Desmontado
+Comment[ro]=CD-RW nemontat
+Comment[ru]=Отмонтированный CD (с возможностью записи)
+Comment[rw]=Mwandika CD Yakuwemo
+Comment[se]=Gálgajuvvon CD-čálli
+Comment[sk]=Nepripojená napaľovacia mechanika CD
+Comment[sl]=Odklopljen zapisovalnik CD-jev
+Comment[sr]=Демонтиран CD резач
+Comment[sr@Latn]=Demontiran CD rezač
+Comment[sv]=Avmonterad cd-brännare
+Comment[ta]=வெளியேற்றிய குறுந்தகடு எழுதி
+Comment[tg]=Ҷудо шудаи CD-RW
+Comment[th]=เครื่องเขียนซีดีที่ไม่ได้กเม้านท์
+Comment[tr]=Ayrılmış CD Yazıcı
+Comment[tt]=Totaşmağan CD Yazdırğıç
+Comment[uk]=Демонтований гравер КД
+Comment[uz]=Ulanmagan kompakt-disk yozuvchi
+Comment[uz@cyrillic]=Уланмаган компакт-диск ёзувчи
+Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho
+Comment[vi]=Ổ ghi CD đã gỡ ra
+Comment[wa]=Plake lazer CD sol broûleu dismontêye
+Comment[xh]=CD-RW Enganyuswanga
+Comment[zh_CN]=未挂载的刻录机
+Comment[zh_TW]=未掛載的 CD-RW
+Comment[zu]=I-CD-RW eyehlisiwe
+Patterns=
+
+X-TDE-AutoEmbed=true
+X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop
new file mode 100644
index 000000000..a437e0a82
--- /dev/null
+++ b/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=cdwriter_unmount_decrypt
+Type=MimeType
+MimeType=media/cd-rw_unmounted_decrypted
+Comment=Unmounted Decrypted CD-RW
+Comment[de]=Nicht eingebundener, entschlüsselter CD-RW
+Patterns=
+
+X-TDE-AutoEmbed=true
+X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop
new file mode 100644
index 000000000..d24b165bf
--- /dev/null
+++ b/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=cdwriter_unmount_encrypt
+Type=MimeType
+MimeType=media/cd-rw_unmounted_encrypted
+Comment=Unmounted Encrypted CD-RW
+Comment[de]=Nicht eingebundener, entschlüsselter CD-RW
+Patterns=
+
+X-TDE-AutoEmbed=true
+X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cdwriter_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdwriter_unmounted_decrypted.desktop
deleted file mode 100644
index e81c0b857..000000000
--- a/tdeioslave/media/mimetypes/cdwriter_unmounted_decrypted.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Icon=cdwriter_unmount_decrypt
-Type=MimeType
-MimeType=media/cdwriter_unmounted_decrypted
-Comment=Unmounted Decrypted CD Writer
-Comment[de]=Nicht eingebundener, entschlüsselter CD-Brenner
-Patterns=
-
-X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cdwriter_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cdwriter_unmounted_encrypted.desktop
deleted file mode 100644
index 5eb9f3396..000000000
--- a/tdeioslave/media/mimetypes/cdwriter_unmounted_encrypted.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Icon=cdwriter_unmount_encrypt
-Type=MimeType
-MimeType=media/cdwriter_unmounted_encrypted
-Comment=Unmounted Encrypted CD Writer
-Comment[de]=Nicht eingebundener, entschlüsselter CD-Brenner
-Patterns=
-
-X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory