updated French support

bbidulock · Mar 25, 2002 · 11c0760 · 11c0760
1 parent 21ef46f
commit 11c0760
Show file tree

Hide file tree

Showing 49 changed files with 1,369 additions and 380 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -30,6 +30,8 @@ Current Contributors:
 	 - Taiwan Chinese (zh_TW) support
 	Bodnar Istvan <piggy@dub.hu>
 	 - Hungarian (hu_HU) support
+	Duret Bertrand <bertrand.duret@libertysurf.fr>
+	 - updated French (fr_FR) nls and added French man pages
 
 Original Author:
         Brad Hughes <bhughes@trolltech.com>

diff --git a/ChangeLog b/ChangeLog
@@ -35,6 +35,7 @@ Changes from 0.62.1:
     on the window.  To further attack the infinite loops this function ensures
     that client.transient != this.
   - added zh_TW (Taiwan Chinese) and Hungarian (hu_HU)
+  - updated the French nls support and added French man pages
   - remove slit and netwm as compile time options
   - strip much of BaseDisplay's original functionality and move it to the
     blackbox class.

diff --git a/Makefile.in b/Makefile.in
@@ -93,9 +93,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -264,11 +264,6 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

diff --git a/configure b/configure
@@ -2964,6 +2964,7 @@ util/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
+doc/fr_FR/Makefile
 doc/ja_JP/Makefile
 doc/nl_NL/Makefile
 doc/sl_SI/Makefile
@@ -3092,6 +3093,7 @@ util/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
+doc/fr_FR/Makefile
 doc/ja_JP/Makefile
 doc/nl_NL/Makefile
 doc/sl_SI/Makefile

diff --git a/configure.in b/configure.in
@@ -179,6 +179,7 @@ util/Makefile
 data/Makefile
 data/styles/Makefile
 doc/Makefile
+doc/fr_FR/Makefile
 doc/ja_JP/Makefile
 doc/nl_NL/Makefile
 doc/sl_SI/Makefile

diff --git a/data/Makefile.in b/data/Makefile.in
@@ -89,9 +89,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps data/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -190,11 +190,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = data
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

diff --git a/data/styles/Makefile.in b/data/styles/Makefile.in
@@ -91,9 +91,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu data/styles/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps data/styles/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -125,11 +125,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = data/styles
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/styles/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,11 +1,17 @@
-# doc/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
+# doc/Makefile.am for Blackbox - an X11 Window manager
 
 CLEANFILES = blackbox.1
 MAINTAINERCLEANFILES = Makefile.in
 man_MANS = blackbox.1 bsetroot.1
+SUBDIRS = fr_FR ja_JP nl_NL sl_SI
+
+DEFAULT_MENU=$(pkgdatadir)/menu
 
 distclean-local:
 	rm -f *\~
 
 blackbox.1: blackbox.1.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," blackbox.1.in > blackbox.1
+	@regex_cmd@ -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+		-e "s,@pkgdatadir@,$(pkgdatadir)," \
+		-e "s,@version@,$(VERSION)," \
+		 @srcdir@/blackbox.1.in > blackbox.1
diff --git a/doc/Makefile.in b/doc/Makefile.in
@@ -76,7 +76,7 @@ regex_cmd = @regex_cmd@
 CLEANFILES = blackbox.1
 MAINTAINERCLEANFILES = Makefile.in
 man_MANS = blackbox.1 bsetroot.1
-SUBDIRS = ja_JP nl_NL sl_SI
+SUBDIRS = fr_FR ja_JP nl_NL sl_SI
 
 DEFAULT_MENU = $(pkgdatadir)/menu
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -96,9 +96,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps doc/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -236,11 +236,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = doc
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

diff --git a/doc/fr_FR/Makefile.am b/doc/fr_FR/Makefile.am
@@ -0,0 +1,42 @@
+# doc/<locale>/Makefile.am for Blackbox - an X11 Window manager
+
+# what locale is this
+locale = fr_FR
+
+# where to install
+locale_mandir = $(DESTDIR)$(mandir)/$(locale)/man1
+
+# what to install
+manfiles = blackbox.1 @srcdir@/bsetroot.1
+
+# which files need processing during 'make'
+all-local: blackbox.1
+
+CLEANFILES = blackbox.1
+MAINTAINERCLEANFILES = Makefile.in
+
+NLSTEST = @NLS@
+DEFAULT_MENU=$(pkgdatadir)/menu
+
+distclean-local:
+	rm -f *\~
+
+blackbox.1: blackbox.1.in
+	@regex_cmd@ -e "s,@defaultmenu@,$(DEFAULT_MENU)," \
+		-e "s,@pkgdatadir@,$(pkgdatadir)," \
+		-e "s,@version@,$(VERSION)," \
+		@srcdir@/blackbox.1.in > blackbox.1
+
+install-data-local: all-local
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		echo "Installing manual pages for $(locale)"; \
+		$(mkinstalldirs) $(locale_mandir); \
+		$(INSTALL_DATA) $(manfiles) $(locale_mandir); \
+	fi
+
+uninstall-local:
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		for i in $(manfiles); do \
+		rm -f $(locale_mandir)/`basename $$i`; \
+		done; \
+	fi