whoops, wasn't quite right :-/

author: rathnor <rathnor> 2004-06-20 14:06:37 (GMT)
committer: rathnor <rathnor> 2004-06-20 14:06:37 (GMT)
commit: 5008d65247d4a07a242ce8569b5e74327597111e (patch)
tree: 5f8097b42f8d8ec50861c06bcd78491b20c44af4
parent: c144177c5c43ce35cf8c7b0e888a597d6292b39a (diff)
download: fluxbox_pavel-5008d65247d4a07a242ce8569b5e74327597111e.zip
fluxbox_pavel-5008d65247d4a07a242ce8569b5e74327597111e.tar.bz2
19 files changed, 28 insertions, 37 deletions
diff --git a/nls/C/.cvsignore b/nls/C/.cvsignore
index 4120fef..44c687c 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 dcf917e..9f7f16f 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
+MAINTAINERCLEANFILES = Makefile.in 
-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
+MFILES = Translation.m
 EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
-        @if test x$(NLSTEST) = "x-DNLS"; then \
+        @if test x$(NLSTEST) = "x-DNLS"; then                 echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
-                echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
+NG)";                 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG);                 $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
-                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+NG);         fi
-                $(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
-Translation.m: $(MFILES)
+uninstall-local:
-        @if test x$(NLSTEST) = "x-DNLS"; then \
+        @if test x$(NLSTEST) = "x-DNLS"; then                 rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat;                 rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG);         fi
-                rm -f Translation.m; \
-                awk -f ../convert.awk \
-                        output=Translation.m $(MFILES); \
-        fi
 fluxbox.cat: Translation.m
-        @if test x$(NLSTEST) = "x-DNLS"; then \
+        @if test x$(NLSTEST) = "x-DNLS"; then                 $(gencat_cmd) fluxbox.cat Translation.m;         fi
-                $(gencat_cmd) fluxbox.cat Translation.m; \
-        fi
diff --git a/nls/bg_BG/Translation.m b/nls/bg_BG/Translation.m
index 2d53e30..b9b75ad 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 761bb79..5081e4a 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 65a8772..b0e9665 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 e856b4f..76b11ca 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 5a16321..34de268 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 d7b0304..4c71dae 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 fd99bda..a2e6efe 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 b6f9e93..6e30a69 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 3f4ef0b..67c5c6c 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 151634e..ec62df5 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 aa66a67..bed62a4 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 418879e..70ee956 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 6a017c9..23dcd49 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 023e397..2441893 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 01eabf3..d975ece 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 f6c2c2f..68c6725 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 4072282..4075cd8 100644
--- a/nls/tr_TR/Translation.m
+++ b/nls/tr_TR/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 $set 0x1 #Align
author	rathnor <rathnor>	2004-06-20 14:06:37 (GMT)
committer	rathnor <rathnor>	2004-06-20 14:06:37 (GMT)
commit	5008d65247d4a07a242ce8569b5e74327597111e (patch)
tree	5f8097b42f8d8ec50861c06bcd78491b20c44af4
parent	c144177c5c43ce35cf8c7b0e888a597d6292b39a (diff)
download	fluxbox_pavel-5008d65247d4a07a242ce8569b5e74327597111e.zip fluxbox_pavel-5008d65247d4a07a242ce8569b5e74327597111e.tar.bz2

diff --git a/nls/C/.cvsignore b/nls/C/.cvsignore index 4120fef..44c687c 100644 --- a/nls/C/.cvsignore +++ b/nls/C/.cvsignore
@@ -1,5 +1,3 @@
1	.cvsignore
2	Makefile	1	Makefile
3	Makefile.in	2	Makefile.in
4	*.cat	3	*.cat
5	*.m


diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am index dcf917e..9f7f16f 100644 --- a/nls/C/Makefile.am +++ b/nls/C/Makefile.am
@@ -1,46 +1,22 @@
1	# nls/C/Makefile.am for Fluxbox - an X11 Window Manager	1	# nls/C/Makefile.am for Fluxbox - www.fluxbox.org
2		2
3	THE_LANG = C	3	THE_LANG = C
4	# no CODESET
5		4
6	NLSTEST = @NLS@	5	NLSTEST = @NLS@
7	CLEANFILES = fluxbox.cat	6	CLEANFILES = fluxbox.cat
8	MAINTAINERCLEANFILES = Makefile.in Translation.m	7	MAINTAINERCLEANFILES = Makefile.in
9	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	8	MFILES = Translation.m
10	EXTRA_DIST= $(MFILES)	9	EXTRA_DIST= $(MFILES)
		10
11	all-local: fluxbox.cat	11	all-local: fluxbox.cat
12	install-data-local: fluxbox.cat	12	install-data-local: fluxbox.cat
13	@if test x$(NLSTEST) = "x-DNLS"; then \	13	@if test x$(NLSTEST) = "x-DNLS"; then echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
14	echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \	14	NG)"; $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LA
15	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \	15	NG); fi
16	$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
17	rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
18	ln -fs C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
19	rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
20	ln -fs C $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
21	rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
22	ln -fs C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
23	rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
24	ln -fs C $(DESTDIR)$(pkgdatadir)/nls/en; \
25	fi
26	uninstall-local:
27	@if test x$(NLSTEST) = "x-DNLS"; then \
28	rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
29	rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
30	rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
31	rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
32	rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
33	rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
34	fi
35		16
36	Translation.m: $(MFILES)	17	uninstall-local:
37	@if test x$(NLSTEST) = "x-DNLS"; then \	18	@if test x$(NLSTEST) = "x-DNLS"; then rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); fi
38	rm -f Translation.m; \
39	awk -f ../convert.awk \
40	output=Translation.m $(MFILES); \
41	fi
42		19
43	fluxbox.cat: Translation.m	20	fluxbox.cat: Translation.m
44	@if test x$(NLSTEST) = "x-DNLS"; then \	21	@if test x$(NLSTEST) = "x-DNLS"; then $(gencat_cmd) fluxbox.cat Translation.m; fi
45	$(gencat_cmd) fluxbox.cat Translation.m; \	22
46	fi


diff --git a/nls/bg_BG/Translation.m b/nls/bg_BG/Translation.m index 2d53e30..b9b75ad 100644 --- a/nls/bg_BG/Translation.m +++ b/nls/bg_BG/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/da_DK/Translation.m b/nls/da_DK/Translation.m index 761bb79..5081e4a 100644 --- a/nls/da_DK/Translation.m +++ b/nls/da_DK/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/de_DE/Translation.m b/nls/de_DE/Translation.m index 65a8772..b0e9665 100644 --- a/nls/de_DE/Translation.m +++ b/nls/de_DE/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/es_ES/Translation.m b/nls/es_ES/Translation.m index e856b4f..76b11ca 100644 --- a/nls/es_ES/Translation.m +++ b/nls/es_ES/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-15
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/et_EE/Translation.m b/nls/et_EE/Translation.m index 5a16321..34de268 100644 --- a/nls/et_EE/Translation.m +++ b/nls/et_EE/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-15
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/fr_FR/Translation.m b/nls/fr_FR/Translation.m index d7b0304..4c71dae 100644 --- a/nls/fr_FR/Translation.m +++ b/nls/fr_FR/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-15
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/it_IT/Translation.m b/nls/it_IT/Translation.m index fd99bda..a2e6efe 100644 --- a/nls/it_IT/Translation.m +++ b/nls/it_IT/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/ja_JP/Translation.m b/nls/ja_JP/Translation.m index b6f9e93..6e30a69 100644 --- a/nls/ja_JP/Translation.m +++ b/nls/ja_JP/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=eucJP
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/lv_LV/Translation.m b/nls/lv_LV/Translation.m index 3f4ef0b..67c5c6c 100644 --- a/nls/lv_LV/Translation.m +++ b/nls/lv_LV/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-13
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/nl_NL/Translation.m b/nls/nl_NL/Translation.m index 151634e..ec62df5 100644 --- a/nls/nl_NL/Translation.m +++ b/nls/nl_NL/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/pl_PL/Translation.m b/nls/pl_PL/Translation.m index aa66a67..bed62a4 100644 --- a/nls/pl_PL/Translation.m +++ b/nls/pl_PL/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/pt_BR/Translation.m b/nls/pt_BR/Translation.m index 418879e..70ee956 100644 --- a/nls/pt_BR/Translation.m +++ b/nls/pt_BR/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/pt_PT/Translation.m b/nls/pt_PT/Translation.m index 6a017c9..23dcd49 100644 --- a/nls/pt_PT/Translation.m +++ b/nls/pt_PT/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/ru_RU/Translation.m b/nls/ru_RU/Translation.m index 023e397..2441893 100644 --- a/nls/ru_RU/Translation.m +++ b/nls/ru_RU/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=KOI8-R
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/sl_SI/Translation.m b/nls/sl_SI/Translation.m index 01eabf3..d975ece 100644 --- a/nls/sl_SI/Translation.m +++ b/nls/sl_SI/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-2
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/sv_SE/Translation.m b/nls/sv_SE/Translation.m index f6c2c2f..68c6725 100644 --- a/nls/sv_SE/Translation.m +++ b/nls/sv_SE/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4


diff --git a/nls/tr_TR/Translation.m b/nls/tr_TR/Translation.m index 4072282..4075cd8 100644 --- a/nls/tr_TR/Translation.m +++ b/nls/tr_TR/Translation.m
@@ -1,3 +1,4 @@
		1	$ codeset=ISO-8859-1
1		2
2	$set 0x1 #Align	3	$set 0x1 #Align
3		4