@@ -1,16 +1,16 @@ 
 $set 1 #BaseDisplay
 
 $ #XError
-# %s:  X ´íÎó: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
+# %s:  X error: %s(%d) opcodes %d/%d\n  resource 0x%lx\n
 $ #SignalCaught
-# %s: ²¶»ñÐźŠ%d \n
+# %s: signal %d caught\n
 $ #ShuttingDown
-# ¹Ø±Õ\n
+# shutting down\n
 $ #Aborting
-# ÕýÔÚÍ˳ö... ´æ´¢ºËÐÄÊý¾Ý\n
+# aborting... dumping core\n
 $ #XConnectFail
-# BaseDisplay::BaseDisplay: Á¬½Ó X ·þÎñÆ÷ʧ°Ü.\n
+# BaseDisplay::BaseDisplay: connection to X server failed.\n
 $ #CloseOnExecFail
 # BaseDisplay::BaseDisplay: couldn't mark display connection as close-on-exec\n
 $ #BadWindowRemove
-# BaseDisplay::eventLoop(): ÕýÔÚ´Óʼþ¶ÓÁÐÖÐɾ³ý»µ´°¿Ú\n
+# BaseDisplay::eventLoop(): removing bad window from event queue\n

@@ -1,4 +1,4 @@ 
 $set 2 #Basemenu
 
 $ #BlackboxMenu
-# Blackbox ²Ëµ¥
+# Blackbox Menu

@@ -1,38 +1,40 @@ 
 $set 3 #Configmenu
 
 $ #ConfigOptions
-# ÅäÖÃÑ¡Ïî
+# Config Options
 $ #FocusModel
-# ¾Û½¹Ä£Ê½
+# Focus Model
 $ #WindowPlacement
-# ´°¿Ú·ÅÖÃ
+# Window Placement
 $ #ImageDithering
-# ͼÏñµ÷г
+# Image Dithering
 $ #OpaqueMove
-# ÏÔʾÒƶ¯´°¿ÚÄÚÈÝ
+# Opaque Window Moving
 $ #FullMax
-# ÍêÈ«×î´ó»¯
+# Full Maximization
 $ #FocusNew
-# ¾Û½¹Ð´°¿Ú
+# Focus New Windows
 $ #FocusLast
-# ×ÀÃæ¸Ä±äʱ¾Û½¹´°¿Ú
+# Focus Window on Workspace Change
 $ #ClickToFocus
-# µã»÷¾Û½¹
+# Click to Focus
 $ #SloppyFocus
-# ×Ô¶¯¾Û½¹
+# Sloppy Focus
 $ #AutoRaise
-# ×Ô¶¯·ÅÇ°
+# Auto Raise
+$ #ClickRaise
+# Click Raise
 $ #SmartRows
-# ×Ô¶¯·ÅÖÃ(ÐÐ)
+# Smart Placement (Rows)
 $ #SmartCols
-# ×Ô¶¯·ÅÖÃ(ÁÐ)
+# Smart Placement (Columns)
 $ #Cascade
-# ²ãµþ·ÅÖÃ
+# Cascade Placement
 $ #LeftRight
-# ´Ó×óµ½ÓÒ
+# Left to Right
 $ #RightLeft
-# ´ÓÓÒµ½×ó
+# Right to Left
 $ #TopBottom
-# ´ÓÉϵ½ÏÂ
+# Top to Bottom
 $ #BottomTop
-# ´Óϵ½ÉÏ
+# Bottom to Top

@@ -1,4 +1,4 @@ 
 $set 4 #Icon
 
 $ #Icons
-# ͼ±ê
+# Icons

@@ -1,13 +1,13 @@ 
 $set 5 #Image
 
 $ #ErrorCreatingSolidPixmap
-# BImage::render_solid: ´´½¨pixmap³ö´í\n
+# BImage::render_solid: error creating pixmap\n
 $ #ErrorCreatingXImage
-# BImage::renderXImage: ´´½¨XImage³ö´í\n
+# BImage::renderXImage: error creating XImage\n
 $ #UnsupVisual
 # BImage::renderXImage: unsupported visual\n
 $ #ErrorCreatingPixmap
-# BImage::renderPixmap: ´´½¨pixmap³ö´í\n
+# BImage::renderPixmap: error creating pixmap\n
 $ #InvalidColormapSize
 # BImageControl::BImageControl: invalid colormap size %d (%d/%d/%d) - reducing\n
 $ #ErrorAllocatingColormap

@@ -1,30 +1,45 @@ 
-# Makefile.am for Blackbox - an X11 Window Manager
+# nls/C/Makefile.am for Blackbox - an X11 Window Manager
 
 NLSTEST = @NLS@
-THE_LANG = zh_CN
-THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)
 CLEANFILES = blackbox.cat
 MAINTAINERCLEANFILES = Makefile.in Translation.m
 DISTCLEANFILES = Translation.m
 MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
 
-all-local: blackbox.cat
+all-local: Translation.m blackbox.cat
 install-data-local: blackbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(THE_NLS_PATH)"; \
-		$(mkinstalldirs) $(THE_NLS_PATH); \
-		$(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \
+		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \
+		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
+		$(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
+		ln -f -ss C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
+		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
+		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
 	fi
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(THE_NLS_PATH)/blackbox.cat; \
-		rmdir $(THE_NLS_PATH); \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/blackbox.cat; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
+		rmdir $(DESTDIR)$(pkgdatadir)/nls/C; \
 	fi
 
+# note... when adding new catalogs... you do not need the
+# header=../blackbox-nls.hh which is passed to awk... we
+# only need to generate it once.
+
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
-	fi
+	awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \
+		output=Translation.m $(MFILES)
 
 blackbox.cat: Translation.m
 	@if test x$(NLSTEST) = "x-DNLS"; then \

@@ -1,52 +1,54 @@ 
 $set 6 #Screen
 
 $ #AnotherWMRunning
-# BScreen::BScreen: ²éѯX·þÎñÆ÷ʱ³ö´í.\n  \
-ÒѾ­ÓÐÁíÒ»¸ö´°¿Ú¹ÜÀíÆ÷ÔÚÔËÐÐ %s.\n
+# BScreen::BScreen: an error occured while querying the X server.\n  \
+another window manager is already running on display %s.\n
 $ #ManagingScreen
-# BScreen::BScreen: ¶ÔÆÁÄ» %d ʹÓÃÊÓ 0x%lx, Éî¶È %d\n
+# BScreen::BScreen: managing screen %d using visual 0x%lx, depth %d\n
 $ #FontLoadFail
-# BScreen::LoadStyle(): ÎÞ·¨ÔØÈë×ÖÌå '%s'\n
+# BScreen::LoadStyle(): couldn't load font '%s'\n
 $ #DefaultFontLoadFail
-# BScreen::LoadStyle(): ÎÞ·¨ÔØÈëĬÈÏ×ÖÌå.\n
+# BScreen::LoadStyle(): couldn't load default font.\n
 $ #EmptyMenuFile
-# %s: Çå¿Õ²Ëµ¥Îļþ\n
+# %s: empty menu file\n
 $ #xterm
 # xterm
 $ #Restart
-# ÖØпªÊ¼
+# Restart
 $ #Exit
-# Í˳ö
+# Exit
 $ #EXECError
-# BScreen::parseMenuFile: [exec] ´íÎó, ûÓв˵¥µÄ±êÌâ»òÃüÁî\n
+# BScreen::parseMenuFile: [exec] error, no menu label and/or command defined\n
 $ #EXITError
-# BScreen::parseMenuFile: [exit] ´íÎó, ûÓв˵¥µÄ±êÌâ\n
+# BScreen::parseMenuFile: [exit] error, no menu label defined\n
 $ #STYLEError
-# BScreen::parseMenuFile: [style] ´íÎó, ûÓв˵¥±êÌâ»òÎļþÃû\n
+# BScreen::parseMenuFile: [style] error, no menu label and/or filename \
+defined\n
 $ #CONFIGError
-# BScreen::parseMenuFile: [config] ´íÎó, ûÓв˵¥±êÌâ\n
+# BScreen::parseMenuFile: [config] error, no menu label defined\n
 $ #INCLUDEError
-# BScreen::parseMenuFile: [include] ´íÎó, ûÓÐÎļþÃû\n
+# BScreen::parseMenuFile: [include] error, no filename defined\n
 $ #INCLUDEErrorReg
-# BScreen::parseMenuFile: [include] ´íÎó, '%s' ²»ÊÇÒ»¸öÆÕͨÎļþ\n
+# BScreen::parseMenuFile: [include] error, '%s' is not a regular file\n
 $ #SUBMENUError
-# BScreen::parseMenuFile: [submenu] ´íÎó, ûÓв˵¥±êÌâ\n
+# BScreen::parseMenuFile: [submenu] error, no menu label defined\n
 $ #RESTARTError
-# BScreen::parseMenuFile: [restart] ´íÎó, ûÓв˵¥±êÌâ\n
+# BScreen::parseMenuFile: [restart] error, no menu label defined\n
 $ #RECONFIGError
-# BScreen::parseMenuFile: [reconfig] ´íÎó, ûÓв˵¥±êÌâ\n
+# BScreen::parseMenuFile: [reconfig] error, no menu label defined\n
 $ #STYLESDIRError
-# BScreen::parseMenuFile: [stylesdir/stylesmenu] ´íÎó, ûÓÐÖ¸ÃûĿ¼\n
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] error, no directory defined\n
 $ #STYLESDIRErrorNotDir
-# BScreen::parseMenuFile: [stylesdir/stylesmenu] ´íÎó, '%s' ²»ÊÇĿ¼\n
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] error, '%s' is not a \
+directory\n
 $ #STYLESDIRErrorNoExist
-# BScreen::parseMenuFile: [stylesdir/stylesmenu] ´íÎó, '%s' ²»´æÔÚ\n
+# BScreen::parseMenuFile: [stylesdir/stylesmenu] error, '%s' does not exist\n
 $ #WORKSPACESError
-# BScreen::parseMenuFile: [workspaces] ´íÎó, ûÓв˵¥±êÌâ\n
+# BScreen::parseMenuFile: [workspaces] error, no menu label defined\n
 $ #PositionLength
 # 0: 0000 x 0: 0000
 $ #PositionFormat
-# ×ó: %4d x ÉÏ: %4d
+# X: %4d x Y: %4d
 $ #GeometryFormat
-# ¿í: %4d x ¸ß: %4d
+# W: %4d x H: %4d
 

@@ -3,6 +3,6 @@ 
 $ #SlitTitle
 # Slit
 $ #SlitDirection
-# Slit ·½Ïò
+# Slit Direction
 $ #SlitPlacement
-# Slit ·ÅÖÃ
+# Slit Placement

@@ -15,8 +15,8 @@ # p
 $ #NoStrftimeTimeFormatA
 # a
 $ #ToolbarTitle
-# ¹¤¾ßÌõ
+# Toolbar
 $ #EditWkspcName
-# ±à¼­×ÀÃæÃû
+# Edit current workspace name
 $ #ToolbarPlacement
-# ¹¤¾ßÌõ·ÅÖÃ
+# Toolbar Placement

@@ -2,13 +2,13 @@ $set 9 #Window
 
 
 $ #Creating
-# BlackboxWindow::BlackboxWindow: ÕýÔÚ´´½¨ 0x%lx\n
+# BlackboxWindow::BlackboxWindow: creating 0x%lx\n
 $ #XGetWindowAttributesFail
-# BlackboxWindow::BlackboxWindow: XGetWindowAttributres ʧ°Ü\n
+# BlackboxWindow::BlackboxWindow: XGetWindowAttributres failed\n
 $ #CannotFindScreen
 # BlackboxWindow::BlackboxWindow: cannot find screen for root window 0x%lx\n
 $ #Unnamed
-# ÎÞÃüÃû
+# Unnamed
 $ #MapRequest
 # BlackboxWindow::mapRequestEvent() for 0x%lx\n
 $ #UnmapNotify

@@ -1,20 +1,20 @@ 
 $set 10 #Windowmenu
 
 $ #SendTo
-# ·¢Ë͵½...
+# Send To ...
 $ #Shade
-# ¾íÁ±
+# Shade
 $ #Iconify
-# ͼ±ê»¯
+# Iconify
 $ #Maximize
-# ×î´ó»¯
+# Maximize
 $ #Raise
-# ·ÅÇ°
+# Raise
 $ #Lower
-# ·Åºó
+# Lower
 $ #Stick
-# ¶¤×¡
+# Stick
 $ #KillClient
-# ɱËÀ
+# Kill Client
 $ #Close
-# ¹Ø±Õ
+# Close

@@ -1,4 +1,4 @@ 
 $set 11 #Workspace
 
 $ #DefaultNameFormat
-# ×ÀÃæ %d
+# Workspace %d

@@ -1,8 +1,8 @@ 
 $set 12 #Workspacemenu
 
 $ #WorkspacesTitle
-# ×ÀÃæ
+# Workspaces
 $ #NewWorkspace
-# н¨×ÀÃæ
+# New Workspace
 $ #RemoveLast
-# ɾ³ý×ÀÃæ
+# Remove Last

@@ -1,16 +1,16 @@ 
 $set 16 #bsetroot
 
 $ #MustSpecify
-# %s: ´íÎó: ±ØÐë´ÓÖÐÖ¸¶¨Ò»¸ö: -solid, -mod, -gradient\n
+# %s: error: must specify one of: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
-  -display <string>        ÏÔʾÁ¬½Ó\n\
-  -mod <x> <y>             ģʽ\n\
-  -foreground, -fg <color> Ç°¾°É«\n\
-  -background, -bg <color> ±³¾°É«\n\n\
-  -gradient <texture>      ½¥½øÎÆÀí\n\
-  -from <color>            ½¥½ø¿ªÊ¼É«\n\
-  -to <color>              ½¥½ø½áÊøÉ«\n\n\
-  -solid <color>           µ¥Ò»É«\n\n\
-  -help                    ÏÔʾÕâ¸ö°ïÖú\n
+  -display <string>        display connection\n\
+  -mod <x> <y>             modula pattern\n\
+  -foreground, -fg <color> modula foreground color\n\
+  -background, -bg <color> modula background color\n\n\
+  -gradient <texture>      gradient texture\n\
+  -from <color>            gradient start color\n\
+  -to <color>              gradient end color\n\n\
+  -solid <color>           solid color\n\n\
+  -help                    print this help text and exit\n
 

@@ -1,38 +1,38 @@ 
 $set 15 #Common
 
 $ #Yes
-# ÊÇ
+# Yes
 $ #No
-# ·ñ
+# No
 
 $ #DirectionTitle
-# ·½Ïò
+# Direction
 $ #DirectionHoriz
-# ˮƽ
+# Horizontal
 $ #DirectionVert
-# ´¹Ö±
+# Vertical
 
 $ #AlwaysOnTop
-# ×ÜÔÚ×îÉÏÃæ
+# Always on top
 
 $ #PlacementTitle
-# ·ÅÖÃ
+# Placement
 $ #PlacementTopLeft
-# ÉÏ×ó
+# Top Left
 $ #PlacementCenterLeft
-# ÖÐ×ó
+# Center Left
 $ #PlacementBottomLeft
-# ÏÂ×ó
+# Bottom Left
 $ #PlacementTopCenter
-# ÉÏÖÐ
+# Top Center
 $ #PlacementBottomCenter
-# ÏÂÖÐ
+# BottomCenter
 $ #PlacementTopRight
-# ÉÏÓÒ
+# Top Right
 $ #PlacementCenterRight
-# ÖÐÓÒ
+# Center Right
 $ #PlacementBottomRight
-# ÏÂÓÒ
+# Bottom Right
 
 $ #AutoHide
-# ×Ô¶¯Òþ²Ø
+# Auto hide

@@ -1,22 +1,23 @@ 
 $set 14 #main
 
 $ #RCRequiresArg
-# ´íÎó: '-rc' ÐèÒª²ÎÊý\n
+# error: '-rc' requires an argument\n
 $ #DISPLAYRequiresArg
-# ´íÎó: '-display' ÐèÒª²ÎÊý\n
+# error: '-display' requires an argument\n
 $ #WarnDisplaySet
-# ¾¯¸æ: ²»ÄÜÉèÖû·¾³±äÁ¿ 'DISPLAY'\n
+# warning: could not set environment variable 'DISPLAY'\n
 $ #Usage
 # Openbox %s : (c) 2002 - 2002 Ben Jansens\n\
-  \t\t\t 2001 - 2002, Sean 'Shaleh' Perry\n\n\
-  \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
-  -display <string>\t\tʹÓÃÏÔʾÁ¬½Ó.\n\
-  -rc <string>\t\t\tʹÓÃÆäËûµÄ×ÊÔ´Îļþ.\n\
-  -version\t\t\tÏÔʾ°æ±¾.\n\
-  -help\t\t\t\tÏÔʾÕâ¸ö°ïÖú.\n\n
+                 2001 - 2002 Sean 'Shaleh' Perry\n\
+                 1997 - 2000, 2002 Brad Hughes\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\
+  -help\t\t\t\tdisplay this help text and exit.\n\n
 $ #CompileOptions
-# ±àÒëÑ¡Ïî:\n\
+# Compile time options:\n\
   Debugging\t\t\t%s\n\
   Shape:\t\t\t%s\n\
   Slit:\t\t\t\t%s\n\
+  Event Clobbering:\t\t%s\n\
   8bpp Ordered Dithering:\t%s\n\n

@@ -8,8 +8,8 @@ $ #WarnDisplaySet
 # Figyelem: nem lehet a 'DISPLAY' környezeti változót beállítani\n
 $ #Usage
 # Openbox %s : (c) 2002 - 2002 Ben Jansens\n\
-  \t\t\t 2001 - 2002, Sean 'Shaleh' Perry\n\n\
-  \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
+                 2001 - 2002 Sean 'Shaleh' Perry\n\
+                 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\thasználandó kijelzõ\n\
   -rc <string>\t\t\tválasztható konfigurációs file.\n\
   -version\t\t\tverziószám kijelzése és kilépés.\n\

@@ -8,8 +8,8 @@ $ #WarnDisplaySet
 # ÐÏÐÅÒÅÄÖÅÎÎÑ: ÎÅ ×ÄÁÌÏÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÚͦÎÎÕ ÓÅÒÅÄÏ×ÉÝÁ "DISPLAY"\n
 $ #Usage
 # Openbox %s : (c) 2002 - 2002 Ben Jansens\n\
-  \t\t\t 2001 - 2002, Sean 'Shaleh' Perry\n\n\
-  \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
+                 2001 - 2002 Sean 'Shaleh' Perry\n\
+                 1997 - 2000, 2002 Brad Hughes\n\n\
   -display <string>\t\tÏÂÓÌÕÇÏ×Õ×ÁÔÉ ×ËÁÚÁÎÉÊ ÄÉÓÐÌÅÊ.\n\
   -rc <string>\t\t\t×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÁÌØÔÅÒÎÁÔÉ×ÎÉÊ ÆÁÊÌ ÒÅÓÕÒÓ¦×.\n\
   -version\t\t\t×É×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓ¦§ ¦ ×ÉÊÔÉ.\n\

@@ -8,8 +8,8 @@ $ #WarnDisplaySet
 # warning: could not set environment variable 'DISPLAY'\n
 $ #Usage
 # Openbox %s : (c) 2002 - 2002 Ben Jansens\n\
-  \t\t\t 2001 - 2002, Sean 'Shaleh' Perry\n\n\
-  \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\
+                 2001 - 2002 Sean 'Shaleh' Perry\n\
+                 1997 - 2000, 2002 Brad Hughes\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\