merge

9 files changed, 32 insertions, 32 deletions

diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc
index 3995909f1..a8c3bb15b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc
@@ -1,8 +1,8 @@
 # created by KDE, Thu Oct 30 14:13:47 2008
 #
-# If you do not want KDE to override your GTK settings, select
+# If you do not want TDE to override your GTK settings, select
 # Appearance & Themes -> Colors in the Control Center and disable the checkbox
-# "Apply colors to non-KDE applications"
+# "Apply colors to non-TDE applications"
 #
 #
 style "default"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc-2.0 b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc-2.0
index 7259a697e..ed38dfa2d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc-2.0
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/gtkrc-2.0
@@ -1,8 +1,8 @@
 # created by KDE, Thu Oct 30 14:13:47 2008
 #
-# If you do not want KDE to override your GTK settings, select
+# If you do not want TDE to override your GTK settings, select
 # Appearance & Themes -> Colors in the Control Center and disable the checkbox
-# "Apply colors to non-KDE applications"
+# "Apply colors to non-TDE applications"
 #
 #
 style "default"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc
index dd67afa35..a44667033 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kcmnspluginrc
@@ -1,4 +1,4 @@
 [Misc]
-startkdeScan=true
+starttdeScan=true
 useArtsdsp=true
 PluginsListFile=/usr/share/redmond-default-settings/tde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kickerrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kickerrc
index 33f11d197..a658c042d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kickerrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kickerrc
@@ -86,6 +86,6 @@ EnableTileBackground=false
 Extensions=find.desktop,remotemenu.desktop,printmenu.desktop,recentdocs.desktop,prefmenu.desktop,systemmenu.desktop,konsolemenu.desktop
 MenuEntryHeight=16
 NumVisibleEntries=4
-RecentAppsStat=20000 1225867511 /usr/share/applications/synaptic-kde.desktop,21000 1226223271 /opt/trinity/share/applications/kde/konsole.desktop
+RecentAppsStat=20000 1225867511 /usr/share/applications/synaptic-kde.desktop,21000 1226223271 /opt/trinity/share/applications/tde/konsole.desktop
 UseBookmarks=true
 MenuEntryFormat=NameAndDescription
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc
index e8f5cac9c..8d57ed914 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/knotify.eventsrc
@@ -2,6 +2,6 @@
 presentation=65
 soundfile=/usr/share/sounds/KDE_Error_1.ogg
 
-[startkde]
+[starttde]
 presentation=1
 soundfile=/usr/share/sounds/kubuntu-login.ogg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/ktaskbarrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/ktaskbarrc
index 6a2734810..6a2734810 100755..100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/ktaskbarrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/ktaskbarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/profilerc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/profilerc
index 0cba16e75..321d12cef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/profilerc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/profilerc
@@ -1,27 +1,27 @@
 [application/x-deb - 1]
 AllowAsDefault=true
-Application=kde-kpackage.desktop
+Application=tde-kpackage.desktop
 GenericServiceType=Application
 Preference=2
 ServiceType=application/x-deb
 
 [application/x-deb - 2]
 AllowAsDefault=true
-Application=kde-kdpkg.desktop
+Application=tde-kdpkg.desktop
 GenericServiceType=Application
 Preference=2
 ServiceType=application/x-deb
 
 [application/x-deb - 3]
 AllowAsDefault=true
-Application=kde-ark.desktop
+Application=tde-ark.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=application/x-deb
 
 [video/avi - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/avi
@@ -42,7 +42,7 @@ ServiceType=video/avi
 
 [video/mp4 - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/mp4
@@ -63,7 +63,7 @@ ServiceType=video/mp4
 
 [video/mpeg - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/mpeg
@@ -84,7 +84,7 @@ ServiceType=video/mpeg
 
 [video/quicktime - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/quicktime
@@ -105,7 +105,7 @@ ServiceType=video/quicktime
 
 [video/vnd.rn-realvideo - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/vnd.rn-realvideo
@@ -126,7 +126,7 @@ ServiceType=video/vnd.rn-realvideo
 
 [video/x-flic - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-flic
@@ -147,7 +147,7 @@ ServiceType=video/x-flic
 
 [video/x-matroska - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-matroska
@@ -168,7 +168,7 @@ ServiceType=video/x-matroska
 
 [video/x-ms-asf - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-ms-asf
@@ -189,7 +189,7 @@ ServiceType=video/x-ms-asf
 
 [video/x-ms-wmp - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-ms-wmp
@@ -210,7 +210,7 @@ ServiceType=video/x-ms-wmp
 
 [video/x-ms-wmv - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-ms-wmv
@@ -231,7 +231,7 @@ ServiceType=video/x-ms-wmv
 
 [video/x-msvideo - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-msvideo
@@ -252,7 +252,7 @@ ServiceType=video/x-msvideo
 
 [video/x-ogm - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-ogm
@@ -273,7 +273,7 @@ ServiceType=video/x-ogm
 
 [video/x-theora - 1]
 AllowAsDefault=true
-Application=kde-kaffeine.desktop
+Application=tde-kaffeine.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=video/x-theora
@@ -294,28 +294,28 @@ ServiceType=video/x-theora
 
 [inode/directory - 1]
 AllowAsDefault=true
-Application=kde-d3lphin.desktop
+Application=tde-d3lphin.desktop
 GenericServiceType=Application
 Preference=2
 ServiceType=inode/directory
 
 [inode/directory - 2]
 AllowAsDefault=true
-Application=kde-kfmclient_dir.desktop
+Application=tde-kfmclient_dir.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=inode/directory
 
 [inode/system_directory - 1]
 AllowAsDefault=true
-Application=kde-d3lphin.desktop
+Application=tde-d3lphin.desktop
 GenericServiceType=Application
 Preference=2
 ServiceType=inode/system_directory
 
 [inode/system_directory - 2]
 AllowAsDefault=true
-Application=kde-kfmclient_dir.desktop
+Application=tde-kfmclient_dir.desktop
 GenericServiceType=Application
 Preference=1
 ServiceType=inode/system_directory
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
index 8f6b40439..e3689c115 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
@@ -1,9 +1,9 @@
 [General]
 AutoAdjustMinItems=0
-Buttons=firefox.desktop,thunderbird.desktop,kde-kcalc.desktop,kde-Home.desktop
+Buttons=firefox.desktop,thunderbird.desktop,tde-kcalc.desktop,tde-Home.desktop
 IconDim=24
 
 [PopularityData]
 ServiceHistories=0.5/0.111565/0.0248935/0.0055545/0.00123938/0.000276542/6.17049e-05/1.37682e-05,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0,0/0/0/0/0/0/0/0
 ServiceInspos=7,4,8,3,2,5
-ServiceNames=kde-kcalc.desktop,kde-Help.desktop,kde-Home.desktop,kde-KControl.desktop,kde-konsole.desktop,kde-kwrite.desktop
+ServiceNames=tde-kcalc.desktop,tde-Help.desktop,tde-Home.desktop,tde-KControl.desktop,tde-konsole.desktop,tde-kwrite.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc
index d0dce217c..511161395 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/tdewalletrc
@@ -1,13 +1,13 @@
 [Auto Allow]
-kdewallet=tdewalletmanager
+tdewallet=tdewalletmanager
 
 [Auto Deny]
-kdewallet=
+tdewallet=
 
 [Wallet]
 Close When Idle=false
 Close on Screensaver=false
-Default Wallet=kdewallet
+Default Wallet=tdewallet
 Enabled=true
 First Use=false
 Idle Timeout=10