diff --git a/acinclude.m4 b/acinclude.m4
index 8e60545e6..65e0a0fc2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -489,7 +489,7 @@ if test "$1" = "default"; then
kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi
if test -z "$xdg_appsdir"; then
- xdg_appsdir='\${datadir}/applications/kde'
+ xdg_appsdir='\${datadir}/applications/tde'
fi
if test -z "$xdg_menudir"; then
xdg_menudir='\${sysconfdir}/xdg/menus'
diff --git a/admin b/admin
index 06098efaf..4af57bf22 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a
+Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0
diff --git a/chalk/chalk.desktop b/chalk/chalk.desktop
index e711f75bc..2f251e2dd 100644
--- a/chalk/chalk.desktop
+++ b/chalk/chalk.desktop
@@ -88,8 +88,8 @@ GenericName[zh_TW]=繪圖與影像編輯
MimeType=application/x-chalk
Type=Application
Icon=chalk
-Categories=Qt;KDE;Graphics;
-X-KDE-NativeMimeType=application/x-chalk
-X-KDE-StartupNotify=true
+Categories=Qt;TDE;Graphics;
+X-TDE-NativeMimeType=application/x-chalk
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
X-Chalk-Version=2
diff --git a/chalk/chalkcolor/chalk_colorspace.desktop b/chalk/chalkcolor/chalk_colorspace.desktop
index 7379a273a..769851659 100644
--- a/chalk/chalkcolor/chalk_colorspace.desktop
+++ b/chalk/chalkcolor/chalk_colorspace.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Chalk/ColorSpace
+X-TDE-ServiceType=Chalk/ColorSpace
Comment=A module implementing a complete colorspace for use with libchalkcolor
Comment[bg]=Модул, реализиращ пълна цветова гама за употреба с libchalkcolor
Comment[ca]=Un mòdul que implementa un complet espai de colors per a usar-lo amb libchalkcolor
diff --git a/chalk/chalkpart.desktop b/chalk/chalkpart.desktop
index 92aa23044..9238c4cff 100644
--- a/chalk/chalkpart.desktop
+++ b/chalk/chalkpart.desktop
@@ -39,11 +39,11 @@ Name[uz]=KOffice rasm bilan ishlash komponenti
Name[uz@cyrillic]=KOffice расм билан ишлаш компоненти
Name[zh_CN]=KOffice 绘图和图像编辑器组件
Name[zh_TW]=KOffice 繪圖與影像編輯元件
-X-KDE-Library=libchalkpart
+X-TDE-Library=libchalkpart
MimeType=application/x-chalk
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/x-chalk
+X-TDE-NativeMimeType=application/x-chalk
GenericName=Image Object
GenericName[bg]=Графично изображение
GenericName[br]=Tra skeudenn
diff --git a/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop b/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop
index 661662b03..dcbfe062f 100644
--- a/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop
+++ b/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop
@@ -81,5 +81,5 @@ Comment[zh_CN]=16 位整数每通道 CYMK 图像的色彩模型
Comment[zh_TW]=每色頻為 16-bit 的 CMYK 圖片色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalk_cmyk_u16_plugin
+X-TDE-Library=chalk_cmyk_u16_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop b/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop
index d01baeb3c..c5f433fcf 100644
--- a/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop
+++ b/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop
@@ -94,6 +94,6 @@ Comment[zh_CN]=八位/通道 CMYK 图像的色彩模型
Comment[zh_TW]=8-bit/色頻的 CMYK 圖片色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalkcmykplugin
+X-TDE-Library=chalkcmykplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/cmyk_u8/templates/.directory b/chalk/colorspaces/cmyk_u8/templates/.directory
index f69b12ea1..680f55722 100644
--- a/chalk/colorspaces/cmyk_u8/templates/.directory
+++ b/chalk/colorspaces/cmyk_u8/templates/.directory
@@ -2,4 +2,4 @@
Name=CMYK
Name[fr]=CMJN
Name[hi]=सीएमवायके
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop b/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop
index 893557c5a..754aebd3d 100644
--- a/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop
+++ b/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop
@@ -80,4 +80,4 @@ Comment[zh_TW]=每色頻為 16-bit 的灰階圖片色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
X-Chalk-Version=2
-X-KDE-Library=chalk_gray_u16_plugin
+X-TDE-Library=chalk_gray_u16_plugin
diff --git a/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop b/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop
index 58a6d992f..633b95aec 100644
--- a/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop
+++ b/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop
@@ -93,5 +93,5 @@ Comment[zh_CN]=8 位灰度图像的色彩模型
Comment[zh_TW]=8-bit 灰階圖片的色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalkgrayplugin
+X-TDE-Library=chalkgrayplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/gray_u8/templates/.directory b/chalk/colorspaces/gray_u8/templates/.directory
index e408f23fc..c8b9f2e4b 100644
--- a/chalk/colorspaces/gray_u8/templates/.directory
+++ b/chalk/colorspaces/gray_u8/templates/.directory
@@ -45,4 +45,4 @@ Name[uz]=Oq-qora
Name[uz@cyrillic]=Оқ-қора
Name[zh_CN]=灰度
Name[zh_TW]=灰階
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop b/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop
index 9f4dab258..a522653b0 100644
--- a/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop
+++ b/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop
@@ -73,5 +73,5 @@ Comment[uk]=Модель кольорів для конусного просто
Comment[zh_TW]=LMS cone space 顏色模式（Long Middle and Short 波長）
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalk_lms_f32_plugin
+X-TDE-Library=chalk_lms_f32_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop b/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop
index 523903bf3..c8904ed45 100644
--- a/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop
+++ b/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop
@@ -72,5 +72,5 @@ Comment[uk]=Модель кольорів для 16-бітних зображе
Comment[zh_TW]=每色頻 16-bit 半浮點 RGB 圖片的色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalk_rgb_f16half_plugin
+X-TDE-Library=chalk_rgb_f16half_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop b/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop
index 7f238a471..95c28283b 100644
--- a/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop
+++ b/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop
@@ -74,4 +74,4 @@ Comment[zh_TW]=每色頻 32-bit 浮點 RGB 圖片的色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
X-Chalk-Version=2
-X-KDE-Library=chalk_rgb_f32_plugin
+X-TDE-Library=chalk_rgb_f32_plugin
diff --git a/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop b/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop
index 36ff23554..85a860c74 100644
--- a/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop
+++ b/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop
@@ -75,6 +75,6 @@ Comment[uk]=Модель кольорів для зображень RGB 32-бі
Comment[zh_TW]=每色頻 16-bit 整數 RGB 圖片的色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalk_rgb_u16_plugin
+X-TDE-Library=chalk_rgb_u16_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop b/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop
index 1a65c7730..82ca7b8ac 100644
--- a/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop
+++ b/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop
@@ -95,5 +95,5 @@ Comment[zh_CN]=8 位/通道 RGB 图像的色彩模型
Comment[zh_TW]=8-bit/色頻 RGB 圖片的色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalkrgbplugin
+X-TDE-Library=chalkrgbplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/rgb_u8/templates/.directory b/chalk/colorspaces/rgb_u8/templates/.directory
index 4b475643a..cef038863 100644
--- a/chalk/colorspaces/rgb_u8/templates/.directory
+++ b/chalk/colorspaces/rgb_u8/templates/.directory
@@ -3,4 +3,4 @@ Name=RGB
Name[cy]=CGwGl (RGB)
Name[fr]=RVB
Name[hi]=आरजीबी
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/chalk/colorspaces/wet/chalkwetplugin.desktop b/chalk/colorspaces/wet/chalkwetplugin.desktop
index 28a33d9b7..bfa7e12df 100644
--- a/chalk/colorspaces/wet/chalkwetplugin.desktop
+++ b/chalk/colorspaces/wet/chalkwetplugin.desktop
@@ -82,5 +82,5 @@ Comment[zh_CN]=模拟水彩绘画的色彩模型和工具
Comment[zh_TW]=以模擬水色繪製的色彩模型與工具
ServiceTypes=Chalk/ColorSpace,Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkwetplugin
+X-TDE-Library=chalkwetplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop b/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop
index aa087bb91..e81597e4e 100644
--- a/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop
+++ b/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop
@@ -69,5 +69,5 @@ Comment[uk]=Пензель з параметрами вогкості і кле
Comment[zh_TW]=濕 & 黏的筆刷
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalkwsbrushpaintop
+X-TDE-Library=chalkwsbrushpaintop
X-Chalk-Version=2
diff --git a/chalk/colorspaces/wetsticky/chalkwsplugin.desktop b/chalk/colorspaces/wetsticky/chalkwsplugin.desktop
index 12fdc2862..e1f9d1fd0 100644
--- a/chalk/colorspaces/wetsticky/chalkwsplugin.desktop
+++ b/chalk/colorspaces/wetsticky/chalkwsplugin.desktop
@@ -41,6 +41,6 @@ Name[zh_CN]=湿性/粘性画布色彩模型
Name[zh_TW]=濕 & 黏的畫布色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalkwsplugin
+X-TDE-Library=chalkwsplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop b/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop
index eaa0c2a11..0a7ffaec2 100644
--- a/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop
+++ b/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop
@@ -67,5 +67,5 @@ Comment[uk]=Модель кольорів для зображень YCbCr з ц
Comment[zh_TW]=每色頻為 16-bit 的 YCbCr 圖片色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalk_ycbcr_u16_plugin
+X-TDE-Library=chalk_ycbcr_u16_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop b/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop
index 6eafad7b6..ed7e63f38 100644
--- a/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop
+++ b/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop
@@ -67,5 +67,5 @@ Comment[uk]=Модель кольорів для зображень YCbCr з ц
Comment[zh_TW]=每色頻為 16-bit 的 YCbCr 圖片色彩模型
ServiceTypes=Chalk/ColorSpace
Type=Service
-X-KDE-Library=chalk_ycbcr_u8_plugin
+X-TDE-Library=chalk_ycbcr_u8_plugin
X-Chalk-Version=2
diff --git a/chalk/data/chalk_filter.desktop b/chalk/data/chalk_filter.desktop
index c865db10e..0ce387737 100644
--- a/chalk/data/chalk_filter.desktop
+++ b/chalk/data/chalk_filter.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Chalk/Filter
+X-TDE-ServiceType=Chalk/Filter
Comment=Filter plugin for Chalk
Comment[bg]=Приставка за филтриране за Chalk
Comment[ca]=Connector de filtre per a Chalk
diff --git a/chalk/data/chalk_paintop.desktop b/chalk/data/chalk_paintop.desktop
index 1dd6f0bd8..26c31d483 100644
--- a/chalk/data/chalk_paintop.desktop
+++ b/chalk/data/chalk_paintop.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Chalk/Paintop
+X-TDE-ServiceType=Chalk/Paintop
Comment=Paint operation plugin for Chalk
Comment[bg]=Приставка за рисуване за Chalk
Comment[ca]=Connector d'operació de pintura per a Chalk
diff --git a/chalk/data/chalk_plugin.desktop b/chalk/data/chalk_plugin.desktop
index def61cbf4..4e46bbc77 100644
--- a/chalk/data/chalk_plugin.desktop
+++ b/chalk/data/chalk_plugin.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Chalk/ViewPlugin
+X-TDE-ServiceType=Chalk/ViewPlugin
Comment=GUI functionality for Chalk
Comment[bg]=ГПИ функционалност за Chalk
Comment[ca]=Funcionalitat d'interfície d'usuari per a Chalk
diff --git a/chalk/data/chalk_tool.desktop b/chalk/data/chalk_tool.desktop
index 5508cae3a..9643080a4 100644
--- a/chalk/data/chalk_tool.desktop
+++ b/chalk/data/chalk_tool.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Chalk/Tool
+X-TDE-ServiceType=Chalk/Tool
Comment=Tool plugin for Chalk
Comment[bg]=Приставка за инструмент за Chalk
Comment[ca]=Connector d'eines per a Chalk
diff --git a/chalk/data/templates/.directory b/chalk/data/templates/.directory
index 66f4bc3ca..5f43b4959 100644
--- a/chalk/data/templates/.directory
+++ b/chalk/data/templates/.directory
@@ -53,4 +53,4 @@ Name[uz@cyrillic]=Бўш
Name[wa]=Vude
Name[zh_CN]=空
Name[zh_TW]=空白
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/chalk/plugins/filters/blur/chalkblurfilter.desktop b/chalk/plugins/filters/blur/chalkblurfilter.desktop
index 5adb437b5..1c0ae9dc5 100644
--- a/chalk/plugins/filters/blur/chalkblurfilter.desktop
+++ b/chalk/plugins/filters/blur/chalkblurfilter.desktop
@@ -34,5 +34,5 @@ Name[uk]=Фільтри згортки (розширення)
Name[zh_TW]=皺褶過濾器（延伸）
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkblurfilter
+X-TDE-Library=chalkblurfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop b/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop
index 727810df5..820ca679e 100644
--- a/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop
+++ b/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop
@@ -67,5 +67,5 @@ Comment[uk]=Фільтр рельєфу
Comment[zh_TW]=Bumpmap 的過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkbumpmap
+X-TDE-Library=chalkbumpmap
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/cimg/chalkcimg.desktop b/chalk/plugins/filters/cimg/chalkcimg.desktop
index ae7bd2c30..469dbf65e 100644
--- a/chalk/plugins/filters/cimg/chalkcimg.desktop
+++ b/chalk/plugins/filters/cimg/chalkcimg.desktop
@@ -75,5 +75,5 @@ Comment[zh_CN]=CImg 图像修复滤镜
Comment[zh_TW]=CImg 圖片修復過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkcimg
+X-TDE-Library=chalkcimg
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop b/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop
index 78aa2b933..8a9b18f6f 100644
--- a/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop
+++ b/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop
@@ -38,5 +38,5 @@ Name[uz@cyrillic]=Ранг филтерлари (кенгайтма)
Name[zh_TW]=色彩過濾器（延伸）
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkcolorify
+X-TDE-Library=chalkcolorify
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop b/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop
index 26b3adf4d..03aa776ab 100644
--- a/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop
+++ b/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop
@@ -38,5 +38,5 @@ Name[uz@cyrillic]=Ранг филтерлари (кенгайтма)
Name[zh_TW]=色彩過濾器（延伸）
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkextensioncolorsfilters
+X-TDE-Library=chalkextensioncolorsfilters
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop b/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop
index 2c2747f21..9bd661098 100644
--- a/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop
+++ b/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop
@@ -90,5 +90,5 @@ Comment[zh_CN]=颜色滤镜
Comment[zh_TW]=色彩過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkcolorsfilters
+X-TDE-Library=chalkcolorsfilters
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop b/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop
index ee0b98421..c64690693 100644
--- a/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop
+++ b/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop
@@ -71,5 +71,5 @@ Comment[uk]=Фільтри згортки
Comment[zh_TW]=皺褶過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkconvolutionfilters
+X-TDE-Library=chalkconvolutionfilters
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop b/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop
index fd8e7e2b3..02caf8b3d 100644
--- a/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop
+++ b/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop
@@ -81,5 +81,5 @@ Comment[uz@cyrillic]=Кубизм филтери
Comment[zh_TW]=立體過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkcubismfilter
+X-TDE-Library=chalkcubismfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop b/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop
index af04bb1f6..44d746317 100644
--- a/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop
+++ b/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop
@@ -67,5 +67,5 @@ Comment[uk]=Фільтр барельєфу
Comment[zh_TW]=浮雕過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkembossfilter
+X-TDE-Library=chalkembossfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/example/chalkexample.desktop b/chalk/plugins/filters/example/chalkexample.desktop
index e9fc34470..9dd9c92d3 100644
--- a/chalk/plugins/filters/example/chalkexample.desktop
+++ b/chalk/plugins/filters/example/chalkexample.desktop
@@ -77,5 +77,5 @@ Comment[uz@cyrillic]=Расмнинг рангларини тескарисиг
Comment[zh_TW]=倒轉圖片的色彩
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkexample
+X-TDE-Library=chalkexample
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop b/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop
index cc32f72b7..aaae41aad 100644
--- a/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop
+++ b/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop
@@ -65,5 +65,5 @@ Name[uk]=Перенесення кольору
Name[zh_TW]=色彩轉換過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkfastcolortransfer
+X-TDE-Library=chalkfastcolortransfer
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop b/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop
index 0067412c1..a0c4d4bc1 100644
--- a/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop
+++ b/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop
@@ -76,5 +76,5 @@ Comment[uz@cyrillic]=Расмнинг сифатини ошириш
Comment[zh_TW]=增強圖片的品質
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkimageenhancement
+X-TDE-Library=chalkimageenhancement
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop b/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop
index 52bb0057f..f137113bd 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop
+++ b/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop
@@ -65,5 +65,5 @@ Name[uz@cyrillic]=Линзани тўғрилаш филтери
Name[zh_TW]=LensCorrection 過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalklenscorrectionfilter
+X-TDE-Library=chalklenscorrectionfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop b/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop
index 8426b08d6..f7e2d5fca 100644
--- a/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop
+++ b/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop
@@ -69,5 +69,5 @@ Comment[uk]=Рівні
Comment[zh_TW]=等級
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalklevelfilter
+X-TDE-Library=chalklevelfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop b/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop
index 6ff1e2f15..3ce9400dc 100644
--- a/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop
+++ b/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop
@@ -73,5 +73,5 @@ Comment[uk]=Додавання шуму в зображення
Comment[zh_TW]=在圖片中增加雜訊
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalknoisefilter
+X-TDE-Library=chalknoisefilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop b/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop
index ae6682f6f..1bfb41af9 100644
--- a/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop
+++ b/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop
@@ -73,5 +73,5 @@ Comment[uk]=Фільтр олійних фарб
Comment[zh_TW]=油畫過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkoilpaintfilter
+X-TDE-Library=chalkoilpaintfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop b/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop
index a7a2e88f5..b2185882c 100644
--- a/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop
+++ b/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop
@@ -79,5 +79,5 @@ Comment[uz@cyrillic]=Пикселлаштириш филтери
Comment[zh_TW]=像素化過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkpixelizefilter
+X-TDE-Library=chalkpixelizefilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop b/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop
index 13b903495..c7bacfea0 100644
--- a/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop
+++ b/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop
@@ -77,5 +77,5 @@ Comment[uz@cyrillic]=Ёмғир томчилари филтери
Comment[zh_TW]=雨滴過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkraindropsfilter
+X-TDE-Library=chalkraindropsfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop b/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop
index b7bb807ab..c1ba6cb54 100644
--- a/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop
+++ b/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop
@@ -61,5 +61,5 @@ Name[uk]=Випадковий вибір
Name[zh_TW]=隨機挑選過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkrandompickfilter
+X-TDE-Library=chalkrandompickfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop b/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop
index c3b6e1822..1158800e6 100644
--- a/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop
+++ b/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop
@@ -35,5 +35,5 @@ Name[uk]=Фільтр Собеля
Name[zh_TW]=Sobel 過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkroundcornersfilter
+X-TDE-Library=chalkroundcornersfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop b/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop
index ae9bcc2fa..2cdbe754f 100644
--- a/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop
+++ b/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop
@@ -35,5 +35,5 @@ Name[uk]=Фільтр маленьких плиток
Name[zh_TW]=小塊拼貼過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalksmalltilesfilter
+X-TDE-Library=chalksmalltilesfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop b/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop
index 46ecd68f4..427dca8b4 100644
--- a/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop
+++ b/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop
@@ -35,5 +35,5 @@ Name[uk]=Фільтр Собеля
Name[zh_TW]=Sobel 過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalksobelfilter
+X-TDE-Library=chalksobelfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/threadtest/chalkthreadtest.desktop b/chalk/plugins/filters/threadtest/chalkthreadtest.desktop
index 658964a1d..13a62621f 100644
--- a/chalk/plugins/filters/threadtest/chalkthreadtest.desktop
+++ b/chalk/plugins/filters/threadtest/chalkthreadtest.desktop
@@ -34,5 +34,5 @@ Name[uk]=Інвертування
Name[zh_TW]=有 Thread 的反轉過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkthreadtest
+X-TDE-Library=chalkthreadtest
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop b/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop
index cbf7edcfa..0b805f025 100644
--- a/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop
+++ b/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop
@@ -36,5 +36,5 @@ Name[uz@cyrillic]=Расмнинг сифатини ошириш филтерл
Name[zh_TW]=增強過濾器（延伸）
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkunsharpfilter
+X-TDE-Library=chalkunsharpfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop b/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop
index 4a08b628e..3c841b88e 100644
--- a/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop
+++ b/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop
@@ -68,5 +68,5 @@ Name[uz@cyrillic]=Тўлқин филтери
Name[zh_TW]=Wave 過濾器
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkwavefilter
+X-TDE-Library=chalkwavefilter
X-Chalk-Version=2
diff --git a/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop b/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop
index e1c940b2b..a17df417a 100644
--- a/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop
+++ b/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop
@@ -89,5 +89,5 @@ Comment[zh_CN]=默认绘图操作
Comment[zh_TW]=預設繪圖操作
ServiceTypes=Chalk/Paintop
Type=Service
-X-KDE-Library=chalkdefaultpaintops
+X-TDE-Library=chalkdefaultpaintops
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop b/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop
index 6472d6373..f1b34b63d 100644
--- a/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop
+++ b/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop
@@ -52,5 +52,5 @@ Name[zh_CN]=默认工具
Name[zh_TW]=預設工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalkdefaulttools
+X-TDE-Library=chalkdefaulttools
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
index 72a7f217f..f005126bb 100644
--- a/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
+++ b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=选择工具
Name[zh_TW]=選取區工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalkselectiontools
+X-TDE-Library=chalkselectiontools
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
index ef80a5e62..325fbf78e 100644
--- a/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
+++ b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
@@ -43,5 +43,5 @@ Name[zh_CN]=裁剪工具
Name[zh_TW]=剪裁工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolcrop
+X-TDE-Library=chalktoolcrop
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
index 1ab54038a..76ea7b29e 100644
--- a/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
+++ b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
@@ -32,5 +32,5 @@ Name[uk]=Криві
Name[zh_TW]=曲線工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolcurves
+X-TDE-Library=chalktoolcurves
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
index d22b19dfd..991709b9f 100644
--- a/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
+++ b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
@@ -88,5 +88,5 @@ Comment[zh_CN]=过滤器工具和绘图集成
Comment[zh_TW]=濾鏡工具與繪圖操作
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolfilter
+X-TDE-Library=chalktoolfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
index 3bc415e37..9899e2841 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
+++ b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
@@ -31,5 +31,5 @@ Name[uk]=Засіб ґратки перспективи
Name[zh_TW]=透視格工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolperspectivegrid
+X-TDE-Library=chalktoolperspectivegrid
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
index 98914bcf9..9f1a9b9c4 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
+++ b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
@@ -33,5 +33,5 @@ Name[uk]=Засіб перспективи
Name[zh_TW]=透視轉換工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolperspectivetransform
+X-TDE-Library=chalktoolperspectivetransform
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
index 2b981e8f5..2b10ed9dd 100644
--- a/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
+++ b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=多边形工具
Name[zh_TW]=多邊形工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolpolygon
+X-TDE-Library=chalktoolpolygon
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
index 0c9c2be17..b68aa879c 100644
--- a/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
+++ b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
@@ -45,5 +45,5 @@ Name[zh_CN]=折线工具
Name[zh_TW]=任意線工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolpolyline
+X-TDE-Library=chalktoolpolyline
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
index 408d1c5ad..cc83dccc8 100644
--- a/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
+++ b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
@@ -39,5 +39,5 @@ Name[zh_CN]=选择相似颜色工具
Name[zh_TW]=選取近似色彩工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolselectsimilar
+X-TDE-Library=chalktoolselectsimilar
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_star/chalktoolstar.desktop b/chalk/plugins/tools/tool_star/chalktoolstar.desktop
index 546c0d970..f2b68b7a8 100644
--- a/chalk/plugins/tools/tool_star/chalktoolstar.desktop
+++ b/chalk/plugins/tools/tool_star/chalktoolstar.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=星形工具
Name[zh_TW]=星形工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktoolstar
+X-TDE-Library=chalktoolstar
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_transform/chalktooltransform.desktop b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
index 4ea3db98e..48fe8042d 100644
--- a/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
+++ b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
@@ -42,5 +42,5 @@ Name[zh_CN]=变形工具
Name[zh_TW]=變形工具
ServiceTypes=Chalk/Tool
Type=Service
-X-KDE-Library=chalktooltransform
+X-TDE-Library=chalktooltransform
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop b/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop
index dde9b9365..20ace8294 100644
--- a/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop
+++ b/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop
@@ -36,5 +36,5 @@ Name[uk]=Діапазон кольорів
Name[zh_TW]=色彩範圍
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkcolorrange
+X-TDE-Library=chalkcolorrange
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop b/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop
index 0993dcc77..ee89d0be2 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop
+++ b/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop
@@ -36,5 +36,5 @@ Name[uk]=Перетворення простору кольорів
Name[zh_TW]=色彩空間轉換
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkcolorspaceconversion
+X-TDE-Library=chalkcolorspaceconversion
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop b/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop
index a48a477e0..959dfe342 100644
--- a/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop
+++ b/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop
@@ -35,5 +35,5 @@ Name[uz@cyrillic]=Соя тушириш
Name[zh_CN]=阴影
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkdropshadow
+X-TDE-Library=chalkdropshadow
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop b/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop
index ed1bb5c96..603086ed1 100644
--- a/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop
+++ b/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop
@@ -41,5 +41,5 @@ Name[zh_CN]=滤镜库
Name[zh_TW]=濾鏡畫廊
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkfiltersgallery
+X-TDE-Library=chalkfiltersgallery
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop b/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop
index b91e42b6f..378754aa5 100644
--- a/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop
+++ b/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop
@@ -39,5 +39,5 @@ Name[zh_CN]=直方图插件
Name[zh_TW]=直方圖外掛程式
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkhistogram
+X-TDE-Library=chalkhistogram
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop b/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop
index aba9ded89..ff60e0e62 100644
--- a/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop
+++ b/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop
@@ -36,5 +36,5 @@ Name[uz@cyrillic]=Гистограмма панели
Name[zh_TW]=直方圖停駐點
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkhistogramdocker
+X-TDE-Library=chalkhistogramdocker
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop b/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop
index 270393ce8..939fcf349 100644
--- a/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop
+++ b/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop
@@ -69,5 +69,5 @@ Comment[uz@cyrillic]=Chalk учун буйруқлар тарихи панели
Comment[zh_TW]=Chalk 的指令紀錄停駐點
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkhistorydocker
+X-TDE-Library=chalkhistorydocker
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop b/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop
index 8505b94e4..980e3fded 100644
--- a/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop
+++ b/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop
@@ -35,5 +35,5 @@ Name[uk]=Втулок зміни розміру та масштабування
Name[zh_TW]=圖片大小與縮放外掛程式
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkimagesize
+X-TDE-Library=chalkimagesize
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop b/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop
index aa4a9d58b..3aa4f21ae 100644
--- a/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop
+++ b/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop
@@ -36,5 +36,5 @@ Name[uk]=Зміна виділення
Name[zh_TW]=變更選取
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkmodifyselection
+X-TDE-Library=chalkmodifyselection
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop b/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop
index 74aee7ed0..a034ada14 100644
--- a/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop
+++ b/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop
@@ -37,5 +37,5 @@ Name[uz@cyrillic]=Унумдорилкни текшириш
Name[zh_TW]=效能測試
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkperftest
+X-TDE-Library=chalkperftest
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop b/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop
index e855492e5..6d0ce1ed5 100644
--- a/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop
+++ b/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop
@@ -36,5 +36,5 @@ Name[uz@cyrillic]=Расмни буриш плагини
Name[zh_TW]=旋轉圖片外掛程式
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkrotateimage
+X-TDE-Library=chalkrotateimage
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop b/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop
index 7b9b0d4bb..09441e832 100644
--- a/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop
+++ b/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop
@@ -43,5 +43,5 @@ Name[zh_CN]=抓图
Name[zh_TW]=螢幕快照
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkscreenshot
+X-TDE-Library=chalkscreenshot
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
index 511e76a05..eba3ea370 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
@@ -77,5 +77,5 @@ Comment[zh_CN]=允许执行脚本
Comment[zh_TW]=允許執行命令稿
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkscripting
+X-TDE-Library=chalkscripting
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
index 049c6a405..654e809cf 100644
--- a/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
+++ b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
@@ -22,5 +22,5 @@ Name[uk]=Виділення непрозорих ділянок
Name[zh_TW]=選擇不透明
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkselectopaque
+X-TDE-Library=chalkselectopaque
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop b/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop
index efb596b82..39bf9f109 100644
--- a/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop
+++ b/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop
@@ -38,5 +38,5 @@ Name[zh_CN]=独立通道插件
Name[zh_TW]=分離色頻外掛程式
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkseparatechannels
+X-TDE-Library=chalkseparatechannels
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop b/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop
index 6f3ac5ae8..2f5677a0a 100644
--- a/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop
+++ b/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop
@@ -33,5 +33,5 @@ Name[uk]=Втулок перекошення зображення
Name[zh_TW]=修剪圖片外掛程式
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkshearimage
+X-TDE-Library=chalkshearimage
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop b/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop
index 8d8a7f7b3..0cb18a744 100644
--- a/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop
+++ b/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop
@@ -31,5 +31,5 @@ Name[uk]=Підложка
Name[zh_TW]=基底
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalksubstrate
+X-TDE-Library=chalksubstrate
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/variations/chalkvariations.desktop b/chalk/plugins/viewplugins/variations/chalkvariations.desktop
index 32b873d19..75cb0a40a 100644
--- a/chalk/plugins/viewplugins/variations/chalkvariations.desktop
+++ b/chalk/plugins/viewplugins/variations/chalkvariations.desktop
@@ -36,5 +36,5 @@ Name[uz@cyrillic]=Вариация плагини
Name[zh_TW]=變動外掛程式
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-KDE-Library=chalkvariations
+X-TDE-Library=chalkvariations
X-Chalk-Version=2
diff --git a/cmake b/cmake
index e47cc63e6..d2f658ca4 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc
+Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280
diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook
index 014f098da..c63258b55 100644
--- a/doc/chalk/developers-plugins.docbook
+++ b/doc/chalk/developers-plugins.docbook
@@ -242,8 +242,8 @@ Icon=
Name=User-visible Name
ServiceTypes=Chalk/Filter
Type=Service
-X-KDE-Library=chalkLIBRARYNAME
-X-KDE-Version=2
+X-TDE-Library=chalkLIBRARYNAME
+X-TDE-Version=2
Possible ServiceTypes are:
@@ -401,7 +401,7 @@ user creates: splitting a view means loading all view plugins again.
Plugin versioning
-&chalk; 1.5 loads plugins with X-KDE-Version=2 set in the
+&chalk; 1.5 loads plugins with X-TDE-Version=2 set in the
.desktop file. &chalk; 1.6 plugins will
probably be binary incompatible with 1.5 plugins and will need the version
number 3. &chalk; 2.0 plugins will need the version number 3. Yes, this is not
@@ -1414,10 +1414,10 @@ Import:
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/x-xcf-gimp
-X-KDE-Weight=1
-X-KDE-Library=libchalkXXXimport
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/x-xcf-gimp
+X-TDE-Weight=1
+X-TDE-Library=libchalkXXXimport
ServiceTypes=KOfficeFilter
@@ -1426,12 +1426,12 @@ Export:
-X-KDE-Export=image/x-xcf-gimp
-X-KDE-Import=application/x-chalk
+X-TDE-Export=image/x-xcf-gimp
+X-TDE-Import=application/x-chalk
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Weight=1
-X-KDE-Library=libchalkXXXexport
+X-TDE-Weight=1
+X-TDE-Library=libchalkXXXexport
diff --git a/doc/koffice.desktop b/doc/koffice.desktop
index fcc5f617b..fef24ab37 100644
--- a/doc/koffice.desktop
+++ b/doc/koffice.desktop
@@ -5,4 +5,4 @@ Name[sv]=Koffice
Name[tr]=Koffice
NoDisplay=true
DocPath=koffice/index.html
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
diff --git a/example/example.desktop b/example/example.desktop
index e8c401563..302a5b981 100644
--- a/example/example.desktop
+++ b/example/example.desktop
@@ -59,4 +59,4 @@ Exec=example
MimeType=application/x-example
Type=Application
Icon=example
-X-KDE-NativeMimeType=application/x-example
+X-TDE-NativeMimeType=application/x-example
diff --git a/example/examplepart.desktop b/example/examplepart.desktop
index a96fa13e1..6a7058718 100644
--- a/example/examplepart.desktop
+++ b/example/examplepart.desktop
@@ -51,9 +51,9 @@ Name[uk]=Приклад компонента KOffice
Name[wa]=Componint di mostraedje di KOffice
Name[zh_CN]=KOffice 组件范例
Name[zh_TW]=KOffice 範例元件
-X-KDE-Library=libexamplepart
+X-TDE-Library=libexamplepart
MimeType=application/x-example
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/x-example
+X-TDE-NativeMimeType=application/x-example
Icon=example
diff --git a/example/x-vnd.kde.example.desktop b/example/x-vnd.kde.example.desktop
index fedd83132..a115980be 100644
--- a/example/x-vnd.kde.example.desktop
+++ b/example/x-vnd.kde.example.desktop
@@ -3,7 +3,7 @@ MimeType=application/x-vnd.kde.example
#Comment=...
Type=MimeType
Patterns=*.xmpl;
-X-KDE-AutoEmbed=false
-[Property::X-KDE-NativeExtension]
+X-TDE-AutoEmbed=false
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.xmpl
diff --git a/filters/chalk/gmagick/chalk_magick.desktop b/filters/chalk/gmagick/chalk_magick.desktop
index 171834ef6..7521d0866 100644
--- a/filters/chalk/gmagick/chalk_magick.desktop
+++ b/filters/chalk/gmagick/chalk_magick.desktop
@@ -53,5 +53,5 @@ MimeType=image/x-xcf-gimp;image/gif;image/cgm;image/x-bmp;image/x-ico;image/x-pc
Type=Application
Icon=chalk
Categories=
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
diff --git a/filters/chalk/gmagick/chalk_magick_export.desktop b/filters/chalk/gmagick/chalk_magick_export.desktop
index 5021233a9..a850207e9 100644
--- a/filters/chalk/gmagick/chalk_magick_export.desktop
+++ b/filters/chalk/gmagick/chalk_magick_export.desktop
@@ -47,9 +47,9 @@ Name[uz]=Chalk Magick eksport filteri
Name[uz@cyrillic]=Chalk Magick экспорт филтери
Name[zh_CN]=Chalk Magick 导出过滤器
Name[zh_TW]=Chalk Magick 匯出過濾程式
-X-KDE-Export=image/gif,image/cgm,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xpm,image/x-rgb,image/x-eps
+X-TDE-Export=image/gif,image/cgm,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xpm,image/x-rgb,image/x-eps
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Import=application/x-chalk
-X-KDE-Weight=1
-X-KDE-Library=libchalkgmagickexport
+X-TDE-Import=application/x-chalk
+X-TDE-Weight=1
+X-TDE-Library=libchalkgmagickexport
diff --git a/filters/chalk/gmagick/chalk_magick_import.desktop b/filters/chalk/gmagick/chalk_magick_import.desktop
index c487f0c4a..af5f62b59 100644
--- a/filters/chalk/gmagick/chalk_magick_import.desktop
+++ b/filters/chalk/gmagick/chalk_magick_import.desktop
@@ -54,8 +54,8 @@ Name[uz]=Chalk Magick import filteri
Name[uz@cyrillic]=Chalk Magick импорт филтери
Name[zh_CN]=Chalk Magick 导入过滤器
Name[zh_TW]=Chalk Magick 匯入過濾程式
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/x-xcf-gimp,image/gif,image/cgm,image/x-bmp,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xcf,image/x-xpm,image/x-vnd.adobe.photoshop,image/x-rgb,image/x-eps
-X-KDE-Weight=1
-X-KDE-Library=libchalkgmagickimport
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/x-xcf-gimp,image/gif,image/cgm,image/x-bmp,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xcf,image/x-xpm,image/x-vnd.adobe.photoshop,image/x-rgb,image/x-eps
+X-TDE-Weight=1
+X-TDE-Library=libchalkgmagickimport
ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/jpeg/chalk_jpeg.desktop b/filters/chalk/jpeg/chalk_jpeg.desktop
index 13239199a..925d6bbc7 100644
--- a/filters/chalk/jpeg/chalk_jpeg.desktop
+++ b/filters/chalk/jpeg/chalk_jpeg.desktop
@@ -53,6 +53,6 @@ StartupNotify=true
Terminal=false
Type=Application
X-DCOP-ServiceType=multi
-X-KDE-StartupNotify=true
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+X-TDE-StartupNotify=true
+X-TDE-SubstituteUID=false
+X-TDE-Username=
diff --git a/filters/chalk/jpeg/chalk_jpeg_export.desktop b/filters/chalk/jpeg/chalk_jpeg_export.desktop
index 17d776dd3..c0a390275 100644
--- a/filters/chalk/jpeg/chalk_jpeg_export.desktop
+++ b/filters/chalk/jpeg/chalk_jpeg_export.desktop
@@ -46,7 +46,7 @@ Name[zh_CN]=Chalk PNG 导出过滤器
Name[zh_TW]=Chalk PNG 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=image/jpeg
-X-KDE-Import=application/x-chalk
-X-KDE-Library=libchalkjpegexport
-X-KDE-Weight=1
+X-TDE-Export=image/jpeg
+X-TDE-Import=application/x-chalk
+X-TDE-Library=libchalkjpegexport
+X-TDE-Weight=1
diff --git a/filters/chalk/jpeg/chalk_jpeg_import.desktop b/filters/chalk/jpeg/chalk_jpeg_import.desktop
index 736c2c7b3..e1b6e22a4 100644
--- a/filters/chalk/jpeg/chalk_jpeg_import.desktop
+++ b/filters/chalk/jpeg/chalk_jpeg_import.desktop
@@ -46,7 +46,7 @@ Name[zh_CN]=Chalk PNG 导入过滤器
Name[zh_TW]=Chalk PNG 匯入過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/jpeg
-X-KDE-Library=libchalkjpegimport
-X-KDE-Weight=1
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/jpeg
+X-TDE-Library=libchalkjpegimport
+X-TDE-Weight=1
diff --git a/filters/chalk/magick/chalk_magick.desktop b/filters/chalk/magick/chalk_magick.desktop
index 621ad1581..ef637ab1c 100644
--- a/filters/chalk/magick/chalk_magick.desktop
+++ b/filters/chalk/magick/chalk_magick.desktop
@@ -52,7 +52,7 @@ GenericName[zh_TW]=繪圖與影像處理程式
MimeType=image/x-xcf-gimp;image/gif;image/cgm;image/x-bmp;image/x-ico;image/x-pcx;image/x-portable-pixmap;image/x-targa;image/x-xbm;image/x-xcf;image/x-xpm;image/x-vnd.adobe.photoshop;image/x-rgb
Type=Application
Icon=chalk
-Categories=Qt;KDE;Office;Graphics;
-X-KDE-StartupNotify=true
+Categories=Qt;TDE;Office;Graphics;
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
NoDisplay=true
diff --git a/filters/chalk/magick/chalk_magick_export.desktop b/filters/chalk/magick/chalk_magick_export.desktop
index 9bbdedc83..0159c1296 100644
--- a/filters/chalk/magick/chalk_magick_export.desktop
+++ b/filters/chalk/magick/chalk_magick_export.desktop
@@ -47,9 +47,9 @@ Name[uz]=Chalk Magick eksport filteri
Name[uz@cyrillic]=Chalk Magick экспорт филтери
Name[zh_CN]=Chalk Magick 导出过滤器
Name[zh_TW]=Chalk Magick 匯出過濾程式
-X-KDE-Export=image/gif,image/cgm,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xpm,image/x-rgb,image/x-eps
+X-TDE-Export=image/gif,image/cgm,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xpm,image/x-rgb,image/x-eps
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Import=application/x-chalk
-X-KDE-Weight=1
-X-KDE-Library=libchalkmagickexport
+X-TDE-Import=application/x-chalk
+X-TDE-Weight=1
+X-TDE-Library=libchalkmagickexport
diff --git a/filters/chalk/magick/chalk_magick_import.desktop b/filters/chalk/magick/chalk_magick_import.desktop
index 0d32448ff..1195e5ec5 100644
--- a/filters/chalk/magick/chalk_magick_import.desktop
+++ b/filters/chalk/magick/chalk_magick_import.desktop
@@ -54,8 +54,8 @@ Name[uz]=Chalk Magick import filteri
Name[uz@cyrillic]=Chalk Magick импорт филтери
Name[zh_CN]=Chalk Magick 导入过滤器
Name[zh_TW]=Chalk Magick 匯入過濾程式
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/x-xcf-gimp,image/gif,image/cgm,image/x-bmp,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xcf,image/x-xpm,image/x-vnd.adobe.photoshop,image/x-rgb,image/x-eps
-X-KDE-Weight=1
-X-KDE-Library=libchalkmagickimport
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/x-xcf-gimp,image/gif,image/cgm,image/x-bmp,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xcf,image/x-xpm,image/x-vnd.adobe.photoshop,image/x-rgb,image/x-eps
+X-TDE-Weight=1
+X-TDE-Library=libchalkmagickimport
ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/openexr/chalk_openexr.desktop b/filters/chalk/openexr/chalk_openexr.desktop
index 26f81ccdc..5cbd7ef44 100644
--- a/filters/chalk/openexr/chalk_openexr.desktop
+++ b/filters/chalk/openexr/chalk_openexr.desktop
@@ -53,5 +53,5 @@ MimeType=image/x-exr
Type=Application
Icon=chalk
Categories=
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
diff --git a/filters/chalk/openexr/chalk_openexr_export.desktop b/filters/chalk/openexr/chalk_openexr_export.desktop
index 92b685181..b0fa521d7 100644
--- a/filters/chalk/openexr/chalk_openexr_export.desktop
+++ b/filters/chalk/openexr/chalk_openexr_export.desktop
@@ -44,9 +44,9 @@ Name[uz]=Chalk OpenEXR eksport filteri
Name[uz@cyrillic]=Chalk OpenEXR экспорт филтери
Name[zh_CN]=Chalk OpenEXR 导出过滤器
Name[zh_TW]=Chalk OpenEXR 匯出過濾程式
-X-KDE-Export=image/x-exr
+X-TDE-Export=image/x-exr
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Import=application/x-chalk
-X-KDE-Weight=1
-X-KDE-Library=libchalk_openexr_export
+X-TDE-Import=application/x-chalk
+X-TDE-Weight=1
+X-TDE-Library=libchalk_openexr_export
diff --git a/filters/chalk/openexr/chalk_openexr_import.desktop b/filters/chalk/openexr/chalk_openexr_import.desktop
index 60f6bc54c..0ab53e902 100644
--- a/filters/chalk/openexr/chalk_openexr_import.desktop
+++ b/filters/chalk/openexr/chalk_openexr_import.desktop
@@ -45,8 +45,8 @@ Name[uz]=Chalk OpenEXR import filteri
Name[uz@cyrillic]=Chalk OpenEXR импорт филтери
Name[zh_CN]=Chalk OpenEXR 导入过滤器
Name[zh_TW]=Chalk OpenEXR 匯入過濾程式
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/x-exr
-X-KDE-Weight=1
-X-KDE-Library=libchalk_openexr_import
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/x-exr
+X-TDE-Weight=1
+X-TDE-Library=libchalk_openexr_import
ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/pdf/chalk_pdf.desktop b/filters/chalk/pdf/chalk_pdf.desktop
index b518da84c..254e3dc2f 100644
--- a/filters/chalk/pdf/chalk_pdf.desktop
+++ b/filters/chalk/pdf/chalk_pdf.desktop
@@ -58,6 +58,6 @@ Terminal=false
TerminalOptions=
Type=Application
X-DCOP-ServiceType=multi
-X-KDE-StartupNotify=true
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+X-TDE-StartupNotify=true
+X-TDE-SubstituteUID=false
+X-TDE-Username=
diff --git a/filters/chalk/pdf/chalk_pdf_import.desktop b/filters/chalk/pdf/chalk_pdf_import.desktop
index cfc6e1eac..3238eb467 100644
--- a/filters/chalk/pdf/chalk_pdf_import.desktop
+++ b/filters/chalk/pdf/chalk_pdf_import.desktop
@@ -44,8 +44,8 @@ Comment=
Comment[uz]=PDF-fayllarni Chalk bilan oʻqish vositasi
Comment[uz@cyrillic]=PDF-файлларни Chalk билан ўқиш воситаси
ServiceTypes=KOfficeFilter
-X-KDE-Available=
-X-KDE-Export=application/x-chalk
-X-KDE-Import=application/pdf
-X-KDE-Weight=1
-X-KDE-Library=libchalkpdfimport
+X-TDE-Available=
+X-TDE-Export=application/x-chalk
+X-TDE-Import=application/pdf
+X-TDE-Weight=1
+X-TDE-Library=libchalkpdfimport
diff --git a/filters/chalk/png/chalk_png.desktop b/filters/chalk/png/chalk_png.desktop
index 3605566b4..5d043578b 100644
--- a/filters/chalk/png/chalk_png.desktop
+++ b/filters/chalk/png/chalk_png.desktop
@@ -53,5 +53,5 @@ MimeType=image/png
Type=Application
Icon=chalk
Categories=
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
diff --git a/filters/chalk/png/chalk_png_export.desktop b/filters/chalk/png/chalk_png_export.desktop
index e4f6711b9..b283316d0 100644
--- a/filters/chalk/png/chalk_png_export.desktop
+++ b/filters/chalk/png/chalk_png_export.desktop
@@ -43,9 +43,9 @@ Name[uz]=Chalk PNG eksport filteri
Name[uz@cyrillic]=Chalk PNG экспорт филтери
Name[zh_CN]=Chalk PNG 导出过滤器
Name[zh_TW]=Chalk PNG 匯出過濾程式
-X-KDE-Export=image/png
+X-TDE-Export=image/png
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Import=application/x-chalk
-X-KDE-Weight=1
-X-KDE-Library=libchalkpngexport
+X-TDE-Import=application/x-chalk
+X-TDE-Weight=1
+X-TDE-Library=libchalkpngexport
diff --git a/filters/chalk/png/chalk_png_import.desktop b/filters/chalk/png/chalk_png_import.desktop
index 94b1c90fe..087ba2649 100644
--- a/filters/chalk/png/chalk_png_import.desktop
+++ b/filters/chalk/png/chalk_png_import.desktop
@@ -44,8 +44,8 @@ Name[uz]=Chalk PNG import filteri
Name[uz@cyrillic]=Chalk PNG импорт филтери
Name[zh_CN]=Chalk PNG 导入过滤器
Name[zh_TW]=Chalk PNG 匯入過濾程式
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/png
-X-KDE-Weight=1
-X-KDE-Library=libchalkpngimport
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/png
+X-TDE-Weight=1
+X-TDE-Library=libchalkpngimport
ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/raw/chalk_raw.desktop b/filters/chalk/raw/chalk_raw.desktop
index d03d0b6ff..b0fd96a27 100644
--- a/filters/chalk/raw/chalk_raw.desktop
+++ b/filters/chalk/raw/chalk_raw.desktop
@@ -53,5 +53,5 @@ MimeType=image/x-raw
Type=Application
Icon=chalk
Categories=
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
diff --git a/filters/chalk/raw/chalk_raw_import.desktop b/filters/chalk/raw/chalk_raw_import.desktop
index 9c3a039d9..167561a04 100644
--- a/filters/chalk/raw/chalk_raw_import.desktop
+++ b/filters/chalk/raw/chalk_raw_import.desktop
@@ -44,8 +44,8 @@ Name[uz]=Chalk RAW import filteri
Name[uz@cyrillic]=Chalk RAW импорт филтери
Name[zh_CN]=Chalk RAW 导入过滤器
Name[zh_TW]=Chalk RAW 匯入過濾程式
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/x-raw
-X-KDE-Weight=1
-X-KDE-Library=libchalk_raw_import
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/x-raw
+X-TDE-Weight=1
+X-TDE-Library=libchalk_raw_import
ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/tiff/chalk_tiff.desktop b/filters/chalk/tiff/chalk_tiff.desktop
index 55cd1033d..71ef14c74 100644
--- a/filters/chalk/tiff/chalk_tiff.desktop
+++ b/filters/chalk/tiff/chalk_tiff.desktop
@@ -58,6 +58,6 @@ Terminal=false
TerminalOptions=
Type=Application
X-DCOP-ServiceType=multi
-X-KDE-StartupNotify=true
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+X-TDE-StartupNotify=true
+X-TDE-SubstituteUID=false
+X-TDE-Username=
diff --git a/filters/chalk/tiff/chalk_tiff_export.desktop b/filters/chalk/tiff/chalk_tiff_export.desktop
index 3f1748275..d4227ecdc 100644
--- a/filters/chalk/tiff/chalk_tiff_export.desktop
+++ b/filters/chalk/tiff/chalk_tiff_export.desktop
@@ -46,7 +46,7 @@ Name[zh_CN]=Chalk TIFF 导出过滤器
Name[zh_TW]=Chalk TIFF 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=image/tiff
-X-KDE-Import=application/x-chalk
-X-KDE-Library=libchalktiffexport
-X-KDE-Weight=1
+X-TDE-Export=image/tiff
+X-TDE-Import=application/x-chalk
+X-TDE-Library=libchalktiffexport
+X-TDE-Weight=1
diff --git a/filters/chalk/tiff/chalk_tiff_import.desktop b/filters/chalk/tiff/chalk_tiff_import.desktop
index 593b0eee2..a2b834469 100644
--- a/filters/chalk/tiff/chalk_tiff_import.desktop
+++ b/filters/chalk/tiff/chalk_tiff_import.desktop
@@ -46,7 +46,7 @@ Name[zh_CN]=Chalk TIFF 导入过滤器
Name[zh_TW]=Chalk TIFF 匯入過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/tiff
-X-KDE-Library=libchalktiffimport
-X-KDE-Weight=1
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/tiff
+X-TDE-Library=libchalktiffimport
+X-TDE-Weight=1
diff --git a/filters/chalk/xcf/chalk_xcf_export.desktop b/filters/chalk/xcf/chalk_xcf_export.desktop
index b88afaed5..6b525d663 100644
--- a/filters/chalk/xcf/chalk_xcf_export.desktop
+++ b/filters/chalk/xcf/chalk_xcf_export.desktop
@@ -44,9 +44,9 @@ Name[uz]=Chalk XCF eksport filteri
Name[uz@cyrillic]=Chalk XCF экспорт филтери
Name[zh_CN]=Chalk XCF 导出过滤器
Name[zh_TW]=Chalk XCF 匯出過濾程式
-X-KDE-Export=image/x-xcf-gimp
+X-TDE-Export=image/x-xcf-gimp
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Import=application/x-chalk
-X-KDE-Weight=1
-X-KDE-Library=libchalkxcfexport
+X-TDE-Import=application/x-chalk
+X-TDE-Weight=1
+X-TDE-Library=libchalkxcfexport
diff --git a/filters/chalk/xcf/chalk_xcf_import.desktop b/filters/chalk/xcf/chalk_xcf_import.desktop
index b2e68d131..7e4af3e50 100644
--- a/filters/chalk/xcf/chalk_xcf_import.desktop
+++ b/filters/chalk/xcf/chalk_xcf_import.desktop
@@ -45,8 +45,8 @@ Name[uz]=Chalk XCF import filteri
Name[uz@cyrillic]=Chalk XCF импорт филтери
Name[zh_CN]=Chalk XCF 导入过滤器
Name[zh_TW]=Chalk XCF 匯入過濾程式
-X-KDE-Export=application/x-chalk
-X-KDE-Import=image/x-xcf-gimp
-X-KDE-Weight=1
-X-KDE-Library=libchalkxcfimport
+X-TDE-Export=application/x-chalk
+X-TDE-Import=image/x-xcf-gimp
+X-TDE-Weight=1
+X-TDE-Library=libchalkxcfimport
ServiceTypes=KOfficeFilter
diff --git a/filters/generic_wrapper/README b/filters/generic_wrapper/README
index 102f7a30f..16a8a9078 100644
--- a/filters/generic_wrapper/README
+++ b/filters/generic_wrapper/README
@@ -14,8 +14,8 @@ Name=My cool filter in Perl
Type=Service
ServiceTypes=KOfficeGenericFilter
Exec=my_filter.pl
-X-KDE-Wrapper-Export=
-X-KDE-Wrapper-Import=
+X-TDE-Wrapper-Export=
+X-TDE-Wrapper-Import=
- write a suitable Makefile.am
@@ -31,7 +31,7 @@ filters/kpresenter/magicpoint.
The only shortcoming at the moment is that you have to add these MIME
types to filters/generic_wrapper/generic_filter.desktop file (in the
-fields X-KDE-Export resp. X-KDE-Import).
+fields X-TDE-Export resp. X-TDE-Import).
---
That's it, have fun :-)
diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc
index 16b617a6b..c36715e20 100644
--- a/filters/generic_wrapper/generic_filter.cc
+++ b/filters/generic_wrapper/generic_filter.cc
@@ -55,10 +55,10 @@ KoFilter::ConversionStatus GenericFilter::convert( const TQCString &from, const
for (it=offers.begin(); it!=offers.end(); ++it)
{
kdDebug() << "Got a filter script, exec: " << (*it)->exec() <<
- ", imports: " << (*it)->property("X-KDE-Wrapper-Import").toString() <<
- ", exports: " << (*it)->property("X-KDE-Wrapper-Export").toString() << endl;
- if ((*it)->property("X-KDE-Wrapper-Import").toCString()==from
- && (*it)->property("X-KDE-Wrapper-Export").toCString()==to)
+ ", imports: " << (*it)->property("X-TDE-Wrapper-Import").toString() <<
+ ", exports: " << (*it)->property("X-TDE-Wrapper-Export").toString() << endl;
+ if ((*it)->property("X-TDE-Wrapper-Import").toCString()==from
+ && (*it)->property("X-TDE-Wrapper-Export").toCString()==to)
{
m_exec=(*it)->exec();
m_from=from;
diff --git a/filters/generic_wrapper/generic_filter.desktop b/filters/generic_wrapper/generic_filter.desktop
index 1a7c6961d..a22b6fa93 100644
--- a/filters/generic_wrapper/generic_filter.desktop
+++ b/filters/generic_wrapper/generic_filter.desktop
@@ -50,9 +50,9 @@ Name[uz]=KOffice umumiy filteri
Name[uz@cyrillic]=KOffice умумий филтери
Name[zh_CN]=KOffice 通用过滤器
Name[zh_TW]=通用 KOffice 過濾器
-X-KDE-Export=application/x-kpresenter
-X-KDE-Import=application/x-magicpoint
-X-KDE-Weight=1
+X-TDE-Export=application/x-kpresenter
+X-TDE-Import=application/x-magicpoint
+X-TDE-Weight=1
Type=Service
ServiceTypes=KOfficeFilter
-X-KDE-Library=libgenerickofilter
+X-TDE-Library=libgenerickofilter
diff --git a/filters/karbon/ai/karbon_ai_import.desktop b/filters/karbon/ai/karbon_ai_import.desktop
index bec797b29..15ec0f105 100644
--- a/filters/karbon/ai/karbon_ai_import.desktop
+++ b/filters/karbon/ai/karbon_ai_import.desktop
@@ -60,8 +60,8 @@ Name[uz@cyrillic]=Karbon14 Illustrator импорт филтери
Name[xh]=Isihluzi Sokurhweba Somzobi we Karbon 14
Name[zh_CN]=Karbon14 Illustrator 导入过滤器
Name[zh_TW]=Karbon14 Illustrator 匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=application/illustrator
-X-KDE-Weight=1
-X-KDE-Library=libkarbonaiimport
+X-TDE-Export=application/x-karbon
+X-TDE-Import=application/illustrator
+X-TDE-Weight=1
+X-TDE-Library=libkarbonaiimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop b/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop
index e7d512946..6542478e1 100644
--- a/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop
+++ b/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop
@@ -62,8 +62,8 @@ Name[ven]=Filithra yau dzhenisa ya Kontour Applixgraphics
Name[xh]=Isihluzi sokurhweba se Kontour Applixgraphics
Name[zh_CN]=Kontour Applixgraphics 图形导入过滤器
Name[zh_TW]=Kontour Applix 圖形匯入過濾程式
-X-KDE-Export=application/x-kontour
-X-KDE-Import=application/x-applixgraphics
-X-KDE-Weight=1
-X-KDE-Library=libapplixgraphicimport
+X-TDE-Export=application/x-kontour
+X-TDE-Import=application/x-applixgraphics
+X-TDE-Weight=1
+X-TDE-Library=libapplixgraphicimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/eps/karbon_eps_export.desktop b/filters/karbon/eps/karbon_eps_export.desktop
index 4ee7d6f3e..97ffa1a54 100644
--- a/filters/karbon/eps/karbon_eps_export.desktop
+++ b/filters/karbon/eps/karbon_eps_export.desktop
@@ -59,8 +59,8 @@ Name[uz@cyrillic]=Karbon14 EPS экспорт филтери
Name[xh]=Isihluzi Sokurhweba ngaphandle se Karbon14 EPS
Name[zh_CN]=Karbon14 EPS 导出过滤器
Name[zh_TW]=Karbon14 EPS 匯出過濾程式
-X-KDE-Export=image/x-eps
-X-KDE-Import=application/x-karbon
-X-KDE-Weight=1
-X-KDE-Library=libkarbonepsexport
+X-TDE-Export=image/x-eps
+X-TDE-Import=application/x-karbon
+X-TDE-Weight=1
+X-TDE-Library=libkarbonepsexport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/eps/karbon_eps_import.desktop b/filters/karbon/eps/karbon_eps_import.desktop
index 83cae5293..033b3338e 100644
--- a/filters/karbon/eps/karbon_eps_import.desktop
+++ b/filters/karbon/eps/karbon_eps_import.desktop
@@ -59,8 +59,8 @@ Name[uz@cyrillic]=Karbon14 EPS импорт филтери
Name[xh]=Isihluzi Sokurhweba se Karbon14 EPS
Name[zh_CN]=Karbon14 EPS 导入过滤器
Name[zh_TW]=Karbon14 EPS 匯出過濾程式
-X-KDE-Export=application/illustrator
-X-KDE-Import=image/x-eps
-X-KDE-Weight=1
-X-KDE-Library=libkarbonepsimport
+X-TDE-Export=application/illustrator
+X-TDE-Import=image/x-eps
+X-TDE-Weight=1
+X-TDE-Library=libkarbonepsimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/eps/karbon_ps_import.desktop b/filters/karbon/eps/karbon_ps_import.desktop
index 1599fcca6..a7420e18d 100644
--- a/filters/karbon/eps/karbon_ps_import.desktop
+++ b/filters/karbon/eps/karbon_ps_import.desktop
@@ -59,8 +59,8 @@ Name[uz@cyrillic]=Karbon14 EPS импорт филтери
Name[xh]=Isihluzi Sokurhweba se Karbon14 EPS
Name[zh_CN]=Karbon14 EPS 导入过滤器
Name[zh_TW]=Karbon14 EPS 匯出過濾程式
-X-KDE-Export=application/illustrator
-X-KDE-Import=application/postscript
-X-KDE-Weight=1
-X-KDE-Library=libkarbonepsimport
+X-TDE-Export=application/illustrator
+X-TDE-Import=application/postscript
+X-TDE-Weight=1
+X-TDE-Library=libkarbonepsimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/kontour/karbon_kontour_import.desktop b/filters/karbon/kontour/karbon_kontour_import.desktop
index e18b68b85..3c773e8a8 100644
--- a/filters/karbon/kontour/karbon_kontour_import.desktop
+++ b/filters/karbon/kontour/karbon_kontour_import.desktop
@@ -59,8 +59,8 @@ Name[uz@cyrillic]=Karbon Kontour импорт филтери
Name[xh]=Isihluzi Sokurhweba se Karbon Kontour
Name[zh_CN]=Karbon Kontour 导入过滤器
Name[zh_TW]=Kontour Kontour 匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=application/x-kontour
-X-KDE-Weight=1
-X-KDE-Library=libkarbonkontourimport
+X-TDE-Export=application/x-karbon
+X-TDE-Import=application/x-kontour
+X-TDE-Weight=1
+X-TDE-Library=libkarbonkontourimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/msod/karbon_msod_import.desktop b/filters/karbon/msod/karbon_msod_import.desktop
index f75aac71d..01cb4bcf2 100644
--- a/filters/karbon/msod/karbon_msod_import.desktop
+++ b/filters/karbon/msod/karbon_msod_import.desktop
@@ -54,8 +54,8 @@ Name[uz]=MS Office chizmalarini Karbon'ga import qilish filteri
Name[uz@cyrillic]=MS Office чизмаларини Karbon'га импорт қилиш филтери
Name[zh_CN]=Karbon 的 MS Office Drawing 导入过滤器
Name[zh_TW]=Karbon 的 MS Office 繪圖匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=image/x-msod
-X-KDE-Weight=1
-X-KDE-Library=libkarbonmsodimport
+X-TDE-Export=application/x-karbon
+X-TDE-Import=image/x-msod
+X-TDE-Weight=1
+X-TDE-Library=libkarbonmsodimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/oodraw/karbon_oodraw_import.desktop b/filters/karbon/oodraw/karbon_oodraw_import.desktop
index b634ba6ab..24fab032a 100644
--- a/filters/karbon/oodraw/karbon_oodraw_import.desktop
+++ b/filters/karbon/oodraw/karbon_oodraw_import.desktop
@@ -53,11 +53,11 @@ Name[uz]=Karbon14 uchun OpenOffice.org Draw import filteri
Name[uz@cyrillic]=Karbon14 учун OpenOffice.org Draw импорт филтери
Name[zh_CN]=Karbon14 的 OpenOffice.org Draw 导入过滤器
Name[zh_TW]=Karbon14 的 OpenOffice.org Draw 匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=application/vnd.sun.xml.draw
-X-KDE-Weight=1
-X-KDE-Library=liboodrawimport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/x-karbon
+X-TDE-Import=application/vnd.sun.xml.draw
+X-TDE-Weight=1
+X-TDE-Library=liboodrawimport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/png/karbon_png_export.desktop b/filters/karbon/png/karbon_png_export.desktop
index e3715bc0b..748e66d9f 100644
--- a/filters/karbon/png/karbon_png_export.desktop
+++ b/filters/karbon/png/karbon_png_export.desktop
@@ -61,7 +61,7 @@ Name[zh_CN]=Karbon14 PNG 导出过滤器
Name[zh_TW]=Karbon14 EPS 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=image/png
-X-KDE-Import=application/x-karbon
-X-KDE-Library=libkarbonpngexport
-X-KDE-Weight=1
+X-TDE-Export=image/png
+X-TDE-Import=application/x-karbon
+X-TDE-Library=libkarbonpngexport
+X-TDE-Weight=1
diff --git a/filters/karbon/svg/karbon_svg_export.desktop b/filters/karbon/svg/karbon_svg_export.desktop
index e09904782..46fd6ccd9 100644
--- a/filters/karbon/svg/karbon_svg_export.desktop
+++ b/filters/karbon/svg/karbon_svg_export.desktop
@@ -61,7 +61,7 @@ Name[zh_CN]=Karbon14 SVG 导出过滤器
Name[zh_TW]=Karbon14 SVG 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=image/svg+xml
-X-KDE-Import=application/x-karbon
-X-KDE-Library=libkarbonsvgexport
-X-KDE-Weight=1
+X-TDE-Export=image/svg+xml
+X-TDE-Import=application/x-karbon
+X-TDE-Library=libkarbonsvgexport
+X-TDE-Weight=1
diff --git a/filters/karbon/svg/karbon_svg_import.desktop b/filters/karbon/svg/karbon_svg_import.desktop
index a1f7eaeac..f60e9dada 100644
--- a/filters/karbon/svg/karbon_svg_import.desktop
+++ b/filters/karbon/svg/karbon_svg_import.desktop
@@ -57,8 +57,8 @@ Name[uz@cyrillic]=Karbon SVG импорт филтери
Name[xh]=Isihluzi Sokurhweba se Karbon SVG
Name[zh_CN]=Karbon SVG 导入过滤器
Name[zh_TW]=Karbon SVG 匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=image/svg+xml
-X-KDE-Weight=1
-X-KDE-Library=libkarbonsvgimport
+X-TDE-Export=application/x-karbon
+X-TDE-Import=image/svg+xml
+X-TDE-Weight=1
+X-TDE-Library=libkarbonsvgimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/wmf/karbon_wmf_export.desktop b/filters/karbon/wmf/karbon_wmf_export.desktop
index d859d2742..e89671008 100644
--- a/filters/karbon/wmf/karbon_wmf_export.desktop
+++ b/filters/karbon/wmf/karbon_wmf_export.desktop
@@ -56,8 +56,8 @@ Name[zh_CN]=Karbon14 WMF 导出过滤器
Name[zh_TW]=Karbon14 WMF 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=image/x-wmf
-X-KDE-Import=application/x-karbon
-X-KDE-Weight=1
-X-KDE-Library=libwmfexport
+X-TDE-Export=image/x-wmf
+X-TDE-Import=application/x-karbon
+X-TDE-Weight=1
+X-TDE-Library=libwmfexport
diff --git a/filters/karbon/wmf/karbon_wmf_import.desktop b/filters/karbon/wmf/karbon_wmf_import.desktop
index d1711ff99..d04f06960 100644
--- a/filters/karbon/wmf/karbon_wmf_import.desktop
+++ b/filters/karbon/wmf/karbon_wmf_import.desktop
@@ -59,8 +59,8 @@ Name[uz@cyrillic]=Karbon WMF импорт филтери
Name[xh]=Isihluzi Sokurhweba se Karbon WMF
Name[zh_CN]=Karbon WMF 导入过滤器
Name[zh_TW]=Karbon WMF 匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=image/x-wmf
-X-KDE-Weight=1
-X-KDE-Library=libwmfimport
+X-TDE-Export=application/x-karbon
+X-TDE-Import=image/x-wmf
+X-TDE-Weight=1
+X-TDE-Library=libwmfimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/xaml/karbon_xaml_export.desktop b/filters/karbon/xaml/karbon_xaml_export.desktop
index 082c29e83..5d3204495 100644
--- a/filters/karbon/xaml/karbon_xaml_export.desktop
+++ b/filters/karbon/xaml/karbon_xaml_export.desktop
@@ -48,7 +48,7 @@ Name[zh_CN]=Karbon14 WVG 导出过滤器
Name[zh_TW]=Karbon14 WVG 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=image/wvg+xml
-X-KDE-Import=application/x-karbon
-X-KDE-Library=libkarbonxamlexport
-X-KDE-Weight=1
+X-TDE-Export=image/wvg+xml
+X-TDE-Import=application/x-karbon
+X-TDE-Library=libkarbonxamlexport
+X-TDE-Weight=1
diff --git a/filters/karbon/xaml/karbon_xaml_import.desktop b/filters/karbon/xaml/karbon_xaml_import.desktop
index 6acd1f1fc..b301c9f98 100644
--- a/filters/karbon/xaml/karbon_xaml_import.desktop
+++ b/filters/karbon/xaml/karbon_xaml_import.desktop
@@ -46,8 +46,8 @@ Name[uz]=Karbon XAML import filteri
Name[uz@cyrillic]=Karbon XAML импорт филтери
Name[zh_CN]=Karbon XAML 导入过滤器
Name[zh_TW]=Karbon XAML 匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=image/wvg+xml
-X-KDE-Weight=1
-X-KDE-Library=libkarbonxamlimport
+X-TDE-Export=application/x-karbon
+X-TDE-Import=image/wvg+xml
+X-TDE-Weight=1
+X-TDE-Library=libkarbonxamlimport
ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/xcf/karbon_xcf_export.desktop b/filters/karbon/xcf/karbon_xcf_export.desktop
index 78772e8ef..4cc02cad0 100644
--- a/filters/karbon/xcf/karbon_xcf_export.desktop
+++ b/filters/karbon/xcf/karbon_xcf_export.desktop
@@ -59,7 +59,7 @@ Name[zh_CN]=Karbon14 Gimp 导出过滤器
Name[zh_TW]=Karbon14 Gimp 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=image/x-xcf-gimp
-X-KDE-Import=application/x-karbon
-X-KDE-Library=libkarbonxcfexport
-X-KDE-Weight=1
+X-TDE-Export=image/x-xcf-gimp
+X-TDE-Import=application/x-karbon
+X-TDE-Library=libkarbonxcfexport
+X-TDE-Weight=1
diff --git a/filters/karbon/xfig/karbon_xfig_import.desktop b/filters/karbon/xfig/karbon_xfig_import.desktop
index 227854c12..b28521a54 100644
--- a/filters/karbon/xfig/karbon_xfig_import.desktop
+++ b/filters/karbon/xfig/karbon_xfig_import.desktop
@@ -54,8 +54,8 @@ Name[uz]=Karbon XFig import filteri
Name[uz@cyrillic]=Karbon XFig импорт филтери
Name[zh_CN]=Karbon XFig 导入过滤器
Name[zh_TW]=Karbon XFig 匯入過濾程式
-X-KDE-Export=application/x-karbon
-X-KDE-Import=image/x-xfig
-X-KDE-Weight=1
-X-KDE-Library=libxfigimport
+X-TDE-Export=application/x-karbon
+X-TDE-Import=image/x-xfig
+X-TDE-Weight=1
+X-TDE-Library=libxfigimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/bmp/kchart_bmp_export.desktop b/filters/kchart/bmp/kchart_bmp_export.desktop
index 008fd0005..4befa4b37 100644
--- a/filters/kchart/bmp/kchart_bmp_export.desktop
+++ b/filters/kchart/bmp/kchart_bmp_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KChart BMP eksport filteri
Name[uz@cyrillic]=KChart BMP экспорт филтери
Name[zh_CN]=KChart BMP 导出过滤器
Name[zh_TW]=KChart BMP 匯出過濾程式
-X-KDE-Import=application/x-kchart
-X-KDE-Export=image/x-bmp
-X-KDE-Weight=1
-X-KDE-Library=libkchartbmpexport
+X-TDE-Import=application/x-kchart
+X-TDE-Export=image/x-bmp
+X-TDE-Weight=1
+X-TDE-Library=libkchartbmpexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/jpeg/kchart_jpeg_export.desktop b/filters/kchart/jpeg/kchart_jpeg_export.desktop
index a9561a5d4..01133a786 100644
--- a/filters/kchart/jpeg/kchart_jpeg_export.desktop
+++ b/filters/kchart/jpeg/kchart_jpeg_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KChart JPEG eksport filteri
Name[uz@cyrillic]=KChart JPEG экспорт филтери
Name[zh_CN]=KChart JPEG 导出过滤器
Name[zh_TW]=KChart JPEG 匯出過濾程式
-X-KDE-Import=application/x-kchart
-X-KDE-Export=image/jpeg
-X-KDE-Weight=1
-X-KDE-Library=libkchartjpegexport
+X-TDE-Import=application/x-kchart
+X-TDE-Export=image/jpeg
+X-TDE-Weight=1
+X-TDE-Library=libkchartjpegexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/mng/kchart_mng_export.desktop b/filters/kchart/mng/kchart_mng_export.desktop
index c21755741..3c6272b42 100644
--- a/filters/kchart/mng/kchart_mng_export.desktop
+++ b/filters/kchart/mng/kchart_mng_export.desktop
@@ -40,8 +40,8 @@ Name[uz@cyrillic]=KChart MNG экспорт филтери
Name[zh_CN]=KChart MNG 导出过滤器
Name[zh_TW]=KChart MNG 匯出過濾程式
Type=Service
-X-KDE-Import=application/x-kchart
-X-KDE-Export=video/x-mng
-X-KDE-Weight=1
-X-KDE-Library=libkchartmngexport
+X-TDE-Import=application/x-kchart
+X-TDE-Export=video/x-mng
+X-TDE-Weight=1
+X-TDE-Library=libkchartmngexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/png/kchart_png_export.desktop b/filters/kchart/png/kchart_png_export.desktop
index 8f33bdf36..a9f222386 100644
--- a/filters/kchart/png/kchart_png_export.desktop
+++ b/filters/kchart/png/kchart_png_export.desktop
@@ -50,8 +50,8 @@ Name[uz]=KChart PNG eksport filteri
Name[uz@cyrillic]=KChart PNG экспорт филтери
Name[zh_CN]=KChart PNG 导出过滤器
Name[zh_TW]=KChart PNG 匯出過濾程式
-X-KDE-Import=application/x-kchart
-X-KDE-Export=image/png
-X-KDE-Weight=1
-X-KDE-Library=libkchartpngexport
+X-TDE-Import=application/x-kchart
+X-TDE-Export=image/png
+X-TDE-Weight=1
+X-TDE-Library=libkchartpngexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/svg/kchart_svg_export.desktop b/filters/kchart/svg/kchart_svg_export.desktop
index 1ad5a1289..6e3d16723 100644
--- a/filters/kchart/svg/kchart_svg_export.desktop
+++ b/filters/kchart/svg/kchart_svg_export.desktop
@@ -50,8 +50,8 @@ Name[uz]=KChart SVG eksport filteri
Name[uz@cyrillic]=KChart SVG экспорт филтери
Name[zh_CN]=KChart SVG 导出过滤器
Name[zh_TW]=KChart SVG 匯出過濾程式
-X-KDE-Import=application/x-kchart
-X-KDE-Export=image/svg+xml
-X-KDE-Weight=1
-X-KDE-Library=libkchartsvgexport
+X-TDE-Import=application/x-kchart
+X-TDE-Export=image/svg+xml
+X-TDE-Weight=1
+X-TDE-Library=libkchartsvgexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/xbm/kchart_xbm_export.desktop b/filters/kchart/xbm/kchart_xbm_export.desktop
index 01347476f..67224ff28 100644
--- a/filters/kchart/xbm/kchart_xbm_export.desktop
+++ b/filters/kchart/xbm/kchart_xbm_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KChart XBM eksport filteri
Name[uz@cyrillic]=KChart XBM экспорт филтери
Name[zh_CN]=KChart XBM 导出过滤器
Name[zh_TW]=KChart XBM 匯出過濾程式
-X-KDE-Import=application/x-kchart
-X-KDE-Export=image/x-xbm
-X-KDE-Weight=1
-X-KDE-Library=libkchartxbmexport
+X-TDE-Import=application/x-kchart
+X-TDE-Export=image/x-xbm
+X-TDE-Weight=1
+X-TDE-Library=libkchartxbmexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/xpm/kchart_xpm_export.desktop b/filters/kchart/xpm/kchart_xpm_export.desktop
index 58ea9a6f6..dfd356de4 100644
--- a/filters/kchart/xpm/kchart_xpm_export.desktop
+++ b/filters/kchart/xpm/kchart_xpm_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KChart XPM eksport filteri
Name[uz@cyrillic]=KChart XPM экспорт филтери
Name[zh_CN]=KChart XPM 导出过滤器
Name[zh_TW]=KChart XPM 匯出過濾程式
-X-KDE-Import=application/x-kchart
-X-KDE-Export=image/x-xpm
-X-KDE-Weight=1
-X-KDE-Library=libkchartxpmexport
+X-TDE-Import=application/x-kchart
+X-TDE-Export=image/x-xpm
+X-TDE-Weight=1
+X-TDE-Library=libkchartxpmexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kformula/latex/kformula_latex_export.desktop b/filters/kformula/latex/kformula_latex_export.desktop
index d14b62a29..e6cac924c 100644
--- a/filters/kformula/latex/kformula_latex_export.desktop
+++ b/filters/kformula/latex/kformula_latex_export.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=text/x-tex
+X-TDE-Export=text/x-tex
ExportDescription=LATEX
Icon=
-X-KDE-Import=application/x-kformula
-X-KDE-Weight=1
+X-TDE-Import=application/x-kformula
+X-TDE-Weight=1
ImportDescription=KFormula
Name=KFormula LaTeX Export Filter
Name[af]=Kformula Latex Voer uit Filter
@@ -66,4 +66,4 @@ Name[zh_CN]=KFormula LaTeX 导出过滤器
Name[zh_TW]=KFormula LaTeX 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkfolatexexport
+X-TDE-Library=libkfolatexexport
diff --git a/filters/kformula/mathml/kformula_mathml_export.desktop b/filters/kformula/mathml/kformula_mathml_export.desktop
index 1fdc1bf3a..a77668556 100644
--- a/filters/kformula/mathml/kformula_mathml_export.desktop
+++ b/filters/kformula/mathml/kformula_mathml_export.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=application/mathml+xml
+X-TDE-Export=application/mathml+xml
ExportDescription=MathML
Icon=
-X-KDE-Import=application/x-kformula
-X-KDE-Weight=1
+X-TDE-Import=application/x-kformula
+X-TDE-Weight=1
ImportDescription=KFormula
Name=KFormula MathML Export Filter
Name[ar]=مِرْشَح تصدير MathML لدى KFormula
@@ -61,4 +61,4 @@ Name[zh_CN]=KFormula MathML 导出过滤器
Name[zh_TW]=KFormula MathML 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkfomathmlexport
+X-TDE-Library=libkfomathmlexport
diff --git a/filters/kformula/mathml/kformula_mathml_import.desktop b/filters/kformula/mathml/kformula_mathml_import.desktop
index a6828cb48..030ec160d 100644
--- a/filters/kformula/mathml/kformula_mathml_import.desktop
+++ b/filters/kformula/mathml/kformula_mathml_import.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=application/x-kformula
+X-TDE-Export=application/x-kformula
ExportDescription=KFormula
Icon=
-X-KDE-Import=application/mathml+xml
-X-KDE-Weight=1
+X-TDE-Import=application/mathml+xml
+X-TDE-Weight=1
ImportDescription=MathM
Name=KFormula MathML Import Filter
Name[ar]=مِرْشَح استيراد MathML لدى KFormula
@@ -61,4 +61,4 @@ Name[zh_CN]=KFormula MathML 导入过滤器
Name[zh_TW]=KFormula MathML 匯入過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkfomathmlimport
+X-TDE-Library=libkfomathmlimport
diff --git a/filters/kformula/png/kformula_png_export.desktop b/filters/kformula/png/kformula_png_export.desktop
index 0ea0856f0..673e57911 100644
--- a/filters/kformula/png/kformula_png_export.desktop
+++ b/filters/kformula/png/kformula_png_export.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=image/png
+X-TDE-Export=image/png
ExportDescription=PNG
Icon=
-X-KDE-Import=application/x-kformula
-X-KDE-Weight=1
+X-TDE-Import=application/x-kformula
+X-TDE-Weight=1
ImportDescription=KFormula
Name=KFormula PNG Export Filter
Name[af]=Kformula Png Voer uit Filter
@@ -67,4 +67,4 @@ Name[zh_CN]=KFormula PNG 导出过滤器
Name[zh_TW]=KFormula PNG 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkfopngexport
+X-TDE-Library=libkfopngexport
diff --git a/filters/kformula/svg/kformula_svg_export.desktop b/filters/kformula/svg/kformula_svg_export.desktop
index 5b7a8d120..c90be58a4 100644
--- a/filters/kformula/svg/kformula_svg_export.desktop
+++ b/filters/kformula/svg/kformula_svg_export.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=image/svg+xml
+X-TDE-Export=image/svg+xml
ExportDescription=SVG
Icon=
-X-KDE-Import=application/x-kformula
-X-KDE-Weight=1
+X-TDE-Import=application/x-kformula
+X-TDE-Weight=1
ImportDescription=KFormula
Name=KFormula SVG Export Filter
Name[ar]=مرشح تصدير SVG لدى KFormula
@@ -53,4 +53,4 @@ Name[zh_CN]=KFormula SVG 导出过滤器
Name[zh_TW]=KFormula SVG 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkfosvgexport
+X-TDE-Library=libkfosvgexport
diff --git a/filters/kivio/imageexport/kivio_image_export.desktop b/filters/kivio/imageexport/kivio_image_export.desktop
index ad5a52d92..b9d442b60 100644
--- a/filters/kivio/imageexport/kivio_image_export.desktop
+++ b/filters/kivio/imageexport/kivio_image_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=Kivio rasm eksport filteri
Name[uz@cyrillic]=Kivio расм экспорт филтери
Name[zh_CN]=Kivio 图像导出过滤器
Name[zh_TW]=Kivio 圖片匯出過濾程式
-X-KDE-Import=application/x-kivio
-X-KDE-Export=image/png,image/jpeg,image/x-bmp
-X-KDE-Weight=1
-X-KDE-Library=libkivioimageexport
+X-TDE-Import=application/x-kivio
+X-TDE-Export=image/png,image/jpeg,image/x-bmp
+X-TDE-Weight=1
+X-TDE-Library=libkivioimageexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/bmp/kpresenter_bmp_export.desktop b/filters/kpresenter/bmp/kpresenter_bmp_export.desktop
index f47dd4eb0..2bd00c34f 100644
--- a/filters/kpresenter/bmp/kpresenter_bmp_export.desktop
+++ b/filters/kpresenter/bmp/kpresenter_bmp_export.desktop
@@ -46,8 +46,8 @@ Name[uz]=KPresenter BMP eksport filteri
Name[uz@cyrillic]=KPresenter BMP экспорт филтери
Name[zh_CN]=KPresenter BMP 导出过滤器
Name[zh_TW]=KPresenter BMP 匯出過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Export=image/x-bmp
-X-KDE-Weight=1
-X-KDE-Library=libkpresenterbmpexport
+X-TDE-Import=application/x-kpresenter
+X-TDE-Export=image/x-bmp
+X-TDE-Weight=1
+X-TDE-Library=libkpresenterbmpexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop b/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop
index 868eac792..5308508b7 100644
--- a/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop
+++ b/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KPresenter JPEG eksport filteri
Name[uz@cyrillic]=KPresenter JPEG экспорт филтери
Name[zh_CN]=KPresenter JPEG 导出过滤器
Name[zh_TW]=KPresenter JPEG 匯出過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Export=image/jpeg
-X-KDE-Weight=1
-X-KDE-Library=libkpresenterjpegexport
+X-TDE-Import=application/x-kpresenter
+X-TDE-Export=image/jpeg
+X-TDE-Weight=1
+X-TDE-Library=libkpresenterjpegexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/kword/kprkword.desktop b/filters/kpresenter/kword/kprkword.desktop
index bf4ff228f..4a61b927c 100644
--- a/filters/kpresenter/kword/kprkword.desktop
+++ b/filters/kpresenter/kword/kprkword.desktop
@@ -50,8 +50,8 @@ Name[uz]=KPresenter uchun KWord filteri
Name[uz@cyrillic]=KPresenter учун KWord филтери
Name[zh_CN]=KPresenter KWord 过滤器
Name[zh_TW]=KPresenter KWord 過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Weight=1
-X-KDE-Export=application/x-kword
-X-KDE-Library=libkprkword
+X-TDE-Import=application/x-kpresenter
+X-TDE-Weight=1
+X-TDE-Export=application/x-kword
+X-TDE-Library=libkprkword
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop b/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop
index 947c6ba75..8e94e783b 100644
--- a/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop
+++ b/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop
@@ -57,6 +57,6 @@ Name[wa]=Passete Magicpoint d' intrêye po KPresenter
Name[xh]=Isihluzi Sokurhweba ngaphakathi kwi Magicpoint ye KPresenter
Name[zh_CN]=KPresenter 的 Magicpoint 导入过滤器
Name[zh_TW]=KPresenter 的 Magicpoint Import 匯入過濾程式
-X-KDE-Wrapper-Export=application/x-kpresenter
-X-KDE-Wrapper-Import=application/x-magicpoint
+X-TDE-Wrapper-Export=application/x-kpresenter
+X-TDE-Wrapper-Import=application/x-magicpoint
ServiceTypes=KOfficeGenericFilter
diff --git a/filters/kpresenter/mng/kpresenter_mng_export.desktop b/filters/kpresenter/mng/kpresenter_mng_export.desktop
index ebb619b67..5cf21d9a8 100644
--- a/filters/kpresenter/mng/kpresenter_mng_export.desktop
+++ b/filters/kpresenter/mng/kpresenter_mng_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KPresenter MNG eksport filteri
Name[uz@cyrillic]=KPresenter MNG экспорт филтери
Name[zh_CN]=KPresenter MNG 导出过滤器
Name[zh_TW]=KPresenter MNG 匯出過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Export=video/x-mng
-X-KDE-Weight=1
-X-KDE-Library=libkpresentermngexport
+X-TDE-Import=application/x-kpresenter
+X-TDE-Export=video/x-mng
+X-TDE-Weight=1
+X-TDE-Library=libkpresentermngexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop b/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop
index d645efbf1..fc5313b81 100644
--- a/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop
+++ b/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop
@@ -53,11 +53,11 @@ Name[uz@cyrillic]=KPresenter учун OpenOffice.org Impress экспорт фи
Name[wa]=Passete OpenOffice.org Impress di rexhowe po KPresenter
Name[zh_CN]=KPresenter 的 OpenOffice.org Impress 导出过滤器
Name[zh_TW]=KPresenter 的 OpenOffice.org Impress 匯出過濾程式
-X-KDE-Export=application/vnd.sun.xml.impress
-X-KDE-Import=application/x-kpresenter
-X-KDE-Weight=1
-X-KDE-Library=libooimpressexport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/vnd.sun.xml.impress
+X-TDE-Import=application/x-kpresenter
+X-TDE-Weight=1
+X-TDE-Library=libooimpressexport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop b/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop
index b5b5a79f3..9e02cd6e7 100644
--- a/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop
+++ b/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop
@@ -54,11 +54,11 @@ Name[uz@cyrillic]=KPresenter учун OpenOffice.org Impress импорт фил
Name[xh]=OpenOffice.org Iphawula Isihluzi Sorhwebo se KPresenter
Name[zh_CN]=KPresenter 的 OpenOffice.org Impress 导入过滤器
Name[zh_TW]=KPresenter 的 OpenOffice.org Impress 匯入過濾程式
-X-KDE-Export=application/x-kpresenter
-X-KDE-Import=application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template
-X-KDE-Weight=1
-X-KDE-Library=libooimpressimport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/x-kpresenter
+X-TDE-Import=application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template
+X-TDE-Weight=1
+X-TDE-Library=libooimpressimport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/png/kpresenter_png_export.desktop b/filters/kpresenter/png/kpresenter_png_export.desktop
index d6ec865f4..f3ebc30ff 100644
--- a/filters/kpresenter/png/kpresenter_png_export.desktop
+++ b/filters/kpresenter/png/kpresenter_png_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KPresenter PNG eksport filteri
Name[uz@cyrillic]=KPresenter PNG экспорт филтери
Name[zh_CN]=KPresenter PNG 导出过滤器
Name[zh_TW]=KPresenter PNG 匯出過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Export=image/png
-X-KDE-Weight=1
-X-KDE-Library=libkpresenterpngexport
+X-TDE-Import=application/x-kpresenter
+X-TDE-Export=image/png
+X-TDE-Weight=1
+X-TDE-Library=libkpresenterpngexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop b/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop
index 99def0089..62e910984 100644
--- a/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop
+++ b/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop
@@ -44,8 +44,8 @@ Name[uz]=KPresenter MS PowerPoint import filteri
Name[uz@cyrillic]=KPresenter MS PowerPoint импорт филтери
Name[zh_CN]=KPresenter 的 Microsoft PowerPoint 导入过滤器
Name[zh_TW]=KPresenter 的 Microsoft PowerPoint 匯入過濾程式
-X-KDE-Export=application/vnd.oasis.opendocument.presentation
-X-KDE-Import=application/mspowerpoint
-X-KDE-Weight=1
-X-KDE-Library=libpowerpointimport
+X-TDE-Export=application/vnd.oasis.opendocument.presentation
+X-TDE-Import=application/mspowerpoint
+X-TDE-Weight=1
+X-TDE-Library=libpowerpointimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/svg/kpresenter_svg_export.desktop b/filters/kpresenter/svg/kpresenter_svg_export.desktop
index be387dc58..7eebd8bda 100644
--- a/filters/kpresenter/svg/kpresenter_svg_export.desktop
+++ b/filters/kpresenter/svg/kpresenter_svg_export.desktop
@@ -45,8 +45,8 @@ Name[uz]=KPresenter SVG eksport filteri
Name[uz@cyrillic]=KPresenter SVG экспорт филтери
Name[zh_CN]=KPresenter SVG 导出过滤器
Name[zh_TW]=KPresenter SVG 匯出過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Export=image/svg+xml
-X-KDE-Weight=1
-X-KDE-Library=libkpresentersvgexport
+X-TDE-Import=application/x-kpresenter
+X-TDE-Export=image/svg+xml
+X-TDE-Weight=1
+X-TDE-Library=libkpresentersvgexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/xbm/kpresenter_xbm_export.desktop b/filters/kpresenter/xbm/kpresenter_xbm_export.desktop
index 890a0b3ac..bc6f7d6ee 100644
--- a/filters/kpresenter/xbm/kpresenter_xbm_export.desktop
+++ b/filters/kpresenter/xbm/kpresenter_xbm_export.desktop
@@ -44,8 +44,8 @@ Name[uz]=KPresenter XBM eksport filteri
Name[uz@cyrillic]=KPresenter XBM экспорт филтери
Name[zh_CN]=KPresenter XBM 导出过滤器
Name[zh_TW]=KPresenter XBM 匯出過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Export=image/x-xbm
-X-KDE-Weight=1
-X-KDE-Library=libkpresenterxbmexport
+X-TDE-Import=application/x-kpresenter
+X-TDE-Export=image/x-xbm
+X-TDE-Weight=1
+X-TDE-Library=libkpresenterxbmexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/xpm/kpresenter_xpm_export.desktop b/filters/kpresenter/xpm/kpresenter_xpm_export.desktop
index 5174e996c..86ebdebc9 100644
--- a/filters/kpresenter/xpm/kpresenter_xpm_export.desktop
+++ b/filters/kpresenter/xpm/kpresenter_xpm_export.desktop
@@ -44,8 +44,8 @@ Name[uz]=KPresenter XPM eksport filteri
Name[uz@cyrillic]=KPresenter XPM экспорт филтери
Name[zh_CN]=KPresenter XPM 导出过滤器
Name[zh_TW]=KPresenter XPM 匯出過濾程式
-X-KDE-Import=application/x-kpresenter
-X-KDE-Export=image/x-xpm
-X-KDE-Weight=1
-X-KDE-Library=libkpresenterxpmexport
+X-TDE-Import=application/x-kpresenter
+X-TDE-Export=image/x-xpm
+X-TDE-Weight=1
+X-TDE-Library=libkpresenterxpmexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/applixspread/kspread_applixspread_import.desktop b/filters/kspread/applixspread/kspread_applixspread_import.desktop
index 5d829d39c..06522906e 100644
--- a/filters/kspread/applixspread/kspread_applixspread_import.desktop
+++ b/filters/kspread/applixspread/kspread_applixspread_import.desktop
@@ -61,8 +61,8 @@ Name[wa]=Passete tåvleu Applix d' intrêye po KSpread
Name[xh]=Isihluzi Sokurhweba se KSpread Applix Spreadsheet
Name[zh_CN]=KSpread Applix 电子表格导入过滤器
Name[zh_TW]=KSpread Applix 電子表單匯入過濾程式
-X-KDE-Export=application/x-kspread
-X-KDE-Import=application/x-applixspread
-X-KDE-Weight=1
-X-KDE-Library=libapplixspreadimport
+X-TDE-Export=application/x-kspread
+X-TDE-Import=application/x-applixspread
+X-TDE-Weight=1
+X-TDE-Library=libapplixspreadimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/csv/kspread_csv_export.desktop b/filters/kspread/csv/kspread_csv_export.desktop
index c41582342..f9cd591fa 100644
--- a/filters/kspread/csv/kspread_csv_export.desktop
+++ b/filters/kspread/csv/kspread_csv_export.desktop
@@ -66,8 +66,8 @@ Name[xh]=CSV Yesihluzi Sokurhweba ngaphandle se KSpread
Name[zh_CN]=KSpread 的 CSV 导出过滤器
Name[zh_TW]=KSpread 的 CSV 匯出過濾程式
Name[zu]=CSV ICSV Export Filter for KSpread
-X-KDE-Export=text/x-csv,text/plain
-X-KDE-Import=application/x-kspread
-X-KDE-Weight=50
-X-KDE-Library=libcsvexport
+X-TDE-Export=text/x-csv,text/plain
+X-TDE-Import=application/x-kspread
+X-TDE-Weight=50
+X-TDE-Library=libcsvexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/csv/kspread_csv_import.desktop b/filters/kspread/csv/kspread_csv_import.desktop
index 0b87e54a1..1be732d4f 100644
--- a/filters/kspread/csv/kspread_csv_import.desktop
+++ b/filters/kspread/csv/kspread_csv_import.desktop
@@ -65,8 +65,8 @@ Name[wa]=Passete CSV d' intrêye po KSpread
Name[xh]=CSV Yesihluzi Sokurhweba se KSpread
Name[zh_CN]=KSpread 的 CSV 导入过滤器
Name[zh_TW]=KSpread 的 CSV 匯入過濾程式
-X-KDE-Export=application/x-kspread
-X-KDE-Import=text/x-csv,text/plain
-X-KDE-Weight=50
-X-KDE-Library=libcsvimport
+X-TDE-Export=application/x-kspread
+X-TDE-Import=text/x-csv,text/plain
+X-TDE-Weight=50
+X-TDE-Library=libcsvimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/dbase/kspread_dbase_import.desktop b/filters/kspread/dbase/kspread_dbase_import.desktop
index 610edd2fa..9583edc3b 100644
--- a/filters/kspread/dbase/kspread_dbase_import.desktop
+++ b/filters/kspread/dbase/kspread_dbase_import.desktop
@@ -58,8 +58,8 @@ Name[wa]=Passete dBASE d' intrêye po KSpread
Name[xh]=Isihluzi Sokurhweba se KSpread dBASE
Name[zh_CN]=KSpread dBASE 导入过滤器
Name[zh_TW]=KSpread dBASE 匯入過濾程式
-X-KDE-Export=application/x-kspread
-X-KDE-Import=application/x-dbase
-X-KDE-Weight=1
-X-KDE-Library=libdbaseimport
+X-TDE-Export=application/x-kspread
+X-TDE-Import=application/x-dbase
+X-TDE-Weight=1
+X-TDE-Library=libdbaseimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/excel/import/kspread_excel_import.desktop b/filters/kspread/excel/import/kspread_excel_import.desktop
index 71682e5d2..f075ec820 100644
--- a/filters/kspread/excel/import/kspread_excel_import.desktop
+++ b/filters/kspread/excel/import/kspread_excel_import.desktop
@@ -54,8 +54,8 @@ Name[uz@cyrillic]=KSpread Microsoft Excel импорт филтери
Name[wa]=Passete MS-Excel d' intrêye po KSpread
Name[zh_CN]=KSpread Microsoft Excel 导入过滤器
Name[zh_TW]=KSpread Microsoft Excel 匯入過濾程式
-X-KDE-Export=application/vnd.oasis.opendocument.spreadsheet
-X-KDE-Import=application/msexcel
-X-KDE-Weight=1
-X-KDE-Library=libexcelimport
+X-TDE-Export=application/vnd.oasis.opendocument.spreadsheet
+X-TDE-Import=application/msexcel
+X-TDE-Weight=1
+X-TDE-Library=libexcelimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/excel/kspread_excel_export.desktop b/filters/kspread/excel/kspread_excel_export.desktop
index 7a4eb20df..6e1c9c061 100644
--- a/filters/kspread/excel/kspread_excel_export.desktop
+++ b/filters/kspread/excel/kspread_excel_export.desktop
@@ -54,8 +54,8 @@ Name[uz]=KSpread uchun Excel eksport filteri
Name[uz@cyrillic]=KSpread учун Excel экспорт филтери
Name[zh_CN]=KSpread 的 Excel 导出过滤器
Name[zh_TW]=KSpread 的 Excel 匯出過濾程式
-#X-KDE-Export=application/msexcel
-#X-KDE-Import=application/x-kspread
-#X-KDE-Weight=1
-#X-KDE-Library=libkspreadexcelexport
+#X-TDE-Export=application/msexcel
+#X-TDE-Import=application/x-kspread
+#X-TDE-Weight=1
+#X-TDE-Library=libkspreadexcelexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/gnumeric/kspread_gnumeric_export.desktop b/filters/kspread/gnumeric/kspread_gnumeric_export.desktop
index ace284e0e..01ea2701a 100644
--- a/filters/kspread/gnumeric/kspread_gnumeric_export.desktop
+++ b/filters/kspread/gnumeric/kspread_gnumeric_export.desktop
@@ -63,11 +63,11 @@ Name[wa]=Passete Gnumeric di rexhowe po KSpread
Name[xh]=GNUmeric Yesihluzi Sorhweba ngaphandle se KSpread
Name[zh_CN]=KSpread 的 GNUmeric 导出过滤器
Name[zh_TW]=KSpread 的 GNUmeric 匯出過濾程式
-X-KDE-Export=application/x-gnumeric
-X-KDE-Import=application/x-kspread
-X-KDE-Weight=1
-X-KDE-Library=libgnumericexport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/x-gnumeric
+X-TDE-Import=application/x-kspread
+X-TDE-Weight=1
+X-TDE-Library=libgnumericexport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/gnumeric/kspread_gnumeric_import.desktop b/filters/kspread/gnumeric/kspread_gnumeric_import.desktop
index 5b7717eeb..51d2a4743 100644
--- a/filters/kspread/gnumeric/kspread_gnumeric_import.desktop
+++ b/filters/kspread/gnumeric/kspread_gnumeric_import.desktop
@@ -64,11 +64,11 @@ Name[wa]=Passete Gnumeric d' intrêye po KSpread
Name[xh]=GNUMERIC Yesihluzi Sorhwebo se KSpread
Name[zh_CN]=KSpread 的 GNUmeric 导入过滤器
Name[zh_TW]=KSpread 的 GNUmeric 匯入過濾程式
-X-KDE-Export=application/x-kspread
-X-KDE-Import=application/x-gnumeric
-X-KDE-Weight=1
-X-KDE-Library=libgnumericimport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/x-kspread
+X-TDE-Import=application/x-gnumeric
+X-TDE-Weight=1
+X-TDE-Library=libgnumericimport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/html/kspread_html_export.desktop b/filters/kspread/html/kspread_html_export.desktop
index 7164cf9a4..41d2692bb 100644
--- a/filters/kspread/html/kspread_html_export.desktop
+++ b/filters/kspread/html/kspread_html_export.desktop
@@ -65,8 +65,8 @@ Name[xh]=HTML Yesihluzi Sokurhweba ngaphandle se KSpread
Name[zh_CN]=KSpread 的 HTML 导出过滤器
Name[zh_TW]=KSpread 的 HTML 匯出過濾程式
Name[zu]=HTML IceboExport Filter for KSpread
-X-KDE-Export=text/html
-X-KDE-Import=application/x-kspread
-X-KDE-Weight=50
-X-KDE-Library=libkspreadhtmlexport
+X-TDE-Export=text/html
+X-TDE-Import=application/x-kspread
+X-TDE-Weight=50
+X-TDE-Library=libkspreadhtmlexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/kexi/kspread_kexi_import.desktop b/filters/kspread/kexi/kspread_kexi_import.desktop
index a18cc29da..c95407403 100644
--- a/filters/kspread/kexi/kspread_kexi_import.desktop
+++ b/filters/kspread/kexi/kspread_kexi_import.desktop
@@ -39,7 +39,7 @@ Name[uz@cyrillic]=KSpread учун Kexi импорт филтери
Name[zh_TW]=Kexi 的 KSpread 匯入過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=application/x-kspread
-X-KDE-Import=application/x-kexiproject-sqlite3
-X-KDE-Library=libkspreadkexiimport
-X-KDE-Weight=50
+X-TDE-Export=application/x-kspread
+X-TDE-Import=application/x-kexiproject-sqlite3
+X-TDE-Library=libkspreadkexiimport
+X-TDE-Weight=50
diff --git a/filters/kspread/latex/export/kspread_latex_export.desktop b/filters/kspread/latex/export/kspread_latex_export.desktop
index b29da68ca..fd133da5e 100644
--- a/filters/kspread/latex/export/kspread_latex_export.desktop
+++ b/filters/kspread/latex/export/kspread_latex_export.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=text/x-tex
+X-TDE-Export=text/x-tex
ExportDescription=LATEX
Icon=
-X-KDE-Import=application/x-kspread
-X-KDE-Weight=1
+X-TDE-Import=application/x-kspread
+X-TDE-Weight=1
ImportDescription=KSpread
Name=KSpread LATEX Export Filter
Name[ar]=مِرْشَح تصدير LATEX لدى KSpread
@@ -62,4 +62,4 @@ Name[zh_CN]=KSpread LATEX 导出过滤器
Name[zh_TW]=KSpread LATEX 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkspreadlatexexport
+X-TDE-Library=libkspreadlatexexport
diff --git a/filters/kspread/opencalc/kspread_opencalc_export.desktop b/filters/kspread/opencalc/kspread_opencalc_export.desktop
index d120960b8..c983a078a 100644
--- a/filters/kspread/opencalc/kspread_opencalc_export.desktop
+++ b/filters/kspread/opencalc/kspread_opencalc_export.desktop
@@ -52,8 +52,8 @@ Name[uz]=KSpread uchun OpenOffice.org Calc eksport filteri
Name[uz@cyrillic]=KSpread учун OpenOffice.org Calc экспорт филтери
Name[zh_CN]=KSpread 的 OpenOffice.org Calc 导出过滤器
Name[zh_TW]=KSpread 的 OpenOffice.org Calc 匯出過濾程式
-X-KDE-Export=application/vnd.sun.xml.calc
-X-KDE-Import=application/x-kspread
-X-KDE-Weight=1
-X-KDE-Library=libopencalcexport
+X-TDE-Export=application/vnd.sun.xml.calc
+X-TDE-Import=application/x-kspread
+X-TDE-Weight=1
+X-TDE-Library=libopencalcexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/opencalc/kspread_opencalc_import.desktop b/filters/kspread/opencalc/kspread_opencalc_import.desktop
index c7dde5ef5..4439e39fd 100644
--- a/filters/kspread/opencalc/kspread_opencalc_import.desktop
+++ b/filters/kspread/opencalc/kspread_opencalc_import.desktop
@@ -52,11 +52,11 @@ Name[uz]=KSpread uchun OpenOffice.org Calc import filteri
Name[uz@cyrillic]=KSpread учун OpenOffice.org Calc импорт филтери
Name[zh_CN]=KSpread 的 OpenOffice.org Calc 导入过滤器
Name[zh_TW]=KSpread 的 OpenOffice.org Calc 匯入過濾程式
-X-KDE-Export=application/x-kspread
-X-KDE-Import=application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template
-X-KDE-Weight=1
-X-KDE-Library=libopencalcimport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/x-kspread
+X-TDE-Import=application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template
+X-TDE-Weight=1
+X-TDE-Library=libopencalcimport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/qpro/kspread_qpro_import.desktop b/filters/kspread/qpro/kspread_qpro_import.desktop
index 386a948ef..6484f6515 100644
--- a/filters/kspread/qpro/kspread_qpro_import.desktop
+++ b/filters/kspread/qpro/kspread_qpro_import.desktop
@@ -64,11 +64,11 @@ Name[wa]=Passete Quattro Pro d' intrêye po KSpread
Name[xh]=Quattro Pro Yesihluzi Sokurhweba se KSpread
Name[zh_CN]=KSpread 的 Quattro Pro 导入过滤器
Name[zh_TW]=KSpread 的 Quattro Pro 匯入過濾程式
-X-KDE-Export=application/x-kspread
-X-KDE-Import=application/x-quattropro
-X-KDE-Weight=1
-X-KDE-Library=libqproimport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/x-kspread
+X-TDE-Import=application/x-quattropro
+X-TDE-Weight=1
+X-TDE-Library=libqproimport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/kugar/kugarnop/kugar_kugar_import.desktop b/filters/kugar/kugarnop/kugar_kugar_import.desktop
index 11eb2340f..343d53032 100644
--- a/filters/kugar/kugarnop/kugar_kugar_import.desktop
+++ b/filters/kugar/kugarnop/kugar_kugar_import.desktop
@@ -55,10 +55,10 @@ Name[uz@cyrillic]=Kugar KugarXML импорт филтери
Name[wa]=Passete KugarXML d' intrêye po Kugar
Name[zh_CN]=Kugar KugarXML 导入过滤器
Name[zh_TW]=Kugar KugarXML 匯入過濾程式
-X-KDE-Import=application/x-kugar
-X-KDE-Weight=1
+X-TDE-Import=application/x-kugar
+X-TDE-Weight=1
ImportDescription=Kugar
-X-KDE-Export=application/x-vnd.kde.kugar.mixed
+X-TDE-Export=application/x-vnd.kde.kugar.mixed
ExportDescription=Kugar Mixed
-X-KDE-Library=libkugarnopimport
+X-TDE-Library=libkugarnopimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/abiword/kword_abiword_export.desktop b/filters/kword/abiword/kword_abiword_export.desktop
index 0125bc1d1..6b9755fc3 100644
--- a/filters/kword/abiword/kword_abiword_export.desktop
+++ b/filters/kword/abiword/kword_abiword_export.desktop
@@ -66,8 +66,8 @@ Name[xh]=Isihluzi Sokurhweba ngaphandle se KWord AbiWord
Name[zh_CN]=KWord AbiWord 导出过滤器
Name[zh_TW]=KWord AbiWord 匯出過濾程式
Name[zu]=KWord AbiWord Icebo Export Filter
-X-KDE-Export=application/x-abiword
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=libabiwordexport
+X-TDE-Export=application/x-abiword
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=libabiwordexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/abiword/kword_abiword_import.desktop b/filters/kword/abiword/kword_abiword_import.desktop
index e0b11cfb4..bfd020d99 100644
--- a/filters/kword/abiword/kword_abiword_import.desktop
+++ b/filters/kword/abiword/kword_abiword_import.desktop
@@ -66,8 +66,8 @@ Name[xh]=Isihluzi Sokurhweba se KWord AbiWord
Name[zh_CN]=KWord AbiWord 导入过滤器
Name[zh_TW]=KWord AbiWord 匯入過濾程式
Name[zu]=KWord AbiWord Icebo lokucoca ulwelo olurhwetyiweyo ngaphakathi
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/x-abiword
-X-KDE-Weight=1
-X-KDE-Library=libabiwordimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/x-abiword
+X-TDE-Weight=1
+X-TDE-Library=libabiwordimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/amipro/kword_amipro_export.desktop b/filters/kword/amipro/kword_amipro_export.desktop
index 16baf5863..a7345240a 100644
--- a/filters/kword/amipro/kword_amipro_export.desktop
+++ b/filters/kword/amipro/kword_amipro_export.desktop
@@ -61,8 +61,8 @@ Name[wa]=Passete AmiPro di rexhowe po KWord
Name[xh]=Isihluzi Sokurhweba se KWord AmiPro
Name[zh_CN]=KWord AmiPro 导出过滤器
Name[zh_TW]=KWord AmiPro 匯出過濾程式
-X-KDE-Export=application/x-amipro
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=libamiproexport
+X-TDE-Export=application/x-amipro
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=libamiproexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/amipro/kword_amipro_import.desktop b/filters/kword/amipro/kword_amipro_import.desktop
index 7e2c30af8..2a1a141c5 100644
--- a/filters/kword/amipro/kword_amipro_import.desktop
+++ b/filters/kword/amipro/kword_amipro_import.desktop
@@ -61,8 +61,8 @@ Name[wa]=Passete AmiPro d' intrêye po KWord
Name[xh]=Isihluzi Sokurhweba se KWord AmiPro
Name[zh_CN]=KWord AmiPro 导入过滤器
Name[zh_TW]=KWord AmiPro 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/x-amipro
-X-KDE-Weight=1
-X-KDE-Library=libamiproimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/x-amipro
+X-TDE-Weight=1
+X-TDE-Library=libamiproimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/applixword/kword_applixword_import.desktop b/filters/kword/applixword/kword_applixword_import.desktop
index 794604bec..1a94c9483 100644
--- a/filters/kword/applixword/kword_applixword_import.desktop
+++ b/filters/kword/applixword/kword_applixword_import.desktop
@@ -65,8 +65,8 @@ Name[xh]=Isihluzo Sokurhweba se KWord Applixword
Name[zh_CN]=KWord Applixword 导入过滤器
Name[zh_TW]=KWord Applixword 匯入過濾程式
Name[zu]=KWord Applixword Icebo lokucoca ulwelo olurhwetyiweyo ngaphakathi
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/x-applixword
-X-KDE-Weight=1
-X-KDE-Library=libapplixwordimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/x-applixword
+X-TDE-Weight=1
+X-TDE-Library=libapplixwordimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/ascii/kword_ascii_export.desktop b/filters/kword/ascii/kword_ascii_export.desktop
index af0996b65..75ed1e964 100644
--- a/filters/kword/ascii/kword_ascii_export.desktop
+++ b/filters/kword/ascii/kword_ascii_export.desktop
@@ -66,8 +66,8 @@ Name[xh]=Isihluzi Sorhwebo se KWord Ascii
Name[zh_CN]=KWord Ascii 导出过滤器
Name[zh_TW]=KWord Ascii 匯出過濾程式
Name[zu]=KWord Ascii I Ascii Export Filter
-X-KDE-Export=text/plain
-X-KDE-Import=application/x-kword
-X-KDE-Weight=50
-X-KDE-Library=libasciiexport
+X-TDE-Export=text/plain
+X-TDE-Import=application/x-kword
+X-TDE-Weight=50
+X-TDE-Library=libasciiexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/ascii/kword_ascii_import.desktop b/filters/kword/ascii/kword_ascii_import.desktop
index 26d16a734..c3d9d08da 100644
--- a/filters/kword/ascii/kword_ascii_import.desktop
+++ b/filters/kword/ascii/kword_ascii_import.desktop
@@ -49,8 +49,8 @@ Name[uz]=KWord ASCII import filteri
Name[uz@cyrillic]=KWord ASCII импорт филтери
Name[zh_CN]=KWord ASCII 导入过滤器
Name[zh_TW]=KWord ASCII 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=text/plain
-X-KDE-Weight=1
-X-KDE-Library=libasciiimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=text/plain
+X-TDE-Weight=1
+X-TDE-Library=libasciiimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/docbook/kword_docbook_export.desktop b/filters/kword/docbook/kword_docbook_export.desktop
index 9d4e73a06..8aa052b78 100644
--- a/filters/kword/docbook/kword_docbook_export.desktop
+++ b/filters/kword/docbook/kword_docbook_export.desktop
@@ -65,8 +65,8 @@ Name[xh]=Isihluzi Sorhweba ngaphandle se KWord SGML DocBook
Name[zh_CN]=KWord SGML DocBook 导出过滤器
Name[zh_TW]=KWord SGML DocBook 匯出過濾程式
Name[zu]=KWord SGML Incwadi ye Doc Icebo lokuhlaziya lokuwheba Yefayela yemininingwane
-X-KDE-Export=text/sgml
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=libdocbookexport
+X-TDE-Export=text/sgml
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=libdocbookexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/hancomword/kword_hancomword_import.desktop b/filters/kword/hancomword/kword_hancomword_import.desktop
index 40991e640..1826f746e 100644
--- a/filters/kword/hancomword/kword_hancomword_import.desktop
+++ b/filters/kword/hancomword/kword_hancomword_import.desktop
@@ -59,8 +59,8 @@ Name[wa]=Passete HancomWord d' intrêye po KWord
Name[xh]=Isihluzi Sokurhweba se KWord HancomWord
Name[zh_CN]=KWord HancomWord 导入过滤器
Name[zh_TW]=KWord HancomWord 匯入過濾程式
-X-KDE-Export=application/vnd.oasis.opendocument.text
-X-KDE-Import=application/x-hancomword
-X-KDE-Weight=1
-X-KDE-Library=libhancomwordimport
+X-TDE-Export=application/vnd.oasis.opendocument.text
+X-TDE-Import=application/x-hancomword
+X-TDE-Weight=1
+X-TDE-Library=libhancomwordimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/html/export/kword_html_export.desktop b/filters/kword/html/export/kword_html_export.desktop
index 4148af464..2a3f9502e 100644
--- a/filters/kword/html/export/kword_html_export.desktop
+++ b/filters/kword/html/export/kword_html_export.desktop
@@ -66,8 +66,8 @@ Name[xh]=Isihluzi Sokurhweba ngaphandle se KWord HTML
Name[zh_CN]=KWord HTML 导出过滤器
Name[zh_TW]=KWord HTML 匯出過濾程式
Name[zu]=KWord HTML Ifayela Ezokuhwebela ngaphandle
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Export=text/html
-X-KDE-Library=libhtmlexport
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Export=text/html
+X-TDE-Library=libhtmlexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/html/import/kword_html_import.desktop b/filters/kword/html/import/kword_html_import.desktop
index 722b3ddc8..f6ffb4f09 100644
--- a/filters/kword/html/import/kword_html_import.desktop
+++ b/filters/kword/html/import/kword_html_import.desktop
@@ -66,8 +66,8 @@ Name[xh]=Isihluzi Sokurhweba se KWord HTML
Name[zh_CN]=KWord HTML 导入过滤器
Name[zh_TW]=KWord HTML 匯入過濾程式
Name[zu]=KWord HTML Icebo lokuhlaziya ifayela yemininingwane yezohwebo lazangaphakathi
-X-KDE-Export=application/x-kword
-X-KDE-Import=text/html
-X-KDE-Weight=1
-X-KDE-Library=libhtmlimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=text/html
+X-TDE-Weight=1
+X-TDE-Library=libhtmlimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop b/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop
index d25a55486..8be7c3413 100644
--- a/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop
+++ b/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop
@@ -54,8 +54,8 @@ Name[uz@cyrillic]=KWord учун KWord 1.3 импорт филтери
Name[wa]=Passete KWord 1.3 d' intrêye po KWord
Name[zh_CN]=KWord 1.3 导入过滤器
Name[zh_TW]=KWord 的 KWord 1.3 匯入過濾程式
-X-KDE-Export=application/vnd.oasis.opendocument.text
-X-KDE-Import=application/x-kword
-X-KDE-Weight=20
-X-KDE-Library=libkwordkword1dot3import
+X-TDE-Export=application/vnd.oasis.opendocument.text
+X-TDE-Import=application/x-kword
+X-TDE-Weight=20
+X-TDE-Library=libkwordkword1dot3import
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/latex/export/kword_latex_export.desktop b/filters/kword/latex/export/kword_latex_export.desktop
index 5fb49cff4..7b00a42ad 100644
--- a/filters/kword/latex/export/kword_latex_export.desktop
+++ b/filters/kword/latex/export/kword_latex_export.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=text/x-tex
+X-TDE-Export=text/x-tex
ExportDescription=LATEX
Icon=
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
ImportDescription=KWord
Name=KWord LATEX Export Filter
Name[af]=Kword Latex Voer uit Filter
@@ -72,4 +72,4 @@ Name[zh_TW]=KWord LATEX 匯出過濾程式
Name[zu]=KWord LATEX Icebo lokuhlaziya ifayela yemininingwane Yezohwebo Lezangaphandle
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkwordlatexexport
+X-TDE-Library=libkwordlatexexport
diff --git a/filters/kword/latex/import/kword_latex_import.desktop b/filters/kword/latex/import/kword_latex_import.desktop
index fbd96222f..e1d588b3f 100644
--- a/filters/kword/latex/import/kword_latex_import.desktop
+++ b/filters/kword/latex/import/kword_latex_import.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=application/x-kword
+X-TDE-Export=application/x-kword
ExportDescription=KWord
Icon=
-X-KDE-Import=text/x-tex
-X-KDE-Weight=1
+X-TDE-Import=text/x-tex
+X-TDE-Weight=1
ImportDescription=LATEX
Name=KWord Latex Import Filter
Name[ar]=مِرْشَح استيراد Latex لدى KWord
@@ -62,4 +62,4 @@ Name[zh_CN]=KWord Latex 导入过滤器
Name[zh_TW]=KWord Latex 匯入過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libkwordlateximport
+X-TDE-Library=libkwordlateximport
diff --git a/filters/kword/msword/kword_msword_import.desktop b/filters/kword/msword/kword_msword_import.desktop
index 9a1cb62b6..4b0673584 100644
--- a/filters/kword/msword/kword_msword_import.desktop
+++ b/filters/kword/msword/kword_msword_import.desktop
@@ -57,8 +57,8 @@ Name[wa]=Passete MS-Word d' intrêye po KWord
Name[xh]=Isihluzi Sokurhweba se KWord AbiWord
Name[zh_CN]=KWord MS Word 导入过滤器
Name[zh_TW]=KWord MS Word 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/msword
-X-KDE-Weight=1
-X-KDE-Library=libmswordimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/msword
+X-TDE-Weight=1
+X-TDE-Library=libmswordimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/mswrite/kword_mswrite_export.desktop b/filters/kword/mswrite/kword_mswrite_export.desktop
index 6da1d1dff..d02974fc3 100644
--- a/filters/kword/mswrite/kword_mswrite_export.desktop
+++ b/filters/kword/mswrite/kword_mswrite_export.desktop
@@ -55,8 +55,8 @@ Name[uz@cyrillic]=KWord Microsoft Write экспорт филтери
Name[wa]=Passete MS-Write di rexhowe po KWord
Name[zh_CN]=KWord Microsoft 书写器导出过滤器
Name[zh_TW]=KWord Microsoft Write 匯出過濾程式
-X-KDE-Export=application/x-mswrite
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=libmswriteexport
+X-TDE-Export=application/x-mswrite
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=libmswriteexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/mswrite/kword_mswrite_import.desktop b/filters/kword/mswrite/kword_mswrite_import.desktop
index 757bb1dab..85d592d30 100644
--- a/filters/kword/mswrite/kword_mswrite_import.desktop
+++ b/filters/kword/mswrite/kword_mswrite_import.desktop
@@ -60,8 +60,8 @@ Name[wa]=Passete MS-Write d' intrêye po KWord
Name[xh]=Isihluzi Sokurhweba se KWord Microsoft Write
Name[zh_CN]=KWord Microsoft 书写器导入过滤器
Name[zh_TW]=KWord Microsoft Write 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/x-mswrite
-X-KDE-Weight=1
-X-KDE-Library=libmswriteimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/x-mswrite
+X-TDE-Weight=1
+X-TDE-Library=libmswriteimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/oowriter/kword_oowriter_export.desktop b/filters/kword/oowriter/kword_oowriter_export.desktop
index 7c602b89f..ca8ab16af 100644
--- a/filters/kword/oowriter/kword_oowriter_export.desktop
+++ b/filters/kword/oowriter/kword_oowriter_export.desktop
@@ -52,8 +52,8 @@ Name[uz]=KWord uchun OpenOffice.org Writer eksport filteri
Name[uz@cyrillic]=KWord учун OpenOffice.org Writer экспорт филтери
Name[zh_CN]=KWord 的 OpenOffice.org Writer 导入过滤器
Name[zh_TW]=KWord 的 OpenOffice.org Writer 匯出過濾程式
-X-KDE-Export=application/vnd.sun.xml.writer
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=liboowriterexport
+X-TDE-Export=application/vnd.sun.xml.writer
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=liboowriterexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/oowriter/kword_oowriter_import.desktop b/filters/kword/oowriter/kword_oowriter_import.desktop
index 36539ed44..f5b828b15 100644
--- a/filters/kword/oowriter/kword_oowriter_import.desktop
+++ b/filters/kword/oowriter/kword_oowriter_import.desktop
@@ -52,11 +52,11 @@ Name[uz]=KWord uchun OpenOffice.org Writer import filteri
Name[uz@cyrillic]=KWord учун OpenOffice.org Writer импорт филтери
Name[zh_CN]=KWord 的 OpenOffice.org Writer 导入过滤器
Name[zh_TW]=KWord 的 OpenOffice.org Writer 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.writer.master
-X-KDE-Weight=1
-X-KDE-Library=liboowriterimport
-X-KDE-LibraryMajor=1
-X-KDE-LibraryMinor=0
-X-KDE-LibraryDependencies=
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.writer.master
+X-TDE-Weight=1
+X-TDE-Library=liboowriterimport
+X-TDE-LibraryMajor=1
+X-TDE-LibraryMinor=0
+X-TDE-LibraryDependencies=
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/palmdoc/kword_palmdoc_export.desktop b/filters/kword/palmdoc/kword_palmdoc_export.desktop
index 47c03a5ee..6e994e66b 100644
--- a/filters/kword/palmdoc/kword_palmdoc_export.desktop
+++ b/filters/kword/palmdoc/kword_palmdoc_export.desktop
@@ -61,8 +61,8 @@ Name[wa]=Passete documints Palm di rexhowe po KWord
Name[xh]=Isihluzi Sokurhweba ngaphandle seKWord Palm Doc
Name[zh_CN]=KWord Palm 文档导出过滤器
Name[zh_TW]=KWord Palm Doc 匯出過濾程式
-X-KDE-Export=application/vnd.palm
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=libpalmdocexport
+X-TDE-Export=application/vnd.palm
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=libpalmdocexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/palmdoc/kword_palmdoc_import.desktop b/filters/kword/palmdoc/kword_palmdoc_import.desktop
index 7ca14111c..e4b879d1e 100644
--- a/filters/kword/palmdoc/kword_palmdoc_import.desktop
+++ b/filters/kword/palmdoc/kword_palmdoc_import.desktop
@@ -61,8 +61,8 @@ Name[wa]=Passete documints Palm d' intrêye po KWord
Name[xh]=Isihluzi Sokurhweba se KWord Palm Doc
Name[zh_CN]=KWord Palm 文档导入过滤器
Name[zh_TW]=KWord Palm Doc 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/vnd.palm
-X-KDE-Weight=1
-X-KDE-Library=libpalmdocimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/vnd.palm
+X-TDE-Weight=1
+X-TDE-Library=libpalmdocimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/pdf/kword_pdf_import.desktop b/filters/kword/pdf/kword_pdf_import.desktop
index fb4313a87..f123b0760 100644
--- a/filters/kword/pdf/kword_pdf_import.desktop
+++ b/filters/kword/pdf/kword_pdf_import.desktop
@@ -54,8 +54,8 @@ Name[uz@cyrillic]=KWord PDF импорт филтери
Name[wa]=Passete PDF d' intrêye po KWord
Name[zh_CN]=KWord PDF 导入过滤器
Name[zh_TW]=KWord PDF 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/pdf
-X-KDE-Weight=1
-X-KDE-Library=libpdfimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/pdf
+X-TDE-Weight=1
+X-TDE-Library=libpdfimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/rtf/export/kword_rtf_export.desktop b/filters/kword/rtf/export/kword_rtf_export.desktop
index dc3ddaf13..0beff2e33 100644
--- a/filters/kword/rtf/export/kword_rtf_export.desktop
+++ b/filters/kword/rtf/export/kword_rtf_export.desktop
@@ -64,8 +64,8 @@ Name[xh]=Isihluzi Sokurhweba ngaphandle se KWord RTF
Name[zh_CN]=KWord RTF 导出过滤器
Name[zh_TW]=KWord RTF 匯出過濾程式
Name[zu]=KWord RTF Icebo lokuhlaziya ifayela yemininingwane Yohwebo lwazangaphandle
-X-KDE-Export=text/rtf,application/msword
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=librtfexport
+X-TDE-Export=text/rtf,application/msword
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=librtfexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/rtf/import/kword_rtf_import.desktop b/filters/kword/rtf/import/kword_rtf_import.desktop
index 277977a41..8894a52b0 100644
--- a/filters/kword/rtf/import/kword_rtf_import.desktop
+++ b/filters/kword/rtf/import/kword_rtf_import.desktop
@@ -64,10 +64,10 @@ Name[xh]=Isihluzi Sokurhweba se KWord RTF
Name[zh_CN]=KWord RTF 导入过滤器
Name[zh_TW]=KWord RTF 匯入過濾程式
Name[zu]=KWord RTF Icebo lokuhlaziya Ifayela yemininingwane Yohwebo Lwazangaphakathi
-X-KDE-Import=text/rtf
-X-KDE-Weight=1
+X-TDE-Import=text/rtf
+X-TDE-Weight=1
ImportDescription=RTF
-X-KDE-Export=application/x-kword
+X-TDE-Export=application/x-kword
ExportDescription=KWord
-X-KDE-Library=librtfimport
+X-TDE-Library=librtfimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/starwriter/kword_starwriter_import.desktop b/filters/kword/starwriter/kword_starwriter_import.desktop
index 40a668833..b1d5ff659 100644
--- a/filters/kword/starwriter/kword_starwriter_import.desktop
+++ b/filters/kword/starwriter/kword_starwriter_import.desktop
@@ -58,7 +58,7 @@ Name[zh_CN]=KWord StarWriter 5.x 导入过滤器
Name[zh_TW]=KWord StarWriter 5.x 匯入過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Export=application/x-kword
-X-KDE-Import=application/vnd.stardivision.writer
-X-KDE-Library=libstarwriterimport
-X-KDE-Weight=1
+X-TDE-Export=application/x-kword
+X-TDE-Import=application/vnd.stardivision.writer
+X-TDE-Library=libstarwriterimport
+X-TDE-Weight=1
diff --git a/filters/kword/wml/kword_wml_export.desktop b/filters/kword/wml/kword_wml_export.desktop
index 59915f6c8..5063cd13e 100644
--- a/filters/kword/wml/kword_wml_export.desktop
+++ b/filters/kword/wml/kword_wml_export.desktop
@@ -60,8 +60,8 @@ Name[wa]=Passete WML di rexhowe po KWord
Name[xh]=Isihluzi Sokurhweba se KWord WML
Name[zh_CN]=KWord WML 导出过滤器
Name[zh_TW]=KWord WML 匯出過濾程式
-X-KDE-Export=text/vnd.wap.wml
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Library=libwmlexport
+X-TDE-Export=text/vnd.wap.wml
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Library=libwmlexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/wml/kword_wml_import.desktop b/filters/kword/wml/kword_wml_import.desktop
index 2a015d58c..c09aa5bc2 100644
--- a/filters/kword/wml/kword_wml_import.desktop
+++ b/filters/kword/wml/kword_wml_import.desktop
@@ -60,8 +60,8 @@ Name[wa]=Passete WML d' intrêye po KWord
Name[xh]=Isihluzi Sokurhweba se KWord WML
Name[zh_CN]=KWord WML 导入过滤器
Name[zh_TW]=KWord WML 匯入過濾程式
-X-KDE-Export=application/x-kword
-X-KDE-Import=text/vnd.wap.wml
-X-KDE-Weight=1
-X-KDE-Library=libwmlimport
+X-TDE-Export=application/x-kword
+X-TDE-Import=text/vnd.wap.wml
+X-TDE-Weight=1
+X-TDE-Library=libwmlimport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/wordperfect/export/kword_wp_export.desktop b/filters/kword/wordperfect/export/kword_wp_export.desktop
index de326d12b..95e15cbc7 100644
--- a/filters/kword/wordperfect/export/kword_wp_export.desktop
+++ b/filters/kword/wordperfect/export/kword_wp_export.desktop
@@ -62,8 +62,8 @@ Name[wa]=Passete WordPerfect di rexhowe po KWord
Name[xh]=Isihluzi Sokurhweba ngaphandle se KWord WordPerfect
Name[zh_CN]=KWord WordPerfect 导出过滤器
Name[zh_TW]=KWord WordPerfect 匯出過濾程式
-X-KDE-Import=application/x-kword
-X-KDE-Weight=1
-X-KDE-Export=application/wordperfect
-X-KDE-Library=libwpexport
+X-TDE-Import=application/x-kword
+X-TDE-Weight=1
+X-TDE-Export=application/wordperfect
+X-TDE-Library=libwpexport
ServiceTypes=KOfficeFilter
diff --git a/filters/kword/wordperfect/import/kword_wp_import.desktop b/filters/kword/wordperfect/import/kword_wp_import.desktop
index 29c59cfdb..d05749395 100644
--- a/filters/kword/wordperfect/import/kword_wp_import.desktop
+++ b/filters/kword/wordperfect/import/kword_wp_import.desktop
@@ -64,8 +64,8 @@ Name[xh]=Isihluzi Sokurhweba se KWord WordPerfect
Name[zh_CN]=KWord WordPerfect 导入过滤器
Name[zh_TW]=KWord WordPerfect 匯入過濾程式
Name[zu]=KWord WordPerfect Icebo Lefayela yemininingwane yokuhlaziya Uhwebo Langaphakathi
-X-KDE-Export=application/vnd.sun.xml.writer
-X-KDE-Import=application/wordperfect
-X-KDE-Weight=1
-X-KDE-Library=libwpimport
+X-TDE-Export=application/vnd.sun.xml.writer
+X-TDE-Import=application/wordperfect
+X-TDE-Weight=1
+X-TDE-Library=libwpimport
ServiceTypes=KOfficeFilter
diff --git a/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop b/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop
index f89271205..594637d0a 100644
--- a/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop
+++ b/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop
@@ -60,8 +60,8 @@ Name[wa]=Passete PowerPoint 97 po KPresenter
Name[xh]=Isihluzi se KPresenter PowerPoint 97
Name[zh_TW]=KPresenter PowerPoint 97 過濾程式
Name[zu]=KPresenter PowerPoint 97 Icebo lokuhlaziya ifayela
-X-KDE-Export=application/x-kpresenter
-X-KDE-Import=application/mspowerpoint
-X-KDE-Weight=1
-X-KDE-Library=libolefilter
+X-TDE-Export=application/x-kpresenter
+X-TDE-Import=application/mspowerpoint
+X-TDE-Weight=1
+X-TDE-Library=libolefilter
ServiceTypes=KOfficeFilter
diff --git a/filters/xsltfilter/export/xslt_export.desktop b/filters/xsltfilter/export/xslt_export.desktop
index 46576c066..4902578b2 100644
--- a/filters/xsltfilter/export/xslt_export.desktop
+++ b/filters/xsltfilter/export/xslt_export.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-X-KDE-Export=text/xml
+X-TDE-Export=text/xml
ExportDescription=XSLT
Icon=
-X-KDE-Import=application/x-kword,application/x-kontour,application/x-kspread,application/x-kivio,application/x-kpresenter,application/x-kchart
-X-KDE-Weight=1
-X-KDE-Available=check
+X-TDE-Import=application/x-kword,application/x-kontour,application/x-kspread,application/x-kivio,application/x-kpresenter,application/x-kchart
+X-TDE-Weight=1
+X-TDE-Available=check
ImportDescription=KWord
Name=KOffice XSLT Export Filter
Name[af]=Koffice Xslt Voer uit Filter
@@ -69,4 +69,4 @@ Name[zh_CN]=KOffice XSLT 导出过滤器
Name[zh_TW]=KOffice XSLT 匯出過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libxsltexport
+X-TDE-Library=libxsltexport
diff --git a/filters/xsltfilter/import/xslt_import.desktop b/filters/xsltfilter/import/xslt_import.desktop
index 6d17677f5..7cfec1b91 100644
--- a/filters/xsltfilter/import/xslt_import.desktop
+++ b/filters/xsltfilter/import/xslt_import.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-X-KDE-Export=application/x-kword,application/x-kontour,application/x-kpresenter,application/x-kivio,application/x-kchart
+X-TDE-Export=application/x-kword,application/x-kontour,application/x-kpresenter,application/x-kivio,application/x-kchart
ExportDescription=KOffice
Icon=
-X-KDE-Import=text/xml
-X-KDE-Weight=1
+X-TDE-Import=text/xml
+X-TDE-Weight=1
ImportDescription=XSLT
Name=KOffice XSLT Import Filter
Name[af]=Koffice Xslt In voer Filter
@@ -68,4 +68,4 @@ Name[zh_CN]=KOffice XSLT 导入过滤器
Name[zh_TW]=KOffice XSLT 匯入過濾程式
ServiceTypes=KOfficeFilter
Type=Service
-X-KDE-Library=libxsltimport
+X-TDE-Library=libxsltimport
diff --git a/karbon/data/karbon.desktop b/karbon/data/karbon.desktop
index 6df53e23a..4c656597d 100644
--- a/karbon/data/karbon.desktop
+++ b/karbon/data/karbon.desktop
@@ -66,5 +66,5 @@ MimeType=application/vnd.oasis.opendocument.graphics;application/x-karbon;applic
InitialPreference=5
Type=Application
Icon=karbon
-X-KDE-NativeMimeType=application/x-karbon
-Categories=Qt;KDE;Office;
+X-TDE-NativeMimeType=application/x-karbon
+Categories=Qt;TDE;Office;
diff --git a/karbon/data/karbon_module.desktop b/karbon/data/karbon_module.desktop
index cf6f7a15f..17069be45 100644
--- a/karbon/data/karbon_module.desktop
+++ b/karbon/data/karbon_module.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Karbon/CoreModule
+X-TDE-ServiceType=Karbon/CoreModule
Comment=Core functionality module for Karbon
Comment[bg]=Модул с основната функционалност на Karbon
Comment[ca]=Mòdul principal de funcionalitat per a Karbon
diff --git a/karbon/data/karbonpart.desktop b/karbon/data/karbonpart.desktop
index 6f09da4ae..3019daca5 100644
--- a/karbon/data/karbonpart.desktop
+++ b/karbon/data/karbonpart.desktop
@@ -47,15 +47,15 @@ Name[uz@cyrillic]=KOffice вектор расмлар компоненти
Name[wa]=Componint grafikes schålåves di Koffice
Name[zh_CN]=KOffice 可缩放图像组件
Name[zh_TW]=KOffice 可縮放圖片元件
-X-KDE-Library=libkarbonpart
+X-TDE-Library=libkarbonpart
MimeType=application/x-karbon;application/illustrator;image/x-eps;application/postscript;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template
# kghostview has 6 for application/postscript, we need to be under that...
InitialPreference=5
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/x-karbon
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.graphics
-X-KDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template
+X-TDE-NativeMimeType=application/x-karbon
+X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.graphics
+X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template
GenericName=Scalable Graphics
GenericName[af]=Skaal veranderbare Grafieka
GenericName[ar]=رسوم قابلة للتمدُّد
diff --git a/karbon/plugins/imagetool/karbonimagetool.desktop b/karbon/plugins/imagetool/karbonimagetool.desktop
index 1294482e7..9beba3379 100644
--- a/karbon/plugins/imagetool/karbonimagetool.desktop
+++ b/karbon/plugins/imagetool/karbonimagetool.desktop
@@ -45,4 +45,4 @@ Name[zh_CN]=图像工具
Name[zh_TW]=圖片工具
ServiceTypes=Karbon/CoreModule
Type=Service
-X-KDE-Library=karbon_imagetoolplugin
+X-TDE-Library=karbon_imagetoolplugin
diff --git a/karbon/plugins/zoomtool/karbonzoomtool.desktop b/karbon/plugins/zoomtool/karbonzoomtool.desktop
index 3692ac549..fb18659cb 100644
--- a/karbon/plugins/zoomtool/karbonzoomtool.desktop
+++ b/karbon/plugins/zoomtool/karbonzoomtool.desktop
@@ -45,4 +45,4 @@ Name[zh_CN]=缩放工具
Name[zh_TW]=縮放工具
ServiceTypes=Karbon/CoreModule
Type=Service
-X-KDE-Library=karbon_zoomtoolplugin
+X-TDE-Library=karbon_zoomtoolplugin
diff --git a/karbon/templates/basic/.directory b/karbon/templates/basic/.directory
index 9aa5ba114..b8c20e595 100644
--- a/karbon/templates/basic/.directory
+++ b/karbon/templates/basic/.directory
@@ -49,4 +49,4 @@ Name[uz@cyrillic]=Оддий
Name[wa]=Di båze
Name[zh_CN]=基本
Name[zh_TW]=基本
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/karbon/tools/karbondefaulttools.desktop b/karbon/tools/karbondefaulttools.desktop
index 193c5d6c7..80cf6f1e0 100644
--- a/karbon/tools/karbondefaulttools.desktop
+++ b/karbon/tools/karbondefaulttools.desktop
@@ -52,4 +52,4 @@ Name[zh_CN]=默认工具
Name[zh_TW]=預設工具
ServiceTypes=Karbon/CoreModule
Type=Service
-X-KDE-Library=karbon_defaulttools
+X-TDE-Library=karbon_defaulttools
diff --git a/kchart/kchart.desktop b/kchart/kchart.desktop
index 03828492a..2c683aa0c 100644
--- a/kchart/kchart.desktop
+++ b/kchart/kchart.desktop
@@ -106,8 +106,8 @@ Exec=kchart %u
Type=Application
Icon=kchart
MimeType=application/x-kchart;application/vnd.oasis.opendocument.chart
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.chart
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
-X-KDE-StartupNotify=true
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.chart
+X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
diff --git a/kchart/kchartpart.desktop b/kchart/kchartpart.desktop
index 2e916cbe1..b4fadebfc 100644
--- a/kchart/kchartpart.desktop
+++ b/kchart/kchartpart.desktop
@@ -50,13 +50,13 @@ Name[uz@cyrillic]=KOffice диаграмма компоненти
Name[wa]=Componint grafike di statistike di KOffice
Name[zh_CN]=KOffice 图表组件
Name[zh_TW]=KOffice Chart 元件
-X-KDE-Library=libkchartpart
+X-TDE-Library=libkchartpart
Type=Service
MimeType=application/x-kchart;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,KOfficeChart
-X-KDE-NativeMimeType=application/x-kchart
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
-X-KDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.chart,application/vnd.oasis.opendocument.chart-template
+X-TDE-NativeMimeType=application/x-kchart
+X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
+X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.chart,application/vnd.oasis.opendocument.chart-template
GenericName=Chart
GenericName[af]=Kaart
GenericName[ar]=رسم بيانيّ
diff --git a/kchart/templates/.directory b/kchart/templates/.directory
index cc6be8b55..be207a3c8 100644
--- a/kchart/templates/.directory
+++ b/kchart/templates/.directory
@@ -41,4 +41,4 @@ Name[uz]=Diagrammalar
Name[uz@cyrillic]=Диаграммалар
Name[zh_CN]=图表
Name[zh_TW]=圖表
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/kchart/templates/Empty.desktop b/kchart/templates/Empty.desktop
index 6830fdb5d..963639d4c 100644
--- a/kchart/templates/Empty.desktop
+++ b/kchart/templates/Empty.desktop
@@ -60,4 +60,4 @@ Name[xh]=Iphepha lokusebenza Elingenanto
Name[zh_CN]=空工作表
Name[zh_TW]=空白工作表
Icon=template_empty
-X-KDE-DefaultTemplate=true
+X-TDE-DefaultTemplate=true
diff --git a/kexi/data/kexihandler.desktop b/kexi/data/kexihandler.desktop
index 751159484..0abfb6cd2 100644
--- a/kexi/data/kexihandler.desktop
+++ b/kexi/data/kexihandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Kexi/Handler
+X-TDE-ServiceType=Kexi/Handler
Comment=Kexi Project Handlers
Comment[ar]=مقابض مشروع Kexi
Comment[bg]=Обработка на проекти в Kexi
diff --git a/kexi/data/x-kexiproject-sqlite2.desktop b/kexi/data/x-kexiproject-sqlite2.desktop
index fda98e9ab..5e0136bbf 100644
--- a/kexi/data/x-kexiproject-sqlite2.desktop
+++ b/kexi/data/x-kexiproject-sqlite2.desktop
@@ -3,7 +3,7 @@ Type=MimeType
MimeType=application/x-kexiproject-sqlite2
Icon=kexiproject_sqlite2
Patterns=*.kexi
-X-KDE-IsAlso=application/x-sqlite2
+X-TDE-IsAlso=application/x-sqlite2
Comment=Kexi Database File-Based Project
Comment[bg]=Проект на Kexi, базиран на файлове на СУБД
Comment[ca]=Projecte Kexi en una base de dades basada en fitxers
diff --git a/kexi/data/x-kexiproject-sqlite3.desktop b/kexi/data/x-kexiproject-sqlite3.desktop
index deed6b38e..921b5683e 100644
--- a/kexi/data/x-kexiproject-sqlite3.desktop
+++ b/kexi/data/x-kexiproject-sqlite3.desktop
@@ -3,7 +3,7 @@ Type=MimeType
MimeType=application/x-kexiproject-sqlite3
Icon=kexiproject_sqlite
Patterns=*.kexi
-X-KDE-IsAlso=application/x-sqlite3
+X-TDE-IsAlso=application/x-sqlite3
Comment=Kexi Database File-Based Project
Comment[bg]=Проект на Kexi, базиран на файлове на СУБД
Comment[ca]=Projecte Kexi en una base de dades basada en fitxers
diff --git a/kexi/debian/kexi.install b/kexi/debian/kexi.install
index 31111e373..61679446e 100644
--- a/kexi/debian/kexi.install
+++ b/kexi/debian/kexi.install
@@ -90,7 +90,7 @@ debian/tmp/usr/share/applnk/
debian/tmp/usr/share/services/kexi/
debian/tmp/usr/share/services/kformdesigner*
-debian/tmp/usr/share/applications/kde/kexi.desktop
+debian/tmp/usr/share/applications/tde/kexi.desktop
debian/tmp/usr/share/mimelnk/application/x-kexiproject-sqlite.desktop
debian/tmp/usr/share/mimelnk/application/x-kexiproject-sqlite2.desktop
debian/tmp/usr/share/mimelnk/application/x-kexiproject-sqlite3.desktop
diff --git a/kexi/formeditor/factories/kformdesigner_containers.desktop b/kexi/formeditor/factories/kformdesigner_containers.desktop
index ae30820c5..0cd57c757 100644
--- a/kexi/formeditor/factories/kformdesigner_containers.desktop
+++ b/kexi/formeditor/factories/kformdesigner_containers.desktop
@@ -48,6 +48,6 @@ Name[uk]=Віджети контейнера
Name[zh_CN]=容器部件
Name[zh_TW]=容器視窗元件
-X-KDE-Library=kformdesigner_containers
+X-TDE-Library=kformdesigner_containers
X-KFormDesigner-FactoryGroup=
X-KFormDesigner-WidgetFactoryVersion=2
diff --git a/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop b/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop
index d5d599fa0..c3c55bb93 100644
--- a/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop
+++ b/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop
@@ -50,6 +50,6 @@ Name[uz@cyrillic]=Оддий виджетлар
Name[zh_CN]=基本部件
Name[zh_TW]=基本視窗元件
-X-KDE-Library=kformdesigner_stdwidgets
+X-TDE-Library=kformdesigner_stdwidgets
X-KFormDesigner-FactoryGroup=
X-KFormDesigner-WidgetFactoryVersion=2
diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop b/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop
index c94e628f6..bfcb4a2d0 100644
--- a/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop
+++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop
@@ -45,6 +45,6 @@ Name[zh_CN]=表单设计器 KDevelop 插件
Name[zh_TW]=表單設計師 KDevelop 外掛程式
MimeType=application/x-designer;
ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-Library=libkformdesigner_kdev_part
+X-TDE-Library=libkformdesigner_kdev_part
Type=Service
InitialPreference=0
diff --git a/kexi/formeditor/test/kformdesigner.desktop b/kexi/formeditor/test/kformdesigner.desktop
index 4a018915d..06ab18370 100644
--- a/kexi/formeditor/test/kformdesigner.desktop
+++ b/kexi/formeditor/test/kformdesigner.desktop
@@ -57,5 +57,5 @@ GenericName[zh_CN]=表单设计器
GenericName[zh_TW]=表單設計師
MimeType=application/x-designer;
Terminal=false
-Categories=Qt;KDE;Development;
+Categories=Qt;TDE;Development;
diff --git a/kexi/formeditor/test/kformdesigner_part.desktop b/kexi/formeditor/test/kformdesigner_part.desktop
index b0f384544..e572ff5c6 100644
--- a/kexi/formeditor/test/kformdesigner_part.desktop
+++ b/kexi/formeditor/test/kformdesigner_part.desktop
@@ -48,5 +48,5 @@ Name[zh_CN]=表单设计器
Name[zh_TW]=表單設計師
MimeType=application/x-designer;
ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-Library=libkformdesigner_part
+X-TDE-Library=libkformdesigner_part
Type=Service
diff --git a/kexi/formeditor/widgetfactory.desktop b/kexi/formeditor/widgetfactory.desktop
index 9b5d7e607..51c494139 100644
--- a/kexi/formeditor/widgetfactory.desktop
+++ b/kexi/formeditor/widgetfactory.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KFormDesigner/WidgetFactory
+X-TDE-ServiceType=KFormDesigner/WidgetFactory
Comment=Widget Factory Base
Comment[bg]=Създаване на графични обекти
Comment[ca]=Factoria base d'estris
diff --git a/kexi/kexi.desktop b/kexi/kexi.desktop
index 3ba9104ca..eaba222d8 100644
--- a/kexi/kexi.desktop
+++ b/kexi/kexi.desktop
@@ -95,6 +95,6 @@ Comment[uz]=Maʼlumot bazasi asosida dasturlarni tuzish
Comment[uz@cyrillic]=Маълумот базаси асосида дастурларни тузиш
Comment[zh_TW]=開發桌面資料庫應用程式
DocPath=kexi/index.html
-X-KDE-NativeMimeType=application/x-kexiproject-sqlite
-X-KDE-NOTKoDocumentEmbeddable=true
-Categories=Qt;KDE;Office;
+X-TDE-NativeMimeType=application/x-kexiproject-sqlite
+X-TDE-NOTKoDocumentEmbeddable=true
+Categories=Qt;TDE;Office;
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 1f348ddf0..677709e40 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -104,7 +104,7 @@ bool DriverManagerInternal::lookupDrivers()
KService::Ptr ptr = (*it);
if (!ptr->property("Library").toString().startsWith("kexidb_")) {
KexiDBWarn << "DriverManagerInternal::lookupDrivers():"
- " X-KDE-Library == " << ptr->property("Library").toString()
+ " X-TDE-Library == " << ptr->property("Library").toString()
<< ": no \"kexidb_\" prefix -- skipped to avoid potential conflicts!" << endl;
continue;
}
diff --git a/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop b/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop
index 066782f12..70984d290 100644
--- a/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop
+++ b/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop
@@ -2,7 +2,7 @@
Name=MySQL
Name[ne]=मेरो एसक्यूएल
Name[sk]=mySQL
-X-KDE-Library=kexidb_mysqldriver
+X-TDE-Library=kexidb_mysqldriver
ServiceTypes=Kexi/DBDriver
Type=Service
InitialPreference=8
diff --git a/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop b/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop
index acad3c640..717b9540b 100644
--- a/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop
+++ b/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop
@@ -45,7 +45,7 @@ Comment[tr]=Kexi Açık Veritabanı Bağlanabilirlik Sürücüsü
Comment[uk]=Драйвер з'єднання Kexi Open Database
Comment[zh_CN]=Kexi 开放数据库连接驱动
Comment[zh_TW]=Kexi 開放資料庫連線驅動程式
-X-KDE-Library=kexidb_odbcdriver
+X-TDE-Library=kexidb_odbcdriver
ServiceTypes=Kexi/DBDriver
Type=Service
InitialPreference=8
diff --git a/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop b/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop
index 1f38241b1..eb4292cb1 100644
--- a/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop
+++ b/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop
@@ -2,7 +2,7 @@
Name=PostgreSQL
Name[hi]=पोस्टग्रे-एसक्यूएल
Name[ne]=पोस्ट ग्रे एसक्यूएल
-X-KDE-Library=kexidb_pqxxsqldriver
+X-TDE-Library=kexidb_pqxxsqldriver
ServiceTypes=Kexi/DBDriver
Type=Service
InitialPreference=8
diff --git a/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop b/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop
index 92e599312..d6f23e982 100644
--- a/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop
+++ b/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop
@@ -46,7 +46,7 @@ Comment[tr]=SQlite Kexi'ye gömülü varsayılan SQL motorudur
Comment[uk]=SQLite - це типовий рушій SQL вбудований в Kexi
Comment[zh_CN]=SQLite 是嵌入 Kexi 的默认 SQL 引擎
Comment[zh_TW]=SQLite 是 Kexi 預設內建的 SQL 引擎
-X-KDE-Library=kexidb_sqlite3driver
+X-TDE-Library=kexidb_sqlite3driver
ServiceTypes=Kexi/DBDriver
Type=Service
InitialPreference=8
diff --git a/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop b/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop
index 5e0959df6..1691d3edb 100644
--- a/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop
+++ b/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop
@@ -46,7 +46,7 @@ Comment[tr]=SQlite Kexi'ye gömülü varsayılan SQL motorudur
Comment[uk]=SQLite - це типовий рушій SQL вбудований в Kexi
Comment[zh_CN]=SQLite 是嵌入 Kexi 的默认 SQL 引擎
Comment[zh_TW]=SQLite 是 Kexi 預設內建的 SQL 引擎
-X-KDE-Library=kexidb_sqlite2driver
+X-TDE-Library=kexidb_sqlite2driver
ServiceTypes=Kexi/DBDriver
Type=Service
InitialPreference=8
diff --git a/kexi/kexidb/kexidb_driver.desktop b/kexi/kexidb/kexidb_driver.desktop
index d6802f93f..bc8ff2b1c 100644
--- a/kexi/kexidb/kexidb_driver.desktop
+++ b/kexi/kexidb/kexidb_driver.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Kexi/DBDriver
+X-TDE-ServiceType=Kexi/DBDriver
Comment=Kexi SQL-Driver plugin
Comment[ar]=ملحق سوّاقة SQL لدى Kexi
Comment[bg]=Приставка на Kexi за SQL драйвери
diff --git a/kexi/migration/keximigration_driver.desktop b/kexi/migration/keximigration_driver.desktop
index dbd184f01..5f07e5281 100644
--- a/kexi/migration/keximigration_driver.desktop
+++ b/kexi/migration/keximigration_driver.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=Kexi/MigrationDriver
+X-TDE-ServiceType=Kexi/MigrationDriver
Comment=Kexi Data Migration Driver
Comment[bg]=Драйвер на Kexi за мигриране на данни
Comment[ca]=Controlador de migració de dades de Kexi
diff --git a/kexi/migration/mysql/keximigrate_mysql.desktop b/kexi/migration/mysql/keximigrate_mysql.desktop
index 529ad459a..ef0ec6e82 100644
--- a/kexi/migration/mysql/keximigrate_mysql.desktop
+++ b/kexi/migration/mysql/keximigrate_mysql.desktop
@@ -45,7 +45,7 @@ Comment[uz]=Kexi uchun MySQL migratsiya drayveri
Comment[uz@cyrillic]=Kexi учун MySQL миграция драйвери
Comment[zh_CN]=Kexi MySQL 升迁驱动程序
Comment[zh_TW]=Kexi 的 MySQL 轉移驅動程式
-X-KDE-Library=keximigrate_mysql
+X-TDE-Library=keximigrate_mysql
ServiceTypes=Kexi/MigrationDriver
Type=Service
InitialPreference=8
diff --git a/kexi/migration/pqxx/keximigrate_pqxx.desktop b/kexi/migration/pqxx/keximigrate_pqxx.desktop
index 3f88cbefa..9da002143 100644
--- a/kexi/migration/pqxx/keximigrate_pqxx.desktop
+++ b/kexi/migration/pqxx/keximigrate_pqxx.desktop
@@ -44,7 +44,7 @@ Comment[uz]=Kexi uchun PostgreSQL migratsiya drayveri
Comment[uz@cyrillic]=Kexi учун PostgreSQL миграция драйвери
Comment[zh_CN]=Kexi PostgreSQL 升迁驱动程序
Comment[zh_TW]=Kexi 的 PostgreSQL 轉移驅動程式
-X-KDE-Library=keximigrate_pqxx
+X-TDE-Library=keximigrate_pqxx
ServiceTypes=Kexi/MigrationDriver
Type=Service
InitialPreference=8
diff --git a/kexi/plugins/forms/kexiformhandler.desktop b/kexi/plugins/forms/kexiformhandler.desktop
index 3b476daaf..7f60695db 100644
--- a/kexi/plugins/forms/kexiformhandler.desktop
+++ b/kexi/plugins/forms/kexiformhandler.desktop
@@ -105,8 +105,8 @@ Name[uz]=Shakllar
Name[uz@cyrillic]=Шакллар
Name[zh_CN]=表单
Name[zh_TW]=表單
-X-KDE-Library=kexihandler_form
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_form
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=form
X-Kexi-TypeMime=kexi/form
diff --git a/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop b/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop
index 4e5bb719c..f7534930a 100644
--- a/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop
+++ b/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop
@@ -50,6 +50,6 @@ Name[uz@cyrillic]=Kexi маълумот база виджетлари
Name[zh_CN]=Kexi 数据库部件
Name[zh_TW]=Kexi DB 視窗元件
-X-KDE-Library=kformdesigner_kexidbwidgets
+X-TDE-Library=kformdesigner_kexidbwidgets
X-KFormDesigner-FactoryGroup=kexi
X-KFormDesigner-WidgetFactoryVersion=2
diff --git a/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop b/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop
index 1c2a383a0..16777d1cd 100644
--- a/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop
+++ b/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop
@@ -42,8 +42,8 @@ Name[uz@cyrillic]=Kexi CSV маълумот импорт/экспорт плаг
Name[zh_CN]=Kexi CSV 数据导入/导出插件
Name[zh_TW]=Kexi CSV 資料匯入/匯出外掛程式
-X-KDE-Library=kexihandler_csv_importexport
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_csv_importexport
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=csv_importexport
X-Kexi-GroupIcon=csv_importexport
diff --git a/kexi/plugins/macros/kexipart/keximacrohandler.desktop b/kexi/plugins/macros/kexipart/keximacrohandler.desktop
index c08a7b2af..19af4e771 100644
--- a/kexi/plugins/macros/kexipart/keximacrohandler.desktop
+++ b/kexi/plugins/macros/kexipart/keximacrohandler.desktop
@@ -70,8 +70,8 @@ Name[uz]=Makros
Name[uz@cyrillic]=Макрос
Name[zh_TW]=巨集
-X-KDE-Library=kexihandler_macro
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_macro
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=macro
X-Kexi-TypeMime=kexi/macro
diff --git a/kexi/plugins/migration/keximigrationhandler.desktop b/kexi/plugins/migration/keximigrationhandler.desktop
index 4ca99b050..b2d0d4798 100644
--- a/kexi/plugins/migration/keximigrationhandler.desktop
+++ b/kexi/plugins/migration/keximigrationhandler.desktop
@@ -93,8 +93,8 @@ Name[uz]=Migratsiya plagini
Name[uz@cyrillic]=Миграция плагини
Name[zh_CN]=升迁插件
Name[zh_TW]=轉移外掛程式
-X-KDE-Library=kexihandler_migration
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_migration
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=migration
X-Kexi-GroupIcon=migration
diff --git a/kexi/plugins/queries/kexiqueryhandler.desktop b/kexi/plugins/queries/kexiqueryhandler.desktop
index 4a4f478e7..8e003e8d1 100644
--- a/kexi/plugins/queries/kexiqueryhandler.desktop
+++ b/kexi/plugins/queries/kexiqueryhandler.desktop
@@ -101,8 +101,8 @@ Name[uz]=Talablar
Name[uz@cyrillic]=Талаблар
Name[zh_CN]=查询
Name[zh_TW]=查詢
-X-KDE-Library=kexihandler_query
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_query
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=query
X-Kexi-TypeMime=kexi/query
diff --git a/kexi/plugins/relations/kexirelationhandler.desktop b/kexi/plugins/relations/kexirelationhandler.desktop
index 7232d316b..22894410e 100644
--- a/kexi/plugins/relations/kexirelationhandler.desktop
+++ b/kexi/plugins/relations/kexirelationhandler.desktop
@@ -101,8 +101,8 @@ Name[uz]=Aloqalar
Name[uz@cyrillic]=Алоқалар
Name[zh_CN]=关系
Name[zh_TW]=關係
-X-KDE-Library=kexihandler_relation
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_relation
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=relation
X-Kexi-TypeMime=kexi/relation
diff --git a/kexi/plugins/reports/kexireporthandler.desktop b/kexi/plugins/reports/kexireporthandler.desktop
index e9606dbf6..f94a8dda0 100644
--- a/kexi/plugins/reports/kexireporthandler.desktop
+++ b/kexi/plugins/reports/kexireporthandler.desktop
@@ -98,8 +98,8 @@ Name[uz]=Hisobotlar
Name[uz@cyrillic]=Ҳисоботлар
Name[zh_CN]=报表
Name[zh_TW]=報告
-X-KDE-Library=kexihandler_report
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_report
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=report
X-Kexi-TypeMime=kexi/report
diff --git a/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop b/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop
index 46ccbd61e..63de46385 100644
--- a/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop
+++ b/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop
@@ -48,6 +48,6 @@ Name[uz@cyrillic]=Kexi ҳисобот виджетлари
Name[zh_CN]=Kexi 报表部件
Name[zh_TW]=Kexi 報告視窗元件
-X-KDE-Library=kformdesigner_kexireportwidgets
+X-TDE-Library=kformdesigner_kexireportwidgets
X-KFormDesigner-FactoryGroup=kexi-report
X-KFormDesigner-WidgetFactoryVersion=2
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop b/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop
index 66e5f9fb7..8eef01af0 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop
@@ -94,8 +94,8 @@ Name[uz]=Skriptlar
Name[uz@cyrillic]=Скриптлар
Name[zh_CN]=脚本
Name[zh_TW]=命令稿
-X-KDE-Library=kexihandler_script
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_script
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=script
X-Kexi-TypeMime=kexi/script
diff --git a/kexi/plugins/tables/kexitablehandler.desktop b/kexi/plugins/tables/kexitablehandler.desktop
index 8491b7a34..79fdf47a1 100644
--- a/kexi/plugins/tables/kexitablehandler.desktop
+++ b/kexi/plugins/tables/kexitablehandler.desktop
@@ -108,8 +108,8 @@ Name[uz@cyrillic]=Жадваллар
Name[wa]=Tåvleas
Name[zh_CN]=表
Name[zh_TW]=表格
-X-KDE-Library=kexihandler_table
-X-KDE-ParentApp=kexi
+X-TDE-Library=kexihandler_table
+X-TDE-ParentApp=kexi
X-Kexi-PartVersion=2
X-Kexi-TypeName=table
X-Kexi-TypeMime=kexi/table
diff --git a/kformula/kformula.desktop b/kformula/kformula.desktop
index d3d69f622..3742883e5 100644
--- a/kformula/kformula.desktop
+++ b/kformula/kformula.desktop
@@ -76,7 +76,7 @@ GenericName[zh_TW]=方程式編輯器
MimeType=application/vnd.oasis.opendocument.formula;application/x-kformula
Type=Application
Icon=kformula
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.formula
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.formula
X-DCOP-ServiceType=Multi
DocPath=kformula/index.html
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
diff --git a/kformula/kformulapart.desktop b/kformula/kformulapart.desktop
index 86303e75d..74d9ba067 100644
--- a/kformula/kformulapart.desktop
+++ b/kformula/kformulapart.desktop
@@ -47,13 +47,13 @@ Name[uz@cyrillic]=KOffice формула компоненти
Name[wa]=Componint formule matematike di KOffice
Name[zh_CN]=KOffice 公式组件
Name[zh_TW]=KOffice Formula 元件
-X-KDE-Library=libkformulapart
+X-TDE-Library=libkformulapart
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/x-kformula;application/mathml+xml
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.formula
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.formula
-X-KDE-ExtraNativeMimeTypes=application/x-kformula,application/vnd.oasis.opendocument.formula-template,application/mathml+xml
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.formula
+X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.formula
+X-TDE-ExtraNativeMimeTypes=application/x-kformula,application/vnd.oasis.opendocument.formula-template,application/mathml+xml
GenericName=Formula Editor
GenericName[af]=Formule Redigeerder
GenericName[ar]=مُحَرِّر المعادَلات
diff --git a/kivio/kiviopart/kivio.desktop b/kivio/kiviopart/kivio.desktop
index 5e2f64901..bda7acd23 100644
--- a/kivio/kiviopart/kivio.desktop
+++ b/kivio/kiviopart/kivio.desktop
@@ -60,7 +60,7 @@ GenericName[zh_TW]=流程圖與圖表編輯
MimeType=application/x-kivio
Type=Application
Icon=kivio
-X-KDE-NativeMimeType=application/x-kivio
+X-TDE-NativeMimeType=application/x-kivio
DocPath=kivio/index.html
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
diff --git a/kivio/kiviopart/kiviopart.desktop b/kivio/kiviopart/kiviopart.desktop
index c09f637ed..a5da2d93b 100644
--- a/kivio/kiviopart/kiviopart.desktop
+++ b/kivio/kiviopart/kiviopart.desktop
@@ -45,12 +45,12 @@ Name[uz]=KOffice sxema va diagrammalarni tahrirlash komponenti
Name[uz@cyrillic]=KOffice схема ва диаграммаларни таҳрирлаш компоненти
Name[zh_CN]=KOffice 流程图和图表编辑组件
Name[zh_TW]=KOffice 流程圖 & 圖表編輯元件
-X-KDE-Library=libkiviopart
+X-TDE-Library=libkiviopart
MimeType=application/x-kivio
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/x-kivio
-Categories=Qt;KDE;Office;
+X-TDE-NativeMimeType=application/x-kivio
+Categories=Qt;TDE;Office;
GenericName=Flowchart & Diagram
GenericName[bg]=Диаграми и схеми
GenericName[ca]=Editor de diagrames de fluxos i diagrames
diff --git a/kivio/plugins/kivioconnectortool/kivioconnectortool.desktop b/kivio/plugins/kivioconnectortool/kivioconnectortool.desktop
index 1f232bcb2..ddeff9c06 100644
--- a/kivio/plugins/kivioconnectortool/kivioconnectortool.desktop
+++ b/kivio/plugins/kivioconnectortool/kivioconnectortool.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Library=libkivioconnectortool
+X-TDE-Library=libkivioconnectortool
Name=ConnectorTool for Kivio
Name[af]=Konnekteer gereedskap vir Kivio
Name[ar]=أداة اتصال Kivio
diff --git a/kivio/plugins/kivioselecttool/kivioselecttool.desktop b/kivio/plugins/kivioselecttool/kivioselecttool.desktop
index fc1c211c2..bc8d37a39 100644
--- a/kivio/plugins/kivioselecttool/kivioselecttool.desktop
+++ b/kivio/plugins/kivioselecttool/kivioselecttool.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Library=libkivioselecttool
+X-TDE-Library=libkivioselecttool
Name=SelectTool for Kivio
Name[af]=Kies gereedskap vir Kivio
Name[ar]=أداة انتقاء Kivio
diff --git a/kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop b/kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop
index b835128ae..e9c29e46a 100644
--- a/kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop
+++ b/kivio/plugins/kiviosmlconnector/kiviosmlconnector.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Library=libkiviosmlconnector
+X-TDE-Library=libkiviosmlconnector
Name=SML Based ConnectorTool for Kivio
Name[bg]=Инструмент базиран на SML за свързване за Kivio
Name[ca]=Eina de connexió per a Kivio basada en SML
diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.desktop b/kivio/plugins/kiviotargettool/kiviotargettool.desktop
index 37c1a6503..661affcd2 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettool.desktop
+++ b/kivio/plugins/kiviotargettool/kiviotargettool.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Library=libkiviotargettool
+X-TDE-Library=libkiviotargettool
Name=Target Tool for Kivio
Name[bg]=Целеви инструмент за Kivio
Name[br]=Ostilh wenn evit Kivio
diff --git a/kivio/plugins/kiviotexttool/kiviotexttool.desktop b/kivio/plugins/kiviotexttool/kiviotexttool.desktop
index 85c8207f7..5239f3662 100644
--- a/kivio/plugins/kiviotexttool/kiviotexttool.desktop
+++ b/kivio/plugins/kiviotexttool/kiviotexttool.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Library=libkiviotexttool
+X-TDE-Library=libkiviotexttool
Name=TextTool for Kivio
Name[af]=Teks gereedskap vir Kivio
Name[ar]=أداة النّص لدى Kivio
diff --git a/kivio/plugins/kiviozoomtool/kiviozoomtool.desktop b/kivio/plugins/kiviozoomtool/kiviozoomtool.desktop
index 0ec34d69f..14982836a 100644
--- a/kivio/plugins/kiviozoomtool/kiviozoomtool.desktop
+++ b/kivio/plugins/kiviozoomtool/kiviozoomtool.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-X-KDE-Library=libkiviozoomtool
+X-TDE-Library=libkiviozoomtool
Name=ZoomTool for Kivio
Name[af]=Vergroting gereedskap vir Kivio
Name[ar]=أداة التّحجيم لدى Kivio
diff --git a/kivio/templates/basic/.directory b/kivio/templates/basic/.directory
index 9aa5ba114..b8c20e595 100644
--- a/kivio/templates/basic/.directory
+++ b/kivio/templates/basic/.directory
@@ -49,4 +49,4 @@ Name[uz@cyrillic]=Оддий
Name[wa]=Di båze
Name[zh_CN]=基本
Name[zh_TW]=基本
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/koshell/koshell.desktop b/koshell/koshell.desktop
index 37b5e8a79..b07e5cc51 100644
--- a/koshell/koshell.desktop
+++ b/koshell/koshell.desktop
@@ -130,6 +130,6 @@ GenericName[zh_CN]=办公套件
GenericName[zh_TW]=辦公軟體程式集
Type=Application
Icon=koshell
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
diff --git a/kounavail/kounavail.desktop b/kounavail/kounavail.desktop
index b78cbff60..85905feb8 100644
--- a/kounavail/kounavail.desktop
+++ b/kounavail/kounavail.desktop
@@ -57,6 +57,6 @@ Name[uz@cyrillic]=Мавжуд бўлмаган KOffice ҳужжати
Name[xh]=Uxhwebu lwe KOffice Olungekhoyo
Name[zh_CN]=不可用的 KOffice 文档
Name[zh_TW]=無法取得的 KOffice 文件
-X-KDE-Library=libkounavailpart
+X-TDE-Library=libkounavailpart
Type=Service
ServiceTypes=KOfficePart
diff --git a/kplato/kplato.desktop b/kplato/kplato.desktop
index 12930f537..9198d4789 100644
--- a/kplato/kplato.desktop
+++ b/kplato/kplato.desktop
@@ -58,7 +58,7 @@ Exec=kplato %u
MimeType=application/x-vnd.kde.kplato
Type=Application
Icon=kplato
-X-KDE-NativeMimeType=application/x-vnd.kde.kplato
+X-TDE-NativeMimeType=application/x-vnd.kde.kplato
DocPath=kplato/index.html
-Categories=Qt;KDE;Office;
-X-KDE-StartupNotify=true
+Categories=Qt;TDE;Office;
+X-TDE-StartupNotify=true
diff --git a/kplato/kplatopart.desktop b/kplato/kplatopart.desktop
index d8c2b89a6..357494eb9 100644
--- a/kplato/kplatopart.desktop
+++ b/kplato/kplatopart.desktop
@@ -48,11 +48,11 @@ Name[uz@cyrillic]=KOffice лойиҳа бошқарув компоненти
Name[wa]=Componint di manaedjaedje di prodjet di KOffice
Name[zh_CN]=KOffice 项目管理组件部件
Name[zh_TW]=KOffice 專案管理元件
-X-KDE-Library=libkplatopart
+X-TDE-Library=libkplatopart
MimeType=application/x-vnd.kde.kplato
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/x-vnd.kde.kplato
+X-TDE-NativeMimeType=application/x-vnd.kde.kplato
GenericName=Project Management
GenericName[bg]=Управление на проекти
GenericName[br]=Mererezh raktresioù
diff --git a/kplato/reports/resourcelist.desktop b/kplato/reports/resourcelist.desktop
index 61cb4fc78..d0b1da6af 100644
--- a/kplato/reports/resourcelist.desktop
+++ b/kplato/reports/resourcelist.desktop
@@ -42,4 +42,4 @@ Name[zh_CN]=资源列表
Name[zh_TW]=資源清單
Type=Link
URL= .source/resourcelist.ktf
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kplato/reports/tasklist.desktop b/kplato/reports/tasklist.desktop
index ea64478a2..aaa2b7f34 100644
--- a/kplato/reports/tasklist.desktop
+++ b/kplato/reports/tasklist.desktop
@@ -43,4 +43,4 @@ Name[zh_CN]=任务列表
Name[zh_TW]=工作清單
Type=Link
URL= .source/tasklist.ktf
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kplato/templates/Simple/.directory b/kplato/templates/Simple/.directory
index a3bc1503b..a983cfd3a 100644
--- a/kplato/templates/Simple/.directory
+++ b/kplato/templates/Simple/.directory
@@ -57,4 +57,4 @@ Name[xh]=Lula
Name[zh_CN]=简单
Name[zh_TW]=簡單
Name[zu]=Okulula
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/kpresenter/kpresenter.desktop b/kpresenter/kpresenter.desktop
index 514d56f31..c2111247a 100644
--- a/kpresenter/kpresenter.desktop
+++ b/kpresenter/kpresenter.desktop
@@ -77,9 +77,9 @@ GenericName[zh_TW]=自動撥放
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/x-kpresenter;application/mspowerpoint
Type=Application
Icon=kpresenter
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
-#X-KDE-NativeMimeType=application/x-kpresenter
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
+#X-TDE-NativeMimeType=application/x-kpresenter
X-DCOP-ServiceType=multi
DocPath=kpresenter/index.html
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Office;
diff --git a/kpresenter/kpresenterpart.desktop b/kpresenter/kpresenterpart.desktop
index 22016ee39..ed84b1d6b 100644
--- a/kpresenter/kpresenterpart.desktop
+++ b/kpresenter/kpresenterpart.desktop
@@ -13,13 +13,13 @@ Name[th]=การนำเสนอข้อมูล
Name[tr]=Kpresenter
Name[ven]=Mulanguli wa K
Name[zu]=Umbonikeleli we K
-X-KDE-Library=libkpresenterpart
+X-TDE-Library=libkpresenterpart
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/x-kpresenter;application/mspowerpoint
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.presentation
-X-KDE-ExtraNativeMimeTypes=application/x-kpresenter,application/vnd.oasis.opendocument.presentation-template
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
+X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.presentation
+X-TDE-ExtraNativeMimeTypes=application/x-kpresenter,application/vnd.oasis.opendocument.presentation-template
GenericName=Slide Presentations
GenericName[af]=Skuif Voorleggings
GenericName[ar]=تقديم الشَّرائح
diff --git a/kpresenter/templates/A4/.directory b/kpresenter/templates/A4/.directory
index 9d5708220..96dd588dd 100644
--- a/kpresenter/templates/A4/.directory
+++ b/kpresenter/templates/A4/.directory
@@ -4,4 +4,4 @@ Name[hi]=ए4
Name[ru]=А4
Name[sr]=А4
Name[zu]=u-A4
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/kpresenter/templates/Screenpresentations/.directory b/kpresenter/templates/Screenpresentations/.directory
index a93f5266e..31497a68e 100644
--- a/kpresenter/templates/Screenpresentations/.directory
+++ b/kpresenter/templates/Screenpresentations/.directory
@@ -46,4 +46,4 @@ Name[uz]=Ekranda namoyishlar
Name[uz@cyrillic]=Экранда намойишлар
Name[zh_CN]=屏幕幻灯片
Name[zh_TW]=螢幕簡報
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop b/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop
index 24e5e8e96..5a28a9bdd 100644
--- a/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop
+++ b/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop
@@ -87,4 +87,4 @@ Comment[zh_CN]=带有一个标题和两个文本框的演示文稿
Comment[zh_TW]=具標題及兩欄文字的和平展示
Type=Link
URL=.source/BlueBreezeDouble.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop b/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop
index c9c1c361b..800e9c493 100644
--- a/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop
+++ b/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop
@@ -89,4 +89,4 @@ Comment[zh_CN]=带有一个标题和一个图片区域的演示文稿
Comment[zh_TW]=具標題及圖片區域的和平展示
Type=Link
URL=.source/BlueBreezePicture.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop b/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop
index 5ce22e5de..e37cfd541 100644
--- a/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop
+++ b/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop
@@ -87,4 +87,4 @@ Comment[zh_CN]=带有一个标题和单个大文本框的演示文稿
Comment[zh_TW]=具標題及一個大型文字區域的和平展示
Type=Link
URL=.source/BlueBreezeSingle.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/Screenpresentations/CopperPlain.desktop b/kpresenter/templates/Screenpresentations/CopperPlain.desktop
index 9c20a71a1..acf28e318 100644
--- a/kpresenter/templates/Screenpresentations/CopperPlain.desktop
+++ b/kpresenter/templates/Screenpresentations/CopperPlain.desktop
@@ -82,4 +82,4 @@ Comment[zh_CN]=颇显豪华的演示文稿主题
Comment[zh_TW]=優雅、提升的展示
Type=Link
URL=.source/CopperPlain.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/Screenpresentations/SnowyMountains.desktop b/kpresenter/templates/Screenpresentations/SnowyMountains.desktop
index 2efd444df..6f87aee6f 100644
--- a/kpresenter/templates/Screenpresentations/SnowyMountains.desktop
+++ b/kpresenter/templates/Screenpresentations/SnowyMountains.desktop
@@ -97,4 +97,4 @@ Comment[zh_CN]=绝酷的演示文稿
Comment[zh_TW]=酷而柔順的展示
Type=Link
URL=.source/SnowyMountains.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop b/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop
index 06353339e..b9b099334 100644
--- a/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop
+++ b/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop
@@ -97,4 +97,4 @@ Comment[zh_CN]=适合信息量大的演示文稿
Comment[zh_TW]=隨意、綠色旋渦的展示
Type=Link
URL=.source/TotallyNewProduct.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/Screenpresentations/classroom.desktop b/kpresenter/templates/Screenpresentations/classroom.desktop
index 827a00a85..291b6e070 100644
--- a/kpresenter/templates/Screenpresentations/classroom.desktop
+++ b/kpresenter/templates/Screenpresentations/classroom.desktop
@@ -75,4 +75,4 @@ Comment[zh_CN]=回味学生时代
Comment[zh_TW]=dannya 的教室
Type=Link
URL=.source/classroom.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/Screenpresentations/savannah.desktop b/kpresenter/templates/Screenpresentations/savannah.desktop
index 3888e9e47..7d0010096 100644
--- a/kpresenter/templates/Screenpresentations/savannah.desktop
+++ b/kpresenter/templates/Screenpresentations/savannah.desktop
@@ -61,4 +61,4 @@ Comment[uk]=Савана (автор: dannya)
Comment[zh_TW]=dannya 的薩凡納
Type=Link
URL=.source/savannah.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/OneColumnLandscape.desktop b/kpresenter/templates/common_desktop/OneColumnLandscape.desktop
index 0d161b51c..6b127efc0 100644
--- a/kpresenter/templates/common_desktop/OneColumnLandscape.desktop
+++ b/kpresenter/templates/common_desktop/OneColumnLandscape.desktop
@@ -104,4 +104,4 @@ Comment[uk]=Презентація з заголовком сторінки і
Comment[zh_TW]=有頁面標題及一個大型文字區域的展示
Type=Link
URL=.source/OneColumnLandscape.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/OneColumnPortrait.desktop b/kpresenter/templates/common_desktop/OneColumnPortrait.desktop
index 06c0a1aa6..15959f217 100644
--- a/kpresenter/templates/common_desktop/OneColumnPortrait.desktop
+++ b/kpresenter/templates/common_desktop/OneColumnPortrait.desktop
@@ -99,4 +99,4 @@ Comment[uk]=Презентація з заголовком сторінки і
Comment[zh_TW]=一個頁面標題與單一文字區域的簡報（縱向）
Type=Link
URL=.source/OneColumnPortrait.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/TitleLandscape.desktop b/kpresenter/templates/common_desktop/TitleLandscape.desktop
index f0ca81b55..ca86d0ddb 100644
--- a/kpresenter/templates/common_desktop/TitleLandscape.desktop
+++ b/kpresenter/templates/common_desktop/TitleLandscape.desktop
@@ -106,4 +106,4 @@ Comment[zh_CN]=带页面标题的演示文稿
Comment[zh_TW]=具有頁面標題的展示
Type=Link
URL=.source/TitleLandscape.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/TitlePortrait.desktop b/kpresenter/templates/common_desktop/TitlePortrait.desktop
index 16b752166..6531364a9 100644
--- a/kpresenter/templates/common_desktop/TitlePortrait.desktop
+++ b/kpresenter/templates/common_desktop/TitlePortrait.desktop
@@ -99,4 +99,4 @@ Comment[uk]=Презентація з заголовком сторінки (к
Comment[zh_TW]=具有標題的簡報（縱向）
Type=Link
URL=.source/TitlePortrait.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/TwoColumnLandscape.desktop b/kpresenter/templates/common_desktop/TwoColumnLandscape.desktop
index 1add6daca..13577ca4d 100644
--- a/kpresenter/templates/common_desktop/TwoColumnLandscape.desktop
+++ b/kpresenter/templates/common_desktop/TwoColumnLandscape.desktop
@@ -103,4 +103,4 @@ Comment[uk]=Презентація з заголовком сторінки і
Comment[zh_TW]=具有標題及兩欄文字的展示
Type=Link
URL=.source/TwoColumnLandscape.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/TwoColumnPortrait.desktop b/kpresenter/templates/common_desktop/TwoColumnPortrait.desktop
index 1439354a4..b2077e267 100644
--- a/kpresenter/templates/common_desktop/TwoColumnPortrait.desktop
+++ b/kpresenter/templates/common_desktop/TwoColumnPortrait.desktop
@@ -99,4 +99,4 @@ Comment[uk]=Презентація з заголовком сторінки і
Comment[zh_TW]=具有頁面標題與兩欄文字的簡報（縱向）
Type=Link
URL=.source/TwoColumnPortrait.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/emptyLandscape.desktop b/kpresenter/templates/common_desktop/emptyLandscape.desktop
index 165214fa7..1074ae833 100644
--- a/kpresenter/templates/common_desktop/emptyLandscape.desktop
+++ b/kpresenter/templates/common_desktop/emptyLandscape.desktop
@@ -97,4 +97,4 @@ Comment[zh_CN]=空演示文稿
Comment[zh_TW]=空白展示
Type=Link
URL=.source/emptyLandscape.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/common_desktop/emptyPortrait.desktop b/kpresenter/templates/common_desktop/emptyPortrait.desktop
index 994512011..16a14982a 100644
--- a/kpresenter/templates/common_desktop/emptyPortrait.desktop
+++ b/kpresenter/templates/common_desktop/emptyPortrait.desktop
@@ -88,4 +88,4 @@ Comment[zh_CN]=空演示文稿(纵向)
Comment[zh_TW]=空白簡報（縱向）
Type=Link
URL=.source/emptyPortrait.kpt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kpresenter/templates/legal/.directory b/kpresenter/templates/legal/.directory
index fda415f73..082726ccc 100644
--- a/kpresenter/templates/legal/.directory
+++ b/kpresenter/templates/legal/.directory
@@ -21,4 +21,4 @@ Name[ven]=Zwa milayo
Name[wa]=Legal US
Name[xh]=Esemthethweni
Name[zu]=Okusemthethweni
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/kpresenter/templates/letter/.directory b/kpresenter/templates/letter/.directory
index b9e17560d..84121095a 100644
--- a/kpresenter/templates/letter/.directory
+++ b/kpresenter/templates/letter/.directory
@@ -40,4 +40,4 @@ Name[wa]=Lete
Name[xh]=Ileta
Name[zh_CN]=信函
Name[zu]=Incwadi
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/kspread/kspread.desktop b/kspread/kspread.desktop
index 1f6938f1a..dc1ab456d 100644
--- a/kspread/kspread.desktop
+++ b/kspread/kspread.desktop
@@ -73,8 +73,8 @@ GenericName[zh_TW]=Spread 表格
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro
Type=Application
Icon=kspread
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
X-DCOP-ServiceType=multi
DocPath=kspread/index.html
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Office;
diff --git a/kspread/kspreadpart.desktop b/kspread/kspreadpart.desktop
index 83b7101d9..530e15cd2 100644
--- a/kspread/kspreadpart.desktop
+++ b/kspread/kspreadpart.desktop
@@ -47,13 +47,13 @@ Name[uz@cyrillic]=KOffice электрон жадваллар компонент
Name[wa]=Componint tåvleu di KOffice
Name[zh_CN]=KOffice 电子表格组件
Name[zh_TW]=KOffice 工作表元件
-X-KDE-Library=libkspreadpart
+X-TDE-Library=libkspreadpart
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro
Type=Service
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.spreadsheet
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
-X-KDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.spreadsheet-template,application/x-kspread
+X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.spreadsheet
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
+X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.spreadsheet-template,application/x-kspread
GenericName=Spreadsheets
GenericName[af]=Spreiblad
GenericName[ar]=وريقات حساب
diff --git a/kspread/plugins/scripting/kspreadscripting.desktop b/kspread/plugins/scripting/kspreadscripting.desktop
index 2a22f10b1..6687390f1 100644
--- a/kspread/plugins/scripting/kspreadscripting.desktop
+++ b/kspread/plugins/scripting/kspreadscripting.desktop
@@ -76,5 +76,5 @@ Comment[uz@cyrillic]=Скриптларни ишга туширишга рухс
Comment[zh_CN]=允许执行脚本
Comment[zh_TW]=允許執行命令稿
Type=Service
-X-KDE-Library=kspreadscripting
-X-KDE-Version=1
+X-TDE-Library=kspreadscripting
+X-TDE-Version=1
diff --git a/kspread/templates/General/.directory b/kspread/templates/General/.directory
index e154374c3..d01a627aa 100644
--- a/kspread/templates/General/.directory
+++ b/kspread/templates/General/.directory
@@ -53,4 +53,4 @@ Name[wa]=Djenerå
Name[xh]=Ngokubanzi
Name[zh_CN]=常规
Name[zh_TW]=一般的
-X-KDE-DefaultTab=true
+X-TDE-DefaultTab=true
diff --git a/kspread/templates/General/Worksheet.desktop b/kspread/templates/General/Worksheet.desktop
index f522529f1..819bcb35c 100644
--- a/kspread/templates/General/Worksheet.desktop
+++ b/kspread/templates/General/Worksheet.desktop
@@ -60,4 +60,4 @@ Name[xh]=Iphepha lokusebenza Elingenanto
Name[zh_CN]=空工作表
Name[zh_TW]=空白工作表
Icon=template_worksheet
-X-KDE-DefaultTemplate=true
+X-TDE-DefaultTemplate=true
diff --git a/kugar/kudesigner/kudesigner.desktop b/kugar/kudesigner/kudesigner.desktop
index 4a4e63339..5affbe2a0 100644
--- a/kugar/kudesigner/kudesigner.desktop
+++ b/kugar/kudesigner/kudesigner.desktop
@@ -151,8 +151,8 @@ Comment[xh]=Umyili Wengxelo
Comment[zh_CN]=报告设计器
Comment[zh_TW]=簡報設計家
MimeType=application/x-kudesigner
-X-KDE-NativeMimeType=application/x-kudesigner
-X-KDE-Library=libkudesignerpart
+X-TDE-NativeMimeType=application/x-kudesigner
+X-TDE-Library=libkudesignerpart
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
diff --git a/kugar/part/kugar.desktop b/kugar/part/kugar.desktop
index b9d18769f..b115a09c0 100644
--- a/kugar/part/kugar.desktop
+++ b/kugar/part/kugar.desktop
@@ -70,7 +70,7 @@ GenericName[xh]=Umenzi we Ngxelo
GenericName[zh_CN]=报告生成器
GenericName[zh_TW]=報告產生器
Terminal=false
-X-KDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
-Categories=Qt;KDE;Office;
+X-TDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
+Categories=Qt;TDE;Office;
# Not ready for public consumption, so hide it from the menus
NoDisplay=true
diff --git a/kugar/part/kugarpart.desktop b/kugar/part/kugarpart.desktop
index ad9f125d1..1ad592faf 100644
--- a/kugar/part/kugarpart.desktop
+++ b/kugar/part/kugarpart.desktop
@@ -50,8 +50,8 @@ MimeType=application/x-kugar;application/x-vnd.kde.kugar.mixed
Type=Service
Terminal=false
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,Browser/View
-X-KDE-Library=libkugarpart
-X-KDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
+X-TDE-Library=libkugarpart
+X-TDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
GenericName=Report Generator
GenericName[af]=Raporteer Genereerder
GenericName[ar]=مُوَلِّد التَّقارير
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index b2e2bc73d..90606ce17 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -63,7 +63,7 @@ TQStringList KWMailMergeDataBase::availablePlugins()
KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),TQString());
for (KTrader::OfferList::Iterator it=pluginOffers.begin();*it;++it)
{
- tmp.append((*it)->property("X-KDE-InternalName").toString());
+ tmp.append((*it)->property("X-TDE-InternalName").toString());
kdDebug()<<"Found mail merge plugin: "<< (*it)->name()<query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
KService::Ptr it=pluginOffers.first();
- TQVariant verProp=it->property("X-KDE-PluginVersion");
+ TQVariant verProp=it->property("X-TDE-PluginVersion");
int version=verProp.toInt();
if (it)
@@ -116,7 +116,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
{
version=0;
KWMailMergeDataSource *ret=0;
- TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
+ TQString constrain=TQString("'%1' in [X-TDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text));
kdDebug()<query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain);
@@ -138,7 +138,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version)
KWMailMergeChoosePluginDialog *dia=new KWMailMergeChoosePluginDialog(pluginOffers);
if (dia->exec()==TQDialog::Accepted)
{
- TQVariant verProp=(*(pluginOffers.at(dia->currentPlugin())))->property("X-KDE-PluginVersion");
+ TQVariant verProp=(*(pluginOffers.at(dia->currentPlugin())))->property("X-TDE-PluginVersion");
version=verProp.toInt();
ret=loadPlugin((*(pluginOffers.at(dia->currentPlugin())))->library());
diff --git a/kword/kwmailmerge.desktop b/kword/kwmailmerge.desktop
index e45659f42..8bbac9afd 100644
--- a/kword/kwmailmerge.desktop
+++ b/kword/kwmailmerge.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KWord/MailMergePlugin
+X-TDE-ServiceType=KWord/MailMergePlugin
Comment=KWord mailmerge plugin
Comment[ar]=ملحق دمج البريد لدى KWord
Comment[bg]=Приставка на KWord за генериране на регулярна е-поща
@@ -58,14 +58,14 @@ Comment[xh]=Uxutyo lweposi ye plagi yangaphakathi ye KWord
Comment[zh_CN]=KWord 邮件合并插件
Comment[zh_TW]=KWord 郵件合併外掛程式
-[PropertyDef::X-KDE-Capabilities]
+[PropertyDef::X-TDE-Capabilities]
Type=TQStringList
-[PropertyDef::X-KDE-InternalName]
+[PropertyDef::X-TDE-InternalName]
Type=TQString
-[PropertyDef::X-KDE-Library]
+[PropertyDef::X-TDE-Library]
Type=TQString
-[PropertyDef::X-KDE-PluginVersion]
+[PropertyDef::X-TDE-PluginVersion]
Type=int
diff --git a/kword/kword.desktop b/kword/kword.desktop
index 65760244f..ab37b8189 100644
--- a/kword/kword.desktop
+++ b/kword/kword.desktop
@@ -72,10 +72,10 @@ GenericName[zh_CN]=字处理
GenericName[zh_TW]=文書處理
MimeType=application/vnd.oasis.opendocument.text;application/x-kword;application/msword;text/rtf;text/plain;application/x-mswrite
Icon=kword
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.text
-#X-KDE-NativeMimeType=application/x-kword
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.text
+#X-TDE-NativeMimeType=application/x-kword
DocPath=kword/index.html
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
InitialPreference=3
diff --git a/kword/kwordpart.desktop b/kword/kwordpart.desktop
index d759cf938..9ba693672 100644
--- a/kword/kwordpart.desktop
+++ b/kword/kwordpart.desktop
@@ -47,10 +47,10 @@ Name[uz]=KOffice matn tahrirlash komponenti
Name[uz@cyrillic]=КOffice матн таҳрирлаш компоненти
Name[zh_CN]=KOffice 字处理组件
Name[zh_TW]=KOffice 文書處理文件
-X-KDE-Library=libkwordpart
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.text
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.text
-X-KDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.text-template,application/x-kword
+X-TDE-Library=libkwordpart
+X-TDE-NativeMimeType=application/vnd.oasis.opendocument.text
+X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.text
+X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.text-template,application/x-kword
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/x-kword;application/msword;text/rtf;text/plain;application/x-mswrite
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
GenericName=Text Documents
diff --git a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop b/kword/mailmerge/kabc/kwmailmerge_kabc.desktop
index 502627dde..f300c0beb 100644
--- a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop
+++ b/kword/mailmerge/kabc/kwmailmerge_kabc.desktop
@@ -100,6 +100,6 @@ Comment[uk]=Цей тип джерела даних дає доступ до з
Comment[zh_CN]=该数据源类型允许您使用您的 TDE 地址簿条目。
Comment[zh_TW]=這個資料來源類別讓您使用您的 TDE 通訊錄項目。
-X-KDE-Library=kwmailmerge_kabc
-X-KDE-Capabilities=open
-X-KDE-InternalName=KABC
+X-TDE-Library=kwmailmerge_kabc
+X-TDE-Capabilities=open
+X-TDE-InternalName=KABC
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.desktop b/kword/mailmerge/kspread/kwmailmerge_kspread.desktop
index 06dd45ec0..536ca79c5 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.desktop
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.desktop
@@ -96,6 +96,6 @@ Comment[uk]=Цей тип джерела даних дає доступ до з
Comment[zh_CN]=该数据源类型允许您从 kspead 文件中使用您的条目。
Comment[zh_TW]=這個資料來源類別讓您可以使用 kspread 檔案的項目。
-X-KDE-Library=kwmailmerge_kspread
-X-KDE-Capabilities=open
-X-KDE-InternalName=KSpread
+X-TDE-Library=kwmailmerge_kspread
+X-TDE-Capabilities=open
+X-TDE-InternalName=KSpread
diff --git a/kword/mailmerge/kwserialletter_classic.desktop b/kword/mailmerge/kwserialletter_classic.desktop
index 030c56b9f..cacf6bd8e 100644
--- a/kword/mailmerge/kwserialletter_classic.desktop
+++ b/kword/mailmerge/kwserialletter_classic.desktop
@@ -117,6 +117,6 @@ Comment[xh]=Uhlobo lwe mvelaphi ye data igcina idata ngqo kwifayile ye KWord
Comment[zh_CN]=该数据源类型将数据直接保存在 KWord 文件中
Comment[zh_TW]=這個資料來源類別將資料直接以 KWord 檔案儲純
-X-KDE-Library=kwmailmerge_classic
-X-KDE-Capabilities=edit,create
-X-KDE-InternalName=Classic
+X-TDE-Library=kwmailmerge_classic
+X-TDE-Capabilities=edit,create
+X-TDE-InternalName=Classic
diff --git a/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop b/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop
index 3b06c6552..6d107ade9 100644
--- a/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop
+++ b/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop
@@ -100,7 +100,7 @@ Comment[xh]=Uhlobo lwe mvelaphi ye data ikuvumela ukuba usebenzise iitafile zesi
Comment[zh_CN]=此数据库类型允许您使用存储于 SQL 服务器的 SQL 数据库表。根据您的系统配置不同，MySQL、PostgreSQL 和 UnixODBC 都是支持的后端数据库。可能还有更多(Qt 商业版中附带 Oracle 支持，或使用第三方后端)。
Comment[zh_TW]=這個資料來源類別讓你使用在一個 SQL 伺服器上面的 SQL 資料表格。根據你的系統設定，MySQL、PostgreSQL 與 UnixODBC 都在支援之列。還會有更多(例如在商業版本的 QT 或是第三廠商提供相關支援)。
-X-KDE-Library=kwmailmerge_qtsqldb
-X-KDE-Capabilities=edit,open
-X-KDE-InternalName=QtSqlEasy
-X-KDE-PluginVersion=1
+X-TDE-Library=kwmailmerge_qtsqldb
+X-TDE-Capabilities=edit,open
+X-TDE-InternalName=QtSqlEasy
+X-TDE-PluginVersion=1
diff --git a/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop b/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop
index 7f45df9b5..74c6bd7cb 100644
--- a/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop
+++ b/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop
@@ -101,7 +101,7 @@ Comment[xh]=Uhlobo lwe mvelaphi ye data ikuvumela ukuba usebenzise iitafile zesi
Comment[zh_CN]=此数据库类型允许您使用存储于 SQL 服务器的 SQL 数据库表。根据您的系统配置不同，MySQL、PostgreSQL 和 UnixODBC 都是支持的后端数据库。可能还有更多(Qt 商业版中附带 Oracle 支持，或使用第三方后端)。
Comment[zh_TW]=這個資料來源類別讓你使用在一個 SQL 伺服器上面的 SQL 資料表格。根據你的系統設定，MySQL、PostgreSQL 與 UnixODBC 都在支援之列。還會有更多(例如在商業版本的 QT 或是第三廠商提供相關支援)。
-X-KDE-Library=kwmailmerge_qtsqldb_power
-X-KDE-Capabilities=edit,open
-X-KDE-InternalName=QtSqlPower
-X-KDE-PluginVersion=1
+X-TDE-Library=kwmailmerge_qtsqldb_power
+X-TDE-Capabilities=edit,open
+X-TDE-InternalName=QtSqlPower
+X-TDE-PluginVersion=1
diff --git a/kword/templates/CardsAndLabels/BusinessCards10.desktop b/kword/templates/CardsAndLabels/BusinessCards10.desktop
index 7f7baf8ce..26588dcd2 100644
--- a/kword/templates/CardsAndLabels/BusinessCards10.desktop
+++ b/kword/templates/CardsAndLabels/BusinessCards10.desktop
@@ -52,4 +52,4 @@ Name[zh_CN]=商务卡片 10
Name[zh_TW]=商業名片 10
Type=Link
URL=.source/BusinessCards10.kwt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kword/templates/CardsAndLabels/LabelsL16.desktop b/kword/templates/CardsAndLabels/LabelsL16.desktop
index c3d50a1f5..628fa7cc8 100644
--- a/kword/templates/CardsAndLabels/LabelsL16.desktop
+++ b/kword/templates/CardsAndLabels/LabelsL16.desktop
@@ -53,4 +53,4 @@ Name[zh_CN]=L16 标签
Name[zh_TW]=標籤 L16
Type=Link
URL=.source/LabelsL16.kwt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kword/templates/Envelopes/EnvelopeC6.desktop b/kword/templates/Envelopes/EnvelopeC6.desktop
index a523293ba..8602a08be 100644
--- a/kword/templates/Envelopes/EnvelopeC6.desktop
+++ b/kword/templates/Envelopes/EnvelopeC6.desktop
@@ -54,4 +54,4 @@ Name[zh_CN]=C6 信封
Name[zh_TW]=信封 C6
Type=Link
URL=.source/EnvelopeC6.kwt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kword/templates/Envelopes/EnvelopeDL.desktop b/kword/templates/Envelopes/EnvelopeDL.desktop
index a99d9f406..5df081e41 100644
--- a/kword/templates/Envelopes/EnvelopeDL.desktop
+++ b/kword/templates/Envelopes/EnvelopeDL.desktop
@@ -54,4 +54,4 @@ Name[zh_CN]=DL 信封
Name[zh_TW]=信封 DL
Type=Link
URL=.source/EnvelopeDL.kwt
-X-KDE-Hidden=false
+X-TDE-Hidden=false
diff --git a/kword/templates/Wordprocessing/.directory b/kword/templates/Wordprocessing/.directory
index 7911ed6a4..4f03e55da 100644
--- a/kword/templates/Wordprocessing/.directory
+++ b/kword/templates/Wordprocessing/.directory
@@ -42,5 +42,5 @@ Name[uz]=Boʻsh hujjat
Name[uz@cyrillic]=Бўш ҳужжат
Name[zh_CN]=空文档
Name[zh_TW]=空白文件
-X-KDE-DefaultTab=true
-X-KDE-SortingWeight=10
+X-TDE-DefaultTab=true
+X-TDE-SortingWeight=10
diff --git a/kword/templates/Wordprocessing/A4.desktop b/kword/templates/Wordprocessing/A4.desktop
index cadcfcfc1..027ff58cc 100644
--- a/kword/templates/Wordprocessing/A4.desktop
+++ b/kword/templates/Wordprocessing/A4.desktop
@@ -82,4 +82,4 @@ Comment[uz@cyrillic]=Бўш A4 ҳужжатини яратиш.
Comment[zh_CN]=创建带有小页边距的空 A4 文档。
Comment[zh_TW]=建立一個每頁兩欄的 A4 文件。
Icon=template_a4
-X-KDE-MeasureSystem=metric
+X-TDE-MeasureSystem=metric
diff --git a/kword/templates/Wordprocessing/ColorfulA4.desktop b/kword/templates/Wordprocessing/ColorfulA4.desktop
index e42ec6371..71828a916 100644
--- a/kword/templates/Wordprocessing/ColorfulA4.desktop
+++ b/kword/templates/Wordprocessing/ColorfulA4.desktop
@@ -81,4 +81,4 @@ Comment[uk]=Двостовпчиковий шаблон зі стильними
Comment[zh_CN]=页眉和页脚颜色多彩的两栏模板
Comment[zh_TW]=一個兩欄的樣本，有彩色的標頭與註腳
Icon=template_colorful
-X-KDE-MeasureSystem=metric
+X-TDE-MeasureSystem=metric
diff --git a/kword/templates/Wordprocessing/ColorfulLetter.desktop b/kword/templates/Wordprocessing/ColorfulLetter.desktop
index 4d32f930a..e10fe36c6 100644
--- a/kword/templates/Wordprocessing/ColorfulLetter.desktop
+++ b/kword/templates/Wordprocessing/ColorfulLetter.desktop
@@ -81,4 +81,4 @@ Comment[uk]=Двостовпчиковий шаблон зі стильними
Comment[zh_CN]=页眉和页脚颜色多彩的两栏模板
Comment[zh_TW]=一個兩欄的樣本，有彩色的標頭與註腳
Icon=template_colorful
-X-KDE-MeasureSystem=imperial
+X-TDE-MeasureSystem=imperial
diff --git a/kword/templates/Wordprocessing/FaxA4.desktop b/kword/templates/Wordprocessing/FaxA4.desktop
index 04c190d76..0db2aa696 100644
--- a/kword/templates/Wordprocessing/FaxA4.desktop
+++ b/kword/templates/Wordprocessing/FaxA4.desktop
@@ -95,4 +95,4 @@ Comment[sv]=En mall för att snabbt skapa ett telefaxmeddelande
Comment[uk]=Шаблон для швидкого створення факсу
Comment[zh_TW]=一個樣本，以便快速建立傳真聯繫
Icon=template_fax
-X-KDE-MeasureSystem=metric
+X-TDE-MeasureSystem=metric
diff --git a/kword/templates/Wordprocessing/FaxLetter.desktop b/kword/templates/Wordprocessing/FaxLetter.desktop
index 4198562d1..f9c2beb4e 100644
--- a/kword/templates/Wordprocessing/FaxLetter.desktop
+++ b/kword/templates/Wordprocessing/FaxLetter.desktop
@@ -95,4 +95,4 @@ Comment[sv]=En mall för att snabbt skapa ett telefaxmeddelande
Comment[uk]=Шаблон для швидкого створення факсу
Comment[zh_TW]=一個樣本，以便快速建立傳真聯繫
Icon=template_fax
-X-KDE-MeasureSystem=imperial
+X-TDE-MeasureSystem=imperial
diff --git a/kword/templates/Wordprocessing/Letter.desktop b/kword/templates/Wordprocessing/Letter.desktop
index 984575528..1fa9cf236 100644
--- a/kword/templates/Wordprocessing/Letter.desktop
+++ b/kword/templates/Wordprocessing/Letter.desktop
@@ -83,4 +83,4 @@ Comment[uz@cyrillic]=Ўлчами 279 × 216 миллиметр бўлган (US
Comment[zh_CN]=创建空的美式信函文档。
Comment[zh_TW]=建立一個空白 US Letter 文件。
Icon=template_letter
-X-KDE-MeasureSystem=imperial
+X-TDE-MeasureSystem=imperial
diff --git a/kword/templates/Wordprocessing/ProfessionalA4.desktop b/kword/templates/Wordprocessing/ProfessionalA4.desktop
index 5db088ba9..67fe16bf5 100644
--- a/kword/templates/Wordprocessing/ProfessionalA4.desktop
+++ b/kword/templates/Wordprocessing/ProfessionalA4.desktop
@@ -82,4 +82,4 @@ Comment[uz]=Mukammal koʻrinadigan boʻsh hujjatni yaratish
Comment[uz@cyrillic]=Мукаммал кўринадиган бўш ҳужжатни яратиш
Comment[zh_TW]=建立有寬邊界的空白文件
Icon=template_a4
-X-KDE-MeasureSystem=metric
+X-TDE-MeasureSystem=metric
diff --git a/kword/templates/Wordprocessing/ProfessionalLetter.desktop b/kword/templates/Wordprocessing/ProfessionalLetter.desktop
index b9d76d9c5..83c1ff924 100644
--- a/kword/templates/Wordprocessing/ProfessionalLetter.desktop
+++ b/kword/templates/Wordprocessing/ProfessionalLetter.desktop
@@ -82,4 +82,4 @@ Comment[uz]=Mukammal koʻrinadigan boʻsh hujjatni yaratish
Comment[uz@cyrillic]=Мукаммал кўринадиган бўш ҳужжатни яратиш
Comment[zh_TW]=建立有寬邊界的空白文件
Icon=template_a4
-X-KDE-MeasureSystem=imperial
+X-TDE-MeasureSystem=imperial
diff --git a/kword/templates/Wordprocessing/TwoColumns.desktop b/kword/templates/Wordprocessing/TwoColumns.desktop
index 4c6d5aebf..480da9931 100644
--- a/kword/templates/Wordprocessing/TwoColumns.desktop
+++ b/kword/templates/Wordprocessing/TwoColumns.desktop
@@ -111,4 +111,4 @@ Comment[uz@cyrillic]=Икки устунли бўш A4 форматидаги ҳ
Comment[zh_CN]=创建每页两栏的 A4 文档。
Comment[zh_TW]=建立一個每頁兩欄的 A4 文件。
Icon=template_twocolumns
-X-KDE-MeasureSystem=metric
+X-TDE-MeasureSystem=metric
diff --git a/kword/templates/Wordprocessing/TwoColumnsLetter.desktop b/kword/templates/Wordprocessing/TwoColumnsLetter.desktop
index fe689f532..7df4f9263 100644
--- a/kword/templates/Wordprocessing/TwoColumnsLetter.desktop
+++ b/kword/templates/Wordprocessing/TwoColumnsLetter.desktop
@@ -107,4 +107,4 @@ Comment[uz@cyrillic]=Икки устунли бўш хат форматидаг
Comment[zh_CN]=创建每页两栏的信函文档。
Comment[zh_TW]=建立一個每頁兩欄的 letter 文件。
Icon=template_twocolumns
-X-KDE-MeasureSystem=imperial
+X-TDE-MeasureSystem=imperial
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index f881293a9..a54cfc257 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -1268,7 +1268,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const
// Using the extension allows to avoid relying on the mime magic when opening
KMimeType::Ptr mime = KMimeType::mimeType( nativeFormatMimeType() );
- TQString extension = mime->property( "X-KDE-NativeExtension" ).toString();
+ TQString extension = mime->property( "X-TDE-NativeExtension" ).toString();
if ( path.isEmpty() )
{
// Never saved? Use a temp file in $HOME then
@@ -2196,7 +2196,7 @@ TQCString KoDocument::nativeFormatMimeType() const
KService::Ptr service = const_cast(this)->nativeService();
if ( !service )
return TQCString();
- TQCString nativeMimeType = service->property( "X-KDE-NativeMimeType" ).toString().latin1();
+ TQCString nativeMimeType = service->property( "X-TDE-NativeMimeType" ).toString().latin1();
if ( nativeMimeType.isEmpty() ) {
// shouldn't happen, let's find out why it happened
if ( !service->serviceTypes().contains( "KOfficePart" ) )
@@ -2212,7 +2212,7 @@ TQCString KoDocument::nativeOasisMimeType() const
KService::Ptr service = const_cast(this)->nativeService();
if ( !service )
return TQCString();
- return service->property( "X-KDE-NativeOasisMimeType" ).toString().latin1();
+ return service->property( "X-TDE-NativeOasisMimeType" ).toString().latin1();
}
@@ -2247,7 +2247,7 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
if ( !service )
return TQCString();
- if ( service->property( "X-KDE-NativeMimeType" ).toString().isEmpty() )
+ if ( service->property( "X-TDE-NativeMimeType" ).toString().isEmpty() )
{
// It may be that the servicetype "KOfficePart" is missing, which leads to this property not being known
if ( KServiceType::serviceType( "KOfficePart" ) == 0L )
@@ -2255,11 +2255,11 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
else {
TQString instname = instance ? instance->instanceName() : kapp->instanceName();
if ( instname != "koshell" ) // hack for koshell
- kdWarning(30003) << service->desktopEntryPath() << ": no X-KDE-NativeMimeType entry!" << endl;
+ kdWarning(30003) << service->desktopEntryPath() << ": no X-TDE-NativeMimeType entry!" << endl;
}
}
- return service->property( "X-KDE-NativeMimeType" ).toString().latin1();
+ return service->property( "X-TDE-NativeMimeType" ).toString().latin1();
}
TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //static
@@ -2267,7 +2267,7 @@ TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //stati
KService::Ptr service = readNativeService( instance );
if ( !service )
return TQStringList();
- return service->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
+ return service->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
}
void KoDocument::setupXmlReader( TQXmlSimpleReader& reader, bool namespaceProcessing )
@@ -2302,7 +2302,7 @@ TQStringList KoDocument::extraNativeMimeTypes() const
KService::Ptr service = const_cast(this)->nativeService();
if ( !service ) // can't happen
return lst;
- return service->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
+ return service->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
}
int KoDocument::supportedSpecialFormats() const
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 829639ac0..f521607bf 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -183,7 +183,7 @@ public:
*
* With the help of @p instance or KApplication::instance() this
* method figures out which .desktop file matches this application. In this
- * file it searches for the "X-KDE-NativeMimeType" entry and returns it.
+ * file it searches for the "X-TDE-NativeMimeType" entry and returns it.
*
* @see KService
* @see KDesktopFile
@@ -195,7 +195,7 @@ public:
*
* With the help of @p instance or KApplication::instance() this
* method figures out which .desktop file matches this application. In this
- * file it searches for the "X-KDE-ExtraNativeMimeTypes" entry and returns it.
+ * file it searches for the "X-TDE-ExtraNativeMimeTypes" entry and returns it.
*
* @see KService
* @see KDesktopFile
@@ -218,14 +218,14 @@ public:
* To be preferred when a document exists. It is fast when calling
* it multiple times since it caches the result that readNativeFormatMimeType()
* delivers.
- * This comes from the X-KDE-NativeMimeType key in the .desktop file
+ * This comes from the X-TDE-NativeMimeType key in the .desktop file
* You do NOT have to reimplement this (it is only virtual for kounavail).
*/
virtual TQCString nativeFormatMimeType() const;
/**
* Returns the OASIS OpenDocument mimetype of the document, if supported
- * This comes from the X-KDE-NativeOasisMimeType key in the .desktop file
+ * This comes from the X-TDE-NativeOasisMimeType key in the .desktop file
*/
TQCString nativeOasisMimeType() const;
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 1c3a7fcb1..9656aa840 100644
--- a/lib/kofficecore/KoFileDialog.cpp
+++ b/lib/kofficecore/KoFileDialog.cpp
@@ -107,7 +107,7 @@ void KoFileDialog::setSpecialMimeFilter( TQStringList& mimeFilter,
for (mimeFilterIt = mimeFilter.begin (); mimeFilterIt != mimeFilter.end (); ++mimeFilterIt, i++)
{
KMimeType::Ptr mime = KMimeType::mimeType (*mimeFilterIt);
- TQString compatString = mime->property ("X-KDE-CompatibleApplication").toString ();
+ TQString compatString = mime->property ("X-TDE-CompatibleApplication").toString ();
if (!compatString.isEmpty ())
filterWidget->changeItem (i18n ("%1 (%2 Compatible)").arg (mime->comment ()).arg (compatString), i);
}
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index 62d93aa5a..2000a5496 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -806,8 +806,8 @@ namespace KOffice {
TQValueList::ConstIterator partEnd( parts.end() );
while ( partIt != partEnd ) {
- TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
- nativeMimeTypes += ( *partIt ).service()->property( "X-KDE-NativeMimeType" ).toString();
+ TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
+ nativeMimeTypes += ( *partIt ).service()->property( "X-TDE-NativeMimeType" ).toString();
TQStringList::ConstIterator it = nativeMimeTypes.begin();
TQStringList::ConstIterator end = nativeMimeTypes.end();
for ( ; it != end; ++it )
@@ -897,8 +897,8 @@ namespace KOffice {
// Be sure that v gets initialized correctly
while ( !v && partIt != partEnd ) {
- TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
- nativeMimeTypes += ( *partIt ).service()->property( "X-KDE-NativeMimeType" ).toString();
+ TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
+ nativeMimeTypes += ( *partIt ).service()->property( "X-TDE-NativeMimeType" ).toString();
TQStringList::ConstIterator it = nativeMimeTypes.begin();
TQStringList::ConstIterator end = nativeMimeTypes.end();
for ( ; !v && it != end; ++it )
@@ -911,8 +911,8 @@ namespace KOffice {
// Now we try to find the "cheapest" KOffice vertex
while ( partIt != partEnd ) {
- TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
- nativeMimeTypes += ( *partIt ).service()->property( "X-KDE-NativeMimeType" ).toString();
+ TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
+ nativeMimeTypes += ( *partIt ).service()->property( "X-TDE-NativeMimeType" ).toString();
TQStringList::ConstIterator it = nativeMimeTypes.begin();
TQStringList::ConstIterator end = nativeMimeTypes.end();
for ( ; !v && it != end; ++it ) {
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index f1bf2229a..b1e845b71 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -344,8 +344,8 @@ namespace // in order not to mess with the global namespace ;)
TQValueList::ConstIterator partEnd( parts.end() );
while ( partIt != partEnd ) {
- TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
- nativeMimeTypes += ( *partIt ).service()->property( "X-KDE-NativeMimeType" ).toString();
+ TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
+ nativeMimeTypes += ( *partIt ).service()->property( "X-TDE-NativeMimeType" ).toString();
TQStringList::ConstIterator it = nativeMimeTypes.begin();
const TQStringList::ConstIterator end = nativeMimeTypes.end();
for ( ; it != end; ++it )
@@ -519,8 +519,8 @@ TQStringList KoFilterManager::mimeFilter()
Vertex *v = new Vertex( "supercalifragilistic/x-pialadocious" );
vertices.insert( "supercalifragilistic/x-pialadocious", v );
while ( partIt != partEnd ) {
- TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
- nativeMimeTypes += ( *partIt ).service()->property( "X-KDE-NativeMimeType" ).toString();
+ TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
+ nativeMimeTypes += ( *partIt ).service()->property( "X-TDE-NativeMimeType" ).toString();
TQStringList::ConstIterator it = nativeMimeTypes.begin();
const TQStringList::ConstIterator end = nativeMimeTypes.end();
for ( ; it != end; ++it )
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 248d3ed39..19fea8238 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -757,7 +757,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent )
int c = suggestedFilename.findRev ('.');
KMimeType::Ptr mime = KMimeType::mimeType( _native_format );
- TQString ext = mime->property( "X-KDE-NativeExtension" ).toString();
+ TQString ext = mime->property( "X-TDE-NativeExtension" ).toString();
if (!ext.isEmpty ())
{
if (c < 0)
@@ -1201,7 +1201,7 @@ void KoMainWindow::print(bool quick) {
// strip off the native extension (I don't want foobar.kwd.ps when printing into a file)
KMimeType::Ptr mime = KMimeType::mimeType( rootView()->koDocument()->outputMimeType() );
if ( mime ) {
- TQString extension = mime->property( "X-KDE-NativeExtension" ).toString();
+ TQString extension = mime->property( "X-TDE-NativeExtension" ).toString();
if ( fileName.endsWith( extension ) )
fileName.truncate( fileName.length() - extension.length() );
diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp
index 5b04d6249..7b1618c11 100644
--- a/lib/kofficecore/KoQueryTrader.cpp
+++ b/lib/kofficecore/KoQueryTrader.cpp
@@ -76,7 +76,7 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) c
KoDocumentEntry KoDocumentEntry::queryByMimeType( const TQString & mimetype )
{
- TQString constr = TQString::fromLatin1( "[X-KDE-NativeMimeType] == '%1' or '%2' in [X-KDE-ExtraNativeMimeTypes]" ).arg( mimetype ).arg( mimetype );
+ TQString constr = TQString::fromLatin1( "[X-TDE-NativeMimeType] == '%1' or '%2' in [X-TDE-ExtraNativeMimeTypes]" ).arg( mimetype ).arg( mimetype );
TQValueList vec = query( false,constr );
if ( vec.isEmpty() )
@@ -96,7 +96,7 @@ KoDocumentEntry KoDocumentEntry::queryByMimeType( const TQString & mimetype )
} else
{
kdError(30003) << "Found no KOffice part able to handle " << mimetype << "!" << endl;
- kdError(30003) << "Check your installation (does the desktop file have X-KDE-NativeMimeType and KOfficePart, did you install KOffice in a different prefix than KDE, without adding the prefix to /etc/kderc ?)" << endl;
+ kdError(30003) << "Check your installation (does the desktop file have X-TDE-NativeMimeType and KOfficePart, did you install KOffice in a different prefix than KDE, without adding the prefix to /etc/kderc ?)" << endl;
}
return KoDocumentEntry();
}
@@ -135,7 +135,7 @@ TQValueList KoDocumentEntry::query( bool _onlyDocEmb, const TQS
if ( (*it)->noDisplay() )
continue;
// Maybe this could be done as a trader constraint too.
- if ( (!_onlyDocEmb) || ((*it)->property("X-KDE-NOTKoDocumentEmbeddable").toString()!="1") )
+ if ( (!_onlyDocEmb) || ((*it)->property("X-TDE-NOTKoDocumentEmbeddable").toString()!="1") )
{
KoDocumentEntry d( *it );
// Append converted offer
@@ -162,11 +162,11 @@ TQValueList KoDocumentEntry::query( bool _onlyDocEmb, const TQS
KoFilterEntry::KoFilterEntry( KService::Ptr service )
: m_service( service )
{
- import = service->property( "X-KDE-Import" ).toStringList();
- export_ = service->property( "X-KDE-Export" ).toStringList();
- int w = service->property( "X-KDE-Weight" ).toInt();
+ import = service->property( "X-TDE-Import" ).toStringList();
+ export_ = service->property( "X-TDE-Export" ).toStringList();
+ int w = service->property( "X-TDE-Weight" ).toInt();
weight = w < 0 ? UINT_MAX : static_cast( w );
- available = service->property( "X-KDE-Available" ).toString();
+ available = service->property( "X-TDE-Available" ).toString();
}
TQValueList KoFilterEntry::query( const TQString & _constr )
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index 343d47049..a86d799a2 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -229,8 +229,8 @@ void KoTemplateTree::readGroups() {
KSimpleConfig config(templateDir.absPath()+"/.directory", true);
config.setDesktopGroup();
name=config.readEntry("Name");
- defaultTab=config.readEntry("X-KDE-DefaultTab");
- sortingWeight=config.readNumEntry("X-KDE-SortingWeight", 1000);
+ defaultTab=config.readEntry("X-TDE-DefaultTab");
+ sortingWeight=config.readNumEntry("X-TDE-SortingWeight", 1000);
//kdDebug() << "name: " << name <file());
config.writeEntry("Name", t->name());
config.writeEntry("Icon", t->picture());
- config.writeEntry("X-KDE-Hidden", t->isHidden());
+ config.writeEntry("X-TDE-Hidden", t->isHidden());
}
namespace KoTemplates {
diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS
index f0121aa91..4a9d35796 100644
--- a/lib/kofficecore/THOUGHTS
+++ b/lib/kofficecore/THOUGHTS
@@ -94,7 +94,7 @@ some crappy output (but at least some output, e.g. an empty frame with some
text information about the part in it). Of course the user should be warned
before embedding such parts :)
b) embedding special KOffice parts as widgets:
-Here we can simply add one entry "X-KDE-EmbedAsWidget" or so to our
+Here we can simply add one entry "X-TDE-EmbedAsWidget" or so to our
.desktop files for KOffice parts. This will guarantee then that this special
part wants to be embedded as a widget. This surely makes sense, but still
we have some problems on printing... no idea how to solve that one. Maybe
@@ -105,7 +105,7 @@ General embedding stuff:
Do we support the "transparent" flag in paintContent with all parts we have?
IMHO it's a nice feature and we sould keep it, but if no part supports it...
well :]
-Maybe we'll have to add a X-KDE-DoNotEmbed flag to the .desktop files
+Maybe we'll have to add a X-TDE-DoNotEmbed flag to the .desktop files
at some point. These parts should be excluded in the part select dia, then.
3) Handling of embedded parts:
diff --git a/lib/kofficecore/kodocinfopropspage.desktop b/lib/kofficecore/kodocinfopropspage.desktop
index 8ef8c9582..8ca84a127 100644
--- a/lib/kofficecore/kodocinfopropspage.desktop
+++ b/lib/kofficecore/kodocinfopropspage.desktop
@@ -64,5 +64,5 @@ Name[xh]=Iphepha Lezinto zobumnini Zexwebhu lwe KOffice
Name[zh_CN]=KOffice 文档基本信息和属性
Name[zh_TW]=KOffice 文件資訊和屬性
Name[zu]=KOffice iphepha ledokhumenti Iphepha Eliqukethe Ulwazi
-X-KDE-Library=kodocinfopropspage
+X-TDE-Library=kodocinfopropspage
ServiceTypes=KPropsDlg/Plugin,application/x-kspread,application/x-kword,application/x-kpresenter,application/x-kchart
diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp
index 7ce1ed77d..cffc4c54b 100644
--- a/lib/kofficecore/tests/filter_graph.cpp
+++ b/lib/kofficecore/tests/filter_graph.cpp
@@ -42,8 +42,8 @@ int main( int /*argc*/, char ** /*argv*/ )
while ( partIt != partEnd ) {
//kdDebug() << ( *partIt ).service()->desktopEntryName() << endl;
- TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-KDE-ExtraNativeMimeTypes" ).toStringList();
- nativeMimeTypes += ( *partIt ).service()->property( "X-KDE-NativeMimeType" ).toString();
+ TQStringList nativeMimeTypes = ( *partIt ).service()->property( "X-TDE-ExtraNativeMimeTypes" ).toStringList();
+ nativeMimeTypes += ( *partIt ).service()->property( "X-TDE-NativeMimeType" ).toString();
TQStringList::ConstIterator it = nativeMimeTypes.begin();
TQStringList::ConstIterator end = nativeMimeTypes.end();
for ( ; it != end; ++it ) {
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
index 264ffefc3..7ce33ed91 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
@@ -49,6 +49,6 @@ Comment[uz]=OASIS OpenDocument diagrammasi
Comment[uz@cyrillic]=OASIS OpenDocument диаграммаси
Comment[zh_CN]=OASIS OpenDocument 图表
Comment[zh_TW]=OASIS 開放文件圖表
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.odc
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.formula.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.formula.desktop
index a50affa15..07875df3d 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.formula.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.formula.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument formula
Comment[uz@cyrillic]=OASIS OpenDocument формула
Comment[zh_CN]=OASIS OpenDocument 公式
Comment[zh_TW]=OASIS 開放文件公式
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.odf
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
index f3d0ad673..4b5ab7183 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument grafika namunasi
Comment[uz@cyrillic]=OASIS OpenDocument графика намунаси
Comment[zh_CN]=OASIS OpenDocument 绘图模板
Comment[zh_TW]=OASIS 開放文件圖片範本
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.otg
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
index 42375d0c2..33cf63ab3 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
@@ -50,6 +50,6 @@ Comment[uz]=OASIS OpenDocument grafika
Comment[uz@cyrillic]=OASIS OpenDocument графика
Comment[zh_CN]=OASIS OpenDocument 绘图
Comment[zh_TW]=OASIS 開放文件圖片
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.odg
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.image.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.image.desktop
index 918be3014..b5313ef9f 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.image.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.image.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument rasm
Comment[uz@cyrillic]=OASIS OpenDocument расм
Comment[zh_CN]=OASIS OpenDocument 图像
Comment[zh_TW]=OASIS 開放文件影像
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.odi
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop
index 9083daf32..7449124d8 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument namoyish namunasi
Comment[uz@cyrillic]=OASIS OpenDocument намойиш намунаси
Comment[zh_CN]=OASIS OpenDocument 演示文稿模板
Comment[zh_TW]=OASIS 開放文件簡報範本
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.otp
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop
index a5612c224..490b5fe87 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop
@@ -50,6 +50,6 @@ Comment[uz]=OASIS OpenDocument namoyish
Comment[uz@cyrillic]=OASIS OpenDocument намойиш
Comment[zh_CN]=OASIS OpenDocument 演示文稿
Comment[zh_TW]=OASIS 開放文件簡報
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.odp
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop
index 6cf157e6e..0c9f77e7e 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument elektron jadval namunasi
Comment[uz@cyrillic]=OASIS OpenDocument электрон жадвал намунаси
Comment[zh_CN]=OASIS OpenDocument 工作簿模板
Comment[zh_TW]=OASIS 開放文件工作表範本
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.ots
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop
index 288066f1c..c3f35a193 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument elektron jadval
Comment[uz@cyrillic]=OASIS OpenDocument электрон жадвал
Comment[zh_CN]=OASIS OpenDocument 工作簿
Comment[zh_TW]=OASIS 開放文件工作表
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.ods
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop
index 189aab9b0..bac496cd4 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument matn namunasi
Comment[uz@cyrillic]=OASIS OpenDocument матн намунаси
Comment[zh_CN]=OASIS OpenDocument 文本模板
Comment[zh_TW]=OASIS 開放文件文字範本
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.ott
diff --git a/mimetypes/trinity3/vnd.oasis.opendocument.text.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.text.desktop
index f8b4da85a..a2ec2e7d0 100644
--- a/mimetypes/trinity3/vnd.oasis.opendocument.text.desktop
+++ b/mimetypes/trinity3/vnd.oasis.opendocument.text.desktop
@@ -51,6 +51,6 @@ Comment[uz]=OASIS OpenDocument matn
Comment[uz@cyrillic]=OASIS OpenDocument матн
Comment[zh_CN]=OASIS OpenDocument 文本
Comment[zh_TW]=OASIS 開放文件文字
-[Property::X-KDE-NativeExtension]
+[Property::X-TDE-NativeExtension]
Type=TQString
Value=.odt
diff --git a/servicetypes/kochart.desktop b/servicetypes/kochart.desktop
index e7a89b38c..6f40156dc 100644
--- a/servicetypes/kochart.desktop
+++ b/servicetypes/kochart.desktop
@@ -1,4 +1,4 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KOfficeChart
+X-TDE-ServiceType=KOfficeChart
diff --git a/servicetypes/kofficepart.desktop b/servicetypes/kofficepart.desktop
index 7cab4b8cd..18629d479 100644
--- a/servicetypes/kofficepart.desktop
+++ b/servicetypes/kofficepart.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KOfficePart
-X-KDE-Derived=KParts/ReadWritePart
+X-TDE-ServiceType=KOfficePart
+X-TDE-Derived=KParts/ReadWritePart
Comment=KOffice Component
Comment[af]=Koffice Komponent
Comment[ar]=مُكَوِّن KOffice
@@ -70,16 +70,16 @@ Comment[zh_TW]=KOffice 元件
Comment[zu]=Ingxenye ye KOffice
# Name of the native mimetype (mandatory) - currently still the KOffice-1.3 one, e.g. application/x-kword
-[PropertyDef::X-KDE-NativeMimeType]
+[PropertyDef::X-TDE-NativeMimeType]
Type=TQString
# Name of the OASIS native mimetype (temporary, and optional)
-[PropertyDef::X-KDE-NativeOasisMimeType]
+[PropertyDef::X-TDE-NativeOasisMimeType]
Type=TQString
# Name of the additional mimetypes that the application can load/save natively
-[PropertyDef::X-KDE-ExtraNativeMimeTypes]
+[PropertyDef::X-TDE-ExtraNativeMimeTypes]
Type=TQStringList
-[PropertyDef::X-KDE-NOTKoDocumentEmbeddable]
+[PropertyDef::X-TDE-NOTKoDocumentEmbeddable]
Type=bool
diff --git a/servicetypes/kofilter.desktop b/servicetypes/kofilter.desktop
index 056acf629..1becb86ba 100644
--- a/servicetypes/kofilter.desktop
+++ b/servicetypes/kofilter.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KOfficeFilter
+X-TDE-ServiceType=KOfficeFilter
Comment=KOffice Filter
Comment[af]=Koffice Filter
Comment[ar]=مِرْشَح KOffice
@@ -69,14 +69,14 @@ Comment[zh_CN]=KOffice 过滤器
Comment[zh_TW]=KOffice 過濾程式
Comment[zu]=Icebo lokuhlaziya ifayela yenimininigwane i KOffice
-[PropertyDef::X-KDE-Import]
+[PropertyDef::X-TDE-Import]
Type=TQStringList
-[PropertyDef::X-KDE-Export]
+[PropertyDef::X-TDE-Export]
Type=TQStringList
-[PropertyDef::X-KDE-Weight]
+[PropertyDef::X-TDE-Weight]
Type=int
-[PropertyDef::X-KDE-Available]
+[PropertyDef::X-TDE-Available]
Type=TQString
diff --git a/servicetypes/kofilterwrapper.desktop b/servicetypes/kofilterwrapper.desktop
index a91353abb..2146fd037 100644
--- a/servicetypes/kofilterwrapper.desktop
+++ b/servicetypes/kofilterwrapper.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KOfficeGenericFilter
+X-TDE-ServiceType=KOfficeGenericFilter
Comment=KOffice Filter Wrapper
Comment[ar]=مُغَلِّف مِرْشَح KOffice
Comment[bg]=Обвивка за филтър на KOffice
@@ -53,8 +53,8 @@ Comment[xh]=Isisongeli Sesihluzi se KOffice
Comment[zh_CN]=KOffice 过滤器包装
Comment[zh_TW]=KOffice 過濾器包裝
-[PropertyDef::X-KDE-Wrapper-Import]
+[PropertyDef::X-TDE-Wrapper-Import]
Type=TQString
-[PropertyDef::X-KDE-Wrapper-Export]
+[PropertyDef::X-TDE-Wrapper-Export]
Type=TQString
diff --git a/servicetypes/koplugin.desktop b/servicetypes/koplugin.desktop
index 2731ed2b0..069441718 100644
--- a/servicetypes/koplugin.desktop
+++ b/servicetypes/koplugin.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
-X-KDE-ServiceType=KOfficePlugin
+X-TDE-ServiceType=KOfficePlugin
Comment=KOffice Plugin
Comment[af]=Koffice Inplak
Comment[ar]=مُلْحَق KOffice
diff --git a/tools/kfile-plugins/abiword/kfile_abiword.desktop b/tools/kfile-plugins/abiword/kfile_abiword.desktop
index 805aad4ad..a522452b0 100644
--- a/tools/kfile-plugins/abiword/kfile_abiword.desktop
+++ b/tools/kfile-plugins/abiword/kfile_abiword.desktop
@@ -43,7 +43,7 @@ Name[uz@cyrillic]=Abiword ҳужжати ҳақида маълумот
Name[zh_CN]=Abiword 信息
Name[zh_TW]=Abiword 資訊
ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_abiword
+X-TDE-Library=kfile_abiword
MimeType=application/x-abiword
PreferredGroups=DocumentInfo
PreferredItems=Author,Title,Abstract
diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop b/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop
index 9a99d1388..a1372f315 100644
--- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop
+++ b/tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop
@@ -43,7 +43,7 @@ Name[uz@cyrillic]=Gnumeric ҳужжати ҳақида маълумот
Name[zh_CN]=Gnumeric 信息
Name[zh_TW]=Gnumeric 資訊
ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_gnumeric
+X-TDE-Library=kfile_gnumeric
MimeType=application/x-gnumeric
PreferredGroups=DocumentInfo
PreferredItems=Author,Title,Abstract
diff --git a/tools/kfile-plugins/koffice/kfile_koffice.desktop b/tools/kfile-plugins/koffice/kfile_koffice.desktop
index 8c8449aad..8e6531801 100644
--- a/tools/kfile-plugins/koffice/kfile_koffice.desktop
+++ b/tools/kfile-plugins/koffice/kfile_koffice.desktop
@@ -60,7 +60,7 @@ Name[xh]=Ulwazi lwe KOffice
Name[zh_CN]=KOffice 信息
Name[zh_TW]=KOffice 資訊
ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_koffice
+X-TDE-Library=kfile_koffice
MimeType=application/x-kword;application/x-kpresenter;application/x-kspread;application/x-karbon
PreferredGroups=DocumentInfo
PreferredItems=Author,Title,Abstract
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.desktop b/tools/kfile-plugins/ooo/kfile_ooo.desktop
index 1dcca275b..99039aa97 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.desktop
+++ b/tools/kfile-plugins/ooo/kfile_ooo.desktop
@@ -51,7 +51,7 @@ Name[wa]=Informåcion OpenOffice.org
Name[zh_CN]=OpenOffice.org 信息
Name[zh_TW]=OpenOffice.org 資訊
ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_ooo
+X-TDE-Library=kfile_ooo
MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.math;application/vnd.sun.xml.writer.template;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.oasis.opendocument.image;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template
PreferredGroups=DocumentInfo
PreferredItems=Author,Title,Abstract
diff --git a/tools/kthesaurus/KThesaurus.desktop b/tools/kthesaurus/KThesaurus.desktop
index 636de9d6a..6ad6d486f 100644
--- a/tools/kthesaurus/KThesaurus.desktop
+++ b/tools/kthesaurus/KThesaurus.desktop
@@ -74,5 +74,5 @@ GenericName[wa]=Mots k' ont-st a vey
GenericName[xh]=Amagama Ahlobeneyo
GenericName[zh_CN]=相关单词
GenericName[zh_TW]=相關單字
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Office;
diff --git a/tools/scripts/check_koffice_install.sh b/tools/scripts/check_koffice_install.sh
index 3c637639b..8f7cf4f2e 100755
--- a/tools/scripts/check_koffice_install.sh
+++ b/tools/scripts/check_koffice_install.sh
@@ -25,7 +25,7 @@ function checkname()
cat $f
exit 1
fi
- nativemime=`grep X-KDE-NativeMimeType $f`
+ nativemime=`grep X-TDE-NativeMimeType $f`
echo Native mimetype : $nativemime
if echo $nativemime | grep "application/x-$instance" >/dev/null 2>/dev/null; then
found=1
@@ -69,7 +69,7 @@ if [ $found = 0 ]; then
fi
if [ $found = 0 ]; then
- echo "***** No $instance.desktop with X-KDE-NativeMimetype in it was found! Installation problem."
+ echo "***** No $instance.desktop with X-TDE-NativeMimetype in it was found! Installation problem."
echo $applnks
fi
diff --git a/tools/spell/kspelltool.desktop b/tools/spell/kspelltool.desktop
index d63e9cd89..676dc298b 100644
--- a/tools/spell/kspelltool.desktop
+++ b/tools/spell/kspelltool.desktop
@@ -66,7 +66,7 @@ Name[xh]=Isixhobo Sokukhangela Upelo
Name[zh_CN]=拼写检查工具
Name[zh_TW]=拼字檢查工具
Name[zu]=Ithuluzi Lokubhekisisa Kokubhalwa Kwamagama
-X-KDE-Library=libkspelltool
+X-TDE-Library=libkspelltool
Type=Service
Commands=spellcheck
Comment=Check this Word's Spelling
diff --git a/tools/thesaurus/thesaurustool.desktop b/tools/thesaurus/thesaurustool.desktop
index 368d44323..8c6ff95ae 100644
--- a/tools/thesaurus/thesaurustool.desktop
+++ b/tools/thesaurus/thesaurustool.desktop
@@ -60,7 +60,7 @@ Name[uz@cyrillic]=Тезаурус воситаси
Name[xh]=Isixhobo se Thesaurus
Name[zh_CN]=词典工具
Name[zh_TW]=同義字工具
-X-KDE-Library=libthesaurustool
+X-TDE-Library=libthesaurustool
Type=Service
Commands=thesaurus
Comment=Show Related Words
diff --git a/tools/thumbnail/clipartthumbnail.desktop b/tools/thumbnail/clipartthumbnail.desktop
index 893eb0403..6f88b8699 100644
--- a/tools/thumbnail/clipartthumbnail.desktop
+++ b/tools/thumbnail/clipartthumbnail.desktop
@@ -41,5 +41,5 @@ Name[zh_CN]=剪贴画
Name[zh_TW]=剪貼板
ServiceTypes=ThumbCreator
MimeTypes=image/wmf
-X-KDE-Library=clipartthumbnail
+X-TDE-Library=clipartthumbnail
CacheThumbnail=true
diff --git a/tools/thumbnail/kofficethumbnail.desktop b/tools/thumbnail/kofficethumbnail.desktop
index c2f3a7cfb..5721735a1 100644
--- a/tools/thumbnail/kofficethumbnail.desktop
+++ b/tools/thumbnail/kofficethumbnail.desktop
@@ -66,5 +66,5 @@ Name[zh_CN]=KOffice 文件
Name[zh_TW]=KOffice 檔案
ServiceTypes=ThumbCreator
MimeTypes=application/x-kword,application/x-kspread,application/x-kpresenter,application/x-karbon,application/x-chalk,application/x-kchart,application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.chart,application/vnd.oasis.opendocument.chart-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.formula-template
-X-KDE-Library=kofficethumbnail
+X-TDE-Library=kofficethumbnail
CacheThumbnail=true
diff --git a/tools/thumbnail/otherofficethumbnail.desktop b/tools/thumbnail/otherofficethumbnail.desktop
index 1c515f6f1..d9a228241 100644
--- a/tools/thumbnail/otherofficethumbnail.desktop
+++ b/tools/thumbnail/otherofficethumbnail.desktop
@@ -65,5 +65,5 @@ Name[zh_CN]=其它 Office 文件
Name[zh_TW]=其他 Office 檔案
ServiceTypes=ThumbCreator
MimeTypes=application/illustrator,application/msexcel,application/mspowerpoint,application/msword,application/vnd.palm,application/wordperfect,application/x-abiword,application/x-amipro,application/x-applixgraphics,application/x-applixspread,application/x-applixword,application/x-gnumeric,application/x-quattropro,image/x-msod,text/rtf,text/vnd.wap.wml
-X-KDE-Library=kofficethumbnail
+X-TDE-Library=kofficethumbnail
CacheThumbnail=true