4 files changed, 19 insertions, 83 deletions
diff --git a/twin/clients/laptop/CMakeLists.txt b/twin/clients/laptop/CMakeLists.txt
index a06afdafc..9fe25af3a 100644
--- a/twin/clients/laptop/CMakeLists.txt
+++ b/twin/clients/laptop/CMakeLists.txt
@@ -23,12 +23,16 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
+tde_create_translated_desktop(
+  SOURCE laptop.desktop
+  DESTINATION ${DATA_INSTALL_DIR}/twin
+  PO_DIR twin-clients-desktops
+)
 
 
-##### twin3_laptop (module) #####################
+##### twin_laptop (module) #####################
 
-tde_add_kpart( twin3_laptop AUTOMOC
+tde_add_kpart( twin_laptop AUTOMOC
   SOURCES laptopclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/laptop/Makefile.am b/twin/clients/laptop/Makefile.am
index ccf1d359b..1788a8691 100644
--- a/twin/clients/laptop/Makefile.am
+++ b/twin/clients/laptop/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = twin3_laptop.la
+kde_module_LTLIBRARIES = twin_laptop.la
 
-twin3_laptop_la_SOURCES = laptopclient.cpp
-twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
-twin3_laptop_la_LIBADD  = ../../lib/libtdecorations.la
+twin_laptop_la_SOURCES = laptopclient.cpp
+twin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
+twin_laptop_la_LIBADD  = ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = laptopclient.h
diff --git a/twin/clients/laptop/laptop.desktop b/twin/clients/laptop/laptop.desktop
index b1c78ca90..060b0cce2 100644
--- a/twin/clients/laptop/laptop.desktop
+++ b/twin/clients/laptop/laptop.desktop
@@ -1,69 +1,3 @@
 [Desktop Entry]
 Name=Laptop
-Name[af]=Draagbare rekenaar
-Name[ar]=الحاسوب النقّال
-Name[az]=Dizüstü Kompüter
-Name[be]=Ноўтбук
-Name[bg]=Лаптоп
-Name[bn]=ল্যাপটপ
-Name[br]=Hezoug
-Name[ca]=Portàtil
-Name[cs]=Notebook
-Name[cy]=Gluniadur
-Name[da]=Bærbar
-Name[el]=Φορητό
-Name[eo]=Tekokomputilo
-Name[es]=Portátil
-Name[eu]=Ordenagailu eramangarria
-Name[fa]=رایانۀ کیفی
-Name[fi]=Kannettava
-Name[fr]=Ordinateur portable
-Name[fy]=Skoatkompjûter
-Name[ga]=Ríomhaire Glúine
-Name[gl]=Portátil
-Name[he]=מחשב נייד
-Name[hi]=लैपटॉप
-Name[hsb]=laptop
-Name[hu]=Noteszgép
-Name[is]=Ferðavél
-Name[it]=Portatile
-Name[ja]=ラップトップ
-Name[ka]=ლეპტოპი
-Name[kk]=Ноутбук
-Name[km]=កុំព្យូទ័រយួរដៃ
-Name[ko]=랩탑
-Name[lo]=ແລບທອບ
-Name[lt]=Nešiojamas kompiuteris
-Name[lv]=Laptops
-Name[mk]=Лаптоп
-Name[mn]=Лаптоп
-Name[ms]=Komputer riba
-Name[nb]=Bærbar
-Name[nds]=Klappreekner
-Name[ne]=ल्यापटप
-Name[nn]=Berbar
-Name[oc]=Portatil
-Name[pa]=ਲੈਪਟਾਪ
-Name[pt]=Portátil
-Name[ru]=Ноутбук
-Name[rw]=Mudasobwa Igendanwa
-Name[se]=Mátkedihtor
-Name[sl]=Prenosnik
-Name[sr]=Лаптоп
-Name[sv]=Bärbar dator
-Name[ta]=மடிக்கணினி
-Name[te]=లాప్ టాప్
-Name[tg]=Ноутбук
-Name[th]=แลปทอป
-Name[tr]=Dizüstü
-Name[tt]=Qulsanaq
-Name[uk]=Мобільний комп'ютер (лептоп)
-Name[uz@cyrillic]=Лаптоп
-Name[ven]=Khomupwutha pfarwa
-Name[vi]=Máy xách tay
-Name[wa]=Poirtåve
-Name[xh]=Umphezulu osongiweyo
-Name[zh_CN]=笔记本电脑
-Name[zh_TW]=筆記型電腦
-Name[zu]=Ikhomputha ephathwayo eyisicaba
-X-TDE-Library=twin3_laptop
+X-TDE-Library=twin_laptop
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 34c79b2d6..b0bc659dd 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -65,7 +65,7 @@ static bool pixmaps_created = false;
 
 // =====================================
 
-extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+extern "C" TDE_EXPORT KDecorationFactory* create_factory()
 {
     return new Laptop::LaptopClientFactory();
 }
@@ -121,11 +121,11 @@ static void create_pixmaps()
     int i, x, y;
     titlePix = new TQPixmap(33, 12);
     TQBitmap mask(33, 12);
-    mask.fill(Qt::color0);
+    mask.fill(TQt::color0);
 
     p.begin(titlePix);
     maskPainter.begin(&mask);
-    maskPainter.setPen(Qt::color1);
+    maskPainter.setPen(TQt::color1);
     for(i=0, y=2; i < 3; ++i, y+=4){
         for(x=1; x <= 33; x+=3){
             p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150));
@@ -221,9 +221,9 @@ static void create_pixmaps()
     drawButtonFrame(iBtnDownPix2, g, true);
 
     if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
-        btnForeground = Qt::black;
+        btnForeground = TQt::black;
     else
-        btnForeground = Qt::white;
+        btnForeground = TQt::white;
 }
 
 static void delete_pixmaps()
@@ -290,7 +290,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
         deco = TQBitmap(8, 8, bitmap, true);
     else {
         deco = TQBitmap(8,8);
-        deco.fill(Qt::color0);
+        deco.fill(TQt::color0);
     }
     deco.setMask(deco);
     repaint();
@@ -472,7 +472,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
     TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
 
     TQRect r(widget()->rect());
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
     p.drawRect(r);
 
     // fill mid frame...
@@ -757,5 +757,3 @@ void LaptopClientFactory::findPreferredHandleSize()
 }
 
 } // Laptop namespace
-
-// vim: sw=4