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

20 files changed, 23 insertions, 23 deletions

diff --git a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
index f44293337..033223250 100644
--- a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
+++ b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
@@ -52,7 +52,7 @@ GenericName[vi]=Giao diện BitTorrent
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent 圖型使用者介面
 Icon=xapp
-InitialPreference=1
+X-TDE-InitialPreference=1
 MimeType=application/x-bittorrent
 Name=BitTorrent Python Curses GUI
 Name[be]=Графічны кліент BitTorrent на мове Python
@@ -101,6 +101,6 @@ Name[uz@cyrillic]=BitTorrent учун Python Curses график интерфе�
 Name[vi]=Con trỏ Giao diện Python BitTorrent
 Name[wa]=Eterface grafike e python po BitTorrent
 Name[zh_TW]=BitTorrent Python Curses 圖型使用者介面
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=true
 Type=Application
diff --git a/kappfinder/apps/Internet/btdownloadgui.desktop b/kappfinder/apps/Internet/btdownloadgui.desktop
index 66bff959c..671879bfc 100644
--- a/kappfinder/apps/Internet/btdownloadgui.desktop
+++ b/kappfinder/apps/Internet/btdownloadgui.desktop
@@ -52,7 +52,7 @@ GenericName[vi]=Giao diện BitTorrent
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent 圖型使用者介面
 Icon=xapp
-InitialPreference=2
+X-TDE-InitialPreference=2
 MimeType=application/x-bittorrent
 Name=BitTorrent Python wxGTK GUI
 Name[be]=Графічны кліент BitTorrent на мове Python для wxGTK
@@ -100,6 +100,6 @@ Name[uz@cyrillic]=BitTorrent учун Python wxGTK график интерфей
 Name[vi]=Giao diện wxGTK Python BitTorrent
 Name[wa]=Eterface grafike e python wxGTK po BitTorrent
 Name[zh_TW]=BitTorrent Python wxGTK 圖型使用者介面
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
diff --git a/kappfinder/apps/Internet/javaws.desktop b/kappfinder/apps/Internet/javaws.desktop
index bed9f6f98..fada7245a 100644
--- a/kappfinder/apps/Internet/javaws.desktop
+++ b/kappfinder/apps/Internet/javaws.desktop
@@ -27,7 +27,7 @@ Name[tr]=Jawa Web Start
 Name[uk]=Запуск програм Java з мережі
 Name[vi]=Khởi động Java Mạng
 Name[wa]=Enondaedje di Java sol daegntoele
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
 Icon=java
diff --git a/kappfinder/apps/Multimedia/XMovie.desktop b/kappfinder/apps/Multimedia/XMovie.desktop
index 594a2f914..25a1a9e4e 100644
--- a/kappfinder/apps/Multimedia/XMovie.desktop
+++ b/kappfinder/apps/Multimedia/XMovie.desktop
@@ -96,5 +96,5 @@ Exec=xmovie
 Terminal=false
 Icon=xmovie
 MimeType=video/x-msvideo;video/quicktime;video/x-flic;video/mpeg;video/x-mpeg;
-InitialPreference=10
+X-TDE-InitialPreference=10
 Type=Application
diff --git a/kappfinder/apps/Multimedia/aviplay.desktop b/kappfinder/apps/Multimedia/aviplay.desktop
index 058a89890..a19f9d717 100644
--- a/kappfinder/apps/Multimedia/aviplay.desktop
+++ b/kappfinder/apps/Multimedia/aviplay.desktop
@@ -93,6 +93,6 @@ Name[ven]=U tamba ha Avi
 Name[vi]=Chơi Avi
 Name[xh]=Umdlalo we Avi
 Name[zu]=Umdlali we-Avi
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 
diff --git a/kappfinder/apps/Multimedia/gtv.desktop b/kappfinder/apps/Multimedia/gtv.desktop
index cac898444..2a7eb0ca8 100644
--- a/kappfinder/apps/Multimedia/gtv.desktop
+++ b/kappfinder/apps/Multimedia/gtv.desktop
@@ -88,5 +88,5 @@ Name[bn]=জিটিভি
 Name[hi]=जीटीवी
 Name[te]=జిటివి
 Name[th]=GTV 
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
diff --git a/kappfinder/apps/Multimedia/mplayer.desktop b/kappfinder/apps/Multimedia/mplayer.desktop
index 0dc6a15c3..e08dbc8e1 100644
--- a/kappfinder/apps/Multimedia/mplayer.desktop
+++ b/kappfinder/apps/Multimedia/mplayer.desktop
@@ -95,7 +95,7 @@ Name[sv]=Mplayer
 Name[ta]=Mசாதனம்
 Name[te]=ఎంప్లెయర్
 Name[ven]=Tshitambisi tsha M
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-Protocols=http
 
diff --git a/kappfinder/apps/Multimedia/ogle.desktop b/kappfinder/apps/Multimedia/ogle.desktop
index 18a650326..e50b28a1f 100644
--- a/kappfinder/apps/Multimedia/ogle.desktop
+++ b/kappfinder/apps/Multimedia/ogle.desktop
@@ -91,7 +91,7 @@ Name[ta]=ஓகல்
 Name[te]=ఒగిల్
 Name[th]=Ogel
 Name[ven]=Zondolola
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-SubstituteUID=false
 X-TDE-Username=
diff --git a/kappfinder/apps/Multimedia/oqtplayer.desktop b/kappfinder/apps/Multimedia/oqtplayer.desktop
index 8002acf64..d511da23a 100644
--- a/kappfinder/apps/Multimedia/oqtplayer.desktop
+++ b/kappfinder/apps/Multimedia/oqtplayer.desktop
@@ -98,7 +98,7 @@ Name[ven]=Tshitambi tsha OQTP
 Name[xh]=Umdlali we OQT
 Name[zh_TW]=OQT 播放器
 Name[zu]=Umdlali we-OQT
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-SubstituteUID=false
 X-TDE-Username=
diff --git a/kappfinder/apps/Multimedia/xine.desktop b/kappfinder/apps/Multimedia/xine.desktop
index 2340371f8..3944dbeb8 100644
--- a/kappfinder/apps/Multimedia/xine.desktop
+++ b/kappfinder/apps/Multimedia/xine.desktop
@@ -88,6 +88,6 @@ Name=Xine
 Name[hi]=एक्साइन
 Name[lo]=ສຸວັນທອງ
 Name[te]=క్సైన్
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 
diff --git a/kappfinder/apps/Office/Applix.desktop b/kappfinder/apps/Office/Applix.desktop
index 0b0da803a..e80336063 100644
--- a/kappfinder/apps/Office/Applix.desktop
+++ b/kappfinder/apps/Office/Applix.desktop
@@ -10,7 +10,7 @@ MimeType=
 Exec=applix
 Icon=applixware
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Office Suite
diff --git a/kappfinder/apps/Office/WordPerfect.desktop b/kappfinder/apps/Office/WordPerfect.desktop
index 8870b18b2..26ea75802 100644
--- a/kappfinder/apps/Office/WordPerfect.desktop
+++ b/kappfinder/apps/Office/WordPerfect.desktop
@@ -19,7 +19,7 @@ MimeType=application/wordperfect;
 Exec=xwp
 Icon=wp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Word Processor
diff --git a/kappfinder/apps/Office/WordPerfect2000.desktop b/kappfinder/apps/Office/WordPerfect2000.desktop
index 15ad77ae0..ed733f761 100644
--- a/kappfinder/apps/Office/WordPerfect2000.desktop
+++ b/kappfinder/apps/Office/WordPerfect2000.desktop
@@ -19,7 +19,7 @@ MimeType=application/wordperfect;application/msword;application/x-winword97;
 Exec=wordperfect
 Icon=wp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Word Processor
diff --git a/kappfinder/apps/Office/XAcc.desktop b/kappfinder/apps/Office/XAcc.desktop
index ba50dd74d..9169d45bf 100644
--- a/kappfinder/apps/Office/XAcc.desktop
+++ b/kappfinder/apps/Office/XAcc.desktop
@@ -9,7 +9,7 @@ MimeType=
 Exec=xacc
 Icon=xapp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Personal Accounting Tool
diff --git a/kappfinder/apps/Office/XsLite.desktop b/kappfinder/apps/Office/XsLite.desktop
index 27bf3c4aa..6cd0fb19c 100644
--- a/kappfinder/apps/Office/XsLite.desktop
+++ b/kappfinder/apps/Office/XsLite.desktop
@@ -11,7 +11,7 @@ MimeType=
 Exec=xslite
 Icon=xapp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Spread Sheet
diff --git a/kappfinder/apps/Office/acroread.desktop b/kappfinder/apps/Office/acroread.desktop
index 827c4aec7..3a94f34ad 100644
--- a/kappfinder/apps/Office/acroread.desktop
+++ b/kappfinder/apps/Office/acroread.desktop
@@ -29,7 +29,7 @@ Name[zu]=Umfundi we-Acrobat
 MimeType=application/pdf;
 Exec=acroread %f
 Type=Application
-DocPath=
+X-DocPath=
 GenericName=PDF Viewer
 GenericName[af]=Pdf Aansig
 GenericName[ar]=عارض الملفات PDF
diff --git a/kappfinder/apps/Office/gnucash.desktop b/kappfinder/apps/Office/gnucash.desktop
index 411f7d33e..5fc1cc647 100644
--- a/kappfinder/apps/Office/gnucash.desktop
+++ b/kappfinder/apps/Office/gnucash.desktop
@@ -13,7 +13,7 @@ Name[tg]=Пули Gnu
 Name[ven]=Tshelede ya Gnu
 Exec=gnucash
 Type=Application
-DocPath=
+X-DocPath=
 GenericName=Finance Manager
 GenericName[af]=Finansiële Bestuurder
 GenericName[ar]=أداة لإدارة الأموال
diff --git a/kappfinder/apps/Office/mrproject.desktop b/kappfinder/apps/Office/mrproject.desktop
index a8d7fc25e..dfe5a34e4 100644
--- a/kappfinder/apps/Office/mrproject.desktop
+++ b/kappfinder/apps/Office/mrproject.desktop
@@ -15,7 +15,7 @@ Name[ven]=Radziphurodzhekiti
 Name[vi]=Ngài Dự án
 Exec=mrproject
 Type=Application
-DocPath=
+X-DocPath=
 GenericName=Project Manager
 GenericName[af]=Projek Bestuurder
 GenericName[ar]=أداة لإدارة المشاريع
diff --git a/kappfinder/apps/Office/plan.desktop b/kappfinder/apps/Office/plan.desktop
index d20780d61..56be264ee 100644
--- a/kappfinder/apps/Office/plan.desktop
+++ b/kappfinder/apps/Office/plan.desktop
@@ -25,7 +25,7 @@ MimeType=
 Exec=plan
 Icon=plan
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Calendar Manager
diff --git a/kappfinder/apps/Office/pybliographic.desktop b/kappfinder/apps/Office/pybliographic.desktop
index b4a98fa91..36627f116 100644
--- a/kappfinder/apps/Office/pybliographic.desktop
+++ b/kappfinder/apps/Office/pybliographic.desktop
@@ -82,7 +82,7 @@ GenericName[zh_TW]=書目資料庫
 GenericName[zu]=Isiqu sedata somlando
 Exec=pybliographic
 Icon=pybliographic
-InitialPreference=2
+X-TDE-InitialPreference=2
 MimeType=text/x-bibtex
 Name=Pybliographic
 Name[af]=Pybliografie
@@ -96,6 +96,6 @@ Name[pa]=ਫੀਬਬਲੀਓਗਰਾਫ
 Name[te]=పైబ్లియొగ్రాఫిక్
 Name[tg]=Иттилооти китобшиноси P
 Path=
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application