16 files changed, 5 insertions, 154 deletions
diff --git a/libtdepim/komposer/core/attachment.cpp b/libtdepim/komposer/core/attachment.cpp
index df803de6..6d5017e9 100644
--- a/libtdepim/komposer/core/attachment.cpp
+++ b/libtdepim/komposer/core/attachment.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * attachment.cpp
  *
diff --git a/libtdepim/komposer/core/attachment.h b/libtdepim/komposer/core/attachment.h
index 5c4e1ebf..8344c8d7 100644
--- a/libtdepim/komposer/core/attachment.h
+++ b/libtdepim/komposer/core/attachment.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * attachment.h
  *
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index fa8e1dc1..2616f8e2 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * core.cpp
  *
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 92235a18..482ee1db 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * core.h
  *
diff --git a/libtdepim/komposer/core/corewidget.cpp b/libtdepim/komposer/core/corewidget.cpp
index c6589376..d9130f53 100644
--- a/libtdepim/komposer/core/corewidget.cpp
+++ b/libtdepim/komposer/core/corewidget.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * corewidget.cpp
  *
diff --git a/libtdepim/komposer/core/corewidget.h b/libtdepim/komposer/core/corewidget.h
index dbe1d674..c2a6a0e7 100644
--- a/libtdepim/komposer/core/corewidget.h
+++ b/libtdepim/komposer/core/corewidget.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * corewidget.h
  *
diff --git a/libtdepim/komposer/core/editor.cpp b/libtdepim/komposer/core/editor.cpp
index 5dada393..83b11b0e 100644
--- a/libtdepim/komposer/core/editor.cpp
+++ b/libtdepim/komposer/core/editor.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * editor.cpp
  *
diff --git a/libtdepim/komposer/core/editor.h b/libtdepim/komposer/core/editor.h
index a1845f6f..4e595b3f 100644
--- a/libtdepim/komposer/core/editor.h
+++ b/libtdepim/komposer/core/editor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * editor.h
  *
diff --git a/libtdepim/komposer/core/komposerconfig.desktop b/libtdepim/komposer/core/komposerconfig.desktop
index c07ea50c..af98889b 100644
--- a/libtdepim/komposer/core/komposerconfig.desktop
+++ b/libtdepim/komposer/core/komposerconfig.desktop
@@ -10,47 +10,7 @@ X-TDE-FactoryName=komposerconfig
 X-TDE-HasReadOnlyMode=false
 
 Name=Komposer
-Name[cy]=Kyfansoddydd
-Name[da]=Brevskriver
-Name[hi]=कम्पोज़र
-Name[ms]=Penggubah
-Name[ne]=कम्पोजर
-Name[pt]=Kompositor
-Name[ta]=கம்போசர்
+
 Comment=TDE Komposer
-Comment[bg]=Писане на форматиран текст
-Comment[br]=Komposer TDE
-Comment[ca]=Compositor per a TDE
-Comment[cy]=Cyfansoddydd TDE
-Comment[da]=TDE Brevskriver
-Comment[de]=TDE-Komposer
-Comment[fr]=Komposer TDE
-Comment[ga]=Komposer TDE
-Comment[hi]=केडीई कम्पोज़र
-Comment[ms]=Penggubah TDE
-Comment[nds]=Nettbreef-Editor vun TDE
-Comment[ne]=केडीई कम्पोजर
-Comment[nn]=TDE, tekstredigerar for e-post
-Comment[pl]=Komposer dla TDE
-Comment[pt]=Kompositor do TDE
-Comment[pt_BR]=Konposer do TDE
-Comment[ru]=Композитор TDE
-Comment[ta]=கேடிஇ கம்போசர்
-Comment[tg]=Композитори TDE
+
 Keywords=komposer;
-Keywords[bg]=редактор; съставител; форматиране; текст; komposer;
-Keywords[ca]=compositor;
-Keywords[cy]=komposer;kyfansoddydd;
-Keywords[da]=brevskriver;
-Keywords[de]=Komposer;
-Keywords[fy]=komposer;opstellen; opsteller;
-Keywords[hi]=कम्पोज़र;
-Keywords[nds]=Komposer;
-Keywords[ne]=कम्पोजर;
-Keywords[nl]=komposer;opstellen;
-Keywords[nn]=komposer;tekstredigerar;epost;
-Keywords[ru]=komposer;ноты;
-Keywords[sr]=komposer;састављач;
-Keywords[sr@Latn]=komposer;sastavljač;
-Keywords[ta]=கம்போசர்;
-Keywords[tg]=komposer;нотаҳо;
diff --git a/libtdepim/komposer/core/komposereditor.desktop b/libtdepim/komposer/core/komposereditor.desktop
index 54b68a02..134a1753 100644
--- a/libtdepim/komposer/core/komposereditor.desktop
+++ b/libtdepim/komposer/core/komposereditor.desktop
@@ -2,55 +2,8 @@
 Type=ServiceType
 X-TDE-ServiceType=Komposer/Editor
 X-TDE-Derived=Komposer/Plugin
+
 Comment=Komposer Editor
-Comment[af]=Komposer Redigeerder
-Comment[bg]=Писане на форматиран текст
-Comment[br]=Aozer Komposer
-Comment[bs]=Komposer editor
-Comment[ca]=Compositor per a TDE
-Comment[cs]=Komposer editor
-Comment[da]=Komposer editor
-Comment[el]=Επεξεργαστής Komposer
-Comment[eo]=Komposer-redaktilo
-Comment[es]=Editor Komposer
-Comment[et]=Komposeri redaktor
-Comment[eu]=Komposer editorea
-Comment[fa]=ویرایشگر Komposer
-Comment[fi]=Komposer-muokkain
-Comment[fr]=Éditeur Komposer
-Comment[fy]=Komposer-bewurker
-Comment[ga]=Eagarthóir Komposer
-Comment[gl]=Editor Komposer
-Comment[he]=עורך של Komposer
-Comment[hu]=Komposer
-Comment[is]=Komposer ritill
-Comment[it]=Komposer editor
-Comment[ja]=Komposer,エディタ
-Comment[kk]=Komposer өңдегіші
-Comment[km]=កម្មវិធីនិពន្ធ Komposer
-Comment[ko]=Komposer 편집기
-Comment[lt]=Komposer redaktorius
-Comment[ms]=Editor Komposer
-Comment[nb]=Komposer redigerer
-Comment[nds]=Komposer-Editor
-Comment[ne]=कम्पोजर सम्पादक
-Comment[nl]=Komposer-editor
-Comment[nn]=Komposer redigerar
-Comment[pl]=Edytor Komposer
-Comment[pt]=Editor Kompositor
-Comment[pt_BR]=Editor de Mensagens
-Comment[ru]=Редактор Komposer
-Comment[sk]=Editor Komposer
-Comment[sl]=Urejevalnik Komposer
-Comment[sr]=Уређивач Komposer
-Comment[sr@Latn]=Uređivač Komposer
-Comment[sv]=Komposer editor
-Comment[ta]=கம்போசர் தொகுப்பான்
-Comment[tg]=Муҳаррири Komposer
-Comment[tr]=Komposer Düzenleyicisi
-Comment[uk]=Редактор Komposer
-Comment[zh_CN]=Komposer 编辑器
-Comment[zh_TW]=Komposer 編輯器
 
 [PropertyDef::X-Komposer-Weight]
 Type=int
diff --git a/libtdepim/komposer/core/komposerplugin.desktop b/libtdepim/komposer/core/komposerplugin.desktop
index 39dfdb6c..3433f888 100644
--- a/libtdepim/komposer/core/komposerplugin.desktop
+++ b/libtdepim/komposer/core/komposerplugin.desktop
@@ -2,58 +2,8 @@
 Type=ServiceType
 X-TDE-ServiceType=Komposer/Plugin
 X-TDE-Derived=KPluginInfo
+
 Name=Komposer Plugin
-Name[af]=Komposer inprop module
-Name[bg]=Приставка за Komposer
-Name[br]=Lugent Komposer
-Name[bs]=Komposer dodatak
-Name[ca]=Endollable Komposer
-Name[cs]=Komposer modul
-Name[cy]=Ategyn Kyfansoddydd
-Name[da]=Brevskriver-plugin
-Name[de]=Komposer-Modul
-Name[el]=Πρόσθετο του Komposer
-Name[eo]=Komposer-kromaĵo
-Name[es]=Accesorio Komposer
-Name[et]=Komposeri plugin
-Name[eu]=Komposer plugin-a
-Name[fa]=وصلۀ Komposer
-Name[fi]=Komposer-liitännäinen
-Name[fr]=Module de Komposer
-Name[fy]=Komposer-plugin
-Name[ga]=Breiseán Komposer
-Name[gl]=Extensión Komposer
-Name[he]=תןסף Kompoer
-Name[hi]=कम्पोज़र प्लगइन
-Name[hu]=Komposer bővítőmodul
-Name[is]=Komposer íforrit
-Name[it]=Plugin Komposer
-Name[ja]=Komposer プラグイン
-Name[kk]=Komposer плагин модулі
-Name[km]=កម្មវិធីជំនួយ Komposer
-Name[ko]=Komposer 플러그인
-Name[lt]=Komposer priedas
-Name[ms]=Plugin Komposer
-Name[nb]=Komposer-programtillegg
-Name[nds]=Komposer-Moduul
-Name[ne]=कम्पोजर प्लगइन
-Name[nn]=Komposer-programtillegg
-Name[pl]=Wtyczka Komposer
-Name[pt]='Plugin' do Kompositor
-Name[pt_BR]=Plug-in do Komposer
-Name[ro]=Modul Komposer
-Name[ru]=Модуль Komposer
-Name[sk]=Modul Komposer
-Name[sl]=Vstavek za Komposer
-Name[sr]=Прикључак Komposer-а
-Name[sr@Latn]=Priključak Komposer-a
-Name[sv]=Komposer-insticksprogram
-Name[ta]=கம்போசர் சொருகுப்பொருள்
-Name[tg]=Модули Komposer
-Name[tr]=Komposer Eklentisi
-Name[uk]=Втулок Komposer
-Name[zh_CN]=Komposer 插件
-Name[zh_TW]=Komposer 外掛程式
 
 [PropertyDef::X-Komposer-Version]
 Type=int
diff --git a/libtdepim/komposer/core/plugin.cpp b/libtdepim/komposer/core/plugin.cpp
index 41af47cd..133d203d 100644
--- a/libtdepim/komposer/core/plugin.cpp
+++ b/libtdepim/komposer/core/plugin.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * plugin.cpp
  *
diff --git a/libtdepim/komposer/core/plugin.h b/libtdepim/komposer/core/plugin.h
index c14bcc6b..ac0b5498 100644
--- a/libtdepim/komposer/core/plugin.h
+++ b/libtdepim/komposer/core/plugin.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * plugin.h
  *
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 2e5aa4f6..9a33b990 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 2; -*-
 /**
  * pluginmanager.cpp
  * Most of this code has been lifted from Martijn's KopetePluginManager class
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index eae6d49a..d9366b3f 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 /**
  * pluginmanager.h
  *
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 3070b165..abacd0eb 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -31,7 +31,7 @@
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C"
 {