# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1376051923 -10800
# Node ID b2311939ad7e80cc61f7aa284e1f82d7b41711f6
# Parent  c39c843d64e5de17784850ee3ef31ca12f806b26
libtaz.sh: add (and use) short gettext aliases: _ and _n

diff -r c39c843d64e5 -r b2311939ad7e Makefile
--- a/Makefile	Thu Jul 25 03:54:11 2013 +0300
+++ b/Makefile	Fri Aug 09 15:38:43 2013 +0300
@@ -17,7 +17,7 @@
 		--copyright-holder="SliTaz" -k -klgettext \
 		./rootfs/lib/libtaz.sh
 	xgettext -j -o po/$(PACKAGE).pot -L Shell --package-name="SliTaz Base" \
-		--copyright-holder="SliTaz" \
+		--copyright-holder="SliTaz" -k_ -k_n \
 		./rootfs/usr/lib/slitaz/libpkg.sh \
 		./rootfs/var/www/cgi-bin/cgi-env.sh \
 		./rootfs/var/www/cgi-bin/index.cgi \
diff -r c39c843d64e5 -r b2311939ad7e doc/libtaz.txt
--- a/doc/libtaz.txt	Thu Jul 25 03:54:11 2013 +0300
+++ b/doc/libtaz.txt	Fri Aug 09 15:38:43 2013 +0300
@@ -12,6 +12,8 @@
 	/lib/libtaz.sh since it is used when /usr may not be mounted.
 
 FUNCTIONS
+	_ string              Short name for "gettext string; echo"
+	_n string             Short name for "gettext string"
 	status                Return command status [Done|Failed]
 	separator             Display a line separator
 	newline               Echo a new line if gettext or echo -n is used
diff -r c39c843d64e5 -r b2311939ad7e po/el.po
--- a/po/el.po	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/el.po	Fri Aug 09 15:38:43 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
 "PO-Revision-Date: 2012-06-09 21:15+0200\n"
 "Last-Translator: Douros Dimitris <dourosdimitris@gmail.com>\n"
 "Language-Team: \n"
@@ -18,31 +18,31 @@
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr "Έγινε"
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr "Χρειάζονται δικαιώματα διαχειριστή (root) για να εκτελέσετε:"
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr ""
 
@@ -64,11 +64,11 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr "To $file δεν είναι tazpkg. Έξοδος"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr "Περιβάλλον CGI SHell"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
 msgid ""
 "Welcome to the SliTaz web server CGI Shell environment. Let the power of "
 "SHell script meet the web! Here you can check HTTP info and try some "
@@ -78,7 +78,7 @@
 "τη δύναμη του shell script να συναντήσει το διαδίκτυο! Εδώ μπορείτε να δείτε "
 "πληροφορίες για το HTTP και να δοκιμάστε κάποια αιτήματα."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
 msgid ""
 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
 "like syntax such as: $(GET var)"
@@ -86,41 +86,40 @@
 "Συμπεριλαμβάνοντας το /usr/lib/sliTaz/httphelper.sh στα script σας, σας "
 "επιτρέπει να χρησιμοποιήσετε σύνταξη σαν PHP, όπως: $(GET var)"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr "Δοκιμή QUERY_STRING:"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr "Πληροφορίες HTTP"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr "Βοηθός HTTP"
-
-#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr "Ευρετήριο του $QUERY_STRING"
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr "Λείπει ο περιηγητής Retawq..."
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr "Παρακαλώ εκτελέστε: su -c 'tazpkg get-install retawq'"
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr "<b>Χρήση:</b> man [τομέας] εντολή"
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr "στον τομέα $SECTION"
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr "Δεν υπάρχει καταχώρηση εγχειριδίου για το $TOPIC$MSG"
+
+#~ msgid "HTTP Helper"
+#~ msgstr "Βοηθός HTTP"
diff -r c39c843d64e5 -r b2311939ad7e po/es_AR.po
--- a/po/es_AR.po	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/es_AR.po	Fri Aug 09 15:38:43 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
 "PO-Revision-Date: 2013-03-19 20:55-0300\n"
 "Last-Translator: René Rivero <arca2@hotmail.com>\n"
 "Language-Team: Argentinian\n"
@@ -16,31 +16,31 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr "Hecho"
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr "Falló"
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr "Tiene que ser root para ejecutar:"
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr "y"
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr "Y"
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr "n"
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr "N"
 
@@ -62,11 +62,11 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr "El archivo no es un tazpkg. Salir"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr "Entorno CGI Shell"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
 msgid ""
 "Welcome to the SliTaz web server CGI Shell environment. Let the power of "
 "SHell script meet the web! Here you can check HTTP info and try some "
@@ -76,7 +76,7 @@
 "los script shell satisfaga la web! Aquí puede comprobar la información HTTP "
 "y probar algunas peticiones."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
 msgid ""
 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
 "like syntax such as: $(GET var)"
@@ -84,41 +84,40 @@
 "La inclusión de /usr/lib/slitaz/httphelper.sh en las secuencias de comandos "
 "le permite utilizar PHP-como la sintaxis: $(GET var)"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr "Prueba QUERY_STRING:"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr "Información HTTP"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr "Ayuda HTTP"
-
-#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr "Indice de $QUERY_STRING"
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr "Falta el navegador web Retawq"
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr "Por favor ejecute: su -c 'tazpkg get-install retawq'"
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr "<b>Use:</b> man [seccion] comando"
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr "en la sección $SECTION"
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr "No hay entrada manual para $TOPIC$MSG"
+
+#~ msgid "HTTP Helper"
+#~ msgstr "Ayuda HTTP"
diff -r c39c843d64e5 -r b2311939ad7e po/fr.po
--- a/po/fr.po	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/fr.po	Fri Aug 09 15:38:43 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
 "PO-Revision-Date: 2012-05-17 09:09+0100\n"
 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
 "Language-Team: French\n"
@@ -17,31 +17,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr "Fait"
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr "Echec"
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr "Vous devez être root pour exécuter:"
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr "o"
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr "O"
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr "n"
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr "N"
 
@@ -63,11 +63,11 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr "$file n'est pas un paquet tazpkg. Arrêt"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr "Environnement SHell CGI"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
 msgid ""
 "Welcome to the SliTaz web server CGI Shell environment. Let the power of "
 "SHell script meet the web! Here you can check HTTP info and try some "
@@ -77,7 +77,7 @@
 "script shell rencontrer le web! Ici, vous pouvez vérifier les info HTTP et "
 "essayer certaines demandes."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
 msgid ""
 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
 "like syntax such as: $(GET var)"
@@ -85,43 +85,42 @@
 "Vous devez inclure '/usr/lib/slitaz/httphelper.sh' dans vos scripts pour "
 "utiliser la synthaxe PHPcomme par exemple: $(GET var)"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr "Test de la chaine de caractères:"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr "Info HTTP"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr "Helper HTTP"
-
-#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr "Racine de $QUERY_STRING"
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr "Navigateur web Retawq manquant..."
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr ""
 "Vous pouvez l'installer en exécutant la commande: su -c 'tazpkg get-install "
 "retawq'"
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr "<b>Usage:</b> man [section] commande"
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr "dans cette section $SECTION"
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr "Pas de manuel disponible pour $TOPIC$MSG"
+
+#~ msgid "HTTP Helper"
+#~ msgstr "Helper HTTP"
diff -r c39c843d64e5 -r b2311939ad7e po/pl.po
--- a/po/pl.po	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/pl.po	Fri Aug 09 15:38:43 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
 "PO-Revision-Date: 2013-07-23 12:34+0100\n"
 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n"
 "Language-Team: \n"
@@ -15,36 +15,37 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr "Zakończono"
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr "Niepowodzenie"
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr "Musisz być administratorem (root) aby wykonać:"
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr "t"
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr "T"
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr "n"
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr "N"
 
@@ -66,56 +67,62 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr "$file nie jest plikiem tazpkg. Kończenie pracy"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17
-#: rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr "Środowisko CGI SHell"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
-msgid "Welcome to the SliTaz web server CGI Shell environment. Let the power of SHell script meet the web! Here you can check HTTP info and try some requests."
-msgstr "Witamy w środowisku CGI SHell serwera web SliTaz. Niech siła skryptów SHell pozna sieć ! Tu może sprawdzić informacje HTTP, i spróbować wykonać kilka zapytań."
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
+msgid ""
+"Welcome to the SliTaz web server CGI Shell environment. Let the power of "
+"SHell script meet the web! Here you can check HTTP info and try some "
+"requests."
+msgstr ""
+"Witamy w środowisku CGI SHell serwera web SliTaz. Niech siła skryptów SHell "
+"pozna sieć ! Tu może sprawdzić informacje HTTP, i spróbować wykonać kilka "
+"zapytań."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
-msgid "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-like syntax such as: $(GET var)"
-msgstr "Dołączanie /usr/lib/slitaz/httphelper.sh do twoich skryptów pozwoli używać składnie podobną do PHP, taką jak: $(GET var)"
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
+msgid ""
+"Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
+"like syntax such as: $(GET var)"
+msgstr ""
+"Dołączanie /usr/lib/slitaz/httphelper.sh do twoich skryptów pozwoli używać "
+"składnie podobną do PHP, taką jak: $(GET var)"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr "Test QUERY_STRING:"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr "HTTP Info"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr "HTTP Helper"
-
-#: rootfs/var/www/cgi-bin/index.cgi:15
-#: rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr "Indeks $QUERY_STRING"
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr "Brakuje przeglądarki internetowej Retawq..."
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr "Proszę uruchomić: su -c 'tazpkg get-install retawq'"
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr "<b>Użycie:</b> man [section] command"
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr "w sekcji $SECTION"
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr "Brak ręcznego wpisu dla $TOPIC$MSG"
 
+#~ msgid "HTTP Helper"
+#~ msgstr "HTTP Helper"
diff -r c39c843d64e5 -r b2311939ad7e po/pt_BR.po
--- a/po/pt_BR.po	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/pt_BR.po	Fri Aug 09 15:38:43 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
 "PO-Revision-Date: 2013-01-22 23:00-0300\n"
 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n"
 "Language-Team: Brazilian Portuguese <i18n@slitaz.org>\n"
@@ -17,31 +17,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr "Terminado"
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr "Falhou"
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr "Você deve ser usuário root para executar"
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr "y"
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr "Y"
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr "n"
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr "N"
 
@@ -63,11 +63,11 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr "$file não é um tazpkg. Abortando"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr "Ambiente SHell CGI"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
 msgid ""
 "Welcome to the SliTaz web server CGI Shell environment. Let the power of "
 "SHell script meet the web! Here you can check HTTP info and try some "
@@ -77,7 +77,7 @@
 "script SHell dominar a rede! Aqui você pode checar informações HTTP e tentar "
 "algumas requisições."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
 msgid ""
 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
 "like syntax such as: $(GET var)"
@@ -85,41 +85,40 @@
 "Incluindo o arquivo /usr/lib/slitaz/httphelper.sh em seus scripts permite a "
 "você utilizar sintaxe PHP como: $(GET var)"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr "Teste QUERY_STRING:"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr "Informação HTTP"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr "Auxiliar HTTP"
-
-#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr "Índice do $QUERY_STRING"
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr "Navegador Retawq não instalado..."
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr "Por favor execute: su -c 'tazpkg get-install retawq'"
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr "<b>Utilização:</b> man [seção] comando"
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr "Na seção $SECTION"
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr "Nenhuma entrada para $TOPIC$MSG"
+
+#~ msgid "HTTP Helper"
+#~ msgstr "Auxiliar HTTP"
diff -r c39c843d64e5 -r b2311939ad7e po/ru.po
--- a/po/ru.po	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/ru.po	Fri Aug 09 15:38:43 2013 +0300
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
-"PO-Revision-Date: 2012-06-03 14:06-0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
+"PO-Revision-Date: 2013-08-09 13:31+0300\n"
 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
 "Language-Team: \n"
 "Language: ru\n"
@@ -19,41 +19,41 @@
 "X-Poedit-Basepath: ../\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr "Готово"
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr "Ошибка"
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr "Вы должны обладать правами root для запуска:"
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr ""
 
 #: rootfs/usr/lib/slitaz/libpkg.sh:33
 msgid "Mirror is unreachable"
-msgstr "Зеркало недоступно"
+msgstr "Репозиторий недоступен"
 
 #: rootfs/usr/lib/slitaz/libpkg.sh:37
 msgid "Mirror is up-to-date"
-msgstr "Зеркало в актуальном состоянии"
+msgstr "Репозиторий в актуальном состоянии"
 
 #: rootfs/usr/lib/slitaz/libpkg.sh:46
 #, sh-format
@@ -65,11 +65,11 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr "Файл $file не является пакетом tazpkg. Выход"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr "Переменные окружения CGI"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
 msgid ""
 "Welcome to the SliTaz web server CGI Shell environment. Let the power of "
 "SHell script meet the web! Here you can check HTTP info and try some "
@@ -79,7 +79,7 @@
 "послужит вебу. Здесь вы можете проверить информацию HTTP и попробовать "
 "сделать некоторые запросы."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
 msgid ""
 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
 "like syntax such as: $(GET var)"
@@ -87,41 +87,40 @@
 "Включив /usr/lib/slitaz/httphelper.sh в ваши скрипты, вы сможете "
 "использовать PHP-подобный синтаксис: $(GET var)"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr "Тест QUERY_STRING:"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr "Информация HTTP"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr "Помощник HTTP"
-
-#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr "Содержимое папки $QUERY_STRING"
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr "Отсутствует браузер Retawq…"
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr "Для его установки выполните: su -c 'tazpkg get-install retawq'"
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr "<b>Использование:</b> man [раздел] команда"
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr "в разделе $SECTION"
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr "Руководство по $TOPIC$MSG отсутствует"
+
+#~ msgid "HTTP Helper"
+#~ msgstr "Помощник HTTP"
diff -r c39c843d64e5 -r b2311939ad7e po/slitaz-base.pot
--- a/po/slitaz-base.pot	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/slitaz-base.pot	Fri Aug 09 15:38:43 2013 +0300
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SliTaz Association
+# Copyright (C) YEAR SliTaz
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,31 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr ""
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr ""
 
@@ -63,58 +63,54 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr ""
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr ""
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
 msgid ""
 "Welcome to the SliTaz web server CGI Shell environment. Let the power of "
 "SHell script meet the web! Here you can check HTTP info and try some "
 "requests."
 msgstr ""
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
 msgid ""
 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
 "like syntax such as: $(GET var)"
 msgstr ""
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr ""
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr ""
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr ""
-
-#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr ""
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr ""
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr ""
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr ""
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr ""
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr ""
diff -r c39c843d64e5 -r b2311939ad7e po/sv.po
--- a/po/sv.po	Thu Jul 25 03:54:11 2013 +0300
+++ b/po/sv.po	Fri Aug 09 15:38:43 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 18:58+0000\n"
+"POT-Creation-Date: 2013-08-09 15:29+0300\n"
 "PO-Revision-Date: 2012-07-10 18:24-0000\n"
 "Last-Translator: Emil Eklund <emileklund123@gmail.com>\n"
 "Language-Team: Swedish\n"
@@ -17,31 +17,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: rootfs/lib/libtaz.sh:25
+#: rootfs/lib/libtaz.sh:23
 msgid "Done"
 msgstr "Klar"
 
-#: rootfs/lib/libtaz.sh:26
+#: rootfs/lib/libtaz.sh:24
 msgid "Failed"
 msgstr "Fel"
 
-#: rootfs/lib/libtaz.sh:155
+#: rootfs/lib/libtaz.sh:153
 msgid "You must be root to execute:"
 msgstr "Du måste vara root-användare för att utföra:"
 
-#: rootfs/lib/libtaz.sh:168
+#: rootfs/lib/libtaz.sh:166
 msgid "y"
 msgstr "j"
 
-#: rootfs/lib/libtaz.sh:169
+#: rootfs/lib/libtaz.sh:167
 msgid "Y"
 msgstr "J"
 
-#: rootfs/lib/libtaz.sh:170
+#: rootfs/lib/libtaz.sh:168
 msgid "n"
 msgstr "n"
 
-#: rootfs/lib/libtaz.sh:171
+#: rootfs/lib/libtaz.sh:169
 msgid "N"
 msgstr "N"
 
@@ -63,11 +63,11 @@
 msgid "$file is not a tazpkg. Exiting"
 msgstr "$file är inte en taxpkg. Avslutar."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:17 rootfs/var/www/cgi-bin/cgi-env.sh:24
+#: rootfs/var/www/cgi-bin/cgi-env.sh:12
 msgid "CGI SHell Environment"
 msgstr "CGI SHell Environment"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:30
+#: rootfs/var/www/cgi-bin/cgi-env.sh:31
 msgid ""
 "Welcome to the SliTaz web server CGI Shell environment. Let the power of "
 "SHell script meet the web! Here you can check HTTP info and try some "
@@ -76,7 +76,7 @@
 "Välkommen till Slitaz web server CGI Shell environment. Låt kraften av SHell "
 "skript möta webben! Här kan du kolla HTTP info och pröva några kommandon."
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:34
+#: rootfs/var/www/cgi-bin/cgi-env.sh:35
 msgid ""
 "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you use PHP-"
 "like syntax such as: $(GET var)"
@@ -84,41 +84,40 @@
 "Att inkludera /usr/lib/slitaz/httphelper.sh i dina skript tillåter dig att "
 "se PHP-aktiga syntax så som: $(GET var)"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:37
+#: rootfs/var/www/cgi-bin/cgi-env.sh:38
 msgid "QUERY_STRING test:"
 msgstr "QUERY_STRING test:"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:42
+#: rootfs/var/www/cgi-bin/cgi-env.sh:43
 msgid "HTTP Info"
 msgstr "HTTP info"
 
-#: rootfs/var/www/cgi-bin/cgi-env.sh:47
-msgid "HTTP Helper"
-msgstr "HTTP hjälpare"
-
-#: rootfs/var/www/cgi-bin/index.cgi:15 rootfs/var/www/cgi-bin/index.cgi:22
+#: rootfs/var/www/cgi-bin/index.cgi:12
 #, sh-format
 msgid "Index of $QUERY_STRING"
 msgstr "Början av $QUERY_STRING"
 
-#: rootfs/usr/bin/man:15
+#: rootfs/usr/bin/man:14
 msgid "Missing Retawq web browser..."
 msgstr "Saknar webbläsaren Retawq..."
 
-#: rootfs/usr/bin/man:16
+#: rootfs/usr/bin/man:15
 msgid "Please run: su -c 'tazpkg get-install retawq'"
 msgstr "Var god kör: su -c 'tazpkg get-install retawq'"
 
-#: rootfs/usr/bin/man:28
+#: rootfs/usr/bin/man:27
 msgid "<b>Usage:</b> man [section] command"
 msgstr "<b>Användning:</b> man [sektion] kommando"
 
-#: rootfs/usr/bin/man:39
+#: rootfs/usr/bin/man:38
 #, sh-format
 msgid "in section $SECTION"
 msgstr "i sektion $SECTION"
 
-#: rootfs/usr/bin/man:80
+#: rootfs/usr/bin/man:79
 #, sh-format
 msgid "No manual entry for $TOPIC$MSG"
 msgstr "Inget manualinlägg för $TOPIC$MSG"
+
+#~ msgid "HTTP Helper"
+#~ msgstr "HTTP hjälpare"
diff -r c39c843d64e5 -r b2311939ad7e rootfs/lib/libtaz.sh
--- a/rootfs/lib/libtaz.sh	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/lib/libtaz.sh	Fri Aug 09 15:38:43 2013 +0300
@@ -7,19 +7,17 @@
 #
 # Documentation: man libtaz or /usr/share/doc/slitaz/libtaz.txt
 #
-# Copyright (C) 2012 SliTaz GNU/Linux - BSD License
+# Copyright (C) 2012-2013 SliTaz GNU/Linux - BSD License
 #
 
-# Internationalization. We can't export TEXTDOMAIN because this script
-# includes to other scripts with other TEXTDOMAIN exported
 . /usr/bin/gettext.sh
 
-# xgettext (from Makefile) can't extract strings from above example:
-# gettext -d 'slitaz-base' 'Done'
-# so, I define own function (and add it as option to xgettext to Makefile)
-lgettext() {
-	gettext -d 'slitaz-base' "$@"
-}
+# short names for common i18n functions (like 'echo' and 'echo -n')
+_() { eval_gettext "$@"; echo; }
+_n() { eval_gettext "$@"; }
+
+# internal i18n
+lgettext() { gettext -d 'slitaz-base' "$@"; }
 
 # Internal variables.
 okmsg="$(lgettext 'Done')"
diff -r c39c843d64e5 -r b2311939ad7e rootfs/usr/bin/ldd
--- a/rootfs/usr/bin/ldd	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/usr/bin/ldd	Fri Aug 09 15:38:43 2013 +0300
@@ -8,11 +8,9 @@
 file="$@"
 for file do
 	case $file in
-  		*/*) :
-       		;;
-  		*) file=./$file
-     		;;
-  	esac
+		*/*) : ;;
+		*) file=./$file ;;
+	esac
 	echo "$file:" | sed 's%^./%%'
 	LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so "$file"
 	echo ""
diff -r c39c843d64e5 -r b2311939ad7e rootfs/usr/bin/man
--- a/rootfs/usr/bin/man	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/usr/bin/man	Fri Aug 09 15:38:43 2013 +0300
@@ -6,14 +6,13 @@
 . /lib/libtaz.sh
 
 # Internationalization.
-. /usr/bin/gettext.sh
 TEXTDOMAIN='slitaz-base'
 . /etc/locale.conf
 export TEXTDOMAIN LANG
 
 if [ ! -x /usr/bin/retawq ]; then
-	echo; gettext "Missing Retawq web browser..."; echo
-	gettext "Please run: su -c 'tazpkg get-install retawq'"; echo -e "\n"
+	echo; _ "Missing Retawq web browser..."
+	_ "Please run: su -c 'tazpkg get-install retawq'"
 	exit 0
 fi
 
@@ -25,7 +24,7 @@
 
 case "$1" in
 	''|-*)
-		emsg "$(gettext '<b>Usage:</b> man [section] command')"
+		emsg "$(_ '<b>Usage:</b> man [section] command')"
 		return ;;
 esac
 
@@ -36,7 +35,7 @@
 if [ -n "$2" ]; then
 	SECTION=$1
 	MAN_SECTION=$1
-	MSG=" $(eval_gettext 'in section $SECTION')"
+	MSG=" $(_n 'in section $SECTION')"
 	shift
 fi
 
@@ -77,7 +76,7 @@
 [ "x$SECTION" = "x" ] && SECTION="all"
 (wget -O - "http://mirror.slitaz.org/man/$SECTION/$TOPIC.html" || \
 	wget -O - "http://man.he.net/?topic=$TOPIC&section=$SECTION") 2> /dev/null | \
-	awk "BEGIN { s=0; n=0 } /<PRE>/ { s=1 } { if (s) { print; n++} } /<\/PRE>/ { s=0 } END { if (n == 0) print \"$(eval_gettext 'No manual entry for $TOPIC$MSG')\" }" | \
+	awk "BEGIN { s=0; n=0 } /<PRE>/ { s=1 } { if (s) { print; n++} } /<\/PRE>/ { s=0 } END { if (n == 0) print \"$(_ 'No manual entry for $TOPIC$MSG')\" }" | \
 	sed -e 's/<[^>]*>//g' -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' | less -M
 
 exit 0
diff -r c39c843d64e5 -r b2311939ad7e rootfs/usr/lib/slitaz/httphelper.sh
--- a/rootfs/usr/lib/slitaz/httphelper.sh	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/usr/lib/slitaz/httphelper.sh	Fri Aug 09 15:38:43 2013 +0300
@@ -9,7 +9,7 @@
 #
 # Documentation: man httphelper or /usr/share/doc/slitaz/httpelper.txt
 #
-# Copyright (C) SliTaz 2012 - GNU gpl v2
+# Copyright (C) SliTaz 2012 - GNU GPL v2
 #
 
 alias urlencode='busybox httpd -e'
diff -r c39c843d64e5 -r b2311939ad7e rootfs/usr/lib/slitaz/libpkg.sh
--- a/rootfs/usr/lib/slitaz/libpkg.sh	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/usr/lib/slitaz/libpkg.sh	Fri Aug 09 15:38:43 2013 +0300
@@ -30,11 +30,11 @@
 	if wget -qs ${mirror%/}/ID; then
 		wget -q ${mirror%/}/ID
 	else
-		gettext "Mirror is unreachable"; false
+		_n "Mirror is unreachable"; false
 		status && return 1
 	fi
 	if [ "$(cat ID)" == "$(cat ID.bak)" ]; then
-		gettext "Mirror is up-to-date"; true
+		_n "Mirror is up-to-date"; true
 		status && return 1
 	fi
 }
@@ -43,7 +43,7 @@
 source_receipt() {
 		local receipt=$1
 		if [ ! -f $receipt ]; then
-			indent 28 $(eval_gettext 'Missing receipt: $receipt')
+			indent 28 $(_ 'Missing receipt: $receipt')
 			continue
 		else
 			. $receipt
@@ -63,7 +63,7 @@
 check_valid_tazpkg() {
 	local file=$1
 	if ! is_valid_tazpkg $file; then
-		eval_gettext "\$file is not a tazpkg. Exiting"; newline
+		_ '$file is not a tazpkg. Exiting'
 		exit 1
 	fi
 }
diff -r c39c843d64e5 -r b2311939ad7e rootfs/usr/share/applications/httpd-cgi.desktop
--- a/rootfs/usr/share/applications/httpd-cgi.desktop	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/usr/share/applications/httpd-cgi.desktop	Fri Aug 09 15:38:43 2013 +0300
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=CGI SHell Environment
-Name[ru]=Переменные окружения CGI
 Name[pt]=Ambiente SHell CGI
 Name[pt_BR]=Ambiente SHell CGI
+Name[ru]=Переменные окружения CGI
 Exec=browser http://localhost/cgi-bin/cgi-env.sh
 Icon=text-x-script
-Type=Application
-Categories=Application;Development;
+Categories=Development;WebDevelopment;
diff -r c39c843d64e5 -r b2311939ad7e rootfs/var/www/cgi-bin/cgi-env.sh
--- a/rootfs/var/www/cgi-bin/cgi-env.sh	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/var/www/cgi-bin/cgi-env.sh	Fri Aug 09 15:38:43 2013 +0300
@@ -1,7 +1,7 @@
 #!/bin/sh
+. /lib/libtaz.sh
 
 # Internationalization.
-. /usr/bin/gettext.sh
 TEXTDOMAIN='slitaz-base'
 . /etc/locale.conf
 export TEXTDOMAIN LANG
@@ -9,45 +9,42 @@
 . /usr/lib/slitaz/httphelper.sh
 header
 
+title=$(_ "CGI SHell Environment")
 cat << EOT
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta charset="utf-8" />
-	<title>$(gettext "CGI SHell Environment")</title>
+	<title>$title</title>
 	<link rel="stylesheet" type="text/css" href="../style.css" />
 </head>
 <body>
 
 <!-- Header -->
 <div id="header">
-	<h1>$(gettext "CGI SHell Environment")</h1>
+	<h1>$title</h1>
 </div>
 
 <!-- Content -->
 <div id="content">
 
-<p>$(gettext "Welcome to the SliTaz web server CGI Shell environment. Let the \
+<p>$(_ "Welcome to the SliTaz web server CGI Shell environment. Let the \
 power of SHell script meet the web! Here you can check HTTP info and try some \
 requests.")</p>
 
-<p>$(gettext "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you \
+<p>$(_ "Including /usr/lib/slitaz/httphelper.sh in your scripts lets you \
 use PHP-like syntax such as: \$(GET var)")</p>
 
-<p>$(gettext "QUERY_STRING test:")
+<p>$(_ "QUERY_STRING test:")
 	<a href="$SCRIPT_NAME?var=value">$SCRIPT_NAME?var=value</a>
 </p>
 
 
-<h2>$(gettext "HTTP Info")</h2>
+<h2>$(_ "HTTP Info")</h2>
 
 <pre>$(httpinfo)</pre>
 
 
-<h2>$(gettext "HTTP Helper")</h2>
-
-<pre>$(httphelper)</pre>
-
 <!-- End content -->
 </div>
 
diff -r c39c843d64e5 -r b2311939ad7e rootfs/var/www/cgi-bin/index.cgi
--- a/rootfs/var/www/cgi-bin/index.cgi	Thu Jul 25 03:54:11 2013 +0300
+++ b/rootfs/var/www/cgi-bin/index.cgi	Fri Aug 09 15:38:43 2013 +0300
@@ -1,25 +1,29 @@
 #!/bin/sh
+. /lib/libtaz.sh
 
 # Internationalization.
-. /usr/bin/gettext.sh
 TEXTDOMAIN='slitaz-base'
 . /etc/locale.conf
 export TEXTDOMAIN LANG
 
-[ ! -d ..$QUERY_STRING ] && echo "HTTP/1.1 404 Not Found" || cat <<EOT
+if [ ! -d ..$QUERY_STRING ]; then
+	echo "HTTP/1.1 404 Not Found";
+else
+	title=$(_ 'Index of $QUERY_STRING')
+	cat << EOT
 Content-type: text/html
 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>$(eval_gettext "Index of \$QUERY_STRING")</title>
+	<title>$title</title>
 	<meta charset="utf-8" />
 	<link rel="stylesheet" type="text/css" href="/style.css" />
 </head>
 
 <!-- Header -->
 <div id="header">
-	<h1>$(eval_gettext "Index of \$QUERY_STRING")</h1>
+	<h1>$title</h1>
 </div>
 
 <!-- Content -->
@@ -39,3 +43,4 @@
 </body>
 </html>
 EOT
+fi