From 35fe2d5e128c1b13d34a5152945a1b8979401d6f Mon Sep 17 00:00:00 2001
From: rathnor <rathnor>
Date: Sat, 4 Oct 2003 12:44:47 +0000
Subject: fix nls bad message errors

---
 ChangeLog             |  6 ++++++
 nls/C/Makefile.am     | 15 +++++++++------
 nls/bg_BG/Makefile.am |  9 ++++++---
 nls/convert.awk       |  2 ++
 nls/da_DK/Makefile.am | 19 +++++++++++--------
 nls/de_DE/Makefile.am | 17 ++++++++++-------
 nls/es_ES/Makefile.am | 21 ++++++++++++---------
 nls/et_EE/Makefile.am | 19 +++++++++++--------
 nls/fr_FR/Makefile.am | 21 ++++++++++++---------
 nls/it_IT/Makefile.am | 17 ++++++++++-------
 nls/ja_JP/Makefile.am | 19 ++++++++++++-------
 nls/lv_LV/Makefile.am | 21 ++++++++++++---------
 nls/pt_BR/Makefile.am | 19 +++++++++++--------
 nls/pt_PT/Makefile.am | 19 +++++++++++--------
 nls/ru_RU/Makefile.am | 19 +++++++++++--------
 nls/sv_SE/Makefile.am | 19 +++++++++++--------
 nls/tr_TR/Makefile.am | 21 ++++++++++++---------
 17 files changed, 169 insertions(+), 114 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62647f4..53be5ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 (Format: Year/Month/Day)
 Changes for 0.9.6:
+*03/10/04:
+  * Fix NLS bad message errors by adding explicit codeset entries (Simon)
+    - thanks to Matt Hope for pointing us to the recent workaround from 
+      blackbox (and thanks to Matt Kraai who contrib-d to Blackbox)
+    - also clean up the Makefiles so they are more generalised
+    nls/*/Makefile.am nls/convert.awk
 *03/10/02:
   * Fix couple of memory leaks and uninitialised uses shown up with 
     valgrind (Simon)
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 7ed9025..2f429ad 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,4 +1,7 @@
-# nls/C/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/C/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = C
+# no CODESET
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,9 +11,9 @@ 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/C"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
+		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; \
@@ -22,12 +25,12 @@ install-data-local: fluxbox.cat
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/fluxbox.cat; \
+		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/C; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 # note... when adding new catalogs... you do not need the
diff --git a/nls/bg_BG/Makefile.am b/nls/bg_BG/Makefile.am
index e524853..b5710fb 100644
--- a/nls/bg_BG/Makefile.am
+++ b/nls/bg_BG/Makefile.am
@@ -1,4 +1,7 @@
-THE_LANG=bg_BG
+# nls/bg_BG/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = bg_BG
+CODESET = ISO-8859-1
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -22,10 +25,10 @@ uninstall-local:
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=bg_BG $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/convert.awk b/nls/convert.awk
index 813c470..e10f0b5 100644
--- a/nls/convert.awk
+++ b/nls/convert.awk
@@ -4,6 +4,8 @@
 
   if (major > 1)
     printf "\n" > output
+  else if (codeset)
+    printf "$ codeset=%s\n", codeset > output
   printf "$set %d %s\n", major, $3 >> output
 
   if (header) {
diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am
index 4e933ef..5adbf48 100644
--- a/nls/da_DK/Makefile.am
+++ b/nls/da_DK/Makefile.am
@@ -1,4 +1,7 @@
-# nls/da_DK/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/da_DK/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = da_DK
+CODESET = ISO-8859-1
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,23 +11,23 @@ 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/da_DK"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/da_DK; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/da_DK; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/da_DK/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/da_DK; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=da_DK $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/de_DE/Makefile.am b/nls/de_DE/Makefile.am
index 08cee33..de320ba 100644
--- a/nls/de_DE/Makefile.am
+++ b/nls/de_DE/Makefile.am
@@ -1,4 +1,7 @@
-# nls/de_DE/Makefile.am for fluxbox - fluxbox.sf.net
+# nls/de_DE/Makefile.am for Fluxbox - fluxbox.sf.net
+
+THE_LANG = de_DE
+CODESET = ISO-8859-1
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -10,15 +13,15 @@ all-local: fluxbox.cat
 
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/de_DE"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/de_DE; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/de_DE; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/de_DE/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/de_DE; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 # note... when adding new catalogs... you do not need the
@@ -28,7 +31,7 @@ uninstall-local:
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am
index 8cb0e02..937051a 100644
--- a/nls/es_ES/Makefile.am
+++ b/nls/es_ES/Makefile.am
@@ -1,4 +1,7 @@
-# nls/es_ES/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/es_ES/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = es_ES
+CODESET = ISO-8859-15
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,26 +11,26 @@ 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/es_ES"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/es_ES; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/es_ES; \
+		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/es; \
-		ln -fs es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \
+		ln -fs $(THE_LANG) $(DESTDIR)$(pkgdatadir)/nls/es; \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/es_ES/fluxbox.cat; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/es_ES; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=es_ES $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 1520615..cb4a13c 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -1,4 +1,7 @@
-# nls/et_EE/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/et_EE/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = et_EE
+CODESET = ISO-8859-15
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,23 +11,23 @@ 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/et_EE"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/et_EE ; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/et_EE; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) ; \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/et_EE/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/et_EE; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=et_EE $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index 48255a2..4f7f43f 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -1,4 +1,7 @@
-# nls/fr_FR/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/fr_FR/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = fr_FR
+CODESET = ISO-8859-15
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -9,26 +12,26 @@ 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/fr_FR"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
+		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/fr; \
-		ln -fs fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \
+		ln -fs $(THE_LANG) $(DESTDIR)$(pkgdatadir)/nls/fr; \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/fr_FR/fluxbox.cat; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=fr_FR $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am
index beb9ab7..8a9e178 100644
--- a/nls/it_IT/Makefile.am
+++ b/nls/it_IT/Makefile.am
@@ -1,5 +1,8 @@
 # nls/it_IT/Makefile.am for Fluxbox - an X11 Window Manager
 
+THE_LANG = it_IT
+CODESET = ISO-8859-1
+
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in Translation.m
@@ -9,23 +12,23 @@ 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/it_IT"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/it_IT; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/it_IT; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/it_IT/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/it_IT; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=it_IT $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/ja_JP/Makefile.am b/nls/ja_JP/Makefile.am
index 9a4d97a..dcaf37b 100644
--- a/nls/ja_JP/Makefile.am
+++ b/nls/ja_JP/Makefile.am
@@ -1,3 +1,8 @@
+# nls/ja_JP/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = ja_JP
+CODESET = eucJP
+
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in Translation.m
@@ -6,23 +11,23 @@ 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/ja_JP"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/ja_JP; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/ja_JP; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/ja_JP/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/ja_JP; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=ja_JP $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/lv_LV/Makefile.am b/nls/lv_LV/Makefile.am
index b4cb62d..0eb4e5d 100644
--- a/nls/lv_LV/Makefile.am
+++ b/nls/lv_LV/Makefile.am
@@ -1,4 +1,7 @@
-# nls/lv_LV/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/lv_LV/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = lv_LV
+CODESET = ISO-8859-13
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,25 +11,25 @@ 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/lv_LV"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/lv_LV; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/lv_LV; \
+		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/lv; \
-		ln -fs lv_LV $(DESTDIR)$(pkgdatadir)/nls/lv; \
+		ln -fs $(THE_LANG) $(DESTDIR)$(pkgdatadir)/nls/lv; \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/lv_LV/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/lv_LV; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=lv_LV $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am
index f0f9749..4745ce1 100644
--- a/nls/pt_BR/Makefile.am
+++ b/nls/pt_BR/Makefile.am
@@ -1,4 +1,7 @@
-# nls/pt_BR/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/pt_BR/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = pt_BR
+CODESET = ISO-8859-1
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,23 +11,23 @@ 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/pr_BR"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/pt_BR/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=pt_BR $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/pt_PT/Makefile.am b/nls/pt_PT/Makefile.am
index cf35d0c..7ece564 100644
--- a/nls/pt_PT/Makefile.am
+++ b/nls/pt_PT/Makefile.am
@@ -1,4 +1,7 @@
-# nls/pt_PT/Makefile.am for Fluxbox  - an X11 Window Manager
+# nls/pt_PT/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = pt_PT
+CODESET = ISO-8859-1
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,23 +11,23 @@ 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/pt_PT"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/pt_PT; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/pt_PT; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/pt_PT/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/pt_PT; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=pt_PT $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am
index b250493..3ef9dae 100644
--- a/nls/ru_RU/Makefile.am
+++ b/nls/ru_RU/Makefile.am
@@ -1,4 +1,7 @@
-# nls/ru_RU/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/ru_RU/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = ru_RU
+CODESET = KOI8-R
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -8,23 +11,23 @@ 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/ru_RU"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/ru_RU/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=ru_RU $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am
index 91a3cc2..aa4cfb1 100644
--- a/nls/sv_SE/Makefile.am
+++ b/nls/sv_SE/Makefile.am
@@ -1,4 +1,7 @@
-# nls/sv_SE/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/sv_SE/Makefile.am for Fluxbox - an X11 Window Manager
+
+THE_LANG = sv_SE
+CODESET = ISO-8859-1
 
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
@@ -9,23 +12,23 @@ 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/sv_SE"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/sv_SE/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=sv_SE $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am
index b7075dd..b82bc9e 100644
--- a/nls/tr_TR/Makefile.am
+++ b/nls/tr_TR/Makefile.am
@@ -1,35 +1,38 @@
-# nls/tr_TR/Makefile.am for Blackbox-0.61.x - an X11 Window Manager
+# nls/tr_TR/Makefile.am for Fluxbox - an X11 Window Manager
 # 
 # -- Türkce tercüme dizini için bir yapim-dosya-tabanı
 # 	kabalak -- kabalak@gmx.net
 #
 
+THE_LANG = tr_TR
+CODESET = ISO-8859-1
+
 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
-EXTRA_DIST=$(MFILES)
+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/tr_TR"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/tr_TR/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
 	fi
 
 Translation.m: $(MFILES)
 	@if test x$(NLSTEST) = "x-DNLS"; then \
 		rm -f Translation.m; \
-		awk -f ../convert.awk output=Translation.m $(MFILES); \
+		awk -f ../convert.awk codeset=$(CODESET) codeset=$(CODESET) output=Translation.m $(MFILES); \
 	fi
 
 fluxbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		LANG=tr_TR $(gencat_cmd) fluxbox.cat Translation.m; \
+		LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
 	fi
-- 
cgit v0.11.2