# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1374107548 -10800
# Node ID 8e208c31ad8e3323b593230ea98f62667167d36e
# Parent  0791bb2b4e0b4dd860c17960ef915c0accb846d1
Make terminal wrapper "smarter" (currently only sakura and xterm supported), back params to passwd.desktop; improve tazapps and gpl3 dialogs.

diff -r 0791bb2b4e0b -r 8e208c31ad8e Makefile
--- a/Makefile	Wed Jul 17 09:52:54 2013 +0200
+++ b/Makefile	Thu Jul 18 03:32:28 2013 +0300
@@ -22,7 +22,7 @@
 	@xgettext -o po/slitaz-tools/slitaz-tools.pot -L Shell \
 		--package-name="SliTaz Tools" \
 		./tinyutils/tazlocale ./tinyutils/tazkeymap ./tinyutils/setmixer \
-		./tinyutils/tazx ./tinyutils/decode
+		./tinyutils/tazx ./tinyutils/decode ./tinyutils/terminal
 	@echo "done"
 
 boxes-pot:
@@ -113,27 +113,18 @@
 	chmod +x $(DESTDIR)/etc/init.d/*
 
 install-boxes:
-	#install -m 0755 -d $(DESTDIR)/etc/wireless
 	install -m 0755 -d $(DESTDIR)$(PREFIX)/bin
-	install -m 0755 -d $(DESTDIR)$(PREFIX)/lib/slitaz
 	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/locale
 	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/applications
 	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/pixmaps
-	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/doc/slitaz
 	install -m 0755 boxes/* $(DESTDIR)$(PREFIX)/bin
 	install -m 0755 tazbox/tazbox $(DESTDIR)$(PREFIX)/bin
 	install -m 0755 tinyutils/subox $(DESTDIR)$(PREFIX)/bin
 
-	# Libs
-	#install -m 0755 lib/*.* $(DESTDIR)$(PREFIX)/lib/slitaz
-
 	# Desktop files and icons.
 	install -m 0644 applications/* $(DESTDIR)$(PREFIX)/share/applications
 	install -m 0644 pixmaps/* $(DESTDIR)$(PREFIX)/share/pixmaps
 
-	# Documentation (style is already in slitaz-doc)
-#	cp -a doc/*.html $(DESTDIR)$(PREFIX)/share/doc/slitaz
-
 	# i18n.
 	for l in $(LINGUAS); \
 	do \
diff -r 0791bb2b4e0b -r 8e208c31ad8e applications/passwd.desktop
--- a/applications/passwd.desktop	Wed Jul 17 09:52:54 2013 +0200
+++ b/applications/passwd.desktop	Thu Jul 18 03:32:28 2013 +0300
@@ -5,6 +5,6 @@
 Name[pt]=Mudar Senha de Usuário
 Name[pt_BR]=Mudar Senha de Usuário
 Name[ru]=Пароль учетной записи
-Exec=terminal -e passwd
+Exec=terminal -h -T Passwd -geometry 60x10 -e passwd
 Icon=system-config-authentication
 Categories=ConsoleOnly;Settings;DesktopSettings;
diff -r 0791bb2b4e0b -r 8e208c31ad8e pixmaps/gpl3.png
Binary file pixmaps/gpl3.png has changed
diff -r 0791bb2b4e0b -r 8e208c31ad8e po/slitaz-tools/el.po
--- a/po/slitaz-tools/el.po	Wed Jul 17 09:52:54 2013 +0200
+++ b/po/slitaz-tools/el.po	Thu Jul 18 03:32:28 2013 +0300
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 20:20+0000\n"
+"POT-Creation-Date: 2013-07-17 18:32+0300\n"
 "PO-Revision-Date: 2012-12-18 22:06+0300\n"
 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n"
 "Language-Team: Kostis Mousafiris\n"
@@ -17,26 +17,26 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.5.2\n"
 
-#: tinyutils/tazlocale:82
+#: tinyutils/tazlocale:87
 msgid "Setting system locale to:"
 msgstr "Ρύθμιση του locale στο:"
 
-#: tinyutils/tazlocale:96
+#: tinyutils/tazlocale:101
 msgid "SliTaz language configuration"
 msgstr "Ρύθμιση γλώσσας του SliTaz"
 
-#: tinyutils/tazlocale:115
+#: tinyutils/tazlocale:120
 msgid ""
 "Please logout of your current session and login again to use new locale."
 msgstr ""
 "Παρακαλώ, αποσυνδεθείτε από την τρέχουσα συνεδρία σας και επανασυνδεθείτε, "
 "για να χρησιμοποιήσετε το νέο locale."
 
-#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47
+#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47
 msgid "Config file   :"
 msgstr "Αρχείο ρυθμίσεων   :"
 
-#: tinyutils/tazlocale:125
+#: tinyutils/tazlocale:130
 msgid "Current locale:"
 msgstr "Τρέχον locale:"
 
@@ -67,36 +67,36 @@
 msgid "You must be root to configure X server."
 msgstr "Πρέπει να είστε διαχειριστής συστήματος για να ρυθμίσετε τον X server."
 
-#: tinyutils/tazx:126
+#: tinyutils/tazx:131
 msgid "Install Xorg"
 msgstr "Εγκατάσταση του Xorg"
 
-#: tinyutils/tazx:128
+#: tinyutils/tazx:133
 msgid "Tazx helps you to select your X driver."
 msgstr "Ο Tazx σας βοηθά να επιλέξετε τον οδηγό (driver) για το Χ."
 
-#: tinyutils/tazx:163
+#: tinyutils/tazx:168
 msgid "Tazx dialog helps you to configure your Xorg server."
 msgstr ""
 "Το παράθυρο διαλόγου του Tazx σας βοηθά να ρυθμίσετε τον διακομιστή Xorg."
 
-#: tinyutils/tazx:164
+#: tinyutils/tazx:169
 msgid "Window Manager:"
 msgstr "Διαχειριστής παραθύρων:"
 
-#: tinyutils/tazx:165
+#: tinyutils/tazx:170
 msgid "X server:"
 msgstr "Διακομιστής Χ:"
 
-#: tinyutils/tazx:166
+#: tinyutils/tazx:171
 msgid "Install or reconfigure Xorg"
 msgstr "Εγκατάσταση ή επαναρύθμιση του X org"
 
-#: tinyutils/tazx:167
+#: tinyutils/tazx:172
 msgid "Install TinyX server Xfbdev"
 msgstr "Εγκατάσταση του TinyX server Xfbdev"
 
-#: tinyutils/tazx:168
+#: tinyutils/tazx:173
 msgid "Quit Tazx utility"
 msgstr "Κλείστε το βοηθητικό πρόγραμμα Tazx"
 
@@ -131,3 +131,42 @@
 #: tinyutils/decode:98
 msgid "No file:"
 msgstr "Κανένα αρχείο:"
+
+#: tinyutils/terminal:24
+msgid "configurable SliTaz wrapper for terminal."
+msgstr ""
+
+#: tinyutils/terminal:26
+msgid "Recognized options:"
+msgstr ""
+
+#: tinyutils/terminal:27
+msgid "Print the version number"
+msgstr ""
+
+#: tinyutils/terminal:28
+msgid "Print out this message"
+msgstr ""
+
+#: tinyutils/terminal:29
+#, sh-format
+msgid "Width and height of terminal window ($GEOMETRY)"
+msgstr ""
+
+#: tinyutils/terminal:30
+#, sh-format
+msgid "Title name for window (\"$TITLE\")"
+msgstr ""
+
+#: tinyutils/terminal:31
+msgid "Dont't close terminal after command finished"
+msgstr ""
+
+#: tinyutils/terminal:32
+msgid "Command to execute (must be last in line)"
+msgstr ""
+
+#: tinyutils/terminal:35
+#, sh-format
+msgid "Help for $TERMINAL:"
+msgstr ""
diff -r 0791bb2b4e0b -r 8e208c31ad8e po/slitaz-tools/es_AR.po
--- a/po/slitaz-tools/es_AR.po	Wed Jul 17 09:52:54 2013 +0200
+++ b/po/slitaz-tools/es_AR.po	Thu Jul 18 03:32:28 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-30 14:08+0200\n"
+"POT-Creation-Date: 2013-07-17 18:32+0300\n"
 "PO-Revision-Date: 2011-08-11 00:08-0300\n"
 "Last-Translator: Lucas Gioia <lucas.lucas.lucas24@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,26 +16,26 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tinyutils/tazlocale:82
+#: tinyutils/tazlocale:87
 msgid "Setting system locale to:"
 msgstr ""
 
-#: tinyutils/tazlocale:96
+#: tinyutils/tazlocale:101
 msgid "SliTaz language configuration"
 msgstr "SliTaz configuración del lenguaje"
 
-#: tinyutils/tazlocale:115
+#: tinyutils/tazlocale:120
 msgid ""
 "Please logout of your current session and login again to use new locale."
 msgstr ""
 "Por favor, cierre su sesión actual e iniciela nuevamente para usar un nuevo "
 "local."
 
-#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47
+#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47
 msgid "Config file   :"
 msgstr ""
 
-#: tinyutils/tazlocale:125
+#: tinyutils/tazlocale:130
 msgid "Current locale:"
 msgstr ""
 
@@ -66,36 +66,36 @@
 msgid "You must be root to configure X server."
 msgstr "Debes ser root para configurar el servidor X."
 
-#: tinyutils/tazx:126
+#: tinyutils/tazx:131
 msgid "Install Xorg"
 msgstr "Instalar Xorg"
 
-#: tinyutils/tazx:128
+#: tinyutils/tazx:133
 msgid "Tazx helps you to select your X driver."
 msgstr "Tazx le ayudará a seleccionar su controlador X."
 
-#: tinyutils/tazx:163
+#: tinyutils/tazx:168
 #, fuzzy
 msgid "Tazx dialog helps you to configure your Xorg server."
 msgstr "Los diálogos Tazx le ayudarán a configurar su servidor Xorg."
 
-#: tinyutils/tazx:164
+#: tinyutils/tazx:169
 msgid "Window Manager:"
 msgstr "Gestor de ventanas:"
 
-#: tinyutils/tazx:165
+#: tinyutils/tazx:170
 msgid "X server:"
 msgstr "Servidor X:"
 
-#: tinyutils/tazx:166
+#: tinyutils/tazx:171
 msgid "Install or reconfigure Xorg"
 msgstr "Instalar o reconfigurar Xorg"
 
-#: tinyutils/tazx:167
+#: tinyutils/tazx:172
 msgid "Install TinyX server Xfbdev"
 msgstr "Instalar TinyX servidor Xfbdev"
 
-#: tinyutils/tazx:168
+#: tinyutils/tazx:173
 msgid "Quit Tazx utility"
 msgstr "Salir de la utilidad Tazx"
 
@@ -131,6 +131,45 @@
 msgid "No file:"
 msgstr ""
 
+#: tinyutils/terminal:24
+msgid "configurable SliTaz wrapper for terminal."
+msgstr ""
+
+#: tinyutils/terminal:26
+msgid "Recognized options:"
+msgstr ""
+
+#: tinyutils/terminal:27
+msgid "Print the version number"
+msgstr ""
+
+#: tinyutils/terminal:28
+msgid "Print out this message"
+msgstr ""
+
+#: tinyutils/terminal:29
+#, sh-format
+msgid "Width and height of terminal window ($GEOMETRY)"
+msgstr ""
+
+#: tinyutils/terminal:30
+#, sh-format
+msgid "Title name for window (\"$TITLE\")"
+msgstr ""
+
+#: tinyutils/terminal:31
+msgid "Dont't close terminal after command finished"
+msgstr ""
+
+#: tinyutils/terminal:32
+msgid "Command to execute (must be last in line)"
+msgstr ""
+
+#: tinyutils/terminal:35
+#, sh-format
+msgid "Help for $TERMINAL:"
+msgstr ""
+
 #~ msgid "You must be root to run:"
 #~ msgstr "Debes ser root para correr:"
 
diff -r 0791bb2b4e0b -r 8e208c31ad8e po/slitaz-tools/fr.po
--- a/po/slitaz-tools/fr.po	Wed Jul 17 09:52:54 2013 +0200
+++ b/po/slitaz-tools/fr.po	Thu Jul 18 03:32:28 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-30 14:08+0200\n"
+"POT-Creation-Date: 2013-07-17 18:32+0300\n"
 "PO-Revision-Date: 2012-04-30 14:10+0100\n"
 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
 "Language-Team: French\n"
@@ -17,24 +17,26 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tinyutils/tazlocale:82
+#: tinyutils/tazlocale:87
 msgid "Setting system locale to:"
 msgstr "Paramétrage de la langue du système:"
 
-#: tinyutils/tazlocale:96
+#: tinyutils/tazlocale:101
 msgid "SliTaz language configuration"
 msgstr "Configuration de la langue"
 
-#: tinyutils/tazlocale:115
-msgid "Please logout of your current session and login again to use new locale."
-msgstr "Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle locale."
+#: tinyutils/tazlocale:120
+msgid ""
+"Please logout of your current session and login again to use new locale."
+msgstr ""
+"Veuillez vous déloguer et vous reloguer une fois pour utiliser la nouvelle "
+"locale."
 
-#: tinyutils/tazlocale:124
-#: tinyutils/tazkeymap:47
+#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47
 msgid "Config file   :"
 msgstr "Fichier de config:"
 
-#: tinyutils/tazlocale:125
+#: tinyutils/tazlocale:130
 msgid "Current locale:"
 msgstr "Locale actuelle  :"
 
@@ -47,8 +49,11 @@
 msgstr "Configuration du clavier"
 
 #: tinyutils/tazkeymap:69
-msgid "Please logout of your current session and login again to use new keyboard."
-msgstr "Veuillez vous déloguer et vous reloguer une fois pour utiliser le nouveau clavier."
+msgid ""
+"Please logout of your current session and login again to use new keyboard."
+msgstr ""
+"Veuillez vous déloguer et vous reloguer une fois pour utiliser le nouveau "
+"clavier."
 
 #: tinyutils/setmixer:12
 msgid "Setting default mixer volumes... "
@@ -62,35 +67,35 @@
 msgid "You must be root to configure X server."
 msgstr "Vous devez être root pour configurer le serveur X."
 
-#: tinyutils/tazx:126
+#: tinyutils/tazx:131
 msgid "Install Xorg"
 msgstr "Installer Xorg"
 
-#: tinyutils/tazx:128
+#: tinyutils/tazx:133
 msgid "Tazx helps you to select your X driver."
 msgstr "Tazx vous aide à séléctionner votre pilote Xorg."
 
-#: tinyutils/tazx:163
+#: tinyutils/tazx:168
 msgid "Tazx dialog helps you to configure your Xorg server."
 msgstr "Tazx vous aide à configurer votre serveur Xorg."
 
-#: tinyutils/tazx:164
+#: tinyutils/tazx:169
 msgid "Window Manager:"
 msgstr "Gestionnaire de fenêtres:"
 
-#: tinyutils/tazx:165
+#: tinyutils/tazx:170
 msgid "X server:"
 msgstr "Serveur X:"
 
-#: tinyutils/tazx:166
+#: tinyutils/tazx:171
 msgid "Install or reconfigure Xorg"
 msgstr "Installer ou reconfigurer Xorg"
 
-#: tinyutils/tazx:167
+#: tinyutils/tazx:172
 msgid "Install TinyX server Xfbdev"
 msgstr "Installer le serveur TinyX Xfbdev"
 
-#: tinyutils/tazx:168
+#: tinyutils/tazx:173
 msgid "Quit Tazx utility"
 msgstr "Quitter l'utilitaire Tazx"
 
@@ -126,6 +131,45 @@
 msgid "No file:"
 msgstr "Pas de fichier:"
 
+#: tinyutils/terminal:24
+msgid "configurable SliTaz wrapper for terminal."
+msgstr ""
+
+#: tinyutils/terminal:26
+msgid "Recognized options:"
+msgstr ""
+
+#: tinyutils/terminal:27
+msgid "Print the version number"
+msgstr ""
+
+#: tinyutils/terminal:28
+msgid "Print out this message"
+msgstr ""
+
+#: tinyutils/terminal:29
+#, sh-format
+msgid "Width and height of terminal window ($GEOMETRY)"
+msgstr ""
+
+#: tinyutils/terminal:30
+#, sh-format
+msgid "Title name for window (\"$TITLE\")"
+msgstr ""
+
+#: tinyutils/terminal:31
+msgid "Dont't close terminal after command finished"
+msgstr ""
+
+#: tinyutils/terminal:32
+msgid "Command to execute (must be last in line)"
+msgstr ""
+
+#: tinyutils/terminal:35
+#, sh-format
+msgid "Help for $TERMINAL:"
+msgstr ""
+
 #~ msgid "You must be root to run:"
 #~ msgstr "Vous devez être root pour lancer:"
 
diff -r 0791bb2b4e0b -r 8e208c31ad8e po/slitaz-tools/pt_BR.po
--- a/po/slitaz-tools/pt_BR.po	Wed Jul 17 09:52:54 2013 +0200
+++ b/po/slitaz-tools/pt_BR.po	Thu Jul 18 03:32:28 2013 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: slitaz-tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-30 14:08+0200\n"
+"POT-Creation-Date: 2013-07-17 18:32+0300\n"
 "PO-Revision-Date: 2013-01-26 01:40-0300\n"
 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n"
 "Language-Team: Portuguese <i18n@slitaz.org>\n"
@@ -17,25 +17,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tinyutils/tazlocale:82
+#: tinyutils/tazlocale:87
 msgid "Setting system locale to:"
 msgstr "Definido linguagem do sistema para:"
 
-#: tinyutils/tazlocale:96
+#: tinyutils/tazlocale:101
 msgid "SliTaz language configuration"
 msgstr "Configuração de Linguagem do SliTaz"
 
-#: tinyutils/tazlocale:115
+#: tinyutils/tazlocale:120
 msgid ""
 "Please logout of your current session and login again to use new locale."
 msgstr ""
 "Finalize a sessão atual e faça login novamente para usar a nova linguagem."
 
-#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47
+#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47
 msgid "Config file   :"
 msgstr "Arquivo de configuração:"
 
-#: tinyutils/tazlocale:125
+#: tinyutils/tazlocale:130
 msgid "Current locale:"
 msgstr "Linguagem atual:"
 
@@ -51,7 +51,8 @@
 msgid ""
 "Please logout of your current session and login again to use new keyboard."
 msgstr ""
-"Finalize a sessao atual e faça login novamente para usar o novo mapa de teclado."
+"Finalize a sessao atual e faça login novamente para usar o novo mapa de "
+"teclado."
 
 #: tinyutils/setmixer:12
 msgid "Setting default mixer volumes... "
@@ -65,35 +66,35 @@
 msgid "You must be root to configure X server."
 msgstr "Você deve ser root para configurar o servidor gráfico."
 
-#: tinyutils/tazx:126
+#: tinyutils/tazx:131
 msgid "Install Xorg"
 msgstr "Instalar Xorg"
 
-#: tinyutils/tazx:128
+#: tinyutils/tazx:133
 msgid "Tazx helps you to select your X driver."
 msgstr "O Tazx ajuda a selecionar o driver gráfico."
 
-#: tinyutils/tazx:163
+#: tinyutils/tazx:168
 msgid "Tazx dialog helps you to configure your Xorg server."
 msgstr "A caixa de diálogo do Tazx ajuda a configurar o servidor gráfico."
 
-#: tinyutils/tazx:164
+#: tinyutils/tazx:169
 msgid "Window Manager:"
 msgstr "Gerenciador de janelas:"
 
-#: tinyutils/tazx:165
+#: tinyutils/tazx:170
 msgid "X server:"
 msgstr "Servidor gráfico:"
 
-#: tinyutils/tazx:166
+#: tinyutils/tazx:171
 msgid "Install or reconfigure Xorg"
 msgstr "Instale ou reconfigure o Xorg"
 
-#: tinyutils/tazx:167
+#: tinyutils/tazx:172
 msgid "Install TinyX server Xfbdev"
 msgstr "Instale o servidor gráfico leve Xfbdev"
 
-#: tinyutils/tazx:168
+#: tinyutils/tazx:173
 msgid "Quit Tazx utility"
 msgstr "Sair do utilitário Tazx"
 
@@ -129,6 +130,45 @@
 msgid "No file:"
 msgstr "Nenhum arquivo:"
 
+#: tinyutils/terminal:24
+msgid "configurable SliTaz wrapper for terminal."
+msgstr ""
+
+#: tinyutils/terminal:26
+msgid "Recognized options:"
+msgstr ""
+
+#: tinyutils/terminal:27
+msgid "Print the version number"
+msgstr ""
+
+#: tinyutils/terminal:28
+msgid "Print out this message"
+msgstr ""
+
+#: tinyutils/terminal:29
+#, sh-format
+msgid "Width and height of terminal window ($GEOMETRY)"
+msgstr ""
+
+#: tinyutils/terminal:30
+#, sh-format
+msgid "Title name for window (\"$TITLE\")"
+msgstr ""
+
+#: tinyutils/terminal:31
+msgid "Dont't close terminal after command finished"
+msgstr ""
+
+#: tinyutils/terminal:32
+msgid "Command to execute (must be last in line)"
+msgstr ""
+
+#: tinyutils/terminal:35
+#, sh-format
+msgid "Help for $TERMINAL:"
+msgstr ""
+
 #~ msgid "You must be root to run:"
 #~ msgstr "Você deve ser root para executar:"
 
diff -r 0791bb2b4e0b -r 8e208c31ad8e po/slitaz-tools/ru.po
--- a/po/slitaz-tools/ru.po	Wed Jul 17 09:52:54 2013 +0200
+++ b/po/slitaz-tools/ru.po	Thu Jul 18 03:32:28 2013 +0300
@@ -1,41 +1,39 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Russian translations for SliTaz Tools.
+# Copyright (C) 2013 SliTaz
+# This file is distributed under the same license as the slitaz-tools package.
+# Aleksej Bobylev <al.bobylev@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: SliTaz Tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 20:20+0000\n"
-"PO-Revision-Date: 2012-07-15 15:24-0000\n"
+"POT-Creation-Date: 2013-07-17 18:32+0300\n"
+"PO-Revision-Date: 2013-07-17 18:38+0300\n"
 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Basepath: ../../\n"
-"X-Poedit-SearchPath-0: .\n"
 
-#: tinyutils/tazlocale:82
+#: tinyutils/tazlocale:87
 msgid "Setting system locale to:"
 msgstr "Установка системной локали:"
 
-#: tinyutils/tazlocale:96
+#: tinyutils/tazlocale:101
 msgid "SliTaz language configuration"
 msgstr "Параметры языка SliTaz"
 
-#: tinyutils/tazlocale:115
+#: tinyutils/tazlocale:120
 msgid "Please logout of your current session and login again to use new locale."
 msgstr "Выйдите из системы и войдите повторно, чтобы использовать новую локаль."
 
-#: tinyutils/tazlocale:124
+#: tinyutils/tazlocale:129
 #: tinyutils/tazkeymap:47
 msgid "Config file   :"
 msgstr "Файл настроек    :"
 
-#: tinyutils/tazlocale:125
+#: tinyutils/tazlocale:130
 msgid "Current locale:"
 msgstr "Текущая локаль   :"
 
@@ -63,35 +61,35 @@
 msgid "You must be root to configure X server."
 msgstr "Вы должны быть администратором для настройки X-сервера."
 
-#: tinyutils/tazx:126
+#: tinyutils/tazx:131
 msgid "Install Xorg"
 msgstr "Установка Xorg"
 
-#: tinyutils/tazx:128
+#: tinyutils/tazx:133
 msgid "Tazx helps you to select your X driver."
 msgstr "Tazx поможет вам выбрать драйвер для X."
 
-#: tinyutils/tazx:163
+#: tinyutils/tazx:168
 msgid "Tazx dialog helps you to configure your Xorg server."
 msgstr "Диалог Tazx поможет вам настроить сервер Xorg."
 
-#: tinyutils/tazx:164
+#: tinyutils/tazx:169
 msgid "Window Manager:"
 msgstr "Менеджер окон:"
 
-#: tinyutils/tazx:165
+#: tinyutils/tazx:170
 msgid "X server:"
 msgstr "X-сервер:"
 
-#: tinyutils/tazx:166
+#: tinyutils/tazx:171
 msgid "Install or reconfigure Xorg"
 msgstr "Установить или перенастроить Xorg"
 
-#: tinyutils/tazx:167
+#: tinyutils/tazx:172
 msgid "Install TinyX server Xfbdev"
 msgstr "Установить сервер TinyX: Xfbdev"
 
-#: tinyutils/tazx:168
+#: tinyutils/tazx:173
 msgid "Quit Tazx utility"
 msgstr "Выйти из утилиты Tazx"
 
@@ -127,6 +125,45 @@
 msgid "No file:"
 msgstr "Нет файла:"
 
+#: tinyutils/terminal:24
+msgid "configurable SliTaz wrapper for terminal."
+msgstr "настраиваемая обёртка SliTaz для терминала."
+
+#: tinyutils/terminal:26
+msgid "Recognized options:"
+msgstr "Поддерживаемые параметры:"
+
+#: tinyutils/terminal:27
+msgid "Print the version number"
+msgstr "Информация о версии"
+
+#: tinyutils/terminal:28
+msgid "Print out this message"
+msgstr "Вывести эту справку"
+
+#: tinyutils/terminal:29
+#, sh-format
+msgid "Width and height of terminal window ($GEOMETRY)"
+msgstr "Ширина и высота окна терминала ($GEOMETRY)"
+
+#: tinyutils/terminal:30
+#, sh-format
+msgid "Title name for window (\"$TITLE\")"
+msgstr "Заголовок окна (\"$TITLE\")"
+
+#: tinyutils/terminal:31
+msgid "Dont't close terminal after command finished"
+msgstr "Не закрывать терминал после завершения команды"
+
+#: tinyutils/terminal:32
+msgid "Command to execute (must be last in line)"
+msgstr "Выполнить команду (должна быть последней в строке)"
+
+#: tinyutils/terminal:35
+#, sh-format
+msgid "Help for $TERMINAL:"
+msgstr "Справка программы $TERMINAL:"
+
 #~ msgid "You must be root to run:"
 #~ msgstr "Вы должны быть администратором, чтобы запустить:"
 
diff -r 0791bb2b4e0b -r 8e208c31ad8e po/slitaz-tools/slitaz-tools.pot
--- a/po/slitaz-tools/slitaz-tools.pot	Wed Jul 17 09:52:54 2013 +0200
+++ b/po/slitaz-tools/slitaz-tools.pot	Thu Jul 18 03:32:28 2013 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: SliTaz Tools\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-01 20:20+0000\n"
+"POT-Creation-Date: 2013-07-17 18:32+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,24 +17,24 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tinyutils/tazlocale:82
+#: tinyutils/tazlocale:87
 msgid "Setting system locale to:"
 msgstr ""
 
-#: tinyutils/tazlocale:96
+#: tinyutils/tazlocale:101
 msgid "SliTaz language configuration"
 msgstr ""
 
-#: tinyutils/tazlocale:115
+#: tinyutils/tazlocale:120
 msgid ""
 "Please logout of your current session and login again to use new locale."
 msgstr ""
 
-#: tinyutils/tazlocale:124 tinyutils/tazkeymap:47
+#: tinyutils/tazlocale:129 tinyutils/tazkeymap:47
 msgid "Config file   :"
 msgstr ""
 
-#: tinyutils/tazlocale:125
+#: tinyutils/tazlocale:130
 msgid "Current locale:"
 msgstr ""
 
@@ -63,35 +63,35 @@
 msgid "You must be root to configure X server."
 msgstr ""
 
-#: tinyutils/tazx:126
+#: tinyutils/tazx:131
 msgid "Install Xorg"
 msgstr ""
 
-#: tinyutils/tazx:128
+#: tinyutils/tazx:133
 msgid "Tazx helps you to select your X driver."
 msgstr ""
 
-#: tinyutils/tazx:163
+#: tinyutils/tazx:168
 msgid "Tazx dialog helps you to configure your Xorg server."
 msgstr ""
 
-#: tinyutils/tazx:164
+#: tinyutils/tazx:169
 msgid "Window Manager:"
 msgstr ""
 
-#: tinyutils/tazx:165
+#: tinyutils/tazx:170
 msgid "X server:"
 msgstr ""
 
-#: tinyutils/tazx:166
+#: tinyutils/tazx:171
 msgid "Install or reconfigure Xorg"
 msgstr ""
 
-#: tinyutils/tazx:167
+#: tinyutils/tazx:172
 msgid "Install TinyX server Xfbdev"
 msgstr ""
 
-#: tinyutils/tazx:168
+#: tinyutils/tazx:173
 msgid "Quit Tazx utility"
 msgstr ""
 
@@ -126,3 +126,42 @@
 #: tinyutils/decode:98
 msgid "No file:"
 msgstr ""
+
+#: tinyutils/terminal:24
+msgid "configurable SliTaz wrapper for terminal."
+msgstr ""
+
+#: tinyutils/terminal:26
+msgid "Recognized options:"
+msgstr ""
+
+#: tinyutils/terminal:27
+msgid "Print the version number"
+msgstr ""
+
+#: tinyutils/terminal:28
+msgid "Print out this message"
+msgstr ""
+
+#: tinyutils/terminal:29
+#, sh-format
+msgid "Width and height of terminal window ($GEOMETRY)"
+msgstr ""
+
+#: tinyutils/terminal:30
+#, sh-format
+msgid "Title name for window (\"$TITLE\")"
+msgstr ""
+
+#: tinyutils/terminal:31
+msgid "Dont't close terminal after command finished"
+msgstr ""
+
+#: tinyutils/terminal:32
+msgid "Command to execute (must be last in line)"
+msgstr ""
+
+#: tinyutils/terminal:35
+#, sh-format
+msgid "Help for $TERMINAL:"
+msgstr ""
diff -r 0791bb2b4e0b -r 8e208c31ad8e tazbox/tazbox
--- a/tazbox/tazbox	Wed Jul 17 09:52:54 2013 +0200
+++ b/tazbox/tazbox	Thu Jul 18 03:32:28 2013 +0300
@@ -251,12 +251,24 @@
 
 # All applications
 all_apps() {
-	yad --icons --title="$(gettext "All Applications")" \
+	yad --icons --title="$(gettext 'All Applications')" \
 		--compact --read-dir=/usr/share/applications \
 		--window-icon=$icon --width=400 --height=400 \
 		--button="gtk-close:0"
 }
 
+# Generate alternatives list: first - current choice, following - existing apps
+gen_alt() {
+	alts="$@"
+	current=$(echo $alts | cut -d' ' -f1)
+	alts=$(echo $alts | sed "s|$current||g")
+	for alt in $alts; do
+		[ ! $(busybox which $alt) ] && alts=$(echo $alts | sed "s|$alt||")
+	done
+	echo $current $alts | tr ' ' '!' #sed 's| |!|g'
+}
+
+
 #
 # Commands
 #
@@ -358,30 +370,45 @@
 			cp /etc/slitaz/applications.conf $CONFIG
 		fi
 		. $CONFIG
+
+		FILE_MANAGERS=$(gen_alt $FILE_MANAGER \
+			clex emelfm2 mc pathfinder pcmanfm ranger spacefm thunar xfe ytree)
+		BROWSERS=$(gen_alt $BROWSER \
+			arora chrome cream dillo elinks firefox iron links lynx midori \
+			netsurf opera retawq seamonkey surf tazweb)
+		EDITORS=$(gen_alt $EDITOR \
+			adie beaver emacs geany jed joe le leafpad mousepad mp-5 nano \
+			SciTE vi vim xedit xfw zile)
+		TERMINALS=$(gen_alt $TERMINAL \
+			aterm evilvte lxterminal mrxvt sakura stjerm tilda urxvt vte xterm \
+			yeahconsole)
+		WINDOW_MANAGERS=$(gen_alt $WINDOW_MANAGER \
+			awesome blackbox dwm echinus enlightenment fluxbox icewm jwm \
+			karmen matchbox openbox-session pekwm ratpoison xfwm4)
+
 		eval $(yad --title="$(gettext 'SliTaz default applications')" \
 			--window-icon=preferences-desktop --image=preferences-desktop \
 			--text="<b>$(gettext 'SliTaz default applications configuration')</b>" \
 			--form \
-			--field="$(gettext 'File manager:')" \
-			--field="$(gettext 'Web browser:')" \
-			--field="$(gettext 'Text editor:')" \
-			--field="$(gettext 'Terminal:')" \
-			--field="$(gettext 'Window manager:')" \
-			"$FILE_MANAGER" "$BROWSER" "$EDITOR" "$TERMINAL" "$WINDOW_MANAGER" | \
+			--field="$(gettext 'File manager:'):CBE" "$FILE_MANAGERS" \
+			--field="$(gettext 'Web browser:'):CBE" "$BROWSERS" \
+			--field="$(gettext 'Text editor:'):CBE" "$EDITORS" \
+			--field="$(gettext 'Terminal:'):CBE" "$TERMINALS" \
+			--field="$(gettext 'Window manager:'):CBE" "$WINDOW_MANAGERS" | \
 			awk -F'|' '{printf "FILE_MANAGER=\"%s\"\nBROWSER=\"%s\"\nEDITOR=\"%s\"\
 TERMINAL=\"%s\"\nWINDOW_MANAGER=\"%s\"\n", $1, $2, $3, $4, $5}')
+
 		sed '/FILE_MANAGER=/s|"\([^"]*\)"|"'$FILE_MANAGER'"|; \
 			/BROWSER=/s|"\([^"]*\)"|"'$BROWSER'"|; \
 			/EDITOR=/s|"\([^"]*\)"|"'$EDITOR'"|; \
 			/TERMINAL=/s|"\([^"]*\)"|"'$TERMINAL'"|; \
 			/WINDOW_MANAGER=/s|"\([^"]*\)"|"'$WINDOW_MANAGER'"|' \
-			-i $CONFIG
-		;;
+			-i $CONFIG ;;
 	gpl)
-		yad --text-info --title="GNU General Public License" \
-		--window-icon=text-x-generic --geometry="560x500+0-24" \
-		--button "OK" < /usr/share/licenses/gpl.txt
-		;;
+		yad --center --text-info --title="GNU General Public License" \
+			--image=/usr/share/pixmaps/gpl3.png --image-on-top \
+			--image-on-top --window-icon=text-x-generic --geometry="580x500" \
+			--fontname=monospace --button "OK" < /usr/share/licenses/gpl.txt ;;
 	*)
 		usage ;;
 esac
diff -r 0791bb2b4e0b -r 8e208c31ad8e tinyutils/terminal
--- a/tinyutils/terminal	Wed Jul 17 09:52:54 2013 +0200
+++ b/tinyutils/terminal	Thu Jul 18 03:32:28 2013 +0300
@@ -2,10 +2,55 @@
 # Launch SliTaz default X Terminal.
 #
 . /etc/slitaz/applications.conf
+. /lib/libtaz.sh
+
+export TEXTDOMAIN='slitaz-tools'
+
+help() {
+	cat << EOT
+$(boldify terminal): $(gettext 'configurable SliTaz wrapper for terminal.')
+
+$(boldify $(gettext 'Recognized options:'))
+-v -version  --version        $(gettext 'Print the version number')
+   -help     --help           $(gettext 'Print out this message')
+   -geometry --geometry       $(eval_gettext 'Width and height of terminal window ($GEOMETRY)')
+-t -title -T --title          $(eval_gettext 'Title name for window ("$TITLE")')
+-h -hold                      $(gettext "Dont't close terminal after command finished")
+-e           --xterm-execute  $(gettext 'Command to execute (must be last in line)')
+
+
+$(boldify $(eval_gettext 'Help for $TERMINAL:'))
+
+EOT
+	$TERMINAL $OPT_HELP
+}
+
 
 USER_CONFIG="$HOME/.config/slitaz/applications.conf"
 [ -f  $USER_CONFIG ] && . $USER_CONFIG
 
-$TERMINAL "$@" &
+local PARAMS="" GEOMETRY="80x24" TITLE="SliTaz $(cat /etc/slitaz-release)" COMMAND
+
+case $TERMINAL in
+	sakura)
+		OPT_TITLE="-t"; OPT_GEOM="--geometry"; OPT_HELP="-?"; OPT_HOLD="-h";;
+	xterm|*)
+		OPT_TITLE="-T"; OPT_GEOM="-geometry"; OPT_HELP="-help"; OPT_HOLD="-hold";;
+esac
+
+until [ $# == 0 ]; do
+	PARAM="$1"
+	case "$PARAM" in
+		-version|--version|-v)	$TERMINAL -v; exit 0;;
+		-help|--help)			help; exit 0;;
+		-h|-hold)				shift; PARAMS="$PARAMS $OPT_HOLD";;
+		-geometry|--geometry)	shift; GEOMETRY="$1"; shift;;
+		-t|-title|-T|--title)	shift; TITLE="$1"; shift;;
+		-e|--xterm-execute)		shift; COMMAND="-e $@"; break;;
+		*)						shift; PARAMS="$PARAMS $PARAM";;
+	esac
+done
+
+$TERMINAL $PARAMS $OPT_GEOM $GEOMETRY $OPT_TITLE "$TITLE" $COMMAND &
 
 exit 0