diff --git a/nls/C/.cvsignore b/nls/C/.cvsignore
index 4120fef1..44c687c8 100644
--- a/nls/C/.cvsignore
+++ b/nls/C/.cvsignore
@@ -1,5 +1,3 @@
-.cvsignore
 Makefile
 Makefile.in
 *.cat
-*.m
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index dcf917e5..9f7f16fc 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,46 +1,22 @@
-# nls/C/Makefile.am for Fluxbox - an X11 Window Manager
+# nls/C/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = C
-# no CODESET
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
-MAINTAINERCLEANFILES = Makefile.in Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m
+MAINTAINERCLEANFILES = Makefile.in 
+MFILES = Translation.m
 EXTRA_DIST= $(MFILES)
+
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
-		ln -fs C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
-		ln -fs C $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
-		ln -fs C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
-		ln -fs C $(DESTDIR)$(pkgdatadir)/nls/en; \
-	fi
-uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-	fi
+        @if test x$(NLSTEST) = "x-DNLS"; then                 echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
+NG)";                 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG);                 $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
+NG);         fi
 
-Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f Translation.m; \
-		awk -f ../convert.awk \
-			output=Translation.m $(MFILES); \
-	fi
+uninstall-local:
+        @if test x$(NLSTEST) = "x-DNLS"; then                 rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat;                 rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG);         fi
 
 fluxbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		$(gencat_cmd) fluxbox.cat Translation.m; \
-	fi
+        @if test x$(NLSTEST) = "x-DNLS"; then                 $(gencat_cmd) fluxbox.cat Translation.m;         fi
+
diff --git a/nls/bg_BG/Translation.m b/nls/bg_BG/Translation.m
index 2d53e302..b9b75ad3 100644
--- a/nls/bg_BG/Translation.m
+++ b/nls/bg_BG/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/da_DK/Translation.m b/nls/da_DK/Translation.m
index 761bb795..5081e4a6 100644
--- a/nls/da_DK/Translation.m
+++ b/nls/da_DK/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/de_DE/Translation.m b/nls/de_DE/Translation.m
index 65a8772e..b0e9665a 100644
--- a/nls/de_DE/Translation.m
+++ b/nls/de_DE/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/es_ES/Translation.m b/nls/es_ES/Translation.m
index e856b4f9..76b11ca3 100644
--- a/nls/es_ES/Translation.m
+++ b/nls/es_ES/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-15
 
 $set 0x1 #Align
 
diff --git a/nls/et_EE/Translation.m b/nls/et_EE/Translation.m
index 5a16321c..34de268b 100644
--- a/nls/et_EE/Translation.m
+++ b/nls/et_EE/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-15
 
 $set 0x1 #Align
 
diff --git a/nls/fr_FR/Translation.m b/nls/fr_FR/Translation.m
index d7b0304c..4c71daed 100644
--- a/nls/fr_FR/Translation.m
+++ b/nls/fr_FR/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-15
 
 $set 0x1 #Align
 
diff --git a/nls/it_IT/Translation.m b/nls/it_IT/Translation.m
index fd99bdae..a2e6efef 100644
--- a/nls/it_IT/Translation.m
+++ b/nls/it_IT/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/ja_JP/Translation.m b/nls/ja_JP/Translation.m
index b6f9e93c..6e30a699 100644
--- a/nls/ja_JP/Translation.m
+++ b/nls/ja_JP/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=eucJP
 
 $set 0x1 #Align
 
diff --git a/nls/lv_LV/Translation.m b/nls/lv_LV/Translation.m
index 3f4ef0bb..67c5c6c9 100644
--- a/nls/lv_LV/Translation.m
+++ b/nls/lv_LV/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-13
 
 $set 0x1 #Align
 
diff --git a/nls/nl_NL/Translation.m b/nls/nl_NL/Translation.m
index 151634e8..ec62df5f 100644
--- a/nls/nl_NL/Translation.m
+++ b/nls/nl_NL/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/pl_PL/Translation.m b/nls/pl_PL/Translation.m
index aa66a67b..bed62a40 100644
--- a/nls/pl_PL/Translation.m
+++ b/nls/pl_PL/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/pt_BR/Translation.m b/nls/pt_BR/Translation.m
index 418879e8..70ee956d 100644
--- a/nls/pt_BR/Translation.m
+++ b/nls/pt_BR/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/pt_PT/Translation.m b/nls/pt_PT/Translation.m
index 6a017c91..23dcd491 100644
--- a/nls/pt_PT/Translation.m
+++ b/nls/pt_PT/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/ru_RU/Translation.m b/nls/ru_RU/Translation.m
index 023e3973..2441893b 100644
--- a/nls/ru_RU/Translation.m
+++ b/nls/ru_RU/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=KOI8-R
 
 $set 0x1 #Align
 
diff --git a/nls/sl_SI/Translation.m b/nls/sl_SI/Translation.m
index 01eabf33..d975ece7 100644
--- a/nls/sl_SI/Translation.m
+++ b/nls/sl_SI/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-2
 
 $set 0x1 #Align
 
diff --git a/nls/sv_SE/Translation.m b/nls/sv_SE/Translation.m
index f6c2c2f3..68c6725f 100644
--- a/nls/sv_SE/Translation.m
+++ b/nls/sv_SE/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align
 
diff --git a/nls/tr_TR/Translation.m b/nls/tr_TR/Translation.m
index 40722821..4075cd8e 100644
--- a/nls/tr_TR/Translation.m
+++ b/nls/tr_TR/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 
 $set 0x1 #Align