31 files changed, 46 insertions, 3 deletions

diff --git a/nls/C/Configmenu.m b/nls/C/Configmenu.m
index 62ff7f0..8090813 100644
--- a/nls/C/Configmenu.m
+++ b/nls/C/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index a7b50ba..d737000 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -36,6 +36,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 echo -e "//This file is generated from nls/C" > ../blackbox-nls.hh; \
                 echo -e "#ifndef BLACKBOX_NLS_HH" >> ../blackbox-nls.hh; \
                 echo -e "#define BLACKBOX_NLS_HH" >> ../blackbox-nls.hh; \
diff --git a/nls/bg_BG/Configmenu.m b/nls/bg_BG/Configmenu.m
index decf6f5..850f1f0 100644
--- a/nls/bg_BG/Configmenu.m
+++ b/nls/bg_BG/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Óâåëè÷è âúðõó Slit -à
 $ #SloppyWindowGrouping
 # Sloppy Ãðóïèðàíå íà ïðîçîðöè
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/bg_BG/Makefile.am b/nls/bg_BG/Makefile.am
index 2b248d2..024d672 100644
--- a/nls/bg_BG/Makefile.am
+++ b/nls/bg_BG/Makefile.am
@@ -21,6 +21,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/bg_BG/Translation.m b/nls/bg_BG/Translation.m
index 1e7a3e6..c91fd0f 100644
--- a/nls/bg_BG/Translation.m
+++ b/nls/bg_BG/Translation.m
@@ -39,6 +39,7 @@ $set 3 #Configmenu
 23 Ïîëó Sloppy Ôîêóñ
 24 Óâåëè÷è âúðõó Slit -à
 25 Sloppy Ãðóïèðàíå íà ïðîçîðöè
+26 Workspace Warping
 
 $set 4 #Icon
 
diff --git a/nls/blackbox-nls.hh b/nls/blackbox-nls.hh
index dbdfceb..866bbf6 100644
--- a/nls/blackbox-nls.hh
+++ b/nls/blackbox-nls.hh
@@ -41,6 +41,7 @@ enum {
         ConfigmenuSemiSloppyFocus = 0x17,
         ConfigmenuMaxOverSlit = 0x18,
         ConfigmenuSloppyWindowGrouping = 0x19,
+        ConfigmenuWorkspaceWarping = 0x1a,
 
         IconSet = 0x4,
         IconIcons = 0x1,
diff --git a/nls/da_DK/Configmenu.m b/nls/da_DK/Configmenu.m
index cb742bc..d045d7e 100644
--- a/nls/da_DK/Configmenu.m
+++ b/nls/da_DK/Configmenu.m
@@ -48,3 +48,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am
index 6c9ea01..c673cb3 100644
--- a/nls/da_DK/Makefile.am
+++ b/nls/da_DK/Makefile.am
@@ -20,6 +20,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/es_ES/Configmenu.m b/nls/es_ES/Configmenu.m
index 1aef071..d1c5d2d 100644
--- a/nls/es_ES/Configmenu.m
+++ b/nls/es_ES/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am
index 5856c87..8a47b3f 100644
--- a/nls/es_ES/Makefile.am
+++ b/nls/es_ES/Makefile.am
@@ -23,6 +23,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/et_EE/Configmenu.m b/nls/et_EE/Configmenu.m
index 9dcbee6..fdc1411 100644
--- a/nls/et_EE/Configmenu.m
+++ b/nls/et_EE/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 6bd65a2..0452f8c 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -20,6 +20,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/fr_FR/Configmenu.m b/nls/fr_FR/Configmenu.m
index 0023b6a..d988d0b 100644
--- a/nls/fr_FR/Configmenu.m
+++ b/nls/fr_FR/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximisez au dessus du Slit
 $ #SloppyWindowGrouping
 # Groupement des fenêtres stupide
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index 91c9f01..ba9ce69 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -24,6 +24,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/it_IT/Configmenu.m b/nls/it_IT/Configmenu.m
index b8bbdf5..77bf98e 100644
--- a/nls/it_IT/Configmenu.m
+++ b/nls/it_IT/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am
index 8c84c55..c05db87 100644
--- a/nls/it_IT/Makefile.am
+++ b/nls/it_IT/Makefile.am
@@ -21,6 +21,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/ja_JP/Configmenu.m b/nls/ja_JP/Configmenu.m
index 102fa2b..5c08112 100644
--- a/nls/ja_JP/Configmenu.m
+++ b/nls/ja_JP/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Slit¤ò±Û¤¨¤ÆºÇÂç²½
 $ #SloppyWindowGrouping
 # WindowÆâ¤Ë¥¿¥Ö¥É¥í¥Ã¥×¤Ç¤â¥¿¥Ö¥°¥ë¡¼¥×¤Ë
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/ja_JP/Makefile.am b/nls/ja_JP/Makefile.am
index 1f050b0..de48ab7 100644
--- a/nls/ja_JP/Makefile.am
+++ b/nls/ja_JP/Makefile.am
@@ -18,10 +18,11 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
 blackbox.cat: Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) blackbox.cat Translation.m; \
+                LANG=ja_JP $(gencat_cmd) blackbox.cat Translation.m; \
         fi
diff --git a/nls/ja_JP/Translation.m b/nls/ja_JP/Translation.m
index 12b0ccc..784fd9b 100644
--- a/nls/ja_JP/Translation.m
+++ b/nls/ja_JP/Translation.m
@@ -19,7 +19,7 @@ $set 3 #Configmenu
 3 ¥¦¥£¥ó¥É¥¦ÇÛÃÖ
 4 ²èÁü¥Ç¥£¥¶
 5 ¥¦¥£¥ó¥É¥¦¤ÎÆâÍƤòɽ¼¨¤·¤¿¤Þ¤Þ°ÜÆ°
-6 ´°Á´ºÇÂç²½¡Ê¥¿¥¹¥¯¥Ð¡¼Ìµ»ë¡Ë
+6 ´°Á´ºÇÂç²½(¥¿¥¹¥¯¥Ð¡¼Ìµ»ë)
 7 ¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥Õ¥©¡¼¥«¥¹
 8 ¥ï¡¼¥¯¥¹¥Ú¡¼¥¹°ÜÆ°»þ¤ËºÇ¸å¤Î¥¦¥£¥ó¥É¥¦¤Ë¥Õ¥©¡¼¥«¥¹
 9 ¥¯¥ê¥Ã¥¯¤Ç¥Õ¥©¡¼¥«¥¹
@@ -39,6 +39,7 @@ $set 3 #Configmenu
 23 ¥«¡¼¥½¥ë¥ª¡¼¥Ð¡¼¤Ç¥Õ¥©¡¼¥«¥¹(SemiSloppy)
 24 Slit¤ò±Û¤¨¤ÆºÇÂç²½
 25 WindowÆâ¤Ë¥¿¥Ö¥É¥í¥Ã¥×¤Ç¤â¥¿¥Ö¥°¥ë¡¼¥×¤Ë
+26 Workspace Warping
 
 $set 4 #Icon
 
@@ -182,7 +183,7 @@ $set 15 #main
 1 error: '-rc' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹\n
 2 error: '-display' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹\n
 3 warning: ´Ä¶­ÊÑ¿ô 'DISPLAY' ¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n
-4 Fluxkbox %s: (c) 2001 Henrik Kinnunen\n\n\
+4 Fluxbox %s: (c) 2001 Henrik Kinnunen\n\n\
   -display <string>\t\t »ØÄê¥Ç¥£¥¹¥×¥ì¥¤¤ËÀܳ.\n\
   -rc <string>\t\t\t Âå¤ï¤ê¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò»ÈÍÑ.\n\
   -version\t\t\t ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ».\n\
diff --git a/nls/pt_BR/Configmenu.m b/nls/pt_BR/Configmenu.m
index c586737..40524ce 100644
--- a/nls/pt_BR/Configmenu.m
+++ b/nls/pt_BR/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am
index 197c57d..a33dbb8 100644
--- a/nls/pt_BR/Makefile.am
+++ b/nls/pt_BR/Makefile.am
@@ -20,6 +20,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/pt_PT/Configmenu.m b/nls/pt_PT/Configmenu.m
index 14d04ae..46eda1f 100644
--- a/nls/pt_PT/Configmenu.m
+++ b/nls/pt_PT/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximizar Sobre Slit
 $ #SloppyWindowGrouping
 # Sloppy Janela Em Grupo
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/pt_PT/Makefile.am b/nls/pt_PT/Makefile.am
index 3fc7d03..5a8348e 100644
--- a/nls/pt_PT/Makefile.am
+++ b/nls/pt_PT/Makefile.am
@@ -20,6 +20,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/pt_PT/Translation.m b/nls/pt_PT/Translation.m
index 76a79b0..03e7671 100644
--- a/nls/pt_PT/Translation.m
+++ b/nls/pt_PT/Translation.m
@@ -39,6 +39,7 @@ $set 3 #Configmenu
 23 Semi Sloppy Focus
 24 Maximizar Sobre Slit
 25 Sloppy Janela Em Grupo
+26 Workspace Warping
 
 $set 4 #Icon
 
diff --git a/nls/pt_PT/blackbox.cat b/nls/pt_PT/blackbox.cat
index 75c3ef3..d78d58c 100644
--- a/nls/pt_PT/blackbox.cat
+++ b/nls/pt_PT/blackbox.cat
diff --git a/nls/ru_RU/Configmenu.m b/nls/ru_RU/Configmenu.m
index 14e46a0..0ca3b24 100644
--- a/nls/ru_RU/Configmenu.m
+++ b/nls/ru_RU/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # íÁËÓÉÍÉÚÉÒÏ×ÁÔØ ÎÁÄ ÄÏËÅÒÏÍ
 $ #SloppyWindowGrouping
 # çÒÕÐÐÉÒÏ×ËÁ "ÒÁÚÍÙÔÙÈ" ÏËÏÎ
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am
index a95d035..1f43b8b 100644
--- a/nls/ru_RU/Makefile.am
+++ b/nls/ru_RU/Makefile.am
@@ -20,6 +20,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/sv_SE/Configmenu.m b/nls/sv_SE/Configmenu.m
index 968b4e1..d83dffe 100644
--- a/nls/sv_SE/Configmenu.m
+++ b/nls/sv_SE/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Hafsig Fönster Gruppering
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am
index b1706c3..3721f13 100644
--- a/nls/sv_SE/Makefile.am
+++ b/nls/sv_SE/Makefile.am
@@ -21,6 +21,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi
 
diff --git a/nls/tr_TR/Configmenu.m b/nls/tr_TR/Configmenu.m
index 6b52958..22a1623 100644
--- a/nls/tr_TR/Configmenu.m
+++ b/nls/tr_TR/Configmenu.m
@@ -50,3 +50,5 @@ $ #MaxOverSlit
 # Maximize Over Slit
 $ #SloppyWindowGrouping
 # Sloppy Window Grouping
+$ #WorkspaceWarping
+# Workspace Warping
diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am
index d6e34cb..2612ebf 100644
--- a/nls/tr_TR/Makefile.am
+++ b/nls/tr_TR/Makefile.am
@@ -25,6 +25,7 @@ uninstall-local:
 
 Translation.m: $(MFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f Translation.m; \
                 awk -f ../convert.awk output=Translation.m $(MFILES); \
         fi