improve native language handling, move messages and menu labels to

FbTk::FbString

3 files changed, 287 insertions, 13 deletions

diff --git a/nls/bg_BG/Makefile.am b/nls/bg_BG/Makefile.am
index 5367f96..b4ecf58 100644
--- a/nls/bg_BG/Makefile.am
+++ b/nls/bg_BG/Makefile.am
@@ -1,30 +1,46 @@
 # nls/bg_BG/Makefile.am for Fluxbox - www.fluxbox.org
 
 THE_LANG = bg_BG
+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/bg_BG/generated-ISO-8859-1.m b/nls/bg_BG/generated-ISO-8859-1.m
new file mode 100644
index 0000000..d893e0b
--- /dev/null
+++ b/nls/bg_BG/generated-ISO-8859-1.m
@@ -0,0 +1,129 @@
+$ codeset=ISO-8859-1
+
+$set 1 #Align
+
+1 ���� � �������
+2 ���� � ����
+3 ���� � �����
+4 ������������
+6 ���� � ����
+7 ���� � �������
+8 ���� � ����
+11 ���� � �����
+12 ����� � �������
+13 ���� � �����
+14 ���� � �������
+15 ���� � ����
+16 ���� � �����
+17 ���������
+
+$set 2 #BaseDisplay
+
+
+$set 3 #Common
+
+2 ����������� ��������
+
+$set 4 #Configmenu
+
+2 ����������� ���������
+4 ������ �� �����
+7 ��������� �������� ��� ����� �� ��������� �����
+8 ��� �����
+9 ��������� ������ ��������
+10 ����� �����������
+11 Image Dithering
+12 ����������� ������� �� ����������
+13 ���� Sloppy �����
+14 Sloppy �����
+15 Workspace Warping
+
+$set 5 #Ewmh
+
+
+$set 6 #FbTkError
+
+
+$set 7 #Fluxbox
+
+
+$set 8 #Gnome
+
+
+$set 9 #Keys
+
+
+$set 10 #Menu
+
+3 �����
+4 �����
+7 ������������
+9 ������������
+
+$set 11 #Remember
+
+
+$set 12 #Screen
+
+2 W: %4d x H: %4d
+
+$set 13 #Slit
+
+4 Posoka na Slit -a
+7 ������������ �� Slit -�
+8 Slit
+
+$set 14 #Toolbar
+
+1 ���������� ����� �� �������� ������� �����
+10 ������������ �� Toolbar -�
+11 Toolbar
+
+$set 15 #Window
+
+1 ������
+
+$set 16 #Windowmenu
+
+1 �������
+2 ����������
+4 �����
+5 �������
+6 ��������
+7 ����� �� ...
+8 �������
+9 ������
+
+$set 17 #Workspace
+
+1 ������� ����� %d
+2 ������� �����
+3 ���� ������� �����
+4 ����� ����������
+
+$set 18 #fbsetroot
+
+1 error: must specify one of: -solid, -mod, -gradient\n
+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                    print this help text and exit\n
+
+$set 19 #main
+
+1 ������: '-display' ������� ��������
+11 ������: '-rc' ������� ��������
+13 Fluxkbox %s: (c) %s Henrik Kinnunen\n\n\
+-display <string>\t\tuse display connection.\n\
+-rc <string>\t\t\t������� ��������� �������� ����.\n\
+-version\t\t\t������ �������� � �����.\n\
+-info\t\t\t\tdisplay some useful information.\n\
+-log <filename>\t\t\tlog output to file.\n\
+-help\t\t\t\t������ ���� ������� ����� � �����.\n\n
+
+
diff --git a/nls/bg_BG/generated-UTF-8.m b/nls/bg_BG/generated-UTF-8.m
new file mode 100644
index 0000000..d9626b6
--- /dev/null
+++ b/nls/bg_BG/generated-UTF-8.m
@@ -0,0 +1,129 @@
+$ codeset=UTF-8
+
+$set 1 #Align
+
+1 Äîëó â Ñðåäàòà
+2 Äîëó â Ëÿâî
+3 Äîëó â Äÿñíî
+4 Õîðèçîíòàëíî
+6 Äîëó â Ëÿâî
+7 Ëÿâî â Ñðåäàòà
+8 Ãîðå â Ëÿâî
+11 Äîëó â Äÿñíî
+12 Äÿñíî â Ñðåäàòà
+13 Ãîðå â Äÿñíî
+14 Ãîðå â Ñðåäàòà
+15 Ãîðå â Ëÿâî
+16 Ãîðå â Äÿñíî
+17 Âåðòêàëíî
+
+$set 2 #BaseDisplay
+
+
+$set 3 #Common
+
+2 Àâòîìàòè÷íî ñêðèâàíå
+
+$set 4 #Configmenu
+
+2 Àâòîìàòè÷íî Ïîâäèãàíå
+4 Êëèêíè çà Ôîêóñ
+7 Ôîêóñèðàé Ïðîçîðåö ïðè ñìÿíà íà Ðàáîòíèòå Ìåñòà
+8 Òèï ôîêóñ
+9 Ôîêóñèðàé Íîâèòå Ïðîçîðöè
+10 Ïúëíî Óâåëè÷àâàíå
+11 Image Dithering
+12 Íåïðîçðà÷íî ìåñòåíå íà ïðîçîðöèòå
+13 Ïîëó Sloppy Ôîêóñ
+14 Sloppy Ôîêóñ
+15 Workspace Warping
+
+$set 5 #Ewmh
+
+
+$set 6 #FbTkError
+
+
+$set 7 #Fluxbox
+
+
+$set 8 #Gnome
+
+
+$set 9 #Keys
+
+
+$set 10 #Menu
+
+3 Èçõîä
+4 Èêîíè
+7 Ðàçïîëîæåíèå
+9 Ðåñòàðòèðàíå
+
+$set 11 #Remember
+
+
+$set 12 #Screen
+
+2 W: %4d x H: %4d
+
+$set 13 #Slit
+
+4 Posoka na Slit -a
+7 Ðàçïîëîæåíèå íà Slit -à
+8 Slit
+
+$set 14 #Toolbar
+
+1 Ðåäàêòèðàé èìåòî íà òåêóùîòî Ðàáîòíî Ìÿñòî
+10 Ðàçïîëîæåíèå íà Toolbar -à
+11 Toolbar
+
+$set 15 #Window
+
+1 Áåçèìå
+
+$set 16 #Windowmenu
+
+1 Çàòâîðè
+2 Èêîíèçèðàé
+4 Ñíèøè
+5 Óâåëè÷è
+6 Ïîâäèãíè
+7 Ïðàòè íà ...
+8 Çàñåí÷è
+9 Çàáîäè
+
+$set 17 #Workspace
+
+1 Ðàáîòíî Ìÿñòî %d
+2 Ðàáîòíè Ìåñòà
+3 Íîâî Ðàáîòíî Ìÿñòî
+4 Ìàõíè Ïîñëåäíîòî
+
+$set 18 #fbsetroot
+
+1 error: must specify one of: -solid, -mod, -gradient\n
+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                    print this help text and exit\n
+
+$set 19 #main
+
+1 ãðåøêà: '-display' èçèñêâà àðãóìåíò
+11 ãðåøêà: '-rc' èçèñêâà àðãóìåíò
+13 Fluxkbox %s: (c) %s Henrik Kinnunen\n\n\
+-display <string>\t\tuse display connection.\n\
+-rc <string>\t\t\tïîëçâàé çàìåñòâàù ðåñóðñåí ôàéë.\n\
+-version\t\t\tïîêàæè âåðñèÿòà è èçëåç.\n\
+-info\t\t\t\tdisplay some useful information.\n\
+-log <filename>\t\t\tlog output to file.\n\
+-help\t\t\t\tïîêàæè òîçè ïîìîùåí òåêñò è èçëåç.\n\n
+
+