emit [encoding] tags around the menus

This commit is contained in:
simonb 2007-03-31 10:53:53 +00:00
parent b38f4e931f
commit 9ce423ab5f
2 changed files with 52 additions and 0 deletions

View file

@ -1,5 +1,10 @@
(Format: Year/Month/Day)
Changes for 1.0.0:
*07/03/31:
* Make fluxbox-generate_menu emit [encoding] tags around all of its
menus. Please check that it is the right encoding, I had to guess
some as it wasn't recorded (Simon)
util/fluxbox-generate_menu.in
*07/03/30:
* Added fi_FI support (Thanks Pasi Juvonen, loudvr at yahoo ca)
nls/fi_FI/*, util/fluxbox-generate_menu.in

View file

@ -555,6 +555,9 @@ rm -f ${MENUFILENAME}.tmp
}
# menu defaults (if translation forget to set one of them)
MENU_ENCODING=UTF-8 # (its also ascii)
ABOUTITEM='About'
BACKGROUNDMENU='Backgrounds'
BACKGROUNDMENUTITLE='Set the Background'
@ -606,6 +609,8 @@ case ${LC_ALL} in
# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
# email fbgm.diff to han@mijncomputer.nl
MENU_ENCODING=KOI8-R
BACKGROUNDMENU='ïÂÏÉ'
BACKGROUNDMENUTITLE='õÓÔÁÎÏ×ÉÔØ ÏÂÏÉ'
BROWSERMENU='âÒÁÕÚÅÒÙ'
@ -642,6 +647,9 @@ case ${LC_ALL} in
;;
cs_CZ.ISO*) # Czech locales (ISO-8859-2 encodings)
MENU_ENCODING=ISO-8859-2
ABOUTITEM='O programu...'
BACKGROUNDMENU='Pozadí'
BACKGROUNDMENUTITLE='Nastavení pozadí'
@ -684,6 +692,9 @@ case ${LC_ALL} in
;;
de_DE*) # german locales
MENU_ENCODING=ISO-8859-15
BACKGROUNDMENU='Hintergrundbilder'
BACKGROUNDMENUTITLE='Hintergrundbild setzen'
BROWSERMENU='Internet-Browser'
@ -725,6 +736,8 @@ case ${LC_ALL} in
# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
# email fbgm.diff to han@mijncomputer.nl
MENU_ENCODING=ISO-8859-1
BACKGROUNDMENU='Bakgrunder'
BACKGROUNDMENUTITLE='Sätt bakgrund'
BROWSERMENU='Webbläsare'
@ -762,6 +775,9 @@ case ${LC_ALL} in
XUTILSMENU='X-program'
;;
nl_*) #Nederlandse locales
MENU_ENCODING=ISO-8859-15
BACKGROUNDMENU='Achtergrond'
BACKGROUNDMENUTITLE='Kies een achtergrond'
BROWSERMENU='Browsers'
@ -797,6 +813,9 @@ case ${LC_ALL} in
XUTILSMENU='X-Gereedschap'
;;
fi_FI*) #Finnish locales
MENU_ENCODING=ISO-8859-1
ABOUTMENU='Tietoja ohjelmasta'
ABOUTITEM='Tietoja ohjelmasta'
BACKGROUNDMENU='Taustakuvat'
@ -840,6 +859,8 @@ case ${LC_ALL} in
# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
# email fbgm.diff to han@mijncomputer.nl
MENU_ENCODING=eucJP
BACKGROUNDMENU='ÇØ·Ê'
BACKGROUNDMENUTITLE='ÇطʤÎÀßÄê'
BROWSERMENU='¥Ö¥é¥¦¥¶'
@ -881,6 +902,8 @@ case ${LC_ALL} in
# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
# email fbgm.diff to han@mijncomputer.nl
MENU_ENCODING=ISO-8859-15
BACKGROUNDMENU="Fond d'écran"
BACKGROUNDMENUTITLE="Changer le fond d'écran"
BROWSERMENU='Navigateurs'
@ -916,6 +939,9 @@ case ${LC_ALL} in
XUTILSMENU='Outils X'
;;
it_IT*) # italian locales
MENU_ENCODING=ISO-8859-1
BACKGROUNDMENU='Sfondi'
BACKGROUNDMENUTITLE='Imposta lo sfondo'
BROWSERMENU='Browsers'
@ -957,6 +983,8 @@ case ${LC_ALL} in
# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
# email fbgm.diff to han@mijncomputer.nl
MENU_ENCODING=ISO-8859-15
BACKGROUNDMENU='Fundaluri'
BACKGROUNDMENUTITLE='Alege fundalul'
BROWSERMENU='Navigatoare'
@ -994,6 +1022,8 @@ case ${LC_ALL} in
;;
es_ES*) # spanish locales
MENU_ENCODING=ISO-8859-15
ABOUTITEM='Acerca'
BACKGROUNDMENU='Fondos'
BACKGROUNDMENUTITLE='Seleccionar Fondo'
@ -1041,6 +1071,8 @@ case ${LC_ALL} in
# $ diff u fluxbox-generate-menu.in.orig fluxbox-generate-menu.in > fbgm.diff
# email fbgm.diff to han@mijncomputer.nl
MENU_ENCODING=ISO-8859-2
BACKGROUNDMENU='Tapety'
BACKGROUNDMENUTITLE='Ustaw tapetê'
BROWSERMENU='Przegl±darki'
@ -1077,6 +1109,9 @@ case ${LC_ALL} in
XUTILSMENU='Narzêdzia X'
;;
pt_PT*) # Portuguese locales
MENU_ENCODING=ISO-8859-1
ABOUTMENU="Sobre"
BACKGROUNDMENU='Imagens de Fundo'
BACKGROUNDMENUTITLE='Definir Imagem de Fundo'
@ -1119,6 +1154,9 @@ case ${LC_ALL} in
XUTILSMENU='Utilitários X'
;;
nb_NO*) # Norwegian locales
MENU_ENCODING=UTF-8
ABOUTITEM='Om'
BACKGROUNDMENU='Bakgrunner'
BACKGROUNDMENUTITLE='Velg bakgrunn'
@ -1515,6 +1553,10 @@ EOF
echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME}
if [ -n "$MENU_ENCODING" ]; then
append_menu "[encoding] {$MENU_ENCODING}"
fi
append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}"
case "$DEFAULT_BROWSERNAME" in
@ -1830,6 +1872,11 @@ append_submenu "${FBSETTINGSMENU}"
append "[exit] (${EXITITEM})"
append_menu_end
if [ -n "$MENU_ENCODING" ]; then
append_menu "[endencoding]"
fi
append_menu_end
# this function removes empty menu items. It can not yet remove nested