Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase

36 files changed, 42 insertions, 42 deletions

diff --git a/konqueror/about/konq_aboutpage.desktop b/konqueror/about/konq_aboutpage.desktop
index dadfdd615..da91b3a67 100644
--- a/konqueror/about/konq_aboutpage.desktop
+++ b/konqueror/about/konq_aboutpage.desktop
@@ -80,7 +80,7 @@ Name[xh]=Malunga-Nephepha le Konqueror
 Name[zh_CN]=Konqueror 的关于页面
 Name[zh_TW]=Konqueror 相關資訊
 Name[zu]=Mayelana-nekhasi le-Konqueror
-ServiceTypes=KonqAboutPage,KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KonqAboutPage,KParts/ReadOnlyPart
 X-TDE-Library=konq_aboutpage
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-Built-Into=konqueror
diff --git a/konqueror/iconview/konq_iconview.desktop b/konqueror/iconview/konq_iconview.desktop
index 38d9d5690..524efb6d6 100644
--- a/konqueror/iconview/konq_iconview.desktop
+++ b/konqueror/iconview/konq_iconview.desktop
@@ -80,10 +80,10 @@ Name[zh_CN]=图标视图
 Name[zh_TW]=圖示瀏覽
 Name[zu]=Umbukiso wophawu lwesithombe
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_iconview
 X-TDE-BrowserView-AllowAsDefault=true
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-Args=IconView
 Icon=view_icon
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/konqueror/iconview/konq_multicolumnview.desktop b/konqueror/iconview/konq_multicolumnview.desktop
index 2a71a42f6..70523fc6a 100644
--- a/konqueror/iconview/konq_multicolumnview.desktop
+++ b/konqueror/iconview/konq_multicolumnview.desktop
@@ -80,10 +80,10 @@ Name[zh_CN]=多列视图
 Name[zh_TW]=多列瀏覽
 Name[zu]=Umbukiso onamakholumu amaningi
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_iconview
 X-TDE-BrowserView-AllowAsDefault=true
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-Args=MultiColumnView
 Icon=view_multicolumn
-InitialPreference=9
+X-TDE-InitialPreference=9
diff --git a/konqueror/kfmclient.desktop b/konqueror/kfmclient.desktop
index 7407c5953..6ef381e09 100644
--- a/konqueror/kfmclient.desktop
+++ b/konqueror/kfmclient.desktop
@@ -4,7 +4,7 @@ Type=Application
 Exec=kfmclient openURL %u
 Icon=konqueror
 Terminal=false
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/kfmclient_dir.desktop b/konqueror/kfmclient_dir.desktop
index 6ccb07e90..4d7c06645 100644
--- a/konqueror/kfmclient_dir.desktop
+++ b/konqueror/kfmclient_dir.desktop
@@ -4,7 +4,7 @@ Exec=kfmclient openURL %u inode/directory
 Icon=konqueror
 Terminal=false
 MimeType=inode/directory;
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/kfmclient_html.desktop b/konqueror/kfmclient_html.desktop
index e2e4177c6..70594802c 100644
--- a/konqueror/kfmclient_html.desktop
+++ b/konqueror/kfmclient_html.desktop
@@ -4,7 +4,7 @@ Exec=kfmclient openURL %u text/html
 Icon=konqueror
 Terminal=false
 MimeType=text/html;application/xhtml+xml;text/xml;
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/kfmclient_war.desktop b/konqueror/kfmclient_war.desktop
index bece31386..665ba2ade 100644
--- a/konqueror/kfmclient_war.desktop
+++ b/konqueror/kfmclient_war.desktop
@@ -4,7 +4,7 @@ Exec=kfmclient openURL %u application/x-webarchive
 Icon=konqueror
 Terminal=false
 MimeType=application/x-webarchive;
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/konqbrowser.desktop b/konqueror/konqbrowser.desktop
index 8545abec8..034039a26 100644
--- a/konqueror/konqbrowser.desktop
+++ b/konqueror/konqbrowser.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kfmclient openProfile webbrowsing
 Icon=konqueror
-DocPath=konqueror/index.html
+X-DocPath=konqueror/index.html
 
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/konqfilemgr.desktop b/konqueror/konqfilemgr.desktop
index 3b10dc9e0..90759b0d1 100644
--- a/konqueror/konqfilemgr.desktop
+++ b/konqueror/konqfilemgr.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kfmclient openProfile filemanagement
 Icon=kfm
-DocPath=konqueror/index.html
+X-DocPath=konqueror/index.html
 
 Name=File Manager
 Name[af]=Lêer Bestuurder
diff --git a/konqueror/konquerorsu.desktop b/konqueror/konquerorsu.desktop
index 58bb4ff8e..fdf7b8e03 100644
--- a/konqueror/konquerorsu.desktop
+++ b/konqueror/konquerorsu.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Exec=konqueror --profile filemanagement
-DocPath=konqueror/index.html
+X-DocPath=konqueror/index.html
 Icon=kfm
 X-TDE-SubstituteUID=true
 
diff --git a/konqueror/listview/konq_detailedlistview.desktop b/konqueror/listview/konq_detailedlistview.desktop
index 626c67d57..2e16d061f 100644
--- a/konqueror/listview/konq_detailedlistview.desktop
+++ b/konqueror/listview/konq_detailedlistview.desktop
@@ -80,9 +80,9 @@ Name[zh_CN]=细节列表视图
 Name[zh_TW]=詳細的清單檢視
 Name[zu]=Umbukiso Woluhlu Oluneminingwane
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=DetailedList
 X-TDE-BrowserView-HideFromMenus=true
 Icon=view_detailed
-InitialPreference=7
+X-TDE-InitialPreference=7
diff --git a/konqueror/listview/konq_infolistview.desktop b/konqueror/listview/konq_infolistview.desktop
index e4477e548..b076af7db 100644
--- a/konqueror/listview/konq_infolistview.desktop
+++ b/konqueror/listview/konq_infolistview.desktop
@@ -78,9 +78,9 @@ Name[zh_CN]=信息列表视图
 Name[zh_TW]=資訊清單檢視
 Name[zu]=Umbukiso wohlu lolwazi
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=InfoListView
 X-TDE-BrowserView-HideFromMenus=true
 Icon=view_detailed
-InitialPreference=7
+X-TDE-InitialPreference=7
diff --git a/konqueror/listview/konq_textview.desktop b/konqueror/listview/konq_textview.desktop
index b522bec7e..3f44f0543 100644
--- a/konqueror/listview/konq_textview.desktop
+++ b/konqueror/listview/konq_textview.desktop
@@ -81,9 +81,9 @@ Name[zh_CN]=文本视图
 Name[zh_TW]=文字檢視
 Name[zu]=Umbukiso wombhalo
 MimeType=inode/directory
-ServiceTypes=Browser/View
+X-TDE-ServiceTypes=Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=TextView
 X-TDE-BrowserView-HideFromMenus=true
 Icon=view_text
-InitialPreference=6
+X-TDE-InitialPreference=6
diff --git a/konqueror/listview/konq_treeview.desktop b/konqueror/listview/konq_treeview.desktop
index 7f4d3eb68..3169cba48 100644
--- a/konqueror/listview/konq_treeview.desktop
+++ b/konqueror/listview/konq_treeview.desktop
@@ -80,10 +80,10 @@ Name[zh_CN]=树视图
 Name[zh_TW]=樹狀瀏覽
 Name[zu]=Umbukiso Wesihlahla
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=MixedTree
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-HierarchicalView=true
 Icon=view_tree
-InitialPreference=8
+X-TDE-InitialPreference=8
diff --git a/konqueror/preloader/konqy_preloader.desktop b/konqueror/preloader/konqy_preloader.desktop
index 1aad1ed7a..e23ebc7f4 100644
--- a/konqueror/preloader/konqy_preloader.desktop
+++ b/konqueror/preloader/konqy_preloader.desktop
@@ -138,7 +138,7 @@ Comment[vi]=Giảm thời gian khởi động Konqueror
 Comment[wa]=Fwait enonder pus raddimint Konqueror
 Comment[zh_CN]=减少 Konqueror 启动时间
 Comment[zh_TW]=減少 Konqueror 啟動時間
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=konqy_preloader
 X-TDE-FactoryName=konqy_preloader
diff --git a/konqueror/quickprint/text-ada-print.desktop b/konqueror/quickprint/text-ada-print.desktop
index 74f9acb7a..6801f3499 100644
--- a/konqueror/quickprint/text-ada-print.desktop
+++ b/konqueror/quickprint/text-ada-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-adasrc
+X-TDE-ServiceTypes=text/x-adasrc
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-c++-print.desktop b/konqueror/quickprint/text-c++-print.desktop
index 311d214b3..4c4f04a01 100644
--- a/konqueror/quickprint/text-c++-print.desktop
+++ b/konqueror/quickprint/text-c++-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-c++src
+X-TDE-ServiceTypes=text/x-c++src
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-c++h-print.desktop b/konqueror/quickprint/text-c++h-print.desktop
index 4ae52ca22..f9533cd14 100644
--- a/konqueror/quickprint/text-c++h-print.desktop
+++ b/konqueror/quickprint/text-c++h-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-c++hdr
+X-TDE-ServiceTypes=text/x-c++hdr
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-c-print.desktop b/konqueror/quickprint/text-c-print.desktop
index 0dfb482fb..06371cbae 100644
--- a/konqueror/quickprint/text-c-print.desktop
+++ b/konqueror/quickprint/text-c-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-csrc
+X-TDE-ServiceTypes=text/x-csrc
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-ch-print.desktop b/konqueror/quickprint/text-ch-print.desktop
index 373cc2df8..fa945f606 100644
--- a/konqueror/quickprint/text-ch-print.desktop
+++ b/konqueror/quickprint/text-ch-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-chdr
+X-TDE-ServiceTypes=text/x-chdr
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-css-print.desktop b/konqueror/quickprint/text-css-print.desktop
index 9e05d8886..d91780694 100644
--- a/konqueror/quickprint/text-css-print.desktop
+++ b/konqueror/quickprint/text-css-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/css
+X-TDE-ServiceTypes=text/css
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-diff-print.desktop b/konqueror/quickprint/text-diff-print.desktop
index 7f85c4585..a11ec5024 100644
--- a/konqueror/quickprint/text-diff-print.desktop
+++ b/konqueror/quickprint/text-diff-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-diff
+X-TDE-ServiceTypes=text/x-diff
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-html-print.desktop b/konqueror/quickprint/text-html-print.desktop
index 0be07c3bf..9f07c0c72 100644
--- a/konqueror/quickprint/text-html-print.desktop
+++ b/konqueror/quickprint/text-html-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/html
+X-TDE-ServiceTypes=text/html
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-java-print.desktop b/konqueror/quickprint/text-java-print.desktop
index a6563212b..a27a79781 100644
--- a/konqueror/quickprint/text-java-print.desktop
+++ b/konqueror/quickprint/text-java-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-java
+X-TDE-ServiceTypes=text/x-java
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-log-print.desktop b/konqueror/quickprint/text-log-print.desktop
index b524d6488..6a2e1fb1a 100644
--- a/konqueror/quickprint/text-log-print.desktop
+++ b/konqueror/quickprint/text-log-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-log
+X-TDE-ServiceTypes=text/x-log
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-makefile-print.desktop b/konqueror/quickprint/text-makefile-print.desktop
index 886bb3b3a..b58f71928 100644
--- a/konqueror/quickprint/text-makefile-print.desktop
+++ b/konqueror/quickprint/text-makefile-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-makefile
+X-TDE-ServiceTypes=text/x-makefile
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-pas-print.desktop b/konqueror/quickprint/text-pas-print.desktop
index 075c5cb65..91fbeffa6 100644
--- a/konqueror/quickprint/text-pas-print.desktop
+++ b/konqueror/quickprint/text-pas-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-pascal
+X-TDE-ServiceTypes=text/x-pascal
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-perl-print.desktop b/konqueror/quickprint/text-perl-print.desktop
index cb0305c6c..4f5e238b6 100644
--- a/konqueror/quickprint/text-perl-print.desktop
+++ b/konqueror/quickprint/text-perl-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-perl
+X-TDE-ServiceTypes=text/x-perl
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-print.desktop b/konqueror/quickprint/text-print.desktop
index 8ec33665d..c90f794c4 100644
--- a/konqueror/quickprint/text-print.desktop
+++ b/konqueror/quickprint/text-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/plain
+X-TDE-ServiceTypes=text/plain
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-python-print.desktop b/konqueror/quickprint/text-python-print.desktop
index d439f3ed0..142168352 100644
--- a/konqueror/quickprint/text-python-print.desktop
+++ b/konqueror/quickprint/text-python-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-python
+X-TDE-ServiceTypes=text/x-python
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-tcl-print.desktop b/konqueror/quickprint/text-tcl-print.desktop
index 4914f1edb..4e3dde72e 100644
--- a/konqueror/quickprint/text-tcl-print.desktop
+++ b/konqueror/quickprint/text-tcl-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-tcl
+X-TDE-ServiceTypes=text/x-tcl
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-tex-print.desktop b/konqueror/quickprint/text-tex-print.desktop
index 3cc4f9493..be580d912 100644
--- a/konqueror/quickprint/text-tex-print.desktop
+++ b/konqueror/quickprint/text-tex-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-tex
+X-TDE-ServiceTypes=text/x-tex
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-xml-print.desktop b/konqueror/quickprint/text-xml-print.desktop
index b559d2fbe..568141e86 100644
--- a/konqueror/quickprint/text-xml-print.desktop
+++ b/konqueror/quickprint/text-xml-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-xml
+X-TDE-ServiceTypes=text/x-xml
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-xslt-print.desktop b/konqueror/quickprint/text-xslt-print.desktop
index c0ac5cb82..c20debb2c 100644
--- a/konqueror/quickprint/text-xslt-print.desktop
+++ b/konqueror/quickprint/text-xslt-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-xslt
+X-TDE-ServiceTypes=text/x-xslt
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/sidebar/konq_sidebartng.desktop b/konqueror/sidebar/konq_sidebartng.desktop
index 1138395e3..e3536a391 100644
--- a/konqueror/sidebar/konq_sidebartng.desktop
+++ b/konqueror/sidebar/konq_sidebartng.desktop
@@ -80,7 +80,7 @@ Name[zh_CN]=导航面板
 Name[zh_TW]=導覽面板
 Name[zu]=Iwindi lemininingwane Lokuzula
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_sidebar
 X-TDE-BrowserView-AllowAsDefault=false
 X-TDE-BrowserView-HideFromMenus=true
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.desktop b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
index 2672bd32c..6c278e177 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
@@ -2,7 +2,7 @@
 Icon=history
 Type=Application
 Exec=tdecmshell kcmhistory
-DocPath=kcontrol/kcmhistory/index.html
+X-DocPath=kcontrol/kcmhistory/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=history
 X-TDE-FactoryName=history