slitaz-tools rev 752

tazkeymap: list all keymaps, use libtaz.sh and improvments
author Christophe Lincoln <pankso@slitaz.org>
date Mon Apr 30 14:04:35 2012 +0200 (2012-04-30)
parents efed9a606ecc
children 494b03aad433
files po/slitaz-boxes/slitaz-boxes.pot po/slitaz-tools/es_AR.po po/slitaz-tools/fr.po po/slitaz-tools/pt_BR.po po/slitaz-tools/slitaz-tools.pot po/tazbox/tazbox.pot po/tazdrop/tazdrop.pot po/tazinst/tazinst.pot tazbox/tazbox tinyutils/tazkeymap tinyutils/tazlocale
line diff
     1.1 --- a/po/slitaz-boxes/slitaz-boxes.pot	Mon Apr 30 12:31:30 2012 +0200
     1.2 +++ b/po/slitaz-boxes/slitaz-boxes.pot	Mon Apr 30 14:04:35 2012 +0200
     1.3 @@ -8,7 +8,7 @@
     1.4  msgstr ""
     1.5  "Project-Id-Version: SliTaz Boxes\n"
     1.6  "Report-Msgid-Bugs-To: \n"
     1.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     1.8 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
     1.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    1.11  "Language-Team: LANGUAGE <LL@li.org>\n"
     2.1 --- a/po/slitaz-tools/es_AR.po	Mon Apr 30 12:31:30 2012 +0200
     2.2 +++ b/po/slitaz-tools/es_AR.po	Mon Apr 30 14:04:35 2012 +0200
     2.3 @@ -7,7 +7,7 @@
     2.4  msgstr ""
     2.5  "Project-Id-Version: SliTaz Tools\n"
     2.6  "Report-Msgid-Bugs-To: \n"
     2.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     2.8 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
     2.9  "PO-Revision-Date: 2011-08-11 00:08-0300\n"
    2.10  "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n"
    2.11  "Language-Team: LANGUAGE <LL@li.org>\n"
    2.12 @@ -17,7 +17,7 @@
    2.13  "Content-Transfer-Encoding: 8bit\n"
    2.14  
    2.15  #: tinyutils/tazlocale:83
    2.16 -msgid "Configuring system locale for:"
    2.17 +msgid "Setting system locale to:"
    2.18  msgstr ""
    2.19  
    2.20  #: tinyutils/tazlocale:97
    2.21 @@ -31,19 +31,19 @@
    2.22  "Por favor, cierre su sesión actual e iniciela nuevamente para usar un nuevo "
    2.23  "local."
    2.24  
    2.25 -#: tinyutils/tazkeymap:17
    2.26 -msgid "You must be root to run:"
    2.27 -msgstr "Debes ser root para correr:"
    2.28 +#: tinyutils/tazkeymap:49
    2.29 +msgid "Config file   :"
    2.30 +msgstr ""
    2.31  
    2.32 -#: tinyutils/tazkeymap:18
    2.33 -msgid "Type su and root password to become super-user"
    2.34 -msgstr "Escriba su y su contraseña root para ser super-usuario"
    2.35 +#: tinyutils/tazkeymap:50
    2.36 +msgid "Current keymap:"
    2.37 +msgstr ""
    2.38  
    2.39 -#: tinyutils/tazkeymap:53
    2.40 +#: tinyutils/tazkeymap:57
    2.41  msgid "SliTaz keymap configuration"
    2.42  msgstr "SliTaz configuración de teclas"
    2.43  
    2.44 -#: tinyutils/tazkeymap:94
    2.45 +#: tinyutils/tazkeymap:69
    2.46  msgid ""
    2.47  "Please logout of your current session and login again to use new keyboard."
    2.48  msgstr ""
    2.49 @@ -126,3 +126,9 @@
    2.50  #: tinyutils/decode:98
    2.51  msgid "No file:"
    2.52  msgstr ""
    2.53 +
    2.54 +#~ msgid "You must be root to run:"
    2.55 +#~ msgstr "Debes ser root para correr:"
    2.56 +
    2.57 +#~ msgid "Type su and root password to become super-user"
    2.58 +#~ msgstr "Escriba su y su contraseña root para ser super-usuario"
     3.1 --- a/po/slitaz-tools/fr.po	Mon Apr 30 12:31:30 2012 +0200
     3.2 +++ b/po/slitaz-tools/fr.po	Mon Apr 30 14:04:35 2012 +0200
     3.3 @@ -7,8 +7,8 @@
     3.4  msgstr ""
     3.5  "Project-Id-Version: SliTaz Tools\n"
     3.6  "Report-Msgid-Bugs-To: \n"
     3.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     3.8 -"PO-Revision-Date: 2012-04-30 12:02+0100\n"
     3.9 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
    3.10 +"PO-Revision-Date: 2012-04-30 14:03+0100\n"
    3.11  "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
    3.12  "Language-Team: French\n"
    3.13  "Language: fr\n"
    3.14 @@ -18,39 +18,32 @@
    3.15  "Plural-Forms: nplurals=2; plural=(n > 1);\n"
    3.16  
    3.17  #: tinyutils/tazlocale:83
    3.18 -msgid "Configuring system locale for:"
    3.19 -msgstr "Configuration de la langue du système:"
    3.20 +msgid "Setting system locale to:"
    3.21 +msgstr "Paramétrage de la langue du système:"
    3.22  
    3.23  #: tinyutils/tazlocale:97
    3.24  msgid "SliTaz language configuration"
    3.25  msgstr "Configuration de la langue"
    3.26  
    3.27  #: tinyutils/tazlocale:116
    3.28 -msgid ""
    3.29 -"Please logout of your current session and login again to use new locale."
    3.30 -msgstr ""
    3.31 -"Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle "
    3.32 -"locale."
    3.33 +msgid "Please logout of your current session and login again to use new locale."
    3.34 +msgstr "Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle locale."
    3.35  
    3.36 -#: tinyutils/tazkeymap:17
    3.37 -msgid "You must be root to run:"
    3.38 -msgstr "Vous devez être root pour lancer:"
    3.39 +#: tinyutils/tazkeymap:49
    3.40 +msgid "Config file   :"
    3.41 +msgstr "Fichier de config:"
    3.42  
    3.43 -#: tinyutils/tazkeymap:18
    3.44 -msgid "Type su and root password to become super-user"
    3.45 -msgstr ""
    3.46 -"Veuillez taper su et le mot de passe root pour devenir super-utilisateur"
    3.47 +#: tinyutils/tazkeymap:50
    3.48 +msgid "Current keymap:"
    3.49 +msgstr "Clavier actuel   :"
    3.50  
    3.51 -#: tinyutils/tazkeymap:53
    3.52 +#: tinyutils/tazkeymap:57
    3.53  msgid "SliTaz keymap configuration"
    3.54  msgstr "Configuration du clavier"
    3.55  
    3.56 -#: tinyutils/tazkeymap:94
    3.57 -msgid ""
    3.58 -"Please logout of your current session and login again to use new keyboard."
    3.59 -msgstr ""
    3.60 -"Veuillez vous déloguer et vous reloguer une fois pour utiliser le nouveau "
    3.61 -"clavier."
    3.62 +#: tinyutils/tazkeymap:69
    3.63 +msgid "Please logout of your current session and login again to use new keyboard."
    3.64 +msgstr "Veuillez vous déloguer et vous reloguer une fois pour utiliser le nouveau clavier."
    3.65  
    3.66  #: tinyutils/setmixer:12
    3.67  msgid "Setting default mixer volumes... "
    3.68 @@ -127,3 +120,10 @@
    3.69  #: tinyutils/decode:98
    3.70  msgid "No file:"
    3.71  msgstr "Pas de fichier:"
    3.72 +
    3.73 +#~ msgid "You must be root to run:"
    3.74 +#~ msgstr "Vous devez être root pour lancer:"
    3.75 +
    3.76 +#~ msgid "Type su and root password to become super-user"
    3.77 +#~ msgstr ""
    3.78 +#~ "Veuillez taper su et le mot de passe root pour devenir super-utilisateur"
     4.1 --- a/po/slitaz-tools/pt_BR.po	Mon Apr 30 12:31:30 2012 +0200
     4.2 +++ b/po/slitaz-tools/pt_BR.po	Mon Apr 30 14:04:35 2012 +0200
     4.3 @@ -8,7 +8,7 @@
     4.4  msgstr ""
     4.5  "Project-Id-Version: slitaz-tools\n"
     4.6  "Report-Msgid-Bugs-To: \n"
     4.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     4.8 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
     4.9  "PO-Revision-Date: 2011-06-18 16:37-0300\n"
    4.10  "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n"
    4.11  "Language-Team: Portuguese <i18n@slitaz.org>\n"
    4.12 @@ -19,7 +19,7 @@
    4.13  "Plural-Forms: nplurals=2; plural=(n > 1);\n"
    4.14  
    4.15  #: tinyutils/tazlocale:83
    4.16 -msgid "Configuring system locale for:"
    4.17 +msgid "Setting system locale to:"
    4.18  msgstr ""
    4.19  
    4.20  #: tinyutils/tazlocale:97
    4.21 @@ -32,19 +32,19 @@
    4.22  msgstr ""
    4.23  "Finalize a sessão atual e faça login novamente para usar a nova linguagem."
    4.24  
    4.25 -#: tinyutils/tazkeymap:17
    4.26 -msgid "You must be root to run:"
    4.27 -msgstr "Você deve ser root para executar:"
    4.28 +#: tinyutils/tazkeymap:49
    4.29 +msgid "Config file   :"
    4.30 +msgstr ""
    4.31  
    4.32 -#: tinyutils/tazkeymap:18
    4.33 -msgid "Type su and root password to become super-user"
    4.34 -msgstr "Digite su e a senha do root para tornar-se superusuário"
    4.35 +#: tinyutils/tazkeymap:50
    4.36 +msgid "Current keymap:"
    4.37 +msgstr ""
    4.38  
    4.39 -#: tinyutils/tazkeymap:53
    4.40 +#: tinyutils/tazkeymap:57
    4.41  msgid "SliTaz keymap configuration"
    4.42  msgstr "Configuraçao de Zona Horária do SliTaz"
    4.43  
    4.44 -#: tinyutils/tazkeymap:94
    4.45 +#: tinyutils/tazkeymap:69
    4.46  msgid ""
    4.47  "Please logout of your current session and login again to use new keyboard."
    4.48  msgstr ""
    4.49 @@ -126,3 +126,9 @@
    4.50  #: tinyutils/decode:98
    4.51  msgid "No file:"
    4.52  msgstr ""
    4.53 +
    4.54 +#~ msgid "You must be root to run:"
    4.55 +#~ msgstr "Você deve ser root para executar:"
    4.56 +
    4.57 +#~ msgid "Type su and root password to become super-user"
    4.58 +#~ msgstr "Digite su e a senha do root para tornar-se superusuário"
     5.1 --- a/po/slitaz-tools/slitaz-tools.pot	Mon Apr 30 12:31:30 2012 +0200
     5.2 +++ b/po/slitaz-tools/slitaz-tools.pot	Mon Apr 30 14:04:35 2012 +0200
     5.3 @@ -8,7 +8,7 @@
     5.4  msgstr ""
     5.5  "Project-Id-Version: SliTaz Tools\n"
     5.6  "Report-Msgid-Bugs-To: \n"
     5.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     5.8 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
     5.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    5.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    5.11  "Language-Team: LANGUAGE <LL@li.org>\n"
    5.12 @@ -18,7 +18,7 @@
    5.13  "Content-Transfer-Encoding: 8bit\n"
    5.14  
    5.15  #: tinyutils/tazlocale:83
    5.16 -msgid "Configuring system locale for:"
    5.17 +msgid "Setting system locale to:"
    5.18  msgstr ""
    5.19  
    5.20  #: tinyutils/tazlocale:97
    5.21 @@ -30,19 +30,19 @@
    5.22  "Please logout of your current session and login again to use new locale."
    5.23  msgstr ""
    5.24  
    5.25 -#: tinyutils/tazkeymap:17
    5.26 -msgid "You must be root to run:"
    5.27 +#: tinyutils/tazkeymap:49
    5.28 +msgid "Config file   :"
    5.29  msgstr ""
    5.30  
    5.31 -#: tinyutils/tazkeymap:18
    5.32 -msgid "Type su and root password to become super-user"
    5.33 +#: tinyutils/tazkeymap:50
    5.34 +msgid "Current keymap:"
    5.35  msgstr ""
    5.36  
    5.37 -#: tinyutils/tazkeymap:53
    5.38 +#: tinyutils/tazkeymap:57
    5.39  msgid "SliTaz keymap configuration"
    5.40  msgstr ""
    5.41  
    5.42 -#: tinyutils/tazkeymap:94
    5.43 +#: tinyutils/tazkeymap:69
    5.44  msgid ""
    5.45  "Please logout of your current session and login again to use new keyboard."
    5.46  msgstr ""
     6.1 --- a/po/tazbox/tazbox.pot	Mon Apr 30 12:31:30 2012 +0200
     6.2 +++ b/po/tazbox/tazbox.pot	Mon Apr 30 14:04:35 2012 +0200
     6.3 @@ -8,7 +8,7 @@
     6.4  msgstr ""
     6.5  "Project-Id-Version: TazBox\n"
     6.6  "Report-Msgid-Bugs-To: \n"
     6.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     6.8 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
     6.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    6.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    6.11  "Language-Team: LANGUAGE <LL@li.org>\n"
     7.1 --- a/po/tazdrop/tazdrop.pot	Mon Apr 30 12:31:30 2012 +0200
     7.2 +++ b/po/tazdrop/tazdrop.pot	Mon Apr 30 14:04:35 2012 +0200
     7.3 @@ -8,7 +8,7 @@
     7.4  msgstr ""
     7.5  "Project-Id-Version: TazDrop\n"
     7.6  "Report-Msgid-Bugs-To: \n"
     7.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     7.8 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
     7.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    7.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    7.11  "Language-Team: LANGUAGE <LL@li.org>\n"
     8.1 --- a/po/tazinst/tazinst.pot	Mon Apr 30 12:31:30 2012 +0200
     8.2 +++ b/po/tazinst/tazinst.pot	Mon Apr 30 14:04:35 2012 +0200
     8.3 @@ -8,7 +8,7 @@
     8.4  msgstr ""
     8.5  "Project-Id-Version: Tazinst\n"
     8.6  "Report-Msgid-Bugs-To: \n"
     8.7 -"POT-Creation-Date: 2012-04-30 12:30+0200\n"
     8.8 +"POT-Creation-Date: 2012-04-30 13:50+0200\n"
     8.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    8.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    8.11  "Language-Team: LANGUAGE <LL@li.org>\n"
     9.1 --- a/tazbox/tazbox	Mon Apr 30 12:31:30 2012 +0200
     9.2 +++ b/tazbox/tazbox	Mon Apr 30 14:04:35 2012 +0200
     9.3 @@ -160,7 +160,7 @@
     9.4  		*) continue ;;
     9.5  	esac
     9.6  	# System language configuration.
     9.7 -	[ "$locale" ] && tazlocale init $locale
     9.8 +	[ "$locale" ] && tazlocale $locale
     9.9  }
    9.10  
    9.11  # Keymap functions
    9.12 @@ -190,7 +190,7 @@
    9.13  		*) continue ;;
    9.14  	esac
    9.15  	# System keymap configuration
    9.16 -	[ "$keymap" ] && tazkeymap init $keymap
    9.17 +	[ "$keymap" ] && tazkeymap $keymap
    9.18  }
    9.19  
    9.20  # TZ functions
    10.1 --- a/tinyutils/tazkeymap	Mon Apr 30 12:31:30 2012 +0200
    10.2 +++ b/tinyutils/tazkeymap	Mon Apr 30 14:04:35 2012 +0200
    10.3 @@ -1,30 +1,32 @@
    10.4  #!/bin/sh
    10.5  #
    10.6  # Tazkeymap - SliTaz GNU/Linux keymap config using loadkeys and dialog boxes.
    10.7 -# Configuration file is : /etc/keymap.conf
    10.8 +# Configuration file is: /etc/keymap.conf
    10.9  #
   10.10 -# (C) SliTaz GNU/Linux - 2011 <pankso@slitaz.org> - GNU gpl.
   10.11 +# Copyright (C) 2008-2012 SliTaz GNU/Linux - BSD License
   10.12 +#
   10.13 +# Author: Christophe Lincoln <pankso@slitaz.org>
   10.14  #
   10.15  : ${DIALOG=dialog}
   10.16 +. /lib/libtaz.sh
   10.17 +check_root
   10.18  
   10.19  # Internationalization
   10.20  . /usr/bin/gettext.sh
   10.21  TEXTDOMAIN='slitaz-tools'
   10.22  export TEXTDOMAIN
   10.23  
   10.24 -# Check if user is root.
   10.25 -if test $(id -u) != 0; then
   10.26 -	gettext "You must be root to run:"; echo " $(basename $0)"
   10.27 -	gettext "Type su and root password to become super-user"; echo
   10.28 -	exit 1
   10.29 -fi
   10.30 -
   10.31 -# Get current keymap if it exists.
   10.32 -if [ -s /etc/keymap.conf ]; then
   10.33 -	CUR=`cat /etc/keymap.conf`
   10.34 -else
   10.35 -	CUR="none"
   10.36 -fi
   10.37 +# List all keymaps.
   10.38 +list_keymaps() {
   10.39 +	cd /usr/share/kbd/keymaps/i386
   10.40 +	# We first need a list to sort and then use \n for Yad list.
   10.41 +	for i in $(find *rty *rtz dvorak -name *.map.gz)
   10.42 +	do
   10.43 +		keymap=$(basename $i)
   10.44 +		type=$(dirname $i)
   10.45 +		echo "${keymap%.map.gz} $type"
   10.46 +	done
   10.47 +}
   10.48  
   10.49  # Load the selected kmap file from /usr/share/kbd/keymaps or Busybox kmaps.
   10.50  load_keymap() {
   10.51 @@ -35,54 +37,27 @@
   10.52  	fi
   10.53  }
   10.54  
   10.55 +# Config /etc/keymap.conf
   10.56 +system_config() {
   10.57 +	#gettext "Setting system keymap to:"; echo -n " $kmap"
   10.58 +	echo "$kmap" > /etc/keymap.conf
   10.59 +	#status
   10.60 +}
   10.61 +
   10.62  case "$1" in
   10.63 -	config)
   10.64 -		# Used to configure keymap from cmdline or scripts
   10.65 -		kmap=$2
   10.66 -		echo "$kmap" > /etc/keymap.conf
   10.67 -		load_keymap ;;
   10.68 -	init)
   10.69 -		# Used to configure keymap boot scripts, keymap us then loaded by
   10.70 -		# the script /etc/init.d/i18n.sh
   10.71 -		kmap=$2
   10.72 -		echo "$kmap" > /etc/keymap.conf ;;
   10.73 -	*)
   10.74 +	info)
   10.75 +		gettext "Config file   :"; echo " /etc/keymap.conf"
   10.76 +		gettext "Current keymap:"; echo " $(cat /etc/keymap.conf)" ;;
   10.77 +	list)
   10.78 +		list_keymaps | sort ;;
   10.79 +	"")
   10.80  		# Default to text mode dialog.
   10.81  		exec 3>&1
   10.82 -		value=`$DIALOG  --clear \
   10.83 +		value=$($DIALOG  --clear \
   10.84  		--title " $(gettext "SliTaz keymap configuration") " \
   10.85  		--menu "" 15 70 5 \
   10.86 -		"us"            "USA" \
   10.87 -		"fr_CH-latin1"  "Suisse Romande" \
   10.88 -		"fr-latin1"     "France" \
   10.89 -		"be-latin1"     "Belgique" \
   10.90 -		"br-abnt2"      "Brazil" \
   10.91 -		"cf"            "Canada/Quebec" \
   10.92 -		"croat"         "Croat" \
   10.93 -		"cz-lat2"       "Czech" \
   10.94 -		"de_CH-latin1"  "Schweizer Deutsch" \
   10.95 -		"de-latin1"     "Deutschland" \
   10.96 -		"dk-latin1"     "Danemark" \
   10.97 -		"dvorak"        "Dvorak" \
   10.98 -		"dvorak-r"      "Dvorak (right-hand)" \
   10.99 -		"dvorak-l"      "Dvorak (left-hand)" \
  10.100 -		"es"            "Spain/Mexico" \
  10.101 -		"fi-latin1"     "Finland" \
  10.102 -		"hu"            "Hungria" \
  10.103 -		"it"            "Italia" \
  10.104 -		"is-latin1"     "Island" \
  10.105 -		"jp106"         "Japan" \
  10.106 -		"nl2"           "Netherlands" \
  10.107 -		"no-latin1"     "Norway" \
  10.108 -		"pl2"           "Poland" \
  10.109 -		"pt-latin1"     "Portugal" \
  10.110 -		"ru"            "Russia" \
  10.111 -		"se-lat6"       "Sweden" \
  10.112 -		"sg-latin1"     "Singapore " \
  10.113 -		"trq"			"Turkey" \
  10.114 -		"uk"            "United Kingdom" \
  10.115 -		"us-acentos"    "USA Acentos" \
  10.116 -		2>&1 1>&3`
  10.117 +		$(list_keymaps | sort) \
  10.118 +		2>&1 1>&3)
  10.119  		retval=$?
  10.120  		exec 3>&-
  10.121  		case $retval in
  10.122 @@ -93,12 +68,15 @@
  10.123  		if [ -s /etc/keymap.conf ]; then
  10.124  			msg=$(gettext "\
  10.125  Please logout of your current session and login again to use new keyboard.")
  10.126 -			$DIALOG --clear \
  10.127 -				--title " Information " \
  10.128 -				--msgbox "$msg" 16 70
  10.129 +			$DIALOG --clear --title " Information " --msgbox "$msg" 16 70
  10.130  		fi
  10.131  		kmap=$value
  10.132 -		echo "$kmap" > /etc/keymap.conf
  10.133 +		system_config
  10.134 +		load_keymap ;;
  10.135 +	*)
  10.136 +		# Used to configure keymap from cmdline or scripts
  10.137 +		kmap=$1
  10.138 +		system_config
  10.139  		load_keymap ;;
  10.140  esac
  10.141  
    11.1 --- a/tinyutils/tazlocale	Mon Apr 30 12:31:30 2012 +0200
    11.2 +++ b/tinyutils/tazlocale	Mon Apr 30 14:04:35 2012 +0200
    11.3 @@ -1,7 +1,7 @@
    11.4  #!/bin/sh
    11.5  #
    11.6  # Tazlocale: SliTaz GNU/Linux locale setting using dialog boxes.
    11.7 -# Configuration file is : /etc/locale.conf
    11.8 +# Configuration file is: /etc/locale.conf
    11.9  #
   11.10  # Copyright (C) 2008-2012 SliTaz GNU/Linux - BSD License
   11.11  #
   11.12 @@ -21,7 +21,7 @@
   11.13  {
   11.14  	. /etc/locale.conf
   11.15  	LANGUAGE=${LANG%_*}
   11.16 -	[ "$LANG" = "C" ] && LANGUAGE="en"
   11.17 +	[ "$LANG" = "POSIX" ] && LANGUAGE="en"
   11.18  	# Openbox menu in /usr/share/doc/slitaz
   11.19  	if [ -f /etc/xdg/openbox/menu.$LANGUAGE.xml ]; then
   11.20  		cd /etc/xdg/openbox && rm -f menu.xml
   11.21 @@ -80,7 +80,7 @@
   11.22  # Config /etc/locale.conf
   11.23  system_config() {
   11.24  	export LC_ALL=$locale
   11.25 -	gettext "Configuring system locale for:"; echo -n " $locale"
   11.26 +	gettext "Setting system locale to:"; echo -n " $locale"
   11.27  	echo "LANG=$locale" > /etc/locale.conf
   11.28  	echo "LC_ALL=$locale" >> /etc/locale.conf
   11.29  	# Resource libtaz.sh to get status message in the correct locale.
   11.30 @@ -106,7 +106,7 @@
   11.31  		1|255) exit 0 ;;
   11.32  	esac
   11.33  
   11.34 -	# Default: C = English
   11.35 +	# Default: POSIX = English
   11.36  	[ "$locale" = "en" ] && locale="en_US"
   11.37  	[ -s /etc/locale.conf ] && RECONFIG="yes"
   11.38