diff --git a/clients/Makefile.am b/clients/Makefile.am
index 98195fab86..14be26e563 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,3 +1,8 @@
 SUBDIRS = b2 default keramik laptop modernsystem quartz redmond web
 # need to be ported: kwmtheme (almost done)
 # only for testing: test
+
+# -maxdepth 2 is needed as the config directories have other .pot files :-(
+# KDE4 (or 3.4): unify the .pot, at least for the clients
+messages:
+	$(XGETTEXT) `find . -maxdepth 2  -name \*.cpp` -o $(podir)/kwin_clients.pot
diff --git a/clients/b2/Makefile.am b/clients/b2/Makefile.am
index b6a55cd9bb..88a9b16080 100644
--- a/clients/b2/Makefile.am
+++ b/clients/b2/Makefile.am
@@ -18,9 +18,6 @@ lnk_DATA = b2.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_b2.pot
-
 ###KMAKE-start (don't edit or delete this block)
 
 ###KMAKE-end
diff --git a/clients/default/Makefile.am b/clients/default/Makefile.am
index 411cedb30a..3f9b1e7e78 100644
--- a/clients/default/Makefile.am
+++ b/clients/default/Makefile.am
@@ -12,5 +12,3 @@ kwin3_default_la_LIBADD  = $(LIB_KDECORE) ../../lib/libkdecorations.la
 METASOURCES = AUTO
 noinst_HEADERS = kdedefault.h
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_default.pot
diff --git a/clients/keramik/Makefile.am b/clients/keramik/Makefile.am
index 2cdaaef671..d5969643c2 100644
--- a/clients/keramik/Makefile.am
+++ b/clients/keramik/Makefile.am
@@ -42,5 +42,3 @@ tiles.h: embedtool
 
 keramik.lo: tiles.h
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_keramik.pot
diff --git a/clients/kwmtheme/Makefile.am b/clients/kwmtheme/Makefile.am
index 455b2bd154..f6c6111809 100644
--- a/clients/kwmtheme/Makefile.am
+++ b/clients/kwmtheme/Makefile.am
@@ -13,5 +13,3 @@ noinst_HEADERS = kwmthemeclient.h
 lnkdir = $(kde_datadir)/kwin
 lnk_DATA = kwmtheme.desktop
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_kwmtheme.pot
diff --git a/clients/laptop/Makefile.am b/clients/laptop/Makefile.am
index e3d7c3ccac..eb870720aa 100644
--- a/clients/laptop/Makefile.am
+++ b/clients/laptop/Makefile.am
@@ -15,5 +15,3 @@ lnk_DATA = laptop.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_laptop.pot
diff --git a/clients/modernsystem/Makefile.am b/clients/modernsystem/Makefile.am
index 35a0600bdc..75e0249f8e 100644
--- a/clients/modernsystem/Makefile.am
+++ b/clients/modernsystem/Makefile.am
@@ -17,5 +17,3 @@ lnk_DATA = modernsystem.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_modernsys.pot
diff --git a/clients/quartz/Makefile.am b/clients/quartz/Makefile.am
index 4cbd9a5555..69e6cc0109 100644
--- a/clients/quartz/Makefile.am
+++ b/clients/quartz/Makefile.am
@@ -17,8 +17,6 @@ lnk_DATA = quartz.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_quartz.pot
 
 ###KMAKE-start (don't edit or delete this block)
 
diff --git a/clients/redmond/Makefile.am b/clients/redmond/Makefile.am
index 97f34a14da..85d0236d20 100644
--- a/clients/redmond/Makefile.am
+++ b/clients/redmond/Makefile.am
@@ -15,5 +15,3 @@ lnk_DATA = redmond.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_redmond.pot
diff --git a/clients/web/Makefile.am b/clients/web/Makefile.am
index 09898160a8..b253e8c336 100644
--- a/clients/web/Makefile.am
+++ b/clients/web/Makefile.am
@@ -29,5 +29,3 @@ linkdir                   = $(kde_datadir)/kwin/
 link_DATA                 = web.desktop
 EXTRA_DIST                = $(link_DATA)
 
-#messages:
-#	$(XGETTEXT) *.cpp -o $(podir)/kwin_web.pot
diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp
index 48255e7747..331de2f979 100644
--- a/lib/kdecoration_plugins_p.cpp
+++ b/lib/kdecoration_plugins_p.cpp
@@ -165,9 +165,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
 
     pluginStr = nameStr;
     
-    QString catalogue = nameStr;
-    catalogue.replace( "kwin3_", "kwin_" );
-    KGlobal::locale()->insertCatalogue( catalogue );
+    KGlobal::locale()->insertCatalogue( "kwin_clients" );
 
     old_library = oldLibrary; // save for delayed destroying
     old_fact = oldFactory;