7 files changed, 37 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c382f5..64acc2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
 (Format: Year/Month/Day)
+Changes for 0.9.9:
+*04/01/16:
+  * Different window for window position  (Thanks Junichiro Kita (kita<at>kitaj.no-ip.com)
+    Screen.cc
+  * New Command:      (Thanks Junichiro Kita (kita<at>kitaj.no-ip.com)
+    WindowMenu  - this will show the window menu on the focused window
+  * Revert to old focused window after menu keyboard navigation (Henrik)
+    fluxbox.cc
+  * Menu keyboard navigation bug fixes (Thanks Junichiro Kita (kita<at>kitaj.no-ip.com)
+    also fixes so submenus dont open unless you press Right
+    Menu.cc
+  * Using strut area for ArrangeWindows (Thanks Carlos (mindsuck<(at)>gfxnstuff .com.ar))
+  * New behavior for icon button   (Thanks Dmitriy Nikitinskiy)
+    On click: if focused then iconify else raise and focus.
+    IconButton.cc
+*04/01/15:
+
+
+--------------------------------------------------------------------------
 Changes for 0.9.8:
 *04/01/14:
   * Fixed some border issues with left/right alignment in Iconbar (Henrik)
diff --git a/nls/C/Screen.m b/nls/C/Screen.m
index 128c06e..1890b8a 100644
--- a/nls/C/Screen.m
+++ b/nls/C/Screen.m
@@ -51,4 +51,6 @@ $ #PositionFormat
 # X: %4d x Y: %4d
 $ #GeometryFormat
 # W: %4d x H: %4d
+$ #GeometryLength
+# W: 0000 x H: 0000
 
diff --git a/nls/bg_BG/Translation.m b/nls/bg_BG/Translation.m
index ee2cce1..5748781 100644
--- a/nls/bg_BG/Translation.m
+++ b/nls/bg_BG/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 $set 1 #BaseDisplay
 
 1 %s:  X ãðåøêà: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
@@ -187,10 +188,12 @@ $set 15 #main
 1 ãðåøêà: '-rc' èçèñêâà àðãóìåíò\n
 2 ãðåøêà: '-display' èçèñêâà àðãóìåíò\n
 3 âíèìàíèå: íå ìîãà äà íàãëàñÿ ïðîìåíëèâàòà íà ñðåäàòà 'DISPLAY'\n
-4 Fluxkbox %s: (c) 2001 Henrik Kinnunen\n\n\
+4 Fluxkbox %s: (c) %s Henrik Kinnunen\n\n\
   -display <string>\t\tuse display connection.\n\
   -rc <string>\t\t\tïîëçâàé çàìåñòâàù ðåñóðñåí ôàéë.\n\
   -version\t\t\tïîêàæè âåðñèÿòà è èçëåç.\n\
+  -info\t\t\t\tdisplay some useful information.\n\
+  -log <filename>\t\t\tlog output to file.\n\
   -help\t\t\t\tïîêàæè òîçè ïîìîùåí òåêñò è èçëåç.\n\n
 5 Èçáðàíè âúçìîæíîñòè ïî âðåìå íà êîìïèëàöèÿòà:\n\
   Debugging\t\t\t%s\n\
diff --git a/nls/blackbox-nls.hh b/nls/blackbox-nls.hh
index e90c8e6..1e1c34e 100644
--- a/nls/blackbox-nls.hh
+++ b/nls/blackbox-nls.hh
@@ -86,6 +86,7 @@ enum {
         ScreenPositionLength = 0x16,
         ScreenPositionFormat = 0x17,
         ScreenGeometryFormat = 0x18,
+        ScreenGeometryLength = 0x19,
 
         SlitSet = 0x7,
         SlitSlitTitle = 0x1,
diff --git a/nls/de_DE/Translation.m b/nls/de_DE/Translation.m
index 5a3fb8c..540dc85 100644
--- a/nls/de_DE/Translation.m
+++ b/nls/de_DE/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=ISO-8859-1
 $set 1 #BaseDisplay
 
 1 %s:  X Fehler ! : %s(%d) opcodes %d/%d\n  resource 0x%lx\n
@@ -186,10 +187,12 @@ $set 15 #main
 1 error: '-rc' requires an argument\n
 2 error: '-display' requires an argument\n
 3 warning: could not set environment variable 'DISPLAY'\n
-4 Fluxbox %s: (c) 2001-2002 Henrik Kinnunen\n\n\
+4 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
 5 Compile time options:\n\
   Debugging\t\t\t%s\n\
diff --git a/nls/ja_JP/Screen.m b/nls/ja_JP/Screen.m
index ee4cbd1..762ee9a 100644
--- a/nls/ja_JP/Screen.m
+++ b/nls/ja_JP/Screen.m
@@ -49,4 +49,6 @@ $ #PositionFormat
 # X: %4d x Y: %4d
 $ #GeometryFormat
 # Éý: %4d x ¹â: %4d
+$ #GeometryLength
+# Éý: 0000 x ¹â: 0000
 
diff --git a/nls/ja_JP/Translation.m b/nls/ja_JP/Translation.m
index b7a6a65..bb40b2d 100644
--- a/nls/ja_JP/Translation.m
+++ b/nls/ja_JP/Translation.m
@@ -1,3 +1,4 @@
+$ codeset=eucJP
 $set 1 #BaseDisplay
 
 1 %s:  X ¥¨¥é¡¼: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
@@ -41,6 +42,7 @@ $set 3 #Configmenu
 25 WindowÆâ¤Ë¥¿¥Ö¥É¥í¥Ã¥×¤Ç¤â¥¿¥Ö¥°¥ë¡¼¥×¤Ë
 26 ¥¦¥£¥ó¥É¥¦¥É¥é¥Ã¥°¤Ç¥ï¡¼¥¯¥¹¥Ú¡¼¥¹¤ò°ÜÆ°
 27 ¥Þ¥¦¥¹¥Û¥¤¡¼¥ë¤Ç¥ï¡¼¥¯¥¹¥Ú¡¼¥¹Àڤ괹¤¨
+28 ¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹
 
 $set 4 #Icon
 
@@ -185,10 +187,12 @@ $set 15 #main
 1 error: '-rc' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹\n
 2 error: '-display' ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹\n
 3 warning: ´Ä¶­ÊÑ¿ô 'DISPLAY' ¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n
-4 Fluxbox %s: (c) 2001 Henrik Kinnunen\n\n\
+4 Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
   -display <string>\t\t »ØÄê¥Ç¥£¥¹¥×¥ì¥¤¤ËÀܳ.\n\
   -rc <string>\t\t\t Âå¤ï¤ê¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò»ÈÍÑ.\n\
   -version\t\t\t ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ».\n\
+  -info\t\t\t\tdisplay some useful information.\n\
+  -log <filename>\t\t\tlog output to file.\n\
   -help\t\t\t\t ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ».\n\n
 5 ¥³¥ó¥Ñ¥¤¥ë»þ¤Î¥ª¥×¥·¥ç¥ó:\n\
   Debugging\t\t\t%s\n\