[tdebase][r14.0.x] fa007f89

Branch: r14.0.x

fa007f89	2015-03-04 16:48:11	Timothy Pearson
Rename most device icons to comply with XDG standards (cherry picked from commit 0157291f5ea3af6c7fae08ff20eb346bb01624f8)
M kdesktop/init/Templates/CDROM-Device.desktop M kdesktop/init/Templates/CDWRITER-Device.desktop M kdesktop/init/Templates/DVDROM-Device.desktop M kdesktop/init/Templates/Floppy.desktop M kdesktop/init/Templates/HD.desktop M kdesktop/init/Templates/ZIP-Device.desktop M kdesktop/init/Templates/linkCDROM.desktop M kdesktop/init/Templates/linkCDWRITER.desktop M kdesktop/init/Templates/linkDVDROM.desktop M kdesktop/init/Templates/linkFloppy.desktop M kdesktop/init/Templates/linkHD.desktop M kdesktop/init/Templates/linkZIP.desktop M kicker/applets/media/mediaapplet.desktop M konqueror/sidebar/trees/init/services/audiocd.desktop M tdeioslave/floppy/floppy.protocol M tdeioslave/media/mimetypes/audiocd.desktop M tdeioslave/media/mimetypes/blankcd.desktop M tdeioslave/media/mimetypes/blankdvd.desktop M tdeioslave/media/mimetypes/cd-r_mounted.desktop M tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop M tdeioslave/media/mimetypes/cd-r_unmounted.desktop M tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop M tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop M tdeioslave/media/mimetypes/cd-rw_mounted.desktop M tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop M tdeioslave/media/mimetypes/cd-rw_unmounted.desktop M tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop M tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop M tdeioslave/media/mimetypes/cdrom_mounted.desktop M tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop M tdeioslave/media/mimetypes/cdrom_unmounted.desktop M tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop M tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop M tdeioslave/media/mimetypes/dvd_mounted.desktop M tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop M tdeioslave/media/mimetypes/dvd_unmounted.desktop M tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop M tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop M tdeioslave/media/mimetypes/dvdvideo.desktop M tdeioslave/media/mimetypes/floppy5_mounted.desktop M tdeioslave/media/mimetypes/floppy5_unmounted.desktop M tdeioslave/media/mimetypes/floppy_mounted.desktop M tdeioslave/media/mimetypes/floppy_unmounted.desktop M tdeioslave/media/mimetypes/hdd_mounted.desktop M tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop M tdeioslave/media/mimetypes/hdd_unmounted.desktop M tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop M tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop M tdeioslave/media/mimetypes/removable_mounted.desktop M tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop M tdeioslave/media/mimetypes/removable_unmounted.desktop M tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop M tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop M tdeioslave/media/mimetypes/svcd.desktop M tdeioslave/media/mimetypes/vcd.desktop M tdeioslave/media/mimetypes/zip_mounted.desktop M tdeioslave/media/mimetypes/zip_unmounted.desktop
diff --git a/kdesktop/init/Templates/CDROM-Device.desktop b/kdesktop/init/Templates/CDROM-Device.desktop index b4201f4..5f0a8ee 100644 --- a/kdesktop/init/Templates/CDROM-Device.desktop +++ b/kdesktop/init/Templates/CDROM-Device.desktop @@ -3,8 +3,8 @@ Dev= ReadOnly=false Type=FSDevice -Icon=cdrom_mount -UnmountIcon=cdrom_unmount +Icon=media-optical-cdrom-mounted +UnmountIcon=media-optical-cdrom Actions=Eject; X-TDE-Priority=TopLevel [Desktop Action Eject] diff --git a/kdesktop/init/Templates/CDWRITER-Device.desktop b/kdesktop/init/Templates/CDWRITER-Device.desktop index 77c5d07..3dbb0a2 100644 --- a/kdesktop/init/Templates/CDWRITER-Device.desktop +++ b/kdesktop/init/Templates/CDWRITER-Device.desktop @@ -3,8 +3,8 @@ Dev= ReadOnly=0 Type=FSDevice -Icon=cdwriter_mount -UnmountIcon=cdwriter_unmount +Icon=media-optical-cdwriter-mounted +UnmountIcon=media-optical-cdwriter Actions=Eject; X-TDE-Priority=TopLevel [Desktop Action Eject] diff --git a/kdesktop/init/Templates/DVDROM-Device.desktop b/kdesktop/init/Templates/DVDROM-Device.desktop index d4f272c..335967e 100644 --- a/kdesktop/init/Templates/DVDROM-Device.desktop +++ b/kdesktop/init/Templates/DVDROM-Device.desktop @@ -3,8 +3,8 @@ Dev= ReadOnly=false Type=FSDevice -Icon=dvd_mount -UnmountIcon=dvd_unmount +Icon=media-optical-dvd-mounted +UnmountIcon=media-optical-dvd Actions=Eject; X-TDE-Priority=TopLevel [Desktop Action Eject] diff --git a/kdesktop/init/Templates/Floppy.desktop b/kdesktop/init/Templates/Floppy.desktop index 5d73d36..9182d28 100644 --- a/kdesktop/init/Templates/Floppy.desktop +++ b/kdesktop/init/Templates/Floppy.desktop @@ -73,6 +73,6 @@ Dev= ReadOnly=false Type=FSDevice -Icon=3floppy_mount -UnmountIcon=3floppy_unmount +Icon=media-floppy-3_5-mounted +UnmountIcon=media-floppy-3_5 X-TDE-Priority=TopLevel diff --git a/kdesktop/init/Templates/HD.desktop b/kdesktop/init/Templates/HD.desktop index 78ed614..69646a0 100644 --- a/kdesktop/init/Templates/HD.desktop +++ b/kdesktop/init/Templates/HD.desktop @@ -3,5 +3,5 @@ Dev= ReadOnly=false Type=FSDevice -Icon=hdd_mount -UnmountIcon=hdd_unmount +Icon=drive-harddisk-mounted +UnmountIcon=drive-harddisk diff --git a/kdesktop/init/Templates/ZIP-Device.desktop b/kdesktop/init/Templates/ZIP-Device.desktop index bec34fe..8115f6e 100644 --- a/kdesktop/init/Templates/ZIP-Device.desktop +++ b/kdesktop/init/Templates/ZIP-Device.desktop @@ -3,8 +3,8 @@ Dev= ReadOnly=false Type=FSDevice -Icon=zip_mount -UnmountIcon=zip_unmount +Icon=media-floppy-zip-mounted +UnmountIcon=media-floppy-zip Actions=Eject; X-TDE-Priority=TopLevel [Desktop Action Eject] diff --git a/kdesktop/init/Templates/linkCDROM.desktop b/kdesktop/init/Templates/linkCDROM.desktop index b895fe7..98bd0dd 100644 --- a/kdesktop/init/Templates/linkCDROM.desktop +++ b/kdesktop/init/Templates/linkCDROM.desktop @@ -147,4 +147,4 @@ Comment[zh_TW]=�� Type=Link URL=.source/CDROM-Device.desktop -Icon=cdrom_unmount +Icon=media-optical-cdrom diff --git a/kdesktop/init/Templates/linkCDWRITER.desktop b/kdesktop/init/Templates/linkCDWRITER.desktop index 8a080c5..5f9ecc4 100644 --- a/kdesktop/init/Templates/linkCDWRITER.desktop +++ b/kdesktop/init/Templates/linkCDWRITER.desktop @@ -147,4 +147,4 @@ Comment[zh_TW]=�� Type=Link URL=.source/CDWRITER-Device.desktop -Icon=cdwriter_unmount +Icon=media-optical-cdwriter diff --git a/kdesktop/init/Templates/linkDVDROM.desktop b/kdesktop/init/Templates/linkDVDROM.desktop index e65875b..82e0429 100644 --- a/kdesktop/init/Templates/linkDVDROM.desktop +++ b/kdesktop/init/Templates/linkDVDROM.desktop @@ -147,4 +147,4 @@ Comment[zh_TW]=�� DVD-ROM �� Type=Link URL=.source/DVDROM-Device.desktop -Icon=dvd_unmount +Icon=media-optical-dvd diff --git a/kdesktop/init/Templates/linkFloppy.desktop b/kdesktop/init/Templates/linkFloppy.desktop index 2a86dd5..f4852ef 100644 --- a/kdesktop/init/Templates/linkFloppy.desktop +++ b/kdesktop/init/Templates/linkFloppy.desktop @@ -155,4 +155,4 @@ Comment[zu]=Ithuluzi le-Floppy elisha Type=Link URL=.source/Floppy.desktop -Icon=3floppy_unmount +Icon=media-floppy-3_5 diff --git a/kdesktop/init/Templates/linkHD.desktop b/kdesktop/init/Templates/linkHD.desktop index 43a5ba4..ee73bba 100644 --- a/kdesktop/init/Templates/linkHD.desktop +++ b/kdesktop/init/Templates/linkHD.desktop @@ -154,4 +154,4 @@ Comment[zu]=I-diski Elukhuni Entsha Type=Link URL=.source/HD.desktop -Icon=hdd_unmount +Icon=drive-harddisk diff --git a/kdesktop/init/Templates/linkZIP.desktop b/kdesktop/init/Templates/linkZIP.desktop index 9ef9eae..9615679 100644 --- a/kdesktop/init/Templates/linkZIP.desktop +++ b/kdesktop/init/Templates/linkZIP.desktop @@ -147,4 +147,4 @@ Comment[zh_TW]=�� ZIP �� Type=Link URL=.source/ZIP-Device.desktop -Icon=zip_unmount +Icon=media-floppy-zip diff --git a/kicker/applets/media/mediaapplet.desktop b/kicker/applets/media/mediaapplet.desktop index 8c4f8a9..8d5aa55 100644 --- a/kicker/applets/media/mediaapplet.desktop +++ b/kicker/applets/media/mediaapplet.desktop @@ -126,5 +126,5 @@ Name[wa]=Sopoirts di w��rdaedje Name[zh_CN]=�� Name[zh_TW]=�� -Icon=3floppy_unmount +Icon=media-floppy-3_5 X-TDE-Library=media_panelapplet diff --git a/konqueror/sidebar/trees/init/services/audiocd.desktop b/konqueror/sidebar/trees/init/services/audiocd.desktop index e3049f2..58c307e 100644 --- a/konqueror/sidebar/trees/init/services/audiocd.desktop +++ b/konqueror/sidebar/trees/init/services/audiocd.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Link URL=audiocd:/ -Icon=cdaudio_unmount +Icon=media-optical-cdaudio Name=Audio CD Browser Name[af]=Musiek CD Blaaier Name[ar]=�� diff --git a/tdeioslave/floppy/floppy.protocol b/tdeioslave/floppy/floppy.protocol index 336839c..68c41d7 100644 --- a/tdeioslave/floppy/floppy.protocol +++ b/tdeioslave/floppy/floppy.protocol @@ -9,6 +9,6 @@ makedir=true deleting=true moving=true -Icon=3floppy_mount +Icon=media-floppy-3_5-mounted X-DocPath=tdeioslave/floppy/index.html Class=:local diff --git a/tdeioslave/media/mimetypes/audiocd.desktop b/tdeioslave/media/mimetypes/audiocd.desktop index ec53de3..de2e05b 100644 --- a/tdeioslave/media/mimetypes/audiocd.desktop +++ b/tdeioslave/media/mimetypes/audiocd.desktop @@ -59,7 +59,7 @@ Comment[wa]=Plake lazer CD odio Comment[zh_CN]=�� CD Comment[zh_TW]=�� CD -Icon=cdaudio_unmount +Icon=media-optical-cdaudio X-TDE-AutoEmbed=true X-TDE-IsAlso=inode/directory diff --git a/tdeioslave/media/mimetypes/blankcd.desktop b/tdeioslave/media/mimetypes/blankcd.desktop index 723ade2..5903237 100644 --- a/tdeioslave/media/mimetypes/blankcd.desktop +++ b/tdeioslave/media/mimetypes/blankcd.desktop @@ -69,5 +69,5 @@ Comment[wa]=Plake lazer CD sins r��n dzo Comment[zh_CN]=�� CD Comment[zh_TW]=�� CD -Icon=cdwriter_unmount +Icon=media-optical-cdwriter diff --git a/tdeioslave/media/mimetypes/blankdvd.desktop b/tdeioslave/media/mimetypes/blankdvd.desktop index 6aa21b1..d2a288f 100644 --- a/tdeioslave/media/mimetypes/blankdvd.desktop +++ b/tdeioslave/media/mimetypes/blankdvd.desktop @@ -69,4 +69,4 @@ Comment[wa]=Plake lazer DVD sins r��n dzo Comment[zh_CN]=�� DVD Comment[zh_TW]=�� DVD -Icon=dvd_unmount +Icon=media-optical-dvd diff --git a/tdeioslave/media/mimetypes/cd-r_mounted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted.desktop index 3549085..bad9fec 100644 --- a/tdeioslave/media/mimetypes/cd-r_mounted.desktop +++ b/tdeioslave/media/mimetypes/cd-r_mounted.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=cdwriter_mount +Icon=media-optical-cdwriter-mounted Type=MimeType MimeType=media/cd-r_mounted Comment=Mounted CD-R diff --git a/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop index 650555e..e51fd87 100644 --- a/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop +++ b/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=cdwriter_mount_decrypt +Icon=media-optical-cdwriter-mounted_decrypt Type=MimeType MimeType=media/cd-r_mounted_decrypted Comment=Mounted Decrypted CD-R diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop index 5dfdde3..ba15872 100644 --- a/tdeioslave/media/mimetypes/cd-r_unmounted.desktop +++ b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=cdwriter_unmount +Icon=media-optical-cdwriter Type=MimeType MimeType=media/cd-r_unmounted Comment=Unmounted CD-R diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop Diff limit reached (max: 250 lines)