1 files changed, 127 insertions, 120 deletions

diff --git a/nls/zh_CN/generated-GB2312.m b/nls/zh_CN/generated-GB2312.m
index f9fdf36..c7eb6b2 100644
--- a/nls/zh_CN/generated-GB2312.m
+++ b/nls/zh_CN/generated-GB2312.m
@@ -1,4 +1,4 @@
-$ codeset=ISO-8859-1
+$ codeset=GB2312
 
 $set 1 #Align
 
@@ -10,8 +10,8 @@ $set 1 #Align
 6 ×óÏ·½
 7 ×ó²à¾ÓÖÐ
 8 ×óÉÏ·½
-9 ¸½×Å
-10 ÓÒ
+9 À©Õ¹
+10 ¿¿ÓÒ
 11 ÓÒÏ·½
 12 ÓÒ²à¾ÓÖÐ
 13 ÓÒÉÏ·½
@@ -28,86 +28,92 @@ $set 2 #BaseDisplay
 
 $set 3 #Common
 
-1 Alpha
+1 AlphaÖµ
 2 ×Ô¶¯Òþ²Ø
-3 ±àÒë
+3 ±àÒëʱ¼ä
 4 ±àÒëÑ¡Ïî
 5 ±àÒëÆ÷
 6 ±àÒëÆ÷°æ±¾
-7 ³õʼ»¯
-8 ¼ü°ó¶©
-9 ¹ú¼Ê»¯×ÖÌå
-10 ²Ëµ¥
-11 Ñùʽ
-12 ĬÈÏ
+7       ³õʼ»¯
+8       ¼ü°ó¶©
+9       ±¾µØÓïÑÔÖ§³Ö
+10      ²Ëµ¥
+11      Ñùʽ
+12 ĬÈÏÅäÖÃ
 13 ½ûÓÃ
 14 ´íÎó
 15 Fluxbox°æ±¾
-16 Maximize Over
-17 SVN·¢ÐкÅ
+16 ×î´ó»¯Ê±¸Ç¹ý
+17 SVNÐÞ¶©°æ±¾ºÅ
 18 ¿É¼û
+19 ¸ÃÖ÷Ìâ䶨ÒåÈκα³¾°¡£\nÇë²Î¿¼ÊÖ²á»òÔĶÁFAQ¡£
 
 $set 4 #Configmenu
 
 1 ·´¾â³Ý
-2 ×Ô¶¯Ëõ·Å
-3 Click Raises
-4 Click to Focus
-5 Decorate Transient Windows
-6 Êó±ê»¬ÂÖ¸ü»»×ÀÃæ
+2 ×Ô¶¯ÌáÉý
+3 µã»÷ÌáÉý
+4 µã»÷¾Û½¹
+5 ×°ÊÎÁÙʱ´°¿Ú
+6 Êó±ê¹öÂÖÇл»¹¤×÷Çø
 7 Focus Window on Workspace Change
-8 Focus Model
-9 Focus New Windows
-10 Full Maximization
-11 Image Dithering
-12 Opaque Window Moving
-14 Mouse Focus
-15 Workspace Warping
-16 Force Pseudo-Transparency
-17 Menu Alpha
+8 ¾Û½¹Ä£Ê½
+9 ¾Û½¹Ð´°¿Ú
+10 ÍêÈ«×î´ó»¯
+11 ͼÏñ·ÂÉ«
+12 Òƶ¯Ê±ÏÔʾ´°¿ÚÄÚÈÝ
+14 Êó±ê¾Û½¹
+15 ¹¤×÷Çø»ØÐý
+16 Ç¿ÖÆα͸Ã÷
+17 ²Ëµ¥AlphaÖµ
 18 ͸Ã÷
-19 Focused Window Alpha
-20 Unfocused Window Alpha
+19 ¾Û½¹´°¿ÚAlphaÖµ
+20 ·Ç¾Û½¹´°¿ÚAlphaÖµ
+21 ±êÇ©Ñ¡Ïî
+22 ±êÇ©ÖÃÓÚ±êÌâÀ¸ÄÚ
+23 ÍâÖñêÇ©¿í¶È
+24 µã»÷¾Û½¹±êÇ©
+25 Êó±ê¾Û½¹±êÇ©
 
 $set 5 #Ewmh
 
-1 ´íÎó: ÄÚ´æ²»×ã,²»ÄÜ·ÖÅäÄÚ´æ¸øEWMH client list
+1 ÖÂÃü´íÎó: ÄÚ´æ²»×ã,ÎÞ·¨ÎªEWMH client list·ÖÅäÄÚ´æ
 
 $set 6 #FbTkError
 
-1 ¾¯¸æWarning! Height > 3200 setting Height = 3200
-2 ¾¯¸æWarning! Width > 3200 setting Width = 3200
+1 ¾¯¸æ£¡ Height > 3200 £¬ÉèÖà Height = 3200
+2 ¾¯¸æ£¡ Width > 3200 £¬ÉèÖà Width = 3200
 3 ¾¯¸æ: ²»ÄܼÓÔر¸ÓÃ×ÖÌå
-4 ·ÖÅä³ö´í
-5 Error creating pixmap
-6 Cant create XImage
-7 Failed to read
-8 Warning: Failed to find valid format for alpha.
-9 Warning: Failed to create alpha picture.
-10 Warning: Failed to create alpha pixmap.
-11 Failed to find format for screen(%d)
-12 Out of memory
-13 Out of memory while allocating blue buffer.
-14 Out of memory while allocating green buffer.
-15 Out of memory while allocating red buffer.
-16 Failed to read theme item
-17 unsupported visual
-18 Setting default value
+4 ·ÖÅä´íÎó¡£
+5 ´´½¨ÏñËØÓ³Éä³ö´í
+6 ÎÞ·¨´´½¨XImage
+7 ¶Áȡʧ°Ü
+8 ¾¯¸æ£ºÎÞ·¨ÎªalphaÕÒµ½ÓÐЧ¸ñʽ¡£
+9 ¾¯¸æ£º´´½¨alphaͼƬʧ°Ü¡£
+10 ¾¯¸æ£º´´½¨alphaÏñËØÓ³Éäʧ°Ü¡£
+11 ²éÕÒÆÁÄ»¸ñʽʧ°Ü(%d)
+12 ÄÚ´æ²»×ã
+13 ÄÚ´æ²»×㣬ÎÞ·¨·ÖÅä¸øblue buffer¡£
+14 ÄÚ´æ²»×㣬ÎÞ·¨·ÖÅä¸øgreen buffer¡£
+15 ÄÚ´æ²»×㣬ÎÞ·¨·ÖÅä¸øred buffer¡£
+16 ¶ÁÈ¡Ö÷ÌâÏîĿʧ°Ü
+17 ²»Ö§³ÖͼÏñģʽ
+18 ÉèÖÃĬÈÏÖµ
 
 $set 7 #Fluxbox
 
-1 rcÎļþÎÞЧ!
-2 Failed to load groupfile
-3 Failed to load database
+1 ÎÞЧµÄrcÎļþÃû!
+2 ¼ÓÔØ×éÎļþʧ°Ü
+3 ¼ÓÔØÊý¾Ý¿âʧ°Ü
 4 Retrying with
-5 Warning! Could not find screen to map window on!
-6 Can't create %s directory
-7 Couldn't find screens to manage.\nMake sure you don't have another window manager running.
-8 Error parsing regular expression
-9 Fatal! There can only one instance of fluxbox class.
-10 Can not connect to X server.\nMake sure you started X before you start Fluxbox.
-11 Warning: X server does not support locale
-12 Warning: cannot set locale modifiers
+5 ¾¯¸æ£¡ÎÞ·¨ÕÒµ½ÆÁÄ»À´»æÖÆ´°¿Ú£¡
+6 ÎÞ·¨´´½¨ %s Ŀ¼
+7 ÎÞ·¨ÕÒµ½ÐèÒª¿ØÖƵÄÆÁÄ»¡£\nÇëÈ·±£Ã»ÓÐÆäËû´°¿Ú¹ÜÀíÆ÷ÕýÔÚÔËÐС£
+8 Óï·¨¹æÔò½âÎö´íÎó
+9 ÖÂÃü´íÎó£¡fluxboxÀàÖ»ÄÜÓÐÒ»¸öʵÀý¡£
+10 ÎÞ·¨Á¬½ÓX server¡£\nÇëÈ·±£Ä㿪ÆôFluxbox֮ǰ¿ªÆôÁËX¡£
+11 ¾¯¸æ£ºX server²»Ö§³Ölocale
+12 ¾¯¸æ£ºÎÞ·¨ÉèÖÃlocale modifiers
 
 $set 8 #Gnome
 
@@ -126,94 +132,95 @@ $set 10 #Menu
 3 Í˳ö
 4 ͼ±ê
 5 ²ã´Î...
-6 On Head...
-7 Ìæ»»
+6 λÓÚ¼àÊÓÆ÷...
+7 λÖÃ
 8 ÖØмÓÔØÅäÖÃÎļþ
-9 ÖØÆô¶¯
+9 ÖØÆôFluxbox
+10 ¾¯¸æ£º[encoding]±êÇ©²»¶Ô³Æ
 
 $set 11 #Remember
 
-1 Decorations
-2 Dimensions
-3 Jump to workspace
+1 ×°ÊÎ
+2 ³ß´ç
+3 ÌøÖÁ¹¤×÷Çø
 4 ²ã
-5 Remember...
-6 Position
-7 Save on close
-8 Shaded
-9 Sticky
+5 ¼Çס...
+6 λÖÃ
+7 ¹Ø±Õʱ±£´æ
+8 ¾íÆð
+9 ճס
 10 δ֪°´¼ü
-11 Workspace
-12 Head
+11 ¹¤×÷Çø
+12 ¼àÊÓÆ÷
 
 $set 12 #Screen
 
-1 BScreen::BScreen: querying the X serverʱ·¢Éú´íÎó.\n ÁíÍâÒ»¸ö´°¿Ú¹ÜÀíÆ÷ÕýÔËÐÐ,displayΪ
+1 BScreen::BScreen: ѯÎÊX serverʱ·¢Éú´íÎó.\n ÁíÍâÒ»¸ö´°¿Ú¹ÜÀíÆ÷ÕýÔËÐÐ,displayΪ
 2 W: %4d x H: %4d
-3 BScreen::BScreen: managing screen %d using visual 0x%lx, depth %d\n
+3 BScreen::BScreen: ¿ØÖÆÆÁÄ» %d ʹÓÃͼÏñģʽ 0x%lx, É«²ÊÉî¶È %d\n
 4 W: %04d x H: %04d
 
 $set 13 #Slit
 
 1 Clients
-2 Cycle Down
-3 Cycle Up
-4 Slit Direction
-5 Slit Layer
-6 Slit on Head
-7 Slit Placement
+2 Ͼí
+3 ÉϾí
+4 Slit·½Ïò
+5 Slit²ã´Î
+6 SlitλÓÚ¼àÊÓÆ÷
+7 SlitλÖÃ
 8 Slit
-9 Save SlitList
+9 ±£´æSlitÁбí
 
 $set 14 #Toolbar
 
-1 Edit current workspace name
-2 Iconbar Mode
-3 All Windows
-4 Icons
-5 None
-6 ¹¤×÷ÇøWorkspace
-7 ¹¤×÷ÇøËùÓÐÈÎÎñ²¢ÏÔʾͼ±ê
-8 Toolbar Layer
-9 Toolbar on Head
-10 Toolbar Placement
+1 ÖØÃüÃûµ±Ç°¹¤×÷Çø
+2 ͼ±êÀ¸Ä£Ê½
+3 ËùÓд°¿Ú
+4 ËùÓÐ×îС»¯µÄ´°¿Ú
+5 ÎÞ
+6 µ±Ç°¹¤×÷ÇøËùÓд°¿Ú
+7 µ±Ç°¹¤×÷ÇøËùÓÐ×îС»¯µÄ´°¿Ú
+8 ¹¤¾ßÀ¸²ã´Î
+9 ¹¤¾ßÀ¸Î»ÓÚ¼àÊÓÆ÷
+10 ¹¤¾ßÀ¸Î»ÖÃ
 11 ¹¤¾ßÀ¸
-12 ¹¤¾ßÀ¸¿í¶È
-13 ʱÖÓ²ÉÓÃ24Сʱ¸ñʽ
-14 ʱÖÓ²ÉÓÃ12Сʱ¸ñʽ
-15 ÐÞ¸Äʱ¼äÏÔʾ¸ñʽ
-16 ÏÔʾͼƬ
-17 ²»ÏÔʾͼ±ê
-18 ¹¤×÷ÇøËùÓÐÈÎÎñÎÞͼ±ê
+12 ¹¤¾ßÀ¸¿í¶È°Ù·Ö±È
+13 ʱÖÓ£º24Сʱ¸ñʽ
+14 ʱÖÓ£º12Сʱ¸ñʽ
+15 ±à¼­Ê±¼äÏÔʾ¸ñʽ
+16 ÏÔʾͼ±ê
+17 ËùÓÐδ×îС»¯µÄ´°¿Ú
+18 µ±Ç°¹¤×÷ÇøËùÓÐδ×îС»¯µÄ´°¿Ú
 
 $set 15 #Window
 
-1 Unnamed
+1 δÃüÃû
 
 $set 16 #Windowmenu
 
 1 ¹Ø±Õ
 2 ×îС»¯
-3 Layer
-4 Lower
+3 ²ã´Î
+4 ½µµÍ
 5 ×î´ó»¯
-6 Raise
+6 ÌáÉý
 7 ·¢Ë͵½...
-8 Shade
-9 ¾íÆð
-10 ɱµô
+8 ¾íÆð
+9 ճס
+10 ɱËÀ
 
 $set 17 #Workspace
 
 1 ¹¤×÷Çø %d
 2 ¹¤×÷Çø
 3 н¨¹¤×÷Çø
-4 ÒƳö×îºó¹¤×÷Çø
+4 ÒƳý×îºóÒ»¸ö¹¤×÷Çø
 
 $set 18 #fbsetroot
 
-1 ´íÎó: ±ØÐëÖ¸¶¨:: -solid, -mod, -gradientÆäÖеÄÒ»¸ö.\n
-2 Couldn't create pixmap atoms, giving up!
+1 ´íÎó: ±ØÐëÖ¸¶¨: -solid, -mod, -gradient Èý¸ö²ÎÊýÖеÄÒ»¸ö.\n
+2 ÎÞ·¨´´½¨pixmap atoms£¬·ÅÆú£¡
 3 -display <string>        display connection\n\
 -mod <x> <y>             modula pattern\n\
 -foreground, -fg <color> modula foreground color\n\
@@ -231,7 +238,7 @@ $set 19 #main
 3 Bad cast
 4 ³¬³öÏÔʾ·¶Î§
 5 ÔËÐÐʱ´íÎó
-6 Standard Exception
+6 ±ê×¼ÀýÍâ
 7 δ֪´íÎó
 8 ´íÎó: '-log'ÐèÒªÒ»¸ö²ÎÊý
 9 ÈÕÖ¾Îļþ
@@ -240,22 +247,22 @@ $set 19 #main
 12 ´íÎó: '-screen'ÐèÒªÒ»¸ö²ÎÊý
 13 Fluxbox %s: (c) %s Henrik Kinnunen\n\
 Ö÷Ò³: http://www.fluxbox.org/\n\n\
--display <string>\t\tÖ¸¶¨displayÁ¬½Ó.\n\
--screen <all|int,int,int>\tÔÚÌض¨µÄscreensÉÏÏÔʾ.\n\
--rc <string>\t\t\tʹÓÃÖ¸¶¨µÄ×ÊÔ´Îļþ.\n\
--version\t\t\tÏÔʾ°æ±¾ºÅ.\n\
--info\t\t\t\tÏÔʾfluxboxÏà¹ØÐÅÏ¢.\n\
--log <filename>\t\t\t½«Êä³ö¼Ç¼µ½ÎļþÖÐ.\n\
--help\t\t\t\tÏÔʾ°ïÖúÐÅÏ¢.\n\n
-14 ¾¯¸æ: ²»ÄܶÁÈ¡»·¾³±äÁ¿'DISPLAY'
+-display <string>\t\tÖ¸¶¨displayÁ¬½Ó¡£\n\
+-screen <all|int,int,int>\tÔÚÌض¨µÄÆÁÄ»ÉÏÏÔʾ¡£\n\
+-rc <string>\t\t\tʹÓÃÖ¸¶¨µÄ×ÊÔ´Îļþ¡£\n\
+-version\t\t\tÏÔʾ°æ±¾ºÅÈ»ºóÍ˳ö¡£\n\
+-info\t\t\t\tÏÔʾһЩÓÐÓõÄÐÅÏ¢¡£\n\
+-log <filename>\t\t\t½«Êä³ö¼Ç¼µ½ÎļþÖС£\n\
+-help\t\t\t\tÏÔʾÕâÔò°ïÖúÐÅϢȻºóÍ˳ö¡£\n\n
+14 ¾¯¸æ: ÎÞ·¨ÉèÖû·¾³±äÁ¿'DISPLAY'
 
 $set 20
 
-1 Above Dock
-2 Ï·½
+1 ÔÚDockÖ®ÉÏ
+2 µ×²¿
 3 ×ÀÃæ
 4 Dock
-5 ÆÕͨģʽ
-6 ÉÏ·½
+5 ÆÕͨ
+6 ¶¥²¿