improve native language handling, move messages and menu labels to

FbTk::FbString

3 files changed, 549 insertions, 13 deletions

diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am
index 8e95858..510be09 100644
--- a/nls/zh_CN/Makefile.am
+++ b/nls/zh_CN/Makefile.am
@@ -1,30 +1,46 @@
 # nls/zh_CN/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = zh_CN
+SRC_CODESET = ISO-8859-1
+DEST_CODESETS = ISO-8859-1 UTF-8
 
 LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
-CLEANFILES = fluxbox.cat
-MAINTAINERCLEANFILES = Makefile.in 
 MFILES = Translation.m
-EXTRA_DIST= $(MFILES)
+GENERATED_MFILES = $(patsubst %,generated-%.m,$(DEST_CODESETS))
+MAINTAINERCLEANFILES = Makefile.in $(GENERATED_MFILES)
+CATFILES = $(patsubst %,fluxbox-%.cat,$(DEST_CODESETS))
 
-all-local: fluxbox.cat
-install-data-local: fluxbox.cat
+# We distribute the generated files so that users don't need iconv
+EXTRA_DIST= $(MFILES) $(GENERATED_MFILES)
+CLEANFILES = $(CATFILES)
+
+all-local: $(CATFILES)
+install-data-local: $(CATFILES)
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
-                $(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
-                $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+                for codeset in $(DEST_CODESETS); do \
+                        echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG).$${codeset}"; \
+                        $(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG).$${codeset}; \
+                        $(INSTALL_DATA) fluxbox-$${codeset}.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG).$${codeset}/fluxbox.cat; \
+                done; \
         fi
 
+# not part of the normal build process
+translations: $(GENERATED_MFILES)
+
+generated-%.m: Translation.m
+        iconv -f $(SRC_CODESET) -t $* Translation.m | sed s/$(SRC_CODESET)/$*/ > $@
+
 uninstall-local:
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
-                rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+                for codeset in $(DEST_CODESETS); do \
+                        rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG).$${codeset}/fluxbox.cat; \
+                        rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG).$${codeset}; \
+                done; \
         fi
 
-fluxbox.cat: Translation.m
+fluxbox-%.cat: generated-%.m Translation.m
         @if test x$(NLSTEST) = "x-DNLS"; then \
-                $(gencat_cmd) fluxbox.cat Translation.m; \
+                echo "Creating catfile for $*"; \
+                $(gencat_cmd) fluxbox-$*.cat generated-$*.m; \
         fi
-
diff --git a/nls/zh_CN/generated-ISO-8859-1.m b/nls/zh_CN/generated-ISO-8859-1.m
new file mode 100644
index 0000000..3851aa9
--- /dev/null
+++ b/nls/zh_CN/generated-ISO-8859-1.m
@@ -0,0 +1,260 @@
+$ codeset=ISO-8859-1
+
+$set 1 #Align
+
+1 下方居中
+2 左下方
+3 右下方
+4 水平
+5 靠左
+6 左下方
+7 左侧居中
+8 左上方
+9 附着
+10 右
+11 右下方
+12 右侧居中
+13 右上方
+14 上方居中
+15 左上方
+16 左上方
+17 垂直
+
+$set 2 #BaseDisplay
+
+1 退出... 存储崩溃文件\n
+2 关闭\n
+3 %s:      捕获信号 %d\n
+
+$set 3 #Common
+
+1 Alpha
+2 自动隐藏
+3 编译
+4 编译选项
+5 编译器
+6 编译器版本
+7 初始化
+8 键绑订
+9 国际化字体
+10 菜单
+11 样式
+12 默认
+13 禁用
+14 错误
+15 Fluxbox版本
+16 Maximize Over
+17 SVN发行号
+18 可见
+
+$set 4 #Configmenu
+
+1 反锯齿
+2 自动缩放
+3 Click Raises
+4 Click to Focus
+5 Decorate Transient Windows
+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
+18 透明
+19 Focused Window Alpha
+20 Unfocused Window Alpha
+
+$set 5 #Ewmh
+
+1 错误: 内存不足,不能分配内存给EWMH client list
+
+$set 6 #FbTkError
+
+1 警告Warning! Height > 3200 setting Height = 3200
+2 警告Warning! Width > 3200 setting 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
+
+$set 7 #Fluxbox
+
+1 rc文件无效!
+2 Failed to load groupfile
+3 Failed to load database
+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
+
+$set 8 #Gnome
+
+1 错误: 内存不足, 无法为GNOME client list分配内存
+
+$set 9 #Keys
+
+1 Keys: Error on line
+2 Keys: Failed to merge keytree!
+3 Keys: Invalid key/modifier on line
+
+$set 10 #Menu
+
+1 配置
+2 Fluxbox默认菜单
+3 退出
+4 图标
+5 层次...
+6 On Head...
+7 替换
+8 重新加载配置文件
+9 重启动
+
+$set 11 #Remember
+
+1 Decorations
+2 Dimensions
+3 Jump to workspace
+4 层
+5 Remember...
+6 Position
+7 Save on close
+8 Shaded
+9 Sticky
+10 未知按键
+11 Workspace
+12 Head
+
+$set 12 #Screen
+
+1 BScreen::BScreen: querying the X server时发生错误.\n 另外一个窗口管理器正运行,display为
+2 W: %4d x H: %4d
+3 BScreen::BScreen: managing screen %d using visual 0x%lx, depth %d\n
+
+$set 13 #Slit
+
+1 Clients
+2 Cycle Down
+3 Cycle Up
+4 Slit Direction
+5 Slit Layer
+6 Slit on Head
+7 Slit Placement
+8 Slit
+9 Save SlitList
+
+$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
+11 工具栏
+12 工具栏宽度
+13 时钟采用24小时格式
+14 时钟采用12小时格式
+15 修改时间显示格式
+16 显示图片
+17 不显示图标
+18 工作区所有任务无图标
+
+$set 15 #Window
+
+1 Unnamed
+
+$set 16 #Windowmenu
+
+1 关闭
+2 最小化
+3 Layer
+4 Lower
+5 最大化
+6 Raise
+7 发送到...
+8 Shade
+9 卷起
+10 杀掉
+
+$set 17 #Workspace
+
+1 工作区 %d
+2 工作区
+3 新建工作区
+4 移出最后工作区
+
+$set 18 #fbsetroot
+
+1 错误: 必须指定:: -solid, -mod, -gradient其中的一个.\n
+2 Couldn't create pixmap atoms, giving up!
+3 -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                    显示帮助信息\n
+
+$set 19 #main
+
+1 错误: '-display'需要一个参数
+2 Bad Alloc
+3 Bad cast
+4 超出显示范围
+5 运行时错误
+6 Standard Exception
+7 未知错误
+8 错误: '-log'需要一个参数
+9 日志文件
+10 记录日志到
+11 错误: '-rc'需要一个参数
+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'
+
+$set 20
+
+1 Above Dock
+2 下方
+3 桌面
+4 Dock
+5 普通模式
+6 上方
+
+
diff --git a/nls/zh_CN/generated-UTF-8.m b/nls/zh_CN/generated-UTF-8.m
new file mode 100644
index 0000000..8981622
--- /dev/null
+++ b/nls/zh_CN/generated-UTF-8.m
@@ -0,0 +1,260 @@
+$ codeset=UTF-8
+
+$set 1 #Align
+
+1 下方居中
+2 左下方
+3 右下方
+4 æ°´å¹³
+5 靠左
+6 左下方
+7 左侧居中
+8 左上方
+9 附着
+10 右
+11 右下方
+12 右侧居中
+13 右上方
+14 上方居中
+15 左上方
+16 左上方
+17 垂直
+
+$set 2 #BaseDisplay
+
+1 退出... 存储崩溃文件\n
+2 关闭\n
+3 %s:      捕获信号 %d\n
+
+$set 3 #Common
+
+1 Alpha
+2 自动隐藏
+3 编译
+4 编译选项
+5 编译器
+6 编译器版本
+7 初始化
+8 键绑订
+9 国际化字体
+10 菜单
+11 样式
+12 默认
+13 禁用
+14 错误
+15 Fluxbox版本
+16 Maximize Over
+17 SVN发行号
+18 可见
+
+$set 4 #Configmenu
+
+1 反锯齿
+2 自动缩放
+3 Click Raises
+4 Click to Focus
+5 Decorate Transient Windows
+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
+18 透明
+19 Focused Window Alpha
+20 Unfocused Window Alpha
+
+$set 5 #Ewmh
+
+1 错误: 内存不足,不能分配内存给EWMH client list
+
+$set 6 #FbTkError
+
+1 警告Warning! Height > 3200 setting Height = 3200
+2 警告Warning! Width > 3200 setting 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
+
+$set 7 #Fluxbox
+
+1 rc文件无效!
+2 Failed to load groupfile
+3 Failed to load database
+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
+
+$set 8 #Gnome
+
+1 错误: 内存不足, 无法为GNOME client list分配内存
+
+$set 9 #Keys
+
+1 Keys: Error on line
+2 Keys: Failed to merge keytree!
+3 Keys: Invalid key/modifier on line
+
+$set 10 #Menu
+
+1 配置
+2 Fluxbox默认菜单
+3 退出
+4 图标
+5 层次...
+6 On Head...
+7 替换
+8 重新加载配置文件
+9 重启动
+
+$set 11 #Remember
+
+1 Decorations
+2 Dimensions
+3 Jump to workspace
+4 层
+5 Remember...
+6 Position
+7 Save on close
+8 Shaded
+9 Sticky
+10 未知按键
+11 Workspace
+12 Head
+
+$set 12 #Screen
+
+1 BScreen::BScreen: querying the X server时发生错误.\n 另外一个窗口管理器正运行,display为
+2 W: %4d x H: %4d
+3 BScreen::BScreen: managing screen %d using visual 0x%lx, depth %d\n
+
+$set 13 #Slit
+
+1 Clients
+2 Cycle Down
+3 Cycle Up
+4 Slit Direction
+5 Slit Layer
+6 Slit on Head
+7 Slit Placement
+8 Slit
+9 Save SlitList
+
+$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
+11 工具栏
+12 工具栏宽度
+13 时钟采用24小时格式
+14 时钟采用12小时格式
+15 修改时间显示格式
+16 显示图片
+17 不显示图标
+18 工作区所有任务无图标
+
+$set 15 #Window
+
+1 Unnamed
+
+$set 16 #Windowmenu
+
+1 关闭
+2 最小化
+3 Layer
+4 Lower
+5 最大化
+6 Raise
+7 发送到...
+8 Shade
+9 卷起
+10 杀掉
+
+$set 17 #Workspace
+
+1 工作区 %d
+2 工作区
+3 新建工作区
+4 移出最后工作区
+
+$set 18 #fbsetroot
+
+1 错误: 必须指定:: -solid, -mod, -gradient其中的一个.\n
+2 Couldn't create pixmap atoms, giving up!
+3 -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                    显示帮助信息\n
+
+$set 19 #main
+
+1 错误: '-display'需要一个参数
+2 Bad Alloc
+3 Bad cast
+4 超出显示范围
+5 运行时错误
+6 Standard Exception
+7 未知错误
+8 错误: '-log'需要一个参数
+9 日志文件
+10 记录日志到
+11 错误: '-rc'需要一个参数
+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'
+
+$set 20
+
+1 Above Dock
+2 下方
+3 桌面
+4 Dock
+5 普通模式
+6 上方
+
+