Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeartwork

7 files changed, 59 insertions, 59 deletions

diff --git a/IconThemes/ikons/index.theme b/IconThemes/ikons/index.theme
index f0a7d4a1..6a726376 100644
--- a/IconThemes/ikons/index.theme
+++ b/IconThemes/ikons/index.theme
@@ -83,7 +83,7 @@ SmallDefault=16
 SmallSizes=16
 PanelDefault=32
 PanelSizes=16,32,48
-Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/filesystems,32x32/filesystems,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes
+Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/places,32x32/places,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes
 [16x16/actions]
 Size=16
 Context=Actions
@@ -112,13 +112,13 @@ Type=Fixed
 Size=32
 Context=Devices
 Type=Fixed
-[16x16/filesystems]
+[16x16/places]
 Size=16
-Context=FileSystems
+Context=Places
 Type=Fixed
-[32x32/filesystems]
+[32x32/places]
 Size=32
-Context=FileSystems
+Context=Places
 Type=Fixed
 [16x16/mimetypes]
 Size=16
@@ -136,9 +136,9 @@ Type=Fixed
 Size=48
 Context=Devices
 Type=Fixed
-[48x48/filesystems]
+[48x48/places]
 Size=48
-Context=FileSystems
+Context=Places
 Type=Fixed
 [48x48/mimetypes]
 Size=48
@@ -152,7 +152,7 @@ Type=Fixed
 Size=64
 Context=Applications
 Type=Fixed
-[64x64/filesystems]
+[64x64/places]
 Size=64
-Context=FileSystems
+Context=Places
 Type=Fixed
diff --git a/IconThemes/kdeclassic/index.theme b/IconThemes/kdeclassic/index.theme
index 7cca657c..b9c0acd4 100644
--- a/IconThemes/kdeclassic/index.theme
+++ b/IconThemes/kdeclassic/index.theme
@@ -123,7 +123,7 @@ SmallDefault=16
 SmallSizes=16
 PanelDefault=32
 PanelSizes=16,32,48
-Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/filesystems,32x32/filesystems,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes,64x64 apps
+Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/places,32x32/places,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes,64x64 apps
 [16x16/actions]
 Size=16
 Context=Actions
@@ -152,13 +152,13 @@ Type=Threshold
 Size=32
 Context=Devices
 Type=Threshold
-[16x16/filesystems]
+[16x16/places]
 Size=16
-Context=FileSystems
+Context=Places
 Type=Threshold
-[32x32/filesystems]
+[32x32/places]
 Size=32
-Context=FileSystems
+Context=Places
 Type=Threshold
 [16x16/mimetypes]
 Size=16
@@ -176,9 +176,9 @@ Type=Threshold
 Size=48
 Context=Devices
 Type=Threshold
-[48x48/filesystems]
+[48x48/places]
 Size=48
-Context=FileSystems
+Context=Places
 Type=Threshold
 [48x48/mimetypes]
 Size=48
@@ -188,9 +188,9 @@ Type=Threshold
 Size=64
 Context=MimeTypes
 Type=Threshold
-[64x64/filesystems]
+[64x64/places]
 Size=64
-Context=FileSystems
+Context=Places
 Type=Threshold
 [64x64/apps]
 Size=64
diff --git a/IconThemes/kids/index.theme b/IconThemes/kids/index.theme
index d8ee1ac1..6dfa935a 100644
--- a/IconThemes/kids/index.theme
+++ b/IconThemes/kids/index.theme
@@ -99,7 +99,7 @@ SmallDefault=16
 SmallSizes=16
 PanelDefault=48
 PanelSizes=16,32,48,64,128
-Directories=16x16/actions,22x22/actions,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/filesystems,32x32/filesystems,48x48/filesystems,64x64/filesystems,128x128/filesystems,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/filesystems,128x128/apps,128x128/devices,128x128/actions
+Directories=16x16/actions,22x22/actions,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/places,32x32/places,48x48/places,64x64/places,128x128/places,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/places,128x128/apps,128x128/devices,128x128/actions
 [16x16/actions]
 Size=16
 Context=Actions
@@ -164,25 +164,25 @@ Type=Threshold
 Size=128
 Context=Devices
 Type=Threshold
-[16x16/filesystems]
+[16x16/places]
 Size=16
-Context=FileSystems
+Context=Places
 Type=Threshold
-[32x32/filesystems]
+[32x32/places]
 Size=32
-Context=FileSystems
+Context=Places
 Type=Threshold
-[48x48/filesystems]
+[48x48/places]
 Size=48
-Context=FileSystems
+Context=Places
 Type=Threshold
-[64x64/filesystems]
+[64x64/places]
 Size=64
-Context=FileSystems
+Context=Places
 Type=Threshold
-[128x128/filesystems]
+[128x128/places]
 Size=128
-Context=FileSystems
+Context=Places
 Type=Threshold
 [16x16/mimetypes]
 Size=16
@@ -212,9 +212,9 @@ Type=Threshold
 Size=48
 Context=Devices
 Type=Threshold
-[48x48/filesystems]
+[48x48/places]
 Size=48
-Context=FileSystems
+Context=Places
 Type=Threshold
 [48x48/mimetypes]
 Size=48
@@ -228,9 +228,9 @@ Type=Threshold
 Size=64
 Context=Devices
 Type=Threshold
-[64x64/filesystems]
+[64x64/places]
 Size=64
-Context=FileSystems
+Context=Places
 Type=Threshold
 [64x64/mimetypes]
 Size=64
@@ -245,9 +245,9 @@ Type=Threshold
 Size=128
 Context=Devices
 Type=Threshold
-[128x128/filesystems]
+[128x128/places]
 Size=128
-Context=FileSystems
+Context=Places
 Type=Threshold
 [128x128/mimetypes]
 Size=128
diff --git a/IconThemes/locolor/index.theme b/IconThemes/locolor/index.theme
index fc62480b..fe14032f 100644
--- a/IconThemes/locolor/index.theme
+++ b/IconThemes/locolor/index.theme
@@ -116,7 +116,7 @@ SmallSizes=16
 PanelDefault=16
 PanelSizes=16,32
 LockOverlay=lockoverlay
-Directories=16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes
+Directories=16x16/actions,16x16/apps,16x16/devices,16x16/places,16x16/mimetypes,32x32/apps,32x32/devices,32x32/places,32x32/mimetypes
 [16x16/actions]
 Size=16
 Context=Actions
@@ -129,9 +129,9 @@ Type=Fixed
 Size=16
 Context=Devices
 Type=Fixed
-[16x16/filesystems]
+[16x16/places]
 Size=16
-Context=FileSystems
+Context=Places
 Type=Fixed
 [16x16/mimetypes]
 Size=16
@@ -145,9 +145,9 @@ Type=Fixed
 Size=32
 Context=Devices
 Type=Fixed
-[32x32/filesystems]
+[32x32/places]
 Size=32
-Context=FileSystems
+Context=Places
 Type=Fixed
 [32x32/mimetypes]
 Size=32
diff --git a/IconThemes/slick/index.theme b/IconThemes/slick/index.theme
index 79905594..e34f6193 100644
--- a/IconThemes/slick/index.theme
+++ b/IconThemes/slick/index.theme
@@ -105,7 +105,7 @@ SmallDefault=16
 SmallSizes=16,22
 PanelDefault=32
 PanelSizes=16,22,32,48,64,128
-Directories=16x16/actions,22x22/actions,22x22/apps,22x22/mimetypes,22x22/filesystems,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,22x22/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/filesystems,32x32/filesystems,48x48/filesystems,64x64/filesystems,128x128/filesystems,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/filesystems,128x128/apps,128x128/devices,128x128/actions
+Directories=16x16/actions,22x22/actions,22x22/apps,22x22/mimetypes,22x22/places,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,22x22/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/places,32x32/places,48x48/places,64x64/places,128x128/places,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/places,128x128/apps,128x128/devices,128x128/actions
 [16x16/actions]
 Size=16
 Context=Actions
@@ -178,25 +178,25 @@ Type=Threshold
 Size=22
 Context=Devices
 Type=Threshold
-[16x16/filesystems]
+[16x16/places]
 Size=16
-Context=FileSystems
+Context=Places
 Type=Threshold
-[32x32/filesystems]
+[32x32/places]
 Size=32
-Context=FileSystems
+Context=Places
 Type=Threshold
-[48x48/filesystems]
+[48x48/places]
 Size=48
-Context=FileSystems
+Context=Places
 Type=Threshold
-[64x64/filesystems]
+[64x64/places]
 Size=64
-Context=FileSystems
+Context=Places
 Type=Threshold
-[128x128/filesystems]
+[128x128/places]
 Size=128
-Context=FileSystems
+Context=Places
 Type=Threshold
 [16x16/mimetypes]
 Size=16
@@ -230,13 +230,13 @@ Type=Threshold
 Size=48
 Context=Devices
 Type=Threshold
-[48x48/filesystems]
+[48x48/places]
 Size=48
-Context=FileSystems
+Context=Places
 Type=Threshold
-[22x22/filesystems]
+[22x22/places]
 Size=22
-Context=FileSystems
+Context=Places
 Type=Threshold
 [48x48/mimetypes]
 Size=48
@@ -250,9 +250,9 @@ Type=Threshold
 Size=64
 Context=Devices
 Type=Threshold
-[64x64/filesystems]
+[64x64/places]
 Size=64
-Context=FileSystems
+Context=Places
 Type=Threshold
 [64x64/mimetypes]
 Size=64
@@ -266,9 +266,9 @@ Type=Threshold
 Size=128
 Context=Devices
 Type=Threshold
-[128x128/filesystems]
+[128x128/places]
 Size=128
-Context=FileSystems
+Context=Places
 Type=Threshold
 [128x128/mimetypes]
 Size=128
diff --git a/admin b/admin
-Subproject efdff81cd246d0737ecb1a82ef6fd588c0a6bc0
+Subproject a84dfb918b09c3e577b5ebd811761daf4fc8226
diff --git a/cmake b/cmake
-Subproject f1cea7f894713183e061fa6d2b69b05889a90a0
+Subproject 3e0a4c9f3bb710512f7f21dc63970804ee09d09