# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1435493696 -10800
# Node ID ec332cdcdbc1ad873ae20ad583d06a8ab693db6c
# Parent  9e6ab147f6a3c53f7f88ee4d441a4fee5b5f05d1
syslinux: change some locales in the menu; update locale-* package set according to syslinux menu, add kbd (console keyboard) layouts.

diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-ar/receipt
--- a/locale-ar/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-ar/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-ar"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
 SHORT_DESC="Arabic locale pack"
 MAINTAINER="al.bobylev@gmail.com"
@@ -9,7 +9,7 @@
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata"
 DEPENDS="glibc-base"
 
 LOCALE="ar"
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-cs/receipt
--- a/locale-cs/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-cs/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,20 +1,21 @@
 # SliTaz package receipt
 
 PACKAGE="locale-cs"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Czech locale pack."
+SHORT_DESC="Czech locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="cs"
 LOCALE_DEPENDS=""
-KB_FLAGS=""
+KBD="cz-lat2"
+KB_FLAGS="CZ:cz"
 GCONV="ISO8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-da/receipt
--- a/locale-da/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-da/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt
 
 PACKAGE="locale-da"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Danish locale pack."
+SHORT_DESC="Danish locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="da"
 LOCALE_DEPENDS=""
-KB_FLAGS=""
-GCONV="IBM865"
+KBD="dk-latin1"
+KB_FLAGS="DK:dk"
+GCONV="IBM865 ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-de/receipt
--- a/locale-de/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-de/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt
 
 PACKAGE="locale-de"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="German locale pack."
+SHORT_DESC="German locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="de"
 LOCALE_DEPENDS="fr_BE" # for de_BE
-KB_FLAGS=""
-GCONV=""
+KBD="de-latin1 de_CH-latin1 sg-latin1"
+KB_FLAGS="DE:de AT:at CH:ch"
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-el/receipt
--- a/locale-el/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-el/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -9,13 +9,14 @@
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="el"
 LOCALE_DEPENDS=""
+KBD="gr"
 KB_FLAGS="GR:gr US:us"
-GCONV="ISO8859-7 IBM869 CP1253"
+GCONV="ISO8859-7 IBM869 CP1253 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-en/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-en/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-en"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="English locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="en"
+LOCALE_DEPENDS=""
+KBD="uk us us-acentos dvorak dvorak-l dvorak-r"
+KB_FLAGS="CM:cm GH:gh NG:ng ZA:za GB:gb US:us"
+GCONV="ISO8859-1 ISO8859-15"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-es/receipt
--- a/locale-es/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-es/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt
 
 PACKAGE="locale-es"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Spanish locale pack."
+SHORT_DESC="Spanish locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="es"
 LOCALE_DEPENDS=""
-KB_FLAGS=""
-GCONV=""
+KBD="es"
+KB_FLAGS="ES:es ES:latam"
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-fi/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-fi/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-fi"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Finnish locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="fi"
+LOCALE_DEPENDS=""
+KBD="fi"
+KB_FLAGS="FI:fi"
+GCONV="ISO8859-1 ISO8859-15"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-fr/receipt
--- a/locale-fr/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-fr/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt
 
 PACKAGE="locale-fr"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="French locale pack."
+SHORT_DESC="French locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="fr"
 LOCALE_DEPENDS="en_CA de_CH" # for fr_CA and fr_CH
-KB_FLAGS=""
-GCONV=""
+KBD="fr-latin1 be-latin1 cf fr_CH-latin1"
+KB_FLAGS="FR:fr CA:ca CD:cd GN:gn"
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-hr/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-hr/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-hr"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Croatian locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="hr"
+LOCALE_DEPENDS=""
+KBD="croat"
+KB_FLAGS="HR:hr"
+GCONV="ISO8859-2"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-hu/receipt
--- a/locale-hu/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-hu/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,20 +1,21 @@
 # SliTaz package receipt
 
 PACKAGE="locale-hu"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Hungarian locale pack."
+SHORT_DESC="Hungarian locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="hu"
 LOCALE_DEPENDS=""
-KB_FLAGS=""
+KBD="hu"
+KB_FLAGS="HU:hu"
 GCONV="ISO8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-id/receipt
--- a/locale-id/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-id/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt
 
 PACKAGE="locale-id"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Indonesian locale pack."
+SHORT_DESC="Indonesian locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata"
 DEPENDS="glibc-base"
 
 LOCALE="id"
 LOCALE_DEPENDS=""
+KBD=""
 KB_FLAGS=""
-GCONV=""
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-is/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-is/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-is"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Icelandic locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="is"
+LOCALE_DEPENDS=""
+KBD="is-latin1"
+KB_FLAGS="IS:is"
+GCONV="ISO8859-1 ISO8859-15"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-it/receipt
--- a/locale-it/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-it/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt
 
 PACKAGE="locale-it"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Italian locale pack."
+SHORT_DESC="Italian locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="it"
 LOCALE_DEPENDS="de_CH" # for it_CH
-KB_FLAGS=""
-GCONV=""
+KBD="it"
+KB_FLAGS="IT:it"
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-ja/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-ja/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-ja"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Japanese locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="ja"
+LOCALE_DEPENDS="translit_cjk_variants"
+KBD="jp106"
+KB_FLAGS="JP:jp US:us"
+GCONV="EUC-JP EUC-JP-MS SJIS   libJIS"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-nb/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-nb/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-nb"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Norwegian locale pack (Bokmål)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="nb"
+LOCALE_DEPENDS=""
+KBD="no-latin1"
+KB_FLAGS="NO:no"
+GCONV="ISO8859-1 ISO8859-15"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-nl/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-nl/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-nl"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Dutch locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="nl"
+LOCALE_DEPENDS=""
+KBD="nl2"
+KB_FLAGS="NL:nl"
+GCONV="ISO8859-1 ISO8859-15"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-nn/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-nn/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-nn"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Norwegian locale pack (Nynorsk)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="nn"
+LOCALE_DEPENDS=""
+KBD="no-latin1"
+KB_FLAGS="NO:no"
+GCONV="ISO8859-1 ISO8859-15"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-pl/receipt
--- a/locale-pl/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-pl/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pl"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
 SHORT_DESC="Polish locale pack"
 MAINTAINER="al.bobylev@gmail.com"
@@ -9,12 +9,13 @@
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="pl"
 LOCALE_DEPENDS=""
-KB_FLAGS=""
+KBD="pl2"
+KB_FLAGS="PL:pl"
 GCONV="ISO8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-pt/receipt
--- a/locale-pt/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-pt/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,22 +1,23 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pt"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Portuguese locale pack."
+SHORT_DESC="Portuguese locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="pt"
 LOCALE_DEPENDS=""
 LOCALEDEF="pt_PT pt_PT@euro"
-KB_FLAGS=""
-GCONV=""
+KBD="pt-latin1"
+KB_FLAGS="PT:pt"
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-pt_BR/receipt
--- a/locale-pt_BR/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-pt_BR/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,9 +1,9 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pt_BR"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Portuguese/Brazilian locale pack."
+SHORT_DESC="Portuguese/Brazilian locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
@@ -14,8 +14,9 @@
 
 LOCALE="pt_BR"
 LOCALE_DEPENDS="pt_PT" # for pt_BR
-KB_FLAGS=""
-GCONV=""
+KBD="br-abnt2 us-acentos"
+KB_FLAGS="BR:br"
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -30,4 +31,3 @@
 {
 	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
-
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-ro/receipt
--- a/locale-ro/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-ro/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-ro"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
 SHORT_DESC="Romanian locale pack"
 MAINTAINER="al.bobylev@gmail.com"
@@ -9,11 +9,12 @@
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="ro"
 LOCALE_DEPENDS=""
+KBD="ro ro_std ro_win"
 KB_FLAGS="RO:ro"
 GCONV="IBM852 CP1250 ISO8859-2 ISO8859-16"
 
@@ -23,14 +24,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# Copy X11 Compose Rules
-	mkdir -p $fs/usr/share/X11/locale
-	cp -a $WOK/xorg-libX11/install/usr/share/X11/locale/iso8859-2 $fs/usr/share/X11/locale
-
-	# Copy Kbd definitions
-	mkdir -p $fs/usr/share/kbd/keymaps/i386/qwerty
-	cp -a $WOK/kbd/install/usr/share/kbd/keymaps/i386/qwerty/ro* $fs/usr/share/kbd/keymaps/i386/qwerty
 }
 
 # Back to C if it's the last used locale.
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-ru/receipt
--- a/locale-ru/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-ru/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,19 +1,20 @@
 # SliTaz package receipt
 
 PACKAGE="locale-ru"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Russian locale pack."
+SHORT_DESC="Russian locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="ru"
 LOCALE_DEPENDS=""
+KBD="ru"
 KB_FLAGS="US:us RU:ru UA:ua"
 GCONV="ISO8859-5 KOI8-R KOI8-U IBM866 CP1251"
 
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-sl/receipt
--- a/locale-sl/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-sl/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,20 +1,21 @@
 # SliTaz package receipt
 
 PACKAGE="locale-sl"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Slovenian locale pack."
+SHORT_DESC="Slovenian locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="sl"
 LOCALE_DEPENDS=""
-KB_FLAGS=""
+KBD="slovene"
+KB_FLAGS="SI:si"
 GCONV="ISO8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-sv/receipt
--- a/locale-sv/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-sv/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt
 
 PACKAGE="locale-sv"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Swedish locale pack."
+SHORT_DESC="Swedish locale pack"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
 DEPENDS="glibc-base"
 
 LOCALE="sv"
 LOCALE_DEPENDS="fi_FI fi_FI@euro" # for sv_FI and sv_FI@euro
-KB_FLAGS=""
-GCONV=""
+KBD="se-lat6"
+KB_FLAGS="SE:se"
+GCONV="ISO8859-1 ISO8859-15"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-tr/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-tr/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-tr"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Turkish locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="tr"
+LOCALE_DEPENDS=""
+KBD="trq tr_q-latin5"
+KB_FLAGS="TR:tr"
+GCONV="ISO8859-9"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-uk/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-uk/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt
+
+PACKAGE="locale-uk"
+VERSION="5.0"
+CATEGORY="system-tools"
+SHORT_DESC="Ukrainian locale pack"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+HOST_ARCH="i486 arm"
+
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata kbd"
+DEPENDS="glibc-base"
+
+LOCALE="uk"
+LOCALE_DEPENDS=""
+KBD="ua"
+KB_FLAGS="US:us RU:ru UA:ua"
+GCONV="ISO8859-5 KOI8-R KOI8-U IBM866 CP1251"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	get_locale
+}
+
+# Back to C if it's the last used locale.
+post_remove()
+{
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
+}
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-zh_CN/receipt
--- a/locale-zh_CN/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-zh_CN/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-zh_CN"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
 SHORT_DESC="Chinese Simplified locale pack."
 MAINTAINER="lufeng369@slitaz.org"
@@ -9,13 +9,14 @@
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata"
 DEPENDS="glibc-base wqy-microhei"
 
 LOCALE="zh_CN"
 LOCALE_DEPENDS="iso14651_t1_pinyin" # for zh_CN
-KB_FLAGS=""
-GCONV="EUC-CN libGB GBK"
+KBD=""
+KB_FLAGS="CN:cn"
+GCONV="EUC-CN GBK GB18030   libGB"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 locale-zh_TW/receipt
--- a/locale-zh_TW/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/locale-zh_TW/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-zh_TW"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="system-tools"
 SHORT_DESC="Chinese Traditional locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -9,13 +9,14 @@
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="i486 arm"
 
-WANTED="glibc slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11 flag-icons tzdata"
 DEPENDS="glibc-base pcf-uming"
 
 LOCALE="zh_TW"
 LOCALE_DEPENDS="zh_CN" # for zh_TW
-KB_FLAGS=""
-GCONV="BIG5"
+KBD=""
+KB_FLAGS="TW:tw"
+GCONV="BIG5 EUC-TW   libCNS"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 slitaz-i18n/receipt
--- a/slitaz-i18n/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/slitaz-i18n/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="slitaz-i18n"
-VERSION="4.2"
+VERSION="5.0"
 CATEGORY="meta"
 SHORT_DESC="SliTaz internationalization meta package to build locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -28,31 +28,29 @@
 {
 	mkdir -p $fs/usr/share/doc/slitaz
 	. $stuff/locale-pack.conf
-	for p in $CORE_PKGS
-	do
+	for p in $CORE_PKGS; do
 		if [ ! -d "$WOK/$p/install" ]; then
 			if [ -x /usr/bin/cook ]; then
 				cook $p
-			else
+			elif [ -x /usr/bin/tazwok ]; then
 				tazwok cook $p
 			fi
 		fi
 	done
 	# Cook all locale pack.
-	for i in $LOCALE_PACK
-	do
+	for i in $LOCALE_PACK; do
 		if [ -x /usr/bin/cook ]; then
 			cook locale-$i
 		elif [ -x /usr/bin/tazwok ]; then
 			tazwok cook locale-$i
 		fi
 	done
-	cat > $fs/usr/share/doc/slitaz/i18n.txt << EOT
+	cat > $fs/usr/share/doc/slitaz/i18n.txt <<EOT
 SliTaz i18n information
 ================================================================================
 
-This package provides the necessary functions and configs for the SliTaz locale 
-pack. SliTaz uses UTF-8 by default and tazlocale (from SliTaz tools) to 
+This package provides the necessary functions and configs for the SliTaz locale
+pack. SliTaz uses UTF-8 by default and tazlocale (from SliTaz tools) to
 configure the system language.
 
 
@@ -69,4 +67,3 @@
 ================================================================================
 EOT
 }
-
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 slitaz-i18n/stuff/locale-pack.conf
--- a/slitaz-i18n/stuff/locale-pack.conf	Sun Jun 28 14:56:44 2015 +0300
+++ b/slitaz-i18n/stuff/locale-pack.conf	Sun Jun 28 15:14:56 2015 +0300
@@ -11,4 +11,5 @@
 CORE_PKGS_ARM="acl attr dialog e2fsprogs jwm libgpg-error lynx nano"
 
 # List of all locale pack (locale-xx)
-LOCALE_PACK="ar cs da de el es fr hu id it pl pt pt_BR ro ru sl sv zh_CN zh_TW"
+LOCALE_PACK="ar cs da de el en es fi fr hr hu id is it ja nb nl nn pl pt pt_BR \
+ro ru sl sv tr uk zh_CN zh_TW"
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 slitaz-i18n/stuff/locale-pack.functions
--- a/slitaz-i18n/stuff/locale-pack.functions	Sun Jun 28 14:56:44 2015 +0300
+++ b/slitaz-i18n/stuff/locale-pack.functions	Sun Jun 28 15:14:56 2015 +0300
@@ -1,13 +1,13 @@
 get_locale()
 {
-	[ "x$CHARMAP" == x ] && CHARMAP=UTF-8
+	[ -z "$CHARMAP" ] && CHARMAP='UTF-8'
 
 	case "$SLITAZ_ARCH" in
 		arm*) ;;
 		i?86)
 			# Get translated Openbox menu from SliTaz sub project slitaz-configs
-			obmenu=$WOK/slitaz-configs/install/etc/xdg/openbox/menu.$LOCALE.xml
-			if [ -f $obmenu ]; then
+			obmenu="$WOK/slitaz-configs/install/etc/xdg/openbox/menu.$LOCALE.xml"
+			if [ -f "$obmenu" ]; then
 				mkdir -p $fs/etc/xdg/openbox
 				echo "* Found $LOCALE translations for: openbox menu"
 				cp $obmenu $fs/etc/xdg/openbox
@@ -21,8 +21,8 @@
 	esac
 	mkdir -p $fs/usr/share/locale/$LOCALE
 	for app in $CORE_PKGS; do
-		app_locale=$WOK/$app/install/usr/share/locale/$LOCALE
-		if [ -d $app_locale ]; then
+		app_locale="$WOK/$app/install/usr/share/locale/$LOCALE"
+		if [ -d "$app_locale" ]; then
 			echo "* Found $LOCALE translations for: $app"
 			cp -a $app_locale $fs/usr/share/locale
 		fi
@@ -31,27 +31,34 @@
 	# List of available locales
 	cd $WOK/glibc/install/usr/share/i18n/locales
 	locales=$(ls -1 | sed -n '/^'$LOCALE'$/p; /^'$LOCALE'_.*/p' | sed '/translit/d')
-	[ "x$LOCALEDEF" != x ] && locales=$LOCALEDEF
+	[ -n "$LOCALEDEF" ] && locales="$LOCALEDEF"
 
 	# Get X11 locale
 	for def in $locales; do
-		x11_locale=$WOK/xorg-libX11/install/usr/share/X11/locale/$def.$CHARMAP
-		if [ -d $x11_locale ]; then
-			echo "* Found $def.$CHARMAP locale for: X11"
-			mkdir -p $fs/usr/share/X11/locale
-			cp -a $x11_locale $fs/usr/share/X11/locale
-		fi
+		x11_locale="$WOK/xorg-libX11/install/usr/share/X11/locale/$def.$CHARMAP"
+		case "$def.$CHARMAP" in
+			en_US.UTF-8)
+				# belongs to "xorg-libX11" package, skip it
+				;;
+			*)
+				if [ -d "$x11_locale" ]; then
+					echo "* Found $def.$CHARMAP locale for: X11"
+					mkdir -p $fs/usr/share/X11/locale
+					cp -a $x11_locale $fs/usr/share/X11/locale
+				fi
+				;;
+		esac
 	done
 
 	# Get locale definition files
-	usil=usr/share/i18n/locales
+	usil='usr/share/i18n/locales'
 	for def in $locales; do
 		echo "* Copying $def locale files"
 		mkdir -p $fs/$usil
 		cp -a $WOK/glibc/install/$usil/$def $fs/$usil
 	done
 
-	if [ "x$LOCALE_DEPENDS" != x ]; then
+	if [ -n "$LOCALE_DEPENDS" ]; then
 		for dep in $LOCALE_DEPENDS; do
 			echo "* Copying additional $dep locale files"
 			cp -a $WOK/glibc/install/usr/share/i18n/locales/$dep \
@@ -59,6 +66,8 @@
 		done
 	fi
 
+	#grep -r 'include' $fs/usr/share/i18n/locales	# test includes in locales
+
 	# Get timezones from tzdata
 	countries=$(echo $locales | \
 		sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u)
@@ -82,7 +91,7 @@
 
 	# Get country flags
 	echo "* Copy flag icons for countries: "$countries
-	usih=usr/share/icons/hicolor
+	usih='usr/share/icons/hicolor'
 	for country in $countries; do
 		for size in 16x16 48x48; do
 			install -Dm644 \
@@ -91,22 +100,37 @@
 		done
 	done
 	# above icons credits
-	fusl=$fs/usr/share/licenses
+	fusl="$fs/usr/share/licenses"
 	mkdir -p $fusl
 	cp -a $WOK/flag-icons/source/*/LICENSE.txt $fusl/gosquared.txt
 
 	# Gconv modules for encodings other than default
-	if [ "x$GCONV" != x ]; then
+	if [ -n "$GCONV" ]; then
 		mkdir -p $fs/usr/lib/gconv
 		for enc in $GCONV; do
 			echo "* Copying $enc gconv module"
 			cp -a $WOK/glibc/install/usr/lib/gconv/$enc.so $fs/usr/lib/gconv
 		done
+		#ldd $fs/usr/lib/gconv/*	# test depends in gconv modules
+	fi
+
+	# Console keyboard layouts
+	if [ -n "$KBD" ]; then
+		uskki='usr/share/kbd/keymaps/i386'
+		cd $WOK/kbd/install
+		for map in $KBD; do
+			echo "* Copying $map kbd map"
+			mapfiles=$(find . -type f -name $map.map.gz)
+			for mapfile in $mapfiles; do
+				mkdir -p "$fs/$(dirname "${mapfile#./}")"
+				cp "$WOK/kbd/install/${mapfile#./}" "$fs/${mapfile#./}"
+			done
+		done
 	fi
 
 	# Keyboard flags for default lxpanel keyboard applet
-	if [ "x$KB_FLAGS" != x ]; then
-		uslix=usr/share/lxpanel/images/xkb-flags
+	if [ -n "$KB_FLAGS" ]; then
+		uslix='usr/share/lxpanel/images/xkb-flags'
 		mkdir -p $fs/$uslix
 		for i in $KB_FLAGS; do
 			install -Dm644 \
diff -r 9e6ab147f6a3 -r ec332cdcdbc1 syslinux/receipt
--- a/syslinux/receipt	Sun Jun 28 14:56:44 2015 +0300
+++ b/syslinux/receipt	Sun Jun 28 15:14:56 2015 +0300
@@ -76,8 +76,8 @@
 cz		cz-lat2		cs_CZ	Cesky
 dk		dk-latin1	da_DK	Dansk
 de		de-latin1	de_DE	Deutsch
-de_CH\ deCH	de_CH-latin1	de_DE	Deutsch Schweiz
-sg		sg-latin1	de_DE	Deutsch Schweiz (sg)
+de_CH\ deCH	de_CH-latin1	de_CH	Deutsch Schweiz
+sg		sg-latin1	de_CH	Deutsch Schweiz (sg)
 gr		gr		el_GR	Ellinika
 en		uk		en_GB	English UK
 us		us		en_US	English US
@@ -87,9 +87,9 @@
 us_dr\ usdr	dvorak-r	en_US	English US (dvorak-r)
 es		es		es_ES	Espanol
 fr		fr-latin1	fr_FR	Francais
-be		be-latin1	fr_FR	Francais Belgique
-ca		cf		fr_FR	Francais Canada
-fr_CH\ frCH	fr_CH-latin1	fr_FR	Francais Suisse
+be		be-latin1	fr_BE	Francais Belgique
+ca		cf		fr_CA	Francais Canada
+fr_CH\ frCH	fr_CH-latin1	fr_CH	Francais Suisse
 cr		hr,croat	hr_HR	Hrvatski
 is		is-latin1	is_IS	Islenska
 it		it		it_IT	Italiano
@@ -101,7 +101,7 @@
 po		pl2		pl_PL	Polski
 pt		pt-latin1	pt_PT	Portugues
 ru		ru		ru_RU	Russian
-sl		slovene		sl_SL	Slovenski
+sl		slovene		sl_SI	Slovenski
 fi		fi		fi_FI	Suomi
 se		se-lat6		sv_SE	Svenska
 tr		trq		tr_TR	Turkce