6 files changed, 41 insertions, 14 deletions

diff --git a/nls/et_EE/.cvsignore b/nls/et_EE/.cvsignore
new file mode 100644
index 0000000..4120fef
--- /dev/null
+++ b/nls/et_EE/.cvsignore
@@ -0,0 +1,5 @@
+.cvsignore
+Makefile
+Makefile.in
+*.cat
+*.m
diff --git a/nls/et_EE/Configmenu.m b/nls/et_EE/Configmenu.m
index 02857bc..7d94bdd 100644
--- a/nls/et_EE/Configmenu.m
+++ b/nls/et_EE/Configmenu.m
@@ -46,3 +46,11 @@ $ #TabRotateVertical
 # Rotate Vertical Tabs
 $ #SemiSloppyFocus
 # Semi Sloppy Focus
+$ #MaxOverSlit
+# Maximize Over Slit
+$ #SloppyWindowGrouping
+# Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
+$ #DesktopWheeling
+# Desktop Wheeling
diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 6bd65a2..cb4a13c 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -1,29 +1,33 @@
-# 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 = 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/et_EE"; \
-                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/et_EE ; \
-                $(INSTALL_DATA) blackbox.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/blackbox.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 \
-                awk -f ../convert.awk output=Translation.m $(MFILES); \
+                rm -f Translation.m; \
+                awk -f ../convert.awk codeset=$(CODESET) output=Translation.m $(MFILES); \
         fi
 
-blackbox.cat: Translation.m
+fluxbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=$(THE_LANG) $(gencat_cmd) fluxbox.cat Translation.m; \
         fi
diff --git a/nls/et_EE/Windowmenu.m b/nls/et_EE/Windowmenu.m
index 863a945..5c527a6 100644
--- a/nls/et_EE/Windowmenu.m
+++ b/nls/et_EE/Windowmenu.m
@@ -18,3 +18,5 @@ $ #KillClient
 # Killi klient
 $ #Close
 # Sulge
+$ #Tab
+# Tab
diff --git a/nls/et_EE/fluxbox.m b/nls/et_EE/fluxbox.m
new file mode 100644
index 0000000..3fbf74c
--- /dev/null
+++ b/nls/et_EE/fluxbox.m
@@ -0,0 +1,6 @@
+$set 13 #blackbox
+
+$ #NoManagableScreens
+# Blackbox::Blackbox: ei leidnud hallatavaid displeisid, katkestame\n
+$ #MapRequest
+# Blackbox::process_event: MapRequest 0x%lx'le\n
diff --git a/nls/et_EE/main.m b/nls/et_EE/main.m
index 4dc7648..c374152 100644
--- a/nls/et_EE/main.m
+++ b/nls/et_EE/main.m
@@ -7,10 +7,12 @@ $ #DISPLAYRequiresArg
 $ #WarnDisplaySet
 # hoiatus: ei saanud määrata keskonna muutujat 'DISPLAY'\n
 $ #Usage
-# Fluxbox %s: (c) 2001 Henrik Kinnunen\n\n\
+# Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
   -display <string>\t\tkasuta displei ühendust.\n\
   -rc <string>\t\t\tkasuta alternatiivseid resursse.\n\
   -version\t\t\tnäita versiooninumber ja välju.\n\
+  -info\t\t\t\tdisplay some useful information.\n\
+  -log <filename>\t\t\tlog output to file.\n\
   -help\t\t\t\tnäita seda abiteksti ja välju.\n\n
 $ #CompileOptions
 # Kompileerimisoptsioonid:\n\