nls from bb-cvs

added yself to the usage string
added the slit option back in
added the event clobber option back in

16 files changed, 141 insertions, 121 deletions

diff --git a/nls/C/BaseDisplay.m b/nls/C/BaseDisplay.m
index dcdd194b..f7f3d9b4 100644
--- a/nls/C/BaseDisplay.m
+++ b/nls/C/BaseDisplay.m
@@ -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
diff --git a/nls/C/Basemenu.m b/nls/C/Basemenu.m
index 64d71572..6c4da308 100644
--- a/nls/C/Basemenu.m
+++ b/nls/C/Basemenu.m
@@ -1,4 +1,4 @@
 $set 2 #Basemenu
 
 $ #BlackboxMenu
-# Blackbox 菜单
+# Blackbox Menu
diff --git a/nls/C/Configmenu.m b/nls/C/Configmenu.m
index a296eced..7fef82da 100644
--- a/nls/C/Configmenu.m
+++ b/nls/C/Configmenu.m
@@ -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
diff --git a/nls/C/Icon.m b/nls/C/Icon.m
index 06ebc54e..54b96a63 100644
--- a/nls/C/Icon.m
+++ b/nls/C/Icon.m
@@ -1,4 +1,4 @@
 $set 4 #Icon
 
 $ #Icons
-# 图标
+# Icons
diff --git a/nls/C/Image.m b/nls/C/Image.m
index fcb973ed..5dd251a6 100644
--- a/nls/C/Image.m
+++ b/nls/C/Image.m
@@ -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
diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index d29cd987..6674611b 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -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 \
diff --git a/nls/C/Screen.m b/nls/C/Screen.m
index 3baba996..128c06e7 100644
--- a/nls/C/Screen.m
+++ b/nls/C/Screen.m
@@ -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
 
diff --git a/nls/C/Slit.m b/nls/C/Slit.m
index 5bc50ff8..0e5e3a4f 100644
--- a/nls/C/Slit.m
+++ b/nls/C/Slit.m
@@ -3,6 +3,6 @@ $set 7 #Slit
 $ #SlitTitle
 # Slit
 $ #SlitDirection
-# Slit 方向
+# Slit Direction
 $ #SlitPlacement
-# Slit 放置
+# Slit Placement
diff --git a/nls/C/Toolbar.m b/nls/C/Toolbar.m
index 4115eeee..93e26453 100644
--- a/nls/C/Toolbar.m
+++ b/nls/C/Toolbar.m
@@ -15,8 +15,8 @@ $ #NoStrftimeTimeFormatP
 $ #NoStrftimeTimeFormatA
 # a
 $ #ToolbarTitle
-# 工具条
+# Toolbar
 $ #EditWkspcName
-# 编辑桌面名
+# Edit current workspace name
 $ #ToolbarPlacement
-# 工具条放置
+# Toolbar Placement
diff --git a/nls/C/Window.m b/nls/C/Window.m
index d548395e..9987b47c 100644
--- a/nls/C/Window.m
+++ b/nls/C/Window.m
@@ -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
diff --git a/nls/C/Windowmenu.m b/nls/C/Windowmenu.m
index a98d39d9..4bf90cf4 100644
--- a/nls/C/Windowmenu.m
+++ b/nls/C/Windowmenu.m
@@ -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
diff --git a/nls/C/Workspace.m b/nls/C/Workspace.m
index b04efed7..315460a0 100644
--- a/nls/C/Workspace.m
+++ b/nls/C/Workspace.m
@@ -1,4 +1,4 @@
 $set 11 #Workspace
 
 $ #DefaultNameFormat
-# 桌面 %d
+# Workspace %d
diff --git a/nls/C/Workspacemenu.m b/nls/C/Workspacemenu.m
index 0c41e6d2..5423a191 100644
--- a/nls/C/Workspacemenu.m
+++ b/nls/C/Workspacemenu.m
@@ -1,8 +1,8 @@
 $set 12 #Workspacemenu
 
 $ #WorkspacesTitle
-# 桌面
+# Workspaces
 $ #NewWorkspace
-# 新建桌面
+# New Workspace
 $ #RemoveLast
-# 删除桌面
+# Remove Last
diff --git a/nls/C/bsetroot.m b/nls/C/bsetroot.m
index 8d313863..ddd7be6a 100644
--- a/nls/C/bsetroot.m
+++ b/nls/C/bsetroot.m
@@ -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
 
diff --git a/nls/C/common.m b/nls/C/common.m
index 5eca4c99..53217029 100644
--- a/nls/C/common.m
+++ b/nls/C/common.m
@@ -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
diff --git a/nls/C/main.m b/nls/C/main.m
index 23faee28..32e68eb5 100644
--- a/nls/C/main.m
+++ b/nls/C/main.m
@@ -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