added zh_CN translations (thanx Andyliu)

fixed ko_KR translations (thanx Jo Hyunseok)

6 files changed, 419 insertions, 117 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c13015..f062a8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 (Format: Year/Month/Day)
 Changes for 0.9.15:
-*06/03/07:
+*06/03/09:
    * Bugfix for _net_wm_state_hidden (Thanks Mark)
      Ewmh.cc
+   * Updated ko_KR translations (Thanks Jo Hyunseok)
+   * Added zh_CN translationas (Thanks Andyliu, liudeyan at gmail dot com)
+*06/03/07:
    * Bugfix for stuck icons (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org)
      IconbarTool.cc
 *06/03/05:
diff --git a/configure.in b/configure.in
index 22d7b90..e55912e 100644
--- a/configure.in
+++ b/configure.in
@@ -632,29 +632,30 @@ doc/Makefile
 doc/ru/Makefile
 nls/Makefile
 nls/C/Makefile
+nls/be_BY/Makefile
+nls/bg_BG/Makefile
 nls/cs_CZ/Makefile
 nls/da_DK/Makefile
+nls/de_DE/Makefile
 nls/el_GR/Makefile
 nls/es_ES/Makefile
 nls/et_EE/Makefile
 nls/fr_FR/Makefile
-nls/pt_BR/Makefile
-nls/ru_RU/Makefile
-nls/sv_SE/Makefile
-nls/tr_TR/Makefile
-nls/pt_PT/Makefile
-nls/bg_BG/Makefile
+nls/it_IT/Makefile
 nls/ja_JP/Makefile
-nls/lv_LV/Makefile
 nls/ko_KR/Makefile
-nls/it_IT/Makefile
-nls/de_DE/Makefile
+nls/lv_LV/Makefile
 nls/nb_NO/Makefile
 nls/nl_NL/Makefile
+nls/no_NO/Makefile
 nls/pl_PL/Makefile
+nls/pt_BR/Makefile
+nls/pt_PT/Makefile
+nls/ru_RU/Makefile
 nls/sl_SI/Makefile
-nls/vi_VN/Makefile
-nls/be_BY/Makefile
+nls/sv_SE/Makefile
+nls/tr_TR/Makefile
 nls/uk_UA/Makefile
-nls/no_NO/Makefile
+nls/vi_VN/Makefile
+nls/zh_CN/Makefile
 )
diff --git a/nls/Makefile.am b/nls/Makefile.am
index cfec35d..e3bc725 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -5,7 +5,7 @@ NLSTEST = @NLS@
 SUBDIRS = C cs_CZ da_DK es_ES et_EE fr_FR pt_BR ru_RU \
                   sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \
                   lv_LV de_DE nl_NL no_NO sl_SI pl_PL vi_VN be_BY \
-                  uk_UA el_GR nb_NO
+                  uk_UA el_GR nb_NO zh_CN
 
 MAINTAINERCLEANFILES = Makefile.in fluxbox-nls.hh
 EXTRA_DIST=fluxbox-nls.hh nlsinfo
diff --git a/nls/ko_KR/Translation.m b/nls/ko_KR/Translation.m
index bc6135a..601411a 100644
--- a/nls/ko_KR/Translation.m
+++ b/nls/ko_KR/Translation.m
@@ -1,24 +1,24 @@
-$ codeset=eucKR
+$ codeset=UTF-8
 
 $set 1 #Align
 
-1 �ϴ� �߾�
-2 �ϴ� ����
-3 �ϴ� ������
-4 [����]
-5 ���� ����
-6 ���� �Ʒ�
-7 ���� ����
-8 ���� ��
-9 ���� ȥ��
-10 ������ ����
-11 ���� �Ʒ�
-12 ���� ����
-13 ���� ��
-14 ��� �߾�
-15 ��� ����
-16 ��� ������
-17 [����]
+1 하단 중앙
+2 하단 왼쪽
+3 하단 오���쪽
+4 [수평]
+5 왼쪽 정렬
+6 좌�� 아래
+7 좌측 중���
+8 좌측 위
+9 양쪽 정렬
+10 오���쪽 정렬
+11 ����� 아래
+12 ���측 중���
+13 ���측 위
+14 상단 중앙
+15 상단 왼쪽
+16 상단 오���쪽
+17 [수직]
 
 $set 2 #BaseDisplay
 
@@ -28,45 +28,46 @@ $set 2 #BaseDisplay
 
 $set 3 #Common
 
-1 ���� ���
-2 �ڵ� ����
+1 알파 채널���
+2 자동 숨김
 3 Compiled
 4 Compiled options
 5 Compiler
 6 Compiler version
 7 init
 8 keys
+9 nls
 10 menu
 11 style
 12 Defaults
 13 disabled
 14 Error
 15 Fluxbox version
-16 â �ִ�ȭ �� ����
-18 ���� ǥ��
+16 창 최대화 시 덮기
+17 SVN Revision
+18 툴바 표시
 
 $set 4 #Configmenu
 
-1 ��Ƽ �ٸ��
-2 Ȱ��ȭ�� â �ڵ� �ø�
-3 Ŭ�� �� â �ø�
-4 Ŭ�� �� Ȱ��ȭ
-5 Decorate Transient Windows
-6 ������ �ٷ� �۾����� ��ȯ
+1 안티 앨리어스
+2 활성화된 창 자동 올림
+3 클릭 시 창 올림
+4 클릭 시 활성화
+5 임시창 테두리 꾸밈
+6 마���스 휠로 작업공��� 전환
 7 Focus Window on Workspace Change
-8 Ȱ��ȭ ���
-9 ���� ���� â Ȱ��ȭ
-10 ����� ��ü �ִ�ȭ
-11 �̹��� �����
-12 â �̵� �� ���� ����
-13 Ŀ�� ��ġ ���ڵ� Ȱ��ȭ
-14 Ŀ�� ��ġ�� â Ȱ��ȭ
-15 ��ȯ�� �۾����� ��ȯ
+8 활성화 방법
+9 새로 여는 창 활성화
+10 화면 전체 최대화 (툴바 위치 포함)
+11 이미지 디더링
+12 창 이동 중 내용 나타냄
+14 마우스 커서가 놓인 창 활성화
+15 순환식 작업공간 전환 (마지막 -> 맨 처음) 
 16 Force Pseudo-Transparency
-17 ������ ���� ���
-18 ������ ����
-19 ����� ���� ���
-20 ������� ���� ���
+17 메��의 알파 채널���
+18 반���명 ��정
+19 활성���의 알파 채널���
+20 비활성���의 알파 채널���
 
 $set 5 #Ewmh
 
@@ -120,30 +121,30 @@ $set 9 #Keys
 
 $set 10 #Menu
 
-1 Configuration
+1 설정
 2 Fluxbox default menu
-3 Exit
+3 종료
 4 Icons
-5 ���̾� ...
+5 레이어 ...
 6 On Head...
-7 ��ġ
+7 위치
 8 Reload Config
-9 Restart
+9 재시작
 10 xterm
 
 $set 11 #Remember
 
-1 �׵θ�?
-2 ũ��
-3 �ش� �۾��������� ����
-4 ���̾�
-5 ����ϱ� ...
-6 ��ġ
-7 ���� ���� �� ���
-8 ���̵�?
-9 ����?
+1 테두리 상태
+2 크기
+3 ���억한 작업공간으��� 건너감
+4 레이어
+5 기억하기 ...
+6 위치
+7 종료 시의 ��� 기억
+8 셰이드 여부
+9 고정 여부
 10 Unknown apps key
-11 �۾�����
+11 작업공���
 12 Head
 
 $set 12 #Screen
@@ -157,34 +158,36 @@ $set 12 #Screen
 
 $set 13 #Slit
 
-1 Ŭ���̾�Ʈ
-2 �� ĭ�� ����������
-3 �� ĭ�� �о������
-4 Slit ����
-5 Slit ���̾�
+1 클라이언트
+2 한 칸씩 내려앉히기
+3 한 ���씩 밀어올리기
+4 Slit 방향
+5 Slit 레이어
 6 Slit on Head
-7 Slit ��ġ
+7 Slit 위치
 8 Slit
-9 SlitList ����
+9 SlitList 저장
 
 $set 14 #Toolbar
 
-1 �۾����� �̸� ����
-2 �����ܹ� ���
-3 ��� �۾������� â ǥ��
-4 ������ȭ �� �͸�
-5 ǥ�� ����
-6 ���� �۾������� â ǥ��
-7 ���� �۾��������� ������ȭ �� �͸�
-8 ���� ���̾�
+1 작업공��� 이름 변경
+2 아이콘바 모드
+3 모든 작업공���의 �� 표시
+4 ���소화된 ���만
+5 표시 안함
+6 현재 작업공���의 �� 표시
+7 현재 작업공���에서 ���소화된 ���만
+8 툴바 레이어
 9 Toolbar on Head
-10 ���� ��ġ
-11 ����
-12 ���� �ʺ�(%)
-13 �ð�: 24 �ð���
-14 �ð�: 12 �ð���
-15 �ð� ǥ�� ���� ����
-16 ������ �׸� ǥ��
+10 툴바 위치
+11 툴바
+12 툴바 너비(%)
+13 시계: 24 시간제
+14 시계: 12 시간제
+15 시간 표시 형식 수정
+16 아이콘 그림 보기
+17 최소화된 창은 제외하고 표시
+18 현재 작업공간의 최소화된 창 제외
 
 $set 15 #Window
 
@@ -192,29 +195,30 @@ $set 15 #Window
 
 $set 16 #Windowmenu
 
-1 �ݱ�
-2 ������ȭ
-3 ���̾�
-4 ����
-5 �ִ�ȭ
-6 �ø�
-7 ������ ...
-8 ���̵�
-9 ����
-10 ���� ����
+1 닫기
+2 아이콘화
+3 레이어
+4 낮춤
+5 최���화
+6 올림
+7 Send To ...
+8 셰이드
+9 고정
+10 ���제 종료
 
 $set 17 #Workspace
 
-1 �۾����� %d
-2 �۾�����
-3 �� �۾����� ����
-4 ������ �� ����
+1 작업공��� %d
+2 작업공���
+3 새 작업공��� 추���
+4 마지막 것 제��
 
-$set 18 #fbsetroot
+$set 18 #bsetroot
 
-1 Error: must specify one of: -solid, -mod, -gradient\n
+1 %s: error: must specify one of: -solid, -mod, -gradient\n
 2 Couldn't create pixmap atoms, giving up!
-3 -display <string>        display connection\n\
+3 %s 2.0: (c) 1997-2000 Brad Hughes\n\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\
@@ -226,7 +230,7 @@ $set 18 #fbsetroot
 
 $set 19 #main
 
-1 error: '-display' requires an argument
+1 error: '-display' requires an argument\n
 2 Bad Alloc
 3 Bad cast
 4 Out of range
@@ -236,23 +240,23 @@ $set 19 #main
 8 error: '-log' needs an argument
 9 Log File
 10 Logging to
-11 error: '-rc' requires an argument
-13 Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
+11 error: '-rc' requires an argument\n
+12 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
-14 warning: couldn't set environment variable 'DISPLAY'
+13 warning: couldn't set environment variable 'DISPLAY'
 
 $set 20
 
-1 Dock ��
-2 �Ϻ�
-3 ����ũž
+1 Dock 위
+2 하부
+3 데스크탑
 4 Dock
-5 ǥ��
-6 ����
+5 표준
+6 상위
 
 
diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am
new file mode 100644
index 0000000..c4c0cd3
--- /dev/null
+++ b/nls/zh_CN/Makefile.am
@@ -0,0 +1,30 @@
+# nls/C/Makefile.am for Fluxbox - www.fluxbox.org
+
+THE_LANG = zh_CN
+
+LOCALE_PATH = @LOCALE_PATH@
+NLSTEST = @NLS@
+CLEANFILES = fluxbox.cat
+MAINTAINERCLEANFILES = Makefile.in 
+MFILES = Translation.m
+EXTRA_DIST= $(MFILES)
+
+all-local: fluxbox.cat
+install-data-local: fluxbox.cat
+        @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); \
+        fi
+
+uninstall-local:
+        @if test x$(NLSTEST) = "x-DNLS"; then \
+                rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+                rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+        fi
+
+fluxbox.cat: Translation.m
+        @if test x$(NLSTEST) = "x-DNLS"; then \
+                $(gencat_cmd) fluxbox.cat Translation.m; \
+        fi
+
diff --git a/nls/zh_CN/Translation.m b/nls/zh_CN/Translation.m
new file mode 100644
index 0000000..c39189b
--- /dev/null
+++ b/nls/zh_CN/Translation.m
@@ -0,0 +1,264 @@
+$ 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 重启动
+10 xterm
+
+$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 W: 0000 x H: 0000
+4 BScreen::BScreen: managing screen %d using visual 0x%lx, depth %d\n
+5 X: %4d x Y: %4d
+6 0: 0000 x 0: 0000
+
+$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 上方
+
+