# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1375540668 -10800
# Node ID 874b0d62ff7e3020bf4ddcb6e74f3e867c697c76
# Parent  4434891fab1c85874c390e3ce0892979cb79aca9
slitaz-i18n: rewrite locale-pack.functions; slitaz-configs: now generate openbox desktop menu using po files; locale-*: update using new locale-pack.functions (FIXME: post_remove)

diff -r 4434891fab1c -r 874b0d62ff7e locale-cs/receipt
--- a/locale-cs/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-cs/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,39 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-cs"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Czech locale pack."
 MAINTAINER="pankso@slitaz.org"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="slitaz-i18n"
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
 
 LOCALE="cs"
-LOCALEDEF="cs_CZ"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	# Pregenerate locale file so we dont need glibc-locale as dep.
-	mkdir -p $fs/usr/lib/locale
-	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
-	rm -rf /usr/lib/locale/$LOCALEDEF
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-da/receipt
--- a/locale-da/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-da/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,38 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-da"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Danish locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="da"
-LOCALEDEF="da_DK"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	# Pregenerate locale file so we dont need glibc-locale as dep.
-	mkdir -p $fs/usr/lib/locale
-	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
-	rm -rf /usr/lib/locale/$LOCALEDEF
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-de/receipt
--- a/locale-de/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-de/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,34 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-de"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="German locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="de"
-LOCALEDEF="de_DE"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-el/receipt
--- a/locale-el/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-el/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,36 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-el"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Greek locale pack"
 MAINTAINER="al.bobylev@gmail.com"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
 
 LOCALE="el"
-LOCALEDEF="el_GR"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	get_x11_locale
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-es/receipt
--- a/locale-es/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-es/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,34 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-es"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Spanish locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="es"
-LOCALEDEF="es_ES"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-fr/receipt
--- a/locale-fr/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-fr/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,34 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-fr"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="French locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="fr"
-LOCALEDEF="fr_FR"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-hu/receipt
--- a/locale-hu/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-hu/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,38 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-hu"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Hungarian locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="hu"
-LOCALEDEF="hu_HU"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	# Pregenerate locale file so we dont need glibc-locale as dep.
-	mkdir -p $fs/usr/lib/locale
-	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
-	rm -rf /usr/lib/locale/$LOCALEDEF
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-id/receipt
--- a/locale-id/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-id/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,38 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-id"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Indonesian locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="id"
-LOCALEDEF="id_ID"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	# Pregenerate locale file so we dont need glibc-locale as dep.
-	mkdir -p $fs/usr/lib/locale
-	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
-	rm -rf /usr/lib/locale/$LOCALEDEF
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-it/receipt
--- a/locale-it/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-it/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,34 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-it"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Italian locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="it"
-LOCALEDEF="it_IT"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-pl/receipt
--- a/locale-pl/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-pl/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,36 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pl"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Polish locale pack"
 MAINTAINER="al.bobylev@gmail.com"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
 
 LOCALE="pl"
-LOCALEDEF="pl_PL"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	#get_x11_locale
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-pt/receipt
--- a/locale-pt/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-pt/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,34 +1,28 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pt"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Portuguese locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="pt"
-LOCALEDEF="pt_PT"
-CHARMAP="UTF-8"
+LOCALEDEF="pt_PT pt_PT@euro"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-pt_BR/receipt
--- a/locale-pt_BR/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-pt_BR/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,36 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-pt_BR"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Portuguese/Brazilian locale pack."
 MAINTAINER="pankso@slitaz.org"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
 
 LOCALE="pt_BR"
-LOCALEDEF="pt_BR"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	get_x11_locale
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-ru/receipt
--- a/locale-ru/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-ru/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,36 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-ru"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Russian locale pack."
 MAINTAINER="pankso@slitaz.org"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
 
 LOCALE="ru"
-LOCALEDEF="ru_RU"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	get_x11_locale
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-sl/receipt
--- a/locale-sl/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-sl/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,34 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-sl"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Slovenian locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="sl"
-LOCALEDEF="sl_SI"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-sv/receipt
--- a/locale-sv/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-sv/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,38 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-sv"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Swedish locale pack."
 MAINTAINER="pankso@slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
+
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base"
-BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
-WEB_SITE="http://www.slitaz.org/"
-WANTED="slitaz-i18n"
 
 LOCALE="sv"
-LOCALEDEF="sv_SE"
-CHARMAP="UTF-8"
 
 # 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
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	# Pregenerate locale file so we dont need glibc-locale as dep.
-	mkdir -p $fs/usr/lib/locale
-	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
-	rm -rf /usr/lib/locale/$LOCALEDEF
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-zh_CN/receipt
--- a/locale-zh_CN/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-zh_CN/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,50 +1,35 @@
 # SliTaz package receipt
 
 PACKAGE="locale-zh_CN"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Chinese Simplified locale pack."
 MAINTAINER="lufeng369@slitaz.org"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base wqy-microhei"
-BUILD_DEPENDS="glibc-locale xorg-libX11 slitaz-i18n"
 
 LOCALE="zh_CN"
-LOCALEDEF="zh_CN"
-CHARMAP="UTF-8"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
-# Genereted locale files are in /usr/lib/locale.
 genpkg_rules()
 {
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
-
-	mkdir -p $fs/usr/share/locale/$LOCALE $fs/usr/lib/locale
-	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF.UTF-8
+	get_locale
 
 	GCONV_MODULES="
-		BIG5.so             GBBIG5.so   GBGBK.so
-		UTF-32.so           GB18030.so	EUC-CN.so
-		GBK.so              UTF-7.so	libGB.so"
+		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 /usr/lib/gconv/$i $fs/usr/lib/gconv
+		cp $WOK/glibc/install/usr/lib/gconv/$i $fs/usr/lib/gconv
 	done
-	
-	install  -D /usr/share/zoneinfo/Asia/Shanghai \
-		$fs/usr/share/zoneinfo/Asia/Shanghai -m 644
-	install  -D /usr/share/zoneinfo/posix/Asia/Shanghai \
-		$fs/usr/share/posix/zoneinfo/Asia/Shanghai -m 644
-	install  -D /usr/share/zoneinfo/right/Asia/Shanghai \
-		$fs/usr/share/right/zoneinfo/Asia/Shanghai -m 644
-
-	get_x11_locale
 }
 
 post_install()
@@ -60,9 +45,5 @@
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if [ -z "$1" ]; then
-		if [ $(grep -q $LOCALEDEF /etc/locale.conf) ]; then
-			echo "LANG=C" > /etc/locale.conf
-		fi
-	fi
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e locale-zh_TW/receipt
--- a/locale-zh_TW/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/locale-zh_TW/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,41 +1,27 @@
 # SliTaz package receipt
 
 PACKAGE="locale-zh_TW"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Chinese Traditional locale pack."
 MAINTAINER="pankso@slitaz.org"
 WEB_SITE="http://www.slitaz.org/"
 
-WANTED="slitaz-i18n xorg-libX11"
+WANTED="glibc slitaz-i18n xorg-libX11"
 DEPENDS="glibc-base pcf-uming"
-BUILD_DEPENDS="glibc glibc-locale xorg-libX11"
 
 LOCALE="zh_TW"
-LOCALEDEF="zh_TW"
-CHARMAP="UTF-8"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
-# Genereted locale files are in /usr/lib/locale.
 genpkg_rules()
 {
 	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	. $WOK/slitaz-i18n/stuff/locale-pack.conf
-	mk_locale_dir
-	get_slitaz_messages
-	get_core_messages
-	get_x11_locale
-	# Pregenerate locale file so we dont need glibc-locale as dep.
-	mkdir -p $fs/usr/lib/locale
-	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
+	get_locale
 }
 
 # Back to C if it's the last used locale.
 post_remove()
 {
-	if grep -q $LOCALEDEF /etc/locale.conf; then
-		echo "LANG=C" > /etc/locale.conf
-		echo "LC_ALL=C" >> /etc/locale.conf
-	fi
-	rm -rf /usr/lib/locale/$LOCALEDEF
+	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
 }
diff -r 4434891fab1c -r 874b0d62ff7e slitaz-configs-base/receipt
--- a/slitaz-configs-base/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/slitaz-configs-base/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,32 +1,36 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-configs-base"
-VERSION="5.1.3"
+VERSION="5.1.6"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz config files for text based systems."
 MAINTAINER="pankso@slitaz.org"
+LICENSE="GPL"
+WEB_SITE="http://www.slitaz.org/"
 SOURCE="slitaz-configs"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.slitaz.org/"
 WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.gz"
 
 DEPENDS="tazlito tazpkg"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
-{	
+{
 	# Copy rootfs files from the stuff and set permissions.
-	mkdir -p $fs/etc $fs/boot $fs/usr/share
+	mkdir -p \
+		$fs/etc \
+		$fs/boot \
+		$fs/usr/share \
+		$fs/etc/skel/Music \
+		$fs/etc/skel/Documents
 	cp -a $src/rootfs/boot $fs
 	cp -a $src/rootfs/etc/skel $fs/etc
 	cp -a $src/rootfs/etc/X11 $fs/etc
-	mkdir -p \
-		$fs/etc/skel/Music \
-		$fs/etc/skel/Documents
-	for i in images pixmaps themes webhome
-	do
+
+	for i in images pixmaps themes webhome; do
 		cp -r $src/rootfs/usr/share/$i $fs/usr/share
 	done
+
 	cp -a $src/rootfs/root $fs
 	chown -R root.root $fs
 	chmod 0750 $fs/root
diff -r 4434891fab1c -r 874b0d62ff7e slitaz-configs/receipt
--- a/slitaz-configs/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/slitaz-configs/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-configs"
-VERSION="5.1.5"
+VERSION="5.1.6"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz config files and artwork."
 MAINTAINER="pankso@slitaz.org"
@@ -14,23 +14,30 @@
 DEPENDS="slitaz-configs-base xorg-libXcomposite xorg-libXdamage xorg-xcompmgr \
 transset-df ttf-dejavu slitaz-tools-boxes clearlooks slim"
 
+# Rules to configure and make the package.
+compile_rules()
+{
+	make DESTDIR=$DESTDIR menu
+	ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml
+}
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	# Copy rootfs files from the stuff and set permissions.
 	mkdir -p $fs/etc/xdg/openbox $fs/usr/share
-	for f in menu.en.xml menu.xml autostart environment rc.xml
-	do
-		cp -a $src/rootfs/etc/xdg/openbox/$f $fs/etc/xdg/openbox
-	done
+	cp -a $src/rootfs/etc/xdg/openbox $fs/etc/xdg
+
 	# /usr/share
 	for i in applications lxdm slim slitaz
 	do
 		cp -r $src/rootfs/usr/share/$i $fs/usr/share
 	done
+
 	cp -a $src/rootfs/usr/bin $fs/usr
 	cp -a $src/rootfs/etc/lxpanel $fs/etc
 	cp -a $src/rootfs/etc/slitaz $fs/etc
+
 	chown -R root.root $fs
 }
 
diff -r 4434891fab1c -r 874b0d62ff7e slitaz-i18n/receipt
--- a/slitaz-i18n/receipt	Fri Aug 02 15:13:41 2013 +0300
+++ b/slitaz-i18n/receipt	Sat Aug 03 17:37:48 2013 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt
 
 PACKAGE="slitaz-i18n"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="meta"
 SHORT_DESC="SliTaz internationalization meta package to build locale pack."
 MAINTAINER="pankso@slitaz.org"
@@ -9,10 +9,11 @@
 
 # Bdeps ensure packages are built so we can get generated po files.
 BUILD_DEPENDS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs \
-epdfview galculator gcc-lib-base gcolor2 gdk-pixbuf gettext-base glib glibc-base \
-gparted gtk+ isomaster kbd-base leafpad libwebkit lostirc lxappearance lxpanel \
+epdfview galculator gcc-lib-base gcolor2 gdk-pixbuf glib glibc-base \
+gparted gtk+ isomaster kbd leafpad libwebkit lostirc lxappearance lxpanel \
 lxrandr lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted \
-pcmanfm popt retawq sakura transmission viewnior yad"
+spacefm popt retawq sakura transmission viewnior yad lxsession lxsession-edit \
+lxinput"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 4434891fab1c -r 874b0d62ff7e slitaz-i18n/stuff/locale-pack.functions
--- a/slitaz-i18n/stuff/locale-pack.functions	Fri Aug 02 15:13:41 2013 +0300
+++ b/slitaz-i18n/stuff/locale-pack.functions	Sat Aug 03 17:37:48 2013 +0300
@@ -1,71 +1,61 @@
-#!/bin/sh
+get_locale()
+{
+	[ "x$CHARMAP" == x ] && CHARMAP=UTF-8
 
-# Standard directories having translated files.
-mk_locale_dir()
-{
-	mkdir -p \
-		$fs/usr/share/locale/$LOCALE \
-		$fs/etc/xdg/openbox
-}
-
-# Get translated files from SliTaz sub projects: configs & tools.
-get_slitaz_messages()
-{
-	configs=$WOK/slitaz-configs/source
-	openbox=$configs/slitaz-configs-*/rootfs/etc/xdg/openbox
-	#tools=$WOK/slitaz-tools/source
-
-	# Make tazwok compatible with this.
-	if [ ! -x /usr/bin/cook ]; then
-		[ -d $configs ] || tazwok get-src slitaz-configs --target=$configs
-		#[ -d $tools ] || tazwok get-src slitaz-tools --target=$tools
+	# 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
+		mkdir -p $fs/etc/xdg/openbox
+		echo "* Found $LOCALE translations for: openbox menu"
+		cp $obmenu $fs/etc/xdg/openbox
 	fi
 
-	[ ! -d $configs ] && echo "ERROR: missing source slitaz-configs" && exit 1
-	#[ ! -d $tools ] && echo "ERROR: missing source slitaz-tools" && exit 1
-
-	if [ -f $openbox/menu.${LOCALE}.xml ]; then
-		echo "* Found $LOCALE locale for: openbox menu"
-		cp $openbox/menu.${LOCALE}.xml $fs/etc/xdg/openbox
-	fi
-	
-	# Tools messages will be replace in time by POT files.
-	#
-	# NOTE: All po files are now include into slitaz-tools (easy for update)
-	#
-	#if [ -d $tools/slitaz-tools-*/messages/$LOCALE ]; then
-		#echo "* Found $LOCALE locale for: slitaz-tools"
-		#cp -a $tools/slitaz-tools-*/messages/$LOCALE \
-			#$fs/usr/share/slitaz/messages
-	#fi
-	
-	#if [ -d $tools/slitaz-tools-*/po/mo/$LOCALE ]; then
-		#for app in $(ls $tools/slitaz-tools-*/po/mo/$LOCALE)
-		#do
-			#echo "* Found $LOCALE locale for: ${app%.mo}"
-			#cp -a $tools/slitaz-tools-*/po/mo/$LOCALE/$app \
-				#$fs/usr/share/locale/$LOCALE
-		#done
-	#fi
-}
-
-# Get the core packages messages.
-get_core_messages()
-{
-	for i in $CORE_PKGS
-	do
-		if [ -d $WOK/$i/install/usr/share/locale/$LOCALE ]; then
-			echo "* Found $LOCALE locale for: $i"
-			cp -a $WOK/$i/install/usr/share/locale/$LOCALE \
-				$fs/usr/share/locale
+	# Get the core packages messages.
+	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
+			echo "* Found $LOCALE translations for: $app"
+			cp -a $app_locale $fs/usr/share/locale
 		fi
 	done
+
+	# 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
+
+	# 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
+	done
+
+	# Pregenerate locale file so we dont need glibc-locale as dep.
+	for def in $locales; do
+		echo "* Generate $def locale definition"
+		mkdir -p $fs/usr/lib/locale
+		localedef -i $def -c -f $CHARMAP $fs/usr/lib/locale/$def
+	done
+
+	# Get timezones
+	countries=$(echo $locales | \
+		sed 's|@[^ ]*||g; s|[^ _]*_||g' | tr ' ' '\n' | sort -u)
+	echo "* Copy timezone info for countries: "$countries
+	locations=''
+	for country in $countries; do
+		location=$(grep '^'$country \
+			$WOK/glibc/install/usr/share/zoneinfo/zone.tab | awk '{ print $3}')
+		locations="$locations $location"
+	done
+	for location in $locations; do
+		for tz in $location posix/$location right/$location; do
+			install -Dm644 /usr/share/zoneinfo/$tz \
+						$fs/usr/share/zoneinfo/$tz
+		done
+	done
 }
-
-# Get X11 locale
-get_x11_locale()
-{
-	mkdir -p $fs/usr/share/X11/locale
-	cp -a $WOK/xorg-libX11/install/usr/share/X11/locale/$LOCALEDEF.$CHARMAP \
-		$fs/usr/share/X11/locale
-}