From 901902330a638335e6ca5a2718073df73fe4ba4a Mon Sep 17 00:00:00 2001 From: mathias Date: Tue, 4 Jan 2005 12:05:58 +0000 Subject: updated ru_RU translations added ko_KR translations --- ChangeLog | 4 + configure.in | 1 + nls/Makefile.am | 4 +- nls/ko_KR/Makefile.am | 29 ++++++ nls/ko_KR/Makefile.in | 258 +++++++++++++++++++++++++++++++++++++++++++++++ nls/ko_KR/Translation.m | 259 ++++++++++++++++++++++++++++++++++++++++++++++++ nls/ru_RU/Translation.m | 61 +++++++++++- nls/translators.txt | 2 + 8 files changed, 612 insertions(+), 6 deletions(-) create mode 100644 nls/ko_KR/Makefile.am create mode 100644 nls/ko_KR/Makefile.in create mode 100644 nls/ko_KR/Translation.m diff --git a/ChangeLog b/ChangeLog index 7d24471..a2face5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ (Format: Year/Month/Day) Changes for 0.9.12 +<<<<<<< .mine *05/01/04: + * Added ko_KR (thanx Jo Hyunseok ) + * Updated ru_RU (thanx php-coder) + ru_RU/Translation.m * Fix some initialisation states, especially window placement with no decorations through apps (e.g. aterm) Window.hh/cc Screen.cc Ewmh.cc diff --git a/configure.in b/configure.in index 5fd74a9..cc31de9 100644 --- a/configure.in +++ b/configure.in @@ -553,6 +553,7 @@ nls/pt_PT/Makefile nls/bg_BG/Makefile nls/ja_JP/Makefile nls/lv_LV/Makefile +nls/ko_KR/Makefile nls/it_IT/Makefile nls/de_DE/Makefile nls/nl_NL/Makefile diff --git a/nls/Makefile.am b/nls/Makefile.am index 1d973ca..b38d703 100644 --- a/nls/Makefile.am +++ b/nls/Makefile.am @@ -2,8 +2,8 @@ NLSTEST = @NLS@ SUBDIRS = C da_DK es_ES et_EE fr_FR pt_BR ru_RU sv_SE \ - tr_TR it_IT pt_PT bg_BG ja_JP lv_LV de_DE nl_NL \ - sl_SI pl_PL vi_VN + tr_TR it_IT pt_PT bg_BG ja_JP ko_KR lv_LV de_DE \ + nl_NL sl_SI pl_PL vi_VN MAINTAINERCLEANFILES = Makefile.in fluxbox-nls.hh EXTRA_DIST=fluxbox-nls.hh nlsinfo diff --git a/nls/ko_KR/Makefile.am b/nls/ko_KR/Makefile.am new file mode 100644 index 0000000..53d53e0 --- /dev/null +++ b/nls/ko_KR/Makefile.am @@ -0,0 +1,29 @@ +# nls/ko_KR/Makefile.am for Fluxbox - www.fluxbox.org + +THE_LANG = ko_KR + +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)$(pkgdatadir)/nls/$(THE_LANG)"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ + fi + +uninstall-local: + @if test x$(NLSTEST) = "x-DNLS"; then \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \ + rmdir $(DESTDIR)$(pkgdatadir)/nls/$(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/ko_KR/Makefile.in b/nls/ko_KR/Makefile.in new file mode 100644 index 0000000..2e7df78 --- /dev/null +++ b/nls/ko_KR/Makefile.in @@ -0,0 +1,258 @@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# nls/ko_KR/Makefile.am for Fluxbox - www.fluxbox.org + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) +transform = @program_transform_name@ +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +AWK = @AWK@ +CC = @CC@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +DEBUG = @DEBUG@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +ECHO = @ECHO@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +NLS = @NLS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +RC = @RC@ +SHAPE = @SHAPE@ +STRIP = @STRIP@ +UP = @UP@ +VERSION = @VERSION@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +am__include = @am__include@ +am__quote = @am__quote@ +gencat_cmd = @gencat_cmd@ +install_sh = @install_sh@ +regex_cmd = @regex_cmd@ + +THE_LANG = ko_KR + +NLSTEST = @NLS@ +CLEANFILES = fluxbox.cat +MAINTAINERCLEANFILES = Makefile.in +MFILES = Translation.m +EXTRA_DIST = $(MFILES) +subdir = nls/ko_KR +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am + +.SUFFIXES: + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu nls/ko_KR/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: +tags: TAGS +TAGS: + + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ + if test -d $$d/$$file; then \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile all-local + +installdirs: + +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-data-local + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +uninstall-am: uninstall-info-am uninstall-local + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am info info-am install install-am install-data \ + install-data-am install-data-local install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ + uninstall-local + + +all-local: fluxbox.cat +install-data-local: fluxbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ + echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ + fi + +uninstall-local: + @if test x$(NLSTEST) = "x-DNLS"; then \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \ + rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ + fi + +fluxbox.cat: Translation.m + @if test x$(NLSTEST) = "x-DNLS"; then \ + $(gencat_cmd) fluxbox.cat Translation.m; \ + fi +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/nls/ko_KR/Translation.m b/nls/ko_KR/Translation.m new file mode 100644 index 0000000..c26ef7d --- /dev/null +++ b/nls/ko_KR/Translation.m @@ -0,0 +1,259 @@ +$ 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 Aborting... dumping core\n +2 Shutting Down\n +3 %s: signal %d caught\n + +$set 3 #Common + +1 알파 채널값 +2 자동 숨김 +3 Compiled +4 Compiled options +5 Compiler +6 Compiler version +7 init +8 keys +9 menu +10 style +11 Defaults +12 disabled +13 Error +14 Fluxbox version +15 창 최대화 시 덮기 +16 툴바 표시 + +$set 4 #Configmenu + +1 안티 앨리어스 +2 활성화된 창 자동 올림 +3 클릭 시 창 올림 +4 클릭 시 활성화 +5 Decorate Transient Windows +6 마우스 휠로 작업공간 전환 +7 Focus Window on Workspace Change +8 활성화 방법 +9 새로 여는 창 활성화 +10 모니터 전체 최대화 +11 이미지 디더링 +12 창 이동 시 내용 보임 +13 커서 위치 반자동 활성화 +14 커서 위치의 창 활성화 +15 순환식 작업공간 전환 +16 Force Pseudo-Transparency +17 메뉴의 알파 채널값 +18 반투명 설정 +19 활성창의 알파 채널값 +20 비활성창의 알파 채널값 + +$set 5 #Ewmh + +1 Fatal: Out of memory, can't allocate for EWMH client list + +$set 6 #FbTkError + +1 Warning! Height > 3200 setting Height = 3200 +2 Warning! Width > 3200 setting Width = 3200 +3 Warning: can't load fallback font +4 Allocation error. +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 filename is invalid! +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 Fatal: Out of memory, can't allocate for 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 default menu +3 종료 +4 Icons +5 레이어... +6 On Head... +7 위치 +8 Reload Config +9 재시작 +10 xterm + +$set 11 #Remember + +1 테두리? +2 크기 +3 해당 작업공간으로 점프 +4 레이어 +5 기억하기... +6 위치 +7 종료 시의 값 기억 +8 셰이드? +9 고정? +10 Unknown apps key +11 작업공간 +12 Head + +$set 12 #Screen + +1 BScreen::BScreen: an error occured while querying the X server.\n another window manager already running on 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 클라이언트 +2 한 칸씩 내려앉히기 +3 한 칸씩 밀어올리기 +4 Slit 방향 +5 Slit 레이어 +6 Slit on Head +7 Slit 위치 +8 Slit +9 SlitList 저장 + +$set 14 #Toolbar + +1 작업공간 이름 변경 +2 아이콘바 모드 +3 모든 작업공간의 창 표시 +4 아이콘화 된 것만 +5 표시 안함 +6 현재 작업공간의 창 표시 +7 현재 작업공간에서 아이콘화 된 것만 +8 툴바 레이어 +9 Toolbar on Head +10 툴바 위치 +11 툴바 +12 툴바 너비(%) +13 시계: 24 시간제 +14 시계: 12 시간제 +15 시간 표시 형식 수정 +16 아이콘 그림 표시 + +$set 15 #Window + +1 Unnamed + +$set 16 #Windowmenu + +1 닫기 +2 아이콘화 +3 레이어 +4 낮춤 +5 최대화 +6 올림 +7 Send To ... +8 셰이드 +9 고정 +10 강제 종료 + +$set 17 #Workspace + +1 작업공간 %d +2 작업공간 +3 새 작업공간 추가 +4 마지막 것 제거 + +$set 18 #bsetroot + +1 %s: error: must specify one of: -solid, -mod, -gradient\n +2 Couldn't create pixmap atoms, giving up! +3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ +-display display connection\n\ +-mod modula pattern\n\ +-foreground, -fg modula foreground color\n\ +-background, -bg modula background color\n\n\ +-gradient gradient texture\n\ +-from gradient start color\n\ +-to gradient end color\n\n\ +-solid solid color\n\n\ +-help print this help text and exit\n + +$set 19 #main + +1 error: '-display' requires an argument\n +2 Bad Alloc +3 Bad cast +4 Out of range +5 Runtime error +6 Standard Exception +7 Unknown error +8 error: '-log' needs an argument +9 Log File +10 Logging to +11 error: '-rc' requires an argument\n +12 Fluxbox %s: (c) %s Henrik Kinnunen\n\n\ +-display \t\tuse display connection.\n\ +-rc \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 \t\t\tlog output to file.\n\ +-help\t\t\t\tdisplay this help text and exit.\n\n +13 warning: couldn't set environment variable 'DISPLAY' + +$set 20 + +1 Dock 위 +2 하부 +3 데스크탑 +4 Dock +5 표준 +6 상위 + + diff --git a/nls/ru_RU/Translation.m b/nls/ru_RU/Translation.m index acb70d4..adac37b 100644 --- a/nls/ru_RU/Translation.m +++ b/nls/ru_RU/Translation.m @@ -6,9 +6,12 @@ $set 1 #Align 2 3 4 +5 6 7 8 +9 +10 11 12 13 @@ -21,13 +24,29 @@ $set 2 #BaseDisplay $set 3 #Common - +1 2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +14 Fluxbox +15 +16 $set 4 #Configmenu - +1 2 +3 4 +5 +6 7 8 9 @@ -37,6 +56,10 @@ $set 4 #Configmenu 13 14 15 +17 +18 +19 +20 $set 5 #Ewmh @@ -55,14 +78,25 @@ $set 9 #Keys $set 10 #Menu +1 3 4 +5 ... 7 9 10 Xterm $set 11 #Remember - +1 +2 +3 +4 +5 ... +6 +7 +8 +9 +11 $set 12 #Screen @@ -71,16 +105,27 @@ $set 12 #Screen 6 0: 0000 x 0: 0000 $set 13 #Slit - +1 +2 +3 4 7 8 +9 $set 14 #Toolbar 1 +2 +3 +4 +5 +6 +7 10 11 +12 +16 $set 15 #Window @@ -90,6 +135,7 @@ $set 16 #Windowmenu 1 2 +3 ... 4 5 6 @@ -130,4 +176,11 @@ $set 19 #main -log \t\t\t .\n\ -help\t\t\t\t .\n\n +$set 20 #Layer +1 +2 +3 +4 +5 +6 diff --git a/nls/translators.txt b/nls/translators.txt index 271dd9b..c5202e1 100644 --- a/nls/translators.txt +++ b/nls/translators.txt @@ -21,6 +21,8 @@ Adding a new translation List of translators contrubutors -------------------------------- +ru_RU: php-coder +ko_KR: Jo Hyunseok pl_PL: Meltir and Cheester , offtza@gazeta.pl nl_NL: Han Boetes sl_SI: Ales Jagodnik -- cgit v0.11.2