14 files changed, 17 insertions, 20 deletions

diff --git a/nls/bg_BG/Makefile.am b/nls/bg_BG/Makefile.am
index 024d672..0c3c8d5 100644
--- a/nls/bg_BG/Makefile.am
+++ b/nls/bg_BG/Makefile.am
@@ -10,7 +10,7 @@ all-local: blackbox.cat
 install-data-local: blackbox.cat
         @if test x$(NLSTEST) = "x-DNLS"; then \
                 echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \
+                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
                 $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
         fi
 uninstall-local:
@@ -27,5 +27,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=bg_BG $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/blackbox-nls.hh b/nls/blackbox-nls.hh
index 15bb263..f8f91eb 100644
--- a/nls/blackbox-nls.hh
+++ b/nls/blackbox-nls.hh
@@ -176,9 +176,6 @@ enum {
         bsetrootMustSpecify = 0x1,
         bsetrootUsage = 0x2,
         dummy_not_used = 0 //just for the ending
-}; //end enum
-
-}; //end namespace
-
-#endif //BLACKBOX_NLS_HH
-
+}; //end enum\n
+}; //end namespace\n
+#endif //BLACKBOX_NLS_HH\n
diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am
index c673cb3..fc63970 100644
--- a/nls/da_DK/Makefile.am
+++ b/nls/da_DK/Makefile.am
@@ -26,5 +26,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=da_DK $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am
index 8a47b3f..d7d2f02 100644
--- a/nls/es_ES/Makefile.am
+++ b/nls/es_ES/Makefile.am
@@ -29,5 +29,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=es_ES $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 0452f8c..ad2e0d9 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -26,5 +26,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=et_EE $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index ba9ce69..97221e2 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -30,5 +30,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=fr_FR $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am
index c05db87..1797882 100644
--- a/nls/it_IT/Makefile.am
+++ b/nls/it_IT/Makefile.am
@@ -27,5 +27,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=it_IT $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am
index a33dbb8..d22ede3 100644
--- a/nls/pt_BR/Makefile.am
+++ b/nls/pt_BR/Makefile.am
@@ -26,5 +26,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=pt_BR $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/pt_PT/Makefile.am b/nls/pt_PT/Makefile.am
index 5a8348e..a0b064f 100644
--- a/nls/pt_PT/Makefile.am
+++ b/nls/pt_PT/Makefile.am
@@ -26,5 +26,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=pt_PT $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/ru_RU/Configmenu.m b/nls/ru_RU/Configmenu.m
index 30da03a..e746edc 100644
--- a/nls/ru_RU/Configmenu.m
+++ b/nls/ru_RU/Configmenu.m
@@ -51,6 +51,6 @@ $ #MaxOverSlit
 $ #SloppyWindowGrouping
 # Группировка "размытых" окон
 $ #WorkspaceWarping
-# Workspace Warping
+# Перемещение окон между рабочими столами
 $ #DesktopWheeling
 # Desktop Wheeling
diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am
index 1f43b8b..9ccbfb2 100644
--- a/nls/ru_RU/Makefile.am
+++ b/nls/ru_RU/Makefile.am
@@ -26,5 +26,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=ru_RU $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/ru_RU/Windowmenu.m b/nls/ru_RU/Windowmenu.m
index 45ba228..7b631a6 100644
--- a/nls/ru_RU/Windowmenu.m
+++ b/nls/ru_RU/Windowmenu.m
@@ -1,7 +1,7 @@
 $set 10 #Windowmenu
 
 $ #SendTo
-# Отправить на ...
+# Отправить окно на ...
 $ #SendGroupTo
 # Отправить группу на...
 $ #Shade
diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am
index 3721f13..59d8d0b 100644
--- a/nls/sv_SE/Makefile.am
+++ b/nls/sv_SE/Makefile.am
@@ -27,5 +27,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=sv_SE $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am
index 2612ebf..f3a6278 100644
--- a/nls/tr_TR/Makefile.am
+++ b/nls/tr_TR/Makefile.am
@@ -31,5 +31,5 @@ Translation.m: $(MFILES)
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=tr_TR $(gencat_cmd) blackbox.cat Translation.m; \
         fi