# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1438458544 -10800
# Node ID 8ddffadf56a6f717cda50ddac4d0256559226487
# Parent  7cdf12d25925f26481b260d9e498212485f00202
Fix i18n, use libtaz i18n functions, make pot and msgmerge, add Russian translations.

diff -r 7cdf12d25925 -r 8ddffadf56a6 Makefile
--- a/Makefile	Mon Jul 27 21:45:20 2015 +0000
+++ b/Makefile	Sat Aug 01 22:49:04 2015 +0300
@@ -4,7 +4,7 @@
 PREFIX?=/usr
 DOCDIR?=/usr/share/doc
 DESTDIR?=
-LINGUAS?=el fr pl pt_BR zh_CN zh_TW
+LINGUAS?=el fr pl pt_BR ru zh_CN zh_TW
 
 PACKAGE	=	tazusb
 VERSION	:=	$(shell grep ^VERSION ${PACKAGE} | cut -d '=' -f 2)
@@ -18,9 +18,11 @@
 	xgettext -o po/tazusb-box/tazusb-box.pot -L Shell \
 		--package-name="TazUSB" \
 		--package-version="$(VERSION)" \
+		-kaction -ktitle -k_ -k_n -k_p:1,2 \
 		./tazusb-box
 	xgettext -o po/tazusb/tazusb.pot -L Shell \
 		--package-name="TazUSB" \
+		-kaction -ktitle -k_ -k_n -k_p:1,2 \
 		--package-version="$(VERSION)" \
 		./tazusb
 
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/el.po
--- a/po/tazusb-box/el.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb-box/el.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-01 12:51+0200\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2012-11-21 13:17+0200\n"
 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n"
 "Language-Team: Kostis Mousafiris\n"
@@ -16,24 +16,40 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tazusb-box:30
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
+msgstr ""
+"Δημιουργήστε ένα στικάκι LiveUSB με το SliTaz και φορτώστετο με εκκίνση από "
+"τη RAM!"
+
+#: tazusb-box:38
 msgid ""
-"<b>Generate SliTaz LiveUSB media and boot in RAM!</b> Insert a LiveCD into "
-"the cdrom drive or use a local ISO image, select the correct device and "
-"press OK."
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
 msgstr ""
-"<b>Δημιουργήστε ένα στικάκι LiveUSB με το SliTaz και φορτώστετο με εκκίνση "
-"από τη RAM!</b> Βάλτε ένα LiveCD μέσα στον οδηγό CD-ROM, ή χρησιμοποιείστε "
-"μία τοπική εικόνα ISO, επιλέξτε τη σωστή συσκευή και πατήστε OK."
+"Βάλτε ένα LiveCD μέσα στον οδηγό CD-ROM, ή χρησιμοποιείστε μία τοπική εικόνα "
+"ISO, επιλέξτε τη σωστή συσκευή και πατήστε OK."
 
-#: tazusb-box:50
+#: tazusb-box:51
+msgid "Reboot"
+msgstr ""
+
+#: tazusb-box:60
 msgid "No USB media found"
 msgstr "Δεν βρέθηκε κανένα αποθηκευτικό μέσο USB"
 
-#: tazusb-box:58
+#: tazusb-box:70
 msgid "ISO Image:"
 msgstr "Εικόνα ISO:"
 
-#: tazusb-box:59
+#: tazusb-box:71
 msgid "USB Media:"
 msgstr "Αποθηκευτικό μέσο USB:"
+
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr ""
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/fr.po
--- a/po/tazusb-box/fr.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb-box/fr.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-01 12:51+0200\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2012-05-01 12:53+0100\n"
 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -17,19 +17,38 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tazusb-box:30
-msgid "<b>Generate SliTaz LiveUSB media and boot in RAM!</b> Insert a LiveCD into the cdrom drive or use a local ISO image, select the correct device and press OK."
-msgstr "<b>Générer un LiveUSB de SliTaz et démarrer!</b> Insérer un LiveCD dans le lecteur de cdrom ou utiliser une image ISO, séléctionner le media et appuyer sur OK."
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
+msgstr "Générer un LiveUSB de SliTaz et démarrer!"
 
-#: tazusb-box:50
+#: tazusb-box:38
+msgid ""
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
+msgstr ""
+"Insérer un LiveCD dans le lecteur de CD-ROM ou utiliser une image ISO, "
+"séléctionner le media et appuyer sur OK."
+
+#: tazusb-box:51
+msgid "Reboot"
+msgstr ""
+
+#: tazusb-box:60
 msgid "No USB media found"
 msgstr "Pas de média USB trouvé"
 
-#: tazusb-box:58
+#: tazusb-box:70
 msgid "ISO Image:"
 msgstr "Image ISO:"
 
-#: tazusb-box:59
+#: tazusb-box:71
 msgid "USB Media:"
 msgstr "Média USB:"
 
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr ""
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/pl.po
--- a/po/tazusb-box/pl.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb-box/pl.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-01 12:51+0200\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2013-07-23 12:36+0100\n"
 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n"
 "Language-Team: Paweł Pyrczak <support@pyrczak.pl>\n"
@@ -15,24 +15,44 @@
 "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"
 
-#: tazusb-box:30
-msgid "<b>Generate SliTaz LiveUSB media and boot in RAM!</b> Insert a LiveCD into the cdrom drive or use a local ISO image, select the correct device and press OK."
-msgstr "<b>Generuje nośnik SliTaz LiveUSB botowalny w pamięci RAM!</b> Włóż LiveCD do napędu cdrom albo użyj lokalnego obrazu ISO, wybierz właściwy nośnik docelowy USB i naciśnij OK."
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
+msgstr "Generuje nośnik SliTaz LiveUSB botowalny w pamięci RAM!"
 
-#: tazusb-box:50
+#: tazusb-box:38
+msgid ""
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
+msgstr ""
+"Włóż LiveCD do napędu CD-ROM albo użyj lokalnego obrazu ISO, wybierz "
+"właściwy nośnik docelowy USB i naciśnij OK."
+
+#: tazusb-box:51
+msgid "Reboot"
+msgstr ""
+
+#: tazusb-box:60
 msgid "No USB media found"
 msgstr "Nie znaleziono nośników USB"
 
-#: tazusb-box:58
+#: tazusb-box:70
 msgid "ISO Image:"
 msgstr "Obraz ISO:"
 
-#: tazusb-box:59
+#: tazusb-box:71
 msgid "USB Media:"
 msgstr "Nośnik USB:"
 
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr ""
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/pt_BR.po
--- a/po/tazusb-box/pt_BR.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb-box/pt_BR.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-01 12:51+0200\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2014-03-06 22:53-0300\n"
 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n"
 "Language-Team: Portuguese <i18n@slitaz.org>\n"
@@ -17,24 +17,38 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tazusb-box:30
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
+msgstr "Gera uma mídia LiveUSB do SliTaz a ser carregada na RAM!"
+
+#: tazusb-box:38
 msgid ""
-"<b>Generate SliTaz LiveUSB media and boot in RAM!</b> Insert a LiveCD into "
-"the cdrom drive or use a local ISO image, select the correct device and "
-"press OK."
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
 msgstr ""
-"<b>Gera uma mídia LiveUSB do SliTaz a ser carregada na RAM!</b> Insira um "
-"LiveCD no drive de CDROM ou use uma imagem ISO local, selecione o "
+"Insira um LiveCD no drive de CD-ROM ou use uma imagem ISO local, selecione o "
 "dispositivo e clique em OK."
 
-#: tazusb-box:50
+#: tazusb-box:51
+msgid "Reboot"
+msgstr ""
+
+#: tazusb-box:60
 msgid "No USB media found"
 msgstr "Nenhuma mídia USB encontrada"
 
-#: tazusb-box:58
+#: tazusb-box:70
 msgid "ISO Image:"
 msgstr "Imagem ISO:"
 
-#: tazusb-box:59
+#: tazusb-box:71
 msgid "USB Media:"
 msgstr "Mídia USB:"
+
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr ""
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/ru.po
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/tazusb-box/ru.po	Sat Aug 01 22:49:04 2015 +0300
@@ -0,0 +1,55 @@
+# Russian translations for tazusb-box.
+# Copyright (C) 2015 SliTaz
+# This file is distributed under the same license as the tazusb package.
+# Aleksej Bobylev <al.bobylev@gmail.com>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TazUSB 4.2.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-01 16:57+0300\n"
+"PO-Revision-Date: 2015-08-01 21:59+0300\n"
+"Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
+"Language-Team: \n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
+msgstr "Создайте LiveUSB носитель SliTaz и загрузитесь в ОЗУ!"
+
+#: tazusb-box:38
+msgid ""
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
+msgstr ""
+"Вставьте LiveCD в привод CD-ROM или используйте файл образа ISO, выберите "
+"соответствующее устройство и нажмите OK."
+
+#: tazusb-box:51
+msgid "Reboot"
+msgstr "Перезагрузка"
+
+#: tazusb-box:60
+msgid "No USB media found"
+msgstr "Носители USB не обнаружены"
+
+#: tazusb-box:70
+msgid "ISO Image:"
+msgstr "Образ ISO:"
+
+#: tazusb-box:71
+msgid "USB Media:"
+msgstr "Носитель USB:"
+
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr "Устройство не указано: выход"
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr "Использование:"
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/tazusb-box.pot
--- a/po/tazusb-box/tazusb-box.pot	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb-box/tazusb-box.pot	Sat Aug 01 22:49:04 2015 +0300
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: TazUSB 4.2.2\n"
+"Project-Id-Version: TazUSB 4.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 08:56+0100\n"
+"POT-Creation-Date: 2015-08-01 22:14+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,21 +17,36 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tazusb-box:30
-msgid ""
-"<b>Generate SliTaz LiveUSB media and boot in RAM!</b> Insert a LiveCD into "
-"the cdrom drive or use a local ISO image, select the correct device and "
-"press OK."
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
 msgstr ""
 
-#: tazusb-box:50
+#: tazusb-box:38
+msgid ""
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
+msgstr ""
+
+#: tazusb-box:51
+msgid "Reboot"
+msgstr ""
+
+#: tazusb-box:60
 msgid "No USB media found"
 msgstr ""
 
-#: tazusb-box:58
+#: tazusb-box:70
 msgid "ISO Image:"
 msgstr ""
 
-#: tazusb-box:59
+#: tazusb-box:71
 msgid "USB Media:"
 msgstr ""
+
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr ""
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/zh_CN.po
--- a/po/tazusb-box/zh_CN.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb-box/zh_CN.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-05 15:07+0800\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2014-06-26 15:04+0800\n"
 "Last-Translator: 张文宇 <jame987165702@gmail.com>\n"
 "Language-Team: \n"
@@ -18,23 +18,36 @@
 "X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: tazusb-box:30
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
+msgstr "生成SliTaz LiveUSB 媒介,在记忆体启动SliTaz!"
+
+#: tazusb-box:38
 msgid ""
-"<b>Generate SliTaz LiveUSB media and boot in RAM!</b> Insert a LiveCD into "
-"the cdrom drive or use a local ISO image, select the correct device and "
-"press OK."
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
+msgstr "插入LiveCD 到光碟机或使用本地ISO映像,选择正确设备,再输入 OK ."
+
+#: tazusb-box:51
+msgid "Reboot"
 msgstr ""
-"<b>生成SliTaz LiveUSB 媒介,在记忆体启动slitaz!</b> 插入LiveCD 到光碟机或使用"
-"本地ISO映像,选择正确设备,再输入 OK ."
 
-#: tazusb-box:50
+#: tazusb-box:60
 msgid "No USB media found"
 msgstr "找不到USB媒介"
 
-#: tazusb-box:58
+#: tazusb-box:70
 msgid "ISO Image:"
 msgstr "ISO 映像:"
 
-#: tazusb-box:59
+#: tazusb-box:71
 msgid "USB Media:"
 msgstr "USB 媒介"
+
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr ""
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb-box/zh_TW.po
--- a/po/tazusb-box/zh_TW.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb-box/zh_TW.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-05 15:07+0800\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2014-06-05 15:07+0800\n"
 "Last-Translator: lunglungyu <lunglungyu2004@gmail.com>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,23 +16,36 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tazusb-box:30
+#: tazusb-box:37
+msgid "Generate SliTaz LiveUSB media and boot in RAM!"
+msgstr "生成SliTaz LiveUSB 媒介,在記憶體啟動SliTaz!"
+
+#: tazusb-box:38
 msgid ""
-"<b>Generate SliTaz LiveUSB media and boot in RAM!</b> Insert a LiveCD into "
-"the cdrom drive or use a local ISO image, select the correct device and "
-"press OK."
+"Insert a LiveCD into the CD-ROM drive or use a local ISO image, select the "
+"correct device and press OK."
+msgstr "插入LiveCD 到光碟機或使用本地ISO映像,選擇正確設備,再輸入 OK ."
+
+#: tazusb-box:51
+msgid "Reboot"
 msgstr ""
-"<b>生成SliTaz LiveUSB 媒介,在記憶體啟動slitaz!</b> 插入LiveCD 到"
-"光碟機或使用本地ISO映像,選擇正確設備,再輸入 OK ."
 
-#: tazusb-box:50
+#: tazusb-box:60
 msgid "No USB media found"
 msgstr "找不到USB媒介"
 
-#: tazusb-box:58
+#: tazusb-box:70
 msgid "ISO Image:"
 msgstr "ISO 映像:"
 
-#: tazusb-box:59
+#: tazusb-box:71
 msgid "USB Media:"
 msgstr "USB 媒介"
+
+#: tazusb-box:91
+msgid "No device: exit"
+msgstr ""
+
+#: tazusb-box:109
+msgid "Usage:"
+msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb/el.po
--- a/po/tazusb/el.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb/el.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 08:56+0100\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2012-11-21 13:17+0200\n"
 "Last-Translator: Constantine Mousafiris <kvisitor@gnugr.org>\n"
 "Language-Team: Kostis Mousafiris\n"
@@ -16,39 +16,42 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tazusb:35
-msgid "SliTaz Live USB - Version:"
-msgstr "Αποθηκευτικό μέσο USB για live λειτουργία του SliTaz"
+#: tazusb:34
+msgid "SliTaz Live USB - Version: %s"
+msgstr "Αποθηκευτικό μέσο USB για live λειτουργία του SliTaz %s"
 
 #: tazusb:36
-msgid "Usage: "
-msgstr "Χρήση: "
+msgid "Usage:"
+msgstr "Χρήση:"
 
 #: tazusb:37
+msgid "%s [command] [compression|device]"
+msgstr ""
+
+#: tazusb:38
 msgid "Commands:"
 msgstr "Εντολές:"
 
-#: tazusb:38
+#: tazusb:40
 msgid "Print this short usage."
 msgstr "Εκτύπωση αυτής της σύντομης χρήσης."
 
-#: tazusb:39
-msgid ""
-"Write the current filesystem to rootfs.gz.\n"
-"  \t\tSupported compression: lzma. gzip, none."
-msgstr ""
-"Εγγράψτε το σύστημα αρχείων στο rootfs.gz.\n"
-"  \t\tΥποστηριζόμενη συμπίεση: lzma, gzip, καμία."
-
 #: tazusb:41
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem \n"
-"                (for LiveUSB or /home). Default is ext3."
+"Write the current filesystem to rootfs.gz. Supported compression: lzma, "
+"gzip, none."
 msgstr ""
-"Κάντε διαμόρφωση (format) και επισημάντε την συσκευή με ένα σύστημα "
-"αρχείων \n"
-"                σε ext3, ext2 ή  fat32 (για το LiveUSB ή το /home). \n"
-"                Η προεπιλογή είναι το ext3."
+"Εγγράψτε το σύστημα αρχείων στο rootfs.gz. Υποστηριζόμενη συμπίεση: lzma, "
+"gzip, καμία."
+
+#: tazusb:42
+msgid ""
+"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"home). Default is ext3."
+msgstr ""
+"Κάντε διαμόρφωση (format) και επισημάντε την συσκευή με ένα σύστημα αρχείων "
+"σε ext3, ext2 ή fat32 (για το LiveUSB ή το /home). Η προεπιλογή είναι το "
+"ext3."
 
 #: tazusb:43
 msgid "Generate a bootable LiveUSB using files from the LiveCD."
@@ -70,201 +73,266 @@
 msgid "Remove old backup filesystems to free disk space."
 msgstr ""
 "Διαγραφή παλιών αντιγράφων ασφαλείας των αρχείων συστήματος, για "
-"απελευθέρωση\n"
-"                χώρου στον δίσκο."
+"απελευθέρωση χώρου στον δίσκο."
 
-#: tazusb:67
+#: tazusb:64
+msgid ""
+"Please specify the target USB device to %s. You can type 'list' to get a "
+"list of devices, type 'exit' or give an empty value to exit."
+msgstr ""
+
+#: tazusb:68 tazusb:72
 msgid "Device to use: "
 msgstr "Συσκευή που θα χρησιμοποιηθεί: "
 
-#: tazusb:71
+#: tazusb:77
 msgid "No specified device or exit."
 msgstr "Δεν διευκρινίσθηκε μια συσκευή ή κάποια έξοδος."
 
-#: tazusb:101 tazusb:117
+#: tazusb:91
+msgid "Unable to find device %s"
+msgstr ""
+
+#: tazusb:108 tazusb:123
 msgid "Please specify a label for the partition (TazUSB): "
 msgstr "Παρακαλώ ορίστε μια ετικέτα/ label για την κατάτμηση (TazUSB): "
 
-#: tazusb:127
+#: tazusb:113 tazusb:164 tazusb:172
+msgid "Label: %s"
+msgstr ""
+
+#: tazusb:132
 msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
 msgstr ""
 "Παρακαλώ ορίστε ένα σύστημα αρχείων του τύπου ext2, ext3 ή fat32 (ext3): "
 
-#: tazusb:159 tazusb:167
+#: tazusb:141
+msgid "Please specify the filesystem type to %s."
+msgstr ""
+
+#: tazusb:142
+msgid "Available formats are ext3(default), ext2 or fat32."
+msgstr ""
+
+#: tazusb:143
+msgid "Press enter to keep the default value."
+msgstr ""
+
+#: tazusb:145
+msgid "File system type: "
+msgstr ""
+
+#: tazusb:163 tazusb:171
 msgid "Processing..."
 msgstr "Γίνεται επεξεργασία..."
 
-#: tazusb:173
-msgid ""
-"Can't find mkdosfs tool.\\nWould you like to install dosfstools from "
-"repository [y/N] ? "
+#: tazusb:177
+msgid "Can't find %s tool."
+msgstr "Αδύνατη η εύρεση του εργαλείου %s."
+
+#: tazusb:178
+msgid "Would you like to install %s from repository [y/N]? "
+msgstr "Μήπως θα θέλατε να εγκαταστήσετε τα %s από το αποθετήριο [y/N]? "
+
+#: tazusb:189
+msgid "Sorry. Filesystem %s is not supported."
 msgstr ""
-"Αδύνατη η εύρεση του εργαλείου mkdosfs.\\nΜήπως θα θέλατε να εγκαταστήσετε "
-"τα dosfstools από το αποθετήριο [y/N] ?"
 
-#: tazusb:198
+#: tazusb:206
 msgid "Unmounting USB target device..."
 msgstr "Γίνεται αποπροσάρτηση της συσκευής USB στόχου..."
 
-#: tazusb:206
+#: tazusb:215
 msgid "Mounting USB target device..."
 msgstr "Γίνεται προσάρτηση της συσκευής USB στόχου..."
 
-#: tazusb:214
-msgid "Mounting cdrom device..."
+#: tazusb:224
+msgid "Mounting CD-ROM device..."
 msgstr "Γίνεται προσάρτηση της συσκευής CD-ROM..."
 
-#: tazusb:225
-msgid "Unable to mount cdrom or to find a filesystem on it (rootfs.gz)."
+#: tazusb:236
+msgid "Unable to mount CD-ROM or to find a filesystem on it (%s)."
 msgstr ""
-"Αδύνατη η προσάρτηση του CD-ROM, ή η ανεύρεση συστήματος αρχείων πάνω σε \n"
-"αυτό (rootfs.gz)."
+"Αδύνατη η προσάρτηση του CD-ROM, ή η ανεύρεση συστήματος αρχείων πάνω σε "
+"αυτό (%s)."
 
-#: tazusb:246
-msgid "Mounting "
-msgstr "Γίνεται προσάρτηση "
+#: tazusb:258
+msgid "Mounting %s..."
+msgstr "Γίνεται προσάρτηση %s..."
 
-#: tazusb:252
-msgid "Unable to mount iso or to find a filesystem on it (rootfs.gz)."
+#: tazusb:263
+msgid "Unable to mount ISO or to find a filesystem on it (%s)."
 msgstr ""
-"Αδύνατη η προσάρτηση του ISO, ή η ανεύρεση συστήματος αρχείων πάνω σε αυτό \n"
-"(rootfs.gz)."
+"Αδύνατη η προσάρτηση του ISO, ή η ανεύρεση συστήματος αρχείων πάνω σε αυτό "
+"(%s)."
 
-#: tazusb:260
-msgid "Copying needed files from cdrom..."
+#: tazusb:272
+msgid "Copying needed files from CD-ROM..."
 msgstr "Γίνεται αντιγραφή των απαιτούμενων αρχείων από το CD-ROM..."
 
-#: tazusb:322
-msgid "Do you want to exit Tazusb or reboot system (Exit/reboot) ? "
+#: tazusb:286
+msgid "Installing a new MBR to %s"
 msgstr ""
-"Μήπως θέλετε να βγείτε από το Tazusb ή να κάνετε επανεκκίνηση του "
-"συστήματος \n"
-"(Έξοδος/Eπανεκκίνηση) ?"
 
-#: tazusb:357
+#: tazusb:291
+msgid "No new MBR installed to %s"
+msgstr ""
+
+#: tazusb:310
+msgid "Installing bootloader: %s"
+msgstr ""
+
+#: tazusb:338
+msgid "Do you want to exit Tazusb or reboot system (Exit/reboot)? "
+msgstr ""
+"Μήπως θέλετε να βγείτε από το Tazusb ή να κάνετε επανεκκίνηση του συστήματος "
+"(Έξοδος - Exit / Eπανεκκίνηση - reboot)?"
+
+#: tazusb:358
+msgid "Setting %s as bootable..."
+msgstr ""
+
+#: tazusb:374
 msgid "Gen swap"
 msgstr "Δημιουργία swap"
 
-#: tazusb:359
+#: tazusb:376
 msgid ""
-"Generate a swap file in /home/swap that will be activated on each boot to "
-"have\n"
-"more memory available (Empty value to exit).\n"
-"\n"
-"Swap file in Mb : "
+"Generate a swap file in %s that will be activated on each boot to have more "
+"memory available (empty value to exit)."
 msgstr ""
-"Δημιουργήστε ένα αρχείο swap στο in /home/swap που θα ενεργοποιείται με "
-"κάθε \n"
-"επανεκκίνηση, για να επιτυγχάνεται περισσότερη διαθέσιμη μνήμη \n"
-"(Empty value to exit).\n"
-"\n"
-"Αρχείο Swap σε Mb : "
+"Δημιουργήστε ένα αρχείο swap στο in %s που θα ενεργοποιείται με κάθε "
+"επανεκκίνηση, για να επιτυγχάνεται περισσότερη διαθέσιμη μνήμη (empty value "
+"to exit)."
 
-#: tazusb:365
+#: tazusb:379
+msgid "Swap file in MB: "
+msgstr "Αρχείο Swap σε MB: "
+
+#: tazusb:382
 msgid "Empty value. Exiting..."
 msgstr "Κενή τιμή. Γίνεται έξοδος..."
 
-#: tazusb:385
+#: tazusb:403
 msgid "Clean"
 msgstr "Καθαρισμός"
 
-#: tazusb:387
-msgid ""
-"Remove old rootfs.gz.unixtimestamp backup filesystems to free up disk space."
+#: tazusb:405
+msgid "Remove old %s backup filesystems to free up disk space."
 msgstr ""
-"Διαγραφή των παλιών αντιγράφων ασφαλείας των αρχείων συστήματος rootfs.gz.\n"
-"unixtimestamp, για να απελευθερωθεί περισσότερος χώρος δίσκου."
+"Διαγραφή των παλιών αντιγράφων ασφαλείας των αρχείων συστήματος %s, για να "
+"απελευθερωθεί περισσότερος χώρος δίσκου."
 
-#: tazusb:399
+#: tazusb:410
+#, fuzzy
+msgid "Do you wish to remove: %s (Yes/no/exit)? "
+msgstr ""
+"Επιθυμείτε να διαγράψετε την ανάλυση εικόνας της οθόνης (No/yes/exit) ?"
+
+#: tazusb:418
 msgid "No filesystems selected, exiting..."
 msgstr "Δεν επιλέχθηκαν αρχεία συστήματος, γίνεται έξοδος..."
 
-#: tazusb:419
+#: tazusb:438
 msgid "Write filesystem"
 msgstr "Εγγραφή συστήματος αρχείων"
 
-#: tazusb:422
+#: tazusb:440
 msgid ""
-"The command writefs will write all the current filesystem into a suitable\n"
-"cpio archive (rootfs.gz) usable on a bootable LiveUSB media."
+"The command writefs will write all the current filesystem into a suitable "
+"cpio archive (%s) usable on a bootable LiveUSB media."
 msgstr ""
 
-#: tazusb:432
+#: tazusb:444
+msgid "Archive compression: %s"
+msgstr ""
+
+#: tazusb:450
 #, fuzzy
-msgid "Do you wish to remove the sound card and screen configs ? "
+msgid "Do you wish to remove the sound card and screen configs?"
 msgstr "Επιθυμείτε να διαγράψετε την επιλογή κάρτας ήχου (No/yes/exit) ?"
 
-#: tazusb:433 tazusb:450
+#: tazusb:451 tazusb:469
 msgid "Press ENTER to keep or answer (No|yes|exit): "
 msgstr ""
 
-#: tazusb:439
+#: tazusb:457
 #, fuzzy
 msgid "Removing current sound card and screen configurations..."
 msgstr "Γίνεται απομάκρυνση της τρέχουσας επιλογής κάρτας ήχου..."
 
-#: tazusb:444
+#: tazusb:462
 #, fuzzy
 msgid "Keeping current sound card and screen configurations..."
 msgstr "Διατήρηση της τρέχουσας επιλογής κάρτας ήχου..."
 
-#: tazusb:449
+#: tazusb:468
 #, fuzzy
-msgid "Do you wish to remove local/keymap settings ? "
+msgid "Do you wish to remove local/keymap settings?"
 msgstr "Επιθυμείτε να διαγράψετε την επιλογή κάρτας ήχου (No/yes/exit) ?"
 
-#: tazusb:456
+#: tazusb:475
 #, fuzzy
 msgid "Removing current locale/keymap settings..."
 msgstr "Γίνεται απομάκρυνση της τρέχουσας ανάλυσης εικόνας της οθόνης..."
 
-#: tazusb:460
+#: tazusb:479
 #, fuzzy
 msgid "Keeping current locale/keymap settings..."
 msgstr "Διατήρηση της τρέχουσας ανάλυσης εικόνας της οθόνης..."
 
-#: tazusb:478
-msgid "Creating rootfs.gz with lzma compression... "
-msgstr "Δημιουργείται το rootfs.gz με συμπίεση lzma... "
+#: tazusb:512
+msgid "Creating %s with lzma compression... "
+msgstr "Δημιουργείται το %s με συμπίεση lzma... "
 
-#: tazusb:482
-msgid "Creating rootfs.gz with gzip compression... "
-msgstr "Δημιουργείται το rootfs.gz με συμπίεση gzip... "
+#: tazusb:516
+msgid "Creating %s with gzip compression... "
+msgstr "Δημιουργείται το %s με συμπίεση gzip... "
 
-#: tazusb:486
-msgid "Creating rootfs.gz without compression... "
-msgstr "Δημιουργείται το rootfs.gz χωρίς συμπίεση... "
+#: tazusb:520
+msgid "Creating %s without compression... "
+msgstr "Δημιουργείται το %s χωρίς συμπίεση... "
 
-#: tazusb:495
-msgid "Moving rootfs.gz to media. Remember to unmount for delayed writes!"
+#: tazusb:531
+msgid "Moving %s to media. Remember to unmount for delayed writes!"
 msgstr ""
-"Μετακίνηση του rootfs.gz σε ένα μέσο αποθήκευσης. \n"
-"Θυμηθείτε να κάνετε αποπροσάρτηση για τις καθυστερημένες εγγραφές!"
+"Μετακίνηση του %s σε ένα μέσο αποθήκευσης. Θυμηθείτε να κάνετε αποπροσάρτηση "
+"για τις καθυστερημένες εγγραφές!"
 
-#: tazusb:505
-msgid "rootfs.gz is located in /"
-msgstr "Το rootfs.gz τοποθετήθηκε στο /"
+#: tazusb:541
+msgid "%s is located in /"
+msgstr "Το %s τοποθετήθηκε στο /"
 
-#: tazusb:512
+#: tazusb:545
+#, fuzzy
+msgid "Root filesystem size: %s"
+msgstr "Εγγραφή συστήματος αρχείων"
+
+#: tazusb:547
 msgid "ENTER to continue..."
 msgstr "Πατήστε ENTER για να συνεχίσετε..."
 
-#: tazusb:518
+#: tazusb:555
 msgid "Format a device"
 msgstr "Κάντε διαμόρφωση (format) μιας συσκευής"
 
-#: tazusb:542
+#: tazusb:564
+#, fuzzy
+msgid "Device: %s"
+msgstr "Συσκευή που θα χρησιμοποιηθεί: "
+
+#: tazusb:572
+msgid "Device %s is ready to use as LiveUSB and/or /home partition."
+msgstr ""
+
+#: tazusb:580
 msgid "Gen a LiveUSB media"
 msgstr "Δημιουργήστε ένα μέσο αποθήκευσης LiveUSB"
 
-#: tazusb:568
+#: tazusb:611
 msgid "Please specify a valid filename on the command line."
 msgstr "Παρακαλώ, ορίστε ένα έγκυρο όνομα αρχείου στη γραμμή εντολών."
 
-#: tazusb:572
+#: tazusb:615
 msgid "Copy ISO file to SliTaz LiveUSB media"
 msgstr "Αντιγράψτε το αρχείο ISO στο μέσο αποθήκευσης LiveUSB με το SliTaz"
-
-#~ msgid "Do you wish to remove the screen resolution (No/yes/exit) ? "
-#~ msgstr ""
-#~ "Επιθυμείτε να διαγράψετε την ανάλυση εικόνας της οθόνης (No/yes/exit) ?"
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb/fr.po
--- a/po/tazusb/fr.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb/fr.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 08:56+0100\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2012-05-01 12:53+0100\n"
 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,37 +16,39 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tazusb:35
-msgid "SliTaz Live USB - Version:"
-msgstr "SliTaz Live USB - Version:"
+#: tazusb:34
+msgid "SliTaz Live USB - Version: %s"
+msgstr "SliTaz Live USB - Version: %s"
 
 #: tazusb:36
-msgid "Usage: "
-msgstr "Syntaxe: "
+msgid "Usage:"
+msgstr "Syntaxe:"
 
 #: tazusb:37
-msgid "Commands:"
-msgstr "Commandes: "
+msgid "%s [command] [compression|device]"
+msgstr ""
 
 #: tazusb:38
+msgid "Commands:"
+msgstr "Commandes :"
+
+#: tazusb:40
 msgid "Print this short usage."
 msgstr "Affiche cette aide."
 
-#: tazusb:39
-msgid ""
-"Write the current filesystem to rootfs.gz.\n"
-"  \t\tSupported compression: lzma. gzip, none."
-msgstr ""
-"Write the current filesystem to rootfs.gz.\n"
-"  \t\tSupported compression: lzma. gzip, none."
-
 #: tazusb:41
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem \n"
-"                (for LiveUSB or /home). Default is ext3."
+"Write the current filesystem to rootfs.gz. Supported compression: lzma, "
+"gzip, none."
 msgstr ""
-"Formater et nommer un périphérique en ext3, ext2 ou fat32\n"
-"                (pour LiveUSB ou /home). ext3 Par défault."
+
+#: tazusb:42
+msgid ""
+"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"home). Default is ext3."
+msgstr ""
+"Formater et nommer un périphérique en ext3, ext2 ou fat32 (pour LiveUSB ou /"
+"home). ext3 Par défault."
 
 #: tazusb:43
 msgid "Generate a bootable LiveUSB using files from the LiveCD."
@@ -64,190 +66,260 @@
 msgid "Remove old backup filesystems to free disk space."
 msgstr "Supprimer les sauvegardes pour libérer de la place."
 
-#: tazusb:67
+#: tazusb:64
+msgid ""
+"Please specify the target USB device to %s. You can type 'list' to get a "
+"list of devices, type 'exit' or give an empty value to exit."
+msgstr ""
+
+#: tazusb:68 tazusb:72
 msgid "Device to use: "
-msgstr "Périphérique  cible:"
+msgstr "Périphérique cible:"
 
-#: tazusb:71
+#: tazusb:77
 msgid "No specified device or exit."
-msgstr "Pas de périphérique spécifié ou quitter"
+msgstr "Pas de périphérique spécifié ou quitter."
 
-#: tazusb:101 tazusb:117
+#: tazusb:91
+#, fuzzy
+msgid "Unable to find device %s"
+msgstr "Impossible de trouver le périphérique: %s"
+
+#: tazusb:108 tazusb:123
 msgid "Please specify a label for the partition (TazUSB): "
 msgstr "Entrez un nom de volume (TazUSB): "
 
-#: tazusb:127
+#: tazusb:113 tazusb:164 tazusb:172
+msgid "Label: %s"
+msgstr ""
+
+#: tazusb:132
 msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
 msgstr "Donnez le type de système de fichiers ext2, ext3 ou fat32 (ext3): "
 
-#: tazusb:159 tazusb:167
+#: tazusb:141
+#, fuzzy
+msgid "Please specify the filesystem type to %s."
+msgstr "Donnez le type de système de fichiers ext2, ext3 ou fat32 (ext3): "
+
+#: tazusb:142
+msgid "Available formats are ext3(default), ext2 or fat32."
+msgstr ""
+
+#: tazusb:143
+msgid "Press enter to keep the default value."
+msgstr ""
+
+#: tazusb:145
+msgid "File system type: "
+msgstr ""
+
+#: tazusb:163 tazusb:171
 msgid "Processing..."
-msgstr "Traitement en cours"
+msgstr "Traitement en cours..."
 
-#: tazusb:173
-msgid ""
-"Can't find mkdosfs tool.\\nWould you like to install dosfstools from "
-"repository [y/N] ? "
-msgstr ""
-"Impossible de trouver le programme mkdofs.\n"
-"Voulez-vous installer le paquet dosfstools depuis le dépot [y/N] ? "
+#: tazusb:177
+msgid "Can't find %s tool."
+msgstr "Impossible de trouver le programme %s."
 
-#: tazusb:198
+#: tazusb:178
+msgid "Would you like to install %s from repository [y/N]? "
+msgstr "Voulez-vous installer le paquet %s depuis le dépot [y/N] ? "
+
+#: tazusb:189
+msgid "Sorry. Filesystem %s is not supported."
+msgstr "Désolé. Le système de fichiers %s n'est pas supporté."
+
+#: tazusb:206
 msgid "Unmounting USB target device..."
 msgstr "Démontage du périphérique USB..."
 
-#: tazusb:206
+#: tazusb:215
 msgid "Mounting USB target device..."
 msgstr "Montage du périphérique USB..."
 
-#: tazusb:214
-msgid "Mounting cdrom device..."
-msgstr "Montage du cdrom..."
+#: tazusb:224
+msgid "Mounting CD-ROM device..."
+msgstr "Montage du CD-ROM..."
 
-#: tazusb:225
-msgid "Unable to mount cdrom or to find a filesystem on it (rootfs.gz)."
+#: tazusb:236
+msgid "Unable to mount CD-ROM or to find a filesystem on it (%s)."
 msgstr ""
-"Impossible de monter le cdrom ou d'y trouver un système de fichier (rootfs."
-"gz)."
+"Impossible de monter le CD-ROM ou d'y trouver un système de fichier (%s)."
 
-#: tazusb:246
-msgid "Mounting "
-msgstr "Montage de "
+#: tazusb:258
+msgid "Mounting %s..."
+msgstr "Montage de %s..."
 
-#: tazusb:252
-msgid "Unable to mount iso or to find a filesystem on it (rootfs.gz)."
+#: tazusb:263
+msgid "Unable to mount ISO or to find a filesystem on it (%s)."
 msgstr ""
-"Impossible de monter l'image ISO ou d'y trouver un système de fichier "
-"(rootfs.gz)."
+"Impossible de monter l'image ISO ou d'y trouver un système de fichier (%s)."
 
-#: tazusb:260
-msgid "Copying needed files from cdrom..."
-msgstr "Copie des fichiers depuis le cdrom"
+#: tazusb:272
+msgid "Copying needed files from CD-ROM..."
+msgstr "Copie des fichiers depuis le CD-ROM..."
 
-#: tazusb:322
-msgid "Do you want to exit Tazusb or reboot system (Exit/reboot) ? "
+#: tazusb:286
+msgid "Installing a new MBR to %s"
+msgstr "Installation du MBR sur: %s"
+
+#: tazusb:291
+msgid "No new MBR installed to %s"
+msgstr "Pas de nouveau MBR installé sur: %s"
+
+#: tazusb:310
+msgid "Installing bootloader: %s"
+msgstr "Installation du bootloader: %s"
+
+#: tazusb:338
+msgid "Do you want to exit Tazusb or reboot system (Exit/reboot)? "
 msgstr "Voulez-vous quitter Tazusb ou redémarrer le système (Exit/reboot) ? "
 
-#: tazusb:357
+#: tazusb:358
+#, fuzzy
+msgid "Setting %s as bootable..."
+msgstr "Paramètre le périphérique comme amorçable..."
+
+#: tazusb:374
 msgid "Gen swap"
 msgstr "Création du fichier d'échange"
 
-#: tazusb:359
+#: tazusb:376
 msgid ""
-"Generate a swap file in /home/swap that will be activated on each boot to "
-"have\n"
-"more memory available (Empty value to exit).\n"
-"\n"
-"Swap file in Mb : "
+"Generate a swap file in %s that will be activated on each boot to have more "
+"memory available (empty value to exit)."
 msgstr ""
-"Créé un fichier d'échange, dans /home/swap, qui sera activé à chaque "
-"démarrage\n"
-"pour avoir plus de mémoire disponible (Pas de valeur pour quitter).\n"
-"\n"
-"Taille du fichier d'échange en Mo: "
+"Créé un fichier d'échange, dans %s, qui sera activé à chaque démarrage pour "
+"avoir plus de mémoire disponible (pas de valeur pour quitter)."
 
-#: tazusb:365
+#: tazusb:379
+msgid "Swap file in MB: "
+msgstr "Taille du fichier d'échange en Mo : "
+
+#: tazusb:382
 msgid "Empty value. Exiting..."
 msgstr "Aucune valeur. Quitter..."
 
-#: tazusb:385
+#: tazusb:403
 msgid "Clean"
 msgstr "Nettoyage"
 
-#: tazusb:387
-msgid ""
-"Remove old rootfs.gz.unixtimestamp backup filesystems to free up disk space."
+#: tazusb:405
+msgid "Remove old %s backup filesystems to free up disk space."
 msgstr ""
-"Suppression des anciennes sauvegarde de rootfs.gz.unixtimestamp pour libérer "
-"de la place sur le lecteur."
+"Suppression des anciennes sauvegarde de %s pour libérer de la place sur le "
+"lecteur."
 
-#: tazusb:399
+#: tazusb:410
+msgid "Do you wish to remove: %s (Yes/no/exit)? "
+msgstr "Désirez-vous supprimer: %s (Yes/no/exit) ? "
+
+#: tazusb:418
 msgid "No filesystems selected, exiting..."
 msgstr "Pas de système de fichier choisi, quitter..."
 
-#: tazusb:419
+#: tazusb:438
 msgid "Write filesystem"
 msgstr "Création du système de fichier"
 
-#: tazusb:422
+#: tazusb:440
 msgid ""
-"The command writefs will write all the current filesystem into a suitable\n"
-"cpio archive (rootfs.gz) usable on a bootable LiveUSB media."
+"The command writefs will write all the current filesystem into a suitable "
+"cpio archive (%s) usable on a bootable LiveUSB media."
 msgstr ""
 
-#: tazusb:432
+#: tazusb:444
+msgid "Archive compression: %s"
+msgstr ""
+
+#: tazusb:450
 #, fuzzy
-msgid "Do you wish to remove the sound card and screen configs ? "
+msgid "Do you wish to remove the sound card and screen configs?"
 msgstr "Souhaîtez-vous supprimer the sound card selection (No/yes/exit) ?"
 
-#: tazusb:433 tazusb:450
+#: tazusb:451 tazusb:469
 msgid "Press ENTER to keep or answer (No|yes|exit): "
 msgstr ""
 
-#: tazusb:439
+#: tazusb:457
 #, fuzzy
 msgid "Removing current sound card and screen configurations..."
 msgstr "Suppression des informations sur la carte son sélèctionnée..."
 
-#: tazusb:444
+#: tazusb:462
 #, fuzzy
 msgid "Keeping current sound card and screen configurations..."
 msgstr "Garder la sélection courante de la carte son..."
 
-#: tazusb:449
+#: tazusb:468
 #, fuzzy
-msgid "Do you wish to remove local/keymap settings ? "
+msgid "Do you wish to remove local/keymap settings?"
 msgstr "Souhaîtez-vous supprimer the sound card selection (No/yes/exit) ?"
 
-#: tazusb:456
+#: tazusb:475
 #, fuzzy
 msgid "Removing current locale/keymap settings..."
 msgstr "Supprimer la résolution d'écran actuelle..."
 
-#: tazusb:460
+#: tazusb:479
 #, fuzzy
 msgid "Keeping current locale/keymap settings..."
 msgstr "Garder la résolution d'écran actuelle..."
 
-#: tazusb:478
-msgid "Creating rootfs.gz with lzma compression... "
-msgstr "Création du fichier rootfs.gz avec compression lzma..."
+#: tazusb:512
+msgid "Creating %s with lzma compression... "
+msgstr "Création du fichier %s avec compression lzma... "
 
-#: tazusb:482
-msgid "Creating rootfs.gz with gzip compression... "
-msgstr "Création du fichier rootfs.gz avec compression gzip..."
+#: tazusb:516
+msgid "Creating %s with gzip compression... "
+msgstr "Création du fichier %s avec compression gzip... "
 
-#: tazusb:486
-msgid "Creating rootfs.gz without compression... "
-msgstr "Création de rootfs.gz sans compression..."
+#: tazusb:520
+msgid "Creating %s without compression... "
+msgstr "Création de %s sans compression... "
 
-#: tazusb:495
-msgid "Moving rootfs.gz to media. Remember to unmount for delayed writes!"
+#: tazusb:531
+msgid "Moving %s to media. Remember to unmount for delayed writes!"
 msgstr ""
-"Déplacement de rootfs.gz vers le média. N'oubliez de démonter le "
-"périphérique pour les écritures différées."
+"Déplacement de %s vers le média. N'oubliez de démonter le périphérique pour "
+"les écritures différées."
 
-#: tazusb:505
-msgid "rootfs.gz is located in /"
-msgstr "Le fichier rootfs.gz est dans /"
+#: tazusb:541
+msgid "%s is located in /"
+msgstr "Le fichier %s est dans /"
 
-#: tazusb:512
+#: tazusb:545
+#, fuzzy
+msgid "Root filesystem size: %s"
+msgstr "Taille du système de fichier racine: %s"
+
+#: tazusb:547
 msgid "ENTER to continue..."
 msgstr "appuyer sur Entrer pour continuer"
 
-#: tazusb:518
+#: tazusb:555
 msgid "Format a device"
 msgstr "Formatage d'un périphérique"
 
-#: tazusb:542
+#: tazusb:564
+#, fuzzy
+msgid "Device: %s"
+msgstr "Périphérique cible:"
+
+#: tazusb:572
+msgid "Device %s is ready to use as LiveUSB and/or /home partition."
+msgstr ""
+
+#: tazusb:580
 msgid "Gen a LiveUSB media"
 msgstr "Générer un média LiveUSB"
 
-#: tazusb:568
+#: tazusb:611
 msgid "Please specify a valid filename on the command line."
 msgstr "Indiquez un nom de fichier valide sur la ligne de commande."
 
-#: tazusb:572
+#: tazusb:615
 msgid "Copy ISO file to SliTaz LiveUSB media"
 msgstr "Copie du fichier ISO vers SliTaz LiveUSB"
 
@@ -266,9 +338,6 @@
 #~ msgid "This program requires being run as root."
 #~ msgstr "Ce programme nécessite d'être exécuté en tant que root."
 
-#~ msgid "Unable to find device: $DEVICE"
-#~ msgstr "Impossible de trouver le périphérique: $DEVICE"
-
 #~ msgid "Label  : $label"
 #~ msgstr "Nom de volume"
 
@@ -281,31 +350,5 @@
 #~ msgid "Mkfs   : mkdosfs -F 32 -n \"$label\" $DEVICE"
 #~ msgstr "Mkfs   : mkdosfs -F 32 -n \"$label\" $DEVICE"
 
-#~ msgid "Sorry. Filesystem $FS is not supported."
-#~ msgstr "Désolé. Le système de fichiers $FS n'est pas supporté."
-
-#~ msgid "Installing a new MBR to: $DISK"
-#~ msgstr "Installation du MBR sur: $DISK"
-
-#~ msgid "No new MBR installed to: $DISK"
-#~ msgstr "Pas de nouveau MBR installé sur: $DISK"
-
-#~ msgid "Installing bootloader: $ST"
-#~ msgstr "Installation du bootloader: $ST"
-
-#~ msgid "Setting $DEVICE as bootable..."
-#~ msgstr "Paramètre le périphérique comme amorçable..."
-
-#~ msgid "Do you wish to remove: `basename $file` (Yes/no/exit) ? "
-#~ msgstr "Désirez-vous supprimer: `basename $file` (Yes/no/exit) ? "
-
-#~ msgid "Root filesystem size: $size"
-#~ msgstr "Taille du système de fichier racine: $size"
-
 #~ msgid "Device : $DEVICE"
 #~ msgstr "Lecteur: $DEVICE"
-
-#~ msgid ""
-#~ "Device $label ($DEVICE) is ready to use as LiveUSB and/or /home partition."
-#~ msgstr ""
-#~ "Device $label ($DEVICE) is ready to use as LiveUSB and/or /home partition."
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb/pl.po
--- a/po/tazusb/pl.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb/pl.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 08:56+0100\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2013-07-23 12:36+0100\n"
 "Last-Translator: Paweł Pyrczak <tkr.tkr.pl@gmail.com>\n"
 "Language-Team: Paweł Pyrczak <support@pyrczak.pl>\n"
@@ -21,38 +21,41 @@
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: tazusb:35
-msgid "SliTaz Live USB - Version:"
-msgstr "SliTaz Live USB - Wersja:"
+#: tazusb:34
+msgid "SliTaz Live USB - Version: %s"
+msgstr "SliTaz Live USB - Wersja: %s"
 
 #: tazusb:36
-msgid "Usage: "
-msgstr "Użycie: "
+msgid "Usage:"
+msgstr "Użycie:"
 
 #: tazusb:37
+msgid "%s [command] [compression|device]"
+msgstr ""
+
+#: tazusb:38
 msgid "Commands:"
 msgstr "Komendy:"
 
-#: tazusb:38
+#: tazusb:40
 msgid "Print this short usage."
 msgstr "Pokazuje tą krótką informację o użyciu."
 
-#: tazusb:39
-msgid ""
-"Write the current filesystem to rootfs.gz.\n"
-"  \t\tSupported compression: lzma. gzip, none."
-msgstr ""
-"Zapisuje aktualny system plików do rootfs.gz\n"
-"  \t\tObsługiwane formaty kompresji: lzma, gzip, none."
-
 #: tazusb:41
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem \n"
-"                (for LiveUSB or /home). Default is ext3."
+"Write the current filesystem to rootfs.gz. Supported compression: lzma, "
+"gzip, none."
 msgstr ""
-"Formatuj i nadaj etykietę urządzeniowi z systemem plików \n"
-"  \t\text2, ext3 albo fat32 (dla LiveUSB albo /home).\n"
-"  \t\tDomyślnie ext3."
+"Zapisuje aktualny system plików do rootfs.gz. Obsługiwane formaty kompresji: "
+"lzma, gzip, none."
+
+#: tazusb:42
+msgid ""
+"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"home). Default is ext3."
+msgstr ""
+"Formatuj i nadaj etykietę urządzeniowi z systemem plików ext2, ext3 albo "
+"fat32 (dla LiveUSB albo /home). Domyślnie ext3."
 
 #: tazusb:43
 msgid "Generate a bootable LiveUSB using files from the LiveCD."
@@ -70,191 +73,253 @@
 msgid "Remove old backup filesystems to free disk space."
 msgstr "Usuwa starą kopię zapasową systemu plików aby zwolnić miejsce."
 
-#: tazusb:67
+#: tazusb:64
+msgid ""
+"Please specify the target USB device to %s. You can type 'list' to get a "
+"list of devices, type 'exit' or give an empty value to exit."
+msgstr ""
+
+#: tazusb:68 tazusb:72
 msgid "Device to use: "
 msgstr "Napęd przeznaczony di użycia: "
 
-#: tazusb:71
+#: tazusb:77
 msgid "No specified device or exit."
 msgstr "Nie sprecyzowano napędu, albo kończenie."
 
-#: tazusb:101 tazusb:117
+#: tazusb:91
+msgid "Unable to find device %s"
+msgstr ""
+
+#: tazusb:108 tazusb:123
 msgid "Please specify a label for the partition (TazUSB): "
 msgstr "Proszę wprowadzić etykietę dla tablicy partycji (TazUSB): "
 
-#: tazusb:127
+#: tazusb:113 tazusb:164 tazusb:172
+msgid "Label: %s"
+msgstr ""
+
+#: tazusb:132
 msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
 msgstr "Proszę wprowadzić użyty system plików ext2, ext3 lub fat32 (ext3): "
 
-#: tazusb:159 tazusb:167
+#: tazusb:141
+msgid "Please specify the filesystem type to %s."
+msgstr ""
+
+#: tazusb:142
+msgid "Available formats are ext3(default), ext2 or fat32."
+msgstr ""
+
+#: tazusb:143
+msgid "Press enter to keep the default value."
+msgstr ""
+
+#: tazusb:145
+msgid "File system type: "
+msgstr ""
+
+#: tazusb:163 tazusb:171
 msgid "Processing..."
 msgstr "Przetwarzanie..."
 
-#: tazusb:173
-msgid ""
-"Can't find mkdosfs tool.\\nWould you like to install dosfstools from "
-"repository [y/N] ? "
+#: tazusb:177
+msgid "Can't find %s tool."
+msgstr "Nie można znaleźć narzędzia %s."
+
+#: tazusb:178
+msgid "Would you like to install %s from repository [y/N]? "
+msgstr "Czy chesz zainstalować %s z repozytorium [y/N]? "
+
+#: tazusb:189
+msgid "Sorry. Filesystem %s is not supported."
 msgstr ""
-"Nie można znaleźć narzędzia mkdosfs.\\nCzy chesz zainstalować dosfstools z "
-"repozytorium [y/N] ? "
 
-#: tazusb:198
+#: tazusb:206
 msgid "Unmounting USB target device..."
 msgstr "Odłączanie (unmount) docelowego napędu USB..."
 
-#: tazusb:206
+#: tazusb:215
 msgid "Mounting USB target device..."
 msgstr "Montowanie docelowego napędu USB..."
 
-#: tazusb:214
-msgid "Mounting cdrom device..."
-msgstr "Montowanie napędu cdrom..."
+#: tazusb:224
+msgid "Mounting CD-ROM device..."
+msgstr "Montowanie napędu CD-ROM..."
 
-#: tazusb:225
-msgid "Unable to mount cdrom or to find a filesystem on it (rootfs.gz)."
+#: tazusb:236
+msgid "Unable to mount CD-ROM or to find a filesystem on it (%s)."
 msgstr ""
-"Nie można zamontować napędu cdrom, albo znaleźć systemu plików na nim "
-"(rootfs.gz)."
+"Nie można zamontować napędu CD-ROM, albo znaleźć systemu plików na nim (%s)."
 
-#: tazusb:246
-msgid "Mounting "
-msgstr "Montowanie "
+#: tazusb:258
+msgid "Mounting %s..."
+msgstr "Montowanie %s..."
 
-#: tazusb:252
-msgid "Unable to mount iso or to find a filesystem on it (rootfs.gz)."
+#: tazusb:263
+msgid "Unable to mount ISO or to find a filesystem on it (%s)."
+msgstr "Nie można zamontować ISO, albo znaleźć systemu plików na nim (%s)."
+
+#: tazusb:272
+msgid "Copying needed files from CD-ROM..."
+msgstr "kopiowanie wymaganych plików z napędu CD-ROM..."
+
+#: tazusb:286
+msgid "Installing a new MBR to %s"
 msgstr ""
-"Nie można zamontować ISO, albo znaleźć systemu plików na nim (rootfs.gz)."
 
-#: tazusb:260
-msgid "Copying needed files from cdrom..."
-msgstr "kopiowanie wymaganych plików z napędu cdrom..."
+#: tazusb:291
+msgid "No new MBR installed to %s"
+msgstr ""
 
-#: tazusb:322
-msgid "Do you want to exit Tazusb or reboot system (Exit/reboot) ? "
-msgstr "Czy chcesz zakończyć Tazusb czy zrestartować system (Exit/reboot) ? "
+#: tazusb:310
+msgid "Installing bootloader: %s"
+msgstr ""
 
-#: tazusb:357
+#: tazusb:338
+msgid "Do you want to exit Tazusb or reboot system (Exit/reboot)? "
+msgstr "Czy chcesz zakończyć Tazusb czy zrestartować system (Exit/reboot)? "
+
+#: tazusb:358
+msgid "Setting %s as bootable..."
+msgstr ""
+
+#: tazusb:374
 msgid "Gen swap"
 msgstr "Generuj swap"
 
-#: tazusb:359
+#: tazusb:376
 msgid ""
-"Generate a swap file in /home/swap that will be activated on each boot to "
-"have\n"
-"more memory available (Empty value to exit).\n"
-"\n"
-"Swap file in Mb : "
+"Generate a swap file in %s that will be activated on each boot to have more "
+"memory available (empty value to exit)."
 msgstr ""
-"Generuj plik swap w /home/swap który będzie aktywowany przy  każdym\n"
-"uruchomieniu aby było dostępne więcej pamięci (Pusta wartość aby wyjść).\n"
-"\n"
-"Rozmiar pliku swap w Mb: "
+"Generuj plik swap w %s który będzie aktywowany przy każdym uruchomieniu aby "
+"było dostępne więcej pamięci (pusta wartość aby wyjść)."
 
-#: tazusb:365
+#: tazusb:379
+msgid "Swap file in MB: "
+msgstr "Rozmiar pliku swap w MB: "
+
+#: tazusb:382
 msgid "Empty value. Exiting..."
 msgstr "Pusta wartość. Kończenie..."
 
-#: tazusb:385
+#: tazusb:403
 msgid "Clean"
 msgstr "Wyczyść"
 
-#: tazusb:387
-msgid ""
-"Remove old rootfs.gz.unixtimestamp backup filesystems to free up disk space."
+#: tazusb:405
+msgid "Remove old %s backup filesystems to free up disk space."
 msgstr ""
-"Usuń starą kopię zapasową rootfs.gz.unixtimestamp systemu plików aby zwolnić "
-"miejsce na dysku."
+"Usuń starą kopię zapasową %s systemu plików aby zwolnić miejsce na dysku."
 
-#: tazusb:399
+#: tazusb:410
+#, fuzzy
+msgid "Do you wish to remove: %s (Yes/no/exit)? "
+msgstr "Czy chcesz usunąć ustawienia rozdzielczości ekranu (No/yes/exit) ? "
+
+#: tazusb:418
 msgid "No filesystems selected, exiting..."
 msgstr "Nie wybrano systemu plików, kończenie..."
 
-#: tazusb:419
+#: tazusb:438
 msgid "Write filesystem"
 msgstr "Zapisz system plików"
 
-#: tazusb:422
+#: tazusb:440
 msgid ""
-"The command writefs will write all the current filesystem into a suitable\n"
-"cpio archive (rootfs.gz) usable on a bootable LiveUSB media."
+"The command writefs will write all the current filesystem into a suitable "
+"cpio archive (%s) usable on a bootable LiveUSB media."
 msgstr ""
 
-#: tazusb:432
+#: tazusb:444
+msgid "Archive compression: %s"
+msgstr ""
+
+#: tazusb:450
 #, fuzzy
-msgid "Do you wish to remove the sound card and screen configs ? "
+msgid "Do you wish to remove the sound card and screen configs?"
 msgstr "Czy chcesz usunąć ustawienia karty dźwiękowej (No/yes/exit) ? "
 
-#: tazusb:433 tazusb:450
+#: tazusb:451 tazusb:469
 msgid "Press ENTER to keep or answer (No|yes|exit): "
 msgstr ""
 
-#: tazusb:439
+#: tazusb:457
 #, fuzzy
 msgid "Removing current sound card and screen configurations..."
 msgstr "Usuwanie aktualnych ustawień karty dźwiękowej..."
 
-#: tazusb:444
+#: tazusb:462
 #, fuzzy
 msgid "Keeping current sound card and screen configurations..."
 msgstr "Zachowywanie aktualnych ustawień karty dźwiękowej..."
 
-#: tazusb:449
+#: tazusb:468
 #, fuzzy
-msgid "Do you wish to remove local/keymap settings ? "
+msgid "Do you wish to remove local/keymap settings?"
 msgstr "Czy chcesz usunąć ustawienia karty dźwiękowej (No/yes/exit) ? "
 
-#: tazusb:456
+#: tazusb:475
 #, fuzzy
 msgid "Removing current locale/keymap settings..."
 msgstr "Usuwanie aktualnej rozdzielczości ekranu..."
 
-#: tazusb:460
+#: tazusb:479
 #, fuzzy
 msgid "Keeping current locale/keymap settings..."
 msgstr "Zachowywanie aktualnej rozdzielczości ekranu..."
 
-#: tazusb:478
-msgid "Creating rootfs.gz with lzma compression... "
-msgstr "Tworzenie rootfs.gz z kompresją lzma... "
+#: tazusb:512
+msgid "Creating %s with lzma compression... "
+msgstr "Tworzenie %s z kompresją lzma... "
 
-#: tazusb:482
-msgid "Creating rootfs.gz with gzip compression... "
-msgstr "Tworzenie rootfs.gz z kompresją gzip... "
+#: tazusb:516
+msgid "Creating %s with gzip compression... "
+msgstr "Tworzenie %s z kompresją gzip... "
 
-#: tazusb:486
-msgid "Creating rootfs.gz without compression... "
-msgstr "Tworzenie rootfs.gz bez kompresji... "
+#: tazusb:520
+msgid "Creating %s without compression... "
+msgstr "Tworzenie %s bez kompresji... "
 
-#: tazusb:495
-msgid "Moving rootfs.gz to media. Remember to unmount for delayed writes!"
+#: tazusb:531
+msgid "Moving %s to media. Remember to unmount for delayed writes!"
 msgstr ""
-"Przenoszenie rootfs.gz na nośnik. Ponieważ mogą wystąpić opóźnienia w "
-"zapisie, proszę pamiętać aby odmontować urządzenie przed odłączeniem od "
-"komputera !"
+"Przenoszenie %s na nośnik. Ponieważ mogą wystąpić opóźnienia w zapisie, "
+"proszę pamiętać aby odmontować urządzenie przed odłączeniem od komputera!"
 
-#: tazusb:505
-msgid "rootfs.gz is located in /"
-msgstr "rootfs.gz jest zlokalizowany w /"
+#: tazusb:541
+msgid "%s is located in /"
+msgstr "%s jest zlokalizowany w /"
 
-#: tazusb:512
+#: tazusb:545
+msgid "Root filesystem size: %s"
+msgstr ""
+
+#: tazusb:547
 msgid "ENTER to continue..."
 msgstr "ENTER aby kontynuować..."
 
-#: tazusb:518
+#: tazusb:555
 msgid "Format a device"
 msgstr "Formatuj urządzenie"
 
-#: tazusb:542
+#: tazusb:564
+msgid "Device: %s"
+msgstr ""
+
+#: tazusb:572
+msgid "Device %s is ready to use as LiveUSB and/or /home partition."
+msgstr ""
+
+#: tazusb:580
 msgid "Gen a LiveUSB media"
 msgstr "Generuj nośnik LiveUSB"
 
-#: tazusb:568
+#: tazusb:611
 msgid "Please specify a valid filename on the command line."
 msgstr "Proszę wprowadzć poprawną nazwę pliku w linii poleceń."
 
-#: tazusb:572
+#: tazusb:615
 msgid "Copy ISO file to SliTaz LiveUSB media"
 msgstr "Kopiuj plik ISO na nośnik SliTaz LiveUSB"
-
-#~ msgid "Do you wish to remove the screen resolution (No/yes/exit) ? "
-#~ msgstr "Czy chcesz usunąć ustawienia rozdzielczości ekranu (No/yes/exit) ? "
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb/pt_BR.po
--- a/po/tazusb/pt_BR.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb/pt_BR.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 08:56+0100\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2014-03-07 23:20-0300\n"
 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n"
 "Language-Team: Portuguese <i18n@slitaz.org>\n"
@@ -17,37 +17,41 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: tazusb:35
-msgid "SliTaz Live USB - Version:"
-msgstr "SliTaz Live USB - Versão:"
+#: tazusb:34
+msgid "SliTaz Live USB - Version: %s"
+msgstr "SliTaz Live USB - Versão: %s"
 
 #: tazusb:36
-msgid "Usage: "
-msgstr "Uso: "
+msgid "Usage:"
+msgstr "Uso:"
 
 #: tazusb:37
+msgid "%s [command] [compression|device]"
+msgstr ""
+
+#: tazusb:38
 msgid "Commands:"
 msgstr "Comandos:"
 
-#: tazusb:38
+#: tazusb:40
 msgid "Print this short usage."
 msgstr "Mostra esta utilização."
 
-#: tazusb:39
-msgid ""
-"Write the current filesystem to rootfs.gz.\n"
-"  \t\tSupported compression: lzma. gzip, none."
-msgstr ""
-"Escreve o sistema de arquivos atual para rootfs.gz.\n"
-" \t\tCompressões suportadas: lzma, gzip, none (nenhuma)."
-
 #: tazusb:41
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem \n"
-"                (for LiveUSB or /home). Default is ext3."
+"Write the current filesystem to rootfs.gz. Supported compression: lzma, "
+"gzip, none."
 msgstr ""
-"Rotula e formata o dispositivo como ext3, ext2 ou fat32 \n"
-"                (para LiveUSB ou /home). Padrão é ext3."
+"Escreve o sistema de arquivos atual para rootfs.gz. Compressões suportadas: "
+"lzma, gzip, none (nenhuma)."
+
+#: tazusb:42
+msgid ""
+"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"home). Default is ext3."
+msgstr ""
+"Rotula e formata o dispositivo como ext3, ext2 ou fat32 (para LiveUSB ou /"
+"home). Padrão é ext3."
 
 #: tazusb:43
 msgid "Generate a bootable LiveUSB using files from the LiveCD."
@@ -65,177 +69,248 @@
 msgid "Remove old backup filesystems to free disk space."
 msgstr "Remove arquivos de sistema antigo para liberar espaço."
 
-#: tazusb:67
+#: tazusb:64
+msgid ""
+"Please specify the target USB device to %s. You can type 'list' to get a "
+"list of devices, type 'exit' or give an empty value to exit."
+msgstr ""
+
+#: tazusb:68 tazusb:72
 msgid "Device to use: "
 msgstr "Dispositivo a ser utilizado: "
 
-#: tazusb:71
+#: tazusb:77
 msgid "No specified device or exit."
 msgstr "Nenhum dispositivo especificado ou sair."
 
-#: tazusb:101 tazusb:117
+#: tazusb:91
+msgid "Unable to find device %s"
+msgstr ""
+
+#: tazusb:108 tazusb:123
 msgid "Please specify a label for the partition (TazUSB): "
 msgstr "Por favor especifique um rótulo para a partição (TazUSB): "
 
-#: tazusb:127
+#: tazusb:113 tazusb:164 tazusb:172
+msgid "Label: %s"
+msgstr ""
+
+#: tazusb:132
 msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
 msgstr "Por favor escolha ext2, ext3 ou fat32 para formatação (ext3): "
 
-#: tazusb:159 tazusb:167
+#: tazusb:141
+#, fuzzy
+msgid "Please specify the filesystem type to %s."
+msgstr "Por favor escolha ext2, ext3 ou fat32 para formatação (ext3): "
+
+#: tazusb:142
+msgid "Available formats are ext3(default), ext2 or fat32."
+msgstr ""
+
+#: tazusb:143
+msgid "Press enter to keep the default value."
+msgstr ""
+
+#: tazusb:145
+msgid "File system type: "
+msgstr ""
+
+#: tazusb:163 tazusb:171
 msgid "Processing..."
 msgstr "Processando..."
 
-#: tazusb:173
-msgid ""
-"Can't find mkdosfs tool.\\nWould you like to install dosfstools from "
-"repository [y/N] ? "
+#: tazusb:177
+msgid "Can't find %s tool."
+msgstr "Aplicativo %s não encontrado."
+
+#: tazusb:178
+msgid "Would you like to install %s from repository [y/N]? "
+msgstr "Instalar o aplicativo %s a partir do repositório [y/N]? "
+
+#: tazusb:189
+msgid "Sorry. Filesystem %s is not supported."
 msgstr ""
-"Aplicativo mkdosfs não encontrado.\\nInstalar o aplicativo a partir do "
-"repositório [y/N] ? "
 
-#: tazusb:198
+#: tazusb:206
 msgid "Unmounting USB target device..."
 msgstr "Desmontando o dispositivo USB escolhido..."
 
-#: tazusb:206
+#: tazusb:215
 msgid "Mounting USB target device..."
 msgstr "Montando o dispositivo USB escolhido..."
 
-#: tazusb:214
-msgid "Mounting cdrom device..."
-msgstr "Montando o dispositivo CDROM..."
+#: tazusb:224
+msgid "Mounting CD-ROM device..."
+msgstr "Montando o dispositivo CD-ROM..."
 
-#: tazusb:225
-msgid "Unable to mount cdrom or to find a filesystem on it (rootfs.gz)."
+#: tazusb:236
+msgid "Unable to mount CD-ROM or to find a filesystem on it (%s)."
+msgstr "Impossível montar o CD-ROM ou encontrar um sistema de arquivos (%s)."
+
+#: tazusb:258
+msgid "Mounting %s..."
+msgstr "Montando %s..."
+
+#: tazusb:263
+msgid "Unable to mount ISO or to find a filesystem on it (%s)."
+msgstr "Impossível montar a ISO ou encontrar um sistema de arquivos (%s)."
+
+#: tazusb:272
+msgid "Copying needed files from CD-ROM..."
+msgstr "Copiando arquivos requeridos do CD-ROM..."
+
+#: tazusb:286
+msgid "Installing a new MBR to %s"
 msgstr ""
-"Impossível montar o CDROM ou encontrar um sistema de arquivos (rootfs.gz)."
 
-#: tazusb:246
-msgid "Mounting "
-msgstr "Montando "
+#: tazusb:291
+msgid "No new MBR installed to %s"
+msgstr ""
 
-#: tazusb:252
-msgid "Unable to mount iso or to find a filesystem on it (rootfs.gz)."
+#: tazusb:310
+msgid "Installing bootloader: %s"
 msgstr ""
-"Impossível montar a ISO ou encontrar um sistema de arquivos (rootfs.gz)."
 
-#: tazusb:260
-msgid "Copying needed files from cdrom..."
-msgstr "Copiando arquivos requeridos do CDROM..."
+#: tazusb:338
+msgid "Do you want to exit Tazusb or reboot system (Exit/reboot)? "
+msgstr "Sair (Exit) do TazUSB ou reiniciar (reboot) o sistema? "
 
-#: tazusb:322
-msgid "Do you want to exit Tazusb or reboot system (Exit/reboot) ? "
-msgstr "Sair (Exit) do TazUSB ou reiniciar (reboot) o sistema ? "
+#: tazusb:358
+msgid "Setting %s as bootable..."
+msgstr ""
 
-#: tazusb:357
+#: tazusb:374
 msgid "Gen swap"
 msgstr "Gerando swap"
 
-#: tazusb:359
+#: tazusb:376
 msgid ""
-"Generate a swap file in /home/swap that will be activated on each boot to "
-"have\n"
-"more memory available (Empty value to exit).\n"
-"\n"
-"Swap file in Mb : "
+"Generate a swap file in %s that will be activated on each boot to have more "
+"memory available (empty value to exit)."
 msgstr ""
-"Gera arquivo swap em /home/swap a ser ativado durante o boot para\n"
-"obter mais memória disponível (Enter para ignorar).\n"
-"Tamanho do arquivo swap em Mb : "
+"Gera arquivo swap em %s a ser ativado durante o boot para obter mais memória "
+"disponível (enter para ignorar)."
 
-#: tazusb:365
+#: tazusb:379
+msgid "Swap file in MB: "
+msgstr "Tamanho do arquivo swap em MB: "
+
+#: tazusb:382
 msgid "Empty value. Exiting..."
 msgstr "Nenhum valor informado. Saindo..."
 
-#: tazusb:385
+#: tazusb:403
 msgid "Clean"
 msgstr "Limpa"
 
-#: tazusb:387
-msgid ""
-"Remove old rootfs.gz.unixtimestamp backup filesystems to free up disk space."
-msgstr "Remove arquivos rootfs.gz antigos para salvar espaço em disco."
+#: tazusb:405
+msgid "Remove old %s backup filesystems to free up disk space."
+msgstr "Remove arquivos %s antigos para salvar espaço em disco."
 
-#: tazusb:399
+#: tazusb:410
+#, fuzzy
+msgid "Do you wish to remove: %s (Yes/no/exit)? "
+msgstr "Gostaria de remover a seleção de locale e keymap?"
+
+#: tazusb:418
 msgid "No filesystems selected, exiting..."
 msgstr "Nenhum sistema de arquivo selecionado, saindo..."
 
-#: tazusb:419
+#: tazusb:438
 msgid "Write filesystem"
 msgstr "Escrever sistema de arquivo"
 
-#: tazusb:422
+#: tazusb:440
 msgid ""
-"The command writefs will write all the current filesystem into a suitable\n"
-"cpio archive (rootfs.gz) usable on a bootable LiveUSB media."
+"The command writefs will write all the current filesystem into a suitable "
+"cpio archive (%s) usable on a bootable LiveUSB media."
 msgstr ""
-"O comando writefs gravará o sistema de arquivos atual em um arquivo cpio\n"
-"válido (rootfs.gz) para ser utilizado numa mídia LiveUSB."
+"O comando writefs gravará o sistema de arquivos atual em um arquivo cpio "
+"válido (%s) para ser utilizado numa mídia LiveUSB."
 
-#: tazusb:432
-msgid "Do you wish to remove the sound card and screen configs ? "
-msgstr "Gostaria de remover a seleção de placa de som e tela ? "
+#: tazusb:444
+msgid "Archive compression: %s"
+msgstr ""
 
-#: tazusb:433 tazusb:450
+#: tazusb:450
+msgid "Do you wish to remove the sound card and screen configs?"
+msgstr "Gostaria de remover a seleção de placa de som e tela?"
+
+#: tazusb:451 tazusb:469
 msgid "Press ENTER to keep or answer (No|yes|exit): "
 msgstr "Pressione ENTER para manter ou responder (No|yes|exit):"
 
-#: tazusb:439
+#: tazusb:457
 msgid "Removing current sound card and screen configurations..."
 msgstr "Removendo a seleção de placa de som e tela..."
 
-#: tazusb:444
+#: tazusb:462
 msgid "Keeping current sound card and screen configurations..."
 msgstr "Mantendo o seleção de placa de som e tela..."
 
-#: tazusb:449
-msgid "Do you wish to remove local/keymap settings ? "
-msgstr "Gostaria de remover a seleção de locale e keymap ? "
+#: tazusb:468
+msgid "Do you wish to remove local/keymap settings?"
+msgstr "Gostaria de remover a seleção de locale e keymap?"
 
-#: tazusb:456
+#: tazusb:475
 msgid "Removing current locale/keymap settings..."
 msgstr "Removendo a configuração de locale e keymap..."
 
-#: tazusb:460
+#: tazusb:479
 msgid "Keeping current locale/keymap settings..."
 msgstr "Mantendo a configuração de locale e keymap..."
 
-#: tazusb:478
-msgid "Creating rootfs.gz with lzma compression... "
-msgstr "Criando rootfs.gz com compressão lzma... "
+#: tazusb:512
+msgid "Creating %s with lzma compression... "
+msgstr "Criando %s com compressão lzma... "
 
-#: tazusb:482
-msgid "Creating rootfs.gz with gzip compression... "
-msgstr "Criando rootfs.gz com compressão gzip... "
+#: tazusb:516
+msgid "Creating %s with gzip compression... "
+msgstr "Criando %s com compressão gzip... "
 
-#: tazusb:486
-msgid "Creating rootfs.gz without compression... "
-msgstr "Criando rootfs.gz sem compressão... "
+#: tazusb:520
+msgid "Creating %s without compression... "
+msgstr "Criando %s sem compressão... "
 
-#: tazusb:495
-msgid "Moving rootfs.gz to media. Remember to unmount for delayed writes!"
-msgstr "Movendo rootfs.gz para a mídia. Lembre-se de desmontar o dispositivo!"
+#: tazusb:531
+msgid "Moving %s to media. Remember to unmount for delayed writes!"
+msgstr "Movendo %s para a mídia. Lembre-se de desmontar o dispositivo!"
 
-#: tazusb:505
-msgid "rootfs.gz is located in /"
-msgstr "rootfs.gz localizado em /"
+#: tazusb:541
+msgid "%s is located in /"
+msgstr "%s localizado em /"
 
-#: tazusb:512
+#: tazusb:545
+#, fuzzy
+msgid "Root filesystem size: %s"
+msgstr "Escrever sistema de arquivo"
+
+#: tazusb:547
 msgid "ENTER to continue..."
 msgstr "ENTER para continuar..."
 
-#: tazusb:518
+#: tazusb:555
 msgid "Format a device"
 msgstr "Formatar o dispositivo"
 
-#: tazusb:542
+#: tazusb:564
+#, fuzzy
+msgid "Device: %s"
+msgstr "Dispositivo a ser utilizado: "
+
+#: tazusb:572
+msgid "Device %s is ready to use as LiveUSB and/or /home partition."
+msgstr ""
+
+#: tazusb:580
 msgid "Gen a LiveUSB media"
 msgstr "Gera uma mídia LiveUSB"
 
-#: tazusb:568
+#: tazusb:611
 msgid "Please specify a valid filename on the command line."
 msgstr "Por favor especifique um nome de arquivo válido na linha de comando."
 
-#: tazusb:572
+#: tazusb:615
 msgid "Copy ISO file to SliTaz LiveUSB media"
 msgstr "Copia uma imagem ISO para a mídia LiveUSB"
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb/ru.po
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/tazusb/ru.po	Sat Aug 01 22:49:04 2015 +0300
@@ -0,0 +1,324 @@
+# Russian translations for TazUSB
+# Copyright (C) 2015 SliTaz
+# This file is distributed under the same license as the TazUSB package.
+# Aleksej Bobylev <al.bobylev@gmail.com>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TazUSB 4.2.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-01 16:57+0300\n"
+"PO-Revision-Date: 2015-08-01 17:48+0300\n"
+"Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
+"Language-Team: \n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: tazusb:34
+msgid "SliTaz Live USB - Version: %s"
+msgstr "SliTaz Live USB — версия %s"
+
+#: tazusb:36
+msgid "Usage:"
+msgstr "Использование:"
+
+#: tazusb:37
+msgid "%s [command] [compression|device]"
+msgstr "%s [команда] [сжатие|устройство]"
+
+#: tazusb:38
+msgid "Commands:"
+msgstr "Команды:"
+
+#: tazusb:40
+msgid "Print this short usage."
+msgstr "Показать эту краткую справку."
+
+#: tazusb:41
+msgid ""
+"Write the current filesystem to rootfs.gz. Supported compression: lzma, "
+"gzip, none."
+msgstr ""
+"Сохранить текущую файловую систему в файле rootfs.gz. Поддерживаемые типы "
+"сжатия: lzma, gzip, none (без сжатия)."
+
+#: tazusb:42
+msgid ""
+"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or "
+"/home). Default is ext3."
+msgstr ""
+"Форматировать устройство в файловую систему ext3, ext2 или fat32 и присвоить "
+"метку диску (для LiveUSB или /home). По умолчанию ext3."
+
+#: tazusb:43
+msgid "Generate a bootable LiveUSB using files from the LiveCD."
+msgstr "Создать загрузочный LiveUSB используя файлы с LiveCD."
+
+#: tazusb:44
+msgid "Create or recreate and activate additional swap memory."
+msgstr "Создать (или переделать) и включить дополнительный файл подкачки swap."
+
+#: tazusb:45
+msgid "Generate a bootable LiveUSB using files from ISO file."
+msgstr "Создать загрузочный LiveUSB используя файлы из образа ISO."
+
+#: tazusb:46
+msgid "Remove old backup filesystems to free disk space."
+msgstr ""
+"Удалить старые резервные копии файловой системы, чтобы освободить диск."
+
+#: tazusb:64
+msgid ""
+"Please specify the target USB device to %s. You can type 'list' to get a "
+"list of devices, type 'exit' or give an empty value to exit."
+msgstr ""
+"Пожалуйста, укажите целевое устройство USB для команды %s. Вы можете ввести "
+"«list», чтобы получить список устройств, «exit» или ничего не вводить, чтобы "
+"выйти."
+
+#: tazusb:68 tazusb:72
+msgid "Device to use: "
+msgstr "Используемое устройство: "
+
+#: tazusb:77
+msgid "No specified device or exit."
+msgstr "Не указано устройство, выход."
+
+#: tazusb:91
+msgid "Unable to find device %s"
+msgstr "Не удалось найти устройство «%s»"
+
+#: tazusb:108 tazusb:123
+msgid "Please specify a label for the partition (TazUSB): "
+msgstr "Пожалуйста, укажите метку раздела (TazUSB): "
+
+#: tazusb:113 tazusb:164 tazusb:172
+msgid "Label: %s"
+msgstr "Метка: %s"
+
+#: tazusb:132
+msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
+msgstr ""
+"Пожалуйста, укажите тип файловой системы: ext2, ext3 или fat32 (ext3): "
+
+#: tazusb:141
+msgid "Please specify the filesystem type to %s."
+msgstr "Пожалуйста, укажите тип файловой системы для команды «%s»."
+
+#: tazusb:142
+msgid "Available formats are ext3(default), ext2 or fat32."
+msgstr "Доступные форматы: ext3 (по умолчанию), ext2 или fat32."
+
+#: tazusb:143
+msgid "Press enter to keep the default value."
+msgstr "Нажмите Enter, чтобы сохранить текущее значение."
+
+#: tazusb:145
+msgid "File system type: "
+msgstr "Тип файловой системы: "
+
+#: tazusb:163 tazusb:171
+msgid "Processing..."
+msgstr "Обработка…"
+
+#: tazusb:177
+msgid "Can't find %s tool."
+msgstr "Не удалось найти программу %s."
+
+#: tazusb:178
+msgid "Would you like to install %s from repository [y/N]? "
+msgstr "Хотите установить пакет «%s» из репозитория [y/N]? "
+
+#: tazusb:189
+msgid "Sorry. Filesystem %s is not supported."
+msgstr "Извините. Файловая система «%s» не поддерживается."
+
+#: tazusb:206
+msgid "Unmounting USB target device..."
+msgstr "Отключение целевого устройства USB…"
+
+#: tazusb:215
+msgid "Mounting USB target device..."
+msgstr "Подключение целевого устройства USB…"
+
+#: tazusb:224
+msgid "Mounting CD-ROM device..."
+msgstr "Подключение устройства CD-ROM…"
+
+#: tazusb:236
+msgid "Unable to mount CD-ROM or to find a filesystem on it (%s)."
+msgstr "Не удалось подключить CD-ROM или найти на нём файловую систему (%s)."
+
+#: tazusb:258
+msgid "Mounting %s..."
+msgstr "Подключение %s…"
+
+#: tazusb:263
+msgid "Unable to mount ISO or to find a filesystem on it (%s)."
+msgstr "Не удалось подключить образ ISO или найти в нём файловую систему (%s)."
+
+#: tazusb:272
+msgid "Copying needed files from CD-ROM..."
+msgstr "Копирование необходимых файлов с CD-ROM…"
+
+#: tazusb:286
+msgid "Installing a new MBR to %s"
+msgstr "Установка новой MBR на %s"
+
+#: tazusb:291
+msgid "No new MBR installed to %s"
+msgstr "Новая MBR не была установлена на %s"
+
+#: tazusb:310
+msgid "Installing bootloader: %s"
+msgstr "Установка загрузчика: %s"
+
+#: tazusb:338
+msgid "Do you want to exit Tazusb or reboot system (Exit/reboot)? "
+msgstr "Желаете выйти из Tazusb (exit) или перезагрузить систему (reboot)? "
+
+#: tazusb:358
+msgid "Setting %s as bootable..."
+msgstr "Установка загрузочного бита на %s…"
+
+#: tazusb:374
+msgid "Gen swap"
+msgstr "Создание swap"
+
+#: tazusb:376
+msgid ""
+"Generate a swap file in %s that will be activated on each boot to have more "
+"memory available (empty value to exit)."
+msgstr ""
+"Будет создан файл подкачки в %s. Он будет использоваться при каждой "
+"перезагрузке для того, чтобы увеличить размер доступной памяти (пустой ввод, "
+"чтобы выйти)."
+
+#: tazusb:379
+msgid "Swap file in MB: "
+msgstr "Размер файла подкачки в МБ: "
+
+#: tazusb:382
+msgid "Empty value. Exiting..."
+msgstr "Пустое значение. Выход…"
+
+#: tazusb:403
+msgid "Clean"
+msgstr "Очистка"
+
+#: tazusb:405
+msgid "Remove old %s backup filesystems to free up disk space."
+msgstr ""
+"Будут удалены старые файлы %s для того, чтобы увеличить доступное дисковое "
+"пространство."
+
+#: tazusb:410
+msgid "Do you wish to remove: %s (Yes/no/exit)? "
+msgstr "Хотите ли вы удалить «%s» (Yes/no/exit)? "
+
+#: tazusb:418
+msgid "No filesystems selected, exiting..."
+msgstr "Файловая система не выбрана, выход…"
+
+#: tazusb:438
+msgid "Write filesystem"
+msgstr "Запись файловой системы"
+
+#: tazusb:440
+msgid ""
+"The command writefs will write all the current filesystem into a suitable "
+"cpio archive (%s) usable on a bootable LiveUSB media."
+msgstr ""
+"Команда writefs запишет текущую файловую систему в соответствующий архив "
+"cpio (%s), который можно использовать для загрузочного LiveUSB."
+
+#: tazusb:444
+msgid "Archive compression: %s"
+msgstr "Сжатие архива: %s"
+
+#: tazusb:450
+msgid "Do you wish to remove the sound card and screen configs?"
+msgstr "Хотите ли вы удалить настройки звуковой карты и экрана?"
+
+#: tazusb:451 tazusb:469
+msgid "Press ENTER to keep or answer (No|yes|exit): "
+msgstr "Нажмите Enter, чтобы сохранить настройки или ответьте (No|yes|exit): "
+
+#: tazusb:457
+msgid "Removing current sound card and screen configurations..."
+msgstr "Удаление настроек текущих звуковой карты и экрана…"
+
+#: tazusb:462
+msgid "Keeping current sound card and screen configurations..."
+msgstr "Настройки текущих звуковой карты и экрана сохранены…"
+
+#: tazusb:468
+msgid "Do you wish to remove local/keymap settings?"
+msgstr "Хотите ли вы удалить настройки локали и раскладки клавиатуры?"
+
+#: tazusb:475
+msgid "Removing current locale/keymap settings..."
+msgstr "Удаление настроек текущей локали и раскладки клавиатуры…"
+
+#: tazusb:479
+msgid "Keeping current locale/keymap settings..."
+msgstr "Настройки текущей локали и клавиатуры сохранены…"
+
+#: tazusb:512
+msgid "Creating %s with lzma compression... "
+msgstr "Создание %s со сжатием lzma… "
+
+#: tazusb:516
+msgid "Creating %s with gzip compression... "
+msgstr "Создание %s со сжатием gzip… "
+
+#: tazusb:520
+msgid "Creating %s without compression... "
+msgstr "Создание %s без сжатия… "
+
+#: tazusb:531
+msgid "Moving %s to media. Remember to unmount for delayed writes!"
+msgstr ""
+"Перемещение %s на носитель. Не забудьте его отключить, помните об отложенной "
+"записи!"
+
+#: tazusb:541
+msgid "%s is located in /"
+msgstr "Файл %s расположен в /"
+
+#: tazusb:545
+msgid "Root filesystem size: %s"
+msgstr "Размер корневой файловой системы: %s"
+
+#: tazusb:547
+msgid "ENTER to continue..."
+msgstr "Нажмите Enter для продолжения…"
+
+#: tazusb:555
+msgid "Format a device"
+msgstr "Форматирование устройства"
+
+#: tazusb:564
+msgid "Device: %s"
+msgstr "Устройство: %s"
+
+#: tazusb:572
+msgid "Device %s is ready to use as LiveUSB and/or /home partition."
+msgstr ""
+"Устройство %s готово к использованию в качестве LiveUSB и/или раздела /home."
+
+#: tazusb:580
+msgid "Gen a LiveUSB media"
+msgstr "Создание носителя LiveUSB"
+
+#: tazusb:611
+msgid "Please specify a valid filename on the command line."
+msgstr "Пожалуйста, укажите допустимое имя файла в командной строке."
+
+#: tazusb:615
+msgid "Copy ISO file to SliTaz LiveUSB media"
+msgstr "Копирование образа ISO в носитель SliTaz LiveUSB"
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb/tazusb.pot
--- a/po/tazusb/tazusb.pot	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb/tazusb.pot	Sat Aug 01 22:49:04 2015 +0300
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: TazUSB 4.2.2\n"
+"Project-Id-Version: TazUSB 4.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 08:56+0100\n"
+"POT-Creation-Date: 2015-08-01 22:14+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,32 +17,36 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tazusb:35
-msgid "SliTaz Live USB - Version:"
+#: tazusb:34
+msgid "SliTaz Live USB - Version: %s"
 msgstr ""
 
 #: tazusb:36
-msgid "Usage: "
+msgid "Usage:"
 msgstr ""
 
 #: tazusb:37
+msgid "%s [command] [compression|device]"
+msgstr ""
+
+#: tazusb:38
 msgid "Commands:"
 msgstr ""
 
-#: tazusb:38
+#: tazusb:40
 msgid "Print this short usage."
 msgstr ""
 
-#: tazusb:39
-msgid ""
-"Write the current filesystem to rootfs.gz.\n"
-"  \t\tSupported compression: lzma. gzip, none."
-msgstr ""
-
 #: tazusb:41
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem \n"
-"                (for LiveUSB or /home). Default is ext3."
+"Write the current filesystem to rootfs.gz. Supported compression: lzma, "
+"gzip, none."
+msgstr ""
+
+#: tazusb:42
+msgid ""
+"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"home). Default is ext3."
 msgstr ""
 
 #: tazusb:43
@@ -61,168 +65,240 @@
 msgid "Remove old backup filesystems to free disk space."
 msgstr ""
 
-#: tazusb:67
+#: tazusb:64
+msgid ""
+"Please specify the target USB device to %s. You can type 'list' to get a "
+"list of devices, type 'exit' or give an empty value to exit."
+msgstr ""
+
+#: tazusb:68 tazusb:72
 msgid "Device to use: "
 msgstr ""
 
-#: tazusb:71
+#: tazusb:77
 msgid "No specified device or exit."
 msgstr ""
 
-#: tazusb:101 tazusb:117
+#: tazusb:91
+msgid "Unable to find device %s"
+msgstr ""
+
+#: tazusb:108 tazusb:123
 msgid "Please specify a label for the partition (TazUSB): "
 msgstr ""
 
-#: tazusb:127
+#: tazusb:113 tazusb:164 tazusb:172
+msgid "Label: %s"
+msgstr ""
+
+#: tazusb:132
 msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
 msgstr ""
 
-#: tazusb:159 tazusb:167
+#: tazusb:141
+msgid "Please specify the filesystem type to %s."
+msgstr ""
+
+#: tazusb:142
+msgid "Available formats are ext3(default), ext2 or fat32."
+msgstr ""
+
+#: tazusb:143
+msgid "Press enter to keep the default value."
+msgstr ""
+
+#: tazusb:145
+msgid "File system type: "
+msgstr ""
+
+#: tazusb:163 tazusb:171
 msgid "Processing..."
 msgstr ""
 
-#: tazusb:173
-msgid ""
-"Can't find mkdosfs tool.\\nWould you like to install dosfstools from "
-"repository [y/N] ? "
+#: tazusb:177
+msgid "Can't find %s tool."
 msgstr ""
 
-#: tazusb:198
+#: tazusb:178
+msgid "Would you like to install %s from repository [y/N]? "
+msgstr ""
+
+#: tazusb:189
+msgid "Sorry. Filesystem %s is not supported."
+msgstr ""
+
+#: tazusb:206
 msgid "Unmounting USB target device..."
 msgstr ""
 
-#: tazusb:206
+#: tazusb:215
 msgid "Mounting USB target device..."
 msgstr ""
 
-#: tazusb:214
-msgid "Mounting cdrom device..."
+#: tazusb:224
+msgid "Mounting CD-ROM device..."
 msgstr ""
 
-#: tazusb:225
-msgid "Unable to mount cdrom or to find a filesystem on it (rootfs.gz)."
+#: tazusb:236
+msgid "Unable to mount CD-ROM or to find a filesystem on it (%s)."
 msgstr ""
 
-#: tazusb:246
-msgid "Mounting "
+#: tazusb:258
+msgid "Mounting %s..."
 msgstr ""
 
-#: tazusb:252
-msgid "Unable to mount iso or to find a filesystem on it (rootfs.gz)."
+#: tazusb:263
+msgid "Unable to mount ISO or to find a filesystem on it (%s)."
 msgstr ""
 
-#: tazusb:260
-msgid "Copying needed files from cdrom..."
+#: tazusb:272
+msgid "Copying needed files from CD-ROM..."
 msgstr ""
 
-#: tazusb:322
-msgid "Do you want to exit Tazusb or reboot system (Exit/reboot) ? "
+#: tazusb:286
+msgid "Installing a new MBR to %s"
 msgstr ""
 
-#: tazusb:357
+#: tazusb:291
+msgid "No new MBR installed to %s"
+msgstr ""
+
+#: tazusb:310
+msgid "Installing bootloader: %s"
+msgstr ""
+
+#: tazusb:338
+msgid "Do you want to exit Tazusb or reboot system (Exit/reboot)? "
+msgstr ""
+
+#: tazusb:358
+msgid "Setting %s as bootable..."
+msgstr ""
+
+#: tazusb:374
 msgid "Gen swap"
 msgstr ""
 
-#: tazusb:359
+#: tazusb:376
 msgid ""
-"Generate a swap file in /home/swap that will be activated on each boot to "
-"have\n"
-"more memory available (Empty value to exit).\n"
-"\n"
-"Swap file in Mb : "
+"Generate a swap file in %s that will be activated on each boot to have more "
+"memory available (empty value to exit)."
 msgstr ""
 
-#: tazusb:365
+#: tazusb:379
+msgid "Swap file in MB: "
+msgstr ""
+
+#: tazusb:382
 msgid "Empty value. Exiting..."
 msgstr ""
 
-#: tazusb:385
+#: tazusb:403
 msgid "Clean"
 msgstr ""
 
-#: tazusb:387
-msgid ""
-"Remove old rootfs.gz.unixtimestamp backup filesystems to free up disk space."
+#: tazusb:405
+msgid "Remove old %s backup filesystems to free up disk space."
 msgstr ""
 
-#: tazusb:399
+#: tazusb:410
+msgid "Do you wish to remove: %s (Yes/no/exit)? "
+msgstr ""
+
+#: tazusb:418
 msgid "No filesystems selected, exiting..."
 msgstr ""
 
-#: tazusb:419
+#: tazusb:438
 msgid "Write filesystem"
 msgstr ""
 
-#: tazusb:422
+#: tazusb:440
 msgid ""
-"The command writefs will write all the current filesystem into a suitable\n"
-"cpio archive (rootfs.gz) usable on a bootable LiveUSB media."
+"The command writefs will write all the current filesystem into a suitable "
+"cpio archive (%s) usable on a bootable LiveUSB media."
 msgstr ""
 
-#: tazusb:432
-msgid "Do you wish to remove the sound card and screen configs ? "
+#: tazusb:444
+msgid "Archive compression: %s"
 msgstr ""
 
-#: tazusb:433 tazusb:450
+#: tazusb:450
+msgid "Do you wish to remove the sound card and screen configs?"
+msgstr ""
+
+#: tazusb:451 tazusb:469
 msgid "Press ENTER to keep or answer (No|yes|exit): "
 msgstr ""
 
-#: tazusb:439
+#: tazusb:457
 msgid "Removing current sound card and screen configurations..."
 msgstr ""
 
-#: tazusb:444
+#: tazusb:462
 msgid "Keeping current sound card and screen configurations..."
 msgstr ""
 
-#: tazusb:449
-msgid "Do you wish to remove local/keymap settings ? "
+#: tazusb:468
+msgid "Do you wish to remove local/keymap settings?"
 msgstr ""
 
-#: tazusb:456
+#: tazusb:475
 msgid "Removing current locale/keymap settings..."
 msgstr ""
 
-#: tazusb:460
+#: tazusb:479
 msgid "Keeping current locale/keymap settings..."
 msgstr ""
 
-#: tazusb:478
-msgid "Creating rootfs.gz with lzma compression... "
+#: tazusb:512
+msgid "Creating %s with lzma compression... "
 msgstr ""
 
-#: tazusb:482
-msgid "Creating rootfs.gz with gzip compression... "
+#: tazusb:516
+msgid "Creating %s with gzip compression... "
 msgstr ""
 
-#: tazusb:486
-msgid "Creating rootfs.gz without compression... "
+#: tazusb:520
+msgid "Creating %s without compression... "
 msgstr ""
 
-#: tazusb:495
-msgid "Moving rootfs.gz to media. Remember to unmount for delayed writes!"
+#: tazusb:531
+msgid "Moving %s to media. Remember to unmount for delayed writes!"
 msgstr ""
 
-#: tazusb:505
-msgid "rootfs.gz is located in /"
+#: tazusb:541
+msgid "%s is located in /"
 msgstr ""
 
-#: tazusb:512
+#: tazusb:545
+msgid "Root filesystem size: %s"
+msgstr ""
+
+#: tazusb:547
 msgid "ENTER to continue..."
 msgstr ""
 
-#: tazusb:518
+#: tazusb:555
 msgid "Format a device"
 msgstr ""
 
-#: tazusb:542
+#: tazusb:564
+msgid "Device: %s"
+msgstr ""
+
+#: tazusb:572
+msgid "Device %s is ready to use as LiveUSB and/or /home partition."
+msgstr ""
+
+#: tazusb:580
 msgid "Gen a LiveUSB media"
 msgstr ""
 
-#: tazusb:568
+#: tazusb:611
 msgid "Please specify a valid filename on the command line."
 msgstr ""
 
-#: tazusb:572
+#: tazusb:615
 msgid "Copy ISO file to SliTaz LiveUSB media"
 msgstr ""
diff -r 7cdf12d25925 -r 8ddffadf56a6 po/tazusb/zh_CN.po
--- a/po/tazusb/zh_CN.po	Mon Jul 27 21:45:20 2015 +0000
+++ b/po/tazusb/zh_CN.po	Sat Aug 01 22:49:04 2015 +0300
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: TazUSB 4.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-15 08:56+0100\n"
+"POT-Creation-Date: 2015-08-01 16:41+0300\n"
 "PO-Revision-Date: 2014-07-02 13:23+0800\n"
 "Last-Translator: 张文宇 <jame987165702@gmail.com>\n"
 "Language-Team: \n"
@@ -18,36 +18,38 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.6.5\n"
 
-#: tazusb:35
-msgid "SliTaz Live USB - Version:"
-msgstr "SliTaz Live USB - Version:"
+#: tazusb:34
+msgid "SliTaz Live USB - Version: %s"
+msgstr "SliTaz Live USB - Version: %s"
 
 #: tazusb:36
-msgid "Usage: "
+msgid "Usage:"
 msgstr "用法:"
 
 #: tazusb:37
+msgid "%s [command] [compression|device]"
+msgstr ""
+
+#: tazusb:38
 msgid "Commands:"
 msgstr "命令:"
 
-#: tazusb:38
+#: tazusb:40
 msgid "Print this short usage."
 msgstr "打印简短的使用方法。"
 
-#: tazusb:39
-msgid ""
-"Write the current filesystem to rootfs.gz.\n"
-"  \t\tSupported compression: lzma. gzip, none."
-msgstr ""
-"目前文件系统写入到rootfs.gz。\n"
-"  \t\t支持LZMA压缩、GZIP压缩和不压缩。"
-
 #: tazusb:41
 msgid ""
-"Format and label device with ext3, ext2 or fat32 filesystem \n"
-"                (for LiveUSB or /home). Default is ext3."
+"Write the current filesystem to rootfs.gz. Supported compression: lzma, "
+"gzip, none."
+msgstr "目前文件系统写入到rootfs.gz。支持LZMA压缩、GZIP压缩和不压缩。"
+
+#: tazusb:42
+msgid ""
+"Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /"
+"home). Default is ext3."
 msgstr ""
-"格式化成ext3文件系统，或FAT32文件系统、Ext2文件系统（为LiveUSB或 / home）。默"
+"格式化成ext3文件系统，或FAT32文件系统、Ext2文件系统（为LiveUSB或 /home）。默"
 "认为ext3。"
 
 #: tazusb:43
@@ -66,174 +68,245 @@
 msgid "Remove old backup filesystems to free disk space."
 msgstr "删除旧的备份文件以释放磁盘空间。"
 
-#: tazusb:67
+#: tazusb:64
+msgid ""
+"Please specify the target USB device to %s. You can type 'list' to get a "
+"list of devices, type 'exit' or give an empty value to exit."
+msgstr ""
+
+#: tazusb:68 tazusb:72
 msgid "Device to use: "
 msgstr "设备的使用："
 
-#: tazusb:71
+#: tazusb:77
 msgid "No specified device or exit."
 msgstr "没有指定的设备或退出。"
 
-#: tazusb:101 tazusb:117
+#: tazusb:91
+msgid "Unable to find device %s"
+msgstr ""
+
+#: tazusb:108 tazusb:123
 msgid "Please specify a label for the partition (TazUSB): "
 msgstr "请指定标签为这个分区（tazusb）："
 
-#: tazusb:127
+#: tazusb:113 tazusb:164 tazusb:172
+msgid "Label: %s"
+msgstr ""
+
+#: tazusb:132
 msgid "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
 msgstr "请指定一个文件系统类型的ext2，ext3或FAT32（ext3）："
 
-#: tazusb:159 tazusb:167
+#: tazusb:141
+msgid "Please specify the filesystem type to %s."
+msgstr ""
+
+#: tazusb:142
+msgid "Available formats are ext3(default), ext2 or fat32."
+msgstr ""
+
+#: tazusb:143
+msgid "Press enter to keep the default value."
+msgstr ""
+
+#: tazusb:145
+msgid "File system type: "
+msgstr ""
+
+#: tazusb:163 tazusb:171
 msgid "Processing..."
 msgstr "处理中…"
 
-#: tazusb:173
-msgid ""
-"Can't find mkdosfs tool.\\nWould you like to install dosfstools from "
-"repository [y/N] ? "
-msgstr "找不到MKDOSFS工具。\\n要安装DOSFS工具库[ Y/N ]？"
+#: tazusb:177
+msgid "Can't find %s tool."
+msgstr "找不到%s工具。"
 
-#: tazusb:198
+#: tazusb:178
+msgid "Would you like to install %s from repository [y/N]? "
+msgstr "要安装%s工具库[y/N]？"
+
+#: tazusb:189
+msgid "Sorry. Filesystem %s is not supported."
+msgstr ""
+
+#: tazusb:206
 msgid "Unmounting USB target device..."
 msgstr "取消连接USB目标设备…"
 
-#: tazusb:206
+#: tazusb:215
 msgid "Mounting USB target device..."
 msgstr "安装USB目标设备…"
 
-#: tazusb:214
-msgid "Mounting cdrom device..."
+#: tazusb:224
+msgid "Mounting CD-ROM device..."
 msgstr "安装光盘装置…"
 
-#: tazusb:225
-msgid "Unable to mount cdrom or to find a filesystem on it (rootfs.gz)."
-msgstr "无法安装光盘或者对它找到一个文件系统(rootfs.gz)。"
+#: tazusb:236
+msgid "Unable to mount CD-ROM or to find a filesystem on it (%s)."
+msgstr "无法安装光盘或者对它找到一个文件系统(%s)。"
 
-#: tazusb:246
-msgid "Mounting "
-msgstr "挂载"
+#: tazusb:258
+msgid "Mounting %s..."
+msgstr "挂载%s…"
 
-#: tazusb:252
-msgid "Unable to mount iso or to find a filesystem on it (rootfs.gz)."
-msgstr "无法挂载ISO或者对它找到一个文件系统（rootfs.gz）。"
+#: tazusb:263
+msgid "Unable to mount ISO or to find a filesystem on it (%s)."
+msgstr "无法挂载ISO或者对它找到一个文件系统（%s）。"
 
-#: tazusb:260
-msgid "Copying needed files from cdrom..."
+#: tazusb:272
+msgid "Copying needed files from CD-ROM..."
 msgstr "从光盘复制所需的文件…"
 
-#: tazusb:322
-msgid "Do you want to exit Tazusb or reboot system (Exit/reboot) ? "
+#: tazusb:286
+msgid "Installing a new MBR to %s"
+msgstr ""
+
+#: tazusb:291
+msgid "No new MBR installed to %s"
+msgstr ""
+
+#: tazusb:310
+msgid "Installing bootloader: %s"
+msgstr ""
+
+#: tazusb:338
+msgid "Do you want to exit Tazusb or reboot system (Exit/reboot)? "
 msgstr "你要退出或重新启动系统（Exit/reboot）？"
 
-#: tazusb:357
+#: tazusb:358
+msgid "Setting %s as bootable..."
+msgstr ""
+
+#: tazusb:374
 msgid "Gen swap"
 msgstr "创建交换文件"
 
-#: tazusb:359
+#: tazusb:376
 msgid ""
-"Generate a swap file in /home/swap that will be activated on each boot to "
-"have\n"
-"more memory available (Empty value to exit).\n"
-"\n"
-"Swap file in Mb : "
-msgstr ""
-"生成/home/swap交换文件将被激活，在每次开机有\n"
-"更多的内存（退出空值）。\n"
-"\n"
-"交换文件大小（MB）："
+"Generate a swap file in %s that will be activated on each boot to have more "
+"memory available (empty value to exit)."
+msgstr "生成%s交换文件将被激活，在每次开机有 更多的内存（退出空值）。"
 
-#: tazusb:365
+#: tazusb:379
+msgid "Swap file in MB: "
+msgstr "交换文件大小（MB）："
+
+#: tazusb:382
 msgid "Empty value. Exiting..."
 msgstr "空值。终止"
 
-#: tazusb:385
+#: tazusb:403
 msgid "Clean"
 msgstr "清洁"
 
-#: tazusb:387
-msgid ""
-"Remove old rootfs.gz.unixtimestamp backup filesystems to free up disk space."
-msgstr "删除旧的rootfs.gz.unixtimestamp备份文件以释放磁盘空间。"
+#: tazusb:405
+msgid "Remove old %s backup filesystems to free up disk space."
+msgstr "删除旧的%s备份文件以释放磁盘空间。"
 
-#: tazusb:399
+#: tazusb:410
+#, fuzzy
+msgid "Do you wish to remove: %s (Yes/no/exit)? "
+msgstr "你想删除 区域设置/键盘映射设置 吗？"
+
+#: tazusb:418
 msgid "No filesystems selected, exiting..."
 msgstr "没有文件系统选择. 终止"
 
-#: tazusb:419
+#: tazusb:438
 msgid "Write filesystem"
 msgstr "写文件系统"
 
-#: tazusb:422
+#: tazusb:440
 msgid ""
-"The command writefs will write all the current filesystem into a suitable\n"
-"cpio archive (rootfs.gz) usable on a bootable LiveUSB media."
+"The command writefs will write all the current filesystem into a suitable "
+"cpio archive (%s) usable on a bootable LiveUSB media."
 msgstr ""
-"命令writefs会写的所有文件系统到一个 合适的\n"
-"  cpio存档（rootfs.gz），使用一个可引导LiveUSB媒体。"
+"命令writefs会写的所有文件系统到一个 合适的 cpio存档（%s），使用一个可引导"
+"LiveUSB媒体。"
 
-#: tazusb:432
-msgid "Do you wish to remove the sound card and screen configs ? "
+#: tazusb:444
+msgid "Archive compression: %s"
+msgstr ""
+
+#: tazusb:450
+msgid "Do you wish to remove the sound card and screen configs?"
 msgstr "你想删除的声卡和屏幕配置吗？"
 
-#: tazusb:433 tazusb:450
+#: tazusb:451 tazusb:469
 msgid "Press ENTER to keep or answer (No|yes|exit): "
 msgstr "按回车键继续或选择选项 ：没有|是|推出 (输入：No|yes|exit): "
 
-#: tazusb:439
+#: tazusb:457
 msgid "Removing current sound card and screen configurations..."
 msgstr "删除当前的声卡和屏幕配置…"
 
-#: tazusb:444
+#: tazusb:462
 msgid "Keeping current sound card and screen configurations..."
 msgstr "保持目前的声卡和屏幕配置…"
 
-#: tazusb:449
-msgid "Do you wish to remove local/keymap settings ? "
+#: tazusb:468
+msgid "Do you wish to remove local/keymap settings?"
 msgstr "你想删除 区域设置/键盘映射设置 吗？"
 
-#: tazusb:456
+#: tazusb:475
 msgid "Removing current locale/keymap settings..."
 msgstr "删除当前 区域设置/键盘映射设置…"
 
-#: tazusb:460
+#: tazusb:479
 msgid "Keeping current locale/keymap settings..."
 msgstr "保持当前 区域设置/键盘映射设置…"
 
-#: tazusb:478
-msgid "Creating rootfs.gz with lzma compression... "
-msgstr "创建压缩（lzma）rootfs.gz…"
+#: tazusb:512
+msgid "Creating %s with lzma compression... "
+msgstr "创建压缩（lzma）%s…"
 
-#: tazusb:482
-msgid "Creating rootfs.gz with gzip compression... "
-msgstr "创建压缩（gzip ）rootfs.gz…"
+#: tazusb:516
+msgid "Creating %s with gzip compression... "
+msgstr "创建压缩（gzip ）%s…"
 
-#: tazusb:486
-msgid "Creating rootfs.gz without compression... "
-msgstr "创建rootfs.gz（无压缩）中…"
+#: tazusb:520
+msgid "Creating %s without compression... "
+msgstr "创建%s（无压缩）中…"
 
-#: tazusb:495
-msgid "Moving rootfs.gz to media. Remember to unmount for delayed writes!"
-msgstr "移动rootfs.gz到LiveUSB媒体。请记住取消延迟写入！"
+#: tazusb:531
+msgid "Moving %s to media. Remember to unmount for delayed writes!"
+msgstr "移动%s到LiveUSB媒体。请记住取消延迟写入！"
 
-#: tazusb:505
-msgid "rootfs.gz is located in /"
-msgstr "rootfs.gz位于 /"
+#: tazusb:541
+msgid "%s is located in /"
+msgstr "%s位于 /"
 
-#: tazusb:512
+#: tazusb:545
+#, fuzzy
+msgid "Root filesystem size: %s"
+msgstr "写文件系统"
+
+#: tazusb:547
 msgid "ENTER to continue..."
 msgstr "回车继续…"
 
-#: tazusb:518
+#: tazusb:555
 msgid "Format a device"
 msgstr "格式化一个装置"
 
-#: tazusb:542
+#: tazusb:564
+#, fuzzy
+msgid "Device: %s"
+msgstr "设备的使用："
+
+#: tazusb:572
+msgid "Device %s is ready to use as LiveUSB and/or /home partition."
+msgstr ""
+
+#: tazusb:580
 msgid "Gen a LiveUSB media"
 msgstr "制作（可能指： # tazusb gen-liveusb 命令）一个LiveUSB设备"
 
-#: tazusb:568
+#: tazusb:611
 msgid "Please specify a valid filename on the command line."
 msgstr "请在命令行中指定一个有效的文件名。"
 
-#: tazusb:572
+#: tazusb:615
 msgid "Copy ISO file to SliTaz LiveUSB media"
 msgstr "复制ISO文件到 SliTaz LiveUSB 设备"
diff -r 7cdf12d25925 -r 8ddffadf56a6 tazusb
--- a/tazusb	Mon Jul 27 21:45:20 2015 +0000
+++ b/tazusb	Sat Aug 01 22:49:04 2015 +0300
@@ -8,340 +8,354 @@
 #
 # Authors: see AUTHORS file
 #
+
 VERSION=4.2.6
 
 . /lib/libtaz.sh
 
-# Include gettext helper script.
-. /usr/bin/gettext.sh
+# Export package name for gettext.
+export TEXTDOMAIN='tazusb'
 
-# Export package name for gettext.
-TEXTDOMAIN='tazusb'
-export TEXTDOMAIN
+COMMAND="$1"
+TARGET_ROOT='/media/flash'
+DRIVE_NAME="$(grep "drive name" < /proc/sys/dev/cdrom/info | cut -f3)"
+CDROM="/dev/$DRIVE_NAME"
+LOG="/tmp/$(basename $0).log"
 
-COMMAND=$1
-TARGET_ROOT=/media/flash
-DRIVE_NAME=$(grep "drive name" < /proc/sys/dev/cdrom/info | cut -f 3)
-CDROM=/dev/$DRIVE_NAME
-LOG=/tmp/$(basename $0).log
 
 #
 # Tazusb functions
 #
 
+
 # Print the usage.
-usage ()
-{
-	echo -e "`gettext \"SliTaz Live USB - Version:\"` $VERSION\n
-\033[1m`gettext \"Usage: \"`\033[0m `basename $0` [command] [compression|device]
-\033[1m`gettext \"Commands:\"`\033[0m\n
-  usage     	`gettext \"Print this short usage.\"`
-  writefs 	`gettext \"Write the current filesystem to rootfs.gz.
-  		Supported compression: lzma. gzip, none.\"`
-  format	`gettext \"Format and label device with ext3, ext2 or fat32 filesystem 
-                (for LiveUSB or /home). Default is ext3.\"`
-  gen-liveusb 	`gettext \"Generate a bootable LiveUSB using files from the LiveCD.\"`
-  gen-swap      `gettext \"Create or recreate and activate additional swap memory.\"`
-  gen-iso2usb   `gettext \"Generate a bootable LiveUSB using files from ISO file.\"`
-  clean         `gettext \"Remove old backup filesystems to free disk space.\"`\n"
+
+usage () {
+	_ 'SliTaz Live USB - Version: %s' "$VERSION"
+	newline
+	boldify "$(_n 'Usage:')"
+	echo -n '  '; _ '%s [command] [compression|device]' "$(basename $0)"
+	boldify "$(_n 'Commands:')"
+	optlist "\
+usage		$(_ 'Print this short usage.')
+writefs		$(_ 'Write the current filesystem to rootfs.gz. Supported compression: lzma, gzip, none.')
+format		$(_ 'Format and label device with ext3, ext2 or fat32 filesystem (for LiveUSB or /home). Default is ext3.')
+gen-liveusb	$(_ 'Generate a bootable LiveUSB using files from the LiveCD.')
+gen-swap	$(_ 'Create or recreate and activate additional swap memory.')
+gen-iso2usb	$(_ 'Generate a bootable LiveUSB using files from ISO file.')
+clean		$(_ 'Remove old backup filesystems to free disk space.')
+"
+	newline
 }
 
+
 # Display a list of available partitions.
-fdisk_list()
-{
-	echo "----"
+
+fdisk_list() {
+	separator '-'
 	fdisk -l | grep ^/dev/sd*
-	echo "----"
+	separator '-'
 }
 
+
 # We need a USB media to install.
-ask_for_device()
-{
-	gettext "\
-Please specify the target USB device to $COMMAND. You can type 'list' to 
-get a list of devices, type 'exit' or give an empty value to exit.
 
-Device to use: "; read anser
-	while [ "$anser" == "list" ]; do
+ask_for_device() {
+	longline "$(_ "Please specify the target USB device to %s. You can type \
+'list' to get a list of devices, type 'exit' or give an empty value to exit." \
+"$COMMAND")"
+	newline
+	_n 'Device to use: '; read answer
+
+	while [ "$answer" == 'list' ]; do
 		fdisk_list
-		gettext "Device to use: "; read anser
+		_n 'Device to use: '; read answer
 	done
-	if [ "$anser" = "" -o "$anser" = "exit" ]; then
-		echo ""
-		gettext "No specified device or exit."
-		echo ""
+
+	if [ -z "$answer" -o "$answer" == 'exit' ]; then
+		newline
+		_ 'No specified device or exit.'
 		exit 0
 	else
-		DEVICE=$anser
+		DEVICE="$answer"
 	fi
 }
 
+
 # Verify a device exists before format or install
-check_for_device()
-{
-	IFDEV=`fdisk -l | grep $DEVICE`
+
+check_for_device() {
+	IFDEV="$(fdisk -l | grep $DEVICE)"
 	if [ -z "$IFDEV" ]; then
-		echo ""
-		gettext "Unable to find device: $DEVICE"
-		echo ""
+		newline
+		_ 'Unable to find device %s' "$DEVICE"
 		exit 0
 	fi
 }
 
+
 # gets the UUID and filesystem type
-get_part_info()
-{
-	UUID=`blkid -s UUID -o value $DEVICE`
-	FSTYPE=`blkid -s TYPE -o value $DEVICE`
+
+get_part_info() {
+	UUID="$(blkid -s UUID -o value $DEVICE)"
+	FSTYPE="$(blkid -s TYPE -o value $DEVICE)"
 }
 
+
 # Format target device and label partition.
-mkfs_ext3()
-{
-	gettext "Please specify a label for the partition (TazUSB): "
+
+mkfs_ext3() {
+	_n 'Please specify a label for the partition (TazUSB): '
 	read label
-	
-	if [ -z $label ]; then
-		label=TazUSB
-	fi
-	
-	gettext "Label  : $label"; echo ""
-	gettext "Mkfs   : mkfs.ext3 -L \"$label\" $DEVICE" ; echo ""
-	echo "" && sleep 2
+
+	[ -z "$label" ] && label='TazUSB'
+
+	_ 'Label: %s' "$label"
+	echo "Mkfs: mkfs.ext3 -L \"$label\" $DEVICE"
+	newline; sleep 2
 	mkfs.ext3 -L "$label" $DEVICE
 }
 
+
 # Get label for device
-get_label()
-{
-	gettext "Please specify a label for the partition (TazUSB): "
+
+get_label() {
+	_n 'Please specify a label for the partition (TazUSB): '
 	read label
-	if [ -z $label ]; then
-		label=TazUSB
+	[ -z "$label" ] && label='TazUSB'
+}
+
+
+# Get fs type. Supported fs are ext3, ext2, fat32
+
+get_fs_type() {
+	_n 'Please specify a filesystem type ext2, ext3 or fat32 (ext3): '
+	read fs_type
+	[ -z "$fs_type" ] && fs_type='ext3'
+}
+
+
+# We can chose the filesystem type.
+
+ask_for_fs_type() {
+	_ 'Please specify the filesystem type to %s.' "$COMMAND"
+	_ 'Available formats are ext3(default), ext2 or fat32.'
+	_ 'Press enter to keep the default value.'
+	newline
+	_n 'File system type: '; read answer
+	if [ -z "$answer" ]; then
+		FS_TYPE='ext3'
+	else
+		FS_TYPE="$answer"
 	fi
 }
 
-# Get fs type. Supported fs are ext3, ext2, fat32
-get_fs_type()
-{
-	gettext "Please specify a filesystem type ext2, ext3 or fat32 (ext3): "
-	read  fs_type
-	if [ -z $fs_type ]; then
-		fs_type=ext3
-	fi
-}
-
-# We can chose the filesystem type.
-ask_for_fs_type()
-{
-	gettext "\
-Please specify the filesystem type to $COMMAND. 
-Available formats are ext3(default), ext2 or fat32. 
-Press enter to keep the default value.
-
-File system type: "; read anser
-	if [ "$anser" = "" ]; then
-		FS_TYPE=ext3
-	else
-		FS_TYPE=$anser
-	fi
-}
 
 # Format target device in ext3, ext2 or fat32.
 # Usage: make_fs ext2|fat32|ext3 (default)
-make_fs()
-{
+
+make_fs() {
 	local answer
-	
-	FS=$(echo $fs_type | tr [A-Z] [a-z])
+
+	FS=$(echo $fs_type | tr '[A-Z]' '[a-z]')
 	case "$FS" in
 		ext3|ext2)
-			echo ""; gettext "Processing..." ; echo ""
-			gettext "Label  : $label" ; echo ""
-			gettext "Mkfs   : mkfs.$FS -L \"$label\" $DEVICE"
-			echo "" && sleep 2
-			mkfs.$@ -L "$label" $DEVICE > $LOG 2>&1
+			newline; _ 'Processing...'
+			_ 'Label: %s' "$label"
+			echo "Mkfs: mkfs.$FS -L \"$label\" $DEVICE"
+			newline; sleep 2
+			mkfs.$FS -L "$label" $DEVICE > $LOG 2>&1
 			;;
-		[Ff]at32)
-			if [ -x /sbin/mkdosfs ];then
-				echo "" ; gettext "Processing..."; echo ""
-				gettext "Label  : $label" ; echo ""
-				gettext "Mkfs   : mkdosfs -F 32 -n \"$label\" $DEVICE"; echo ""
-				echo "" && sleep 2
-				mkdosfs -F 32 -n "$label" $DEVICE  
+		fat32)
+			if [ -x '/sbin/mkdosfs' ];then
+				newline; _ 'Processing...'
+				_ 'Label: %s' "$label"
+				echo "Mkfs: mkdosfs -F 32 -n \"$label\" $DEVICE"
+				newline; sleep 2
+				mkdosfs -F 32 -n "$label" $DEVICE
 			else
-				gettext "Can't find mkdosfs tool.\nWould you like to install dosfstools from repository [y/N] ? "; read answer
-				case $answer in
+				_ "Can't find %s tool." 'mkdosfs'
+				_n 'Would you like to install %s from repository [y/N]? ' 'dosfstools'
+				read answer
+				case "$answer" in
 					y|Y)
-						yes | tazpkg get-install dosfstools  && make_fs fat32;;
+						yes | tazpkg get-install dosfstools && make_fs fat32;;
 					*)
 						exit 1 ;;
 				esac
 			fi
 			;;
 		*)
-			gettext "Sorry. Filesystem $FS is not supported."; echo ""
-			exit 
+			_ 'Sorry. Filesystem %s is not supported.' "$FS"
+			exit
+			;;
 	esac
 }
 
+
 # Mount an existing USB device.
-unmount_target_usb()
-{
+
+unmount_target_usb() {
 	# If mount point is in use, unmount
 	if mount | grep -q $TARGET_ROOT; then
 		umount $TARGET_ROOT
 	fi
-	
+
 	# Device could be mounted elsewhere, so unmount
 	if mount | grep -q $DEVICE; then
-		gettext "Unmounting USB target device..."; echo ""
+		_ 'Unmounting USB target device...'
 		umount $DEVICE
 	fi
 }
 
+
 # Mount an existing USB device.
-mount_target_usb()
-{
-	gettext "Mounting USB target device..."	; echo ""
+
+mount_target_usb() {
+	_ 'Mounting USB target device...'
 	mkdir -p $TARGET_ROOT
 	mount $DEVICE $TARGET_ROOT 2>/dev/null
 }
 
+
 # Mount SliTaz LiveCD to get needed files.
-mount_cdrom()
-{
-	gettext "Mounting cdrom device..."; echo ""
-	
+
+mount_cdrom() {
+	_ 'Mounting CD-ROM device...'
+
 	if mount | grep /media/cdrom; then
 		umount /media/cdrom
 	fi
-	
+
 	mkdir -p /media/cdrom
 	mount -r -t iso9660 $CDROM /media/cdrom 2>/dev/null
-	
+
 	if [ ! -f /media/cdrom/boot/rootfs.gz -a \
 	     ! -f /media/cdrom/boot/rootfs1.gz ]; then
-		echo ""; gettext "Unable to mount cdrom or to find a filesystem on it (rootfs.gz)."; echo ""
+		newline
+		longline "$(_ 'Unable to mount CD-ROM or to find a filesystem on it (%s).' 'rootfs.gz')"
 		exit 0
 	fi
 }
 
+
 # Mount SliTaz ISO to get needed files.
-mount_iso()
-{
+
+mount_iso() {
 	if mount | grep /media/cdrom ; then
 		umount /media/cdrom
 	fi
-	
+
 	test -d /media/cdrom || mkdir -p /media/cdrom
-	
+
 	# Add support to other distros.
-    if [ ! -f /etc/slitaz-version ]; then
-         OPTIONS="-o loop"
-    else
-         OPTIONS=""
-    fi
-	
-	gettext "Mounting "
-	echo  "`basename $ISO`..."; echo ""
-	mount $OPTIONS $ISO /media/cdrom 2>/dev/null 
-	
+	if [ ! -f /etc/slitaz-version ]; then
+		OPTIONS='-o loop'
+	else
+		OPTIONS=''
+	fi
+
+	_ 'Mounting %s...' "$(basename $ISO)"
+	mount $OPTIONS $ISO /media/cdrom 2>/dev/null
+
 	if [ ! -f /media/cdrom/boot/rootfs.gz -a \
 	     ! -f /media/cdrom/boot/rootfs1.gz ]; then
-		gettext "Unable to mount iso or to find a filesystem on it (rootfs.gz)."; echo ""
+		longline "$(_ 'Unable to mount ISO or to find a filesystem on it (%s).' 'rootfs.gz')"
 		exit 0
 	fi
 }
 
-# All needed files are in the boot directory of the cdrom.
-copy_cdrom_files()
-{
-	gettext "Copying needed files from cdrom..."
-	mkdir -p $TARGET_ROOT/boot
-	cp /media/cdrom/boot/bzImage* $TARGET_ROOT/boot/
+
+# All needed files are in the boot directory of the CD-ROM.
+
+copy_cdrom_files() {
+	_n 'Copying needed files from CD-ROM...'
+	mkdir -p                         $TARGET_ROOT/boot
+	cp /media/cdrom/boot/bzImage*    $TARGET_ROOT/boot
 	cp /media/cdrom/boot/rootfs*.gz* $TARGET_ROOT/boot
-	cp /media/cdrom/boot/memtest $TARGET_ROOT/boot 2> /dev/null
-	cp /media/cdrom/boot/*pxe $TARGET_ROOT/boot 2> /dev/null
+	cp /media/cdrom/boot/memtest     $TARGET_ROOT/boot 2>/dev/null
+	cp /media/cdrom/boot/*pxe        $TARGET_ROOT/boot 2>/dev/null
 	status
 }
 
-install_mbr()
-{
+
+install_mbr() {
 	# MBR
 	DISK=${DEVICE%[1-99]}
 	if [ -f /usr/share/boot/mbr.bin ]; then
-		gettext  "Installing a new MBR to: $DISK"
+		_n 'Installing a new MBR to %s' "$DISK"
 		cat /usr/share/boot/mbr.bin > $DISK
 		status
 	else
 		# Skip MBR install (tazpkg get-install syslinux-extra ? and then cat)
-		gettext "No new MBR installed to: $DISK"; echo ""
+		_ 'No new MBR installed to %s' "$DISK"
 	fi
 }
 
+
 # ext/syslinux install
-install_boot()
-{
+
+install_boot() {
 	# Decide if we're installing syslinux or extlinux
-	if [ "$FSTYPE" = "vfat" ]; then
-		ST=syslinux
+	if [ "$FSTYPE" == 'vfat' ]; then
+		ST='syslinux'
 		STC="syslinux --install -d /boot/syslinux/ $DEVICE"
-		STE=cfg
+		STE='cfg'
 	else
-		ST=extlinux
+		ST='extlinux'
 		STC="extlinux --install $TARGET_ROOT/boot/$ST"
-		STE=conf
+		STE='conf'
 	fi
-	
-	gettext  "Installing bootloader: $ST"; echo ""
+
+	_ 'Installing bootloader: %s' "$ST"
 	mkdir -p $TARGET_ROOT/boot/$ST
 	$STC
-	
+
 	# Use existing isolinux.cfg for extlinux.conf or syslinux.cfg
 	cp /media/cdrom/boot/isolinux/isolinux.cfg $TARGET_ROOT/boot/$ST/$ST.$STE
-	
+
 	# Update DVD autoinstall
 	sed -i "s/LABEL=packages-[^,]*/UUID=$UUID/g" $(grep -l append $TARGET_ROOT/boot/$ST/*)
-	 
+
 	# Add home=$UUID to kernel line in extlinux or syslinux.cfg
 	sed -i -e "s/\(root=.*\)/\1 home=$UUID/" $(grep -l append $TARGET_ROOT/boot/$ST/*)
-	
+
 	# Splash screen and help files.
 	cp /media/cdrom/boot/isolinux/splash.* $TARGET_ROOT/boot/$ST
-	cp /media/cdrom/boot/isolinux/*.cfg $TARGET_ROOT/boot/$ST
-	cp /media/cdrom/boot/isolinux/*.kbd $TARGET_ROOT/boot/$ST
-	cp /media/cdrom/boot/isolinux/*.c32 $TARGET_ROOT/boot/$ST
+	cp /media/cdrom/boot/isolinux/*.cfg    $TARGET_ROOT/boot/$ST
+	cp /media/cdrom/boot/isolinux/*.kbd    $TARGET_ROOT/boot/$ST
+	cp /media/cdrom/boot/isolinux/*.c32    $TARGET_ROOT/boot/$ST
 	sed -i -e s/'SliTaz GNU\/Linux'/'SliTaz GNU\/Linux LiveUSB'/ \
 		-e "s/isolinux/$ST/" $TARGET_ROOT/boot/$ST/$ST.$STE
 }
 
+
 # Let user exit or reboot.
-exit_or_reboot()
-{
+
+exit_or_reboot() {
 	separator
-	echo ""
-	gettext "Do you want to exit Tazusb or reboot system (Exit/reboot) ? "
-	read anser
-	if [ "$anser" == "reboot" ]; then
+	newline
+	longline "$(_n 'Do you want to exit Tazusb or reboot system (Exit/reboot)? ')"
+	read answer
+	if [ "$answer" == 'reboot' ]; then
 		unmount_target_usb
 		reboot || reboot -f
 	else
 		unmount_target_usb
-		echo "" && exit 0
+		newline; exit 0
 	fi
 }
 
-set_bootable()
-{
+
+set_bootable() {
 	# As the boot flag is toggable, need to check it before hand
 	DISK=${DEVICE%[1-99]}
-	ISSET=`fdisk -l $DISK | grep $DEVICE | grep "\*"`
-	
+	ISSET="$(fdisk -l $DISK | grep $DEVICE | grep "\*")"
+
 	# If not set, set bootable
-	if [ "$ISSET" == "" ]; then
+	if [ -z "$ISSET" ]; then
 		umount $TARGET_ROOT 2>/dev/null
-		gettext "Setting $DEVICE as bootable..."
+		_n 'Setting %s as bootable...' "$DEVICE"
 		fdisk $DISK >/dev/null << EOF
 a
 1
@@ -351,20 +365,21 @@
 	fi
 }
 
+
 # Generate a virtual swap file in /home/swap. SliTaz boot scripts 
 # will activate it, useful for low memory systems
-gen_swap_file()
-{
-	echo ""
-	echo -en "\033[1m`gettext \"Gen swap\"`\033[0m
-================================================================================"
-gettext "Generate a swap file in /home/swap that will be activated on each boot to have
-more memory available (Empty value to exit).
 
-Swap file in Mb : "
+gen_swap_file() {
+	newline
+	boldify "$(_n 'Gen swap')"
+	separator
+	longline "$(_ "Generate a swap file in %s that will be activated on each \
+boot to have more memory available (empty value to exit)." '/home/swap')"
+	newline
+	_n 'Swap file in MB: '
 	read size
 	if [ -z "$size" ]; then
-		gettext "Empty value. Exiting..."; echo ""
+		_ 'Empty value. Exiting...'
 		exit 0
 	fi
 	cd /home
@@ -377,20 +392,22 @@
 	# Make swap filesystem.
 	mkswap swap
 	swapon swap
-	echo ""
+	newline
 }
 
+
 # Clean out old backups to save disk space
-clean_usb() 
-{
-	echo ""
-	echo -en "\033[1m`gettext \"Clean\"`\033[0m
-================================================================================"
-gettext "Remove old rootfs.gz.unixtimestamp backup filesystems to free up disk space."; echo -e "\n\n"
+
+clean_usb() {
+	newline
+	boldify "$(_n 'Clean')"
+	separator
+	longline "$(_n 'Remove old %s backup filesystems to free up disk space.' \
+'rootfs.gz.unixtimestamp')"
+	newline
 	# Locate and interactively remove old filesystems from /home directory
-	for file in `find /home/boot/rootfs.gz.[0-9]*`
-	do
-		gettext "Do you wish to remove: `basename $file` (Yes/no/exit) ? "
+	for file in $(find /home/boot/rootfs.gz.[0-9]*); do
+		_n 'Do you wish to remove: %s (Yes/no/exit)? ' "$(basename $file)"
 		read answer
 		case $answer in
 			e|E|"exit"|Exit)
@@ -398,11 +415,12 @@
 			y|Y|yes|Yes)
 				rm -f $file ;;
 			*)
-			gettext "No filesystems selected, exiting..." ; echo "" ;;
+				_ 'No filesystems selected, exiting...' ;;
 		esac
 	done
 }
 
+
 #
 # Tazusb sequence
 #
@@ -411,66 +429,65 @@
 	writefs)
 		# Writefs to rootfs.gz
 		check_root
-		if [ -z $2 ]; then
-			COMPRESSION=none
+		if [ -z "$2" ]; then
+			COMPRESSION='none'
 		else
-			COMPRESSION=$2
+			COMPRESSION="$2"
 		fi
 		# Start info
+		title 'Write filesystem'
+
+		longline "$(_ "The command writefs will write all the current \
+filesystem into a suitable cpio archive (%s) usable on a bootable \
+LiveUSB media." 'rootfs.gz')"
 		newline
-		boldify "$(gettext 'Write filesystem')"
-		separator
-		cat << EOT
-$(gettext "The command writefs will write all the current filesystem into a suitable
-cpio archive (rootfs.gz) usable on a bootable LiveUSB media.")
+		_ 'Archive compression: %s' "$(colorize 36 "$COMPRESSION")"
 
-$(boldify "Archive compression:") $(colorize 36 "$COMPRESSION")
-
-EOT
 		# Clear out tazpkg cache
 		rm /var/lib/tazpkg/*.bak /var/cache/tazpkg/* -r -f
 
 		# Optionally remove sound card selection and screen resolution.
-		gettext "Do you wish to remove the sound card and screen configs ? "; echo
-		gettext "Press ENTER to keep or answer (No|yes|exit): "
+		_ 'Do you wish to remove the sound card and screen configs?'
+		_n 'Press ENTER to keep or answer (No|yes|exit): '
 		read anser
 		case $anser in
 			e|E|"exit"|Exit)
 				exit 0 ;;
 			y|Y|yes|Yes)
-				gettext "Removing current sound card and screen configurations..."
+				_n 'Removing current sound card and screen configurations...'
 				rm -f /var/lib/sound-card-driver
 				rm -f /var/lib/alsa/asound.state
 				rm -f /etc/X11/xorg.conf ;;
 			*)
-				gettext "Keeping current sound card and screen configurations..." ;;
+				_n 'Keeping current sound card and screen configurations...' ;;
 		esac
-		status && newline
-		
+		status
+		newline
+
 		# Optionally remove i18n settings
-		gettext "Do you wish to remove local/keymap settings ? "; echo
-		gettext "Press ENTER to keep or answer (No|yes|exit): "
+		_ 'Do you wish to remove local/keymap settings?'
+		_n 'Press ENTER to keep or answer (No|yes|exit): '
 		read anser
 		case $anser in
 			e|E|"exit"|Exit)
 				exit 0 ;;
 			y|Y|yes|Yes)
-				gettext "Removing current locale/keymap settings..."
-				echo "" > /etc/locale.conf
-				echo "" > /etc/keymap.conf ;;
+				_n 'Removing current locale/keymap settings...'
+				echo > /etc/locale.conf
+				echo > /etc/keymap.conf ;;
 			*)
-				gettext "Keeping current locale/keymap settings..."
-				grep -qs '^INCLUDE i18n.cfg' /home/boot/*linux/*linux.c* &&
-				sed -i 's/^INCLUDE i18n.cfg/# &/' /home/boot/*linux/*linux.c* ;;
+				_n 'Keeping current locale/keymap settings...'
+				grep -qs '^INCLUDE i18n.cfg'        /home/boot/*linux/*linux.c* &&
+				sed  -i  's/^INCLUDE i18n.cfg/# &/' /home/boot/*linux/*linux.c* ;;
 		esac
 		status
-		
+
 		# Clean-up files by default
 		mv -f /var/log/wtmp /tmp/tazusb-wtmp
 		touch /var/log/wtmp
-		echo "" > /etc/udev/rules.d/70-persistent-net.rules
-		echo "" > /etc/udev/rules.d/70-persistant-cd.rules
-		
+		echo > /etc/udev/rules.d/70-persistent-net.rules
+		echo > /etc/udev/rules.d/70-persistant-cd.rules
+
 		# Create list of files
 		# find / -xdev | sed '/^\/home\//d;/^\/tmp\//d' >/tmp/list
 		# for dev in console null tty tty1
@@ -491,27 +508,27 @@
 		done
 
 		# Generate initramfs with specified compression
-		if [ "$COMPRESSION" = "lzma" ]; then
-			gettext "Creating rootfs.gz with lzma compression... "
+		if [ "$COMPRESSION" == 'lzma' ]; then
+			_n 'Creating %s with lzma compression... ' 'rootfs.gz'
 			cpio -o -H newc | lzma e -si -so > /rootfs.gz
 
-		elif [ "$COMPRESSION" = "gzip" ]; then
-			gettext "Creating rootfs.gz with gzip compression... "
+		elif [ "$COMPRESSION" == 'gzip' ]; then
+			_n 'Creating %s with gzip compression... ' 'rootfs.gz'
 			cpio -o -H newc | gzip -9 > /rootfs.gz
 
 		else
-			gettext "Creating rootfs.gz without compression... "
+			_n 'Creating %s without compression... ' 'rootfs.gz'
 			cpio -o -H newc > /rootfs.gz
 		fi < /tmp/list
 
 		mv -f /tmp/tazusb-wtmp /var/log/wtmp
 
 		# Get initramfs size
-		size=`du -sh /rootfs.gz | cut -f 1`
+		size=$(du -sh /rootfs.gz | cut -f1)
 
 		# If the bootable medium is where it should be, copy across
 		if (test -e /home/boot/bzImage); then
-			gettext "Moving rootfs.gz to media. Remember to unmount for delayed writes!"; echo ""
+			longline "$(_ 'Moving %s to media. Remember to unmount for delayed writes!' 'rootfs.gz')"
 
 			# Move the old filesystem with the unix timestamp for reference
 			if (test -e /home/boot/previous.gz); then
@@ -521,50 +538,52 @@
 			mv /home/boot/rootfs.gz /home/boot/previous.gz
 			mv /rootfs.gz /home/boot/.
 		else
-			gettext "rootfs.gz is located in /"; echo ""
+			_ '%s is located in /' 'rootfs.gz'
 		fi
 
 		separator
-		gettext "Root filesystem size: $size"; echo ""
-		echo ""
-		echo "----"
-		gettext "ENTER to continue..."; read i
+		_ 'Root filesystem size: %s' "$size"
+		separator '-'
+		_n 'ENTER to continue...'; read i
 		;;
+
+
 	format)
 		# Format a partition.
 		check_root
-		echo ""
-		echo -e "\033[1m`gettext \"Format a device\"`\033[0m"
-		separator
-		DEVICE=$2
-		label=$3
-		fs_type=$4
-		if [ -z $DEVICE ]; then
+
+		title 'Format a device'
+
+		DEVICE="$2"
+		label="$3"
+		fs_type="$4"
+		if [ -z "$DEVICE" ]; then
 			ask_for_device
 			check_for_device
 		else
-			echo "Device : $DEVICE"
+			_ 'Device: %s' "$DEVICE"
 		fi
-		test -z $fs_type &&	get_fs_type
+		[ -z "$fs_type" ] && get_fs_type
 		get_label
-		unmount_target_usb 
+		unmount_target_usb
 		make_fs "$fs_type"
 		# mkfs_ext3
 		separator
-		gettext "Device $label ($DEVICE) is ready to use as LiveUSB and/or /home partition."
-		echo ""
+		longline "$(_ 'Device %s is ready to use as LiveUSB and/or /home partition.' "$label ($DEVICE)")"
 		;;
+
+
 	gen-liveusb)
 		# Generate a LiveUSB media using files from a LiveCD.
 		check_root
-		echo ""
-		echo -e "\033[1m`gettext \"Gen a LiveUSB media\"`\033[0m"
-		separator
-		DEVICE=$2
-		if [ -z $DEVICE ]; then
+
+		title 'Gen a LiveUSB media'
+
+		DEVICE="$2"
+		if [ -z "$DEVICE" ]; then
 			ask_for_device
 		fi
-		
+
 		check_for_device
 		mount_cdrom
 		get_part_info
@@ -576,22 +595,27 @@
 		install_boot
 		exit_or_reboot
 		;;
+
+
 	gen-swap)
 		check_root
-		gen_swap_file ;;
+		gen_swap_file
+		;;
+
+
 	gen-iso2usb|iso2usb)
 		check_root
 		# Check if file exists
-		ISO=$2
-		if [ -z $ISO ] || [ ! -f $ISO ]; then
-			gettext "Please specify a valid filename on the command line."; echo ""
+		ISO="$2"
+		if [ -z "$ISO" -o ! -f "$ISO" ]; then
+			_ 'Please specify a valid filename on the command line.'
 			exit 1
 		fi
-		echo ""
-		boldify "$(gettext "Copy ISO file to SliTaz LiveUSB media")"
-		separator
-		DEVICE=$3
-		if [ -z $DEVICE ]; then
+
+		title 'Copy ISO file to SliTaz LiveUSB media'
+
+		DEVICE="$3"
+		if [ -z "$DEVICE" ]; then
 			ask_for_device
 		fi
 		check_for_device
@@ -606,11 +630,15 @@
 		umount /media/cdrom
 		losetup -d /dev/loop0
 		exit_or_reboot
-		;;	
+		;;
+
+
 	clean)
 		check_root
 		clean_usb
-		;;	
+		;;
+
+
 	usage|*)
 		# Display usage by default.
 		usage
diff -r 7cdf12d25925 -r 8ddffadf56a6 tazusb-box
--- a/tazusb-box	Mon Jul 27 21:45:20 2015 +0000
+++ b/tazusb-box	Sat Aug 01 22:49:04 2015 +0300
@@ -6,61 +6,75 @@
 #
 # Authors : Christophe Lincoln <pankso@slitaz.org>
 #
+
 . /lib/libtaz.sh
 
+
 # TazUSBbox is only for root.
-if test $(id -u) != 0 ; then
+
+if [ $(id -u) -ne 0 ]; then
 	exec tazbox su tazusb-box
 	exit 0
 fi
 
+
 # We can specify an ISO on cmdline: tazusb-box --iso=/path/to/image.iso
+
 [ "$iso" ] || iso=" "
 
-title="TazUSB Box"
-icon="/usr/share/pixmaps/slitaz-icon.png"
+title='TazUSB Box'
+icon='/usr/share/pixmaps/slitaz-icon.png'
 opts="--window-icon=$icon --height=220 --width=520 --center --on-top"
 
+
 # I18n
-. /usr/bin/gettext.sh
-TEXTDOMAIN='tazusb-box'
-export TEXTDOMAIN
+
+export TEXTDOMAIN='tazusb-box'
+
 
 # Main text information
-info="$(gettext "<b>Generate SliTaz LiveUSB media and boot in RAM!</b> \
-Insert a LiveCD into the cdrom drive or use a local ISO image, select \
+
+info="<b>$(_ 'Generate SliTaz LiveUSB media and boot in RAM!')</b>\n\n \
+$(_ "Insert a LiveCD into the CD-ROM drive or use a local ISO image, select \
 the correct device and press OK.")
 "
 
+
 #
 # Functions
 #
 
 # Nice GTK output for commands.
+
 output() {
 	yad --text-info $opts --title="$title" --tail --margins=4 \
-		--button="Reboot:reboot" --button="gtk-close:0"
+		--button="$(_n 'Reboot'):reboot" --button="gtk-close:0"
 }
 
+
 list_devices() {
 	if [ -d /proc/scsi/usb-storage ]; then
-		dev="$(blkid | cut -d ":" -f 1)"
+		dev="$(blkid | cut -d":" -f1)"
 		echo $dev | sed s'/ /!/'g
 	else
-		gettext "No USB media found"
+		_ 'No USB media found'
 	fi
 }
 
+
 # Main GUI box function with pure Yad spec
+
 usbbox_main() {
 	yad --form $opts --title="$title" --text="$info" \
 		--image=usb-creator --image-on-top \
-		--field="$(gettext "ISO Image:")":FL \
-		--field="$(gettext "USB Media:")":CB \
+		--field="$(_n 'ISO Image:')":FL \
+		--field="$(_n 'USB Media:')":CB \
 		"$iso" "$(list_devices)"
 }
 
+
 # Handler
+
 usbbox() {
 	# Store box results
 	main=$(usbbox_main)
@@ -72,25 +86,27 @@
 	esac
 
 	# Deal with $main values. Exit if any device.
-	dev=$(echo $main | cut -d "|" -f 2)
+	dev=$(echo $main | cut -d"|" -f2)
 	if ! echo $dev | grep -q /dev; then
-		echo "No device: exit" && exit 0
+		_ 'No device: exit'
+		exit 0
 	fi
 	if echo "$main" | grep -q ".iso|"; then
 		iso=$(echo $main | cut -d "|" -f 1)
-		yes "" | tazusb gen-iso2usb $iso $dev --output=raw | output
+		yes '' | tazusb gen-iso2usb $iso $dev --output=raw | output
 	else
-		yes "" | tazusb gen-liveusb $dev --output=raw | output
+		yes '' | tazusb gen-liveusb $dev --output=raw | output
 	fi
 }
 
+
 #
 # Script commands
 #
 
 case "$1" in
-	usage)
-		echo "Usage: $(basename $0) [list]" ;;
+	usage|--help|-h)
+		echo "$(_ 'Usage:') $(basename $0) [list]" ;;
 	list)
 		list_devices ;;
 	*)