10 files changed, 144 insertions, 144 deletions

diff --git a/kwin/kcmkwin/kwindecoration/CMakeLists.txt b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
index 1d88ce5a9..5fbdb3653 100644
--- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/kwin/lib
+  ${CMAKE_SOURCE_DIR}/twin/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -23,15 +23,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kwindecoration.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES twindecoration.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kcm_kwindecoration (module) ###############
+##### kcm_twindecoration (module) ###############
 
-tde_add_kpart( kcm_kwindecoration AUTOMOC
+tde_add_kpart( kcm_twindecoration AUTOMOC
   SOURCES
-    kwindecoration.cpp buttons.cpp
-    kwindecorationIface.skel preview.cpp
+    twindecoration.cpp buttons.cpp
+    twindecorationIface.skel preview.cpp
   LINK tdecorations-shared tdeui-shared Xext
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/kcmkwin/kwindecoration/Makefile.am b/kwin/kcmkwin/kwindecoration/Makefile.am
index e7bac2af8..021c1ac3e 100644
--- a/kwin/kcmkwin/kwindecoration/Makefile.am
+++ b/kwin/kcmkwin/kwindecoration/Makefile.am
@@ -1,18 +1,18 @@
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = kcm_kwindecoration.la
+kde_module_LTLIBRARIES = kcm_twindecoration.la
 
-kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp
-noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h
+kcm_twindecoration_la_SOURCES = twindecoration.cpp buttons.cpp twindecorationIface.skel preview.cpp
+noinst_HEADERS = twindecoration.h twindecorationIface.h buttons.h preview.h
 
-kcm_kwindecoration_la_LDFLAGS = \
+kcm_twindecoration_la_LDFLAGS = \
   -module -avoid-version $(all_libraries) -no-undefined
 
-kcm_kwindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+kcm_twindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kcmtwindecoration.pot
 
-xdg_apps_DATA = kwindecoration.desktop
+xdg_apps_DATA = twindecoration.desktop
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp
index 7ddcb2af2..2c450aed1 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttons.cpp
@@ -1,15 +1,15 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2004,  Sandro Giessl <sandro@giessl.com>
 	Copyright (c) 2001
 		Karol Szwed <gallium@kde.org>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders)
+	Based on original "twintheme" (Window Borders)
 	Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -46,7 +46,7 @@
 #include "pixmaps.h"
 
 
-#define BUTTONDRAGMIMETYPE "application/x-kde_kwindecoration_buttons"
+#define BUTTONDRAGMIMETYPE "application/x-kde_twindecoration_buttons"
 ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
 	: TQStoredDrag( BUTTONDRAGMIMETYPE, parent, name)
 {
diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h
index 909adfe87..088d3414d 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.h
+++ b/kwin/kcmkwin/kwindecoration/buttons.h
@@ -1,15 +1,15 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2004, Sandro Giessl <sandro@giessl.com>
 	Copyright (c) 2001
 		Karol Szwed <gallium@kde.org>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
index 65c951893..4ef509e5a 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -1,14 +1,14 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2001
 		Karol Szwed <gallium@kde.org>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders)
+	Based on original "twintheme" (Window Borders)
 	Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -56,7 +56,7 @@
 #include <kaboutdata.h>
 #include <dcopclient.h>
 
-#include "kwindecoration.h"
+#include "twindecoration.h"
 #include "preview.h"
 #include <kdecoration_plugins_p.h>
 #include <kdecorationfactory.h>
@@ -64,16 +64,16 @@
 // KCModule plugin interface
 // =========================
 typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
+K_EXPORT_COMPONENT_FACTORY( kcm_twindecoration, KWinDecoFactory("kcmtwindecoration") )
 
 KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &)
 	: DCOPObject("KWinClientDecoration"),
 	  KCModule(KWinDecoFactory::instance(), parent, name),
-          kwinConfig("kwinrc"),
+          twinConfig("twinrc"),
           pluginObject(0)
 {
-	kwinConfig.setGroup("Style");
-        plugins = new KDecorationPreviewPlugins( &kwinConfig );
+	twinConfig.setGroup("Style");
+        plugins = new KDecorationPreviewPlugins( &twinConfig );
 
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); 
 
@@ -319,8 +319,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	// Set up the decoration lists and other UI settings
 	findDecorations();
 	createDecorationList();
-	readConfig( &kwinConfig );
-	resetPlugin( &kwinConfig );
+	readConfig( &twinConfig );
+	resetPlugin( &twinConfig );
 
 	tabWidget->insertTab( pluginPage, i18n("&Window Decoration") );
 	tabWidget->insertTab( buttonPage, i18n("&Buttons") );
@@ -343,11 +343,11 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int )));
 //	connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
 
-	// Allow kwin dcop signal to update our selection list
-	connectDCOPSignal("kwin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
+	// Allow twin dcop signal to update our selection list
+	connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
 	
 	KAboutData *about =
-		new KAboutData(I18N_NOOP("kcmkwindecoration"),
+		new KAboutData(I18N_NOOP("kcmtwindecoration"),
 				I18N_NOOP("Window Decoration Control Module"),
 				0, 0, KAboutData::License_GPL,
 				I18N_NOOP("(c) 2001 Karol Szwed"));
@@ -363,11 +363,11 @@ KWinDecorationModule::~KWinDecorationModule()
 }
 
 
-// Find all theme desktop files in all 'data' dirs owned by kwin.
+// Find all theme desktop files in all 'data' dirs owned by twin.
 // And insert these into a DecorationInfo structure
 void KWinDecorationModule::findDecorations()
 {
-	TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin");
+	TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin");
 	TQStringList::ConstIterator it;
 
 	for (it = dirList.begin(); it != dirList.end(); it++)
@@ -382,7 +382,7 @@ void KWinDecorationModule::findDecorations()
 					KDesktopFile desktopFile(filename);
 					TQString libName = desktopFile.readEntry("X-KDE-Library");
 
-					if (!libName.isEmpty() && libName.startsWith( "kwin3_" ))
+					if (!libName.isEmpty() && libName.startsWith( "twin3_" ))
 					{
 						DecorationInfo di;
 						di.name = desktopFile.readName();
@@ -395,12 +395,12 @@ void KWinDecorationModule::findDecorations()
 }
 
 
-// Fills the decorationList with a list of available kwin decorations
+// Fills the decorationList with a list of available twin decorations
 void KWinDecorationModule::createDecorationList()
 {
 	TQValueList<DecorationInfo>::ConstIterator it;
 
-	// Sync with kwin hardcoded KDE2 style which has no desktop item
+	// Sync with twin hardcoded KDE2 style which has no desktop item
     TQStringList decorationNames;
 	decorationNames.append( i18n("KDE 2") );
 	for (it = decorations.begin(); it != decorations.end(); ++it)
@@ -415,11 +415,11 @@ void KWinDecorationModule::createDecorationList()
 // Reset the decoration plugin to what the user just selected
 void KWinDecorationModule::slotChangeDecoration( const TQString & text)
 {
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
 	// Let the user see config options for the currently selected decoration
-	resetPlugin( &kwinConfig, text );
+	resetPlugin( &twinConfig, text );
 }
 
 
@@ -515,7 +515,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
 		}
 
 	if (libName.isEmpty())
-		libName = "kwin_default";	// KDE 2
+		libName = "twin_default";	// KDE 2
 
 	return libName;
 }
@@ -525,8 +525,8 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
 // pluginConfigWidget, allowing for dynamic configuration of decorations
 void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName )
 {
-	// Config names are "kwin_icewm_config"
-	// for "kwin3_icewm" kwin client
+	// Config names are "twin_icewm_config"
+	// for "twin3_icewm" twin client
 
 	TQString oldName = styleToConfigLib( oldLibraryName );
 
@@ -585,7 +585,7 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDe
 }
 
 
-// Reads the kwin config settings, and sets all UI controls to those settings
+// Reads the twin config settings, and sets all UI controls to those settings
 // Updating the config plugin if required
 void KWinDecorationModule::readConfig( KConfig* conf )
 {
@@ -599,7 +599,7 @@ void KWinDecorationModule::readConfig( KConfig* conf )
 
 	oldLibraryName = currentLibraryName;
 	currentLibraryName = conf->readEntry("PluginLib",
-					((TQPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz"));
+					((TQPixmap::defaultDepth() > 8) ? "twin_plastik" : "twin_quartz"));
 	TQString decoName = decorationName( currentLibraryName );
 
 	// If we are using the "default" kde client, use the "default" entry.
@@ -659,14 +659,14 @@ void KWinDecorationModule::readConfig( KConfig* conf )
 }
 
 
-// Writes the selected user configuration to the kwin config file
+// Writes the selected user configuration to the twin config file
 void KWinDecorationModule::writeConfig( KConfig* conf )
 {
 	TQString name = decorationList->currentText();
 	TQString libName = decorationLibName( name );
 
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
 	// General settings
 	conf->writeEntry("PluginLib", libName);
@@ -712,35 +712,35 @@ void KWinDecorationModule::dcopUpdateClientList()
 {
 	// Changes the current active ListBox item, and
 	// Loads a new plugin configuration tab if required.
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
-	readConfig( &kwinConfig );
-	resetPlugin( &kwinConfig );
+	readConfig( &twinConfig );
+	resetPlugin( &twinConfig );
 }
 
 
 // Virutal functions required by KCModule
 void KWinDecorationModule::load()
 {
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
 	// Reset by re-reading the config
-	readConfig( &kwinConfig );
-        resetPlugin( &kwinConfig );
+	readConfig( &twinConfig );
+        resetPlugin( &twinConfig );
 }
 
 
 void KWinDecorationModule::save()
 {
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
-	writeConfig( &kwinConfig );
-	emit pluginSave( &kwinConfig );
+	writeConfig( &twinConfig );
+	emit pluginSave( &twinConfig );
 
-	kwinConfig.sync();
+	twinConfig.sync();
 	resetKWin();
 	// resetPlugin() will get called via the above DCOP function
 }
@@ -807,8 +807,8 @@ void KWinDecorationModule::checkSupportedBorderSizes()
 
 TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib )
 {
-        if( styleLib.startsWith( "kwin3_" ))
-            return "kwin_" + styleLib.mid( 6 ) + "_config";
+        if( styleLib.startsWith( "twin3_" ))
+            return "twin_" + styleLib.mid( 6 ) + "_config";
         else
             return styleLib + "_config";
 }
@@ -828,13 +828,13 @@ TQString KWinDecorationModule::quickHelp() const
 
 void KWinDecorationModule::resetKWin()
 {
-	bool ok = kapp->dcopClient()->send("kwin*", "KWinInterface",
+	bool ok = kapp->dcopClient()->send("twin*", "KWinInterface",
                         "reconfigure()", TQByteArray());
 	if (!ok)
-		kdDebug() << "kcmkwindecoration: Could not reconfigure kwin" << endl;
+		kdDebug() << "kcmtwindecoration: Could not reconfigure twin" << endl;
 }
 
-#include "kwindecoration.moc"
+#include "twindecoration.moc"
 // vim: ts=4
 // kate: space-indent off; tab-width 4;
 
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
index 3c5f12e6f..dc1e55ef6 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Exec=kcmshell kwindecoration
+Exec=kcmshell twindecoration
 Icon=kcmkwm
 Type=Application
-DocPath=kcontrol/kwindecoration/index.html
+DocPath=kcontrol/twindecoration/index.html
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwindecoration
-X-KDE-FactoryName=kwindecoration
+X-KDE-Library=twindecoration
+X-KDE-FactoryName=twindecoration
 
 Name=Window Decorations
 Name[af]=Venster Versierings
@@ -162,70 +162,70 @@ Comment[zh_CN]=配置窗口标题的观感
 Comment[zh_TW]=設定視窗標題列的外觀與感覺
 Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window
 
-Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
-Keywords[ar]=kwin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات
-Keywords[az]=kwin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək
-Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
-Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration
-Keywords[ca]=kwin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració
-Keywords[cs]=kwin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace
-Keywords[csb]=kwin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô
-Keywords[cy]=kwin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad
-Keywords[da]=kwin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration
+Keywords=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
+Keywords[ar]=twin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات
+Keywords[az]=twin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək
+Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
+Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, twin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration
+Keywords[ca]=twin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració
+Keywords[cs]=twin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace
+Keywords[csb]=twin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô
+Keywords[cy]=twin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad
+Keywords[da]=twin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration
 Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen
-Keywords[el]=kwin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση
-Keywords[eo]=kwin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo
-Keywords[es]=kwin,ventana,gestor,borde,estilo,tema,aspecto,comportamiento,disposición,botón,asa,esquina,kwm,decoración
-Keywords[et]=kwin,aken,haldur,piire,stiil,teema,välimus,kasutamine,nupud,serv,kwm,dekoratsioon
-Keywords[eu]=kwin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoia, maneiatzailea,ertzea,kwm,dekorazioa
-Keywords[fa]=kwin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرح‌بندی، دکمه، گرداندن، لبه، kwm، تزئین
-Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys
-Keywords[fr]=kwin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration
-Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear
-Keywords[ga]=kwin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán
-Keywords[gl]=kwin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración
-Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration
+Keywords[el]=twin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση
+Keywords[eo]=twin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo
+Keywords[es]=twin,ventana,gestor,borde,estilo,tema,aspecto,comportamiento,disposición,botón,asa,esquina,kwm,decoración
+Keywords[et]=twin,aken,haldur,piire,stiil,teema,välimus,kasutamine,nupud,serv,kwm,dekoratsioon
+Keywords[eu]=twin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoia, maneiatzailea,ertzea,kwm,dekorazioa
+Keywords[fa]=twin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرح‌بندی، دکمه، گرداندن، لبه، kwm، تزئین
+Keywords[fi]=twin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys
+Keywords[fr]=twin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration
+Keywords[fy]=twin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear
+Keywords[ga]=twin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán
+Keywords[gl]=twin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración
+Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, twin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration
 Keywords[hi]=के-विन,विंडो,प्रबंधक,बार्डर,शैली,प्रसंग,रूप,अनुभव,ले-आउट,बटन,हैंडल,किनारा,केडबल्यूएम,सजावट
-Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras
+Keywords[hr]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras
 Keywords[hu]=KWin,ablak,kezelő,szegély,stílus,téma,kinézet,megjelenés,elrendezés,nyomógomb,fogantyú,perem,kwm,ablakstílus
-Keywords[is]=kwin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut
-Keywords[it]=kwin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione
-Keywords[ja]=kwin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾
-Keywords[km]=kwin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការ​ប្រើ,គែម,kwm,ការ​តុបតែង
-Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija
-Keywords[lv]=kwin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija
-Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација
+Keywords[is]=twin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut
+Keywords[it]=twin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione
+Keywords[ja]=twin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾
+Keywords[km]=twin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការ​ប្រើ,គែម,kwm,ការ​តុបតែង
+Keywords[lt]=twin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija
+Keywords[lv]=twin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija
+Keywords[mk]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација
 Keywords[mn]=KWin,Kwm,Цонх,Manager,Хүрээ,Design,Хэлбэр,Загвар, Optik,Харагдалт,Layout,Товч,Өнцөг,Засал
-Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration
-Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon
-Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon
+Keywords[mt]=twin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration
+Keywords[nb]=twin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon
+Keywords[nds]=twin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon
 Keywords[ne]=के विन,सञ्झ्याल, प्रबन्धक, किनारा, शैली, विषयवस्तु, हेराइ, बुझाइ, सजावट, बटन, ह्यान्डल, छेउ,kwm, सजावट
-Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer
-Keywords[nn]=kwin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon
-Keywords[nso]=kwin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso
-Keywords[pa]=kwin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ
-Keywords[pl]=kwin,okno,menedżer,brzeg,styl,motyw,wygląd,zachowanie,układ,przycisk,uchwyt,krawędź,kwm,dekoracja
-Keywords[pt]=kwin,janela,gestor,contorno,estilo,tema,aparência,comportamento,visual,botão,pega,extremo,kwm,decoração
-Keywords[pt_BR]=kwin,janela,gerenciador,borda,estilo,tema,aparência,aparência,botão, gerenciador,borda,kwm,decoração
-Keywords[ro]=kwin,fereastră,manager,margine,stil,tematică,aspect,comportament,format,buton,kwm,decorare
-Keywords[rw]=kwin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko,kumva,imigaragarire,buto,ikirindi,impera,kwm,ugutaaka
-Keywords[se]=kwin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva
-Keywords[sk]=kwin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť
-Keywords[sl]=kwin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek
-Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација
-Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija
-Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration
-Keywords[ta]=kwin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு
-Keywords[th]=kwin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง
-Keywords[tr]=kwin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon
-Keywords[uk]=kwin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення
-Keywords[uz]=kwin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish
-Keywords[uz@cyrillic]=kwin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш
-Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza
-Keywords[vi]=kwin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí
-Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje
-Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso
-Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰
-Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
-Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
+Keywords[nl]=twin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer
+Keywords[nn]=twin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon
+Keywords[nso]=twin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso
+Keywords[pa]=twin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ
+Keywords[pl]=twin,okno,menedżer,brzeg,styl,motyw,wygląd,zachowanie,układ,przycisk,uchwyt,krawędź,kwm,dekoracja
+Keywords[pt]=twin,janela,gestor,contorno,estilo,tema,aparência,comportamento,visual,botão,pega,extremo,kwm,decoração
+Keywords[pt_BR]=twin,janela,gerenciador,borda,estilo,tema,aparência,aparência,botão, gerenciador,borda,kwm,decoração
+Keywords[ro]=twin,fereastră,manager,margine,stil,tematică,aspect,comportament,format,buton,kwm,decorare
+Keywords[rw]=twin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko,kumva,imigaragarire,buto,ikirindi,impera,kwm,ugutaaka
+Keywords[se]=twin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva
+Keywords[sk]=twin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť
+Keywords[sl]=twin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek
+Keywords[sr]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација
+Keywords[sr@Latn]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija
+Keywords[sv]=twin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration
+Keywords[ta]=twin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு
+Keywords[th]=twin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง
+Keywords[tr]=twin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon
+Keywords[uk]=twin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення
+Keywords[uz]=twin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish
+Keywords[uz@cyrillic]=twin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш
+Keywords[ven]=twin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza
+Keywords[vi]=twin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí
+Keywords[wa]=twin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje
+Keywords[xh]=twin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso
+Keywords[zh_CN]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰
+Keywords[zh_TW]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
+Keywords[zu]=twin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
 Categories=Qt;KDE;X-KDE-settings-looknfeel;
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.h b/kwin/kcmkwin/kwindecoration/kwindecoration.h
index 53b3ed6ae..f6b535024 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.h
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.h
@@ -1,14 +1,14 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2001
 		Karol Szwed <gallium@kde.org>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@
 
 #include <kdecoration.h>
 
-#include "kwindecorationIface.h"
+#include "twindecorationIface.h"
 
 class KComboBox;
 class TQCheckBox;
@@ -109,7 +109,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
 
 		KDecorationPreview* preview;
 		KDecorationPlugins* plugins;
-		KConfig kwinConfig;
+		KConfig twinConfig;
 
 		TQCheckBox* cbUseCustomButtonPositions;
 	//	TQCheckBox* cbUseMiniWindows;
diff --git a/kwin/kcmkwin/kwindecoration/kwindecorationIface.h b/kwin/kcmkwin/kwindecoration/kwindecorationIface.h
index f45be6b7b..f50082648 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecorationIface.h
+++ b/kwin/kcmkwin/kwindecoration/kwindecorationIface.h
@@ -1,14 +1,14 @@
 /* 
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2001
 		Karol Szwed (gallium) <karlmail@usa.net>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/kwin/kcmkwin/kwindecoration/pixmaps.h b/kwin/kcmkwin/kwindecoration/pixmaps.h
index 76f60b3e9..710e01425 100644
--- a/kwin/kcmkwin/kwindecoration/pixmaps.h
+++ b/kwin/kcmkwin/kwindecoration/pixmaps.h
@@ -1,15 +1,15 @@
 /* 
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2004, Sandro Giessl <sandro@giessl.com>
 	Copyright (c) 2001
 		Karol Szwed <gallium@kde.org>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp
index ea894ecbc..ee8c59c75 100644
--- a/kwin/kcmkwin/kwindecoration/preview.cpp
+++ b/kwin/kcmkwin/kwindecoration/preview.cpp
@@ -454,7 +454,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions()
 
 unsigned long KDecorationPreviewOptions::updateSettings()
     {
-    KConfig cfg( "kwinrc", true );
+    KConfig cfg( "twinrc", true );
     unsigned long changed = 0;
     changed |= d->updateKWinSettings( &cfg );