aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-05-14 21:10:11 (GMT)
committermarkt <markt>2007-05-14 21:10:11 (GMT)
commit4c628adea83346e3a8950d089cb367059a92c63b (patch)
treeeace6a1acd614e7b094c43d27aea4f5ef2453e14
parent85139c733ebea2dd9c1b2bd927438b7c01113f21 (diff)
downloadfluxbox-4c628adea83346e3a8950d089cb367059a92c63b.zip
fluxbox-4c628adea83346e3a8950d089cb367059a92c63b.tar.bz2
transferred patch from Simon about fbgm encodings
-rw-r--r--ChangeLog4
-rwxr-xr-xutil/fluxbox-generate_menu.in47
2 files changed, 51 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d9f984..deab2d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,10 @@ Changes for 1.1:
87 SendToWorkspace, TakeToWorkspace, NextTab, PrevTab, MoveTabLeft, 87 SendToWorkspace, TakeToWorkspace, NextTab, PrevTab, MoveTabLeft,
88 MoveTabRight, DetachClient 88 MoveTabRight, DetachClient
89 WorkspaceCmd.cc/hh CurrentWindowCmd.cc/hh FbCommandFactory.cc 89 WorkspaceCmd.cc/hh CurrentWindowCmd.cc/hh FbCommandFactory.cc
90 * Make fluxbox-generate_menu emit [encoding] tags around all of its
91 menus. Please check that it is the right encoding, I had to guess
92 some as it wasn't recorded (Simon)
93 util/fluxbox-generate_menu.in
90*07/03/30: 94*07/03/30:
91 * Added fi_FI support (Thanks Pasi Juvonen, loudvr at yahoo ca) 95 * Added fi_FI support (Thanks Pasi Juvonen, loudvr at yahoo ca)
92 nls/fi_FI/*, util/fluxbox-generate_menu.in 96 nls/fi_FI/*, util/fluxbox-generate_menu.in
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index f94edd0..c43c5cf 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -555,6 +555,9 @@ rm -f ${MENUFILENAME}.tmp
555} 555}
556 556
557# menu defaults (if translation forget to set one of them) 557# menu defaults (if translation forget to set one of them)
558
559MENU_ENCODING=UTF-8 # (its also ascii)
560
558ABOUTITEM='About' 561ABOUTITEM='About'
559BACKGROUNDMENU='Backgrounds' 562BACKGROUNDMENU='Backgrounds'
560BACKGROUNDMENUTITLE='Set the Background' 563BACKGROUNDMENUTITLE='Set the Background'
@@ -606,6 +609,8 @@ case ${LC_ALL} in
606# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 609# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
607# email fbgm.diff to han@mijncomputer.nl 610# email fbgm.diff to han@mijncomputer.nl
608 611
612 MENU_ENCODING=KOI8-R
613
609 BACKGROUNDMENU='ïÂÏÉ' 614 BACKGROUNDMENU='ïÂÏÉ'
610 BACKGROUNDMENUTITLE='õÓÔÁÎÏ×ÉÔØ ÏÂÏÉ' 615 BACKGROUNDMENUTITLE='õÓÔÁÎÏ×ÉÔØ ÏÂÏÉ'
611 BROWSERMENU='âÒÁÕÚÅÒÙ' 616 BROWSERMENU='âÒÁÕÚÅÒÙ'
@@ -642,6 +647,9 @@ case ${LC_ALL} in
642 ;; 647 ;;
643 648
644 cs_CZ.ISO*) # Czech locales (ISO-8859-2 encodings) 649 cs_CZ.ISO*) # Czech locales (ISO-8859-2 encodings)
650
651 MENU_ENCODING=ISO-8859-2
652
645 ABOUTITEM='O programu...' 653 ABOUTITEM='O programu...'
646 BACKGROUNDMENU='Pozadí' 654 BACKGROUNDMENU='Pozadí'
647 BACKGROUNDMENUTITLE='Nastavení pozadí' 655 BACKGROUNDMENUTITLE='Nastavení pozadí'
@@ -684,6 +692,9 @@ case ${LC_ALL} in
684 ;; 692 ;;
685 693
686 de_DE*) # german locales 694 de_DE*) # german locales
695
696 MENU_ENCODING=ISO-8859-15
697
687 BACKGROUNDMENU='Hintergrundbilder' 698 BACKGROUNDMENU='Hintergrundbilder'
688 BACKGROUNDMENUTITLE='Hintergrundbild setzen' 699 BACKGROUNDMENUTITLE='Hintergrundbild setzen'
689 BROWSERMENU='Internet-Browser' 700 BROWSERMENU='Internet-Browser'
@@ -725,6 +736,8 @@ case ${LC_ALL} in
725# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 736# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
726# email fbgm.diff to han@mijncomputer.nl 737# email fbgm.diff to han@mijncomputer.nl
727 738
739 MENU_ENCODING=ISO-8859-1
740
728 BACKGROUNDMENU='Bakgrunder' 741 BACKGROUNDMENU='Bakgrunder'
729 BACKGROUNDMENUTITLE='Sätt bakgrund' 742 BACKGROUNDMENUTITLE='Sätt bakgrund'
730 BROWSERMENU='Webbläsare' 743 BROWSERMENU='Webbläsare'
@@ -762,6 +775,9 @@ case ${LC_ALL} in
762 XUTILSMENU='X-program' 775 XUTILSMENU='X-program'
763 ;; 776 ;;
764 nl_*) #Nederlandse locales 777 nl_*) #Nederlandse locales
778
779 MENU_ENCODING=ISO-8859-15
780
765 BACKGROUNDMENU='Achtergrond' 781 BACKGROUNDMENU='Achtergrond'
766 BACKGROUNDMENUTITLE='Kies een achtergrond' 782 BACKGROUNDMENUTITLE='Kies een achtergrond'
767 BROWSERMENU='Browsers' 783 BROWSERMENU='Browsers'
@@ -797,6 +813,9 @@ case ${LC_ALL} in
797 XUTILSMENU='X-Gereedschap' 813 XUTILSMENU='X-Gereedschap'
798 ;; 814 ;;
799 fi_FI*) #Finnish locales 815 fi_FI*) #Finnish locales
816
817 MENU_ENCODING=ISO-8859-1
818
800 ABOUTMENU='Tietoja ohjelmasta' 819 ABOUTMENU='Tietoja ohjelmasta'
801 ABOUTITEM='Tietoja ohjelmasta' 820 ABOUTITEM='Tietoja ohjelmasta'
802 BACKGROUNDMENU='Taustakuvat' 821 BACKGROUNDMENU='Taustakuvat'
@@ -840,6 +859,8 @@ case ${LC_ALL} in
840# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 859# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
841# email fbgm.diff to han@mijncomputer.nl 860# email fbgm.diff to han@mijncomputer.nl
842 861
862 MENU_ENCODING=eucJP
863
843 BACKGROUNDMENU='ÇØ·Ê' 864 BACKGROUNDMENU='ÇØ·Ê'
844 BACKGROUNDMENUTITLE='ÇطʤÎÀßÄê' 865 BACKGROUNDMENUTITLE='ÇطʤÎÀßÄê'
845 BROWSERMENU='¥Ö¥é¥¦¥¶' 866 BROWSERMENU='¥Ö¥é¥¦¥¶'
@@ -881,6 +902,8 @@ case ${LC_ALL} in
881# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 902# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
882# email fbgm.diff to han@mijncomputer.nl 903# email fbgm.diff to han@mijncomputer.nl
883 904
905 MENU_ENCODING=ISO-8859-15
906
884 BACKGROUNDMENU="Fond d'écran" 907 BACKGROUNDMENU="Fond d'écran"
885 BACKGROUNDMENUTITLE="Changer le fond d'écran" 908 BACKGROUNDMENUTITLE="Changer le fond d'écran"
886 BROWSERMENU='Navigateurs' 909 BROWSERMENU='Navigateurs'
@@ -916,6 +939,9 @@ case ${LC_ALL} in
916 XUTILSMENU='Outils X' 939 XUTILSMENU='Outils X'
917 ;; 940 ;;
918 it_IT*) # italian locales 941 it_IT*) # italian locales
942
943 MENU_ENCODING=ISO-8859-1
944
919 BACKGROUNDMENU='Sfondi' 945 BACKGROUNDMENU='Sfondi'
920 BACKGROUNDMENUTITLE='Imposta lo sfondo' 946 BACKGROUNDMENUTITLE='Imposta lo sfondo'
921 BROWSERMENU='Browsers' 947 BROWSERMENU='Browsers'
@@ -957,6 +983,8 @@ case ${LC_ALL} in
957# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 983# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
958# email fbgm.diff to han@mijncomputer.nl 984# email fbgm.diff to han@mijncomputer.nl
959 985
986 MENU_ENCODING=ISO-8859-15
987
960 BACKGROUNDMENU='Fundaluri' 988 BACKGROUNDMENU='Fundaluri'
961 BACKGROUNDMENUTITLE='Alege fundalul' 989 BACKGROUNDMENUTITLE='Alege fundalul'
962 BROWSERMENU='Navigatoare' 990 BROWSERMENU='Navigatoare'
@@ -994,6 +1022,8 @@ case ${LC_ALL} in
994 ;; 1022 ;;
995 es_ES*) # spanish locales 1023 es_ES*) # spanish locales
996 1024
1025 MENU_ENCODING=ISO-8859-15
1026
997 ABOUTITEM='Acerca' 1027 ABOUTITEM='Acerca'
998 BACKGROUNDMENU='Fondos' 1028 BACKGROUNDMENU='Fondos'
999 BACKGROUNDMENUTITLE='Seleccionar Fondo' 1029 BACKGROUNDMENUTITLE='Seleccionar Fondo'
@@ -1041,6 +1071,8 @@ case ${LC_ALL} in
1041# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff 1071# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
1042# email fbgm.diff to han@mijncomputer.nl 1072# email fbgm.diff to han@mijncomputer.nl
1043 1073
1074 MENU_ENCODING=ISO-8859-2
1075
1044 BACKGROUNDMENU='Tapety' 1076 BACKGROUNDMENU='Tapety'
1045 BACKGROUNDMENUTITLE='Ustaw tapetê' 1077 BACKGROUNDMENUTITLE='Ustaw tapetê'
1046 BROWSERMENU='Przegl±darki' 1078 BROWSERMENU='Przegl±darki'
@@ -1077,6 +1109,9 @@ case ${LC_ALL} in
1077 XUTILSMENU='Narzêdzia X' 1109 XUTILSMENU='Narzêdzia X'
1078 ;; 1110 ;;
1079 pt_PT*) # Portuguese locales 1111 pt_PT*) # Portuguese locales
1112
1113 MENU_ENCODING=ISO-8859-1
1114
1080 ABOUTMENU="Sobre" 1115 ABOUTMENU="Sobre"
1081 BACKGROUNDMENU='Imagens de Fundo' 1116 BACKGROUNDMENU='Imagens de Fundo'
1082 BACKGROUNDMENUTITLE='Definir Imagem de Fundo' 1117 BACKGROUNDMENUTITLE='Definir Imagem de Fundo'
@@ -1119,6 +1154,9 @@ case ${LC_ALL} in
1119 XUTILSMENU='Utilitários X' 1154 XUTILSMENU='Utilitários X'
1120 ;; 1155 ;;
1121 nb_NO*) # Norwegian locales 1156 nb_NO*) # Norwegian locales
1157
1158 MENU_ENCODING=UTF-8
1159
1122 ABOUTITEM='Om' 1160 ABOUTITEM='Om'
1123 BACKGROUNDMENU='Bakgrunner' 1161 BACKGROUNDMENU='Bakgrunner'
1124 BACKGROUNDMENUTITLE='Velg bakgrunn' 1162 BACKGROUNDMENUTITLE='Velg bakgrunn'
@@ -1515,6 +1553,10 @@ EOF
1515 1553
1516echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME} 1554echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME}
1517 1555
1556if [ -n "$MENU_ENCODING" ]; then
1557 append_menu "[encoding] {$MENU_ENCODING}"
1558fi
1559
1518append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}" 1560append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}"
1519 1561
1520case "$DEFAULT_BROWSERNAME" in 1562case "$DEFAULT_BROWSERNAME" in
@@ -1838,6 +1880,11 @@ append_submenu "${FBSETTINGSMENU}"
1838 append "[exit] (${EXITITEM})" 1880 append "[exit] (${EXITITEM})"
1839 1881
1840 append_menu_end 1882 append_menu_end
1883
1884if [ -n "$MENU_ENCODING" ]; then
1885 append_menu "[endencoding]"
1886fi
1887
1841append_menu_end 1888append_menu_end
1842 1889
1843# this function removes empty menu items. It can not yet remove nested 1890# this function removes empty menu items. It can not yet remove nested