Update TDE menu to reduce clutter and eliminate conflicts with KDE4.

This partially resolves bug report 977.

11 files changed, 19 insertions, 19 deletions

diff --git a/kaddressbook/kaddressbook.desktop b/kaddressbook/kaddressbook.desktop
index 1d9633fca..c75c284c4 100644
--- a/kaddressbook/kaddressbook.desktop
+++ b/kaddressbook/kaddressbook.desktop
@@ -78,4 +78,4 @@ X-DCOP-ServiceName=kaddressbook
 MimeType=text/x-vcard;text/x-ldif;
 ServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook
 X-TDE-Library=libkaddressbookpart
-Categories=Qt;TDE;Office;ContactManagement;
+Categories=Qt;TDE;Office;ContactManagement;X-TDE-Office-PIM;
diff --git a/kalarm/kalarm.desktop b/kalarm/kalarm.desktop
index 9749750e3..0efd26c84 100644
--- a/kalarm/kalarm.desktop
+++ b/kalarm/kalarm.desktop
@@ -47,7 +47,7 @@ GenericName[kk]=Дербес ескертулер жоспарлағышы
 GenericName[km]=កម្មវិធី​កំណត់​ម៉ោង​រោទ៍​ផ្ទាល់​ខ្លួន
 GenericName[lt]=Asmeninių žinučių-priminimų planuoklis
 GenericName[mk]=Закажување лични аларми
-GenericName[ms]=Penjadual Penggera Peribadi 
+GenericName[ms]=Penjadual Penggera Peribadi
 GenericName[nb]=Personlig varslingsplanlegger
 GenericName[nds]=Persöönlich Anstöötgever
 GenericName[ne]=व्यक्तिगत संसूचक अनुसूचक
@@ -70,5 +70,5 @@ GenericName[zh_TW]=個人鬧鐘排程程式
 Terminal=false
 X-DCOP-ServiceType=Unique
 X-TDE-StartupNotify=true
-Categories=Qt;TDE;Utility;X-TDE-Utilities-PIM;Office;Calendar;
+Categories=Qt;TDE;Office;X-TDE-Office-PIM;Calendar;
 OnlyShowIn=TDE;
diff --git a/kandy/src/kandy.desktop b/kandy/src/kandy.desktop
index ee08bcf5f..ae9b2f5e7 100644
--- a/kandy/src/kandy.desktop
+++ b/kandy/src/kandy.desktop
@@ -108,11 +108,11 @@ GenericName[tr]=Cep Telefonu Aracı
 GenericName[uk]=Засіб для мобільних телефонів
 GenericName[uz]=Уяли телефон учун восита
 GenericName[ven]=Tshishumiswa tsha lutingo thendeleki
-GenericName[vi]=Công cụ điện thoại di động 
+GenericName[vi]=Công cụ điện thoại di động
 GenericName[xh]=Isixhobo Semfono-mfono Ekuhanjwa nayo
 GenericName[zh_CN]=移动电话工具
 GenericName[zh_TW]=行動電話工具
 GenericName[zu]=Ithuluzi Lamakhala ekhukhwini
 Terminal=false
 X-DCOP-ServiceType=Multi
-Categories=Qt;TDE;Utility;Telephony;
+Categories=Qt;TDE;Utility;Telephony;X-TDE-Utilities-Peripherals;
diff --git a/karm/support/karm.desktop b/karm/support/karm.desktop
index 63aae1e82..301d1f4ea 100644
--- a/karm/support/karm.desktop
+++ b/karm/support/karm.desktop
@@ -62,7 +62,7 @@ GenericName[tg]=Баҳисобгирии вақти корӣ
 GenericName[tr]=Kişisel Saat İzleyici
 GenericName[uk]=Персональний лічильник часу
 GenericName[ven]=Tshisedzulusi tsha tshifhinga tsha vhune
-GenericName[vi]=Trình đo thời gian 
+GenericName[vi]=Trình đo thời gian
 GenericName[xh]=Umfumani Wexesha Lobuqu
 GenericName[zh_CN]=个人时间记录
 GenericName[zh_TW]=個人時程記錄
@@ -75,4 +75,4 @@ Type=Application
 Terminal=false
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;TDE;X-TDE-Utilities-PIM;Office;Calendar;
+Categories=Qt;TDE;X-TDE-Office-PIM;Office;Calendar;
diff --git a/kmail/KMail.desktop b/kmail/KMail.desktop
index 360e1ff0f..a2bd990db 100644
--- a/kmail/KMail.desktop
+++ b/kmail/KMail.desktop
@@ -88,4 +88,4 @@ X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kmail
 ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
-Categories=Qt;TDE;Network;Office;Email;
+Categories=Qt;TDE;Network;Office;Email;X-TDE-Office-PIM;
diff --git a/knotes/knotes.desktop b/knotes/knotes.desktop
index 63c03664c..cb64c4481 100644
--- a/knotes/knotes.desktop
+++ b/knotes/knotes.desktop
@@ -37,7 +37,7 @@ GenericName[km]=ចំណាំ​លេចឡើង
 GenericName[lt]=Pastabos lapeliuose
 GenericName[lv]=Izlecošās Piezīmes
 GenericName[mk]=Скок-белешки
-GenericName[ms]=Nota Popup 
+GenericName[ms]=Nota Popup
 GenericName[mt]=Noti żgħar
 GenericName[nb]=Sprettopp-notater
 GenericName[nds]=Opduk-Notizen
@@ -87,4 +87,4 @@ Name[zh_TW]=KNotes 便利貼
 
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
-Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;Office;
+Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
diff --git a/kontact/src/Kontact.desktop b/kontact/src/Kontact.desktop
index 82ec08bb5..2c1ffa220 100644
--- a/kontact/src/Kontact.desktop
+++ b/kontact/src/Kontact.desktop
@@ -34,7 +34,7 @@ GenericName[he]=מנהל מידע אישי
 GenericName[hi]=निजी जानकारी प्रबंधक
 GenericName[hu]=Információkezelő
 GenericName[is]=Persónulegur upplýsingastjórnandi
-GenericName[it]=Gestione informazioni personali 
+GenericName[it]=Gestione informazioni personali
 GenericName[ja]=個人情報マネージャ
 GenericName[kk]=Дербес Ақпарат Менеджері
 GenericName[km]=កម្មវិធី​គ្រប់គ្រង​ព័ត៌មាន​ផ្ទាល់​ខ្លួន
@@ -65,5 +65,5 @@ GenericName[zh_CN]=个人信息管理器
 GenericName[zh_TW]=個人資訊管理者
 Terminal=false
 X-TDE-StartupNotify=true
-Categories=Qt;TDE;Office;Network;Email;
+Categories=Qt;TDE;Office;Network;Email;X-TDE-Office-PIM;
 DocPath=kontact/index.html
diff --git a/korganizer/korganizer.desktop b/korganizer/korganizer.desktop
index a75e4d596..c815fe4ec 100644
--- a/korganizer/korganizer.desktop
+++ b/korganizer/korganizer.desktop
@@ -26,13 +26,13 @@ Comment[hr]=Kalendar i rokovnik
 Comment[hu]=Határidőnapló és eseményszervező
 Comment[is]=Dagbók og skipulag
 Comment[it]=Programma di calendario e di agenda
-Comment[ja]=カレンダーとスケジュール管理プログラム
+Comment[ja]=カレンダーとスケジュール管理プログラ�
 Comment[kk]=Күнтізбе және Жоспарлау бағдарламасы
 Comment[km]=កម្មវិធី​ប្រតិទិន និង​កាលវិភាគ
 Comment[lt]=Kalendoriaus ir planavimo programa
 Comment[lv]=Kalendāra un Plānošanas Programma
 Comment[mk]=Програма за календари и закажувања
-Comment[ms]=Kalendar dan Program Penjadualan 
+Comment[ms]=Kalendar dan Program Penjadualan
 Comment[mt]=Programm b' kalendarju w skeda
 Comment[nb]=Et kalender- og tidsplanleggingsprogram
 Comment[nds]=Kalenner un Tietplaner
diff --git a/korn/KOrn.desktop b/korn/KOrn.desktop
index c795ac491..dfb7a76f4 100644
--- a/korn/KOrn.desktop
+++ b/korn/KOrn.desktop
@@ -73,4 +73,4 @@ Name[ne]=कर्न
 Name[ta]=கார்ன்
 Name[zh_TW]=Korn 信件通知
 X-DCOP-ServiceType=Unique
-Categories=Qt;TDE;Office;Email;
+Categories=Qt;TDE;Office;Email;X-TDE-Office-PIM;
diff --git a/ktnef/gui/ktnef.desktop b/ktnef/gui/ktnef.desktop
index 2a45f1e83..ea4ec88db 100644
--- a/ktnef/gui/ktnef.desktop
+++ b/ktnef/gui/ktnef.desktop
@@ -29,7 +29,7 @@ GenericName[kk]=TNEF файлды қарау құралы
 GenericName[km]=កម្មវិធី​មើល​ឯកសារ TNEF
 GenericName[lt]=TNEF bylų žiūryklė
 GenericName[mk]=Прегледувач на TNEF-датотеки
-GenericName[ms]=Pemapar Fail TNEF 
+GenericName[ms]=Pemapar Fail TNEF
 GenericName[nb]=TNEF-filvisning
 GenericName[nds]=TNEF-Dateikieker
 GenericName[ne]=TNEF फाइल दर्शक
@@ -80,7 +80,7 @@ Comment[ja]=TNEF ファイルのためのビューア/展開ツール
 Comment[kk]=TNEF файдарды қарау/тарқату
 Comment[km]=កម្មវិធី​មើល និង​ស្រង់​ឯកសារ TNEF
 Comment[lt]=TNEF bylų žiūryklė - išpakuotojas
-Comment[ms]=Pemapar/pengekstrak untuk fail TNEF 
+Comment[ms]=Pemapar/pengekstrak untuk fail TNEF
 Comment[nb]=En utpakker/fremviser for TNEF-filer
 Comment[nds]=TNEF-Dateien ankieken un Delen ruttrecken
 Comment[ne]=TNEF फाइलका लागि दर्शक/निष्कासक
@@ -104,4 +104,4 @@ Comment[zh_CN]=TNEF 文件的查看/提取器
 Comment[zh_TW]=TNEF 檔案檢視器
 Terminal=false
 MimeType=application/ms-tnef;
-Categories=Qt;TDE;Office;
+Categories=Qt;TDE;Office;X-TDE-Office-PIM;
diff --git a/wizards/groupwarewizard.desktop b/wizards/groupwarewizard.desktop
index 8dc1ad434..b5c376449 100644
--- a/wizards/groupwarewizard.desktop
+++ b/wizards/groupwarewizard.desktop
@@ -49,4 +49,4 @@ Type=Application
 Icon=kontact
 Terminal=false
 X-TDE-StartupNotify=true
-Categories=Qt;TDE;Office;
+Categories=Qt;TDE;Office;X-TDE-Office-PIM;