# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1399407544 -10800
# Node ID c667db027c32951202f89da0da52210299ad9852
# Parent  95bed3ed6d9b3eb328bb90828d74788bdffa0c94
slitaz-i18n: encodings are still used in translations and web pages, so add gconv modules to locale packages. Add: full set of locale-xx-extra. Up: all locale-xx, locale-xx-extra, slitaz-i18n, slitaz-i18n-extra (4.2). Up slitaz-tools, slitaz-tools-boxes (5.8.6)

diff -r 95bed3ed6d9b -r c667db027c32 locale-ar-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-ar-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-ar-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Arabic locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-ar"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="ar"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-ar/receipt
--- a/locale-ar/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-ar/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-ar"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Arabic locale pack"
 MAINTAINER="al.bobylev@gmail.com"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="ar"
-ADD_FLAGS="US"
-LXPANEL_FLAGS="us"
+LOCALE_DEPENDS=""
+KB_FLAGS="SA:ara US:us"
+GCONV="ISO-8859-6 IBM864 CP1256"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,10 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# use Saudi Arabia flag for Arabic keyboard layout
-	ln -s /usr/share/icons/hicolor/16x16/intl/SA.png \
-		$fs/usr/share/lxpanel/images/xkb-flags/ara.png
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 locale-cs-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-cs-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-cs-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Czech locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-cs"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="cs"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-cs/receipt
--- a/locale-cs/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-cs/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-cs"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Czech locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="cs"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS=""
+KB_FLAGS=""
+GCONV="ISO-8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-da-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-da-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-da-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Danish locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-da"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="da"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-da/receipt
--- a/locale-da/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-da/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-da"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Danish locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="da"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS=""
+KB_FLAGS=""
+GCONV="IBM865"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-de-extra/receipt
--- a/locale-de-extra/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-de-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-de-extra"
-VERSION="4.0"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="German extra locale pack."
 MAINTAINER="pankso@slitaz.org"
diff -r 95bed3ed6d9b -r c667db027c32 locale-de/receipt
--- a/locale-de/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-de/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-de"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="German locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="de"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS="fr_BE" # for de_BE
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,9 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# "de_BE" locale definition based on "fr_BE" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/fr_BE $fs/usr/share/i18n/locales
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 locale-el-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-el-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-el-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Greek locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-el"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="el"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-el/receipt
--- a/locale-el/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-el/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-el"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Greek locale pack"
 MAINTAINER="al.bobylev@gmail.com"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="el"
-ADD_FLAGS="US"
-LXPANEL_FLAGS="us gr"
+LOCALE_DEPENDS=""
+KB_FLAGS="GR:gr US:us"
+GCONV="ISO-8859-7 ISO869 CP1253"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-es-extra/receipt
--- a/locale-es-extra/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-es-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-es-extra"
-VERSION="4.0"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Spanish extra locale pack."
 MAINTAINER="pankso@slitaz.org"
diff -r 95bed3ed6d9b -r c667db027c32 locale-es/receipt
--- a/locale-es/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-es/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-es"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Spanish locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="es"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS=""
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,9 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# "es_US" locale definition based on "en_US" locale definition file
-	#cp -a $WOK/glibc/install/usr/share/i18n/locales/en_US $fs/usr/share/i18n/locales
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 locale-fr-extra/receipt
--- a/locale-fr-extra/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-fr-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-fr-extra"
-VERSION="4.0"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Extra French locale pack (with Gimp, Mplayer, Xine)"
 MAINTAINER="pankso@slitaz.org"
diff -r 95bed3ed6d9b -r c667db027c32 locale-fr/receipt
--- a/locale-fr/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-fr/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-fr"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="French locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="fr"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS="en_CA de_CH" # for fr_CA and fr_CH
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,11 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# "fr_CA" locale definition based on "en_CA" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/en_CA $fs/usr/share/i18n/locales
-	# "fr_CH" locale definition based on "de_CH" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/de_CH $fs/usr/share/i18n/locales
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 locale-hu-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-hu-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-hu-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Hungarian locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-hu"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="hu"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-hu/receipt
--- a/locale-hu/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-hu/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-hu"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Hungarian locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="hu"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS=""
+KB_FLAGS=""
+GCONV="ISO-8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-id-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-id-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-id-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Indonesian locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-id"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="id"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-id/receipt
--- a/locale-id/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-id/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-id"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Indonesian locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="id"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS=""
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-it-extra/receipt
--- a/locale-it-extra/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-it-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-it-extra"
-VERSION="4.0"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Italian extra locale pack."
 MAINTAINER="pankso@slitaz.org"
diff -r 95bed3ed6d9b -r c667db027c32 locale-it/receipt
--- a/locale-it/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-it/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-it"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Italian locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="it"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS="de_CH" # for it_CH
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,9 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# "it_CH" locale definition based on "de_CH" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/de_CH $fs/usr/share/i18n/locales
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 locale-pl-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-pl-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-pl-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Polish locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-pl"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="pl"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-pl/receipt
--- a/locale-pl/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-pl/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pl"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Polish locale pack"
 MAINTAINER="al.bobylev@gmail.com"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="pl"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS=""
+KB_FLAGS=""
+GCONV="ISO-8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-pt-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-pt-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-pt-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Portuguese locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-pt"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="pt"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-pt/receipt
--- a/locale-pt/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-pt/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pt"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Portuguese locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,9 +12,10 @@
 DEPENDS="glibc-base"
 
 LOCALE="pt"
+LOCALE_DEPENDS=""
 LOCALEDEF="pt_PT pt_PT@euro"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-pt_BR-extra/receipt
--- a/locale-pt_BR-extra/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-pt_BR-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pt_BR-extra"
-VERSION="4.0"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Portuguese/Brazilian extra locale pack."
 MAINTAINER="pankso@slitaz.org"
diff -r 95bed3ed6d9b -r c667db027c32 locale-pt_BR/receipt
--- a/locale-pt_BR/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-pt_BR/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pt_BR"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Portuguese/Brazilian locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="pt_BR"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS="pt_PT" # for pt_BR
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,9 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# "pt_BR" locale definition based on "pt_PT" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/pt_PT $fs/usr/share/i18n/locales
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 locale-ru-extra/receipt
--- a/locale-ru-extra/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-ru-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-ru-extra"
-VERSION="4.0"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Russian extra locale pack."
 MAINTAINER="al.bobylev@gmail.com"
diff -r 95bed3ed6d9b -r c667db027c32 locale-ru/receipt
--- a/locale-ru/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-ru/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-ru"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Russian locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="ru"
-ADD_FLAGS="US"
-LXPANEL_FLAGS="us ru ua"
+LOCALE_DEPENDS=""
+KB_FLAGS="US:us RU:ru UA:ua"
+GCONV="ISO-8859-5 KOI8-R KOI8-U IBM866 CP1251"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-sl-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-sl-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-sl-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Slovenian locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-sl"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="sl"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-sl/receipt
--- a/locale-sl/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-sl/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-sl"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Slovenian locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="sl"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS=""
+KB_FLAGS=""
+GCONV="ISO-8859-2 IBM852 CP1250"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 95bed3ed6d9b -r c667db027c32 locale-sv-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-sv-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-sv-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Swedish locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-sv"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="sv"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-sv/receipt
--- a/locale-sv/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-sv/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-sv"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Swedish locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base"
 
 LOCALE="sv"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS="fi_FI fi_FI@euro" # for sv_FI and sv_FI@euro
+KB_FLAGS=""
+GCONV=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,11 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# "sv_FI" locale definition based on "fi_FI" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/fi_FI $fs/usr/share/i18n/locales
-	# "sv_FI@euro" locale definition based on "fi_FI" and "fi_FI@euro" locale definition files
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/fi_FI@euro $fs/usr/share/i18n/locales
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 locale-zh_CN-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-zh_CN-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-zh_CN-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Chinese Simplified locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-zh_CN"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="zh_CN"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-zh_CN/receipt
--- a/locale-zh_CN/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-zh_CN/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-zh_CN"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Chinese Simplified locale pack."
 MAINTAINER="lufeng369@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base wqy-microhei"
 
 LOCALE="zh_CN"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS="iso14651_t1_pinyin" # for zh_CN
+KB_FLAGS=""
+GCONV="EUC-CN libGB GBK"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -22,20 +23,18 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
 
-	# "zh_CN" locale definition based on "iso14651_t1_pinyin" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/iso14651_t1_pinyin $fs/usr/share/i18n/locales
+	# do really zh_CN locale need this?
+	#GCONV_MODULES="
+	#	BIG5.so    GBBIG5.so   GBGBK.so
+	#	UTF-32.so  GB18030.so  EUC-CN.so
+	#	GBK.so     UTF-7.so    libGB.so"
+	#mkdir -p $fs/usr/bin
+	#mkdir -p $fs/usr/lib/gconv
 
-	GCONV_MODULES="
-		BIG5.so    GBBIG5.so   GBGBK.so
-		UTF-32.so  GB18030.so  EUC-CN.so
-		GBK.so     UTF-7.so    libGB.so"
-	mkdir -p $fs/usr/bin
-	mkdir -p $fs/usr/lib/gconv
-
-	cp /usr/bin/iconv $fs/usr/bin
-	for i in $GCONV_MODULES; do
-		cp $WOK/glibc/install/usr/lib/gconv/$i $fs/usr/lib/gconv
-	done
+	#cp /usr/bin/iconv $fs/usr/bin
+	#for i in $GCONV_MODULES; do
+	#	cp $WOK/glibc/install/usr/lib/gconv/$i $fs/usr/lib/gconv
+	#done
 }
 
 post_install()
diff -r 95bed3ed6d9b -r c667db027c32 locale-zh_TW-extra/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale-zh_TW-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt
+
+PACKAGE="locale-zh_TW-extra"
+VERSION="4.2"
+CATEGORY="system-tools"
+SHORT_DESC="Extra Chinese Traditional locale pack (with GIMP, MPlayer, Xine)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="http://www.slitaz.org/"
+DEPENDS="locale-zh_TW"
+BUILD_DEPENDS="slitaz-i18n-extra"
+WANTED="slitaz-i18n-extra"
+
+LOCALE="zh_TW"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n-extra/stuff/locale-pack.conf
+	mk_locale_dir
+	get_extra_messages
+}
diff -r 95bed3ed6d9b -r c667db027c32 locale-zh_TW/receipt
--- a/locale-zh_TW/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/locale-zh_TW/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="locale-zh_TW"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Chinese Traditional locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,9 @@
 DEPENDS="glibc-base pcf-uming"
 
 LOCALE="zh_TW"
-ADD_FLAGS=""
-LXPANEL_FLAGS=""
+LOCALE_DEPENDS="zh_CN" # for zh_TW
+KB_FLAGS=""
+GCONV="BIG5"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -21,9 +22,6 @@
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	get_locale
-
-	# "zh_TW" locale definition based on "zh_CN" locale definition file
-	cp -a $WOK/glibc/install/usr/share/i18n/locales/zh_CN $fs/usr/share/i18n/locales
 }
 
 # Back to C if it's the last used locale.
diff -r 95bed3ed6d9b -r c667db027c32 slitaz-i18n-extra/receipt
--- a/slitaz-i18n-extra/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/slitaz-i18n-extra/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="slitaz-i18n-extra"
-VERSION="4.0"
+VERSION="4.2"
 CATEGORY="meta"
 SHORT_DESC="SliTaz internationalization meta package to build extra locale pack."
 MAINTAINER="pankso@slitaz.org"
diff -r 95bed3ed6d9b -r c667db027c32 slitaz-i18n-extra/stuff/locale-pack.conf
--- a/slitaz-i18n-extra/stuff/locale-pack.conf	Mon May 05 22:37:15 2014 +0200
+++ b/slitaz-i18n-extra/stuff/locale-pack.conf	Tue May 06 23:19:04 2014 +0300
@@ -5,4 +5,4 @@
 inkscape"
 
 # List of all extra locale pack (locale-xx-extra)
-LOCALE_PACK="de es fr it pt_BR ru"
+LOCALE_PACK="ar cs da de el es fr hu id it pl pt pt_BR ru sl sv zh_CN zh_TW"
diff -r 95bed3ed6d9b -r c667db027c32 slitaz-i18n/receipt
--- a/slitaz-i18n/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/slitaz-i18n/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="slitaz-i18n"
-VERSION="4.1"
+VERSION="4.2"
 CATEGORY="meta"
 SHORT_DESC="SliTaz internationalization meta package to build locale pack."
 MAINTAINER="pankso@slitaz.org"
diff -r 95bed3ed6d9b -r c667db027c32 slitaz-i18n/stuff/locale-pack.functions
--- a/slitaz-i18n/stuff/locale-pack.functions	Mon May 05 22:37:15 2014 +0200
+++ b/slitaz-i18n/stuff/locale-pack.functions	Tue May 06 23:19:04 2014 +0300
@@ -43,6 +43,14 @@
 		cp -a $WOK/glibc/install/$usil/$def $fs/$usil
 	done
 
+	if [ "x$LOCALE_DEPENDS" != x ]; then
+		for dep in $LOCALE_DEPENDS; do
+			echo "* Copying additional $dep locale files"
+			cp -a $WOK/glibc/install/usr/share/i18n/locales/$dep \
+			$fs/usr/share/i18n/locales
+		done
+	fi
+
 	# Get timezones from tzdata
 	countries=$(echo $locales | \
 		sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u)
@@ -61,9 +69,9 @@
 	done
 
 	# Get country flags
-	echo "* Copy flag icons for countries: "$countries $ADD_FLAGS
+	echo "* Copy flag icons for countries: "$countries
 	usih=usr/share/icons/hicolor
-	for country in $countries $ADD_FLAGS; do
+	for country in $countries; do
 		for size in 16x16 48x48; do
 			install -Dm644 \
 				$WOK/flag-icons/taz/*/fs/$usih/$size/intl/$country.png \
@@ -75,14 +83,27 @@
 	mkdir -p $fusl
 	cp -a $WOK/flag-icons/source/*/LICENSE.txt $fusl/gosquared.txt
 
-	# Keyboard flags for default lxpanel keyboard applet
-	if [ "x$LXPANEL_FLAGS" != "x" ]; then
-		uslix=usr/share/lxpanel/images/xkb-flags
-		mkdir -p $fs/$uslix
-		for i in $LXPANEL_FLAGS; do
-			ln -s /$usih/16x16/intl/$(echo $i | tr a-z A-Z).png $fs/$uslix/$i.png
+	# Gconv modules for encodings other than default
+	if [ "x$GCONV" != x ]; 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
 	fi
 
+	# Keyboard flags for default lxpanel keyboard applet
+	if [ "x$KB_FLAGS" != x ]; then
+		uslix=usr/share/lxpanel/images/xkb-flags
+		mkdir -p $fs/$uslix
+		for i in $KB_FLAGS; do
+			install -Dm644 \
+				$WOK/flag-icons/taz/*/fs/$usih/16x16/intl/${i%%:*}.png \
+				$fs/$usih/16x16/intl/${i%%:*}.png
+			ln -s /$usih/16x16/intl/${i%%:*}.png $fs/$uslix/${i##*:}.png
+		done
+	fi
+
+	# exit code OK
 	echo
 }
diff -r 95bed3ed6d9b -r c667db027c32 slitaz-tools-boxes/receipt
--- a/slitaz-tools-boxes/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/slitaz-tools-boxes/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-tools-boxes"
-VERSION="5.8.5"
+VERSION="5.8.6"
 CATEGORY="system-tools"
 SHORT_DESC="All SliTaz GTK/Yad boxes to command line tools."
 MAINTAINER="pankso@slitaz.org"
@@ -20,6 +20,24 @@
 compile_rules()
 {
 	make && make DESTDIR=$DESTDIR install-boxes
+
+	# make zone-mini.tab for timezone selector
+	TAB=$WOK/tzdata/install/usr/share/zoneinfo/zone.tab
+	OUT=$install/usr/share/zoneinfo/zone-mini.tab
+	echo -n > $OUT
+	ZONES="$(cat $1 | sed '/#/ d' | cut -d'	' -f1,3 | sort -u)"
+	for COUNTRY in $(echo "$ZONES" | cut -d'	' -f1 | sort -u); do
+		echo -ne "$COUNTRY\t" >> $OUT
+		for LOC in $(echo "$ZONES" | sed -n "/$COUNTRY/ s|.*\t\(.*\)|\1|p"); do
+			echo -n "${LOC##*/} " >> $OUT
+		done
+		echo >> $OUT
+	done
+	sed -i 's| $||g' $OUT
+
+	# country names
+	cp -a $WOK/tzdata/install/usr/share/zoneinfo/iso3166.tab \
+		$install/usr/share/zoneinfo/
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -27,7 +45,7 @@
 {
 	mkdir -p $fs
 	cp -a $install/* $fs
-	# No cdrom on emb devices
+	# No CD-ROM on embedded devices
 	case "$ARCH" in
 		arm*) 
 			rm -f $fs/usr/bin/burn-box 
diff -r 95bed3ed6d9b -r c667db027c32 slitaz-tools/receipt
--- a/slitaz-tools/receipt	Mon May 05 22:37:15 2014 +0200
+++ b/slitaz-tools/receipt	Tue May 06 23:19:04 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-tools"
-VERSION="5.8.5"
+VERSION="5.8.6"
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz tools provide installer and utils usable on termnial."
 MAINTAINER="pankso@slitaz.org"