6 files changed, 53 insertions, 15 deletions

diff --git a/nls/C/.cvsignore b/nls/C/.cvsignore
new file mode 100644
index 0000000..4120fef
--- /dev/null
+++ b/nls/C/.cvsignore
@@ -0,0 +1,5 @@
+.cvsignore
+Makefile
+Makefile.in
+*.cat
+*.m
diff --git a/nls/C/Configmenu.m b/nls/C/Configmenu.m
index 7f64e97..a50e6fd 100644
--- a/nls/C/Configmenu.m
+++ b/nls/C/Configmenu.m
@@ -46,3 +46,13 @@ $ #TabRotateVertical
 # Rotate Vertical Tabs
 $ #SemiSloppyFocus
 # Semi Sloppy Focus
+$ #MaxOverSlit
+# Maximize Over Slit
+$ #SloppyWindowGrouping
+# Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
+$ #DesktopWheeling
+# Desktop Wheeling
+$ #AntiAlias
+# AntiAlias
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index be588ad..2f429ad 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -1,16 +1,19 @@
-# 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 = blackbox.cat
+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 blackbox.m common.m main.m bsetroot.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)
-all-local: blackbox.cat
-install-data-local: blackbox.cat
+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) blackbox.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,25 +25,35 @@ install-data-local: blackbox.cat
         fi
 uninstall-local:
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                rm -f $(DESTDIR)$(pkgdatadir)/nls/C/blackbox.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
-# header=../blackbox-nls.hh which is passed to awk... we
+# header=../fluxbox-nls.hh which is passed to awk... we
 # only need to generate it once.
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                awk -f ../convert.awk header=../blackbox-nls.hh \
+                rm -f Translation.m; \
+                echo "//This file is generated from nls/C" > ../fluxbox-nls.hh; \
+                echo "#ifndef BLACKBOX_NLS_HH" >> ../fluxbox-nls.hh; \
+                echo "#define BLACKBOX_NLS_HH" >> ../fluxbox-nls.hh; \
+                echo "namespace FBNLS {" >> ../fluxbox-nls.hh;  \
+                echo "enum {" >> ../fluxbox-nls.hh;     \
+                awk -f ../convert.awk header=../fluxbox-nls.hh \
                         output=Translation.m $(MFILES); \
+                echo "  dummy_not_used = 0 //just for the ending" >> ../fluxbox-nls.hh; \
+                echo "}; //end enum" >> ../fluxbox-nls.hh; \
+                echo "}; //end namespace" >> ../fluxbox-nls.hh; \
+                echo "#endif //BLACKBOX_NLS_HH" >> ../fluxbox-nls.hh; \
         fi
 
-blackbox.cat: Translation.m
+fluxbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                $(gencat_cmd) fluxbox.cat Translation.m; \
         fi
diff --git a/nls/C/Windowmenu.m b/nls/C/Windowmenu.m
index 13b3c38..58ccfe2 100644
--- a/nls/C/Windowmenu.m
+++ b/nls/C/Windowmenu.m
@@ -20,3 +20,5 @@ $ #KillClient
 # Kill Client
 $ #Close
 # Close
+$ #Tab
+# Tab
diff --git a/nls/C/fluxbox.m b/nls/C/fluxbox.m
new file mode 100644
index 0000000..74d09f6
--- /dev/null
+++ b/nls/C/fluxbox.m
@@ -0,0 +1,6 @@
+$set 13 #blackbox
+
+$ #NoManagableScreens
+# Blackbox::Blackbox: no managable screens found, aborting\n
+$ #MapRequest
+# Blackbox::process_event: MapRequest for 0x%lx\n
diff --git a/nls/C/main.m b/nls/C/main.m
index 5ff1b70..b5a1a8e 100644
--- a/nls/C/main.m
+++ b/nls/C/main.m
@@ -7,10 +7,12 @@ $ #DISPLAYRequiresArg
 $ #WarnDisplaySet
 # warning: could not set environment variable 'DISPLAY'\n
 $ #Usage
-# Fluxkbox %s: (c) 2001 Henrik Kinnunen\n\n\
+# Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
   -display <string>\t\tuse display connection.\n\
   -rc <string>\t\t\tuse alternate resource file.\n\
   -version\t\t\tdisplay version and exit.\n\
+  -info\t\t\t\tdisplay some useful information.\n\
+  -log <filename>\t\t\tlog output to file.\n\
   -help\t\t\t\tdisplay this help text and exit.\n\n
 $ #CompileOptions
 # Compile time options:\n\