6 files changed, 24 insertions, 150 deletions
diff --git a/kicker/applets/trash/CMakeLists.txt b/kicker/applets/trash/CMakeLists.txt
index e5ae62051..96ae16574 100644
--- a/kicker/applets/trash/CMakeLists.txt
+++ b/kicker/applets/trash/CMakeLists.txt
@@ -28,7 +28,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES trashapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
+tde_create_translated_desktop(
+  SOURCE trashapplet.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
+  PO_DIR kicker-desktops
+)
 
 
 ##### trash_panelapplet (module) ################
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index f431b8aed..b86b5ef9d 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
+	TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
 	{
 		TDEGlobal::locale()->insertCatalogue("trashapplet");
 		return new TrashApplet(configFile, KPanelApplet::Normal,
@@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQW
 
 	mpDirLister = new KDirLister();
 
-	connect( mpDirLister, TQT_SIGNAL( clear() ),
-	         this, TQT_SLOT( slotClear() ) );
-	connect( mpDirLister, TQT_SIGNAL( completed() ),
-	         this, TQT_SLOT( slotCompleted() ) );
-	connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-	         this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
+	connect( mpDirLister, TQ_SIGNAL( clear() ),
+	         this, TQ_SLOT( slotClear() ) );
+	connect( mpDirLister, TQ_SIGNAL( completed() ),
+	         this, TQ_SLOT( slotCompleted() ) );
+	connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+	         this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
 
 	mpDirLister->openURL("trash:/");
 }
@@ -67,8 +67,8 @@ TrashApplet::~TrashApplet()
 {
 	// disconnect the dir lister before quitting so as not to crash
 	// on kicker exit
-	disconnect( mpDirLister, TQT_SIGNAL( clear() ),
-	            this, TQT_SLOT( slotClear() ) );
+	disconnect( mpDirLister, TQ_SIGNAL( clear() ),
+	            this, TQ_SLOT( slotClear() ) );
 	delete mpDirLister;
 	TDEGlobal::locale()->removeCatalogue("trashapplet");
 }
@@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * )
 	int size = 1;
 
 	size = std::max( size, 
-			 orientation() == Qt::Vertical ?
+			 orientation() == TQt::Vertical ?
 			 	mButton->heightForWidth( width() ) :
 				mButton->widthForHeight( height() ) );
 
 	
-	if(orientation() == Qt::Vertical)
+	if(orientation() == TQt::Vertical)
 	{
 		mButton->resize( width(), size );
 	}
diff --git a/kicker/applets/trash/trashapplet.desktop b/kicker/applets/trash/trashapplet.desktop
index b4d0f0828..9450225aa 100644
--- a/kicker/applets/trash/trashapplet.desktop
+++ b/kicker/applets/trash/trashapplet.desktop
@@ -1,138 +1,8 @@
 [Desktop Entry]
 Type=Plugin
-Comment=Displays the trashcan and allows files to be dropped onto it
-Comment[af]=Vertoon die asblik en laat toe dat lêers in dit gegooi mag word
-Comment[ar]=يظهر سلّة المهملات و يسمح بإسقاط الملفات فيها
-Comment[be]=Паказвае сметніцу і дазваляе кідаць файлы ў яе
-Comment[bg]=Показване на кошчето и възможност за преместване на файлове в него
-Comment[bn]=আবর্জনার বাক্স দেখায়, যাতে ফাইল ড্রপ করা যায়
-Comment[bs]=Prikazuje kantu za smeće i omogućuje da se u nju bacaju datoteke
-Comment[ca]=Mostra la paperera i permet amollar-hi fitxers
-Comment[cs]=Zobrazuje koš a umožňuje do něj odhazovat soubory
-Comment[csb]=Wëskrzëniwô zamkłósc kòsza ë zezwôlô przecygac do niegò lopczi
-Comment[da]=Viser affaldsspanden og tillader at filer droppes på den
-Comment[de]=Mülleimerfunktion in der Kontrollleiste
-Comment[el]=Εμφανίζει τον Κάδο Απορριμμάτων και επιτρέπει την απόθεση αρχείων πάνω του
-Comment[en_GB]=Displays the wastebin and allows files to be dropped onto it
-Comment[eo]=Montras rubujon kaj ebligas dosiero-alfaligon
-Comment[es]=Muestra la papelera y permite tirar archivos en ella
-Comment[et]=Näitab prügikasti ning lubab faile sellesse visata
-Comment[eu]=Zakarontzia bistaratzen du, fitxategiak jauregitea lagunduz
-Comment[fa]=زباله‌دان را نمایش داده و به پرونده‌ها اجازه می‌دهد در آن بیفتند
-Comment[fi]=Näyttää roskakorin ja sallii tiedostojen pudottamisen siihen
-Comment[fr]=Affiche la corbeille et permet d'y déposer des fichiers
-Comment[fy]=Lit it jiskefet sjen en stiet ta dat triemmen fuortsmiten wurde troch se nei it byldkaike ta te slepen
-Comment[gl]=Mostra a papeleira e permite deitar ficheiros nela
-Comment[he]=מציג את פח האשפה ומאפשר לך לזרוק אליו קבצים
-Comment[hr]=Prikazuje kantu za otpad i omogućuje ispuštanje datoteka u nju
-Comment[hu]=Megjeleníti a szemétkosarat, lehetővé téve fájlok belehelyezését
-Comment[is]=Sýnir ruslakörfuna og leyfir að skrám sé sleppt á hana
-Comment[it]=Mostra il cestino e permette di trascinarci sopra i file
-Comment[ja]=ごみ箱を表示し、ごみ箱へのファイルのドロップを可能にします
-Comment[kk]=Өшірілгендер шелегін керсетіп, оған файлдарды тастауға мүмкіндік береді
-Comment[km]=បង្ហាញធុងសំរាម និងអនុញ្ញាតឲ្យទម្លាក់ឯកសារលើវា
-Comment[lt]=Rodo šiukšliadėžę ir leidžia į ją tempiant numesti bylas
-Comment[mk]=Ја прикажува корпата и овозможува пуштање датотеки врз неа
-Comment[nb]=Viser papirkurven og lar deg legge filer i den
-Comment[nds]=Wiest de Affalltünn, Dateien köönt dor op droppt warrn.
-Comment[ne]=रद्दीटोकरी प्रदर्शन गर्छ र यसमा फाइलहरू राख्न अनुमति दिन्छ
-Comment[nl]=Toont de prullenbak en maakt het mogelijk bestanden weg te gooien door ze naar het pictogram te slepen
-Comment[nn]=Viser papirkorga og lèt deg leggja filer i henne
-Comment[pl]=Pokazuje kosz i pozwala przeciągać do niego pliki
-Comment[pt]=Mostra o caixote do lixo e permite largar ficheiros nele
-Comment[pt_BR]=Mostra a lixeira e permite que arquivos sejam arrastados até ela
-Comment[ro]=Afișează coșul de gunoi și permite aruncare fișierelor în acesta
-Comment[ru]=Показать на рабочем столе корзину для ненужных файлов
-Comment[sk]=Zobrazí odpadkový kôš a povolí vhodenie súborov do neho
-Comment[sl]=Prikaz ikone za Smeti, na katero lahko odvržete datoteke
-Comment[sr]=Приказује канту за смеће и омогућава испуштање фајлова на њу
-Comment[sr@Latn]=Prikazuje kantu za smeće i omogućava ispuštanje fajlova na nju
-Comment[sv]=Visar papperskorgen och tillåter att filer släpps på den
-Comment[th]=แสดงถังขยะและอนุญาตให้มีการปล่อยแฟ้มลงไปได้
-Comment[tr]=Çöp kutusunu gösterir ve dosyaların üzerine taşınmasına izin verir
-Comment[uk]=Показує смітник і дає змогу вкидати в нього файли
-Comment[vi]=Hiển thị thùng rác và cho phép thả các tập tin vào đó
-Comment[wa]=Håyneye l' batch et permete di mete des fitchîs å dvins
-Comment[zh_CN]=显示回收站，并允许您将文件拖至其上
-Comment[zh_TW]=顯示垃圾筒並且允許將檔案丟到其中
 Name=Trash
-Name[af]=Gemors
-Name[ar]=سلة النفايات
-Name[az]=Zibil
-Name[be]=Сметніца
-Name[bg]=Кошче
-Name[bn]=আবর্জনা
-Name[br]=Pod-lastez
-Name[bs]=Smeće
-Name[ca]=Paperera
-Name[cs]=Koš
-Name[csb]=Kòsz
-Name[cy]=Sbwriel
-Name[da]=Affald
-Name[de]=Mülleimer
-Name[el]=Κάδος απορριμμάτων
-Name[en_GB]=Wastebin
-Name[eo]=Rubujo
-Name[es]=Papelera
-Name[et]=Prügikast
-Name[eu]=Zaborra
-Name[fa]=زباله
-Name[fi]=Roskakori
-Name[fr]=Corbeille
-Name[fy]=Jiskefet
-Name[ga]=Bruscar
-Name[gl]=Lixo
-Name[he]=אשפה
-Name[hi]=रद्दी
-Name[hr]=Otpad
-Name[hsb]=Papjernik
-Name[hu]=Szemétkosár
-Name[is]=Rusl
-Name[it]=Cestino
-Name[ja]=ごみ箱
-Name[ka]=ურნა
-Name[kk]=Өшірілгендер
-Name[km]=ធុងសំរាម
-Name[lo]=ຖັງຂີ້ເຫຍື່ອ
-Name[lt]=Šiukšliadėžė
-Name[lv]=Miskaste
-Name[mk]=Корпа
-Name[mn]=Хогийн сав
-Name[ms]=Sampah
-Name[mt]=Skart
-Name[nb]=Papirkurv
-Name[nds]=Affalltünn
-Name[ne]=रद्दीटोकरी
-Name[nl]=Prullenbak
-Name[nn]=Papirkorg
-Name[nso]=Seswaraditlakala
-Name[pa]=ਰੱਦੀ
-Name[pl]=Kosz
-Name[pt]=Lixo
-Name[pt_BR]=Lixo
-Name[ro]=Gunoi
-Name[ru]=Корзина
-Name[se]=Ruskalihtti
-Name[sk]=Kôš
-Name[sl]=Smeti
-Name[sr]=Смеће
-Name[sr@Latn]=Smeće
-Name[sv]=Skräp
-Name[ta]=குப்பை
-Name[te]=చెత్త బుట్ట
-Name[tg]=Ахлотдон
-Name[th]=ถังขยะ
-Name[tr]=Çöp
-Name[tt]=Çüplek
-Name[uk]=Смітник
-Name[uz]=Chiqindilar qutisi
-Name[uz@cyrillic]=Чиқиндилар қутиси
-Name[ven]=Tshikha
-Name[vi]=Thùng rác
-Name[wa]=Batch
-Name[xh]=Inkukumo
-Name[zh_CN]=回收站
-Name[zh_TW]=資源回收桶
-Name[zu]=Izibi
+
+Comment=Displays the trashcan and allows files to be dropped onto it
+
 Icon=trashcan_empty
 X-TDE-Library=trash_panelapplet
diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h
index c77cf3755..124ae4310 100644
--- a/kicker/applets/trash/trashapplet.h
+++ b/kicker/applets/trash/trashapplet.h
@@ -33,7 +33,7 @@
 
 class TrashApplet : public KPanelApplet
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 85c0eef62..96efb7436 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -32,14 +32,14 @@
 #include <konq_popupmenu.h>
 
 TrashButton::TrashButton(TQWidget *parent)
-	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)),
+	: PanelPopupButton(parent), mActions(this, this),
 	  mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
 {
 	TDEIO::UDSEntry entry;
 	TDEIO::NetAccess::stat("trash:/", entry, 0L);
 	mFileItem.assign(KFileItem(entry, "trash:/"));
 
-	TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+	TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()),
 	                               &mActions, "paste");
 	a->setShortcut(0);
 
@@ -53,7 +53,7 @@ TrashButton::TrashButton(TQWidget *parent)
 
 	// Activate this code only if we find a way to have both an
 	// action and a popup menu for the same kicker button
-	//connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
+	//connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
 
 	setPopup(new TQPopupMenu());
 }
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index bbf596a0c..fa1ce7077 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -32,7 +32,7 @@
 
 class TrashButton : public PanelPopupButton
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashButton(TQWidget *parent);