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

11 files changed, 11 insertions, 11 deletions

diff --git a/kcontrol/tdeio/cache.desktop b/kcontrol/tdeio/cache.desktop
index 1e8666de5..2d03cf11e 100644
--- a/kcontrol/tdeio/cache.desktop
+++ b/kcontrol/tdeio/cache.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/cache/index.html
+X-DocPath=kcontrol/cache/index.html
 Icon=cache
 Exec=tdecmshell cache
 
diff --git a/kcontrol/tdeio/cookies.desktop b/kcontrol/tdeio/cookies.desktop
index 9612c8d53..f6c034f89 100644
--- a/kcontrol/tdeio/cookies.desktop
+++ b/kcontrol/tdeio/cookies.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/cookies/index.html
+X-DocPath=kcontrol/cookies/index.html
 Icon=cookie
 Exec=tdecmshell cookies
 
diff --git a/kcontrol/tdeio/lanbrowser.desktop b/kcontrol/tdeio/lanbrowser.desktop
index c917bfbbf..2a7571f71 100644
--- a/kcontrol/tdeio/lanbrowser.desktop
+++ b/kcontrol/tdeio/lanbrowser.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/smb/index.html
+X-DocPath=kcontrol/smb/index.html
 Icon=samba
 Exec=tdecmshell lanbrowser
 
diff --git a/kcontrol/tdeio/netpref.desktop b/kcontrol/tdeio/netpref.desktop
index 61d181019..428051a38 100644
--- a/kcontrol/tdeio/netpref.desktop
+++ b/kcontrol/tdeio/netpref.desktop
@@ -196,7 +196,7 @@ Name[wa]=Preferinces di raloyaedje
 Name[zh_CN]=连接首选项
 Name[zh_TW]=連線偏好設定
 Type=Application
-DocPath=kcontrol/netpref/index.html
+X-DocPath=kcontrol/netpref/index.html
 X-TDE-FactoryName=netpref
 X-TDE-Library=tdeio
 
diff --git a/kcontrol/tdeio/proxy.desktop b/kcontrol/tdeio/proxy.desktop
index 6bab29836..9cf7ed67d 100644
--- a/kcontrol/tdeio/proxy.desktop
+++ b/kcontrol/tdeio/proxy.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/proxy/index.html
+X-DocPath=kcontrol/proxy/index.html
 Icon=proxy
 Exec=tdecmshell proxy
 
diff --git a/kcontrol/tdeio/smb.desktop b/kcontrol/tdeio/smb.desktop
index c1cf7a15b..e82da7926 100644
--- a/kcontrol/tdeio/smb.desktop
+++ b/kcontrol/tdeio/smb.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/smb/index.html
+X-DocPath=kcontrol/smb/index.html
 Icon=samba
 Exec=tdecmshell smb
 
diff --git a/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop b/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
index 94fa23150..09d757326 100644
--- a/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
+++ b/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
@@ -71,7 +71,7 @@ Name[xh]=UADescription (IE 4.5 kwi Win 2000)
 Name[zh_CN]=用户代理描述 (运行于 Win 2000 的 IE 4.5)
 Name[zh_TW]=使用者代理描述 (IE 4.5 on Win 2000)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=IE
 X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 4.5; Windows NT 5.0)
 X-TDE-UA-NAME=Internet Explorer
diff --git a/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop b/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
index a32a4a606..77d0f3ac0 100644
--- a/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
+++ b/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
@@ -70,7 +70,7 @@ Name[xh]=UADescription (IE 5.01 kwi Win 2000)
 Name[zh_CN]=用户代理描述 (运行于 Win 2000 的 IE 5.01)
 Name[zh_TW]=使用者代理描述 (IE 5.01 on Win 2000)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=IE
 X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)
 X-TDE-UA-NAME=Internet Explorer
diff --git a/kcontrol/tdeio/uasproviders/ie55onwin98.desktop b/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
index f5c7046f0..36b65ec68 100644
--- a/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
+++ b/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
@@ -70,7 +70,7 @@ Name[xh]=UADescription UA (IE 5.5 kwi Win 98)
 Name[zh_CN]=用户代理描述 (运行于 Win 98 的 IE 5.5)
 Name[zh_TW]=使用者代理描述 (IE 5.5 on Win 98)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=IE
 X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)
 X-TDE-UA-NAME=Internet Explorer
diff --git a/kcontrol/tdeio/uasproviders/op75oncurrent.desktop b/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
index 64c0c234b..b0d537d77 100644
--- a/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
@@ -61,7 +61,7 @@ Name[wa]=Discrijhaedje di l' idintité do betchteu (Opera 7.55 sol ci do moumint
 Name[zh_CN]=用户代理描述 (运行于本机的 Opera 7.55)
 Name[zh_TW]=使用者代理描述 (Opera 7.55 on current)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=OPR
 X-TDE-UA-FULL=Opera/7.55 (appPlatform; appSysName appMachineType; U) [appLanguage]
 X-TDE-UA-NAME=Opera
diff --git a/kcontrol/tdeio/useragent.desktop b/kcontrol/tdeio/useragent.desktop
index 7729b7f50..dd129113d 100644
--- a/kcontrol/tdeio/useragent.desktop
+++ b/kcontrol/tdeio/useragent.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Icon=agent
 Exec=tdecmshell useragent
-DocPath=kcontrol/useragent/index.html
+X-DocPath=kcontrol/useragent/index.html
 
 
 X-TDE-Library=tdeio